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

r603 - in trunk/jrst/src/test: java/org/nuiton/jrst resources
by kcardineaud＠users.nuiton.org June 10, 2011

June 10, 2011

Author: kcardineaud Date: 2011-06-10 09:51:04 +0200 (Fri, 10 Jun 2011) New Revision: 603 Url: http://nuiton.org/repositories/revision/jrst/603 Log: #1590 Verbatim block not well generated : add a test Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java trunk/jrst/src/test/resources/testLiteral.rst Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-06-09 16:37:50 UTC (rev 602) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-06-10 07:51:04 UTC (rev 603) @@ -158,7 +158,7 @@ Assert.assertTrue(actualXml.contains(xmlexpected)); } - /* + @Test public void testLiteral() throws Exception { URL url = JRSTReaderTest.class.getResource("/testLiteral.rst"); @@ -170,7 +170,9 @@ String xmlexpected = - "<literal_block>refcomp.admin.email=l'email des administrateurs. Example : admin(a)refcomp.com"; + "<literal_block> refcomp.admin.email=l'email des administrateurs. Example : admin(a)refcomp.com\n" + + "\n" + + "</literal_block></list_item></enumerated_list><paragraph>Paragraphe test</paragraph></document>"; String actualXml = doc.asXML(); @@ -178,7 +180,7 @@ log.warn("Expected :\n" + xmlexpected); Assert.assertTrue(actualXml.contains(xmlexpected)); - }*/ + } @Test Modified: trunk/jrst/src/test/resources/testLiteral.rst =================================================================== --- trunk/jrst/src/test/resources/testLiteral.rst 2011-06-09 16:37:50 UTC (rev 602) +++ trunk/jrst/src/test/resources/testLiteral.rst 2011-06-10 07:51:04 UTC (rev 603) @@ -3,4 +3,6 @@ 2. Editer la configuration de base. Créez un fichier de configuration nommé:: - refcomp.admin.email=l'email des administrateurs. Example : admin(a)refcomp.com \ No newline at end of file + refcomp.admin.email=l'email des administrateurs. Example : admin(a)refcomp.com + +Paragraphe test \ No newline at end of file

1 0

r602 - trunk/jrst
by sletellier＠users.nuiton.org June 9, 2011

June 9, 2011

Author: sletellier Date: 2011-06-09 18:37:50 +0200 (Thu, 09 Jun 2011) New Revision: 602 Url: http://nuiton.org/repositories/revision/jrst/602 Log: Fix dependencies Modified: trunk/jrst/pom.xml Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2011-06-09 16:31:45 UTC (rev 601) +++ trunk/jrst/pom.xml 2011-06-09 16:37:50 UTC (rev 602) @@ -84,8 +84,9 @@ <artifactId>fop</artifactId> </dependency> <dependency> - <groupId>net.sourceforge.saxon</groupId> - <artifactId>saxon</artifactId> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <scope>runtime</scope> </dependency> <!-- <dependency> <artifactId>xalan</artifactId>

1 0

r601 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst
by kcardineaud＠users.nuiton.org June 9, 2011

June 9, 2011

Author: kcardineaud Date: 2011-06-09 18:31:45 +0200 (Thu, 09 Jun 2011) New Revision: 601 Url: http://nuiton.org/repositories/revision/jrst/601 Log: #1590 Verbatim block not well generated Modified: trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java 2011-06-09 14:25:13 UTC (rev 600) +++ trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java 2011-06-09 16:31:45 UTC (rev 601) @@ -192,6 +192,15 @@ } /** + * Add a character at the current position + * @param character that you want to add + */ + public void add(char character) { + buffer.add(nextChar,character); + } + + + /** * go left in reading char buffer * * @param number @@ -297,6 +306,9 @@ } } + + + /** * passe les lignes blanches * Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-06-09 14:25:13 UTC (rev 600) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-06-09 16:31:45 UTC (rev 601) @@ -281,6 +281,9 @@ * length of the last element returned (number of char need to this element) */ private int elementLength; + + + public JRSTLexer(Reader reader) { titleLevels = new ArrayList<String>(); @@ -1258,13 +1261,24 @@ boolean literal = false; if (para.endsWith(": ::")) { para = para.substring(0, para.length() - " ::".length()); + in.unread("::", true); + for(int i=0;i<level;i++) { + in.add(' '); + } + literal = true; } else if (para.endsWith("::")) { para = para.substring(0, para.length() - ":".length()); // keep // one // : + in.unread("::", true); + + for(int i=0;i<level;i++) { + in.add(' '); + } + literal = true; } @@ -1303,14 +1317,17 @@ Element result = null; // in.skipBlankLines(); - + + String[] prefix = in.readLines(2); if (prefix.length == 2 && prefix[0].matches("\\s*::\\s*") && prefix[1].matches("\\s*")) { + + int level = level(prefix[0]); String para = in.readLine(); if (para != null) { - int level = level(para); + level=level+1; para = para.substring(level) + "\n"; // it's literal block until level is down Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-06-09 14:25:13 UTC (rev 600) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-06-09 16:31:45 UTC (rev 601) @@ -158,7 +158,7 @@ Assert.assertTrue(actualXml.contains(xmlexpected)); } - + /* @Test public void testLiteral() throws Exception { URL url = JRSTReaderTest.class.getResource("/testLiteral.rst"); @@ -178,7 +178,7 @@ log.warn("Expected :\n" + xmlexpected); Assert.assertTrue(actualXml.contains(xmlexpected)); - } + }*/ @Test

