Author: chatellier Date: 2009-01-16 13:26:49 +0000 (Fri, 16 Jan 2009) New Revision: 249 Modified: jrst/trunk/changelog.txt jrst/trunk/src/main/resources/xsl/rst2xhtml.xsl Log: Fix summary anchor problem Modified: jrst/trunk/changelog.txt =================================================================== --- jrst/trunk/changelog.txt 2009-01-15 18:31:16 UTC (rev 248) +++ jrst/trunk/changelog.txt 2009-01-16 13:26:49 UTC (rev 249) @@ -1,5 +1,6 @@ ver-0.8.4 xxx 2009XXXX + * Fix anchor in content * Update xml2rst.xsl stylesheet * Re add i18n plugin on build * Reenable tests during maven build Modified: jrst/trunk/src/main/resources/xsl/rst2xhtml.xsl =================================================================== --- jrst/trunk/src/main/resources/xsl/rst2xhtml.xsl 2009-01-15 18:31:16 UTC (rev 248) +++ jrst/trunk/src/main/resources/xsl/rst2xhtml.xsl 2009-01-16 13:26:49 UTC (rev 249) @@ -21,12 +21,10 @@ <xsl:template match="title"> <xsl:if test="name(..)='document'"> <h1 class="mainTitle"> - <xsl:apply-templates/> </h1> - - </xsl:if> + <xsl:if test="not(name(..)='document')"> <xsl:element name="h{count(ancestor::section) + 1}"> <xsl:attribute name="class">title</xsl:attribute> @@ -36,7 +34,6 @@ <xsl:if test="not(@refid)"> <xsl:apply-templates/> </xsl:if> - </xsl:element> </xsl:if> </xsl:template> @@ -113,6 +110,7 @@ </xsl:template> <xsl:template match="section"> + <a name="{@id}"></a> <xsl:apply-templates/> </xsl:template> @@ -134,8 +132,6 @@ </xsl:if> <xsl:if test="not(@refid)"> <a href="{@refuri}" id="{@id}"><xsl:apply-templates/></a> - - </xsl:if> </xsl:template> @@ -192,9 +188,11 @@ </xsl:template> <xsl:template match="field"> + <xsl:if test="not(../../docinfo)"> <div class="field"><xsl:apply-templates/></div> </xsl:if> + <xsl:if test="../../docinfo"> <tr> <th class="docinfo-name"> @@ -204,20 +202,16 @@ <xsl:apply-templates select="field_body/*"/> </td> </tr> - </xsl:if> </xsl:template> <xsl:template match="field_name"> <span class="field_name"><xsl:apply-templates/></span> - - </xsl:template> <xsl:template match="field_body"> <span class="field_body"><xsl:apply-templates/></span> - </xsl:template> <xsl:template match="definition_list"> @@ -261,10 +255,10 @@ <p class="header"><xsl:apply-templates/></p> <hr/> </xsl:template> + <!-- | Table +--> - <xsl:template match="table"> <table border="1"> <colgroup> @@ -331,7 +325,6 @@ <xsl:template match="block_quote"> <blockquote> - <xsl:if test="./attribution"> <p><xsl:apply-templates select="child::*[position()=1]"/></p> <p class="attribution"> @@ -340,9 +333,9 @@ </xsl:if> <xsl:if test="not(./attribution)"> <xsl:apply-templates select="child::*"/> - </xsl:if> </blockquote> + </xsl:template> <xsl:template match="doctest_block"> @@ -399,9 +392,7 @@ <col class="option" /> <col class="description" /> <tbody valign="top"> - <xsl:apply-templates/> - </tbody> </table> </xsl:template>