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.