1 0

r600 - in trunk/jrst/src/test/java/org/nuiton/jrst: . bugs
by tchemit＠users.nuiton.org June 9, 2011

June 9, 2011

Author: tchemit Date: 2011-06-09 16:25:13 +0200 (Thu, 09 Jun 2011) New Revision: 600 Url: http://nuiton.org/repositories/revision/jrst/600 Log: fix tests while using java.io.tmpdir + NEVER delete a file generated file in a test Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTCompareDocutils.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTCompareDocutils.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTCompareDocutils.java 2011-06-09 08:55:20 UTC (rev 599) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTCompareDocutils.java 2011-06-09 14:25:13 UTC (rev 600) @@ -1,28 +1,11 @@ package org.nuiton.jrst; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.StringReader; -import java.io.StringWriter; -import java.net.URL; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Locale; -import java.io.FileFilter; - -import javax.xml.transform.TransformerException; - import junit.framework.Assert; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.custommonkey.xmlunit.DetailedDiff; import org.custommonkey.xmlunit.Diff; import org.custommonkey.xmlunit.DifferenceListener; - import org.custommonkey.xmlunit.IgnoreTextAndAttributeValuesDifferenceListener; import org.dom4j.Document; import org.dom4j.DocumentException; @@ -32,10 +15,24 @@ import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.util.FileUtil; +import javax.xml.transform.TransformerException; +import java.io.File; +import java.io.FileFilter; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.StringReader; +import java.io.StringWriter; +import java.net.URL; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; + public class JRSTCompareDocutils { /** to use log facility, just put in your code: log.info(\"...\"); */ @@ -47,6 +44,12 @@ /** Commande utilisee pour transformer le rst en html */ private static String rst2html = "rst2html"; + public static void prepareTmpDir() throws IOException { + + File testFile = new File(System.getProperty("java.io.tmpdir")); + + FileUtil.createDirectoryIfNecessary(testFile); + } public static void main(String[] args) throws Exception { Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java 2011-06-09 08:55:20 UTC (rev 599) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java 2011-06-09 14:25:13 UTC (rev 600) @@ -25,13 +25,16 @@ package org.nuiton.jrst.bugs; -import java.io.File; - import org.apache.commons.io.FileUtils; import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.jrst.JRST; +import org.nuiton.jrst.JRSTCompareDocutils; +import java.io.File; +import java.io.IOException; + /** * Test concernant les directives. * @@ -43,6 +46,11 @@ */ public class DirectiveTest { + @BeforeClass + public static void beforeClass () throws IOException { + JRSTCompareDocutils.prepareTmpDir(); + } + /** * Test que les options des directives images sont correctement * parsées. @@ -53,7 +61,7 @@ public void testImageDirectiveOption() throws Exception { File in = new File("src/test/resources/bugs/testImages21.rst"); File out = File.createTempFile("jrst-testImages", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); @@ -75,7 +83,7 @@ public void testContentDirective() throws Exception { File in = new File("src/test/resources/bugs/testContent877.rst"); File out = File.createTempFile("jrst-testContent", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java 2011-06-09 08:55:20 UTC (rev 599) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java 2011-06-09 14:25:13 UTC (rev 600) @@ -27,10 +27,13 @@ import org.dom4j.Document; import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Test; +import org.nuiton.jrst.JRSTCompareDocutils; import org.nuiton.jrst.JRSTReader; import org.nuiton.jrst.JRSTReaderTest; +import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; import java.net.URL; @@ -46,6 +49,11 @@ */ public class InfiniteLoopTest { + @BeforeClass + public static void beforeClass () throws IOException { + JRSTCompareDocutils.prepareTmpDir(); + } + /** * Test de parser un fichier et déclare le test en echec si il dure * plus de 5s. (bug #697). @@ -55,15 +63,14 @@ @Test(timeout = 5000) public void testInfiniteLoop() throws Exception { URL url = JRSTReaderTest.class.getResource("/bugs/infiniteLoop.rst"); - Document doc = null; Reader in = new InputStreamReader(url.openStream()); try { JRSTReader jrst = new JRSTReader(); - doc = jrst.read(in); + Document doc = jrst.read(in); + Assert.assertNotNull(doc); } finally { in.close(); } - Assert.assertNotNull(doc); } } Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java 2011-06-09 08:55:20 UTC (rev 599) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java 2011-06-09 14:25:13 UTC (rev 600) @@ -25,14 +25,16 @@ package org.nuiton.jrst.bugs; -import java.io.File; - import junit.framework.Assert; - import org.apache.commons.io.FileUtils; +import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.jrst.JRST; +import org.nuiton.jrst.JRSTCompareDocutils; +import java.io.File; +import java.io.IOException; + /** * Test concernant les tables en général. * @@ -44,6 +46,11 @@ */ public class TableTest { + @BeforeClass + public static void beforeClass () throws IOException { + JRSTCompareDocutils.prepareTmpDir(); + } + /** * Test que la présence d'un caractères | ne fait pas planter * la generation des tables. @@ -54,7 +61,7 @@ public void testTableSpecialChar() throws Exception { File in = new File("src/test/resources/bugs/testTable1290.rst"); File out = File.createTempFile("jrst-tables", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); @@ -71,7 +78,7 @@ public void testTableIndentation() throws Exception { File in = new File("src/test/resources/bugs/testTable1375.rst"); File out = File.createTempFile("jrst-tables", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-06-09 08:55:20 UTC (rev 599) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-06-09 14:25:13 UTC (rev 600) @@ -25,17 +25,19 @@ package org.nuiton.jrst.bugs; -import java.io.File; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import junit.framework.Assert; - import org.apache.commons.io.FileUtils; +import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.nuiton.jrst.JRST; +import org.nuiton.jrst.JRSTCompareDocutils; +import java.io.File; +import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** * Test sur les elements de type text (liens, styles...) * @@ -47,6 +49,11 @@ */ public class TextTest { + @BeforeClass + public static void beforeClass () throws IOException { + JRSTCompareDocutils.prepareTmpDir(); + } + /** * Test que les liens avec parametres sont correctement parsés. * @@ -56,7 +63,7 @@ public void testLinksParameters() throws Exception { File in = new File("src/test/resources/bugs/testLinks.rst"); File out = File.createTempFile("jrst-testLinks", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); @@ -75,7 +82,7 @@ public void testLinksSpecialCharacters() throws Exception { File in = new File("src/test/resources/bugs/testLinks1380.rst"); File out = File.createTempFile("jrst-testLinks", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); @@ -93,7 +100,7 @@ public void testTabCharacter() throws Exception { File in = new File("src/test/resources/bugs/testTab1378.rst"); File out = File.createTempFile("jrst-testTab1378", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); @@ -111,7 +118,7 @@ public void testOptionLists() throws Exception { File in = new File("src/test/resources/bugs/testOptionsList644.rst"); File out = File.createTempFile("jrst-testOptionList644", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); @@ -135,7 +142,7 @@ public void testLinkEscape() throws Exception { File in = new File("src/test/resources/bugs/testLinks.rst"); File out = File.createTempFile("jrst-testLinks", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java 2011-06-09 08:55:20 UTC (rev 599) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java 2011-06-09 14:25:13 UTC (rev 600) @@ -25,14 +25,16 @@ package org.nuiton.jrst.bugs; -import java.io.File; - import junit.framework.Assert; - import org.apache.commons.io.FileUtils; +import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.jrst.JRST; +import org.nuiton.jrst.JRSTCompareDocutils; +import java.io.File; +import java.io.IOException; + /** * Test concernant les titres en général. * @@ -44,6 +46,11 @@ */ public class TitlesTest { + @BeforeClass + public static void beforeClass () throws IOException { + JRSTCompareDocutils.prepareTmpDir(); + } + /** * Test que la génération fonctionne meme s'il n'y a pas de titre * de niveau 2. @@ -53,7 +60,7 @@ public void testNoSubtitle() throws Exception { File in = new File("src/test/resources/bugs/testNoSubtitle.rst"); File out = File.createTempFile("jrst-RstToHtml2", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); } @@ -67,7 +74,7 @@ public void testNoContentBetweenTitles() throws Exception { File in = new File("src/test/resources/bugs/testNoContentSubtitles.rst"); File out = File.createTempFile("jrst-testNoContentSubtitles", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out);

