- Jrst-commits - mailman.cloud.codelutin.com

r690 - in branches/jrst-docutils-jython: . jrst/src/main/java/org jrst/src/main/java/org/nuiton/jrst jrst/src/main/resources/xsl jrst-doc/src/site/en/rst/devel jrst-doc/src/site/en/rst/user jrst-doc/src/site/rst/devel jrst-doc/src/site/rst/user
by sletellier＠users.nuiton.org May 31, 2012

May 31, 2012

Author: sletellier Date: 2012-05-31 10:02:14 +0200 (Thu, 31 May 2012) New Revision: 690 Url: http://nuiton.org/repositories/revision/jrst/690 Log: - Delete empty directory - Remove xalan dependency - Remove rst2rst.xsl (dont work) Removed: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/images/ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/images/ branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/images/ branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/images/ branches/jrst-docutils-jython/jrst/src/main/java/org/dom4j/ branches/jrst-docutils-jython/jrst/src/main/resources/xsl/xml2rst.xsl Modified: branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java branches/jrst-docutils-jython/pom.xml 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-05-30 15:45:20 UTC (rev 689) +++ branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java 2012-05-31 08:02:14 UTC (rev 690) @@ -118,11 +118,8 @@ /** XSL Stylesheet to transform Docbook into PDF. */ protected static final String DOCBOOK_2_FO = "/docbook/fo/docbook.xsl"; - /** XSL Stylesheet to transform XML into RST. */ - protected static final String XML_2_RST = "/xsl/xml2rst.xsl"; + public static final String PATTERN_TYPE = "xml|xhtml|docbook|html|htmlInnerBody|xdoc|fo|pdf"; - public static final String PATTERN_TYPE = "xml|xhtml|docbook|html|htmlInnerBody|xdoc|rst|fo|pdf"; - /** HTML output format type */ public static final String TYPE_HTML = "html"; @@ -144,9 +141,6 @@ /** HTML HELP output format type */ public static final String TYPE_HTMLHELP = "htmlhelp"; - /** RST output format type */ - public static final String TYPE_RST = "rst"; - /** ODT output format type */ public static final String TYPE_ODT = "odt"; @@ -177,7 +171,6 @@ stylesheets.put(TYPE_XHTML, RST_2_DOCBOOK + "," + DOCBOOK_2_XHTML); stylesheets.put(TYPE_JAVAHELP, RST_2_DOCBOOK + "," + DOCBOOK_2_JAVAHELP); stylesheets.put(TYPE_HTMLHELP, RST_2_DOCBOOK + "," + DOCBOOK_2_HTMLHELP); - stylesheets.put(TYPE_RST, XML_2_RST); stylesheets.put(TYPE_FO, RST_2_DOCBOOK + "," + DOCBOOK_2_FO); stylesheets.put(TYPE_PDF, RST_2_XHTML); @@ -189,7 +182,6 @@ mimeType.put(TYPE_XHTML, "text/html"); mimeType.put(TYPE_JAVAHELP, "text/plain"); mimeType.put(TYPE_HTMLHELP, "text/html"); - mimeType.put(TYPE_RST, "text/plain"); mimeType.put(TYPE_ODT, "application/vnd.oasis.opendocument.text"); mimeType.put(TYPE_FO, "text/xml"); mimeType.put(TYPE_PDF, "application/pdf"); Deleted: branches/jrst-docutils-jython/jrst/src/main/resources/xsl/xml2rst.xsl =================================================================== --- branches/jrst-docutils-jython/jrst/src/main/resources/xsl/xml2rst.xsl 2012-05-30 15:45:20 UTC (rev 689) +++ branches/jrst-docutils-jython/jrst/src/main/resources/xsl/xml2rst.xsl 2012-05-31 08:02:14 UTC (rev 690) @@ -1,3744 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE xsl:stylesheet [ -<!ENTITY CR "
"> - - - -<!ENTITY tCR "<xsl:text xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xml:space='preserve'>&CR;</xsl:text>"> - -<!ENTITY tEOL "<xsl:text xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xml:space='preserve'>&CR;</xsl:text>"> -<!ENTITY tSP "<xsl:text xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xml:space='preserve'> </xsl:text>"> -]> - - - - - - - - - -<xsl:stylesheet - version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:u="u" - xmlns:data="a" - exclude-result-prefixes="data" - xmlns:str="http://exslt.org/strings" - xmlns:dyn="http://exslt.org/dynamic" - xmlns:math="http://exslt.org/math" - extension-element-prefixes="str dyn math"> - -  - - <xsl:output - method="text" - omit-xml-declaration="yes" - indent="no"/> - -  -  - -  - <xsl:param - name="adornment" - select="'o=o-u=u-u~u`u,u.'"/> - -  - <xsl:param - name="fold" - select="0"/> - -  -  - - <xsl:variable - name="apos" - select='"'"'/> - - <xsl:variable - name="structural_elements" - select="'*document*section*topic*sidebar*'"/> - - <xsl:variable - name="structural_subelements" - select="'*title*subtitle*docinfo*decoration*transition*'"/> - - <xsl:variable - name="bibliographic_elements" - select="'*address*author*authors*contact*copyright*date*field*organization*revision*status*version*'"/> - - <xsl:variable - name="decorative_elements" - select="'*footer*header*'"/> - - <xsl:variable - name="simple_body_elements_no_substitution" - select="'*comment*doctest_block*image*literal_block*paragraph*pending*raw*rubric*target*'"/> - - <xsl:variable - name="folding_elements" - select="concat('*comment*paragraph*rubric*attribution*caption*line*', substring-after($bibliographic_elements, '*'))"/> - - <xsl:variable - name="simple_body_elements" - select="concat($simple_body_elements_no_substitution, 'substitution_definition*')"/> - - <xsl:variable - name="compound_body_elements" - select="'*admonition*attention*block_quote*bullet_list*caution*citation*compound*danger*definition_list*enumerated_list*error*field_list*figure*footnote*hint*important*line_block*note*option_list*system_message*table*tip*warning*container*'"/> - - <xsl:variable - name="body_elements" - select="concat($simple_body_elements, substring-after($compound_body_elements, '*'))"/> - - <xsl:variable - name="admonitions" - select="'*admonition*attention*caution*danger*error*hint*important*note*tip*warning*'"/> - - <xsl:variable - name="simple_body_subelements" - select="'*attribution*caption*classifier*colspec*field_name*label*line*option_argument*option_string*term*'"/> - - <xsl:variable - name="compound_body_subelements" - select="'*definition*definition_list_item*description*entry*field*field_body*legend*list_item*option*option_group*option_list_item*row*tbody*tgroup*thead*'"/> - - <xsl:variable - name="inline_elements" - select="'*abbreviation*acronym*citation_reference*emphasis*footnote_reference*generated*image*inline*literal*problematic*reference*strong*subscript*substitution_reference*superscript*target*title_reference*raw*'"/> - - <xsl:variable - name="inline_containers" - select="concat($simple_body_elements_no_substitution, substring-after($inline_elements, '*'))"/> - - <xsl:variable - name="directives" - select="'*admonition*attention*caution*comment*danger*error*footnote*hint*important*note*tip*warning*image*figure*topic*sidebar*rubric*meta*raw*citation*compound*substitution_definition*container*'"/> - - <xsl:variable - name="titled_elements" - select="'*sidebar*topic*admonition*'"/> - - <xsl:variable - name="blank_after" - select="concat($structural_elements, substring-after($structural_subelements, '*'), substring-after($body_elements, '*'))"/> - - <xsl:variable - name="adornment_characters" - select="concat($apos, '!"#$%&()*+,-./:;<=>?@[\]^_`{|}~')"/> - -  -  - -  -  - <xsl:template - match="document"> - <xsl:if - test="//generated[@classes = 'sectnum']"> - <xsl:text>.. section-numbering::</xsl:text> - &tEOL; - &tCR; - </xsl:if> - <xsl:call-template - name="u:outputClass"> - <xsl:with-param - name="blankAfter" - select="true()"/> - </xsl:call-template> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="section"> - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:blank"/> - <xsl:apply-templates/> - </xsl:template> - -  - <xsl:template - match="section[@classes = 'system-messages']"/> -  -  - -  - -  -  - <xsl:template - match="sidebar"> - <xsl:call-template - name="u:BandI"/> - <xsl:text>.. sidebar:: </xsl:text> - <xsl:value-of - select="title"/> - &tEOL; - <xsl:if - test="subtitle"> - <xsl:call-template - name="u:param"> - <xsl:with-param - name="name" - select="'subtitle'"/> - <xsl:with-param - name="value" - select="subtitle"/> - <xsl:with-param - name="ancestors" - select="ancestor-or-self::*"/> - </xsl:call-template> - </xsl:if> - <xsl:call-template - name="u:params"/> -  - &tCR; - <xsl:apply-templates - select="*[not(self::title) and not(self::subtitle)]"/> - </xsl:template> - -  - -  -  - <xsl:template - match="topic"> - <xsl:call-template - name="u:BandI"/> - <xsl:text>.. topic:: </xsl:text> - <xsl:value-of - select="title"/> - &tEOL; - <xsl:call-template - name="u:params"/> - <xsl:apply-templates - select="*[not(self::title)]"/> - </xsl:template> - -  - <xsl:template - match="topic[starts-with(@classes, 'contents')]"> - <xsl:call-template - name="u:BandI"/> - <xsl:text>.. contents:: </xsl:text> - <xsl:apply-templates - select="title"/> - &tEOL; - <xsl:call-template - name="u:params"> - <xsl:with-param - name="params" - select="@*[name() != 'ids' and name() != 'names' and name() != 'classes']"/> - </xsl:call-template> - <xsl:variable - name="isLocal" - select="substring-before(@classes, ' local')"/> - <xsl:variable - name="realClassesLocal" - select="normalize-space(substring-after(@classes, 'contents'))"/> - <xsl:variable - name="realClassesNode"> - <xsl:choose> - <xsl:when - test="$isLocal"> - <xsl:value-of - select="normalize-space(substring-before($realClassesLocal, 'local'))"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="$realClassesLocal"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:variable - name="realClasses" - select="string($realClassesNode)"/> - <xsl:if - test="$isLocal"> - <xsl:call-template - name="u:param"> - <xsl:with-param - name="name" - select="'local'"/> - <xsl:with-param - name="value" - select="''"/> - <xsl:with-param - name="ancestors" - select="ancestor-or-self::*"/> - </xsl:call-template> - </xsl:if> - <xsl:if - test="$realClasses"> - <xsl:call-template - name="u:param"> - <xsl:with-param - name="name" - select="'class'"/> - <xsl:with-param - name="value" - select="$realClasses"/> - <xsl:with-param - name="ancestors" - select="ancestor-or-self::*"/> - </xsl:call-template> - </xsl:if> -  - &tCR; - </xsl:template> - -  - <xsl:template - match="topic[@classes='dedication' or @classes='abstract']"> - <xsl:call-template - name="u:BandI"/> - <xsl:text>:</xsl:text> - <xsl:apply-templates - select="title"/> - <xsl:text>: </xsl:text> - &tEOL; - <xsl:apply-templates - select="*[not(self::title)]"/> - </xsl:template> - -  - -  -  - <xsl:template - match="admonition"> - <xsl:call-template - name="u:BandI"/> - <xsl:text>.. admonition:: </xsl:text> - <xsl:apply-templates - select="title"/> - &tEOL; - <xsl:call-template - name="u:params"> - <xsl:with-param - name="params" - select="@*[name() != 'classes' or not(starts-with(., 'admonition-'))]"/> - </xsl:call-template> - <xsl:call-template - name="u:indent"/> - <xsl:apply-templates - select="*[not(self::title)]"/> - </xsl:template> - -  - -  -  - <xsl:template - match="attention | caution | danger | error | hint | important | note | tip | warning"> - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:BandI"/> - <xsl:text>.. </xsl:text> - <xsl:value-of - select="name()"/> - <xsl:text>:: </xsl:text> - <xsl:call-template - name="u:params"> - <xsl:with-param - name="params" - select="@*[name() != 'classes']"/> - </xsl:call-template> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="//document/decoration"> - <xsl:apply-templates/> - </xsl:template> - -  -  - <xsl:template - match="//document/decoration/header"> - <xsl:apply-templates/> - </xsl:template> - -  -  - <xsl:template - match="//document/decoration/footer"> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="docinfo"> - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:blank"/> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="docinfo/authors"> - <xsl:call-template - name="u:outputFolding"> - <xsl:with-param - name="prefix"> - <xsl:text>:</xsl:text> - <xsl:value-of - select="name()"/> - <xsl:text>: </xsl:text> - </xsl:with-param> - </xsl:call-template> - </xsl:template> - -  - <xsl:template - match="docinfo/authors/*"> - <xsl:apply-templates/> -  - <xsl:if - test="generate-id(current()) != generate-id(../*[last()])"> - <xsl:text>; </xsl:text> - </xsl:if> - </xsl:template> - -  -  - <xsl:template - match="docinfo/field"> -  - <xsl:apply-templates/> -  - &tEOL; - </xsl:template> - -  -  - <xsl:template - match="docinfo/*[name()!='authors' and name()!='field']"> - <xsl:call-template - name="u:outputFolding"> - <xsl:with-param - name="prefix"> - <xsl:text>:</xsl:text> - <xsl:value-of - select="name()"/> - <xsl:text>: </xsl:text> - </xsl:with-param> - </xsl:call-template> - </xsl:template> - -  - -  -  - <xsl:template - match="transition"> - <xsl:call-template - name="u:outputClass"/> - &tCR;  - <xsl:text>-----</xsl:text> - &tEOL; -  - <xsl:if - test="not(following-sibling::*[1]/@classes)"> - &tCR; - </xsl:if> - </xsl:template> - -  -  - -  -  - <xsl:template - match="//document/title"> - <xsl:call-template - name="u:outputClass"/> - <xsl:variable - name="textWS"> -  - <xsl:apply-templates/> - </xsl:variable> - <xsl:variable - name="text" - select="normalize-space($textWS)"/> - <xsl:variable - name="length" - select="string-length($text)"/> - <xsl:call-template - name="u:overline"> - <xsl:with-param - name="length" - select="$length"/> - <xsl:with-param - name="depth" - select="1"/> - </xsl:call-template> - <xsl:value-of - select="$text"/> - &tEOL; - <xsl:call-template - name="u:underline"> - <xsl:with-param - name="length" - select="$length"/> - <xsl:with-param - name="depth" - select="1"/> - </xsl:call-template> - </xsl:template> - -  - -  -  - <xsl:template - match="section/title"> - <xsl:call-template - name="u:outputClass"/> - <xsl:variable - name="textWS"> -  - <xsl:apply-templates/> - </xsl:variable> - <xsl:variable - name="text" - select="normalize-space($textWS)"/> - <xsl:variable - name="length" - select="string-length($text)"/> - <xsl:variable - name="depth" - select="count(ancestor::section)"/> - <xsl:call-template - name="u:overline"> - <xsl:with-param - name="length" - select="$length"/> - <xsl:with-param - name="depth" - select="$depth + 2"/> - </xsl:call-template> - <xsl:value-of - select="$text"/> - &tEOL; - <xsl:call-template - name="u:underline"> - <xsl:with-param - name="length" - select="$length"/> - <xsl:with-param - name="depth" - select="$depth + 2"/> - </xsl:call-template> -  - <xsl:if - test="not(contains(concat($structural_elements, $compound_body_elements), concat('*', name(following-sibling::*[1]), '*')) or following-sibling::*[1]/@classes)"> - &tCR; - </xsl:if> - </xsl:template> - -  - -  -  - <xsl:template - match="title"> - <xsl:call-template - name="u:outputClass"> - <xsl:with-param - name="alreadyBlanked" - select="true()"/> - </xsl:call-template> -  - <xsl:apply-templates/> -  - </xsl:template> - -  - -  -  - <xsl:template - match="//document/subtitle"> - <xsl:call-template - name="u:outputClass"/> - <xsl:variable - name="textWS"> -  - <xsl:apply-templates/> - </xsl:variable> - <xsl:variable - name="text" - select="normalize-space($textWS)"/> - <xsl:variable - name="length" - select="string-length($text)"/> - -  - &tCR; - <xsl:call-template - name="u:overline"> - <xsl:with-param - name="length" - select="$length"/> - <xsl:with-param - name="depth" - select="2"/> - </xsl:call-template> - <xsl:value-of - select="$text"/> - &tEOL; - <xsl:call-template - name="u:underline"> - <xsl:with-param - name="length" - select="$length"/> - <xsl:with-param - name="depth" - select="2"/> - </xsl:call-template> - </xsl:template> - -  - -  -  - <xsl:template - match="sidebar/subtitle"> - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:indent"/> - <xsl:apply-templates/> - &tEOL; - &tCR; - </xsl:template> - -  -  - -  -  - <xsl:template - match="comment"> - <xsl:call-template - name="u:BandI"/> - <xsl:call-template - name="u:outputFolding"> - <xsl:with-param - name="prefix"> - <xsl:text>.. </xsl:text> - </xsl:with-param> - </xsl:call-template> - </xsl:template> - -  - -  -  - <xsl:template - match="doctest_block"> - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:BandI"/> - <xsl:apply-templates/> - &tEOL; - </xsl:template> - -  - -  -  - <xsl:template - match="image"> - <xsl:choose> - <xsl:when - test="contains($inline_containers, concat('*', name(..), '*')) and @alt"> -  - <xsl:text>|</xsl:text> -  - <xsl:value-of - select="@alt"/> - <xsl:text>|</xsl:text> - </xsl:when> - <xsl:otherwise> -  - <xsl:if - test="not(parent::figure)"> - <xsl:if - test="not(parent::substitution_definition)"> - <xsl:call-template - name="u:BandI"/> - <xsl:text>.. </xsl:text> - </xsl:if> - <xsl:text>image:: </xsl:text> - </xsl:if> - <xsl:value-of - select="@uri"/> - &tEOL; - <xsl:choose> - <xsl:when - test="parent::figure"> -  - <xsl:if - test="../@classes"> - <xsl:call-template - name="u:param"> - <xsl:with-param - name="name" - select="'figclass'"/> - <xsl:with-param - name="value" - select="../@classes"/> - <xsl:with-param - name="ancestors" - select="ancestor::*"/> - </xsl:call-template> - </xsl:if> -  - <xsl:if - test="../@align"> - <xsl:call-template - name="u:param"> - <xsl:with-param - name="name" - select="'align'"/> - <xsl:with-param - name="value" - select="../@align"/> - <xsl:with-param - name="ancestors" - select="ancestor::*"/> - </xsl:call-template> - </xsl:if> - <xsl:call-template - name="u:params"> -  - <xsl:with-param - name="ancestors" - select="ancestor::*"/> - </xsl:call-template> - </xsl:when> - <xsl:when - test="parent::substitution_definition"> - <xsl:call-template - name="u:params"> -  - <xsl:with-param - name="params" - select="@*[name() != 'alt']"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template - name="u:params"> - <xsl:with-param - name="params" - select="@*[name() != 'ids' and name() != 'names']"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - <xsl:if - test="parent::reference"> -  - <xsl:call-template - name="u:param"> - <xsl:with-param - name="name" - select="'target'"/> - <xsl:with-param - name="value"> - <xsl:choose> - <xsl:when - test="../@name"> -  - <xsl:call-template - name="u:inlineReference"> - <xsl:with-param - name="text" - select="../@refid"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> -  - <xsl:value-of - select="../@refuri"/> - </xsl:otherwise> - </xsl:choose> - </xsl:with-param> - <xsl:with-param - name="ancestors" - select="ancestor-or-self::*"/> - </xsl:call-template> - </xsl:if> -  - &tCR; - </xsl:otherwise> - </xsl:choose> - </xsl:template> - -  - -  -  - <xsl:template - match="line_block"> - <xsl:call-template - name="u:outputClass"/> - <xsl:variable - name="isEmbedded" - select="name(..) = 'line_block'"/> - <xsl:if - test="not($isEmbedded)"> - <xsl:call-template - name="u:blank"/> - </xsl:if> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="line"> - <xsl:call-template - name="u:outputClass"/> - <xsl:variable - name="indent"> - <xsl:call-template - name="u:indent"/> - </xsl:variable> - <xsl:value-of - select="$indent"/> - <xsl:choose> - <xsl:when - test="node()"> -  - <xsl:variable - name="lineBlockIndent"> -  - <xsl:for-each - select="ancestor::line_block[position() > 1]"> - <xsl:value-of - select="str:padding(4)"/> - </xsl:for-each> - </xsl:variable> - <xsl:call-template - name="u:outputFolding"> - <xsl:with-param - name="prefix"> - <xsl:text>| </xsl:text> - <xsl:value-of - select="$lineBlockIndent"/> - </xsl:with-param> - <xsl:with-param - name="indent" - select="concat($indent, ' ', $lineBlockIndent)"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:text>|</xsl:text> - &tEOL; - </xsl:otherwise> - </xsl:choose> - </xsl:template> - -  - -  -  - <xsl:template - match="literal_block"> - <xsl:choose> - <xsl:when - test=".//*[contains($inline_elements, concat('*', name(), '*'))]"> -  - <xsl:call-template - name="u:BandI"/> - <xsl:text>.. parsed-literal::</xsl:text> - &tEOL; - <xsl:call-template - name="u:params"/> - &tCR; - </xsl:when> - <xsl:otherwise> - <xsl:call-template - name="u:outputClass"/> -  - <xsl:call-template - name="u:BandI"/> - <xsl:text>::</xsl:text> - &tEOL; - &tCR; - </xsl:otherwise> - </xsl:choose> - <xsl:variable - name="isQuotedLiteral"> - <xsl:call-template - name="u:isQuotedLiteral"/> - </xsl:variable> -  - <xsl:choose> - <xsl:when - test="string-length($isQuotedLiteral)"> - <xsl:call-template - name="u:indent"> - <xsl:with-param - name="ancestors" - select="ancestor::*"/> - </xsl:call-template> - <xsl:apply-templates - mode="quotedLiteral"/> - </xsl:when> - <xsl:otherwise> - <xsl:call-template - name="u:indent"> - <xsl:with-param - name="ancestors" - select="ancestor-or-self::*"/> - </xsl:call-template> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> - &tEOL; - </xsl:template> - -  - <xsl:template - match="text()" - mode="quotedLiteral"> - <xsl:call-template - name="u:indentLF"> - <xsl:with-param - name="indent"> - <xsl:call-template - name="u:indent"> - <xsl:with-param - name="ancestors" - select="ancestor::*[position() > 1]"/> - </xsl:call-template> - </xsl:with-param> - </xsl:call-template> - </xsl:template> - -  - <xsl:template - name="u:isQuotedLiteral"> - <xsl:param - name="text" - select="text()"/> - <xsl:param - name="quote" - select="substring($text, 1, 1)"/> - <xsl:if - test="contains($adornment_characters, $quote) and substring($text, 1, 1) = $quote"> -  - <xsl:choose> - <xsl:when - test="contains($text, '
')"> -  - <xsl:call-template - name="u:isQuotedLiteral"> - <xsl:with-param - name="text" - select="substring-after($text, '
')"/> - <xsl:with-param - name="quote" - select="$quote"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> -  - <xsl:value-of - select="$quote"/> - </xsl:otherwise> - </xsl:choose> - </xsl:if> - </xsl:template> - -  - -  -  - <xsl:template - match="paragraph"> - <xsl:variable - name="previous" - select="preceding-sibling::*[1]"/> -  - <xsl:variable - name="needsIndent" - select="($previous or not(parent::list_item or parent::field_body or contains($admonitions, concat('*', name(..), '*')))) and name($previous) != 'label'"/> -  - <xsl:variable - name="needsBlank" - select="($previous or not(parent::list_item or ../parent::option_list_item or parent::field_body or parent::document or contains($admonitions, concat('*', name(..), '*')))) and (not($previous) or contains($body_elements, concat('*', name($previous), '*')) or name($previous) = 'title' and contains($titled_elements, concat('*', name(..), '*')) or name($previous) = 'docinfo')"/> - <xsl:if - test="$needsBlank"> - &tCR; - </xsl:if> - <xsl:if - test="$needsIndent"> - <xsl:call-template - name="u:indent"/> - </xsl:if> - <xsl:if - test="@classes"> -  - <xsl:call-template - name="u:outputClass"> - <xsl:with-param - name="alreadyBlanked" - select="$needsBlank"/> - <xsl:with-param - name="alreadyIndented" - select="$needsIndent"/> - </xsl:call-template> - <xsl:call-template - name="u:BandI"/> - </xsl:if> - <xsl:call-template - name="u:outputFolding"/> - </xsl:template> - -  - -  - <xsl:template - match="pending"> - <xsl:call-template - name="u:notSupported"/> - </xsl:template> - -  - -  - <xsl:template - match="raw"> - <xsl:choose> - <xsl:when - test="contains($inline_containers, concat('*', name(..), '*'))"> -  -  -  - <xsl:text>:RAW-ROLE:`</xsl:text> - <xsl:apply-templates/> - <xsl:text>`</xsl:text> - </xsl:when> - <xsl:otherwise> -  - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:BandI"/> - <xsl:text>.. raw:: </xsl:text> - <xsl:value-of - select="@format"/> - &tEOL; - <xsl:call-template - name="u:params"> - <xsl:with-param - name="params" - select="@*[name() != 'format' and name() != 'classes']"/> - </xsl:call-template> - &tCR; - <xsl:call-template - name="u:indent"> - <xsl:with-param - name="ancestors" - select="ancestor-or-self::*"/> - </xsl:call-template> - <xsl:apply-templates/> - &tEOL; - </xsl:otherwise> - </xsl:choose> - </xsl:template> - -  - -  - <xsl:template - match="rubric"> - <xsl:call-template - name="u:BandI"/> - <xsl:call-template - name="u:outputFolding"> - <xsl:with-param - name="prefix"> - <xsl:text>.. rubric:: </xsl:text> - </xsl:with-param> - </xsl:call-template> - <xsl:call-template - name="u:params"/> - </xsl:template> - -  - -  - <xsl:template - match="compound"> - <xsl:call-template - name="u:BandI"/> - <xsl:text>.. compound::</xsl:text> - &tEOL; - <xsl:call-template - name="u:params"/> - <xsl:apply-templates/> - </xsl:template> - -  - -  - <xsl:template - match="container"> - <xsl:call-template - name="u:BandI"/> - <xsl:text>.. container::</xsl:text> - <xsl:if - test="@classes"> - &tSP; - <xsl:value-of - select="@classes"/> - </xsl:if> - &tEOL; - <xsl:apply-templates/> - </xsl:template> - -  - -  - <xsl:template - match="substitution_definition"> -  - <xsl:variable - name="isReplace" - select="not(* and count(node()) = 1 and contains($directives, concat('*', name(*[1]), '*')))"/> - <xsl:call-template - name="u:BandI"/> - <xsl:variable - name="prefix"> - <xsl:text>.. |</xsl:text> - <xsl:call-template - name="u:outputNames"/> - <xsl:text>| </xsl:text> - </xsl:variable> - <xsl:choose> - <xsl:when - test="$isReplace"> -  - <xsl:call-template - name="u:outputFolding"> - <xsl:with-param - name="prefix"> - <xsl:value-of - select="$prefix"/> - <xsl:text>replace:: </xsl:text> - </xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="$prefix"/> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - -  - -  -  - <xsl:template - match="block_quote"> - <xsl:if - test="@classes = 'epigraph' or @classes = 'highlights' or @classes = 'pull-quote'"> - <xsl:call-template - name="u:BandI"/> - <xsl:text>.. </xsl:text> - <xsl:value-of - select="@classes"/> - <xsl:text>::</xsl:text> - &tEOL; - <xsl:call-template - name="u:params"/> - </xsl:if> - <xsl:apply-templates/> - </xsl:template> - -  - -  - <xsl:template - match="attribution"> - <xsl:call-template - name="u:outputClass"/> -  - &tCR; - <xsl:call-template - name="u:indent"/> - <xsl:call-template - name="u:outputFolding"> - <xsl:with-param - name="prefix"> - <xsl:text>-- </xsl:text> - </xsl:with-param> - </xsl:call-template> - </xsl:template> - -  - -  - <xsl:template - match="citation"> - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:BandI"/> - <xsl:text>.. [</xsl:text> - <xsl:value-of - select="label"/> - <xsl:text>] </xsl:text> - <xsl:apply-templates - select="*[not(self::label)]"/> - </xsl:template> - -  - <xsl:template - match="citation/label"> - <xsl:apply-templates/> - </xsl:template> - -  - -  - <xsl:template - match="figure"> - <xsl:call-template - name="u:BandI"/> - <xsl:text>.. figure:: </xsl:text> - <xsl:apply-templates/> - </xsl:template> - -  - -  - <xsl:template - match="caption"> - <xsl:call-template - name="u:indent"/> - <xsl:call-template - name="u:outputFolding"/> - </xsl:template> - -  - -  - <xsl:template - match="legend"> - <xsl:apply-templates/> - </xsl:template> - -  - -  - -  -  - <xsl:template - match="footnote[not(@auto)]"> - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:BandI"/> - <xsl:text>.. [</xsl:text> - <xsl:apply-templates - select="label"/> - <xsl:text>] </xsl:text> - <xsl:apply-templates - select="*[not(self::label)]"/> - </xsl:template> - -  -  -  - <xsl:template - match="footnote[@auto='1']"> - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:BandI"/> - <xsl:text>.. [#</xsl:text> - <xsl:if - test="@names = @ids"> - <xsl:call-template - name="u:outputNames"/> - </xsl:if> - <xsl:text>] </xsl:text> - <xsl:apply-templates - select="*[not(self::label)]"/> - </xsl:template> - -  -  - <xsl:template - match="footnote[@auto='*']"> - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:BandI"/> - <xsl:text>.. [*] </xsl:text> - <xsl:apply-templates - select="*[not(self::label)]"/> - </xsl:template> - -  - <xsl:template - match="footnote[starts-with(@names, 'TARGET_NOTE:\ ')]"> -  - <xsl:if - test="generate-id(//footnote[starts-with(@names, 'TARGET_NOTE:\ ')][1]) = generate-id(.)"> -  - <xsl:call-template - name="u:BandI"/> -  - <xsl:text>.. target-notes::</xsl:text> - &tEOL; - </xsl:if> - </xsl:template> - -  - <xsl:template - match="footnote/label"> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="bullet_list"> - <xsl:call-template - name="u:outputClass"/> - <xsl:apply-templates - mode="bullet_list"/> - </xsl:template> - -  - -  -  - <xsl:template - match="definition_list"> - <xsl:call-template - name="u:outputClass"/> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="definition_list_item"> - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:BandI"/> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="term"> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="classifier"> - <xsl:text> : </xsl:text> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="definition"> - <xsl:call-template - name="u:outputClass"/> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="enumerated_list"> - <xsl:call-template - name="u:outputClass"/> - <xsl:apply-templates - mode="enumerated_list"/> - </xsl:template> - -  - -  -  - <xsl:template - match="field_list"> - <xsl:call-template - name="u:outputClass"/> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="field"> - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:BandI"/> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="field_name"> - <xsl:text>:</xsl:text> - <xsl:apply-templates/> - <xsl:text>: </xsl:text> -  - </xsl:template> - -  - -  -  - <xsl:template - match="field_body"> - <xsl:call-template - name="u:outputClass"/> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="option_list"> - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:blank"/> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="option_list_item"> - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:indent"/> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="option_group"> - <xsl:apply-templates/> - &tEOL; - </xsl:template> - -  - -  -  - <xsl:template - match="option"> - <xsl:call-template - name="u:outputClass"/> - <xsl:apply-templates/> - <xsl:if - test="generate-id(current()) != generate-id(../*[last()])"> -  - <xsl:text>, </xsl:text> - </xsl:if> -  - </xsl:template> - -  - -  -  - <xsl:template - match="option_string"> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="option_argument"> - <xsl:value-of - select="@delimiter"/> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="description"> - <xsl:call-template - name="u:outputClass"/> - <xsl:apply-templates/> - &tEOL; - </xsl:template> - -  - -  -  - <xsl:template - match="list_item" - mode="bullet_list"> - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:BandI"/> - <xsl:value-of - select="../@bullet"/> - &tSP;  - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="list_item" - mode="enumerated_list"> - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:BandI"/> - <xsl:call-template - name="u:outputEnumerator"/> - <xsl:apply-templates/> - </xsl:template> - -  - <xsl:template - name="u:outputEnumerator"> -  - <xsl:variable - name="enumType" - select="../@enumtype"/> -  - <xsl:variable - name="start"> - <xsl:choose> - <xsl:when - test="../@start"> - <xsl:value-of - select="../@start"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="1"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> -  - <xsl:variable - name="position"> - <xsl:variable - name="wanted" - select="generate-id()"/> -  - <xsl:for-each - select="../list_item"> - <xsl:if - test="generate-id() = $wanted"> - <xsl:value-of - select="position()"/> - </xsl:if> - </xsl:for-each> - </xsl:variable> -  - <xsl:variable - name="cur"> - <xsl:call-template - name="u:position2Enumerator"> - <xsl:with-param - name="enumType" - select="$enumType"/> - <xsl:with-param - name="position" - select="$position"/> - <xsl:with-param - name="start" - select="$start"/> - </xsl:call-template> - </xsl:variable> -  - <xsl:variable - name="max"> - <xsl:call-template - name="u:position2Enumerator"> - <xsl:with-param - name="enumType" - select="$enumType"/> - <xsl:with-param - name="position" - select="count(../list_item)"/> - <xsl:with-param - name="start" - select="$start"/> - </xsl:call-template> - </xsl:variable> -  - <xsl:value-of - select="../@prefix"/> - <xsl:value-of - select="$cur"/> - <xsl:value-of - select="../@suffix"/> -  - &tSP; -  - <xsl:if - test="$enumType != 'lowerroman' and $enumType != 'upperroman'"> -  - <xsl:value-of - select="str:padding(string-length($max) - string-length($cur))"/> - </xsl:if> - </xsl:template> - -  - <xsl:template - name="u:position2Enumerator"> - <xsl:param - name="enumType"/> - <xsl:param - name="start"/> - <xsl:param - name="position"/> -  - <xsl:variable - name="ordinal" - select="$start - 1 + $position"/> - <xsl:choose> - <xsl:when - test="$enumType = 'arabic'"> - <xsl:value-of - select="$ordinal"/> - </xsl:when> - <xsl:when - test="$enumType = 'loweralpha'"> - <xsl:value-of - select="substring('abcdefghijklmnopqrstzuvwxyz', $ordinal, 1)"/> - </xsl:when> - <xsl:when - test="$enumType = 'upperalpha'"> - <xsl:value-of - select="substring('ABCDEFGHIJKLMNOPQRSTZUVWXYZ', $ordinal, 1)"/> - </xsl:when> -  - <xsl:when - test="$enumType = 'lowerroman'"> - <xsl:text>i</xsl:text> - </xsl:when> - <xsl:when - test="$enumType = 'upperroman'"> - <xsl:text>I</xsl:text> - </xsl:when> - </xsl:choose> - </xsl:template> - -  -  - -  -  - <xsl:template - match="table"> - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:blank"/> - <xsl:apply-templates - select="tgroup"/> - <xsl:if - test="title"> -  - <xsl:call-template - name="u:BandI"/> - <xsl:apply-templates - select="title"/> - &tEOL; - </xsl:if> - </xsl:template> - -  - -  -  - <xsl:template - match="tgroup"> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  -  - <xsl:template - match="colspec"/> - -  - -  -  - <xsl:template - match="thead"> - <xsl:apply-templates/> - </xsl:template> - -  -  - <xsl:template - match="tbody"> - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="row"> -  - <xsl:if - test="position() > 1 or parent::thead or parent::tbody and not(../../thead)"> - <xsl:call-template - name="u:rowSeparatorLine"/> - </xsl:if> -  - <xsl:variable - name="heights"> - <xsl:for-each - select="entry"> - <xsl:variable - name="text"> -  - <xsl:apply-templates/> - </xsl:variable> -  - <xsl:value-of - select="string-length($text) - string-length(translate($text, '
', '')) - 1"/> - &tSP;  - </xsl:for-each> - </xsl:variable> -  - <xsl:variable - name="maxHeight" - select="math:max(str:tokenize(normalize-space($heights)))"/> -  - <xsl:call-template - name="u:rowLines"> - <xsl:with-param - name="currentLine" - select="1"/> - <xsl:with-param - name="maxLine" - select="$maxHeight"/> - </xsl:call-template> -  - <xsl:if - test="position() = last()"> - <xsl:call-template - name="u:rowSeparatorLine"> - <xsl:with-param - name="char"> -  - <xsl:choose> - <xsl:when - test="parent::thead"> - <xsl:value-of - select="'='"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="'-'"/> - </xsl:otherwise> - </xsl:choose> - </xsl:with-param> - </xsl:call-template> - </xsl:if> - </xsl:template> - -  - <xsl:template - name="u:rowLines"> - <xsl:param - name="currentLine"/> - <xsl:param - name="maxLine"/> - <xsl:if - test="$currentLine <= $maxLine"> -  - <xsl:call-template - name="u:indent"/> -  - <xsl:text>|</xsl:text> - <xsl:apply-templates> - <xsl:with-param - name="currentLine" - select="$currentLine"/> - </xsl:apply-templates> -  - &tEOL; -  - <xsl:call-template - name="u:rowLines"> - <xsl:with-param - name="currentLine" - select="$currentLine + 1"/> - <xsl:with-param - name="maxLine" - select="$maxLine"/> - </xsl:call-template> - </xsl:if> - </xsl:template> - -  - <xsl:template - name="u:rowSeparatorLine"> - <xsl:param - name="char" - select="'-'"/> - <xsl:call-template - name="u:indent"/> - <xsl:text>+</xsl:text> - <xsl:for-each - select="../../colspec"> - <xsl:value-of - select="str:padding(@colwidth, $char)"/> - <xsl:text>+</xsl:text> - </xsl:for-each> - &tEOL; - </xsl:template> - -  - -  -  - <xsl:template - match="entry"> -  -  - <xsl:param - name="currentLine" - select="0"/> - <xsl:variable - name="column" - select="position() + sum(preceding-sibling::entry/@morecols)"/> -  - <xsl:variable - name="width"> - <xsl:call-template - name="u:computeEntryWidth"> - <xsl:with-param - name="colspecs" - select="../../../colspec"/> - <xsl:with-param - name="column" - select="$column"/> - <xsl:with-param - name="span" - select="@morecols"/> - </xsl:call-template> - </xsl:variable> -  - <xsl:call-template - name="u:outputEntry"> - <xsl:with-param - name="string"> -  - <xsl:apply-templates/> - </xsl:with-param> - <xsl:with-param - name="width" - select="$width"/> - <xsl:with-param - name="expectedIndent"> -  - <xsl:call-template - name="u:indent"/> - </xsl:with-param> - <xsl:with-param - name="outputLine" - select="$currentLine"/> - </xsl:call-template> -  - <xsl:text>|</xsl:text> - </xsl:template> - -  - <xsl:template - name="u:computeEntryWidth"> -  - <xsl:param - name="colspecs"/> -  - <xsl:param - name="column"/> -  - <xsl:param - name="span" - select="0"/> - <xsl:param - name="sum" - select="0"/> - <xsl:choose> - <xsl:when - test="$span"> -  - <xsl:call-template - name="u:computeEntryWidth"> - <xsl:with-param - name="colspecs" - select="$colspecs"/> - <xsl:with-param - name="column" - select="$column + 1"/> - <xsl:with-param - name="span" - select="$span - 1"/> -  - <xsl:with-param - name="sum" - select="$sum + 1 + $colspecs[$column]/@colwidth"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> -  - <xsl:value-of - select="$sum + $colspecs[$column]/@colwidth"/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - -  - <xsl:template - name="u:outputEntry"> -  - <xsl:param - name="width"/> -  - <xsl:param - name="string" - select="''"/> -  - <xsl:param - name="expectedIndent" - select="''"/> -  - <xsl:param - name="isFirst" - select="true()"/> -  - <xsl:param - name="outputLine" - select="0"/> -  - <xsl:variable - name="doOutput" - select="$outputLine = 0 or $outputLine = 1"/> - <xsl:variable - name="stringLFHalfTrimmed"> - <xsl:choose> - <xsl:when - test="$isFirst and substring($string, 1, 1) = '
'"> -  - <xsl:value-of - select="substring($string, 2)"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="$string"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:variable - name="stringLFTrimmed"> - <xsl:choose> - <xsl:when - test="$isFirst and substring($stringLFHalfTrimmed, string-length($stringLFHalfTrimmed), 1) = '
'"> -  - <xsl:value-of - select="substring($stringLFHalfTrimmed, 1, string-length($stringLFHalfTrimmed) - 1)"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="$stringLFHalfTrimmed"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> -  - <xsl:variable - name="remainingLines"> - <xsl:if - test="contains($stringLFTrimmed, '
')"> - <xsl:value-of - select="substring-after($stringLFTrimmed, '
')"/> - </xsl:if> - </xsl:variable> - <xsl:if - test="$doOutput"> -  - <xsl:variable - name="firstLine"> - <xsl:choose> - <xsl:when - test="string-length($remainingLines)"> - <xsl:value-of - select="substring-before($stringLFTrimmed, '
')"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="$stringLFTrimmed"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> -  - <xsl:variable - name="trimmed"> - <xsl:if - test="string-length($firstLine)"> -  - <xsl:value-of - select="substring-after($firstLine, $expectedIndent)"/> - </xsl:if> - </xsl:variable> -  - <xsl:variable - name="padded" - select="concat(' ', $trimmed, ' ')"/> -  - <xsl:value-of - select="$padded"/> -  - <xsl:if - test="$width - string-length($padded) < 0"> - <xsl:message> - <xsl:text>WARNING: Table column too narrow (minimum: </xsl:text> - <xsl:value-of - select="string-length($padded)"/> - <xsl:text>)</xsl:text> - &tEOL; - </xsl:message> - </xsl:if> - <xsl:value-of - select="str:padding($width - string-length($padded))"/> - </xsl:if> - <xsl:if - test="$outputLine > 1 or $outputLine = 0 and string-length($remainingLines)"> -  - <xsl:if - test="$outputLine = 0"> -  - &tEOL; - </xsl:if> -  - <xsl:call-template - name="u:outputEntry"> - <xsl:with-param - name="width" - select="$width"/> - <xsl:with-param - name="string" - select="$remainingLines"/> - <xsl:with-param - name="expectedIndent" - select="$expectedIndent"/> - <xsl:with-param - name="isFirst" - select="false()"/> - <xsl:with-param - name="outputLine"> - <xsl:choose> - <xsl:when - test="$outputLine = 0"> - <xsl:value-of - select="0"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="$outputLine - 1"/> - </xsl:otherwise> - </xsl:choose> - </xsl:with-param> - </xsl:call-template> - </xsl:if> - </xsl:template> - -  -  - -  - <xsl:template - match="citation_reference"> - <xsl:call-template - name="u:bkslshEscPre"/> - <xsl:text>[</xsl:text> - <xsl:apply-templates/> - <xsl:text>]_</xsl:text> - <xsl:call-template - name="u:bkslshEscSuf"/> - </xsl:template> - -  - -  - <xsl:template - match="emphasis"> - <xsl:call-template - name="u:bkslshEscPre"/> - <xsl:text>*</xsl:text> - <xsl:apply-templates/> - <xsl:text>*</xsl:text> - <xsl:call-template - name="u:bkslshEscSuf"/> - </xsl:template> - -  - -  -  - <xsl:template - match="footnote_reference[not(@auto)]"> - <xsl:call-template - name="u:bkslshEscPre"/> - <xsl:text>[</xsl:text> - <xsl:value-of - select="text()"/> - <xsl:text>]_</xsl:text> - <xsl:call-template - name="u:bkslshEscSuf"/> -  - </xsl:template> - -  -  -  - <xsl:template - match="footnote_reference[@auto='1']"> - <xsl:variable - name="ref" - select="@refid"/> - <xsl:if - test="not(starts-with(//footnote[@ids=$ref]/@names, 'TARGET_NOTE:\ '))"> -  - <xsl:call-template - name="u:bkslshEscPre"/> - <xsl:text>[#</xsl:text> - <xsl:if - test="//footnote[@ids=$ref]/@names != //footnote[@ids=$ref]/label"> - <xsl:call-template - name="u:outputNames"> - <xsl:with-param - name="names" - select="//footnote[@ids=$ref]/@names"/> - </xsl:call-template> - </xsl:if> - <xsl:text>]_</xsl:text> - <xsl:call-template - name="u:bkslshEscSuf"/> - </xsl:if> - </xsl:template> - -  -  - <xsl:template - match="footnote_reference[@auto='*']"> - <xsl:call-template - name="u:bkslshEscPre"/> - <xsl:text>[*]_</xsl:text> - <xsl:call-template - name="u:bkslshEscSuf"/> - </xsl:template> - -  - -  -  - <xsl:template - match="literal"> - <xsl:call-template - name="u:bkslshEscPre"/> - <xsl:text>``</xsl:text> - <xsl:apply-templates/> - <xsl:text>``</xsl:text> - <xsl:call-template - name="u:bkslshEscSuf"/> - </xsl:template> - -  - -  - -  -  - <xsl:template - match="reference[not(@name or @anonymous)]"> - <xsl:call-template - name="u:bkslshEscPre"/> - <xsl:choose> - <xsl:when - test="starts-with(., 'PEP ')"> - <xsl:text>:PEP:`</xsl:text> - <xsl:value-of - select="substring-after(., 'PEP ')"/> - <xsl:text>`</xsl:text> - </xsl:when> - <xsl:when - test="starts-with(., 'RFC ')"> - <xsl:text>:RFC:`</xsl:text> - <xsl:value-of - select="substring-after(., 'RFC ')"/> - <xsl:text>`</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> - <xsl:call-template - name="u:bkslshEscSuf"/> - </xsl:template> - -  -  - <xsl:template - match="reference[@name and @refuri]"> -  - <xsl:variable - name="normalized" - select="translate(normalize-space(@name), 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')"/> - <xsl:variable - name="quoted" - select="str:replace($normalized, ' ', '\ ')"/> - <xsl:variable - name="matching" - select="//target[contains(@names, $quoted)]"/> - <xsl:call-template - name="u:inlineReference"> - <xsl:with-param - name="anonymous" - select="not($matching) or @anonymous"/> - <xsl:with-param - name="embedded" - select="not(@anonymous) and (not($matching) or generate-id(following-sibling::node()[1]) = generate-id($matching))"/> - </xsl:call-template> - </xsl:template> - -  -  - <xsl:template - match="reference[@name and @refid]"> - <xsl:call-template - name="u:inlineReference"> - <xsl:with-param - name="anonymous" - select="@anonymous"/> - </xsl:call-template> - </xsl:template> - -  -  - <xsl:template - match="reference[image]"> -  - <xsl:apply-templates/> - </xsl:template> - -  - -  -  - <xsl:template - match="strong"> - <xsl:call-template - name="u:bkslshEscPre"/> - <xsl:text>**</xsl:text> - <xsl:apply-templates/> - <xsl:text>**</xsl:text> - <xsl:call-template - name="u:bkslshEscSuf"/> - </xsl:template> - -  - -  - <xsl:template - match="subscript"> - <xsl:call-template - name="u:bkslshEscPre"/> - <xsl:text>:sub:`</xsl:text> - <xsl:apply-templates/> - <xsl:text>`</xsl:text> - <xsl:call-template - name="u:bkslshEscSuf"/> - </xsl:template> - -  - -  - <xsl:template - match="superscript"> - <xsl:call-template - name="u:bkslshEscPre"/> - <xsl:text>:sup:`</xsl:text> - <xsl:apply-templates/> - <xsl:text>`</xsl:text> - <xsl:call-template - name="u:bkslshEscSuf"/> - </xsl:template> - -  - -  -  - <xsl:template - match="target"> - <xsl:choose> - <xsl:when - test="name(preceding-sibling::*[1]) = 'reference'"> -  - </xsl:when> - <xsl:when - test="contains($inline_containers, concat('*', name(..), '*'))"> -  - <xsl:call-template - name="u:inlineReference"> - <xsl:with-param - name="isTarget" - select="true()"/> - </xsl:call-template> - </xsl:when> - <xsl:when - test="@anonymous"> -  - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:BandI"/> - <xsl:text>__ </xsl:text> - <xsl:choose> - <xsl:when - test="@refid"> - <xsl:call-template - name="u:outputNamesRefid"/> - <xsl:text>_</xsl:text> - </xsl:when> - <xsl:when - test="@refuri"> - <xsl:value-of - select="@refuri"/> - </xsl:when> - </xsl:choose> - &tEOL; - </xsl:when> - <xsl:when - test="@names | @refid"> -  - <xsl:call-template - name="u:outputClass"/> - <xsl:call-template - name="u:BandI"/> - <xsl:text>.. _</xsl:text> - <xsl:choose> - <xsl:when - test="@refid"> - <xsl:call-template - name="u:outputNamesRefid"/> - </xsl:when> - <xsl:otherwise> - <xsl:variable - name="quoteNeeded" - select="contains(@names, ':')"/> - <xsl:if - test="$quoteNeeded"> - <xsl:text>`</xsl:text> - </xsl:if> - <xsl:call-template - name="u:outputNames"/> - <xsl:if - test="$quoteNeeded"> - <xsl:text>`</xsl:text> - </xsl:if> - </xsl:otherwise> - </xsl:choose> - <xsl:text>:</xsl:text> - <xsl:if - test="@refuri"> - <xsl:text> </xsl:text> - <xsl:value-of - select="@refuri"/> - </xsl:if> - &tEOL; - </xsl:when> - <xsl:otherwise> -  - <xsl:call-template - name="u:notSupported"/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - -  - -  -  - <xsl:template - match="title_reference"> - <xsl:call-template - name="u:bkslshEscPre"/> - <xsl:text>`</xsl:text> - <xsl:apply-templates/> - <xsl:text>`</xsl:text> - <xsl:call-template - name="u:bkslshEscSuf"/> - </xsl:template> - -  - -  -  - <xsl:template - match="inline"> -  - <xsl:call-template - name="u:bkslshEscPre"/> - <xsl:text>:</xsl:text> - <xsl:value-of - select="@classes"/> - <xsl:text>:`</xsl:text> - <xsl:apply-templates/> - <xsl:text>`</xsl:text> - <xsl:call-template - name="u:bkslshEscSuf"/> - </xsl:template> - -  - -  - -  - -  -  - <xsl:template - match="generated"/> - -  - <xsl:template - match="problematic"> -  - <xsl:value-of - select="text()"/> - </xsl:template> - -  - <xsl:template - match="system_message"/> - -  -  - -  - <xsl:template - match="text()"> - <xsl:call-template - name="u:indentLF"/> - </xsl:template> - -  -  - -  - <xsl:template - name="u:BandI"> - <xsl:call-template - name="u:blank"/> - <xsl:call-template - name="u:indent"/> - </xsl:template> - -  - -  - <xsl:template - name="u:blank"> - <xsl:apply-templates - mode="blankSkipInline" - select="preceding::*[1]"/> - </xsl:template> - -  - <xsl:template - mode="blankSkipInline" - match="*"> - <xsl:choose> -  - <xsl:when - test="contains(concat($inline_elements, $simple_body_subelements, $compound_body_subelements), concat('*', name(.), '*'))"> - <xsl:apply-templates - mode="blankSkipInline" - select=".."/> - </xsl:when> - <xsl:otherwise> -  - <xsl:if - test="contains($blank_after, concat('*', name(.), '*'))"> - &tCR; - </xsl:if> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - -  - -  - <data:lookup> - <node - name="address" - indent="10"/> - <node - name="author" - indent="9"/> - <node - name="authors" - indent="10"/> - <node - name="contact" - indent="10"/> - <node - name="copyright" - indent="12"/> - <node - name="date" - indent="7"/> - <node - name="organization" - indent="15"/> - <node - name="revision" - indent="11"/> - <node - name="status" - indent="9"/> - <node - name="version" - indent="10"/> -  - <node - name="list_item" - indent="2"/> - <node - name="definition_list_item" - indent="4"/> - <node - name="field_body" - indent="4"/> - <node - name="option_list_item" - indent="4"/> -  - <node - name="block_quote" - indent="4"/> - <node - name="literal_block" - indent="4"/> - <node - name="attribution" - indent="3"/> - <node - name="line" - indent="2"/> - </data:lookup> - -  - <xsl:template - name="u:indent"> -  - <xsl:param - name="ancestors" - select="ancestor::*"/> - <xsl:for-each - select="$ancestors"> - <xsl:variable - name="this" - select="name()"/> - <xsl:choose> - <xsl:when - test="contains($directives, concat('*', $this, '*'))"> -  - <xsl:value-of - select="str:padding(3)"/> - </xsl:when> - <xsl:when - test="$this = 'list_item' and parent::enumerated_list"> -  - <xsl:variable - name="enumerator"> - <xsl:call-template - name="u:outputEnumerator"/> - </xsl:variable> - <xsl:value-of - select="str:padding(string-length($enumerator))"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="str:padding(document('')//data:lookup/node[@name=$this]/@indent)"/> - </xsl:otherwise> - </xsl:choose> - </xsl:for-each> - </xsl:template> - -  - -  - <xsl:template - name="u:indentLF"> - <xsl:param - name="string" - select="."/> -  - <xsl:param - name="indent"> -  - <xsl:call-template - name="u:indent"/> - </xsl:param> - <xsl:choose> - <xsl:when - test="contains($string,'
')"> -  - <xsl:value-of - select="substring-before($string, '
')"/> - &tEOL; -  - <xsl:value-of - select="$indent"/> -  - <xsl:call-template - name="u:indentLF"> - <xsl:with-param - name="string" - select="substring-after($string, '
')"/> - <xsl:with-param - name="indent" - select="$indent"/> - </xsl:call-template> - </xsl:when> -  - <xsl:otherwise> - <xsl:value-of - select="$string"/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - -  - -  - <xsl:template - name="u:outputFolding"> -  - <xsl:param - name="prefix" - select="''"/> -  - <xsl:param - name="indent"> - <xsl:call-template - name="u:indent"> - <xsl:with-param - name="ancestors" - select="ancestor-or-self::*"/> - </xsl:call-template> - </xsl:param> - <xsl:variable - name="string"> -  - <xsl:apply-templates/> - </xsl:variable> -  - <xsl:value-of - select="$prefix"/> - <xsl:choose> - <xsl:when - test="$fold > 0"> - <xsl:variable - name="normalized" - select="normalize-space($string)"/> - <xsl:choose> - <xsl:when - test="$string = ''"> -  - </xsl:when> - <xsl:when - test="$normalized = ''"> -  - &tSP; - </xsl:when> - <xsl:otherwise> -  - <xsl:if - test="normalize-space(substring($string, 1, 1)) = ''"> - &tSP; - </xsl:if> - <xsl:call-template - name="u:indentFold"> - <xsl:with-param - name="string" - select="$normalized"/> - <xsl:with-param - name="indent" - select="$indent"/> - <xsl:with-param - name="cursorColumn" - select="string-length($indent) + string-length($prefix)"/> - </xsl:call-template> -  - <xsl:if - test="normalize-space(substring($string, string-length($string), 1)) = ''"> - &tSP; - </xsl:if> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="$string"/> - </xsl:otherwise> - </xsl:choose> - &tEOL; - </xsl:template> - -  - -  - <xsl:template - name="u:indentFold"> -  - <xsl:param - name="string"/> -  - <xsl:param - name="indent"/> -  -  - <xsl:param - name="cursorColumn" - select="string-length($indent)"/> -  - <xsl:param - name="isNewLine" - select="true()"/> - <xsl:variable - name="firstWord"> - <xsl:choose> -  - <xsl:when - test="contains($string, ' ')"> - <xsl:value-of - select="substring-before($string, ' ')"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="$string"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:variable - name="rest" - select="substring-after($string, ' ')"/> - <xsl:choose> - <xsl:when - test="$string = ''"/> - <xsl:when - test="$isNewLine"> -  - <xsl:value-of - select="$firstWord"/> - <xsl:call-template - name="u:indentFold"> - <xsl:with-param - name="string" - select="$rest"/> - <xsl:with-param - name="indent" - select="$indent"/> - <xsl:with-param - name="cursorColumn" - select="$cursorColumn + string-length($firstWord)"/> - <xsl:with-param - name="isNewLine" - select="false()"/> - </xsl:call-template> - </xsl:when> - <xsl:when - test="$cursorColumn + 1 + string-length($firstWord) > $fold"> -  - &tEOL; - <xsl:value-of - select="$indent"/> - <xsl:call-template - name="u:indentFold"> - <xsl:with-param - name="string" - select="$string"/> - <xsl:with-param - name="indent" - select="$indent"/> - <xsl:with-param - name="cursorColumn" - select="string-length($indent)"/> - <xsl:with-param - name="isNewLine" - select="true()"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> -  - &tSP; - <xsl:value-of - select="$firstWord"/> - <xsl:call-template - name="u:indentFold"> - <xsl:with-param - name="string" - select="$rest"/> - <xsl:with-param - name="indent" - select="$indent"/> - <xsl:with-param - name="cursorColumn" - select="$cursorColumn + 1 + string-length($firstWord)"/> - <xsl:with-param - name="isNewLine" - select="false()"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - -  - -  - <xsl:template - name="u:params"> - <xsl:param - name="params" - select="@*"/> -  - <xsl:param - name="ancestors" - select="ancestor-or-self::*"/> - <xsl:for-each - select="$params"> -  - <xsl:if - test="name() != 'uri' and name() != 'xml:space'"> - <xsl:call-template - name="u:param"> - <xsl:with-param - name="ancestors" - select="$ancestors"/> - </xsl:call-template> - </xsl:if> - </xsl:for-each> - </xsl:template> - -  - <xsl:template - name="u:param"> - <xsl:param - name="name" - select="name()"/> - <xsl:param - name="value" - select="."/> -  - <xsl:param - name="ancestors" - select="ancestor::*"/> - <xsl:call-template - name="u:indent"> - <xsl:with-param - name="ancestors" - select="$ancestors"/> - </xsl:call-template> - <xsl:text>:</xsl:text> - <xsl:choose> - <xsl:when - test="$name = 'classes'"> - <xsl:text>class</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="$name"/> - </xsl:otherwise> - </xsl:choose> - <xsl:text>:</xsl:text> - <xsl:if - test="$value"> - <xsl:text> </xsl:text> - <xsl:value-of - select="$value"/> - </xsl:if> - &tEOL; - </xsl:template> - -  - -  - <xsl:template - name="u:bkslshEscPre"> -  - <xsl:variable - name="before" - select="preceding-sibling::node()[1]"/> - <xsl:choose> -  - <xsl:when - test="not($before)"/> -  - <xsl:when - test="name($before)"> -  - <xsl:text>\ </xsl:text> - </xsl:when> -  - <xsl:when - test="not(contains(concat($apos, ' 
	"([{<-/:'), substring($before, string-length($before), 1)))"> -  - <xsl:text>\ </xsl:text> - </xsl:when> - </xsl:choose> - </xsl:template> - -  - <xsl:template - name="u:bkslshEscSuf"> -  - <xsl:variable - name="after" - select="following-sibling::node()[1]"/> - <xsl:choose> -  - <xsl:when - test="not($after)"/> -  - <xsl:when - test="name($after)"/> -  - <xsl:when - test="not(contains(concat($apos, ' 
	")]}>-/:.,;!?\'), substring($after, 1, 1)))"> -  - <xsl:text>\</xsl:text> - </xsl:when> - </xsl:choose> - </xsl:template> - -  - - <xsl:template - name="u:notSupported"> - <xsl:call-template - name="u:BandI"/> - <xsl:text>######## NOT SUPPORTED: `</xsl:text> - <xsl:value-of - select="name(.)"/> - <xsl:text>' ########</xsl:text> - &tEOL; - </xsl:template> - -  - - <xsl:template - name="u:overline"> -  - <xsl:param - name="length"/> -  - <xsl:param - name="depth"/> -  - <xsl:if - test="substring($adornment, 2 * ($depth - 1) + 1, 1) = 'o'"> - <xsl:value-of - select="str:padding($length, substring($adornment, 2 * ($depth - 1) + 2, 1))"/> - &tEOL; - </xsl:if> - </xsl:template> - - <xsl:template - name="u:underline"> -  - <xsl:param - name="length"/> -  - <xsl:param - name="depth"/> - <xsl:value-of - select="str:padding($length, substring($adornment, 2 * ($depth - 1) + 2, 1))"/> - &tEOL; - </xsl:template> - -  - -  - <xsl:template - name="u:inlineReference"> - <xsl:param - name="anonymous" - select="false()"/> - <xsl:param - name="embedded" - select="false()"/> -  - <xsl:param - name="isTarget" - select="false()"/> - <xsl:param - name="text" - select="node()"/> - <xsl:call-template - name="u:bkslshEscPre"/> -  - <xsl:variable - name="delimiter"> - <xsl:if - test="* or translate($text, '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz', '') or $embedded"> - <xsl:text>`</xsl:text> - </xsl:if> - </xsl:variable> - <xsl:if - test="$isTarget"> - <xsl:text>_</xsl:text> - </xsl:if> - <xsl:value-of - select="$delimiter"/> - <xsl:apply-templates - select="$text"/> - <xsl:if - test="$embedded"> - <xsl:text> <</xsl:text> - <xsl:value-of - select="@refuri"/> - <xsl:text>></xsl:text> - </xsl:if> - <xsl:value-of - select="$delimiter"/> - <xsl:if - test="not($isTarget)"> - <xsl:text>_</xsl:text> - <xsl:if - test="$anonymous"> - <xsl:text>_</xsl:text> - </xsl:if> - </xsl:if> - <xsl:call-template - name="u:bkslshEscSuf"/> - </xsl:template> - -  - -  -  - <xsl:template - name="u:outputClass"> -  - <xsl:param - name="alreadyBlanked" - select="false()"/> -  - <xsl:param - name="alreadyIndented" - select="false()"/> -  - <xsl:param - name="blankAfter" - select="false()"/> - <xsl:if - test="@classes"> - <xsl:if - test="not($alreadyBlanked)"> - <xsl:call-template - name="u:blank"/> - </xsl:if> - <xsl:if - test="not($alreadyIndented)"> - <xsl:call-template - name="u:indent"/> - </xsl:if> - <xsl:text>.. class:: </xsl:text> - <xsl:value-of - select="@classes"/> - &tEOL; - <xsl:if - test="$blankAfter"> - &tCR; - </xsl:if> - </xsl:if> - </xsl:template> - -  - -  - <xsl:template - name="u:outputNames"> -  - <xsl:param - name="names" - select="@names"/> - <xsl:param - name="index" - select="0"/> - <xsl:value-of - select="str:replace(str:tokenize(normalize-space(str:replace($names, '\ ', '|')))[position() = $index + 1], '|', ' ')"/> - </xsl:template> - -  - -  - <xsl:template - name="u:outputNamesRefid"> - <xsl:param - name="refid" - select="@refid"/> -  - <xsl:variable - name="refElem" - select="//*[@ids and math:max(dyn:map(str:tokenize(normalize-space(@ids)), 'number($refid = .)')) > 0]"/> - <xsl:call-template - name="u:outputNames"> - <xsl:with-param - name="names" - select="$refElem/@names"/> - <xsl:with-param - name="index" - select="math:max(dyn:map(str:tokenize(normalize-space($refElem/@ids)), 'number($refid = .) * position() - 1'))"/> - </xsl:call-template> - </xsl:template> - -  -  - -  - <xsl:template - match="*"> - <xsl:message> - <xsl:text>`</xsl:text> - <xsl:value-of - select="name(.)"/> - <xsl:text>' encountered</xsl:text> - <xsl:if - test="parent::*"> - <xsl:text> in `</xsl:text> - <xsl:value-of - select="name(parent::*)"/> - <xsl:text>'</xsl:text> - </xsl:if> - <xsl:text>, but no template matches.</xsl:text> - </xsl:message> - </xsl:template> - -</xsl:stylesheet> - - - - - Modified: branches/jrst-docutils-jython/pom.xml =================================================================== --- branches/jrst-docutils-jython/pom.xml 2012-05-30 15:45:20 UTC (rev 689) +++ branches/jrst-docutils-jython/pom.xml 2012-05-31 08:02:14 UTC (rev 690) @@ -161,53 +161,6 @@ </dependency> <dependency> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>fop</artifactId> - <version>1.0</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis-ext</artifactId> - </exclusion> - <exclusion> - <artifactId>xalan</artifactId> - <groupId>xalan</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>${xalanVersion}</version> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>xalan</groupId> - <artifactId>serializer</artifactId> - <version>${xalanVersion}</version> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> <groupId>net.sourceforge.saxon</groupId> <artifactId>saxon</artifactId> <version>9.1.0.8</version>

