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

r564 - in trunk: . doxia-module-jrst jrst jrst-doc maven-jrst-plugin
by echatellier＠users.nuiton.org March 14, 2011

March 14, 2011

Author: echatellier Date: 2011-03-14 15:44:51 +0100 (Mon, 14 Mar 2011) New Revision: 564 Url: http://nuiton.org/repositories/revision/jrst/564 Log: Change next version to 1.3 Modified: trunk/doxia-module-jrst/pom.xml trunk/jrst-doc/pom.xml trunk/jrst/pom.xml trunk/maven-jrst-plugin/pom.xml trunk/pom.xml Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2011-03-14 14:42:35 UTC (rev 563) +++ trunk/doxia-module-jrst/pom.xml 2011-03-14 14:44:51 UTC (rev 564) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> @@ -154,4 +154,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2011-03-14 14:42:35 UTC (rev 563) +++ trunk/jrst/pom.xml 2011-03-14 14:44:51 UTC (rev 564) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2011-03-14 14:42:35 UTC (rev 563) +++ trunk/jrst-doc/pom.xml 2011-03-14 14:44:51 UTC (rev 564) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2011-03-14 14:42:35 UTC (rev 563) +++ trunk/maven-jrst-plugin/pom.xml 2011-03-14 14:44:51 UTC (rev 564) @@ -37,7 +37,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-14 14:42:35 UTC (rev 563) +++ trunk/pom.xml 2011-03-14 14:44:51 UTC (rev 564) @@ -37,7 +37,7 @@ </parent> <artifactId>jrst</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> <modules> <module>jrst</module>

1 0

r563 - trunk/jrst/src/test/java/org/nuiton/jrst/bugs
by echatellier＠users.nuiton.org March 14, 2011

March 14, 2011

Author: echatellier Date: 2011-03-14 15:42:35 +0100 (Mon, 14 Mar 2011) New Revision: 563 Url: http://nuiton.org/repositories/revision/jrst/563 Log: Remove sysout Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java 2011-03-12 14:21:27 UTC (rev 562) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java 2011-03-14 14:42:35 UTC (rev 563) @@ -58,7 +58,6 @@ JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); - System.out.println(content); Assert.assertTrue(content.indexOf("Annee|Trait|Espece") > 0); Assert.assertTrue(content.indexOf("Fatal") > 0); } @@ -76,7 +75,6 @@ JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); - System.out.println(content); Assert.assertTrue(content.indexOf("légérs") > 0); } }

1 0

r562 - trunk
by tchemit＠users.nuiton.org March 12, 2011

March 12, 2011

Author: tchemit Date: 2011-03-12 15:21:27 +0100 (Sat, 12 Mar 2011) New Revision: 562 Url: http://nuiton.org/repositories/revision/jrst/562 Log: Update mavenpom4redmineAndCentral to 2.5.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-10 15:37:56 UTC (rev 561) +++ trunk/pom.xml 2011-03-12 14:21:27 UTC (rev 562) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.1</version> + <version>2.5.2</version> </parent> <artifactId>jrst</artifactId>

1 0

r561 - in trunk/jrst/src/test: java/org/nuiton/jrst/bugs resources/bugs
by echatellier＠users.nuiton.org March 10, 2011

March 10, 2011

Author: echatellier Date: 2011-03-10 16:37:56 +0100 (Thu, 10 Mar 2011) New Revision: 561 Url: http://nuiton.org/repositories/revision/jrst/561 Log: Add test case Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java trunk/jrst/src/test/resources/bugs/testLinks.rst Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-03-10 14:30:32 UTC (rev 560) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-03-10 15:37:56 UTC (rev 561) @@ -140,5 +140,6 @@ String content = FileUtils.readFileToString(out); Assert.assertTrue(content.indexOf("echapement de lien1_") > 0); + Assert.assertTrue(content.indexOf("echapement de *.txt") > 0); } } Modified: trunk/jrst/src/test/resources/bugs/testLinks.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testLinks.rst 2011-03-10 14:30:32 UTC (rev 560) +++ trunk/jrst/src/test/resources/bugs/testLinks.rst 2011-03-10 15:37:56 UTC (rev 561) @@ -16,3 +16,6 @@ Test d'echapement de *\lien2_*. Test d'echapement de **\lien3_**. + +Test d'echapement de \*.txt. +

