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

r554 - 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:36:38 +0100 (Wed, 09 Mar 2011) New Revision: 554 Url: http://nuiton.org/repositories/revision/jrst/554 Log: Fix comment and 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:26:35 UTC (rev 553) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-09 10:36:38 UTC (rev 554) @@ -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( @@ -2111,7 +2111,7 @@ Element result = null; String line = in.readLine(); if (line != null) { - if (line.matches("^\\.\\.\\s*.*$")) { + if (line.matches("^\\.\\.\\s+.*$")) { result = DocumentHelper.createElement("comment"); result.addAttribute("level", "0"); result.addAttribute("xml:space", "preserve"); @@ -2119,14 +2119,16 @@ // first line is part of comment result.setText(line.substring(2).trim()); line = in.readLine(); - int level = level(line); - if (level > 0) { - String[] lines = readBlock(level); - String text = line.substring(level); - for (String l : lines) { - text += "\n" + l.substring(level); + if(line != null) { + int level = level(line); + if (level > 0) { + String[] lines = readBlock(level); + String text = line.substring(level); + for (String l : lines) { + text += "\n" + l.substring(level); + } + result.addText(text); } - result.addText(text); } } }

1 0

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

March 9, 2011

Author: echatellier Date: 2011-03-09 11:26:35 +0100 (Wed, 09 Mar 2011) New Revision: 553 Url: http://nuiton.org/repositories/revision/jrst/553 Log: Fix les indentations en trop dans les tables #1375 Added: trunk/jrst/src/test/resources/bugs/testTable1375.rst 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-08 13:40:19 UTC (rev 552) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-09 10:26:35 UTC (rev 553) @@ -942,11 +942,12 @@ String line = in.readLine(); if (line != null) { if (line.matches("\\s.*")) { - String savedLine = line; + int level = level(line); + String savedLine = line + " " + joinBlock(readBlock(level)); line = in.readLine(); if (line != null) { - int level = level(line); + level = level(line); String blockQuote = null; if (level != 0) { String txt = line; 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-08 13:40:19 UTC (rev 552) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java 2011-03-09 10:26:35 UTC (rev 553) @@ -61,4 +61,21 @@ Assert.assertTrue(content.indexOf("Annee|Trait|Espece") > 0); Assert.assertTrue(content.indexOf("Fatal") > 0); } + + /** + * Test que la generation de tableau ne genere pas de paragraphe en trop. + * + * @throws Exception + */ + @Test + public void testTableIndentation() throws Exception { + File in = new File("src/test/resources/bugs/testTable1375.rst"); + File out = File.createTempFile("jrst-tables", ".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("légérs") > 0); + } } Added: trunk/jrst/src/test/resources/bugs/testTable1375.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testTable1375.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testTable1375.rst 2011-03-09 10:26:35 UTC (rev 553) @@ -0,0 +1,27 @@ +================== +Spécifications 2.0 +================== + +Titre élémentaire +================= + ++--------------------------+--------------------------+------------------------+ +| La séparation du | L'utilisation du | L'utilisation d'un | +| fond de la forme | format plain text | gestionnaire de version| ++==========================+==========================+========================+ +| Nous ne perdons plus de | Possibilité d'utiliser un| Historique fin des | +| temps sur la mise en | outil de gestion de | versions. | +| forme et pouvons nous | versions tel que Git ou | | +| concentrer sur le fond. | Mercurial pour un | Diff aisés et lisibles | +| | versionning puissant des | entre différentes | +| Plus besoin de faire de | documents. | versions. | +| fastidieuses mises en | | | +| page. | Utilisation de notre | Travail collaboratif | +| | traitement de textes | facilité grâce aux | +| Plus de style cassés ou | *légérs* préféré. | merges automatiques. | +| de numérotations | | | +| discontinues comme on les| Fichiers légers. | Travail isolé dans des | +| retrouve si souvent avec | | branches. | +| notre éditeur de texte | | | +| préféré : Word. | | | ++--------------------------+--------------------------+------------------------+