1 0

r689 - in branches/jrst-docutils-jython/jrst/src/main: java/org/nuiton/jrst resources/xsl
by jpages＠users.nuiton.org May 30, 2012

May 30, 2012

Author: jpages Date: 2012-05-30 17:45:20 +0200 (Wed, 30 May 2012) New Revision: 689 Url: http://nuiton.org/repositories/revision/jrst/689 Log: Ajout de la feuille de style xml2rst.xsl qui avait ?\195?\169t?\195?\169 enlev?\195?\169e. Added: branches/jrst-docutils-jython/jrst/src/main/resources/xsl/xml2rst.xsl Modified: branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java 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-05-30 15:34:49 UTC (rev 688) +++ branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java 2012-05-30 15:45:20 UTC (rev 689) @@ -118,6 +118,9 @@ /** XSL Stylesheet to transform Docbook into PDF. */ protected static final String DOCBOOK_2_FO = "/docbook/fo/docbook.xsl"; + /** XSL Stylesheet to transform XML into RST. */ + protected static final String XML_2_RST = "/xsl/xml2rst.xsl"; + public static final String PATTERN_TYPE = "xml|xhtml|docbook|html|htmlInnerBody|xdoc|rst|fo|pdf"; /** HTML output format type */ @@ -174,7 +177,7 @@ stylesheets.put(TYPE_XHTML, RST_2_DOCBOOK + "," + DOCBOOK_2_XHTML); stylesheets.put(TYPE_JAVAHELP, RST_2_DOCBOOK + "," + DOCBOOK_2_JAVAHELP); stylesheets.put(TYPE_HTMLHELP, RST_2_DOCBOOK + "," + DOCBOOK_2_HTMLHELP); - stylesheets.put(TYPE_RST, ""); + stylesheets.put(TYPE_RST, XML_2_RST); stylesheets.put(TYPE_FO, RST_2_DOCBOOK + "," + DOCBOOK_2_FO); stylesheets.put(TYPE_PDF, RST_2_XHTML); Added: branches/jrst-docutils-jython/jrst/src/main/resources/xsl/xml2rst.xsl =================================================================== --- branches/jrst-docutils-jython/jrst/src/main/resources/xsl/xml2rst.xsl (rev 0) +++ branches/jrst-docutils-jython/jrst/src/main/resources/xsl/xml2rst.xsl 2012-05-30 15:45:20 UTC (rev 689) @@ -0,0 +1,3744 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE xsl:stylesheet [ +<!ENTITY CR "
"> + + + +<!ENTITY tCR "<xsl:text xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xml:space='preserve'>&CR;</xsl:text>"> + +<!ENTITY tEOL "<xsl:text xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xml:space='preserve'>&CR;</xsl:text>"> +<!ENTITY tSP "<xsl:text xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xml:space='preserve'> </xsl:text>"> +]> + + + + + + + + + +<xsl:stylesheet + version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:u="u" + xmlns:data="a" + exclude-result-prefixes="data" + xmlns:str="http://exslt.org/strings" + xmlns:dyn="http://exslt.org/dynamic" + xmlns:math="http://exslt.org/math" + extension-element-prefixes="str dyn math"> + +  + + <xsl:output + method="text" + omit-xml-declaration="yes" + indent="no"/> + +  +  + +  + <xsl:param + name="adornment" + select="'o=o-u=u-u~u`u,u.'"/> + +  + <xsl:param + name="fold" + select="0"/> + +  +  + + <xsl:variable + name="apos" + select='"'"'/> + + <xsl:variable + name="structural_elements" + select="'*document*section*topic*sidebar*'"/> + + <xsl:variable + name="structural_subelements" + select="'*title*subtitle*docinfo*decoration*transition*'"/> + + <xsl:variable + name="bibliographic_elements" + select="'*address*author*authors*contact*copyright*date*field*organization*revision*status*version*'"/> + + <xsl:variable + name="decorative_elements" + select="'*footer*header*'"/> + + <xsl:variable + name="simple_body_elements_no_substitution" + select="'*comment*doctest_block*image*literal_block*paragraph*pending*raw*rubric*target*'"/> + + <xsl:variable + name="folding_elements" + select="concat('*comment*paragraph*rubric*attribution*caption*line*', substring-after($bibliographic_elements, '*'))"/> + + <xsl:variable + name="simple_body_elements" + select="concat($simple_body_elements_no_substitution, 'substitution_definition*')"/> + + <xsl:variable + name="compound_body_elements" + select="'*admonition*attention*block_quote*bullet_list*caution*citation*compound*danger*definition_list*enumerated_list*error*field_list*figure*footnote*hint*important*line_block*note*option_list*system_message*table*tip*warning*container*'"/> + + <xsl:variable + name="body_elements" + select="concat($simple_body_elements, substring-after($compound_body_elements, '*'))"/> + + <xsl:variable + name="admonitions" + select="'*admonition*attention*caution*danger*error*hint*important*note*tip*warning*'"/> + + <xsl:variable + name="simple_body_subelements" + select="'*attribution*caption*classifier*colspec*field_name*label*line*option_argument*option_string*term*'"/> + + <xsl:variable + name="compound_body_subelements" + select="'*definition*definition_list_item*description*entry*field*field_body*legend*list_item*option*option_group*option_list_item*row*tbody*tgroup*thead*'"/> + + <xsl:variable + name="inline_elements" + select="'*abbreviation*acronym*citation_reference*emphasis*footnote_reference*generated*image*inline*literal*problematic*reference*strong*subscript*substitution_reference*superscript*target*title_reference*raw*'"/> + + <xsl:variable + name="inline_containers" + select="concat($simple_body_elements_no_substitution, substring-after($inline_elements, '*'))"/> + + <xsl:variable + name="directives" + select="'*admonition*attention*caution*comment*danger*error*footnote*hint*important*note*tip*warning*image*figure*topic*sidebar*rubric*meta*raw*citation*compound*substitution_definition*container*'"/> + + <xsl:variable + name="titled_elements" + select="'*sidebar*topic*admonition*'"/> + + <xsl:variable + name="blank_after" + select="concat($structural_elements, substring-after($structural_subelements, '*'), substring-after($body_elements, '*'))"/> + + <xsl:variable + name="adornment_characters" + select="concat($apos, '!"#$%&()*+,-./:;<=>?@[\]^_`{|}~')"/> + +  +  + +  +  + <xsl:template + match="document"> + <xsl:if + test="//generated[@classes = 'sectnum']"> + <xsl:text>.. section-numbering::</xsl:text> + &tEOL; + &tCR; + </xsl:if> + <xsl:call-template + name="u:outputClass"> + <xsl:with-param + name="blankAfter" + select="true()"/> + </xsl:call-template> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="section"> + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:blank"/> + <xsl:apply-templates/> + </xsl:template> + +  + <xsl:template + match="section[@classes = 'system-messages']"/> +  +  + +  + +  +  + <xsl:template + match="sidebar"> + <xsl:call-template + name="u:BandI"/> + <xsl:text>.. sidebar:: </xsl:text> + <xsl:value-of + select="title"/> + &tEOL; + <xsl:if + test="subtitle"> + <xsl:call-template + name="u:param"> + <xsl:with-param + name="name" + select="'subtitle'"/> + <xsl:with-param + name="value" + select="subtitle"/> + <xsl:with-param + name="ancestors" + select="ancestor-or-self::*"/> + </xsl:call-template> + </xsl:if> + <xsl:call-template + name="u:params"/> +  + &tCR; + <xsl:apply-templates + select="*[not(self::title) and not(self::subtitle)]"/> + </xsl:template> + +  + +  +  + <xsl:template + match="topic"> + <xsl:call-template + name="u:BandI"/> + <xsl:text>.. topic:: </xsl:text> + <xsl:value-of + select="title"/> + &tEOL; + <xsl:call-template + name="u:params"/> + <xsl:apply-templates + select="*[not(self::title)]"/> + </xsl:template> + +  + <xsl:template + match="topic[starts-with(@classes, 'contents')]"> + <xsl:call-template + name="u:BandI"/> + <xsl:text>.. contents:: </xsl:text> + <xsl:apply-templates + select="title"/> + &tEOL; + <xsl:call-template + name="u:params"> + <xsl:with-param + name="params" + select="@*[name() != 'ids' and name() != 'names' and name() != 'classes']"/> + </xsl:call-template> + <xsl:variable + name="isLocal" + select="substring-before(@classes, ' local')"/> + <xsl:variable + name="realClassesLocal" + select="normalize-space(substring-after(@classes, 'contents'))"/> + <xsl:variable + name="realClassesNode"> + <xsl:choose> + <xsl:when + test="$isLocal"> + <xsl:value-of + select="normalize-space(substring-before($realClassesLocal, 'local'))"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of + select="$realClassesLocal"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable + name="realClasses" + select="string($realClassesNode)"/> + <xsl:if + test="$isLocal"> + <xsl:call-template + name="u:param"> + <xsl:with-param + name="name" + select="'local'"/> + <xsl:with-param + name="value" + select="''"/> + <xsl:with-param + name="ancestors" + select="ancestor-or-self::*"/> + </xsl:call-template> + </xsl:if> + <xsl:if + test="$realClasses"> + <xsl:call-template + name="u:param"> + <xsl:with-param + name="name" + select="'class'"/> + <xsl:with-param + name="value" + select="$realClasses"/> + <xsl:with-param + name="ancestors" + select="ancestor-or-self::*"/> + </xsl:call-template> + </xsl:if> +  + &tCR; + </xsl:template> + +  + <xsl:template + match="topic[@classes='dedication' or @classes='abstract']"> + <xsl:call-template + name="u:BandI"/> + <xsl:text>:</xsl:text> + <xsl:apply-templates + select="title"/> + <xsl:text>: </xsl:text> + &tEOL; + <xsl:apply-templates + select="*[not(self::title)]"/> + </xsl:template> + +  + +  +  + <xsl:template + match="admonition"> + <xsl:call-template + name="u:BandI"/> + <xsl:text>.. admonition:: </xsl:text> + <xsl:apply-templates + select="title"/> + &tEOL; + <xsl:call-template + name="u:params"> + <xsl:with-param + name="params" + select="@*[name() != 'classes' or not(starts-with(., 'admonition-'))]"/> + </xsl:call-template> + <xsl:call-template + name="u:indent"/> + <xsl:apply-templates + select="*[not(self::title)]"/> + </xsl:template> + +  + +  +  + <xsl:template + match="attention | caution | danger | error | hint | important | note | tip | warning"> + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:BandI"/> + <xsl:text>.. </xsl:text> + <xsl:value-of + select="name()"/> + <xsl:text>:: </xsl:text> + <xsl:call-template + name="u:params"> + <xsl:with-param + name="params" + select="@*[name() != 'classes']"/> + </xsl:call-template> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="//document/decoration"> + <xsl:apply-templates/> + </xsl:template> + +  +  + <xsl:template + match="//document/decoration/header"> + <xsl:apply-templates/> + </xsl:template> + +  +  + <xsl:template + match="//document/decoration/footer"> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="docinfo"> + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:blank"/> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="docinfo/authors"> + <xsl:call-template + name="u:outputFolding"> + <xsl:with-param + name="prefix"> + <xsl:text>:</xsl:text> + <xsl:value-of + select="name()"/> + <xsl:text>: </xsl:text> + </xsl:with-param> + </xsl:call-template> + </xsl:template> + +  + <xsl:template + match="docinfo/authors/*"> + <xsl:apply-templates/> +  + <xsl:if + test="generate-id(current()) != generate-id(../*[last()])"> + <xsl:text>; </xsl:text> + </xsl:if> + </xsl:template> + +  +  + <xsl:template + match="docinfo/field"> +  + <xsl:apply-templates/> +  + &tEOL; + </xsl:template> + +  +  + <xsl:template + match="docinfo/*[name()!='authors' and name()!='field']"> + <xsl:call-template + name="u:outputFolding"> + <xsl:with-param + name="prefix"> + <xsl:text>:</xsl:text> + <xsl:value-of + select="name()"/> + <xsl:text>: </xsl:text> + </xsl:with-param> + </xsl:call-template> + </xsl:template> + +  + +  +  + <xsl:template + match="transition"> + <xsl:call-template + name="u:outputClass"/> + &tCR;  + <xsl:text>-----</xsl:text> + &tEOL; +  + <xsl:if + test="not(following-sibling::*[1]/@classes)"> + &tCR; + </xsl:if> + </xsl:template> + +  +  + +  +  + <xsl:template + match="//document/title"> + <xsl:call-template + name="u:outputClass"/> + <xsl:variable + name="textWS"> +  + <xsl:apply-templates/> + </xsl:variable> + <xsl:variable + name="text" + select="normalize-space($textWS)"/> + <xsl:variable + name="length" + select="string-length($text)"/> + <xsl:call-template + name="u:overline"> + <xsl:with-param + name="length" + select="$length"/> + <xsl:with-param + name="depth" + select="1"/> + </xsl:call-template> + <xsl:value-of + select="$text"/> + &tEOL; + <xsl:call-template + name="u:underline"> + <xsl:with-param + name="length" + select="$length"/> + <xsl:with-param + name="depth" + select="1"/> + </xsl:call-template> + </xsl:template> + +  + +  +  + <xsl:template + match="section/title"> + <xsl:call-template + name="u:outputClass"/> + <xsl:variable + name="textWS"> +  + <xsl:apply-templates/> + </xsl:variable> + <xsl:variable + name="text" + select="normalize-space($textWS)"/> + <xsl:variable + name="length" + select="string-length($text)"/> + <xsl:variable + name="depth" + select="count(ancestor::section)"/> + <xsl:call-template + name="u:overline"> + <xsl:with-param + name="length" + select="$length"/> + <xsl:with-param + name="depth" + select="$depth + 2"/> + </xsl:call-template> + <xsl:value-of + select="$text"/> + &tEOL; + <xsl:call-template + name="u:underline"> + <xsl:with-param + name="length" + select="$length"/> + <xsl:with-param + name="depth" + select="$depth + 2"/> + </xsl:call-template> +  + <xsl:if + test="not(contains(concat($structural_elements, $compound_body_elements), concat('*', name(following-sibling::*[1]), '*')) or following-sibling::*[1]/@classes)"> + &tCR; + </xsl:if> + </xsl:template> + +  + +  +  + <xsl:template + match="title"> + <xsl:call-template + name="u:outputClass"> + <xsl:with-param + name="alreadyBlanked" + select="true()"/> + </xsl:call-template> +  + <xsl:apply-templates/> +  + </xsl:template> + +  + +  +  + <xsl:template + match="//document/subtitle"> + <xsl:call-template + name="u:outputClass"/> + <xsl:variable + name="textWS"> +  + <xsl:apply-templates/> + </xsl:variable> + <xsl:variable + name="text" + select="normalize-space($textWS)"/> + <xsl:variable + name="length" + select="string-length($text)"/> + +  + &tCR; + <xsl:call-template + name="u:overline"> + <xsl:with-param + name="length" + select="$length"/> + <xsl:with-param + name="depth" + select="2"/> + </xsl:call-template> + <xsl:value-of + select="$text"/> + &tEOL; + <xsl:call-template + name="u:underline"> + <xsl:with-param + name="length" + select="$length"/> + <xsl:with-param + name="depth" + select="2"/> + </xsl:call-template> + </xsl:template> + +  + +  +  + <xsl:template + match="sidebar/subtitle"> + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:indent"/> + <xsl:apply-templates/> + &tEOL; + &tCR; + </xsl:template> + +  +  + +  +  + <xsl:template + match="comment"> + <xsl:call-template + name="u:BandI"/> + <xsl:call-template + name="u:outputFolding"> + <xsl:with-param + name="prefix"> + <xsl:text>.. </xsl:text> + </xsl:with-param> + </xsl:call-template> + </xsl:template> + +  + +  +  + <xsl:template + match="doctest_block"> + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:BandI"/> + <xsl:apply-templates/> + &tEOL; + </xsl:template> + +  + +  +  + <xsl:template + match="image"> + <xsl:choose> + <xsl:when + test="contains($inline_containers, concat('*', name(..), '*')) and @alt"> +  + <xsl:text>|</xsl:text> +  + <xsl:value-of + select="@alt"/> + <xsl:text>|</xsl:text> + </xsl:when> + <xsl:otherwise> +  + <xsl:if + test="not(parent::figure)"> + <xsl:if + test="not(parent::substitution_definition)"> + <xsl:call-template + name="u:BandI"/> + <xsl:text>.. </xsl:text> + </xsl:if> + <xsl:text>image:: </xsl:text> + </xsl:if> + <xsl:value-of + select="@uri"/> + &tEOL; + <xsl:choose> + <xsl:when + test="parent::figure"> +  + <xsl:if + test="../@classes"> + <xsl:call-template + name="u:param"> + <xsl:with-param + name="name" + select="'figclass'"/> + <xsl:with-param + name="value" + select="../@classes"/> + <xsl:with-param + name="ancestors" + select="ancestor::*"/> + </xsl:call-template> + </xsl:if> +  + <xsl:if + test="../@align"> + <xsl:call-template + name="u:param"> + <xsl:with-param + name="name" + select="'align'"/> + <xsl:with-param + name="value" + select="../@align"/> + <xsl:with-param + name="ancestors" + select="ancestor::*"/> + </xsl:call-template> + </xsl:if> + <xsl:call-template + name="u:params"> +  + <xsl:with-param + name="ancestors" + select="ancestor::*"/> + </xsl:call-template> + </xsl:when> + <xsl:when + test="parent::substitution_definition"> + <xsl:call-template + name="u:params"> +  + <xsl:with-param + name="params" + select="@*[name() != 'alt']"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template + name="u:params"> + <xsl:with-param + name="params" + select="@*[name() != 'ids' and name() != 'names']"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + <xsl:if + test="parent::reference"> +  + <xsl:call-template + name="u:param"> + <xsl:with-param + name="name" + select="'target'"/> + <xsl:with-param + name="value"> + <xsl:choose> + <xsl:when + test="../@name"> +  + <xsl:call-template + name="u:inlineReference"> + <xsl:with-param + name="text" + select="../@refid"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> +  + <xsl:value-of + select="../@refuri"/> + </xsl:otherwise> + </xsl:choose> + </xsl:with-param> + <xsl:with-param + name="ancestors" + select="ancestor-or-self::*"/> + </xsl:call-template> + </xsl:if> +  + &tCR; + </xsl:otherwise> + </xsl:choose> + </xsl:template> + +  + +  +  + <xsl:template + match="line_block"> + <xsl:call-template + name="u:outputClass"/> + <xsl:variable + name="isEmbedded" + select="name(..) = 'line_block'"/> + <xsl:if + test="not($isEmbedded)"> + <xsl:call-template + name="u:blank"/> + </xsl:if> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="line"> + <xsl:call-template + name="u:outputClass"/> + <xsl:variable + name="indent"> + <xsl:call-template + name="u:indent"/> + </xsl:variable> + <xsl:value-of + select="$indent"/> + <xsl:choose> + <xsl:when + test="node()"> +  + <xsl:variable + name="lineBlockIndent"> +  + <xsl:for-each + select="ancestor::line_block[position() > 1]"> + <xsl:value-of + select="str:padding(4)"/> + </xsl:for-each> + </xsl:variable> + <xsl:call-template + name="u:outputFolding"> + <xsl:with-param + name="prefix"> + <xsl:text>| </xsl:text> + <xsl:value-of + select="$lineBlockIndent"/> + </xsl:with-param> + <xsl:with-param + name="indent" + select="concat($indent, ' ', $lineBlockIndent)"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:text>|</xsl:text> + &tEOL; + </xsl:otherwise> + </xsl:choose> + </xsl:template> + +  + +  +  + <xsl:template + match="literal_block"> + <xsl:choose> + <xsl:when + test=".//*[contains($inline_elements, concat('*', name(), '*'))]"> +  + <xsl:call-template + name="u:BandI"/> + <xsl:text>.. parsed-literal::</xsl:text> + &tEOL; + <xsl:call-template + name="u:params"/> + &tCR; + </xsl:when> + <xsl:otherwise> + <xsl:call-template + name="u:outputClass"/> +  + <xsl:call-template + name="u:BandI"/> + <xsl:text>::</xsl:text> + &tEOL; + &tCR; + </xsl:otherwise> + </xsl:choose> + <xsl:variable + name="isQuotedLiteral"> + <xsl:call-template + name="u:isQuotedLiteral"/> + </xsl:variable> +  + <xsl:choose> + <xsl:when + test="string-length($isQuotedLiteral)"> + <xsl:call-template + name="u:indent"> + <xsl:with-param + name="ancestors" + select="ancestor::*"/> + </xsl:call-template> + <xsl:apply-templates + mode="quotedLiteral"/> + </xsl:when> + <xsl:otherwise> + <xsl:call-template + name="u:indent"> + <xsl:with-param + name="ancestors" + select="ancestor-or-self::*"/> + </xsl:call-template> + <xsl:apply-templates/> + </xsl:otherwise> + </xsl:choose> + &tEOL; + </xsl:template> + +  + <xsl:template + match="text()" + mode="quotedLiteral"> + <xsl:call-template + name="u:indentLF"> + <xsl:with-param + name="indent"> + <xsl:call-template + name="u:indent"> + <xsl:with-param + name="ancestors" + select="ancestor::*[position() > 1]"/> + </xsl:call-template> + </xsl:with-param> + </xsl:call-template> + </xsl:template> + +  + <xsl:template + name="u:isQuotedLiteral"> + <xsl:param + name="text" + select="text()"/> + <xsl:param + name="quote" + select="substring($text, 1, 1)"/> + <xsl:if + test="contains($adornment_characters, $quote) and substring($text, 1, 1) = $quote"> +  + <xsl:choose> + <xsl:when + test="contains($text, '
')"> +  + <xsl:call-template + name="u:isQuotedLiteral"> + <xsl:with-param + name="text" + select="substring-after($text, '
')"/> + <xsl:with-param + name="quote" + select="$quote"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> +  + <xsl:value-of + select="$quote"/> + </xsl:otherwise> + </xsl:choose> + </xsl:if> + </xsl:template> + +  + +  +  + <xsl:template + match="paragraph"> + <xsl:variable + name="previous" + select="preceding-sibling::*[1]"/> +  + <xsl:variable + name="needsIndent" + select="($previous or not(parent::list_item or parent::field_body or contains($admonitions, concat('*', name(..), '*')))) and name($previous) != 'label'"/> +  + <xsl:variable + name="needsBlank" + select="($previous or not(parent::list_item or ../parent::option_list_item or parent::field_body or parent::document or contains($admonitions, concat('*', name(..), '*')))) and (not($previous) or contains($body_elements, concat('*', name($previous), '*')) or name($previous) = 'title' and contains($titled_elements, concat('*', name(..), '*')) or name($previous) = 'docinfo')"/> + <xsl:if + test="$needsBlank"> + &tCR; + </xsl:if> + <xsl:if + test="$needsIndent"> + <xsl:call-template + name="u:indent"/> + </xsl:if> + <xsl:if + test="@classes"> +  + <xsl:call-template + name="u:outputClass"> + <xsl:with-param + name="alreadyBlanked" + select="$needsBlank"/> + <xsl:with-param + name="alreadyIndented" + select="$needsIndent"/> + </xsl:call-template> + <xsl:call-template + name="u:BandI"/> + </xsl:if> + <xsl:call-template + name="u:outputFolding"/> + </xsl:template> + +  + +  + <xsl:template + match="pending"> + <xsl:call-template + name="u:notSupported"/> + </xsl:template> + +  + +  + <xsl:template + match="raw"> + <xsl:choose> + <xsl:when + test="contains($inline_containers, concat('*', name(..), '*'))"> +  +  +  + <xsl:text>:RAW-ROLE:`</xsl:text> + <xsl:apply-templates/> + <xsl:text>`</xsl:text> + </xsl:when> + <xsl:otherwise> +  + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:BandI"/> + <xsl:text>.. raw:: </xsl:text> + <xsl:value-of + select="@format"/> + &tEOL; + <xsl:call-template + name="u:params"> + <xsl:with-param + name="params" + select="@*[name() != 'format' and name() != 'classes']"/> + </xsl:call-template> + &tCR; + <xsl:call-template + name="u:indent"> + <xsl:with-param + name="ancestors" + select="ancestor-or-self::*"/> + </xsl:call-template> + <xsl:apply-templates/> + &tEOL; + </xsl:otherwise> + </xsl:choose> + </xsl:template> + +  + +  + <xsl:template + match="rubric"> + <xsl:call-template + name="u:BandI"/> + <xsl:call-template + name="u:outputFolding"> + <xsl:with-param + name="prefix"> + <xsl:text>.. rubric:: </xsl:text> + </xsl:with-param> + </xsl:call-template> + <xsl:call-template + name="u:params"/> + </xsl:template> + +  + +  + <xsl:template + match="compound"> + <xsl:call-template + name="u:BandI"/> + <xsl:text>.. compound::</xsl:text> + &tEOL; + <xsl:call-template + name="u:params"/> + <xsl:apply-templates/> + </xsl:template> + +  + +  + <xsl:template + match="container"> + <xsl:call-template + name="u:BandI"/> + <xsl:text>.. container::</xsl:text> + <xsl:if + test="@classes"> + &tSP; + <xsl:value-of + select="@classes"/> + </xsl:if> + &tEOL; + <xsl:apply-templates/> + </xsl:template> + +  + +  + <xsl:template + match="substitution_definition"> +  + <xsl:variable + name="isReplace" + select="not(* and count(node()) = 1 and contains($directives, concat('*', name(*[1]), '*')))"/> + <xsl:call-template + name="u:BandI"/> + <xsl:variable + name="prefix"> + <xsl:text>.. |</xsl:text> + <xsl:call-template + name="u:outputNames"/> + <xsl:text>| </xsl:text> + </xsl:variable> + <xsl:choose> + <xsl:when + test="$isReplace"> +  + <xsl:call-template + name="u:outputFolding"> + <xsl:with-param + name="prefix"> + <xsl:value-of + select="$prefix"/> + <xsl:text>replace:: </xsl:text> + </xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:value-of + select="$prefix"/> + <xsl:apply-templates/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + +  + +  +  + <xsl:template + match="block_quote"> + <xsl:if + test="@classes = 'epigraph' or @classes = 'highlights' or @classes = 'pull-quote'"> + <xsl:call-template + name="u:BandI"/> + <xsl:text>.. </xsl:text> + <xsl:value-of + select="@classes"/> + <xsl:text>::</xsl:text> + &tEOL; + <xsl:call-template + name="u:params"/> + </xsl:if> + <xsl:apply-templates/> + </xsl:template> + +  + +  + <xsl:template + match="attribution"> + <xsl:call-template + name="u:outputClass"/> +  + &tCR; + <xsl:call-template + name="u:indent"/> + <xsl:call-template + name="u:outputFolding"> + <xsl:with-param + name="prefix"> + <xsl:text>-- </xsl:text> + </xsl:with-param> + </xsl:call-template> + </xsl:template> + +  + +  + <xsl:template + match="citation"> + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:BandI"/> + <xsl:text>.. [</xsl:text> + <xsl:value-of + select="label"/> + <xsl:text>] </xsl:text> + <xsl:apply-templates + select="*[not(self::label)]"/> + </xsl:template> + +  + <xsl:template + match="citation/label"> + <xsl:apply-templates/> + </xsl:template> + +  + +  + <xsl:template + match="figure"> + <xsl:call-template + name="u:BandI"/> + <xsl:text>.. figure:: </xsl:text> + <xsl:apply-templates/> + </xsl:template> + +  + +  + <xsl:template + match="caption"> + <xsl:call-template + name="u:indent"/> + <xsl:call-template + name="u:outputFolding"/> + </xsl:template> + +  + +  + <xsl:template + match="legend"> + <xsl:apply-templates/> + </xsl:template> + +  + +  + +  +  + <xsl:template + match="footnote[not(@auto)]"> + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:BandI"/> + <xsl:text>.. [</xsl:text> + <xsl:apply-templates + select="label"/> + <xsl:text>] </xsl:text> + <xsl:apply-templates + select="*[not(self::label)]"/> + </xsl:template> + +  +  +  + <xsl:template + match="footnote[@auto='1']"> + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:BandI"/> + <xsl:text>.. [#</xsl:text> + <xsl:if + test="@names = @ids"> + <xsl:call-template + name="u:outputNames"/> + </xsl:if> + <xsl:text>] </xsl:text> + <xsl:apply-templates + select="*[not(self::label)]"/> + </xsl:template> + +  +  + <xsl:template + match="footnote[@auto='*']"> + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:BandI"/> + <xsl:text>.. [*] </xsl:text> + <xsl:apply-templates + select="*[not(self::label)]"/> + </xsl:template> + +  + <xsl:template + match="footnote[starts-with(@names, 'TARGET_NOTE:\ ')]"> +  + <xsl:if + test="generate-id(//footnote[starts-with(@names, 'TARGET_NOTE:\ ')][1]) = generate-id(.)"> +  + <xsl:call-template + name="u:BandI"/> +  + <xsl:text>.. target-notes::</xsl:text> + &tEOL; + </xsl:if> + </xsl:template> + +  + <xsl:template + match="footnote/label"> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="bullet_list"> + <xsl:call-template + name="u:outputClass"/> + <xsl:apply-templates + mode="bullet_list"/> + </xsl:template> + +  + +  +  + <xsl:template + match="definition_list"> + <xsl:call-template + name="u:outputClass"/> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="definition_list_item"> + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:BandI"/> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="term"> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="classifier"> + <xsl:text> : </xsl:text> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="definition"> + <xsl:call-template + name="u:outputClass"/> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="enumerated_list"> + <xsl:call-template + name="u:outputClass"/> + <xsl:apply-templates + mode="enumerated_list"/> + </xsl:template> + +  + +  +  + <xsl:template + match="field_list"> + <xsl:call-template + name="u:outputClass"/> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="field"> + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:BandI"/> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="field_name"> + <xsl:text>:</xsl:text> + <xsl:apply-templates/> + <xsl:text>: </xsl:text> +  + </xsl:template> + +  + +  +  + <xsl:template + match="field_body"> + <xsl:call-template + name="u:outputClass"/> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="option_list"> + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:blank"/> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="option_list_item"> + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:indent"/> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="option_group"> + <xsl:apply-templates/> + &tEOL; + </xsl:template> + +  + +  +  + <xsl:template + match="option"> + <xsl:call-template + name="u:outputClass"/> + <xsl:apply-templates/> + <xsl:if + test="generate-id(current()) != generate-id(../*[last()])"> +  + <xsl:text>, </xsl:text> + </xsl:if> +  + </xsl:template> + +  + +  +  + <xsl:template + match="option_string"> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="option_argument"> + <xsl:value-of + select="@delimiter"/> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="description"> + <xsl:call-template + name="u:outputClass"/> + <xsl:apply-templates/> + &tEOL; + </xsl:template> + +  + +  +  + <xsl:template + match="list_item" + mode="bullet_list"> + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:BandI"/> + <xsl:value-of + select="../@bullet"/> + &tSP;  + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="list_item" + mode="enumerated_list"> + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:BandI"/> + <xsl:call-template + name="u:outputEnumerator"/> + <xsl:apply-templates/> + </xsl:template> + +  + <xsl:template + name="u:outputEnumerator"> +  + <xsl:variable + name="enumType" + select="../@enumtype"/> +  + <xsl:variable + name="start"> + <xsl:choose> + <xsl:when + test="../@start"> + <xsl:value-of + select="../@start"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of + select="1"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> +  + <xsl:variable + name="position"> + <xsl:variable + name="wanted" + select="generate-id()"/> +  + <xsl:for-each + select="../list_item"> + <xsl:if + test="generate-id() = $wanted"> + <xsl:value-of + select="position()"/> + </xsl:if> + </xsl:for-each> + </xsl:variable> +  + <xsl:variable + name="cur"> + <xsl:call-template + name="u:position2Enumerator"> + <xsl:with-param + name="enumType" + select="$enumType"/> + <xsl:with-param + name="position" + select="$position"/> + <xsl:with-param + name="start" + select="$start"/> + </xsl:call-template> + </xsl:variable> +  + <xsl:variable + name="max"> + <xsl:call-template + name="u:position2Enumerator"> + <xsl:with-param + name="enumType" + select="$enumType"/> + <xsl:with-param + name="position" + select="count(../list_item)"/> + <xsl:with-param + name="start" + select="$start"/> + </xsl:call-template> + </xsl:variable> +  + <xsl:value-of + select="../@prefix"/> + <xsl:value-of + select="$cur"/> + <xsl:value-of + select="../@suffix"/> +  + &tSP; +  + <xsl:if + test="$enumType != 'lowerroman' and $enumType != 'upperroman'"> +  + <xsl:value-of + select="str:padding(string-length($max) - string-length($cur))"/> + </xsl:if> + </xsl:template> + +  + <xsl:template + name="u:position2Enumerator"> + <xsl:param + name="enumType"/> + <xsl:param + name="start"/> + <xsl:param + name="position"/> +  + <xsl:variable + name="ordinal" + select="$start - 1 + $position"/> + <xsl:choose> + <xsl:when + test="$enumType = 'arabic'"> + <xsl:value-of + select="$ordinal"/> + </xsl:when> + <xsl:when + test="$enumType = 'loweralpha'"> + <xsl:value-of + select="substring('abcdefghijklmnopqrstzuvwxyz', $ordinal, 1)"/> + </xsl:when> + <xsl:when + test="$enumType = 'upperalpha'"> + <xsl:value-of + select="substring('ABCDEFGHIJKLMNOPQRSTZUVWXYZ', $ordinal, 1)"/> + </xsl:when> +  + <xsl:when + test="$enumType = 'lowerroman'"> + <xsl:text>i</xsl:text> + </xsl:when> + <xsl:when + test="$enumType = 'upperroman'"> + <xsl:text>I</xsl:text> + </xsl:when> + </xsl:choose> + </xsl:template> + +  +  + +  +  + <xsl:template + match="table"> + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:blank"/> + <xsl:apply-templates + select="tgroup"/> + <xsl:if + test="title"> +  + <xsl:call-template + name="u:BandI"/> + <xsl:apply-templates + select="title"/> + &tEOL; + </xsl:if> + </xsl:template> + +  + +  +  + <xsl:template + match="tgroup"> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  +  + <xsl:template + match="colspec"/> + +  + +  +  + <xsl:template + match="thead"> + <xsl:apply-templates/> + </xsl:template> + +  +  + <xsl:template + match="tbody"> + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="row"> +  + <xsl:if + test="position() > 1 or parent::thead or parent::tbody and not(../../thead)"> + <xsl:call-template + name="u:rowSeparatorLine"/> + </xsl:if> +  + <xsl:variable + name="heights"> + <xsl:for-each + select="entry"> + <xsl:variable + name="text"> +  + <xsl:apply-templates/> + </xsl:variable> +  + <xsl:value-of + select="string-length($text) - string-length(translate($text, '
', '')) - 1"/> + &tSP;  + </xsl:for-each> + </xsl:variable> +  + <xsl:variable + name="maxHeight" + select="math:max(str:tokenize(normalize-space($heights)))"/> +  + <xsl:call-template + name="u:rowLines"> + <xsl:with-param + name="currentLine" + select="1"/> + <xsl:with-param + name="maxLine" + select="$maxHeight"/> + </xsl:call-template> +  + <xsl:if + test="position() = last()"> + <xsl:call-template + name="u:rowSeparatorLine"> + <xsl:with-param + name="char"> +  + <xsl:choose> + <xsl:when + test="parent::thead"> + <xsl:value-of + select="'='"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of + select="'-'"/> + </xsl:otherwise> + </xsl:choose> + </xsl:with-param> + </xsl:call-template> + </xsl:if> + </xsl:template> + +  + <xsl:template + name="u:rowLines"> + <xsl:param + name="currentLine"/> + <xsl:param + name="maxLine"/> + <xsl:if + test="$currentLine <= $maxLine"> +  + <xsl:call-template + name="u:indent"/> +  + <xsl:text>|</xsl:text> + <xsl:apply-templates> + <xsl:with-param + name="currentLine" + select="$currentLine"/> + </xsl:apply-templates> +  + &tEOL; +  + <xsl:call-template + name="u:rowLines"> + <xsl:with-param + name="currentLine" + select="$currentLine + 1"/> + <xsl:with-param + name="maxLine" + select="$maxLine"/> + </xsl:call-template> + </xsl:if> + </xsl:template> + +  + <xsl:template + name="u:rowSeparatorLine"> + <xsl:param + name="char" + select="'-'"/> + <xsl:call-template + name="u:indent"/> + <xsl:text>+</xsl:text> + <xsl:for-each + select="../../colspec"> + <xsl:value-of + select="str:padding(@colwidth, $char)"/> + <xsl:text>+</xsl:text> + </xsl:for-each> + &tEOL; + </xsl:template> + +  + +  +  + <xsl:template + match="entry"> +  +  + <xsl:param + name="currentLine" + select="0"/> + <xsl:variable + name="column" + select="position() + sum(preceding-sibling::entry/@morecols)"/> +  + <xsl:variable + name="width"> + <xsl:call-template + name="u:computeEntryWidth"> + <xsl:with-param + name="colspecs" + select="../../../colspec"/> + <xsl:with-param + name="column" + select="$column"/> + <xsl:with-param + name="span" + select="@morecols"/> + </xsl:call-template> + </xsl:variable> +  + <xsl:call-template + name="u:outputEntry"> + <xsl:with-param + name="string"> +  + <xsl:apply-templates/> + </xsl:with-param> + <xsl:with-param + name="width" + select="$width"/> + <xsl:with-param + name="expectedIndent"> +  + <xsl:call-template + name="u:indent"/> + </xsl:with-param> + <xsl:with-param + name="outputLine" + select="$currentLine"/> + </xsl:call-template> +  + <xsl:text>|</xsl:text> + </xsl:template> + +  + <xsl:template + name="u:computeEntryWidth"> +  + <xsl:param + name="colspecs"/> +  + <xsl:param + name="column"/> +  + <xsl:param + name="span" + select="0"/> + <xsl:param + name="sum" + select="0"/> + <xsl:choose> + <xsl:when + test="$span"> +  + <xsl:call-template + name="u:computeEntryWidth"> + <xsl:with-param + name="colspecs" + select="$colspecs"/> + <xsl:with-param + name="column" + select="$column + 1"/> + <xsl:with-param + name="span" + select="$span - 1"/> +  + <xsl:with-param + name="sum" + select="$sum + 1 + $colspecs[$column]/@colwidth"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> +  + <xsl:value-of + select="$sum + $colspecs[$column]/@colwidth"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + +  + <xsl:template + name="u:outputEntry"> +  + <xsl:param + name="width"/> +  + <xsl:param + name="string" + select="''"/> +  + <xsl:param + name="expectedIndent" + select="''"/> +  + <xsl:param + name="isFirst" + select="true()"/> +  + <xsl:param + name="outputLine" + select="0"/> +  + <xsl:variable + name="doOutput" + select="$outputLine = 0 or $outputLine = 1"/> + <xsl:variable + name="stringLFHalfTrimmed"> + <xsl:choose> + <xsl:when + test="$isFirst and substring($string, 1, 1) = '
'"> +  + <xsl:value-of + select="substring($string, 2)"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of + select="$string"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable + name="stringLFTrimmed"> + <xsl:choose> + <xsl:when + test="$isFirst and substring($stringLFHalfTrimmed, string-length($stringLFHalfTrimmed), 1) = '
'"> +  + <xsl:value-of + select="substring($stringLFHalfTrimmed, 1, string-length($stringLFHalfTrimmed) - 1)"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of + select="$stringLFHalfTrimmed"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> +  + <xsl:variable + name="remainingLines"> + <xsl:if + test="contains($stringLFTrimmed, '
')"> + <xsl:value-of + select="substring-after($stringLFTrimmed, '
')"/> + </xsl:if> + </xsl:variable> + <xsl:if + test="$doOutput"> +  + <xsl:variable + name="firstLine"> + <xsl:choose> + <xsl:when + test="string-length($remainingLines)"> + <xsl:value-of + select="substring-before($stringLFTrimmed, '
')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of + select="$stringLFTrimmed"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> +  + <xsl:variable + name="trimmed"> + <xsl:if + test="string-length($firstLine)"> +  + <xsl:value-of + select="substring-after($firstLine, $expectedIndent)"/> + </xsl:if> + </xsl:variable> +  + <xsl:variable + name="padded" + select="concat(' ', $trimmed, ' ')"/> +  + <xsl:value-of + select="$padded"/> +  + <xsl:if + test="$width - string-length($padded) < 0"> + <xsl:message> + <xsl:text>WARNING: Table column too narrow (minimum: </xsl:text> + <xsl:value-of + select="string-length($padded)"/> + <xsl:text>)</xsl:text> + &tEOL; + </xsl:message> + </xsl:if> + <xsl:value-of + select="str:padding($width - string-length($padded))"/> + </xsl:if> + <xsl:if + test="$outputLine > 1 or $outputLine = 0 and string-length($remainingLines)"> +  + <xsl:if + test="$outputLine = 0"> +  + &tEOL; + </xsl:if> +  + <xsl:call-template + name="u:outputEntry"> + <xsl:with-param + name="width" + select="$width"/> + <xsl:with-param + name="string" + select="$remainingLines"/> + <xsl:with-param + name="expectedIndent" + select="$expectedIndent"/> + <xsl:with-param + name="isFirst" + select="false()"/> + <xsl:with-param + name="outputLine"> + <xsl:choose> + <xsl:when + test="$outputLine = 0"> + <xsl:value-of + select="0"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of + select="$outputLine - 1"/> + </xsl:otherwise> + </xsl:choose> + </xsl:with-param> + </xsl:call-template> + </xsl:if> + </xsl:template> + +  +  + +  + <xsl:template + match="citation_reference"> + <xsl:call-template + name="u:bkslshEscPre"/> + <xsl:text>[</xsl:text> + <xsl:apply-templates/> + <xsl:text>]_</xsl:text> + <xsl:call-template + name="u:bkslshEscSuf"/> + </xsl:template> + +  + +  + <xsl:template + match="emphasis"> + <xsl:call-template + name="u:bkslshEscPre"/> + <xsl:text>*</xsl:text> + <xsl:apply-templates/> + <xsl:text>*</xsl:text> + <xsl:call-template + name="u:bkslshEscSuf"/> + </xsl:template> + +  + +  +  + <xsl:template + match="footnote_reference[not(@auto)]"> + <xsl:call-template + name="u:bkslshEscPre"/> + <xsl:text>[</xsl:text> + <xsl:value-of + select="text()"/> + <xsl:text>]_</xsl:text> + <xsl:call-template + name="u:bkslshEscSuf"/> +  + </xsl:template> + +  +  +  + <xsl:template + match="footnote_reference[@auto='1']"> + <xsl:variable + name="ref" + select="@refid"/> + <xsl:if + test="not(starts-with(//footnote[@ids=$ref]/@names, 'TARGET_NOTE:\ '))"> +  + <xsl:call-template + name="u:bkslshEscPre"/> + <xsl:text>[#</xsl:text> + <xsl:if + test="//footnote[@ids=$ref]/@names != //footnote[@ids=$ref]/label"> + <xsl:call-template + name="u:outputNames"> + <xsl:with-param + name="names" + select="//footnote[@ids=$ref]/@names"/> + </xsl:call-template> + </xsl:if> + <xsl:text>]_</xsl:text> + <xsl:call-template + name="u:bkslshEscSuf"/> + </xsl:if> + </xsl:template> + +  +  + <xsl:template + match="footnote_reference[@auto='*']"> + <xsl:call-template + name="u:bkslshEscPre"/> + <xsl:text>[*]_</xsl:text> + <xsl:call-template + name="u:bkslshEscSuf"/> + </xsl:template> + +  + +  +  + <xsl:template + match="literal"> + <xsl:call-template + name="u:bkslshEscPre"/> + <xsl:text>``</xsl:text> + <xsl:apply-templates/> + <xsl:text>``</xsl:text> + <xsl:call-template + name="u:bkslshEscSuf"/> + </xsl:template> + +  + +  + +  +  + <xsl:template + match="reference[not(@name or @anonymous)]"> + <xsl:call-template + name="u:bkslshEscPre"/> + <xsl:choose> + <xsl:when + test="starts-with(., 'PEP ')"> + <xsl:text>:PEP:`</xsl:text> + <xsl:value-of + select="substring-after(., 'PEP ')"/> + <xsl:text>`</xsl:text> + </xsl:when> + <xsl:when + test="starts-with(., 'RFC ')"> + <xsl:text>:RFC:`</xsl:text> + <xsl:value-of + select="substring-after(., 'RFC ')"/> + <xsl:text>`</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates/> + </xsl:otherwise> + </xsl:choose> + <xsl:call-template + name="u:bkslshEscSuf"/> + </xsl:template> + +  +  + <xsl:template + match="reference[@name and @refuri]"> +  + <xsl:variable + name="normalized" + select="translate(normalize-space(@name), 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')"/> + <xsl:variable + name="quoted" + select="str:replace($normalized, ' ', '\ ')"/> + <xsl:variable + name="matching" + select="//target[contains(@names, $quoted)]"/> + <xsl:call-template + name="u:inlineReference"> + <xsl:with-param + name="anonymous" + select="not($matching) or @anonymous"/> + <xsl:with-param + name="embedded" + select="not(@anonymous) and (not($matching) or generate-id(following-sibling::node()[1]) = generate-id($matching))"/> + </xsl:call-template> + </xsl:template> + +  +  + <xsl:template + match="reference[@name and @refid]"> + <xsl:call-template + name="u:inlineReference"> + <xsl:with-param + name="anonymous" + select="@anonymous"/> + </xsl:call-template> + </xsl:template> + +  +  + <xsl:template + match="reference[image]"> +  + <xsl:apply-templates/> + </xsl:template> + +  + +  +  + <xsl:template + match="strong"> + <xsl:call-template + name="u:bkslshEscPre"/> + <xsl:text>**</xsl:text> + <xsl:apply-templates/> + <xsl:text>**</xsl:text> + <xsl:call-template + name="u:bkslshEscSuf"/> + </xsl:template> + +  + +  + <xsl:template + match="subscript"> + <xsl:call-template + name="u:bkslshEscPre"/> + <xsl:text>:sub:`</xsl:text> + <xsl:apply-templates/> + <xsl:text>`</xsl:text> + <xsl:call-template + name="u:bkslshEscSuf"/> + </xsl:template> + +  + +  + <xsl:template + match="superscript"> + <xsl:call-template + name="u:bkslshEscPre"/> + <xsl:text>:sup:`</xsl:text> + <xsl:apply-templates/> + <xsl:text>`</xsl:text> + <xsl:call-template + name="u:bkslshEscSuf"/> + </xsl:template> + +  + +  +  + <xsl:template + match="target"> + <xsl:choose> + <xsl:when + test="name(preceding-sibling::*[1]) = 'reference'"> +  + </xsl:when> + <xsl:when + test="contains($inline_containers, concat('*', name(..), '*'))"> +  + <xsl:call-template + name="u:inlineReference"> + <xsl:with-param + name="isTarget" + select="true()"/> + </xsl:call-template> + </xsl:when> + <xsl:when + test="@anonymous"> +  + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:BandI"/> + <xsl:text>__ </xsl:text> + <xsl:choose> + <xsl:when + test="@refid"> + <xsl:call-template + name="u:outputNamesRefid"/> + <xsl:text>_</xsl:text> + </xsl:when> + <xsl:when + test="@refuri"> + <xsl:value-of + select="@refuri"/> + </xsl:when> + </xsl:choose> + &tEOL; + </xsl:when> + <xsl:when + test="@names | @refid"> +  + <xsl:call-template + name="u:outputClass"/> + <xsl:call-template + name="u:BandI"/> + <xsl:text>.. _</xsl:text> + <xsl:choose> + <xsl:when + test="@refid"> + <xsl:call-template + name="u:outputNamesRefid"/> + </xsl:when> + <xsl:otherwise> + <xsl:variable + name="quoteNeeded" + select="contains(@names, ':')"/> + <xsl:if + test="$quoteNeeded"> + <xsl:text>`</xsl:text> + </xsl:if> + <xsl:call-template + name="u:outputNames"/> + <xsl:if + test="$quoteNeeded"> + <xsl:text>`</xsl:text> + </xsl:if> + </xsl:otherwise> + </xsl:choose> + <xsl:text>:</xsl:text> + <xsl:if + test="@refuri"> + <xsl:text> </xsl:text> + <xsl:value-of + select="@refuri"/> + </xsl:if> + &tEOL; + </xsl:when> + <xsl:otherwise> +  + <xsl:call-template + name="u:notSupported"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + +  + +  +  + <xsl:template + match="title_reference"> + <xsl:call-template + name="u:bkslshEscPre"/> + <xsl:text>`</xsl:text> + <xsl:apply-templates/> + <xsl:text>`</xsl:text> + <xsl:call-template + name="u:bkslshEscSuf"/> + </xsl:template> + +  + +  +  + <xsl:template + match="inline"> +  + <xsl:call-template + name="u:bkslshEscPre"/> + <xsl:text>:</xsl:text> + <xsl:value-of + select="@classes"/> + <xsl:text>:`</xsl:text> + <xsl:apply-templates/> + <xsl:text>`</xsl:text> + <xsl:call-template + name="u:bkslshEscSuf"/> + </xsl:template> + +  + +  + +  + +  +  + <xsl:template + match="generated"/> + +  + <xsl:template + match="problematic"> +  + <xsl:value-of + select="text()"/> + </xsl:template> + +  + <xsl:template + match="system_message"/> + +  +  + +  + <xsl:template + match="text()"> + <xsl:call-template + name="u:indentLF"/> + </xsl:template> + +  +  + +  + <xsl:template + name="u:BandI"> + <xsl:call-template + name="u:blank"/> + <xsl:call-template + name="u:indent"/> + </xsl:template> + +  + +  + <xsl:template + name="u:blank"> + <xsl:apply-templates + mode="blankSkipInline" + select="preceding::*[1]"/> + </xsl:template> + +  + <xsl:template + mode="blankSkipInline" + match="*"> + <xsl:choose> +  + <xsl:when + test="contains(concat($inline_elements, $simple_body_subelements, $compound_body_subelements), concat('*', name(.), '*'))"> + <xsl:apply-templates + mode="blankSkipInline" + select=".."/> + </xsl:when> + <xsl:otherwise> +  + <xsl:if + test="contains($blank_after, concat('*', name(.), '*'))"> + &tCR; + </xsl:if> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + +  + +  + <data:lookup> + <node + name="address" + indent="10"/> + <node + name="author" + indent="9"/> + <node + name="authors" + indent="10"/> + <node + name="contact" + indent="10"/> + <node + name="copyright" + indent="12"/> + <node + name="date" + indent="7"/> + <node + name="organization" + indent="15"/> + <node + name="revision" + indent="11"/> + <node + name="status" + indent="9"/> + <node + name="version" + indent="10"/> +  + <node + name="list_item" + indent="2"/> + <node + name="definition_list_item" + indent="4"/> + <node + name="field_body" + indent="4"/> + <node + name="option_list_item" + indent="4"/> +  + <node + name="block_quote" + indent="4"/> + <node + name="literal_block" + indent="4"/> + <node + name="attribution" + indent="3"/> + <node + name="line" + indent="2"/> + </data:lookup> + +  + <xsl:template + name="u:indent"> +  + <xsl:param + name="ancestors" + select="ancestor::*"/> + <xsl:for-each + select="$ancestors"> + <xsl:variable + name="this" + select="name()"/> + <xsl:choose> + <xsl:when + test="contains($directives, concat('*', $this, '*'))"> +  + <xsl:value-of + select="str:padding(3)"/> + </xsl:when> + <xsl:when + test="$this = 'list_item' and parent::enumerated_list"> +  + <xsl:variable + name="enumerator"> + <xsl:call-template + name="u:outputEnumerator"/> + </xsl:variable> + <xsl:value-of + select="str:padding(string-length($enumerator))"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of + select="str:padding(document('')//data:lookup/node[@name=$this]/@indent)"/> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> + </xsl:template> + +  + +  + <xsl:template + name="u:indentLF"> + <xsl:param + name="string" + select="."/> +  + <xsl:param + name="indent"> +  + <xsl:call-template + name="u:indent"/> + </xsl:param> + <xsl:choose> + <xsl:when + test="contains($string,'
')"> +  + <xsl:value-of + select="substring-before($string, '
')"/> + &tEOL; +  + <xsl:value-of + select="$indent"/> +  + <xsl:call-template + name="u:indentLF"> + <xsl:with-param + name="string" + select="substring-after($string, '
')"/> + <xsl:with-param + name="indent" + select="$indent"/> + </xsl:call-template> + </xsl:when> +  + <xsl:otherwise> + <xsl:value-of + select="$string"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + +  + +  + <xsl:template + name="u:outputFolding"> +  + <xsl:param + name="prefix" + select="''"/> +  + <xsl:param + name="indent"> + <xsl:call-template + name="u:indent"> + <xsl:with-param + name="ancestors" + select="ancestor-or-self::*"/> + </xsl:call-template> + </xsl:param> + <xsl:variable + name="string"> +  + <xsl:apply-templates/> + </xsl:variable> +  + <xsl:value-of + select="$prefix"/> + <xsl:choose> + <xsl:when + test="$fold > 0"> + <xsl:variable + name="normalized" + select="normalize-space($string)"/> + <xsl:choose> + <xsl:when + test="$string = ''"> +  + </xsl:when> + <xsl:when + test="$normalized = ''"> +  + &tSP; + </xsl:when> + <xsl:otherwise> +  + <xsl:if + test="normalize-space(substring($string, 1, 1)) = ''"> + &tSP; + </xsl:if> + <xsl:call-template + name="u:indentFold"> + <xsl:with-param + name="string" + select="$normalized"/> + <xsl:with-param + name="indent" + select="$indent"/> + <xsl:with-param + name="cursorColumn" + select="string-length($indent) + string-length($prefix)"/> + </xsl:call-template> +  + <xsl:if + test="normalize-space(substring($string, string-length($string), 1)) = ''"> + &tSP; + </xsl:if> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:value-of + select="$string"/> + </xsl:otherwise> + </xsl:choose> + &tEOL; + </xsl:template> + +  + +  + <xsl:template + name="u:indentFold"> +  + <xsl:param + name="string"/> +  + <xsl:param + name="indent"/> +  +  + <xsl:param + name="cursorColumn" + select="string-length($indent)"/> +  + <xsl:param + name="isNewLine" + select="true()"/> + <xsl:variable + name="firstWord"> + <xsl:choose> +  + <xsl:when + test="contains($string, ' ')"> + <xsl:value-of + select="substring-before($string, ' ')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of + select="$string"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable + name="rest" + select="substring-after($string, ' ')"/> + <xsl:choose> + <xsl:when + test="$string = ''"/> + <xsl:when + test="$isNewLine"> +  + <xsl:value-of + select="$firstWord"/> + <xsl:call-template + name="u:indentFold"> + <xsl:with-param + name="string" + select="$rest"/> + <xsl:with-param + name="indent" + select="$indent"/> + <xsl:with-param + name="cursorColumn" + select="$cursorColumn + string-length($firstWord)"/> + <xsl:with-param + name="isNewLine" + select="false()"/> + </xsl:call-template> + </xsl:when> + <xsl:when + test="$cursorColumn + 1 + string-length($firstWord) > $fold"> +  + &tEOL; + <xsl:value-of + select="$indent"/> + <xsl:call-template + name="u:indentFold"> + <xsl:with-param + name="string" + select="$string"/> + <xsl:with-param + name="indent" + select="$indent"/> + <xsl:with-param + name="cursorColumn" + select="string-length($indent)"/> + <xsl:with-param + name="isNewLine" + select="true()"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> +  + &tSP; + <xsl:value-of + select="$firstWord"/> + <xsl:call-template + name="u:indentFold"> + <xsl:with-param + name="string" + select="$rest"/> + <xsl:with-param + name="indent" + select="$indent"/> + <xsl:with-param + name="cursorColumn" + select="$cursorColumn + 1 + string-length($firstWord)"/> + <xsl:with-param + name="isNewLine" + select="false()"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + +  + +  + <xsl:template + name="u:params"> + <xsl:param + name="params" + select="@*"/> +  + <xsl:param + name="ancestors" + select="ancestor-or-self::*"/> + <xsl:for-each + select="$params"> +  + <xsl:if + test="name() != 'uri' and name() != 'xml:space'"> + <xsl:call-template + name="u:param"> + <xsl:with-param + name="ancestors" + select="$ancestors"/> + </xsl:call-template> + </xsl:if> + </xsl:for-each> + </xsl:template> + +  + <xsl:template + name="u:param"> + <xsl:param + name="name" + select="name()"/> + <xsl:param + name="value" + select="."/> +  + <xsl:param + name="ancestors" + select="ancestor::*"/> + <xsl:call-template + name="u:indent"> + <xsl:with-param + name="ancestors" + select="$ancestors"/> + </xsl:call-template> + <xsl:text>:</xsl:text> + <xsl:choose> + <xsl:when + test="$name = 'classes'"> + <xsl:text>class</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:value-of + select="$name"/> + </xsl:otherwise> + </xsl:choose> + <xsl:text>:</xsl:text> + <xsl:if + test="$value"> + <xsl:text> </xsl:text> + <xsl:value-of + select="$value"/> + </xsl:if> + &tEOL; + </xsl:template> + +  + +  + <xsl:template + name="u:bkslshEscPre"> +  + <xsl:variable + name="before" + select="preceding-sibling::node()[1]"/> + <xsl:choose> +  + <xsl:when + test="not($before)"/> +  + <xsl:when + test="name($before)"> +  + <xsl:text>\ </xsl:text> + </xsl:when> +  + <xsl:when + test="not(contains(concat($apos, ' 
	"([{<-/:'), substring($before, string-length($before), 1)))"> +  + <xsl:text>\ </xsl:text> + </xsl:when> + </xsl:choose> + </xsl:template> + +  + <xsl:template + name="u:bkslshEscSuf"> +  + <xsl:variable + name="after" + select="following-sibling::node()[1]"/> + <xsl:choose> +  + <xsl:when + test="not($after)"/> +  + <xsl:when + test="name($after)"/> +  + <xsl:when + test="not(contains(concat($apos, ' 
	")]}>-/:.,;!?\'), substring($after, 1, 1)))"> +  + <xsl:text>\</xsl:text> + </xsl:when> + </xsl:choose> + </xsl:template> + +  + + <xsl:template + name="u:notSupported"> + <xsl:call-template + name="u:BandI"/> + <xsl:text>######## NOT SUPPORTED: `</xsl:text> + <xsl:value-of + select="name(.)"/> + <xsl:text>' ########</xsl:text> + &tEOL; + </xsl:template> + +  + + <xsl:template + name="u:overline"> +  + <xsl:param + name="length"/> +  + <xsl:param + name="depth"/> +  + <xsl:if + test="substring($adornment, 2 * ($depth - 1) + 1, 1) = 'o'"> + <xsl:value-of + select="str:padding($length, substring($adornment, 2 * ($depth - 1) + 2, 1))"/> + &tEOL; + </xsl:if> + </xsl:template> + + <xsl:template + name="u:underline"> +  + <xsl:param + name="length"/> +  + <xsl:param + name="depth"/> + <xsl:value-of + select="str:padding($length, substring($adornment, 2 * ($depth - 1) + 2, 1))"/> + &tEOL; + </xsl:template> + +  + +  + <xsl:template + name="u:inlineReference"> + <xsl:param + name="anonymous" + select="false()"/> + <xsl:param + name="embedded" + select="false()"/> +  + <xsl:param + name="isTarget" + select="false()"/> + <xsl:param + name="text" + select="node()"/> + <xsl:call-template + name="u:bkslshEscPre"/> +  + <xsl:variable + name="delimiter"> + <xsl:if + test="* or translate($text, '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz', '') or $embedded"> + <xsl:text>`</xsl:text> + </xsl:if> + </xsl:variable> + <xsl:if + test="$isTarget"> + <xsl:text>_</xsl:text> + </xsl:if> + <xsl:value-of + select="$delimiter"/> + <xsl:apply-templates + select="$text"/> + <xsl:if + test="$embedded"> + <xsl:text> <</xsl:text> + <xsl:value-of + select="@refuri"/> + <xsl:text>></xsl:text> + </xsl:if> + <xsl:value-of + select="$delimiter"/> + <xsl:if + test="not($isTarget)"> + <xsl:text>_</xsl:text> + <xsl:if + test="$anonymous"> + <xsl:text>_</xsl:text> + </xsl:if> + </xsl:if> + <xsl:call-template + name="u:bkslshEscSuf"/> + </xsl:template> + +  + +  +  + <xsl:template + name="u:outputClass"> +  + <xsl:param + name="alreadyBlanked" + select="false()"/> +  + <xsl:param + name="alreadyIndented" + select="false()"/> +  + <xsl:param + name="blankAfter" + select="false()"/> + <xsl:if + test="@classes"> + <xsl:if + test="not($alreadyBlanked)"> + <xsl:call-template + name="u:blank"/> + </xsl:if> + <xsl:if + test="not($alreadyIndented)"> + <xsl:call-template + name="u:indent"/> + </xsl:if> + <xsl:text>.. class:: </xsl:text> + <xsl:value-of + select="@classes"/> + &tEOL; + <xsl:if + test="$blankAfter"> + &tCR; + </xsl:if> + </xsl:if> + </xsl:template> + +  + +  + <xsl:template + name="u:outputNames"> +  + <xsl:param + name="names" + select="@names"/> + <xsl:param + name="index" + select="0"/> + <xsl:value-of + select="str:replace(str:tokenize(normalize-space(str:replace($names, '\ ', '|')))[position() = $index + 1], '|', ' ')"/> + </xsl:template> + +  + +  + <xsl:template + name="u:outputNamesRefid"> + <xsl:param + name="refid" + select="@refid"/> +  + <xsl:variable + name="refElem" + select="//*[@ids and math:max(dyn:map(str:tokenize(normalize-space(@ids)), 'number($refid = .)')) > 0]"/> + <xsl:call-template + name="u:outputNames"> + <xsl:with-param + name="names" + select="$refElem/@names"/> + <xsl:with-param + name="index" + select="math:max(dyn:map(str:tokenize(normalize-space($refElem/@ids)), 'number($refid = .) * position() - 1'))"/> + </xsl:call-template> + </xsl:template> + +  +  + +  + <xsl:template + match="*"> + <xsl:message> + <xsl:text>`</xsl:text> + <xsl:value-of + select="name(.)"/> + <xsl:text>' encountered</xsl:text> + <xsl:if + test="parent::*"> + <xsl:text> in `</xsl:text> + <xsl:value-of + select="name(parent::*)"/> + <xsl:text>'</xsl:text> + </xsl:if> + <xsl:text>, but no template matches.</xsl:text> + </xsl:message> + </xsl:template> + +</xsl:stylesheet> + + + + +

