r697 - in branches/jrst-docutils-jython/jrst/src/main: java/org/nuiton/jrst resources/xsl
Author: jpages Date: 2012-06-06 14:31:17 +0200 (Wed, 06 Jun 2012) New Revision: 697 Url: http://nuiton.org/repositories/revision/jrst/697 Log: Correction de la g?\195?\169n?\195?\169ration de xdoc : les sections se terminaient trop t?\195?\180t Suppression de certains formats inutiles dans la liste de l'interface graphique. Modified: branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java branches/jrst-docutils-jython/jrst/src/main/resources/xsl/rst2xdoc.xsl Modified: branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java 2012-06-05 14:44:35 UTC (rev 696) +++ branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java 2012-06-06 12:31:17 UTC (rev 697) @@ -121,7 +121,7 @@ /** XSL Stylesheet to transform Docbook into PDF. */ protected static final String DOCBOOK_2_FO = "/docbook/fo/docbook.xsl"; - public static final String PATTERN_TYPE = "xml|xhtml|docbook|html|htmlInnerBody|xdoc|rst|fo|pdf|odt|rtf"; + public static final String PATTERN_TYPE = "xml|xhtml|docbook|html|htmlInnerBody|xdoc|fo|pdf"; /** HTML output format type */ public static final String TYPE_HTML = "html"; Modified: branches/jrst-docutils-jython/jrst/src/main/resources/xsl/rst2xdoc.xsl =================================================================== --- branches/jrst-docutils-jython/jrst/src/main/resources/xsl/rst2xdoc.xsl 2012-06-05 14:44:35 UTC (rev 696) +++ branches/jrst-docutils-jython/jrst/src/main/resources/xsl/rst2xdoc.xsl 2012-06-06 12:31:17 UTC (rev 697) @@ -37,31 +37,60 @@ <title><xsl:value-of select="title"/></title> </properties> <body> - <xsl:apply-templates /> + <section> + <xsl:attribute name="name"><xsl:value-of select="title"/></xsl:attribute> + <xsl:apply-templates /> + </section> </body> </document> </xsl:template> + <xsl:template match="section"> + <a name="{@ids}" id="{@ids}"></a> + <!--renommer names par name--> + <xsl:choose> + <xsl:when test="count(ancestor::section) = 0"> + <xsl:apply-templates/> + <!--xsl:element name="subsection"> + <xsl:if test="@names"> + <xsl:attribute name="name"><xsl:value-of select="@names"/></xsl:attribute> + </xsl:if> + <xsl:if test="@name"> + <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute> + </xsl:if> + <xsl:apply-templates/> + </xsl:element--> + </xsl:when> + <xsl:when test="count(ancestor::section) = 1"> + <!--remplacer la balise section par subsection--> + <!--xsl:element name="h{count(ancestor::section) + 2}"> + </xsl:element--> + <xsl:apply-templates/> + </xsl:when> + </xsl:choose> + </xsl:template> + <xsl:template match="title"> <xsl:choose> - <xsl:when test="count(ancestor::section) = 0"> - <section> - <xsl:attribute name="name"><xsl:value-of select="."/></xsl:attribute> - </section> - </xsl:when> - <xsl:when test="count(ancestor::section) = 1"> - <subsection> - <xsl:attribute name="name"><xsl:value-of select="."/></xsl:attribute> - </subsection> - </xsl:when> - <xsl:otherwise> + <xsl:when test="count(ancestor::section) >= 1"> + <!--remplacer la balise section par subsection--> <xsl:element name="h{count(ancestor::section) + 2}"> <xsl:apply-templates/> </xsl:element> - </xsl:otherwise> + </xsl:when> </xsl:choose> </xsl:template> + <!--xsl:template match="reference"> + <xsl:if test="@refid"> + <a href="{@refuri}#{@refid}" id="{@ids}"><xsl:apply-templates/></a> + </xsl:if> + <xsl:if test="not(@refid)"> + <a href="{@refuri}" id="{@refuri}"><xsl:apply-templates/></a> + </xsl:if> + </xsl:template--> + + <!-- #286 : Régression sur la génération des méta-données TODO peut etre que les xsl de xhtml et xdoc devrait être indépendante --> <xsl:template match="docinfo">
participants (1)
-
jpages＠users.nuiton.org