1 0

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

March 8, 2011

Author: echatellier Date: 2011-03-08 14:40:19 +0100 (Tue, 08 Mar 2011) New Revision: 552 Url: http://nuiton.org/repositories/revision/jrst/552 Log: Fix options list parsing #644, #646 Added: trunk/jrst/src/test/resources/bugs/testOptionsList644.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-07 16:42:19 UTC (rev 551) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-08 13:40:19 UTC (rev 552) @@ -638,17 +638,16 @@ Element result = null; String line = in.readLine(); if (line != null) { - if (line.matches("^(\\s*-{1,2}[^\\s-].+\\s+.*)+\\s+.+$")) { + if (line.matches("^(\\s*((--?)|(//?))\\w+([ =][<a-zA-Z][\\w-><]*)?)\\s*.*$")) { result = DocumentHelper.createElement(OPTION_LIST) .addAttribute("level", "" + level(line)); char delimiter; do { - Matcher matcher = Pattern.compile("-{1,2}.+").matcher(line); + Matcher matcher = Pattern.compile("[-/][-/]?.+").matcher(line); matcher.find(); Element option = result.addElement("option"); String option_stringTmp = matcher.group(); - matcher = Pattern.compile("^-{1,2}\\w+").matcher( - option_stringTmp); + matcher = Pattern.compile("^[-/][-/]?\\w+").matcher(option_stringTmp); matcher.find(); String option_string = matcher.group(); option.addAttribute("option_string", option_string); @@ -657,8 +656,8 @@ matcher.end(), option_stringTmp.length()); option.addAttribute("delimiterExiste", "false"); boolean done = false; - if (delimiter == ' ') { // S'il ya 2 espace a suivre, - // l'option est finit + if (delimiter == ' ') { // S'il y a 2 espaces a suivre, + // l'option est finie if (option_stringTmp.charAt(1) == ' ') { done = true; } @@ -666,16 +665,14 @@ if ((delimiter == '=' || delimiter == ' ') && !done) { option.addAttribute("delimiterExiste", "true"); option.addAttribute("delimiter", "" + delimiter); - matcher = Pattern.compile(delimiter + "\\w+").matcher( + matcher = Pattern.compile(delimiter + "[<a-zA-Z][\\w-><\\.\\|]+").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) == ',') { + 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 @@ -695,7 +692,8 @@ } } if (done) { - result.setText(option_stringTmp.substring(matcher.end(), option_stringTmp.length()).trim()); + result.setText(option_stringTmp.substring(matcher.end(), option_stringTmp.length()).trim() + + " " + joinBlock(readBlock(1))); } } while (delimiter == ','); } 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-07 16:42:19 UTC (rev 551) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-03-08 13:40:19 UTC (rev 552) @@ -32,6 +32,7 @@ import junit.framework.Assert; import org.apache.commons.io.FileUtils; +import org.junit.Ignore; import org.junit.Test; import org.nuiton.jrst.JRST; @@ -101,4 +102,27 @@ Matcher matcher = pattern.matcher(content); Assert.assertTrue(matcher.find()); } + + /** + * Test que les synthaxe options sont bien parsées. + * + * @throws Exception + */ + @Test(timeout=10000) + @Ignore + public void testOptionLists() throws Exception { + File in = new File("src/test/resources/bugs/testOptionsList644.rst"); + File out = File.createTempFile("jrst-testOptionList644", ".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("-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); + Assert.assertTrue(content.indexOf("--importRegion") > 0); + Assert.assertTrue(content.indexOf("/V") > 0); + Assert.assertTrue(content.indexOf("DOS/VMS-style options too") > 0); + } } Added: trunk/jrst/src/test/resources/bugs/testOptionsList644.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testOptionsList644.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testOptionsList644.rst 2011-03-08 13:40:19 UTC (rev 552) @@ -0,0 +1,47 @@ +Test option lists +================= + +Quick example : + +-a command-line option "a" +-b file options can have arguments + and long descriptions +--long options can be long also +--input=file long options can also have + arguments +/V DOS/VMS-style options too + + +Isis example : + +--listRegion Affiche la liste des régions disponibles +--importRegion <v3region.zip|v2region.xml|v2region.xml.gz> Importe une région dans la base locale. Il est possible d'importer des régions depuis ISIS-Fish version 2 ou 3. Suivant l'extension du fichier, ISIS-Fish fera la bonne opération + + +Docutils example : + +-a Output all. +-b Output both (this description is + quite long). +-c arg Output just arg. +--long Output all day long. + +-p This option has two paragraphs in the description. + This is the first. + + This is the second. Blank lines may be omitted between + options (as above) or left in (as here and below). + +--very-long-option A VMS-style option. Note the adjustment for + the required two spaces. + +--an-even-longer-option + The description can also start on the next line. + +-2, --two This option has two variants. + +-f FILE, --file=FILE These two options are synonyms; both have + arguments. + +/V A VMS/DOS-style option. +