1 0

r688 - in branches/jrst-docutils-jython/jrst-doc/src/site: . en/rst en/rst/devel en/rst/devel/images en/rst/user en/rst/user/images resources resources/images resources/schemas rst rst/devel rst/user rst/user/images
by jpages＠users.nuiton.org May 30, 2012

May 30, 2012

Author: jpages Date: 2012-05-30 17:34:49 +0200 (Wed, 30 May 2012) New Revision: 688 Url: http://nuiton.org/repositories/revision/jrst/688 Log: Correction de la documentation en tenant compte des remarques de Sylvain Added: branches/jrst-docutils-jython/jrst-doc/src/site/resources/images/ branches/jrst-docutils-jython/jrst-doc/src/site/resources/images/biohazard.png Removed: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/Todo.rst branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/images/DiagrammeClass.png branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/images/DiagrammeSequance.png branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/images/diagrammeGeneration.png branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/images/presentationXSL.png branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/functionality.rst branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/images/biohazard.png branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/Todo.rst branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/fonctionnalites.rst branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/images/biohazard.png Modified: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/XSLpresentation.rst branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/developerDoc.rst branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/library.rst branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/index.rst branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/RSTpresentation.rst branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/index.rst branches/jrst-docutils-jython/jrst-doc/src/site/resources/schemas/diagrammeClass.png branches/jrst-docutils-jython/jrst-doc/src/site/resources/schemas/diagrammeSequence.png branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/docDeveloppeur.rst branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/librairies.rst branches/jrst-docutils-jython/jrst-doc/src/site/rst/index.rst branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/index.rst branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/presentationRST.rst branches/jrst-docutils-jython/jrst-doc/src/site/site_en.xml branches/jrst-docutils-jython/jrst-doc/src/site/site_fr.xml Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/Todo.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/Todo.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/Todo.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -1,47 +0,0 @@ -.. - -.. * #%L -.. * JRst :: Documentation -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2009 - 2010 CodeLutin -.. * %% -.. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU Lesser General Public License as -.. * published by the Free Software Foundation, either version 3 of the -.. * License, or (at your option) any later version. -.. * -.. * This program is distributed in the hope that it will be useful, -.. * but WITHOUT ANY WARRANTY; without even the implied warranty of -.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.. * GNU General Lesser Public License for more details. -.. * -.. * You should have received a copy of the GNU General Lesser Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. -.. * #L% -.. - - -==== -Todo -==== - -This is a list of the tasks which remains to be made. If somebody wants to help -or has ideas, don't hesitate. - -- multiformat date -- xsl file to converts xhtml -> xdoc - -- English documentation (somebody to correct me :) ) -- ant rules to generation help like : - <jrst include="..." exclude="..." destination="" extension="...."/> - destination is destination folder - extension is extension modification of the source file with this one. - -- export yo pretion, magic, or an other presentation tool. - -- to allow the importation of other format that rst, for example .sxw. - to make possible the simple convertion of the .sxw in rst. - -- make a doclet to produce RST JavaDoc Modified: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/XSLpresentation.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/XSLpresentation.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/XSLpresentation.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -183,5 +183,5 @@ - Article : http://www.commentcamarche.net/xml/xmlxsl.php3 - Diagram : http://fr.wikipedia.org/wiki/Extended_stylesheet_language_transformations -.. |presentationxsl| image:: images/presentationXSL.png +.. |presentationxsl| image:: ../../schemas/presentationXSL.png Modified: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/developerDoc.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/developerDoc.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/developerDoc.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -32,28 +32,30 @@ Class diagram ============= -.. image:: ../../schemas/diagrammeGeneration.png +.. image:: ../../schemas/diagrammeClass.png :align: center -**JRST** Class contents main() method, it's looking after options, files reading and writing. Iinitially, it calls Jython_ class **PythonInterpreter** which allows to execute DocUtils' Python script to generate an intermediate file. Then it only remains to apply the wish XSL (if needed) by using **JRSTGenerator** Class. +**JRST** Class contents main() method, it's looking after options, files reading and writing. Initially, it calls Jython_ class **PythonInterpreter** which allows to execute DocUtils' Python script to generate an intermediate file. Then it only remains to apply several desired XSL (if needed) by using **JRSTGenerator** Class. +This sequence diagram describes the parser's mechanism throughout the generation : + +.. image:: ../../schemas/diagrammeSequence.png + :align: center + Generation ========== -.. image:: ../../schemas/classDiagramme.png +.. image:: ../../schemas/diagrammeGeneration.png :align: center Links : - * xml2rst.xsl (convertion from xml of docutils towards rst) : http://www.merten-home.de/FreeSoftware/xml2rst - * dn2dbk.xsl (convertion from xml of docutils towards docbook) : http://membres.lycos.fr/ebellot/dn2dbk - * nwalsh xsl (convertion from docbook towards FO and xhtml) : http://nwalsh.com + * xml2rst.xsl (conversion from xml of docutils towards rst) : http://www.merten-home.de/FreeSoftware/xml2rst + * dn2dbk.xsl (conversion from xml of docutils towards docbook) : http://membres.lycos.fr/ebellot/dn2dbk + * nwalsh xsl (conversion from docbook towards FO and xhtml) : http://nwalsh.com + * IText (conversion from HTML towards PDF) : http://itextpdf.com/ - * XMLmind (convertion from FO towards ODT and RTF) : http://www.xmlmind.com/foconverter/what_is_xfc.html - * FOP (convertion from FO towards PDF) : http://xmlgraphics.apache.org/fop - * IText (convertion from HTML towards PDF) : http://itextpdf.com/ - -Use exemple +Use example =========== We want to convert this following reStructuredText document (text.rst) to html (text.html) : @@ -74,11 +76,6 @@ JRST -t html -o text.html text.rst -This sequence diagramme describes the parser's mechanism throughout the generation : - -.. image:: ../../schemas/diagrammeSequence.png - :align: center - **JRSTGenerator** Class with the XSL file rst2xhtml.xsl, returns following html file:: <?xml version="1.0" encoding="UTF-8"?> @@ -124,7 +121,7 @@ Uses external XSL ================= -JRST able to transform DocUtils XML with external XSL [2]_ files. +JRST is able to transform DocUtils XML with external XSL [2]_ files. You must use this following command:: JRST -x XSLfile, XSLfile2 RSTfile Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/images/DiagrammeClass.png =================================================================== (Binary files differ) Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/images/DiagrammeSequance.png =================================================================== (Binary files differ) Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/images/diagrammeGeneration.png =================================================================== (Binary files differ) Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/images/presentationXSL.png =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/library.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/library.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/library.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -40,10 +40,10 @@ Librairy used to the XSL transformation. -SDoc_ -===== +IText_ +====== -SDoc_ provide Swing composants which includes syntax coloration for many languages. +IText_ is a library to generate PDF documents from (x)HTML pages. Xmlunit_ ======== @@ -53,7 +53,7 @@ DocUtils_ ========= -DocUtils_ is a set of scripts to transform RST_ files into useful formats, such as HTML, ODT, Latex and more. +DocUtils_ is a set of Python scripts to transform RST_ files into useful formats, such as HTML, ODT, Latex and more. Jython_ ======= @@ -64,7 +64,7 @@ .. _dom4j: http://www.dom4j.org .. _javax.xml.transform: http://java.sun.com/javase/6/docs/api/javax/xml/transform/package-summary.h… -.. _SDoc: http://sdoc.sourceforge.net/wiki/pmwiki.php +.. _IText: http://itextpdf.com/ .. _Xmlunit: http://xmlunit.sourceforge.net/ .. _RST: http://docutils.sourceforge.net/rst.html .. _DocUtils: http://docutils.sourceforge.net/docs/ref/doctree.html Modified: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/index.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/index.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/index.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -27,8 +27,8 @@ reStructuredText_ parser : JRst =============================== -Documentation utilisateur -========================= +User Documentation +================== .. contents:: @@ -43,16 +43,18 @@ document. RST has a so simple syntax that it becomes almost invisible. JRST uses Jython_ and DocUtils_ to transform RST_ files to XML to create a tree representation -document. It becomes easy to generate document representation towards differents -fomats. +document. It becomes easy to generate document representation towards different +formats. How to use it ------------- JRST takes a reStructuredText_ file and generates XML file. Which could be used to produce various files formats with generation XSL_ files. The available output formats are HTML, xhtml, -rst, pdf, docbook, odt(Open-Office), rtf, or XML [1]_. +rst, pdf, docbook or odt(Open-Office) [1]_. +If JRST is launched without arguments, a graphical user interface is displayed for the user. Thus, we can choose easily files, output type or external XSL stylesheets to apply. + :: JRST myfile.rst Modified: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/RSTpresentation.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/RSTpresentation.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/RSTpresentation.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -367,18 +367,18 @@ To include an image in your document, you use the the ``image`` directive__. For example:: - .. image:: images/biohazard.png + .. image:: ../../images/biohazard.png results in: -.. image:: images/biohazard.png +.. image:: ../../images/biohazard.png -The ``images/biohazard.png`` part indicates the filename of the image +The ``../../images/biohazard.png`` part indicates the filename of the image you wish to appear in the document. There's no restriction placed on the image (format, size etc). If the image is to appear in HTML and you wish to supply additional information, you may:: - .. image:: images/biohazard.png + .. image:: ../../images/biohazard.png :height: 100 :width: 200 :scale: 50 Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/functionality.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/functionality.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/functionality.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -1,274 +0,0 @@ -.. - -.. * #%L -.. * JRst :: Documentation -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2009 - 2010 CodeLutin -.. * %% -.. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU Lesser General Public License as -.. * published by the Free Software Foundation, either version 3 of the -.. * License, or (at your option) any later version. -.. * -.. * This program is distributed in the hope that it will be useful, -.. * but WITHOUT ANY WARRANTY; without even the implied warranty of -.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.. * GNU General Lesser Public License for more details. -.. * -.. * You should have received a copy of the GNU General Lesser Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. -.. * #L% -.. - - -========================= -Functionalities suggested -========================= - -Docutils DTD : http://docutils.sourceforge.net/docs/ref/doctree.html - -.. contents:: Summary - -Functionalities established -=========================== - -Root element ------------- - -- document_ - -Title elements --------------- - -- subtitle_ -- title_ - -Bibliographic elements ----------------------- - -- docinfo_ -- author_ -- authors_ -- organization_ -- address_ -- contact_ -- version_ -- revision_ -- status_ -- date_ -- copyright_ - -Decoration elements -------------------- - -- decoration_ -- footer_ -- header_ - -Structural elements -------------------- - -- section_ -- topic_ -- sidebar_ -- transition_ - -Body elements -------------- - -- admonition_ -- attention_ -- block_quote_ -- bullet_list_ -- caution_ -- classifier_ -- danger_ -- definition_ -- definition_list_ -- definition_list_item_ -- description_ -- doctest_block_ -- enumerated_list_ -- error_ -- field_ -- field_body_ -- field_list_ -- field_name_ -- footnote_ -- hint_ -- image_ -- important_ -- line_ -- line_block_ -- list_item_ -- literal_block_ -- note_ -- option_ -- option_argument_ -- option_group_ -- option_list_ -- option_list_item_ -- option_string_ -- paragraph_ -- term_ -- tip_ -- warning_ - -Table elements --------------- - -- table_ -- tbody_ -- entry_ -- row_ -- colspec_ -- thead_ -- tgroup_ - -Inline elements ---------------- - -- emphasis_ -- strong_ -- literal_ -- reference_ -- footnote_reference_ - - -Unimplemented functionalities -============================= - -- abbreviation_ -- acronym_ -- attribution_ -- caption_ -- citation_ -- citation_reference_ -- comment_ -- compound_ -- container_ -- figure_ -- generated_ -- inline_ -- label_ -- legend_ -- pending_ -- problematic_ -- raw_ -- rubric_ -- subscript_ -- substitution_definition_ -- substitution_reference_ -- superscript_ -- system_message_ -- target_ -- title_reference_ - -.. _abbreviation: http://docutils.sourceforge.net/docs/ref/doctree.html#abbreviation -.. _acronym: http://docutils.sourceforge.net/docs/ref/doctree.html#acronym -.. _address: http://docutils.sourceforge.net/docs/ref/doctree.html#address -.. _admonition: http://docutils.sourceforge.net/docs/ref/doctree.html#admonition -.. _attention: http://docutils.sourceforge.net/docs/ref/doctree.html#attention - -.. _attribution: http://docutils.sourceforge.net/docs/ref/doctree.html#attribution -.. _author: http://docutils.sourceforge.net/docs/ref/doctree.html#author -.. _authors: http://docutils.sourceforge.net/docs/ref/doctree.html#authors -.. _block_quote: http://docutils.sourceforge.net/docs/ref/doctree.html#block-quote -.. _bullet_list: http://docutils.sourceforge.net/docs/ref/doctree.html#bullet-list -.. _caption: http://docutils.sourceforge.net/docs/ref/doctree.html#caption -.. _caution: http://docutils.sourceforge.net/docs/ref/doctree.html#caution -.. _citation: http://docutils.sourceforge.net/docs/ref/doctree.html#citation -.. _citation_reference: http://docutils.sourceforge.net/docs/ref/doctree.html#citation-reference - -.. _classifier: http://docutils.sourceforge.net/docs/ref/doctree.html#classifier -.. _colspec: http://docutils.sourceforge.net/docs/ref/doctree.html#colspec -.. _comment: http://docutils.sourceforge.net/docs/ref/doctree.html#comment -.. _compound: http://docutils.sourceforge.net/docs/ref/doctree.html#compound -.. _contact: http://docutils.sourceforge.net/docs/ref/doctree.html#contact -.. _container: http://docutils.sourceforge.net/docs/ref/doctree.html#container -.. _copyright: http://docutils.sourceforge.net/docs/ref/doctree.html#copyright -.. _danger: http://docutils.sourceforge.net/docs/ref/doctree.html#danger -.. _date: http://docutils.sourceforge.net/docs/ref/doctree.html#date - -.. _decoration: http://docutils.sourceforge.net/docs/ref/doctree.html#decoration -.. _definition: http://docutils.sourceforge.net/docs/ref/doctree.html#definition -.. _definition_list: http://docutils.sourceforge.net/docs/ref/doctree.html#definition-list -.. _definition_list_item: http://docutils.sourceforge.net/docs/ref/doctree.html#definition-list-item -.. _description: http://docutils.sourceforge.net/docs/ref/doctree.html#description -.. _docinfo: http://docutils.sourceforge.net/docs/ref/doctree.html#docinfo -.. _doctest_block: http://docutils.sourceforge.net/docs/ref/doctree.html#doctest-block -.. _document: http://docutils.sourceforge.net/docs/ref/doctree.html#document -.. _emphasis: http://docutils.sourceforge.net/docs/ref/doctree.html#emphasis - -.. _entry: http://docutils.sourceforge.net/docs/ref/doctree.html#entry -.. _enumerated_list: http://docutils.sourceforge.net/docs/ref/doctree.html#enumerated-list -.. _error: http://docutils.sourceforge.net/docs/ref/doctree.html#error -.. _field: http://docutils.sourceforge.net/docs/ref/doctree.html#field -.. _field_body: http://docutils.sourceforge.net/docs/ref/doctree.html#field-body -.. _field_list: http://docutils.sourceforge.net/docs/ref/doctree.html#field-list -.. _field_name: http://docutils.sourceforge.net/docs/ref/doctree.html#field-name -.. _figure: http://docutils.sourceforge.net/docs/ref/doctree.html#figure -.. _footer: http://docutils.sourceforge.net/docs/ref/doctree.html#footer - -.. _footnote: http://docutils.sourceforge.net/docs/ref/doctree.html#footnote -.. _footnote_reference: http://docutils.sourceforge.net/docs/ref/doctree.html#footnote-reference -.. _generated: http://docutils.sourceforge.net/docs/ref/doctree.html#generated -.. _header: http://docutils.sourceforge.net/docs/ref/doctree.html#header -.. _hint: http://docutils.sourceforge.net/docs/ref/doctree.html#hint -.. _image: http://docutils.sourceforge.net/docs/ref/doctree.html#image -.. _important: http://docutils.sourceforge.net/docs/ref/doctree.html#important -.. _inline: http://docutils.sourceforge.net/docs/ref/doctree.html#inline -.. _label: http://docutils.sourceforge.net/docs/ref/doctree.html#label - -.. _legend: http://docutils.sourceforge.net/docs/ref/doctree.html#legend -.. _line: http://docutils.sourceforge.net/docs/ref/doctree.html#line -.. _line_block: http://docutils.sourceforge.net/docs/ref/doctree.html#line-block -.. _list_item: http://docutils.sourceforge.net/docs/ref/doctree.html#list-item -.. _literal: http://docutils.sourceforge.net/docs/ref/doctree.html#literal -.. _literal_block: http://docutils.sourceforge.net/docs/ref/doctree.html#literal-block -.. _note: http://docutils.sourceforge.net/docs/ref/doctree.html#note -.. _option: http://docutils.sourceforge.net/docs/ref/doctree.html#option -.. _option_argument: http://docutils.sourceforge.net/docs/ref/doctree.html#option-argument - -.. _option_group: http://docutils.sourceforge.net/docs/ref/doctree.html#option-group -.. _option_list: http://docutils.sourceforge.net/docs/ref/doctree.html#option-list -.. _option_list_item: http://docutils.sourceforge.net/docs/ref/doctree.html#option-list-item -.. _option_string: http://docutils.sourceforge.net/docs/ref/doctree.html#option-string -.. _organization: http://docutils.sourceforge.net/docs/ref/doctree.html#organization -.. _paragraph: http://docutils.sourceforge.net/docs/ref/doctree.html#paragraph -.. _pending: http://docutils.sourceforge.net/docs/ref/doctree.html#pending -.. _problematic: http://docutils.sourceforge.net/docs/ref/doctree.html#problematic -.. _raw: http://docutils.sourceforge.net/docs/ref/doctree.html#raw - -.. _reference: http://docutils.sourceforge.net/docs/ref/doctree.html#reference -.. _revision: http://docutils.sourceforge.net/docs/ref/doctree.html#revision -.. _row: http://docutils.sourceforge.net/docs/ref/doctree.html#row -.. _rubric: http://docutils.sourceforge.net/docs/ref/doctree.html#rubric -.. _section: http://docutils.sourceforge.net/docs/ref/doctree.html#section -.. _sidebar: http://docutils.sourceforge.net/docs/ref/doctree.html#sidebar -.. _status: http://docutils.sourceforge.net/docs/ref/doctree.html#status -.. _strong: http://docutils.sourceforge.net/docs/ref/doctree.html#strong -.. _subscript: http://docutils.sourceforge.net/docs/ref/doctree.html#subscript - -.. _substitution_definition: http://docutils.sourceforge.net/docs/ref/doctree.html#substitution-definiti… -.. _substitution_reference: http://docutils.sourceforge.net/docs/ref/doctree.html#substitution-reference -.. _subtitle: http://docutils.sourceforge.net/docs/ref/doctree.html#subtitle -.. _superscript: http://docutils.sourceforge.net/docs/ref/doctree.html#superscript -.. _system_message: http://docutils.sourceforge.net/docs/ref/doctree.html#system-message -.. _table: http://docutils.sourceforge.net/docs/ref/doctree.html#table -.. _target: http://docutils.sourceforge.net/docs/ref/doctree.html#target -.. _tbody: http://docutils.sourceforge.net/docs/ref/doctree.html#tbody -.. _term: http://docutils.sourceforge.net/docs/ref/doctree.html#term - -.. _tgroup: http://docutils.sourceforge.net/docs/ref/doctree.html#tgroup -.. _thead: http://docutils.sourceforge.net/docs/ref/doctree.html#thead -.. _tip: http://docutils.sourceforge.net/docs/ref/doctree.html#tip -.. _title: http://docutils.sourceforge.net/docs/ref/doctree.html#title -.. _title_reference: http://docutils.sourceforge.net/docs/ref/doctree.html#title-reference -.. _topic: http://docutils.sourceforge.net/docs/ref/doctree.html#topic -.. _transition: http://docutils.sourceforge.net/docs/ref/doctree.html#transition -.. _version: http://docutils.sourceforge.net/docs/ref/doctree.html#version -.. _warning: http://docutils.sourceforge.net/docs/ref/doctree.html#warning - Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/images/biohazard.png =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/index.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/index.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/index.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -27,8 +27,8 @@ reStructuredText_ parser : JRst =============================== -Documentation utilisateur -========================= +User Documentation +================== .. contents:: @@ -43,16 +43,18 @@ document. RST has a so simple syntax that it becomes almost invisible. JRST uses Jython_ and DocUtils_ to transform RST_ files to XML to create a tree representation -document. It becomes easy to generate document representation towards differents -fomats. +document. It becomes easy to generate document representation towards different +formats. How to use it ------------- JRST takes a reStructuredText_ file and generates XML file. Which could be used to produce various files formats with generation XSL_ files. The available output formats are HTML, xhtml, -rst, pdf, docbook, odt(Open-Office), rtf, or XML [1]_. +rst, pdf, docbook or odt(Open-Office) [1]_. +If JRST is launched without arguments, a graphical user interface is displayed for the user. Thus, we can choose easily files, output type or external XSL stylesheets to apply. + :: JRST myfile.rst Copied: branches/jrst-docutils-jython/jrst-doc/src/site/resources/images/biohazard.png (from rev 685, branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/images/biohazard.png) =================================================================== (Binary files differ) Property changes on: branches/jrst-docutils-jython/jrst-doc/src/site/resources/images/biohazard.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:mergeinfo + Modified: branches/jrst-docutils-jython/jrst-doc/src/site/resources/schemas/diagrammeClass.png =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/jrst-doc/src/site/resources/schemas/diagrammeSequence.png =================================================================== (Binary files differ) Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/Todo.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/Todo.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/Todo.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -1,53 +0,0 @@ -.. - -.. * #%L -.. * JRst :: Documentation -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2009 - 2010 CodeLutin -.. * %% -.. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU Lesser General Public License as -.. * published by the Free Software Foundation, either version 3 of the -.. * License, or (at your option) any later version. -.. * -.. * This program is distributed in the hope that it will be useful, -.. * but WITHOUT ANY WARRANTY; without even the implied warranty of -.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.. * GNU General Lesser Public License for more details. -.. * -.. * You should have received a copy of the GNU General Lesser Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. -.. * #L% -.. - - -==== -Todo -==== - -Voici la liste des tâches qui reste à faire. Si quelqu'un souhaite aider, ou -a une idée à proposer il ne faut pas hésiter. - -- intégrer une date multiformat -- faire une feuille de style de conversion de xhtml -> xdoc - -- la documentation en anglais (si quelqu'un pouvait me relire :) ) -- faire une règle ant pour aider à la génération - <jrst include="..." exclude="..." destination="" extension="...."/> - destination est le répertoire destination - extension est la modification de l'extension des fichiers sources avec - cette extension - -- un export vers pretion, magic, ou autre outil de présentation. - -- permettre l'import de d'autre format que rst, par exemple .odt - ce qui permettra de convertir simplement du .odt en rst. - -- Faire une doclet qui permette d'écrire les Javadocs en RST - -- Correction du bug sur les URIResolver, lors de la génération DocBook -> fo - il va chercher les imports à la racine du jrst, et non dans le jar. - -- ajouter une directive pour supporter les equations mathematiques f(x)=a^3/x qui sera rendu graphiquement Modified: branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/docDeveloppeur.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/docDeveloppeur.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/docDeveloppeur.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -36,8 +36,14 @@ :alt: Diagramme de classes :align: center -La classe **JRST** contient la méthode main(), elle gère les options, la lecture et l'écriture des fichiers. Elle appelle dans un premier temps la classe **PythonInterpreter** de Jython_ permettant d'exécuter les scripts en Python de DocUtils_ pour générer un fichier XML intermédiaire. Ensuite, il ne reste qu'à appliquer le XSL désiré (si besoin) grâce à la classe **JRSTGenerator**. +La classe **JRST** contient la méthode main(), elle gère les options, la lecture et l'écriture des fichiers. Elle appelle dans un premier temps la classe **PythonInterpreter** de Jython_ permettant d'exécuter les scripts en Python de DocUtils_ pour générer un fichier XML intermédiaire. Ensuite, il ne reste qu'à appliquer le ou les XSL désiré(s) (si besoin) grâce à la classe **JRSTGenerator**. +Ce diagramme de séquence décrit le fonctionnement du parseur tout au long de la génération : + +.. image:: ../schemas/diagrammeSequence.png + :alt: Diagramme de séquence d'une génération + :align: center + La génération ============= @@ -50,9 +56,6 @@ * xml2rst.xsl (convertion de xml de docutils vers rst) : http://www.merten-home.de/FreeSoftware/xml2rst * dn2dbk.xsl (convertion de xml de docutils vers docbook) : http://membres.lycos.fr/ebellot/dn2dbk * les xsl de nwalsh (convertion de docbook vers FO et xhtml) : http://nwalsh.com - - * XMLmind (convertion de FO vers ODT et RTF) : http://www.xmlmind.com/foconverter/what_is_xfc.html - * FOP (convertion de FO vers PDF) : http://xmlgraphics.apache.org/fop * IText (convertion de HTML vers PDF) : http://itextpdf.com/ @@ -77,12 +80,6 @@ JRST -t html -o text.html text.rst -Ce diagramme de séquence décrit le fonctionnement du parseur tout au long de la génération : - -.. image:: ../schemas/diagrammeSequence.png - :alt: Diagramme de séquence d'une génération - :align: center - La Classe **JRSTGenerator**, grâce au fichier XSL rst2xhtml.xsl, renvoie le fichier html suivant:: <?xml version="1.0" encoding="UTF-8"?> Modified: branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/librairies.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/librairies.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/librairies.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -39,10 +39,10 @@ Librairie permettant la transformation XSL. -SDoc_ -===== +IText_ +====== -SDoc_ fournit des composants Swing qui inclut la coloration syntaxique pour de nombreux langages. +IText_ est une bibliothèque permettant de générer des documents PDF à partir de pages (x)HTML. Xmlunit_ ======== @@ -52,7 +52,7 @@ DocUtils_ ========= -DocUtils_ est un ensemble de scripts permettant de transformer des fichiers RST_ en formats plus répendus comme le HTML, ODT, Latex et bien plus encore. +DocUtils_ est un ensemble de scripts en Python permettant de transformer des fichiers RST_ en formats plus répendus comme le HTML, ODT, Latex et bien plus encore. Jython_ ======= @@ -61,7 +61,7 @@ .. _dom4j: http://www.dom4j.org .. _javax.xml.transform: http://java.sun.com/javase/6/docs/api/javax/xml/transform/package-summary.h… -.. _SDoc: http://sdoc.sourceforge.net/wiki/pmwiki.php +.. _IText: http://itextpdf.com/ .. _Xmlunit: http://xmlunit.sourceforge.net/ .. _RST: http://docutils.sourceforge.net/rst.html .. _DocUtils: http://docutils.sourceforge.net/docs/ref/doctree.html Modified: branches/jrst-docutils-jython/jrst-doc/src/site/rst/index.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/rst/index.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/rst/index.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -52,8 +52,10 @@ JRST prend un fichier reStructuredText_ en entrée et génère un fichier XML qui pourra ensuite servir à produire divers formats de fichiers grâce à des fichiers XSL de générations. Les formats de sortie disponibles sont le html, le xhtml, le rst, -le pdf, le docbook_, le odt (Open-Office), le rtf, ou encore le XML [1]_. +le pdf, le docbook_ ou de l'odt (Open-Office) [1]_. +Lorsque JRST est lancé sans argument, une interface graphique est proposée à l'utilisateur. Ainsi, on peut choisir plus aisément les fichiers, le type de sortie ou bien les feuilles de style XSL externes à appliquer. + :: JRST myfile.rst Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/fonctionnalites.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/fonctionnalites.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/fonctionnalites.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -1,273 +0,0 @@ -.. - -.. * #%L -.. * JRst :: Documentation -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2009 - 2010 CodeLutin -.. * %% -.. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU Lesser General Public License as -.. * published by the Free Software Foundation, either version 3 of the -.. * License, or (at your option) any later version. -.. * -.. * This program is distributed in the hope that it will be useful, -.. * but WITHOUT ANY WARRANTY; without even the implied warranty of -.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.. * GNU General Lesser Public License for more details. -.. * -.. * You should have received a copy of the GNU General Lesser Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. -.. * #L% -.. - - -========================= -Fonctionnalités proposées -========================= - -La DTD de Docutils : http://docutils.sourceforge.net/docs/ref/doctree.html - -.. contents:: Sommaire - -Fonctionnalités implantées -========================== - -Element racine --------------- - -- document_ - -Elements titre --------------- - -- subtitle_ -- title_ - -Elements bibliographiques -------------------------- - -- docinfo_ -- author_ -- authors_ -- organization_ -- address_ -- contact_ -- version_ -- revision_ -- status_ -- date_ -- copyright_ - -Elements de décoration ----------------------- - -- decoration_ -- footer_ -- header_ - -Elements structurels --------------------- - -- section_ -- topic_ -- sidebar_ -- transition_ - -Elements du corps ------------------ - -- admonition_ -- attention_ -- block_quote_ -- bullet_list_ -- caution_ -- classifier_ -- danger_ -- definition_ -- definition_list_ -- definition_list_item_ -- description_ -- doctest_block_ -- enumerated_list_ -- error_ -- field_ -- field_body_ -- field_list_ -- field_name_ -- footnote_ -- hint_ -- image_ -- important_ -- line_ -- line_block_ -- list_item_ -- literal_block_ -- note_ -- option_ -- option_argument_ -- option_group_ -- option_list_ -- option_list_item_ -- option_string_ -- paragraph_ -- term_ -- tip_ -- warning_ - -Elements des tableaux ---------------------- - -- table_ -- tbody_ -- entry_ -- row_ -- colspec_ -- thead_ -- tgroup_ - -Elements de la ligne --------------------- - -- emphasis_ -- strong_ -- literal_ -- reference_ -- footnote_reference_ - -Fonctionnalités non-implantées -============================== - -- abbreviation_ -- acronym_ -- attribution_ -- caption_ -- citation_ -- citation_reference_ -- comment_ -- compound_ -- container_ -- figure_ -- generated_ -- inline_ -- label_ -- legend_ -- pending_ -- problematic_ -- raw_ -- rubric_ -- subscript_ -- substitution_definition_ -- substitution_reference_ -- superscript_ -- system_message_ -- target_ -- title_reference_ - -.. _abbreviation: http://docutils.sourceforge.net/docs/ref/doctree.html#abbreviation -.. _acronym: http://docutils.sourceforge.net/docs/ref/doctree.html#acronym -.. _address: http://docutils.sourceforge.net/docs/ref/doctree.html#address -.. _admonition: http://docutils.sourceforge.net/docs/ref/doctree.html#admonition -.. _attention: http://docutils.sourceforge.net/docs/ref/doctree.html#attention - -.. _attribution: http://docutils.sourceforge.net/docs/ref/doctree.html#attribution -.. _author: http://docutils.sourceforge.net/docs/ref/doctree.html#author -.. _authors: http://docutils.sourceforge.net/docs/ref/doctree.html#authors -.. _block_quote: http://docutils.sourceforge.net/docs/ref/doctree.html#block-quote -.. _bullet_list: http://docutils.sourceforge.net/docs/ref/doctree.html#bullet-list -.. _caption: http://docutils.sourceforge.net/docs/ref/doctree.html#caption -.. _caution: http://docutils.sourceforge.net/docs/ref/doctree.html#caution -.. _citation: http://docutils.sourceforge.net/docs/ref/doctree.html#citation -.. _citation_reference: http://docutils.sourceforge.net/docs/ref/doctree.html#citation-reference - -.. _classifier: http://docutils.sourceforge.net/docs/ref/doctree.html#classifier -.. _colspec: http://docutils.sourceforge.net/docs/ref/doctree.html#colspec -.. _comment: http://docutils.sourceforge.net/docs/ref/doctree.html#comment -.. _compound: http://docutils.sourceforge.net/docs/ref/doctree.html#compound -.. _contact: http://docutils.sourceforge.net/docs/ref/doctree.html#contact -.. _container: http://docutils.sourceforge.net/docs/ref/doctree.html#container -.. _copyright: http://docutils.sourceforge.net/docs/ref/doctree.html#copyright -.. _danger: http://docutils.sourceforge.net/docs/ref/doctree.html#danger -.. _date: http://docutils.sourceforge.net/docs/ref/doctree.html#date - -.. _decoration: http://docutils.sourceforge.net/docs/ref/doctree.html#decoration -.. _definition: http://docutils.sourceforge.net/docs/ref/doctree.html#definition -.. _definition_list: http://docutils.sourceforge.net/docs/ref/doctree.html#definition-list -.. _definition_list_item: http://docutils.sourceforge.net/docs/ref/doctree.html#definition-list-item -.. _description: http://docutils.sourceforge.net/docs/ref/doctree.html#description -.. _docinfo: http://docutils.sourceforge.net/docs/ref/doctree.html#docinfo -.. _doctest_block: http://docutils.sourceforge.net/docs/ref/doctree.html#doctest-block -.. _document: http://docutils.sourceforge.net/docs/ref/doctree.html#document -.. _emphasis: http://docutils.sourceforge.net/docs/ref/doctree.html#emphasis - -.. _entry: http://docutils.sourceforge.net/docs/ref/doctree.html#entry -.. _enumerated_list: http://docutils.sourceforge.net/docs/ref/doctree.html#enumerated-list -.. _error: http://docutils.sourceforge.net/docs/ref/doctree.html#error -.. _field: http://docutils.sourceforge.net/docs/ref/doctree.html#field -.. _field_body: http://docutils.sourceforge.net/docs/ref/doctree.html#field-body -.. _field_list: http://docutils.sourceforge.net/docs/ref/doctree.html#field-list -.. _field_name: http://docutils.sourceforge.net/docs/ref/doctree.html#field-name -.. _figure: http://docutils.sourceforge.net/docs/ref/doctree.html#figure -.. _footer: http://docutils.sourceforge.net/docs/ref/doctree.html#footer - -.. _footnote: http://docutils.sourceforge.net/docs/ref/doctree.html#footnote -.. _footnote_reference: http://docutils.sourceforge.net/docs/ref/doctree.html#footnote-reference -.. _generated: http://docutils.sourceforge.net/docs/ref/doctree.html#generated -.. _header: http://docutils.sourceforge.net/docs/ref/doctree.html#header -.. _hint: http://docutils.sourceforge.net/docs/ref/doctree.html#hint -.. _image: http://docutils.sourceforge.net/docs/ref/doctree.html#image -.. _important: http://docutils.sourceforge.net/docs/ref/doctree.html#important -.. _inline: http://docutils.sourceforge.net/docs/ref/doctree.html#inline -.. _label: http://docutils.sourceforge.net/docs/ref/doctree.html#label - -.. _legend: http://docutils.sourceforge.net/docs/ref/doctree.html#legend -.. _line: http://docutils.sourceforge.net/docs/ref/doctree.html#line -.. _line_block: http://docutils.sourceforge.net/docs/ref/doctree.html#line-block -.. _list_item: http://docutils.sourceforge.net/docs/ref/doctree.html#list-item -.. _literal: http://docutils.sourceforge.net/docs/ref/doctree.html#literal -.. _literal_block: http://docutils.sourceforge.net/docs/ref/doctree.html#literal-block -.. _note: http://docutils.sourceforge.net/docs/ref/doctree.html#note -.. _option: http://docutils.sourceforge.net/docs/ref/doctree.html#option -.. _option_argument: http://docutils.sourceforge.net/docs/ref/doctree.html#option-argument - -.. _option_group: http://docutils.sourceforge.net/docs/ref/doctree.html#option-group -.. _option_list: http://docutils.sourceforge.net/docs/ref/doctree.html#option-list -.. _option_list_item: http://docutils.sourceforge.net/docs/ref/doctree.html#option-list-item -.. _option_string: http://docutils.sourceforge.net/docs/ref/doctree.html#option-string -.. _organization: http://docutils.sourceforge.net/docs/ref/doctree.html#organization -.. _paragraph: http://docutils.sourceforge.net/docs/ref/doctree.html#paragraph -.. _pending: http://docutils.sourceforge.net/docs/ref/doctree.html#pending -.. _problematic: http://docutils.sourceforge.net/docs/ref/doctree.html#problematic -.. _raw: http://docutils.sourceforge.net/docs/ref/doctree.html#raw - -.. _reference: http://docutils.sourceforge.net/docs/ref/doctree.html#reference -.. _revision: http://docutils.sourceforge.net/docs/ref/doctree.html#revision -.. _row: http://docutils.sourceforge.net/docs/ref/doctree.html#row -.. _rubric: http://docutils.sourceforge.net/docs/ref/doctree.html#rubric -.. _section: http://docutils.sourceforge.net/docs/ref/doctree.html#section -.. _sidebar: http://docutils.sourceforge.net/docs/ref/doctree.html#sidebar -.. _status: http://docutils.sourceforge.net/docs/ref/doctree.html#status -.. _strong: http://docutils.sourceforge.net/docs/ref/doctree.html#strong -.. _subscript: http://docutils.sourceforge.net/docs/ref/doctree.html#subscript - -.. _substitution_definition: http://docutils.sourceforge.net/docs/ref/doctree.html#substitution-definiti… -.. _substitution_reference: http://docutils.sourceforge.net/docs/ref/doctree.html#substitution-reference -.. _subtitle: http://docutils.sourceforge.net/docs/ref/doctree.html#subtitle -.. _superscript: http://docutils.sourceforge.net/docs/ref/doctree.html#superscript -.. _system_message: http://docutils.sourceforge.net/docs/ref/doctree.html#system-message -.. _table: http://docutils.sourceforge.net/docs/ref/doctree.html#table -.. _target: http://docutils.sourceforge.net/docs/ref/doctree.html#target -.. _tbody: http://docutils.sourceforge.net/docs/ref/doctree.html#tbody -.. _term: http://docutils.sourceforge.net/docs/ref/doctree.html#term - -.. _tgroup: http://docutils.sourceforge.net/docs/ref/doctree.html#tgroup -.. _thead: http://docutils.sourceforge.net/docs/ref/doctree.html#thead -.. _tip: http://docutils.sourceforge.net/docs/ref/doctree.html#tip -.. _title: http://docutils.sourceforge.net/docs/ref/doctree.html#title -.. _title_reference: http://docutils.sourceforge.net/docs/ref/doctree.html#title-reference -.. _topic: http://docutils.sourceforge.net/docs/ref/doctree.html#topic -.. _transition: http://docutils.sourceforge.net/docs/ref/doctree.html#transition -.. _version: http://docutils.sourceforge.net/docs/ref/doctree.html#version -.. _warning: http://docutils.sourceforge.net/docs/ref/doctree.html#warning - Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/images/biohazard.png =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/index.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/index.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/index.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -52,8 +52,10 @@ JRST prend un fichier reStructuredText_ en entrée et génère un fichier XML qui pourra ensuite servir à produire divers formats de fichiers grâce à des fichiers XSL de générations. Les formats de sortie disponibles sont le html, le xhtml, le rst, -le pdf, le docbook_, le odt (Open-Office), le rtf, ou encore le XML [1]_. +le pdf, le docbook_ ou de l'odt (Open-Office) [1]_. +Lorsque JRST est lancé sans argument, une interface graphique est proposée à l'utilisateur. Ainsi, on peut choisir plus aisément les fichiers, le type de sortie ou bien les feuilles de style XSL externes à appliquer. + :: JRST myfile.rst Modified: branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/presentationRST.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/presentationRST.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/presentationRST.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -340,18 +340,18 @@ ``image``. Par exemple:: - .. image:: images/biohazard.png + .. image:: ../images/biohazard.png Le résultat: -.. image:: images/biohazard.png +.. image:: ../images/biohazard.png -La partie ``images/biohazard.png`` indique le chemin d'accès au fichier +La partie ``../images/biohazard.png`` indique le chemin d'accès au fichier de l'image qui doit apparaître. Il n'y a pas de restriction sur l'image (format, taille etc). Si l'image doit apparaître en HTML et que vous souhaitez lui ajouter des informations:: - .. image:: images/biohazard.png + .. image:: ../images/biohazard.png :height: 100 :width: 200 :scale: 50 Modified: branches/jrst-docutils-jython/jrst-doc/src/site/site_en.xml =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/site_en.xml 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/site_en.xml 2012-05-30 15:34:49 UTC (rev 688) @@ -57,14 +57,12 @@ <menu name="User"> <item href="/user/index.html" name="About"/> <item href="/user/RSTpresentation.html" name="A ReStructuredText Primer"/> - <item href="/user/functionality.html" name="Functionalities suggested"/> </menu> <menu name="Developer"> <item name="Documentation" href="/devel/developerDoc.html"/> <item name="A XSL primer" href="/devel/XSLpresentation.html"/> <item name="Librairy used" href="/devel/library.html"/> - <item name="Todo" href="/devel/Todo.html"/> <item name="External documentation" href="/devel/externalDoc.html"/> </menu> Modified: branches/jrst-docutils-jython/jrst-doc/src/site/site_fr.xml =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/site_fr.xml 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/site_fr.xml 2012-05-30 15:34:49 UTC (rev 688) @@ -54,17 +54,15 @@ <menu ref="parent"/> <menu name="Utilisateur"> - <item href="/user/index.html" name="Présentation du JRST"/> + <item href="/user/index.html" name="Présentation de JRST"/> <item href="/user/presentationRST.html" name="Introduction à ReStructuredText"/> - <item href="/user/fonctionnalites.html" name="Fonctionnalités incluses"/> </menu> <menu name="Developpeur"> <item name="Fonctionnement" href="/devel/docDeveloppeur.html"/> - <item name="Presentation au XSL" href="/devel/presentationXSL.html"/> + <item name="Presentation du XSL" href="/devel/presentationXSL.html"/> <item name="Librairies utilisées" href="/devel/librairies.html"/> - <item name="Todo" href="/devel/Todo.html"/> <item name="Documentation externe" href="/devel/docExterne.html"/> </menu>