1 0

r560 - trunk/jrst/src/test/java/org/nuiton/jrst/bugs
by echatellier＠users.nuiton.org March 10, 2011

March 10, 2011

Author: echatellier Date: 2011-03-10 15:30:32 +0100 (Thu, 10 Mar 2011) New Revision: 560 Url: http://nuiton.org/repositories/revision/jrst/560 Log: Remove sysout Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-03-10 14:21:35 UTC (rev 559) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-03-10 14:30:32 UTC (rev 560) @@ -139,7 +139,6 @@ JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); - System.out.println(content); Assert.assertTrue(content.indexOf("echapement de lien1_") > 0); } }

1 0

r559 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst/bugs
by echatellier＠users.nuiton.org March 10, 2011

March 10, 2011

Author: echatellier Date: 2011-03-10 15:21:35 +0100 (Thu, 10 Mar 2011) New Revision: 559 Url: http://nuiton.org/repositories/revision/jrst/559 Log: Fix #1291: Multiline table cell generation as d?\195?\169finition Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-10 14:17:00 UTC (rev 558) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-10 14:21:35 UTC (rev 559) @@ -1833,7 +1833,7 @@ if (lines.length == 2) { int level = level(lines[0]); int levelDef = level(lines[1]); - if (level < levelDef) { + if ((levelDef != lines[1].length()) && (level < levelDef)) { in.unread(lines[1], true); Pattern pattern = Pattern.compile("^\\s*([^:]+)(?: : (.*))?"); Matcher matcher = pattern.matcher(lines[0]); Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java 2011-03-10 14:17:00 UTC (rev 558) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java 2011-03-10 14:21:35 UTC (rev 559) @@ -58,8 +58,9 @@ JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); + System.out.println(content); Assert.assertTrue(content.indexOf("Annee|Trait|Espece") > 0); - Assert.assertTrue(content.indexOf("Fatal") > 0); + Assert.assertTrue(content.indexOf("Fatal") > 0); } /**

1 0

r558 - in trunk/jrst/src/test: java/org/nuiton/jrst/bugs resources/bugs
by echatellier＠users.nuiton.org March 10, 2011

March 10, 2011

Author: echatellier Date: 2011-03-10 15:17:00 +0100 (Thu, 10 Mar 2011) New Revision: 558 Url: http://nuiton.org/repositories/revision/jrst/558 Log: Add test for #663 Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java trunk/jrst/src/test/resources/bugs/testLinks.rst Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-03-10 10:35:45 UTC (rev 557) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-03-10 14:17:00 UTC (rev 558) @@ -122,4 +122,24 @@ Assert.assertTrue(content.indexOf("/V") > 0); Assert.assertTrue(content.indexOf("DOS/VMS-style options too") > 0); } + + /** + * Test que les echapements de lien fonctionne. + * + * \param_ + * + * @throws Exception + */ + @Test + @Ignore + public void testLinkEscape() throws Exception { + File in = new File("src/test/resources/bugs/testLinks.rst"); + File out = File.createTempFile("jrst-testLinks", ".html"); + out.deleteOnExit(); + JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + + String content = FileUtils.readFileToString(out); + System.out.println(content); + Assert.assertTrue(content.indexOf("echapement de lien1_") > 0); + } } Modified: trunk/jrst/src/test/resources/bugs/testLinks.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testLinks.rst 2011-03-10 10:35:45 UTC (rev 557) +++ trunk/jrst/src/test/resources/bugs/testLinks.rst 2011-03-10 14:17:00 UTC (rev 558) @@ -9,3 +9,10 @@ : Il sert pour reporter les erreurs de traduction. `DocBook <http://www.docbook.org/>`_ bla bla `DocBook2 <http://www.docbook2.org/>`_ + + +Test d'echapement de \lien1_. + +Test d'echapement de *\lien2_*. + +Test d'echapement de **\lien3_**.

