Author: vsiveton Date: Thu Jul 27 14:18:11 2006 New Revision: 426246 URL: http://svn.apache.org/viewvc?rev=426246&view=rev Log: MSITE-153: Paragraphs after list being "dropped" by site generation
o decremented the itemFlag in the sinks o formatted the code and clean import Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java?rev=426246&r1=426245&r2=426246&view=diff ============================================================================== --- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java (original) +++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java Thu Jul 27 14:18:11 2006 @@ -16,14 +16,12 @@ * limitations under the License. */ +import java.io.Writer; + import org.apache.maven.doxia.module.HtmlTools; import org.apache.maven.doxia.module.apt.AptParser; import org.apache.maven.doxia.sink.SinkAdapter; -import org.apache.maven.doxia.sink.StructureSink; import org.apache.maven.doxia.util.LineBreaker; -import org.codehaus.plexus.util.StringUtils; - -import java.io.Writer; /** * A doxia Sink which produces an xdoc model. @@ -304,11 +302,11 @@ { markup( "<li>" ); itemFlag++; - // What follows is at least a paragraph. } public void listItem_() { + itemFlag--; markup( "</li>" + EOL ); } @@ -345,11 +343,11 @@ { markup( "<li>" ); itemFlag++; - // What follows is at least a paragraph. } public void numberedListItem_() { + itemFlag--; markup( "</li>" + EOL ); } @@ -377,11 +375,11 @@ { markup( "<dd>" ); itemFlag++; - // What follows is at least a paragraph. } public void definition_() { + itemFlag--; markup( "</dd>" + EOL ); } @@ -402,8 +400,11 @@ else { itemFlag--; + if ( itemFlag < 0 ) + { + itemFlag = 0; + } } - } public void verbatim( boolean boxed ) Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java?rev=426246&r1=426245&r2=426246&view=diff ============================================================================== --- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java (original) +++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java Thu Jul 27 14:18:11 2006 @@ -16,6 +16,10 @@ * limitations under the License. */ +import java.io.PrintWriter; +import java.io.Writer; +import java.util.Map; + import org.apache.maven.doxia.module.HtmlTools; import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext; import org.apache.maven.doxia.parser.Parser; @@ -23,10 +27,6 @@ import org.apache.maven.doxia.sink.StructureSink; import org.codehaus.plexus.util.StringUtils; -import java.io.PrintWriter; -import java.io.Writer; -import java.util.Map; - /** * A doxia sink which produces xhtml * @@ -283,36 +283,36 @@ write( "<li>" ); itemFlag++; - // What follows is at least a paragraph. } public void listItem_() { + itemFlag--; write( "</li>" ); } public void numberedList( int numbering ) { - write("<ol type=\""); + write( "<ol type=\"" ); switch ( numbering ) { case Sink.NUMBERING_LOWER_ALPHA: - write("a"); + write( "a" ); break; case Sink.NUMBERING_UPPER_ALPHA: - write("A"); + write( "A" ); break; case Sink.NUMBERING_LOWER_ROMAN: - write("i"); + write( "i" ); break; case Sink.NUMBERING_UPPER_ROMAN: - write("I"); + write( "I" ); break; case Sink.NUMBERING_DECIMAL: default: - write("1"); + write( "1" ); } - write("\">"); + write( "\">" ); } public void numberedList_() @@ -325,11 +325,11 @@ write( "<li>" ); itemFlag++; - // What follows is at least a paragraph. } public void numberedListItem_() { + itemFlag--; write( "</li>" ); } @@ -358,11 +358,11 @@ write( "<dd>" ); itemFlag++; - // What follows is at least a paragraph. } public void definition_() { + itemFlag--; write( "</dd>" ); } @@ -383,6 +383,10 @@ else { itemFlag--; + if ( itemFlag < 0 ) + { + itemFlag = 0; + } } } @@ -628,12 +632,11 @@ write( " src=\"" + name + "\"" ); } - public void anchor( String name ) { if ( !headFlag ) { - String id = HtmlTools.encodeId(name); + String id = HtmlTools.encodeId( name ); write( "<a name=\"" + id + "\">" ); } }