1 0

r687 - in branches/jrst-docutils-jython: . jrst
by sletellier＠users.nuiton.org May 30, 2012

May 30, 2012

Author: sletellier Date: 2012-05-30 14:55:52 +0200 (Wed, 30 May 2012) New Revision: 687 Url: http://nuiton.org/repositories/revision/jrst/687 Log: Remove sdoc dependency and clean pom Modified: branches/jrst-docutils-jython/jrst/pom.xml branches/jrst-docutils-jython/pom.xml Modified: branches/jrst-docutils-jython/jrst/pom.xml =================================================================== --- branches/jrst-docutils-jython/jrst/pom.xml 2012-05-30 10:14:27 UTC (rev 686) +++ branches/jrst-docutils-jython/jrst/pom.xml 2012-05-30 12:55:52 UTC (rev 687) @@ -93,26 +93,7 @@ <classifier>resources</classifier> </dependency> -  <dependency> - <groupId>xmlunit</groupId> - <artifactId>xmlunit</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>sdoc</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>runtime</scope> @@ -123,7 +104,7 @@ <artifactId>jython-standalone</artifactId> </dependency> -  +  <dependency> <groupId>org.xhtmlrenderer</groupId> <artifactId>core-renderer</artifactId> @@ -136,6 +117,19 @@ <version>2.0.8</version> </dependency> +  + <dependency> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies>  Modified: branches/jrst-docutils-jython/pom.xml =================================================================== --- branches/jrst-docutils-jython/pom.xml 2012-05-30 10:14:27 UTC (rev 686) +++ branches/jrst-docutils-jython/pom.xml 2012-05-30 12:55:52 UTC (rev 687) @@ -214,13 +214,6 @@ </dependency> <dependency> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>sdoc</artifactId> - <version>0.5.0-beta-patchcl</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <version>1.6.1</version>