1 0

r557 - in trunk/jrst/src: main/java/org/nuiton/jrst main/resources/xsl test/java/org/nuiton/jrst/bugs test/resources
by echatellier＠users.nuiton.org March 10, 2011

March 10, 2011

Author: echatellier Date: 2011-03-10 11:35:45 +0100 (Thu, 10 Mar 2011) New Revision: 557 Url: http://nuiton.org/repositories/revision/jrst/557 Log: fix #647, options list parsing Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java trunk/jrst/src/test/resources/frEntier.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-09 10:57:52 UTC (rev 556) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-10 10:35:45 UTC (rev 557) @@ -651,32 +651,37 @@ matcher.find(); String option_string = matcher.group(); option.addAttribute("option_string", option_string); - delimiter = option_stringTmp.charAt(matcher.end()); - option_stringTmp = option_stringTmp.substring( + + boolean done = false; + // Delimiteur bidon + delimiter = '.'; + if (option_stringTmp.length() > matcher.end()) { + delimiter = option_stringTmp.charAt(matcher.end()); + option_stringTmp = option_stringTmp.substring( matcher.end(), option_stringTmp.length()); + } else { + done = true; + } option.addAttribute("delimiterExiste", "false"); - boolean done = false; + if (delimiter == ' ') { // S'il y a 2 espaces a suivre, // l'option est finie if (option_stringTmp.charAt(1) == ' ') { done = true; } } + String option_argument = null; if ((delimiter == '=' || delimiter == ' ') && !done) { option.addAttribute("delimiterExiste", "true"); option.addAttribute("delimiter", "" + delimiter); - matcher = Pattern.compile(delimiter + "[<a-zA-Z][\\w-><\\.\\|]+").matcher( + matcher = Pattern.compile(delimiter + "(([a-zA-Z][\\w-]+)|(<[a-zA-Z][^>]*>))").matcher( option_stringTmp); - String option_argument; if (matcher.find()) { option_argument = matcher.group().substring(1, matcher.group().length()); option.addAttribute("option_argument", option_argument); if (option_stringTmp.charAt(option_argument.length() + 1) == ',') { delimiter = ','; - line = line.substring(option_string.length() - + option_argument.length() + 3, line - .length()); } else { done = true; } @@ -691,6 +696,10 @@ } } } + if (delimiter == ',') { + line = line.substring(option_string.length() + 1 + + (option_argument == null ? 0 : option_argument.length())); + } if (done) { result.setText(option_stringTmp.substring(matcher.end(), option_stringTmp.length()).trim() + " " + joinBlock(readBlock(1))); Modified: trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl =================================================================== --- trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl 2011-03-09 10:57:52 UTC (rev 556) +++ trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl 2011-03-10 10:35:45 UTC (rev 557) @@ -478,12 +478,13 @@ <xsl:value-of select="option_string/text()"/> <xsl:value-of select="./option_argument/@delimiter"/> <xsl:apply-templates select="./option_argument"/> + <xsl:if test="position()!=last()">,</xsl:if> </xsl:template> <xsl:template match="option_argument"> <var> - <xsl:value-of select="text()"/>, + <xsl:value-of select="text()"/> </var> </xsl:template> Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-03-09 10:57:52 UTC (rev 556) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-03-10 10:35:45 UTC (rev 557) @@ -79,7 +79,6 @@ JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); - System.out.println(content); Assert.assertTrue(content.indexOf("nuiton's forge") > 0); Assert.assertTrue(content.indexOf("build.xml") > 0); } @@ -108,8 +107,7 @@ * * @throws Exception */ - @Test(timeout=10000) - @Ignore + @Test public void testOptionLists() throws Exception { File in = new File("src/test/resources/bugs/testOptionsList644.rst"); File out = File.createTempFile("jrst-testOptionList644", ".html"); @@ -117,7 +115,6 @@ JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); - System.out.println(content); Assert.assertTrue(content.indexOf("-a") > 0); Assert.assertTrue(content.indexOf("options can have arguments and long descriptions") > 0); Assert.assertTrue(content.indexOf("<v3region.zip|v2region.xml|v2region.xml.gz>") > 0); Modified: trunk/jrst/src/test/resources/frEntier.rst =================================================================== --- trunk/jrst/src/test/resources/frEntier.rst 2011-03-09 10:57:52 UTC (rev 556) +++ trunk/jrst/src/test/resources/frEntier.rst 2011-03-10 10:35:45 UTC (rev 557) @@ -831,7 +831,7 @@ ``|`` Gauche|Milieu Indique une alternative (un noeud ou bien l'autre (ou les deux)) / personne/nom Chemin d'accès aux éléments (personne/bras/gauche) * * Motif "joker" désignant n'importe quel élément -// //personne Indique tous les descendants d'un noeud +``//`` ``//̀``personne Indique tous les descendants d'un noeud . . Caractérise le noeud courant ``..`` ``..`` Désigne le noeud parent @ @valeur Indique un attribut caractéristique

