Author: ferdinand
Date: Mon Jul 25 10:59:13 2005
New Revision: 225159
URL: http://svn.apache.org/viewcvs?rev=225159&view=rev
Log:
Fixed/added pass-through for id-attribute in several elements
Modified:
forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl
forrest/trunk/main/webapp/skins/pelt/xslt/html/document2html.xsl
Modified: forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl?rev=225159&r1=225158&r2=225159&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl (original)
+++ forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl Mon Jul 25 10:59:13
2005
@@ -192,6 +192,7 @@
<xsl:template match="p[@xml:space='preserve']">
<xsl:apply-templates select="@id"/>
<div class="pre">
+ <xsl:copy-of select="@id"/>
<xsl:apply-templates/>
</div>
</xsl:template>
@@ -200,6 +201,7 @@
<xsl:apply-templates select="@id"/>
<pre class="code">
<!-- Temporarily removed long-line-splitter ... gives out-of-memory problems -->
+ <xsl:copy-of select="@id"/>
<xsl:apply-templates/>
<!--
<xsl:call-template name="format">
@@ -211,26 +213,33 @@
</xsl:template>
<xsl:template match="anchor">
- <a name="{@id}"/>
+ <a name="{@id}">
+ <xsl:copy-of select="@id"/>
+ </a>
</xsl:template>
<xsl:template match="icon">
<xsl:apply-templates select="@id"/>
<img class="icon">
- <xsl:copy-of select="@height | @width | @src | @alt"/>
+ <xsl:copy-of select="@height | @width | @src | @alt | @id"/>
</img>
</xsl:template>
<xsl:template match="code">
<xsl:apply-templates select="@id"/>
- <span class="codefrag"><xsl:value-of select="."/></span>
+ <span class="codefrag">
+ <xsl:copy-of select="@id"/>
+ <xsl:value-of select="."/>
+ </span>
</xsl:template>
<xsl:template match="figure">
<xsl:apply-templates select="@id"/>
+
<div align="center">
+ <xsl:copy-of select="@id"/>
<img class="figure">
- <xsl:copy-of select="@height | @width | @src | @alt"/>
+ <xsl:copy-of select="@height | @width | @src | @alt | @id"/>
</img>
</div>
</xsl:template>
@@ -238,7 +247,7 @@
<xsl:template match="table">
<xsl:apply-templates select="@id"/>
<table cellpadding="4" cellspacing="1" class="ForrestTable">
- <xsl:copy-of select="@cellspacing | @cellpadding | @border | @class | @bgcolor"/>
+ <xsl:copy-of select="@cellspacing | @cellpadding | @border | @class | @bgcolor |@id"/>
<xsl:apply-templates/>
</table>
</xsl:template>
Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/document2html.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/pelt/xslt/html/document2html.xsl?rev=225159&r1=225158&r2=225159&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/document2html.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/document2html.xsl Mon Jul 25 10:59:13 2005
@@ -136,8 +136,8 @@
<xsl:template match="figure">
<xsl:apply-templates select="@id"/>
- <div style="text-align: center;">
- <img src="{@src}" alt="{@alt}" class="figure">
+ <div style="text-align: center;" id="{@id}">
+ <img src="{@src}" alt="{@alt}" class="figure" id="{@id}">
<xsl:if test="@height">
<xsl:attribute name="height"><xsl:value-of select="@height"/></xsl:attribute>
</xsl:if>
|