1 0

r686 - in branches/jrst-docutils-jython/jrst/src: main/resources/xsl test/java/org/nuiton/jrst/bugs test/resources/bugs
by jpages＠users.nuiton.org May 30, 2012

May 30, 2012

Author: jpages Date: 2012-05-30 12:14:27 +0200 (Wed, 30 May 2012) New Revision: 686 Url: http://nuiton.org/repositories/revision/jrst/686 Log: Cr?\195?\169ation d'une classe de test sur les mesages d'erreur. Affichage des erreurs dans le xdoc ou html g?\195?\169n?\195?\169r?\195?\169 pour faciliter la correction de la documentation. fixed #2117 Les messages sont maintenant pris en compte dans les feuilles xsl, ce qui permet d'afficher les messages (niveau d'erreur, ligne, description) dans les fichiers xdoc ou html. Added: branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/ErrorsTest.java branches/jrst-docutils-jython/jrst/src/test/resources/bugs/testDisplayErrors.rst Modified: branches/jrst-docutils-jython/jrst/src/main/resources/xsl/rst2xhtml.xsl Modified: branches/jrst-docutils-jython/jrst/src/main/resources/xsl/rst2xhtml.xsl =================================================================== --- branches/jrst-docutils-jython/jrst/src/main/resources/xsl/rst2xhtml.xsl 2012-05-29 15:37:18 UTC (rev 685) +++ branches/jrst-docutils-jython/jrst/src/main/resources/xsl/rst2xhtml.xsl 2012-05-30 10:14:27 UTC (rev 686) @@ -517,5 +517,14 @@ [<xsl:value-of select="text()"/>] </a> </xsl:template> - + + <xsl:template match="system_message"> + <div class="system-message" style="border: medium outset; padding: 1em;"> + <p class="system-message-title" style="color: red; font-weight: bold;"> + System Message: <xsl:value-of select="@type"/>/<xsl:value-of select="@level"/> (line <xsl:value-of select="@line"/>) + </p> + <xsl:value-of select="paragraph"/> + </div> + </xsl:template> + </xsl:stylesheet> Added: branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/ErrorsTest.java =================================================================== --- branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/ErrorsTest.java (rev 0) +++ branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/bugs/ErrorsTest.java 2012-05-30 10:14:27 UTC (rev 686) @@ -0,0 +1,38 @@ +package org.nuiton.jrst.bugs; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Test; +import org.nuiton.jrst.JRST; +import org.nuiton.jrst.JRSTAbstractTest; + +import java.io.File; + +/** + * Test about the display of warning or errors in the generated site + * + * @author jpages + */ +public class ErrorsTest extends JRSTAbstractTest { + + /** + * Tests if rst warnings or errors are displayed in the generated html + * + * @throws Exception + */ + @Test + public void testDisplayErrors() throws Exception { + File in = getBugTestFile("testDisplayErrors.rst"); + File out = getOutputTestFile("jrst-testDisplayErrors.html"); + + JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + String content = FileUtils.readFileToString(out, JRST.UTF_8); + + assertTrue(content.contains("Explicit markup ends without a blank line; unexpected unindent.")); + assertTrue(content.contains("Literal block ends without a blank line; unexpected unindent.")); + assertTrue(content.contains("Inline literal start-string without end-string.")); + assertTrue(content.contains("Duplicate target name, cannot be used as a unique reference: " + + "\"dossier contenant tous les fichiers nécessaires à ce plan\".")); + } +} Added: branches/jrst-docutils-jython/jrst/src/test/resources/bugs/testDisplayErrors.rst =================================================================== --- branches/jrst-docutils-jython/jrst/src/test/resources/bugs/testDisplayErrors.rst (rev 0) +++ branches/jrst-docutils-jython/jrst/src/test/resources/bugs/testDisplayErrors.rst 2012-05-30 10:14:27 UTC (rev 686) @@ -0,0 +1,74 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id: testDisplayErrors.rst 608 2011-08-18 09:25:35Z jpages $ +.. * $HeadURL: http://svn.nuiton.org/svn/jrst/branches/jrst-docutils-jython/jrst/src/test/… $ +.. * %% +.. * Copyright (C) 2004 - 2011 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - +=================== +Test display errors +=================== + +Testons différents types d'erreur : + +Saut de ligne manquant avant le "ou": +===================================== + +JRST propose de transformer le XML de docutils avec des fichiers XSL externe. +Pour cela, il faut utiliser la commande:: + + JRST -x fichierXSL, fichierXSL2 fichierRST +ou:: + + JRST --xslFile fichierXSL, fichierXSL2 fichierRST + + +Espace manquant avant "personne" : +================================== + +======= =============== =============================================== +Pattern Exemple Signification +======= =============== =============================================== +* * Motif "joker" désignant n'importe quel élément +``//`` ``//``personne Indique tous les descendants d'un noeud +. . Caractérise le noeud courant +``..`` ``..`` Désigne le noeud parent +======= =============== =============================================== + + +Erreur causées par plusieurs liens "Dossier" : +============================================== + +Plan qui modifie les regles de gestion / modifying management rules +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Sigrid V 3.3.0.8 , Plan d'analyse pour la pecherie anchois : modifie les regles +de gestion a chaque simulation `Dossier contenant tous les fichiers nécessaires à ce plan`_ + +.. _Dossier contenant tous les fichiers nécessaires à ce plan: ../downloads/PlanModifRules.zip + +Plan qui modifie regle de gestion et parametres / modify rules and parameters +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Sigrid V 3.3.0.8 , Plan d'analyse pour la pecherie anchois : modifie les regles +de gestion, et des parametres (equations et nb de jours d'inactivite) a chaque +simulation `Dossier contenant tous les fichiers nécessaires à ce plan`_ + +.. _Dossier contenant tous les fichiers nécessaires à ce plan: ../downloads/PlanRulesParam.zip