1 0

r599 - in trunk: . doxia-module-jrst jrst jrst-doc maven-jrst-plugin
by tchemit＠users.nuiton.org June 9, 2011

June 9, 2011

Author: tchemit Date: 2011-06-09 10:55:20 +0200 (Thu, 09 Jun 2011) New Revision: 599 Url: http://nuiton.org/repositories/revision/jrst/599 Log: go to version 1.4 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-06-07 20:08:38 UTC (rev 598) +++ trunk/doxia-module-jrst/pom.xml 2011-06-09 08:55:20 UTC (rev 599) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2011-06-07 20:08:38 UTC (rev 598) +++ trunk/jrst/pom.xml 2011-06-09 08:55:20 UTC (rev 599) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2011-06-07 20:08:38 UTC (rev 598) +++ trunk/jrst-doc/pom.xml 2011-06-09 08:55:20 UTC (rev 599) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2011-06-07 20:08:38 UTC (rev 598) +++ trunk/maven-jrst-plugin/pom.xml 2011-06-09 08:55:20 UTC (rev 599) @@ -37,7 +37,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-07 20:08:38 UTC (rev 598) +++ trunk/pom.xml 2011-06-09 08:55:20 UTC (rev 599) @@ -37,7 +37,7 @@ </parent> <artifactId>jrst</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.4-SNAPSHOT</version> <modules> <module>jrst</module>