1 0

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

March 7, 2011

Author: echatellier Date: 2011-03-07 17:42:19 +0100 (Mon, 07 Mar 2011) New Revision: 551 Url: http://nuiton.org/repositories/revision/jrst/551 Log: #1290 : Can't use | character un table cell 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-07 16:42:04 UTC (rev 550) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java 2011-03-07 16:42:19 UTC (rev 551) @@ -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); }

1 0

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

March 7, 2011

Author: echatellier Date: 2011-03-07 17:42:04 +0100 (Mon, 07 Mar 2011) New Revision: 550 Url: http://nuiton.org/repositories/revision/jrst/550 Log: #1290 : Can't use | character un table cell Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java trunk/jrst/src/test/resources/bugs/testTable1290.rst 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-07 16:23:50 UTC (rev 549) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-07 16:42:04 UTC (rev 550) @@ -1412,6 +1412,9 @@ if ("".equals(content)) { content = tmpcontent; } + else { + content += tmpcontent; + } if (start == -1) { start = tmpstart; } @@ -1421,7 +1424,6 @@ cell.addAttribute(CELL_END, "false"); } else { cell = (Element) row.node(cellNumber); - } cell.addAttribute(CELL_INDEX_START, String .valueOf(start)); @@ -1433,7 +1435,11 @@ content = ""; } else { // start = tmpstart; + if (start == -1) { + start = tmpstart; + } content += tmpcontent + "|"; + cellNumber--; } } done = true; Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java (rev 0) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java 2011-03-07 16:42:04 UTC (rev 550) @@ -0,0 +1,65 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Codelutin, Chatellier Eric + * %% + * 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% + */ + +package org.nuiton.jrst.bugs; + +import java.io.File; + +import junit.framework.Assert; + +import org.apache.commons.io.FileUtils; +import org.junit.Test; +import org.nuiton.jrst.JRST; + +/** + * Test concernant les tables en général. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class TableTest { + + /** + * Test que la présence d'un caractères | ne fait pas planter + * la generation des tables. + * + * @throws Exception + */ + @Test + public void testTableSpecialChar() throws Exception { + File in = new File("src/test/resources/bugs/testTable1290.rst"); + File out = File.createTempFile("jrst-tables", ".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("Annee|Trait|Espece") > 0); + Assert.assertTrue(content.indexOf("Fatal") > 0); + } +} Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/jrst/src/test/resources/bugs/testTable1290.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testTable1290.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testTable1290.rst 2011-03-07 16:42:04 UTC (rev 550) @@ -0,0 +1,10 @@ +Test Tables +=========== + ++-----------------------------------------------------------------------------+----------+ +| Vérifications | Niveau | ++=============================================================================+==========+ +| Vérification que pour chaque espèce présent dans un trait d'une année | Fatal | +| dans le fichier tailles (noté Annee|Trait|Espece) il y a une donnée | | +| dans le fichier captures (le contraire n'est pas vraie) | | ++-----------------------------------------------------------------------------+----------+

