You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by lt...@apache.org on 2009/06/13 08:02:39 UTC
svn commit: r784337 - in
/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src:
main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java
Author: ltheussl
Date: Sat Jun 13 06:02:39 2009
New Revision: 784337
URL: http://svn.apache.org/viewvc?rev=784337&view=rev
Log:
Ad r784100: parser should not emit paragraphs within list items.
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java?rev=784337&r1=784336&r2=784337&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java Sat Jun 13 06:02:39 2009
@@ -252,6 +252,8 @@
}
else if ( parser.getName().equals( SimplifiedDocbookMarkup.LISTITEM_TAG.toString() ) )
{
+ parent.pop();
+
if ( isParent( SimplifiedDocbookMarkup.VARIABLELIST_TAG.toString() ) )
{
sink.definition_();
@@ -609,6 +611,8 @@
{
sink.listItem( attribs );
}
+
+ parent.push( SimplifiedDocbookMarkup.LISTITEM_TAG.toString() );
}
private void handleOrderedListStart( Sink sink, SinkEventAttributeSet attribs )
@@ -647,7 +651,8 @@
private void handleParaEnd( Sink sink )
{
- if ( !isParent( SimplifiedDocbookMarkup.CAPTION_TAG.toString() ) )
+ if ( !isParent( SimplifiedDocbookMarkup.CAPTION_TAG.toString() )
+ && ! isParent( SimplifiedDocbookMarkup.LISTITEM_TAG.toString() ) )
{
sink.paragraph_();
}
@@ -655,7 +660,8 @@
private void handleParaStart( Sink sink, SinkEventAttributeSet attribs )
{
- if ( !isParent( SimplifiedDocbookMarkup.CAPTION_TAG.toString() ) )
+ if ( !isParent( SimplifiedDocbookMarkup.CAPTION_TAG.toString() )
+ && ! isParent( SimplifiedDocbookMarkup.LISTITEM_TAG.toString() ) )
{
sink.paragraph( attribs );
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java?rev=784337&r1=784336&r2=784337&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java Sat Jun 13 06:02:39 2009
@@ -292,9 +292,7 @@
assertEquals( "list", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "listItem", ( (SinkEventElement) it.next() ).getName() );
- assertEquals( "paragraph", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
- assertEquals( "paragraph_", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "listItem_", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "list_", ( (SinkEventElement) it.next() ).getName() );
assertFalse( it.hasNext() );
@@ -308,9 +306,7 @@
assertEquals( "numberedList", event.getName() );
assertEquals( Sink.NUMBERING_UPPER_ALPHA, ( (Integer) event.getArgs()[0] ).intValue() );
assertEquals( "numberedListItem", ( (SinkEventElement) it.next() ).getName() );
- assertEquals( "paragraph", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
- assertEquals( "paragraph_", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "numberedListItem_", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "numberedList_", ( (SinkEventElement) it.next() ).getName() );
assertFalse( it.hasNext() );
@@ -327,9 +323,7 @@
assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "definedTerm_", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "definition", ( (SinkEventElement) it.next() ).getName() );
- assertEquals( "paragraph", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
- assertEquals( "paragraph_", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "definition_", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "definitionListItem_", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "definitionList_", ( (SinkEventElement) it.next() ).getName() );