Author: kcardineaud Date: 2011-05-18 16:37:58 +0200 (Wed, 18 May 2011) New Revision: 585 Url: http://nuiton.org/repositories/revision/jrst/585 Log: #1538 Probl?\195?\168me avec les anonymous hyperlinks Added: trunk/jrst/src/test/resources/testAnonymous.rst Modified: 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/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-05-18 13:55:12 UTC (rev 584) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-05-18 14:37:58 UTC (rev 585) @@ -480,7 +480,7 @@ Element resultTmp = DocumentHelper .createElement(TARGETANONYMOUS); resultTmp.addAttribute(LEVEL, "" + level(l)); - Matcher matcher = Pattern.compile("__ ").matcher(l); + Matcher matcher = Pattern.compile("__ |.. __: ").matcher(l); if (matcher.find()) { resultTmp.addAttribute(REFURI, l.substring(matcher Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-05-18 13:55:12 UTC (rev 584) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-05-18 14:37:58 UTC (rev 585) @@ -136,5 +136,28 @@ Assert.assertEquals(xmlexpected, actualXml); } + + + @Test + public void testAnonymous() throws Exception { + URL url = JRSTReaderTest.class.getResource("/testAnonymous.rst"); + Reader in = new InputStreamReader(url.openStream()); + I18n.init(new ClassPathI18nInitializer(), Locale.UK); + + JRSTReader jrst = new JRSTReader(); + Document doc = jrst.read(in); + + + String xmlexpected ="<target anonymous=\"1\" ids=\"id1\" refuri=\"http://www.python.org\"/>" + +"<target anonymous=\"1\" ids=\"id2\" refuri=\"http://www.python.org\"/>"; + + String actualXml = doc.asXML(); + log.info("Result :\n" + actualXml); + log.info("Expected :\n" + xmlexpected); + + Assert.assertTrue(actualXml.contains(xmlexpected)); + } + + } Added: trunk/jrst/src/test/resources/testAnonymous.rst =================================================================== --- trunk/jrst/src/test/resources/testAnonymous.rst (rev 0) +++ trunk/jrst/src/test/resources/testAnonymous.rst 2011-05-18 14:37:58 UTC (rev 585) @@ -0,0 +1,5 @@ +There are three types of hyperlink targets: internal, external, and +indirect. + + .. __: http://www.python.org + __ http://www.python.org