1 0

r549 - in trunk/jrst/src: main/java/org/nuiton/jrst main/java/org/nuiton/jrst/directive test/java/org/nuiton/jrst/bugs test/resources/bugs
by echatellier＠users.nuiton.org March 7, 2011

March 7, 2011

Author: echatellier Date: 2011-03-07 17:23:50 +0100 (Mon, 07 Mar 2011) New Revision: 549 Url: http://nuiton.org/repositories/revision/jrst/549 Log: #21 : Add parameter support for image directive (width, height, ...) Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java trunk/jrst/src/test/resources/bugs/testImages21.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java trunk/jrst/src/main/java/org/nuiton/jrst/directive/ImageDirective.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-04 12:37:01 UTC (rev 548) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-07 16:23:50 UTC (rev 549) @@ -1106,7 +1106,7 @@ directive.addAttribute(DIRECTIVE_TYPE, directiveType); directive.addAttribute(DIRECTIVE_VALUE, directiveValue); - String[] lines = readBlock(2); + String[] lines = readBlock(1); String text = joinBlock(lines, "\n", false); directive.setText(text); Modified: trunk/jrst/src/main/java/org/nuiton/jrst/directive/ImageDirective.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/directive/ImageDirective.java 2011-03-04 12:37:01 UTC (rev 548) +++ trunk/jrst/src/main/java/org/nuiton/jrst/directive/ImageDirective.java 2011-03-07 16:23:50 UTC (rev 549) @@ -50,6 +50,10 @@ */ public class ImageDirective implements JRSTDirective { + protected static final String SCALE = "scale"; + protected static final String WIDTH = "width"; + protected static final String HEIGHT = "height"; + /* * (non-Javadoc) * @@ -73,6 +77,14 @@ if (matcher.matches()) { String name = matcher.group(1); String value = matcher.group(2); + if (SCALE.equalsIgnoreCase(name)) { + if (!result.asXML().matches(".*" + WIDTH + "=\".*\".*")) { + result.addAttribute(WIDTH, value + (value.matches(".*%") ? "" : "%")); + } + if (!result.asXML().matches(".*" + HEIGHT + "=\".*\".*")) { + result.addAttribute(HEIGHT, value + (value.matches(".*%") ? "" : "%")); + } + } result.addAttribute(name, value); } } Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java (rev 0) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java 2011-03-07 16:23:50 UTC (rev 549) @@ -0,0 +1,68 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Codelutin, Chatellier Eric + * %% + * 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% + */ + +package org.nuiton.jrst.bugs; + +import java.io.File; + +import org.apache.commons.io.FileUtils; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.jrst.JRST; + +/** + * Test concernant les directives. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class DirectiveTest { + + /** + * Test que les options des directives images sont correctement + * parsées. + * + * @throws Exception + */ + @Test + public void testImageDirectiveOption() throws Exception { + File in = new File("src/test/resources/bugs/testImages21.rst"); + File out = File.createTempFile("jrst-testImages", ".html"); + out.deleteOnExit(); + JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + + String content = FileUtils.readFileToString(out); + Assert.assertTrue(content.indexOf("alt=\"alternate text\"") > 0); + Assert.assertTrue(content.indexOf("width=\"200 px\"") > 0); + Assert.assertTrue(content.indexOf("align=\"center\"") > 0); + Assert.assertTrue(content.indexOf("alt=\"tab alternate text\"") > 0); + // scale + Assert.assertTrue(content.indexOf("alt=\"tab alternate text\"") > 0); + Assert.assertTrue(content.indexOf("width=\"49%\" height=\"49%\"") > 0); + } +} Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/jrst/src/test/resources/bugs/testImages21.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testImages21.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testImages21.rst 2011-03-07 16:23:50 UTC (rev 549) @@ -0,0 +1,20 @@ +Test attribut image +=================== + +.. image:: picture.jpeg + :height: 100px + :width: 200 px + :scale: 50 % + :alt: alternate text + :align: center + +.. image:: picturetab.jpeg + :height: 100px + :width: 200 px + :scale: 50 % + :alt: tab alternate text + :align: center + +.. image:: picturescale.jpeg + :scale: 49% + :alt: scale alternate text

