svn commit: r424255 - in /maven/doxia/trunk: doxia-doc-renderer/pom.xml doxia-sandbox/doxia-editor/pom.xml

[trygvis]

Author: trygvis
Date: Fri Jul 21 03:25:23 2006
New Revision: 424255

URL: http://svn.apache.org/viewvc?rev=424255&view=rev
Log:
o Correcting parent references to match the local project.

Modified:
maven/doxia/trunk/doxia-doc-renderer/pom.xml
maven/doxia/trunk/doxia-sandbox/doxia-editor/pom.xml

Modified: maven/doxia/trunk/doxia-doc-renderer/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-doc-renderer/pom.xml?rev=424255&r1=424254&r2=424255&view=diff
==
--- maven/doxia/trunk/doxia-doc-renderer/pom.xml (original)
+++ maven/doxia/trunk/doxia-doc-renderer/pom.xml Fri Jul 21 03:25:23 2006
@@ -4,7 +4,7 @@
   
 doxia
 org.apache.maven.doxia
-1.0-alpha-8-SNAPSHOT
+1.0-alpha-9-SNAPSHOT
   
   doxia-doc-renderer
   Doxia Document Renderer Component

Modified: maven/doxia/trunk/doxia-sandbox/doxia-editor/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-sandbox/doxia-editor/pom.xml?rev=424255&r1=424254&r2=424255&view=diff
==
--- maven/doxia/trunk/doxia-sandbox/doxia-editor/pom.xml (original)
+++ maven/doxia/trunk/doxia-sandbox/doxia-editor/pom.xml Fri Jul 21 03:25:23 
2006
@@ -3,7 +3,7 @@
   
 org.apache.maven.doxia
 doxia
-  1.0-alpha-8-SNAPSHOT
+1.0-alpha-9-SNAPSHOT
   
   doxia-editor
   1.0-alpha-1-SNAPSHOT
@@ -12,7 +12,7 @@
 
   ${project.groupId}
   doxia-core
-  1.0-alpha-8-SNAPSHOT
+  1.0-alpha-9-SNAPSHOT
 
 
   org.codehaus.plexus

svn commit: r424301 - in /maven/doxia/trunk: doxia-core/src/main/java/org/apache/maven/doxia/module/latex/ doxia-core/src/main/java/org/apache/maven/doxia/module/xdoc/ doxia-sandbox/doxia-book/src/mai

[trygvis]

Author: trygvis
Date: Fri Jul 21 06:02:22 2006
New Revision: 424301

URL: http://svn.apache.org/viewvc?rev=424301&view=rev
Log:
o Not rendering stuff in the title of Xdoc sections.
o Printing out the \psection{} *before* the section content.

Modified:

maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java

maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java

maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/latex/LatexBookSink.java

Modified: 
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java?rev=424301&r1=424300&r2=424301&view=diff
==
--- 
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
 (original)
+++ 
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
 Fri Jul 21 06:02:22 2006
@@ -38,6 +38,8 @@
  */
 private boolean fragmentDocument;
 
+private boolean ignoreText;
+
 private LineBreaker out;
 
 private String sinkCommands;
@@ -140,10 +142,17 @@
 
 public void body()
 {
-if ( !fragmentDocument && titleFlag )
+if ( titleFlag )
 {
-titleFlag = false;
-markup( "\\pmaketitle" + EOL + EOL );
+if ( fragmentDocument  )
+{
+markup( "\\psection" );
+}
+else
+{
+titleFlag = false;
+markup( "\\pmaketitle" + EOL + EOL );
+}
 }
 }
 
@@ -169,10 +178,7 @@
 public void sectionTitle1_()
 {
 isTitle = false;
-}
 
-public void section1_()
-{
 if ( StringUtils.isNotEmpty( title ) )
 {
 markup( "\\psectioni{" + title + "}" );
@@ -193,10 +199,7 @@
 public void sectionTitle2_()
 {
 isTitle = false;
-}
 
-public void section2_()
-{
 if ( StringUtils.isNotEmpty( title ) )
 {
 markup( "\\psectionii{" + title + "}" );
@@ -217,10 +220,7 @@
 public void sectionTitle3_()
 {
 isTitle = false;
-}
 
-public void section3_()
-{
 if ( StringUtils.isNotEmpty( title ) )
 {
 markup( "\\psectioniii{" + title + "}" );
@@ -241,10 +241,7 @@
 public void sectionTitle4_()
 {
 isTitle = false;
-}
 
-public void section4_()
-{
 if ( StringUtils.isNotEmpty( title ) )
 {
 markup( "\\psectioniv{" + title + "}" );
@@ -265,10 +262,7 @@
 public void sectionTitle5_()
 {
 isTitle = false;
-}
 
-public void section5_()
-{
 if ( StringUtils.isNotEmpty( title ) )
 {
 markup( "\\psectionv{" + title + "}" );
@@ -452,6 +446,10 @@
 titleFlag = true;
 markup( "\\ptitle{" );
 }
+else
+{
+ignoreText = true;
+}
 }
 
 public void title_()
@@ -460,6 +458,10 @@
 {
 markup( "}" + EOL );
 }
+else
+{
+ignoreText = false;
+}
 }
 
 public void author()
@@ -468,6 +470,10 @@
 {
 markup( "\\pauthor{" );
 }
+else
+{
+ignoreText = true;
+}
 }
 
 public void author_()
@@ -476,6 +482,10 @@
 {
 markup( "}" + EOL );
 }
+else
+{
+ignoreText = false;
+}
 }
 
 public void date()
@@ -484,6 +494,10 @@
 {
 markup( "\\pdate{" );
 }
+else
+{
+ignoreText = true;
+}
 }
 
 public void date_()
@@ -492,6 +506,10 @@
 {
 markup( "}" + EOL );
 }
+else
+{
+ignoreText = false;
+}
 }
 
 public void sectionTitle_()
@@ -673,6 +691,10 @@
 
 public void text( String text )
 {
+if ( ignoreText )
+{
+return;
+}
 if ( isTitle )
 {
 title = text;

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=424301&r1=424300&r2=424301&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
 Fri Jul 21 06:02:22 2006
@@ -41,6 +41,13 @@
 
 protected boolea