svn commit: r583377 - in /maven/doxia/doxia/trunk/doxia-modules: doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/ doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/ doxia-module-xdoc/src/test/java/org/ap...

Wed, 10 Oct 2007 00:38:25 -0700 

Author: ltheussl
Date: Wed Oct 10 00:37:31 2007
New Revision: 583377

URL: http://svn.apache.org/viewvc?rev=583377&view=rev
Log:
Handle page breaks as comments in xml parsers and sinks. Use Markup characters 
in comments.

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/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.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=583377&r1=583376&r2=583377&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
 Wed Oct 10 00:37:31 2007
@@ -706,7 +706,14 @@
     {
         String text = parser.getText();
 
-        sink.comment( text );
+        if ( "PB".equals( text.trim() ) )
+        {
+            sink.pageBreak();
+        }
+        else
+        {
+            sink.comment( text );
+        }
     }
 
     /** [EMAIL PROTECTED] */

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=583377&r1=583376&r2=583377&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
 Wed Oct 10 00:37:31 2007
@@ -1498,7 +1498,15 @@
     /** [EMAIL PROTECTED] */
     public void comment( String comment )
     {
-        markup( "<!--" + comment + "-->" );
+        StringBuffer buffer = new StringBuffer( comment.length() + 9 );
+
+        buffer.append( LESS_THAN ).append( BANG ).append( MINUS ).append( 
MINUS ).append( SPACE );
+
+        buffer.append( comment );
+
+        buffer.append( SPACE ).append( MINUS ).append( MINUS ).append( 
GREATER_THAN );
+
+        markup( buffer.toString() );
     }
 
     // -----------------------------------------------------------------------

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java?rev=583377&r1=583376&r2=583377&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
 Wed Oct 10 00:37:31 2007
@@ -697,7 +697,14 @@
     {
         String text = parser.getText();
 
-        sink.comment( text );
+        if ( "PB".equals( text.trim() ) )
+        {
+            sink.pageBreak();
+        }
+        else
+        {
+            sink.comment( text );
+        }
     }
 
     /** [EMAIL PROTECTED] */

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java?rev=583377&r1=583376&r2=583377&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
 Wed Oct 10 00:37:31 2007
@@ -997,6 +997,12 @@
     }
 
     /** [EMAIL PROTECTED] */
+    public void pageBreak()
+    {
+        comment( "PB" );
+    }
+
+    /** [EMAIL PROTECTED] */
     public void nonBreakingSpace()
     {
         if ( headFlag || titleFlag )
@@ -1029,7 +1035,15 @@
     /** [EMAIL PROTECTED] */
     public void comment( String comment )
     {
-        markup( "<!--" + comment + "-->" );
+        StringBuffer buffer = new StringBuffer( comment.length() + 9 );
+
+        buffer.append( LESS_THAN ).append( BANG ).append( MINUS ).append( 
MINUS ).append( SPACE );
+
+        buffer.append( comment );
+
+        buffer.append( SPACE ).append( MINUS ).append( MINUS ).append( 
GREATER_THAN );
+
+        markup( buffer.toString() );
     }
 
 

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java?rev=583377&r1=583376&r2=583377&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
 Wed Oct 10 00:37:31 2007
@@ -171,7 +171,7 @@
     /** [EMAIL PROTECTED] */
     protected String getPageBreakBlock()
     {
-        return "";
+        return "<!-- PB -->";
     }
 
     /** [EMAIL PROTECTED] */

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java?rev=583377&r1=583376&r2=583377&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
 Wed Oct 10 00:37:31 2007
@@ -342,7 +342,14 @@
     {
         String text = parser.getText();
 
-        sink.comment( text );
+        if ( "PB".equals( text.trim() ) )
+        {
+            sink.pageBreak();
+        }
+        else
+        {
+            sink.comment( text );
+        }
     }
 
     /** [EMAIL PROTECTED] */

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java?rev=583377&r1=583376&r2=583377&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
 Wed Oct 10 00:37:31 2007
@@ -1155,6 +1155,12 @@
     }
 
     /** [EMAIL PROTECTED] */
+    public void pageBreak()
+    {
+        comment( "PB" );
+    }
+
+    /** [EMAIL PROTECTED] */
     public void nonBreakingSpace()
     {
         if ( headFlag )
@@ -1196,7 +1202,15 @@
     /** [EMAIL PROTECTED] */
     public void comment( String comment )
     {
-        rawText( "<!--" + comment + "-->" );
+        StringBuffer buffer = new StringBuffer( comment.length() + 9 );
+
+        buffer.append( LESS_THAN ).append( BANG ).append( MINUS ).append( 
MINUS ).append( SPACE );
+
+        buffer.append( comment );
+
+        buffer.append( SPACE ).append( MINUS ).append( MINUS ).append( 
GREATER_THAN );
+
+        rawText( buffer.toString() );
     }
 
     /** [EMAIL PROTECTED] */

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java?rev=583377&r1=583376&r2=583377&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
 Wed Oct 10 00:37:31 2007
@@ -181,7 +181,7 @@
     /** [EMAIL PROTECTED] */
     protected String getPageBreakBlock()
     {
-        return "";
+        return "<!-- PB -->";
     }
 
     /** [EMAIL PROTECTED] */

Reply via email to