1 0

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

March 4, 2011

Author: echatellier Date: 2011-03-04 13:37:01 +0100 (Fri, 04 Mar 2011) New Revision: 548 Url: http://nuiton.org/repositories/revision/jrst/548 Log: #1380 : Can't use ' character in link (patch provided by Arnaud LIAGRE) Added: trunk/jrst/src/test/resources/bugs/testLinks1380.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2011-03-04 09:40:37 UTC (rev 547) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2011-03-04 12:37:01 UTC (rev 548) @@ -2263,9 +2263,8 @@ String txtDebut = text.substring(0, matcher.start()); String txtFin = text.substring(matcher.end(), text.length()); String ref = text.substring(matcher.start(), matcher.end() - 1); - - ref = ref.replaceAll("('|_)", ""); ref = StringEscapeUtils.unescapeXml(ref); + ref = ref.replaceAll("('|_)", ""); ref = ref.replaceAll("`", ""); Element hyper = DocumentHelper.createElement("reference"); hyper.addAttribute("name", ref); 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-04 09:40:37 UTC (rev 547) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-03-04 12:37:01 UTC (rev 548) @@ -65,6 +65,25 @@ } /** + * Test que les caracteres speciaux dans les label des liens + * ne sont pas perdus. + * + * @throws Exception + */ + @Test + public void testLinksSpecialCharacters() throws Exception { + File in = new File("src/test/resources/bugs/testLinks1380.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("nuiton's forge") > 0); + Assert.assertTrue(content.indexOf("build.xml") > 0); + } + + /** * Test que la presence de caractere "tabulation" ne cause * pas d'exception lors de la generation. * Added: trunk/jrst/src/test/resources/bugs/testLinks1380.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testLinks1380.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testLinks1380.rst 2011-03-04 12:37:01 UTC (rev 548) @@ -0,0 +1,7 @@ +More info on the project on `nuiton's forge`_ . + +.. _nuiton's forge: http://www.nuiton.org/projects/show/eugene + +A sample build.xml file is available here : build.xml_. + +.. _build.xml: build.xml

1 0

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

March 4, 2011