1 0

r556 - trunk/jrst/src/test/resources
by echatellier＠users.nuiton.org March 9, 2011

March 9, 2011

Author: echatellier Date: 2011-03-09 11:57:52 +0100 (Wed, 09 Mar 2011) New Revision: 556 Url: http://nuiton.org/repositories/revision/jrst/556 Log: Fix option synthax Modified: trunk/jrst/src/test/resources/frEntier.rst Modified: trunk/jrst/src/test/resources/frEntier.rst =================================================================== --- trunk/jrst/src/test/resources/frEntier.rst 2011-03-09 10:44:06 UTC (rev 555) +++ trunk/jrst/src/test/resources/frEntier.rst 2011-03-09 10:57:52 UTC (rev 556) @@ -71,9 +71,9 @@ Cette commande aura pour effet de convertir le fichier myfile.rst en XML qui sera affiché sur la sortie standard (console). Plusieurs options sont disponibles : --o file,--outFile=file pour rediriger la sortie vers un fichier. --t format,--outType format pour préciser un format de sortie, donc utiliser un ou des fichiers XSL de génération. Plusieurs formats sont disponibles xhtml, docbook, xml, html, xdoc, rst, pdf, odt, rtf. --x xslFile,--xslFile xslFile sert à préciser le fichier xsl de génération à utiliser. +-o file, --outFile=file pour rediriger la sortie vers un fichier. +-t format, --outType format pour préciser un format de sortie, donc utiliser un ou des fichiers XSL de génération. Plusieurs formats sont disponibles xhtml, docbook, xml, html, xdoc, rst, pdf, odt, rtf. +-x xslFile, --xslFile xslFile sert à préciser le fichier xsl de génération à utiliser. --force forcer l'écriture d'un fichier, si le fichier de sortie existe, il sera remplacé. --help pour afficher les options disponibles :

1 0

r555 - trunk/jrst/src/main/java/org/nuiton/jrst
by echatellier＠users.nuiton.org March 9, 2011

March 9, 2011

Author: echatellier Date: 2011-03-09 11:44:06 +0100 (Wed, 09 Mar 2011) New Revision: 555 Url: http://nuiton.org/repositories/revision/jrst/555 Log: Fix topic parsing Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-09 10:36:38 UTC (rev 554) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-09 10:44:06 UTC (rev 555) @@ -718,7 +718,7 @@ Element result = null; String line = in.readLine(); if (line != null) { - if (line.matches("^\\.\\.\\s+(" + TOPIC + ")::\\s*(.*)$")) { + if (line.matches("^\\.\\.\\s+(" + TOPIC + ")::\\s+(.*)$")) { Matcher matcher = Pattern.compile(TOPIC + "::").matcher(line); matcher.find(); result = DocumentHelper.createElement(TOPIC).addAttribute(

1 0