commit 540a0140f4ad9e91cb022874472b5a21f3135fbd
author Robert Scholte <rfscholte@apache.org> Sat Mar 30 15:09:53 2013 +0000
committer Robert Scholte <rfscholte@apache.org> Sat Mar 30 15:09:53 2013 +0000
tree 639c0f5b71bd3f39385ee00cdb431a9072d143fd
parent 5240a29c1f30d01240b251f4660cf62e0698fbc1

[DOXIA-441] HTML tags produce undefined behavior on the TWiki parser 

git-svn-id: https://svn.apache.org/repos/asf/maven/doxia/doxia/trunk@1462774 13f79535-47bb-0310-9956-ffa450edef68

doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java

diff --git a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
index a26405f..db06697 100644
--- a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
+++ b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
@@ -330,6 +330,7 @@
      */
     private void parseXHTML( final String line, final List<Block> ret, final Matcher xhtmlMatcher )
     {
+        ret.addAll( parse( line.substring( 0, xhtmlMatcher.start() ) ) );
         if ( xhtmlMatcher.group( 1 ).indexOf( "noautolink" ) != -1 )
         {
             noautolink = true;

doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java

diff --git a/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java b/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java
index be1c884..0e99ee9 100644
--- a/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java
+++ b/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java
@@ -91,10 +91,9 @@
         assertEquals( "b", textElement.getArgs()[0] );
         assertEquals( "bold_", ( it.next() ).getName() );
 
-        // FIXME!
-        //textElement = it.next();
-        //assertEquals( "text", textElement.getName() );
-        //assertEquals( "and a bit of", textElement.getArgs()[0] );
+        textElement = it.next();
+        assertEquals( "text", textElement.getName() );
+        assertEquals( " and a bit of ", textElement.getArgs()[0] );
 
         textElement = it.next();
         assertEquals( "rawText", textElement.getName() );