Author: echatellier Date: 2011-03-04 10:40:37 +0100 (Fri, 04 Mar 2011) New Revision: 547 Url: http://nuiton.org/repositories/revision/jrst/547 Log: Fix #1378 : Tab causes nullPointerException (patch provided by Arnaud LIAGRE) Added: trunk/jrst/src/test/resources/bugs/testTab1378.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-03-01 16:19:20 UTC (rev 546) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-03-04 09:40:37 UTC (rev 547) @@ -541,7 +541,7 @@ InputStream stream = url.openStream(); source = new InputSource(stream); } - + return source; } }); @@ -552,11 +552,9 @@ e.printStackTrace(); return null; } catch (ParserConfigurationException e) { - // TODO Auto-generated catch block e.printStackTrace(); return null; } catch (SAXException e) { - // TODO Auto-generated catch block e.printStackTrace(); return null; } Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-01 16:19:20 UTC (rev 546) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-04 09:40:37 UTC (rev 547) @@ -25,6 +25,8 @@ package org.nuiton.jrst; +import static org.nuiton.jrst.ReStructuredText.BLOCK_QUOTE; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.dom4j.DocumentHelper; @@ -135,8 +137,6 @@ public static final String LINE = "line"; - public static final String BLOCK_QUOTE = "block_quote"; - public static final String ATTRIBUTION = "attribution"; public static final String DOCTEST_BLOCK = "doctest_block"; @@ -943,12 +943,14 @@ Element result = null; String line = in.readLine(); if (line != null) { - if (line.matches("\\s*")) { + if (line.matches("\\s.*")) { + String savedLine = line; line = in.readLine(); + if (line != null) { int level = level(line); String blockQuote = null; - if (!(level == 0)) { + if (level != 0) { String txt = line; String[] lines = in.readWhile("(^ {" + level + "}.*)|(\\s*)"); @@ -966,7 +968,7 @@ if (blockQuote != null) { result.addAttribute(ATTRIBUTION, blockQuote); } - result.setText(txt); + result.setText(savedLine + txt); } } } @@ -2360,7 +2362,8 @@ */ private int level(String line) { int result = 0; - while (line.length() > result && line.charAt(result) == ' ') { + String sTmp = line.replaceAll("\\s", " "); + while (sTmp.length() > result && sTmp.charAt(result) == ' ') { result++; } return result; 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-01 16:19:20 UTC (rev 546) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-03-04 09:40:37 UTC (rev 547) @@ -26,6 +26,8 @@ package org.nuiton.jrst.bugs; import java.io.File; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import junit.framework.Assert; @@ -52,14 +54,32 @@ @Test public void testLinksParameters() throws Exception { File in = new File("src/test/resources/bugs/testLinks.rst"); - File out = File.createTempFile("jrst-RstToHtml2", ".html"); + 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("href=\"http://labs.libre-entreprise.org/tracker/?atid=113&group_id=8&func=…"") > 0); Assert.assertTrue(content.indexOf("href=\"http://www.docbook.org/\"") > 0); Assert.assertTrue(content.indexOf("href=\"http://www.docbook2.org/\"") > 0); } + + /** + * Test que la presence de caractere "tabulation" ne cause + * pas d'exception lors de la generation. + * + * @throws Exception + */ + @Test + public void testTabCharacter() throws Exception { + File in = new File("src/test/resources/bugs/testTab1378.rst"); + File out = File.createTempFile("jrst-testTab1378", ".html"); + out.deleteOnExit(); + JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + + String content = FileUtils.readFileToString(out); + Pattern pattern = Pattern.compile(".*<blockquote>.*du bla bla \u00E9l\u00E9mentaire.*</blockquote>.*", Pattern.DOTALL); + Matcher matcher = pattern.matcher(content); + Assert.assertTrue(matcher.find()); + } } Added: trunk/jrst/src/test/resources/bugs/testTab1378.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testTab1378.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testTab1378.rst 2011-03-04 09:40:37 UTC (rev 547) @@ -0,0 +1,21 @@ +=================== +titre élémentaire 1 +=================== + +Sous-titre élémentaire 2 +------------------------ + + du bla bla élémentaire + +The easiest way to start is to use RESThub archetypes to create your first RESThub based application. Just open a command line terminal, and type : + +.. code-block:: bash + + mvn org.apache.maven.plugins:maven-archetype-plugin:2.0:generate -DarchetypeCatalog=http://resthub.org/nexus/content/repositories/releases/ + +You will have to choose between 3 RESThub archetypes : + + * **resthub-js-webapp-archetype** : simple HTML5/Javascript web application + * **resthub-tapestry5-webapp-archetype** : simple RESThub based Tapestry 5 web application + * **resthub-middle-archetype** : a JAR module for inclusion in your multi modules project + \ No newline at end of file

1 0

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

March 1, 2011