1 0

r685 - in branches/jrst-docutils-jython: doxia-module-jrst/src/main/java/org/nuiton/jrst jrst-doc/src/site/en/rst/devel
by jpages＠users.nuiton.org May 29, 2012

May 29, 2012

Author: jpages Date: 2012-05-29 17:37:18 +0200 (Tue, 29 May 2012) New Revision: 685 Url: http://nuiton.org/repositories/revision/jrst/685 Log: Correction des images dans la doc anglaise et mise en commentaire de la suppression des fichiers temporaires dans JrstParser.java Modified: branches/jrst-docutils-jython/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/developerDoc.rst Modified: branches/jrst-docutils-jython/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java =================================================================== --- branches/jrst-docutils-jython/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 2012-05-29 10:18:59 UTC (rev 684) +++ branches/jrst-docutils-jython/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 2012-05-29 15:37:18 UTC (rev 685) @@ -55,12 +55,11 @@ try { // Write the source in a file to use it with JRST File sourceFile = File.createTempFile("source",".rst"); - sourceFile.deleteOnExit(); + // sourceFile.deleteOnExit(); FileWriter fileWriter = new FileWriter(sourceFile); IOUtil.copy(source, fileWriter); // Generation of the xml file - // Transformation to XML Document doc = JRST.generateDocutils(sourceFile); // Application of xsl stylesheets Modified: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/developerDoc.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/developerDoc.rst 2012-05-29 10:18:59 UTC (rev 684) +++ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/developerDoc.rst 2012-05-29 15:37:18 UTC (rev 685) @@ -32,14 +32,16 @@ Class diagram ============= -|classDiagramme| +.. image:: ../../schemas/diagrammeGeneration.png + :align: center **JRST** Class contents main() method, it's looking after options, files reading and writing. Iinitially, it calls Jython_ class **PythonInterpreter** which allows to execute DocUtils' Python script to generate an intermediate file. Then it only remains to apply the wish XSL (if needed) by using **JRSTGenerator** Class. Generation ========== -|diagrammeGeneration| +.. image:: ../../schemas/classDiagramme.png + :align: center Links : @@ -74,7 +76,8 @@ This sequence diagramme describes the parser's mechanism throughout the generation : -|sequenceDiagramme| +.. image:: ../../schemas/diagrammeSequence.png + :align: center **JRSTGenerator** Class with the XSL file rst2xhtml.xsl, returns following html file:: @@ -141,6 +144,3 @@ .. _Cascading Style Sheets: http://en.wikipedia.org/wiki/Cascading_Style_Sheets .. _DocUtils: http://docutils.sourceforge.net/docs/ref/doctree.html .. _Jython: http://jython.org/index.html -.. |diagrammeGeneration| image:: images/diagrammeGeneration.png -.. |classDiagramme| image:: images/diagrammeClass.png -.. |sequenceDiagramme| image:: images/diagrammeSequence.png

