Index: src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlock.java =================================================================== --- src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlock.java (revision 772407) +++ src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlock.java (working copy) @@ -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 ) { Index: src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlockParser.java =================================================================== --- src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlockParser.java (revision 772407) +++ src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlockParser.java (working copy) @@ -66,6 +66,9 @@ 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); } } Index: src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java =================================================================== --- src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java (revision 772407) +++ src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java (working copy) @@ -68,7 +68,7 @@ } else { - ChildBlocksBuilder builder = new ChildBlocksBuilder( appendUntilEmptyLine( line, source ) ); + ChildBlocksBuilder builder = new ChildBlocksBuilder(line ); return new ParagraphBlock( builder.getBlocks(), generateParagraphTags ); } }