Author: echatellier Date: 2011-03-01 17:19:20 +0100 (Tue, 01 Mar 2011) New Revision: 546 Url: http://nuiton.org/repositories/revision/jrst/546 Log: Apply Arnaud LIAGRE's patch for #675 Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java trunk/jrst/src/test/resources/bugs/testLinks.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2011-02-28 09:52:05 UTC (rev 545) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2011-03-01 16:19:20 UTC (rev 546) @@ -2092,8 +2092,8 @@ int start = matcher.start(); int end = matcher.end(); Element ref = DocumentHelper.createElement(REFERENCE); - ref.addAttribute("refuri", matcher.group(2)); - ref.setText(matcher.group(1)); + ref.addAttribute("refuri", StringEscapeUtils.unescapeXml(matcher.group(2))); + ref.setText(StringEscapeUtils.unescapeXml(matcher.group(1))); String key = "inlineReference" + index++; temporaries.put(key, ref.asXML()); text = text.substring(0, start) + "<tmp>" + key + "</tmp>" Modified: trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java 2011-02-28 09:52:05 UTC (rev 545) +++ trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java 2011-03-01 16:19:20 UTC (rev 546) @@ -205,7 +205,7 @@ public static final Pattern REGEX_REFERENCE = Pattern .compile("(https?://[-/%#[\\&&&[^(>)]]\\._\\w:]+\\w+)((\\W|&|$)+)"); public static final Pattern REGEX_INLINE_REFERENCE = Pattern - .compile("`(.+) \\&lt\\;(https?://[-/%#&\\._\\w:]+)(\\&gt\\;)`_"); + .compile("`(.+?) \\&lt\\;(https?://[-/%#&\\._\\w:[^ ]]+)(\\&gt\\;)`_"); public static final Pattern REGEX_EMAIL = Pattern .compile("(^|[^_\\w])([-\\._\\w]+(a)[-\\._\\w]+)([^-\\._\\w]|$)"); public static final Pattern REGEX_FOOTNOTE_REFERENCE = Pattern Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java (rev 0) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-03-01 16:19:20 UTC (rev 546) @@ -0,0 +1,65 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Codelutin, Chatellier Eric + * %% + * 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% + */ + +package org.nuiton.jrst.bugs; + +import java.io.File; + +import junit.framework.Assert; + +import org.apache.commons.io.FileUtils; +import org.junit.Test; +import org.nuiton.jrst.JRST; + +/** + * Test sur les elements de type text (liens, styles...) + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class TextTest { + + /** + * Test que les liens avec parametres sont correctement parsés. + * + * @throws Exception + */ + @Test + public void testLinksParameters() throws Exception { + File in = new File("src/test/resources/bugs/testLinks.rst"); + File out = File.createTempFile("jrst-RstToHtml2", ".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("href=\"http://labs.libre-entreprise.org/tracker/?atid=113&group_id=8&func=…"") > 0); + Assert.assertTrue(content.indexOf("href=\"http://www.docbook.org/\"") > 0); + Assert.assertTrue(content.indexOf("href=\"http://www.docbook2.org/\"") > 0); + } +} Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/jrst/src/test/resources/bugs/testLinks.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testLinks.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testLinks.rst 2011-03-01 16:19:20 UTC (rev 546) @@ -0,0 +1,11 @@ +Test html links +=============== + + * `Report de bugs <http://labs.libre-entreprise.org/tracker/?atid=113&group_id=8&func=browse>`_ + : Il sert à la notification d'un problème lors de l'utilisation d'ISIS-Fish. + * `Demande d'amélioration <http://labs.libre-entreprise.org/tracker/?atid=116&group_id=8&func=browse>`_ + : Il sert à ajouter des idées d'amélioration ISIS-Fish. + * `Report de problèmes de traduction <http://labs.libre-entreprise.org/tracker/?atid=438&group_id=8&func=browse>`_ + : Il sert pour reporter les erreurs de traduction. + +`DocBook <http://www.docbook.org/>`_ bla bla `DocBook2 <http://www.docbook2.org/>`_

1 0