1 0

r684 - branches/jrst-docutils-jython/jrst/src/main/resources/xsl
by jpages＠users.nuiton.org May 29, 2012

May 29, 2012

Author: jpages Date: 2012-05-29 12:18:59 +0200 (Tue, 29 May 2012) New Revision: 684 Url: http://nuiton.org/repositories/revision/jrst/684 Log: Correction d'un autre probl?\195?\168me au sujet des ancres Modified: branches/jrst-docutils-jython/jrst/src/main/resources/xsl/rst2xhtml.xsl Modified: branches/jrst-docutils-jython/jrst/src/main/resources/xsl/rst2xhtml.xsl =================================================================== --- branches/jrst-docutils-jython/jrst/src/main/resources/xsl/rst2xhtml.xsl 2012-05-29 10:01:19 UTC (rev 683) +++ branches/jrst-docutils-jython/jrst/src/main/resources/xsl/rst2xhtml.xsl 2012-05-29 10:18:59 UTC (rev 684) @@ -143,7 +143,7 @@ </xsl:template> <xsl:template match="section"> - <a name="{@ids}"></a> + <a name="{@ids}" id="{@ids}"></a> <xsl:apply-templates/> </xsl:template>

1 0

r683 - in branches/jrst-docutils-jython: jrst/src/main/resources/xsl src/site
by jpages＠users.nuiton.org May 29, 2012

