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