svn commit: r1462774 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src: main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java

[rfscholte]

Author: rfscholte
Date: Sat Mar 30 15:09:53 2013
New Revision: 1462774

URL: http://svn.apache.org/r1462774
Log:
[DOXIA-441] HTML tags produce undefined behavior on the TWiki parser 

Modified:
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java?rev=1462774&r1=1462773&r2=1462774&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
 Sat Mar 30 15:09:53 2013
@@ -330,6 +330,7 @@ public class TextParser
      */
     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;

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java?rev=1462774&r1=1462773&r2=1462774&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java
 Sat Mar 30 15:09:53 2013
@@ -91,10 +91,9 @@ public class TwikiParserTest
         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() );