1 0

r598 - trunk
by tchemit＠users.nuiton.org June 7, 2011

June 7, 2011

Author: tchemit Date: 2011-06-07 22:08:38 +0200 (Tue, 07 Jun 2011) New Revision: 598 Url: http://nuiton.org/repositories/revision/jrst/598 Log: Update mavenpom4redmineAndCentral to 2.5.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-01 09:30:30 UTC (rev 597) +++ trunk/pom.xml 2011-06-07 20:08:38 UTC (rev 598) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.4</version> + <version>2.5.5</version> </parent> <artifactId>jrst</artifactId>

1 0

r597 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst test/resources
by kcardineaud＠users.nuiton.org June 1, 2011

June 1, 2011

Author: kcardineaud Date: 2011-06-01 11:30:30 +0200 (Wed, 01 Jun 2011) New Revision: 597 Url: http://nuiton.org/repositories/revision/jrst/597 Log: #1563 Problem with footnote Added: trunk/jrst/src/test/resources/testFootnote.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2011-05-30 12:52:32 UTC (rev 596) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2011-06-01 09:30:30 UTC (rev 597) @@ -2185,7 +2185,7 @@ matcher = REGEX_FOOTNOTE_REFERENCE.matcher(text); while (matcher.find()) { String txtDebut = text.substring(0, matcher.start()); - String txtFin = text.substring(matcher.end() + 1, text.length()); + String txtFin = text.substring(matcher.end()-1, text.length()-1); Element footnote = DocumentHelper.createElement(FOOTNOTE_REFERENCE); String sFootnote = matcher.group(); boolean done = false; Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-05-30 12:52:32 UTC (rev 596) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-06-01 09:30:30 UTC (rev 597) @@ -180,5 +180,28 @@ Assert.assertTrue(actualXml.contains(xmlexpected)); } + + @Test + public void testFootnote() throws Exception { + URL url = JRSTReaderTest.class.getResource("/testFootnote.rst"); + Reader in = new InputStreamReader(url.openStream()); + I18n.init(new ClassPathI18nInitializer(), Locale.UK); + + JRSTReader jrst = new JRSTReader(); + Document doc = jrst.read(in); + + + String xmlexpected = + "<footnote_reference ids=\"id1\" refid=\"id2\">1</footnote_reference>" + + "</paragraph><footnote backrefs=\"id1\" ids=\"id2\" name=\"1\"><label>1</label>"; + + String actualXml = doc.asXML(); + log.warn("Result :\n" + actualXml); + log.warn("Expected :\n" + xmlexpected); + + Assert.assertTrue(actualXml.contains(xmlexpected)); + } + + } Added: trunk/jrst/src/test/resources/testFootnote.rst =================================================================== --- trunk/jrst/src/test/resources/testFootnote.rst (rev 0) +++ trunk/jrst/src/test/resources/testFootnote.rst 2011-06-01 09:30:30 UTC (rev 597) @@ -0,0 +1,3 @@ +test [1]_ + +.. [1] There are ``*-wide.txt`` variants for each of these character.

1 0