May 29, 2012

Author: jpages Date: 2012-05-29 12:01:19 +0200 (Tue, 29 May 2012) New Revision: 683 Url: http://nuiton.org/repositories/revision/jrst/683 Log: Correction des ancres dans la g?\195?\169n?\195?\169ration du html Modified: branches/jrst-docutils-jython/jrst/src/main/resources/xsl/rst2xhtml.xsl branches/jrst-docutils-jython/src/site/site_en.xml branches/jrst-docutils-jython/src/site/site_fr.xml Modified: branches/jrst-docutils-jython/jrst/src/main/resources/xsl/rst2xhtml.xsl =================================================================== --- branches/jrst-docutils-jython/jrst/src/main/resources/xsl/rst2xhtml.xsl 2012-05-29 09:02:20 UTC (rev 682) +++ branches/jrst-docutils-jython/jrst/src/main/resources/xsl/rst2xhtml.xsl 2012-05-29 10:01:19 UTC (rev 683) @@ -143,7 +143,7 @@ </xsl:template> <xsl:template match="section"> - <a name="{@id}"></a> + <a name="{@ids}"></a> <xsl:apply-templates/> </xsl:template> @@ -161,10 +161,10 @@ <xsl:template match="reference"> <xsl:if test="@refid"> - <a href="{@refuri}#{@refid}" id="{@id}"><xsl:apply-templates/></a> + <a href="{@refuri}#{@refid}" id="{@ids}"><xsl:apply-templates/></a> </xsl:if> <xsl:if test="not(@refid)"> - <a href="{@refuri}" id="{@id}"><xsl:apply-templates/></a> + <a href="{@refuri}" id="{@ids}"><xsl:apply-templates/></a> </xsl:if> </xsl:template> Modified: branches/jrst-docutils-jython/src/site/site_en.xml =================================================================== --- branches/jrst-docutils-jython/src/site/site_en.xml 2012-05-29 09:02:20 UTC (rev 682) +++ branches/jrst-docutils-jython/src/site/site_en.xml 2012-05-29 10:01:19 UTC (rev 683) @@ -70,9 +70,6 @@ <menu name="Language"> <item name="Français" href="../index.html"/> <item name="English" href="index.html"/> - <item name="Nuiton.org" href="http://nuiton.org"/> - <item name="Code Lutin" href="http://www.codelutin.com"/> - <item name="Libre entreprise" href="http://www.libre-entreprise.org"/> </menu> <menu name="Community"> Modified: branches/jrst-docutils-jython/src/site/site_fr.xml =================================================================== --- branches/jrst-docutils-jython/src/site/site_fr.xml 2012-05-29 09:02:20 UTC (rev 682) +++ branches/jrst-docutils-jython/src/site/site_fr.xml 2012-05-29 10:01:19 UTC (rev 683) @@ -72,9 +72,6 @@ <menu name="Langue"> <item name="Français" href="index.html"/> <item name="English" href="./en/index.html"/> - <item name="Nuiton.org" href="http://nuiton.org"/> - <item name="Code Lutin" href="http://www.codelutin.com"/> - <item name="Libre entreprise" href="http://www.libre-entreprise.org"/> </menu> <menu name="Communauté">

1 0

r682 - in branches/jrst-docutils-jython/src/site: . resources resources/images resources/images/logos
by jpages＠users.nuiton.org May 29, 2012

May 29, 2012

Author: jpages Date: 2012-05-29 11:02:20 +0200 (Tue, 29 May 2012) New Revision: 682 Url: http://nuiton.org/repositories/revision/jrst/682 Log: Ajout des images des logos du projet Added: branches/jrst-docutils-jython/src/site/resources/ branches/jrst-docutils-jython/src/site/resources/images/ branches/jrst-docutils-jython/src/site/resources/images/logos/ branches/jrst-docutils-jython/src/site/resources/images/logos/jrst-logo.png branches/jrst-docutils-jython/src/site/resources/images/logos/restructuredtext-logo.png Added: branches/jrst-docutils-jython/src/site/resources/images/logos/jrst-logo.png =================================================================== (Binary files differ) Property changes on: branches/jrst-docutils-jython/src/site/resources/images/logos/jrst-logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jrst-docutils-jython/src/site/resources/images/logos/restructuredtext-logo.png =================================================================== (Binary files differ) Property changes on: branches/jrst-docutils-jython/src/site/resources/images/logos/restructuredtext-logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r681 - branches/jrst-docutils-jython
by jpages＠users.nuiton.org May 29, 2012

May 29, 2012

Author: jpages Date: 2012-05-29 10:57:14 +0200 (Tue, 29 May 2012) New Revision: 681 Url: http://nuiton.org/repositories/revision/jrst/681 Log: Ajout du profil maven-project-info-reports-plugin dans le pom du projet Modified: branches/jrst-docutils-jython/pom.xml Modified: branches/jrst-docutils-jython/pom.xml =================================================================== --- branches/jrst-docutils-jython/pom.xml 2012-05-29 08:47:10 UTC (rev 680) +++ branches/jrst-docutils-jython/pom.xml 2012-05-29 08:57:14 UTC (rev 681) @@ -456,6 +456,49 @@ <module>maven-jrst-plugin</module> </modules> </profile> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + </plugins> + </reporting> + + </profile> + </profiles> + + </project>

1 0