Author: ltheussl
Date: Fri Jun 12 12:40:51 2009
New Revision: 784100
URL: http://svn.apache.org/viewvc?rev=784100&view=rev
Log:
create valid sdocbook: listitem must contain a paragraph and paragraphs cannot
be nested.
Modified:
maven/doxia/doxia/trunk/doxia-book/src/test/java/org/apache/maven/doxia/book/services/renderer/docbook/DocBookBookSinkTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
Modified:
maven/doxia/doxia/trunk/doxia-book/src/test/java/org/apache/maven/doxia/book/services/renderer/docbook/DocBookBookSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/test/java/org/apache/maven/doxia/book/services/renderer/docbook/DocBookBookSinkTest.java?rev=784100&r1=784099&r2=784100&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-book/src/test/java/org/apache/maven/doxia/book/services/renderer/docbook/DocBookBookSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-book/src/test/java/org/apache/maven/doxia/book/services/renderer/docbook/DocBookBookSinkTest.java
Fri Jun 12 12:40:51 2009
@@ -359,22 +359,22 @@
/** {...@inheritdoc} */
protected String getListBlock( String item )
{
- return "<itemizedlist><listitem>" + item +
"</listitem></itemizedlist>";
+ return "<itemizedlist><listitem><para>" + item +
"</para></listitem></itemizedlist>";
}
/** {...@inheritdoc} */
protected String getNumberedListBlock( String item )
{
- return "<orderedlist numeration=\"lowerroman\"><listitem>"
- + item + "</listitem></orderedlist>";
+ return "<orderedlist numeration=\"lowerroman\"><listitem><para>"
+ + item + "</para></listitem></orderedlist>";
}
/** {...@inheritdoc} */
protected String getDefinitionListBlock( String definum, String definition
)
{
return "<variablelist><varlistentry><term>" + definum
- + "</term><listitem>" + definition
- + "</listitem></varlistentry></variablelist>";
+ + "</term><listitem><para>" + definition
+ + "</para></listitem></varlistentry></variablelist>";
}
/** {...@inheritdoc} */
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.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/DocBookSink.java?rev=784100&r1=784099&r2=784100&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
Fri Jun 12 12:40:51 2009
@@ -148,6 +148,8 @@
private boolean skip;
+ private boolean paragraph;
+
private String encoding;
/** Map of warn messages with a String as key to describe the error type
and a Set as value.
@@ -878,6 +880,7 @@
*/
public void list()
{
+ paragraph_();
writeStartTag( SimplifiedDocbookMarkup.ITEMIZEDLIST_TAG );
}
@@ -897,6 +900,7 @@
public void listItem()
{
writeStartTag( SimplifiedDocbookMarkup.LISTITEM_TAG );
+ paragraph();
}
/**
@@ -905,6 +909,7 @@
*/
public void listItem_()
{
+ paragraph_();
writeEndTag( SimplifiedDocbookMarkup.LISTITEM_TAG );
}
@@ -935,6 +940,8 @@
numeration = SimplifiedDocbookMarkup.ARABIC_STYLE;
}
+ paragraph_();
+
MutableAttributeSet att = new SimpleAttributeSet();
att.addAttribute( SimplifiedDocbookMarkup.NUMERATION_ATTRIBUTE,
numeration );
@@ -957,6 +964,7 @@
public void numberedListItem()
{
writeStartTag( SimplifiedDocbookMarkup.LISTITEM_TAG );
+ paragraph();
}
/**
@@ -965,6 +973,7 @@
*/
public void numberedListItem_()
{
+ paragraph_();
writeEndTag( SimplifiedDocbookMarkup.LISTITEM_TAG );
}
@@ -974,6 +983,7 @@
*/
public void definitionList()
{
+ paragraph_();
writeStartTag( SimplifiedDocbookMarkup.VARIABLELIST_TAG );
}
@@ -1029,6 +1039,7 @@
public void definition()
{
writeStartTag( SimplifiedDocbookMarkup.LISTITEM_TAG );
+ paragraph();
}
/**
@@ -1037,6 +1048,7 @@
*/
public void definition_()
{
+ paragraph_();
writeEndTag( SimplifiedDocbookMarkup.LISTITEM_TAG );
}
@@ -1046,7 +1058,11 @@
*/
public void paragraph()
{
- writeStartTag( SimplifiedDocbookMarkup.PARA_TAG );
+ if ( !paragraph )
+ {
+ writeStartTag( SimplifiedDocbookMarkup.PARA_TAG );
+ paragraph = true;
+ }
}
/**
@@ -1055,7 +1071,11 @@
*/
public void paragraph_()
{
- writeEndTag( SimplifiedDocbookMarkup.PARA_TAG );
+ if ( paragraph )
+ {
+ writeEndTag( SimplifiedDocbookMarkup.PARA_TAG );
+ paragraph = false;
+ }
}
/**
@@ -1065,6 +1085,7 @@
public void verbatim( boolean boxed )
{
verbatimFlag = true;
+ paragraph_();
writeStartTag( SimplifiedDocbookMarkup.PROGRAMLISTING_TAG );
}
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.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/DocBookSinkTest.java?rev=784100&r1=784099&r2=784100&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
Fri Jun 12 12:40:51 2009
@@ -128,22 +128,22 @@
/** {...@inheritdoc} */
protected String getListBlock( String item )
{
- return "<itemizedlist><listitem>" + item + "</listitem>" +
"</itemizedlist>";
+ return "<itemizedlist><listitem><para>" + item + "</para></listitem>"
+ "</itemizedlist>";
}
/** {...@inheritdoc} */
protected String getNumberedListBlock( String item )
{
- return "<orderedlist numeration=\"lowerroman\"><listitem>"
- + item + "</listitem>" + "</orderedlist>";
+ return "<orderedlist numeration=\"lowerroman\"><listitem><para>"
+ + item + "</para></listitem>" + "</orderedlist>";
}
/** {...@inheritdoc} */
protected String getDefinitionListBlock( String definum, String definition
)
{
return "<variablelist><varlistentry><term>" + definum
- + "</term>" + "<listitem>" + definition
- + "</listitem>" + "</varlistentry>" + "</variablelist>";
+ + "</term>" + "<listitem><para>" + definition
+ + "</para></listitem>" + "</varlistentry>" + "</variablelist>";
}
/** {...@inheritdoc} */
