svn commit: r772533 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser: ParagraphBlockParser.java SectionBlock.java SectionBlockParser.java

[ltheussl]

Author: ltheussl
Date: Thu May  7 07:35:06 2009
New Revision: 772533

URL: http://svn.apache.org/viewvc?rev=772533&view=rev
Log:
[DOXIA-299] Text formatting in sections does not work
Submitted by: Kornel

Modified:
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlock.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlockParser.java

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java?rev=772533&r1=772532&r2=772533&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java
 Thu May  7 07:35:06 2009
@@ -68,7 +68,7 @@
         }
         else
         {
-            ChildBlocksBuilder builder = new ChildBlocksBuilder( 
appendUntilEmptyLine( line, source ) );
+            ChildBlocksBuilder builder = new ChildBlocksBuilder(line );
             return new ParagraphBlock( builder.getBlocks(), 
generateParagraphTags );
         }
     }

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlock.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlock.java?rev=772533&r1=772532&r2=772533&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlock.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlock.java
 Thu May  7 07:35:06 2009
@@ -28,13 +28,13 @@
 class SectionBlock
     implements Block
 {
-    private String title;
+    private Block text;
 
     private int level;
 
-    SectionBlock( String title, int level )
+    SectionBlock( Block text, int level )
     {
-        this.title = title;
+        this.text = text;
         this.level = level;
     }
 
@@ -67,7 +67,7 @@
             sink.sectionTitle5();
         }
 
-        sink.text( title );
+        this.text.traverse( sink );
 
         if ( level == Sink.SECTION_LEVEL_1 )
         {

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlockParser.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlockParser.java?rev=772533&r1=772532&r2=772533&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlockParser.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlockParser.java
 Thu May  7 07:35:06 2009
@@ -66,6 +66,10 @@
 
         String title = line.substring( 3 ).trim();
 
-        return new SectionBlock( title, level );
+        BlockParser headingParser = new SectionBlockParser();
+        BlockParser figureParser = new FigureBlockParser();
+        BlockParser[] subparsers = new BlockParser[] { headingParser, 
figureParser };
+
+        return new SectionBlock( new ParagraphBlockParser( subparsers ).visit( 
title, source, false ), level );
     }
 }