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 boolean headFlag;
+ /**
+ * An indication on if we're inside a title.
+ *
+ * This will prevent the styling of titles.
+ */
+ protected boolean titleFlag;
+
private int itemFlag;
private boolean boxedFlag;
@@ -138,81 +145,150 @@
resetState();
}
+ // -----------------------------------------------------------------------
+ //
+ // -----------------------------------------------------------------------
+
public void section1()
{
- markup( "<section name=\"" );
+ onSection( 1 );
+ }
+
+ public void sectionTitle1()
+ {
+ onSectionTitle( 1 );
}
public void sectionTitle1_()
{
- markup( "\">" );
+ onSectionTitle_( 1 );
}
public void section1_()
{
- markup( "</section>" );
+ onSection_( 1 );
}
public void section2()
{
- markup( "<subsection name=\"" );
+ onSection( 2 );
+ }
+
+ public void sectionTitle2()
+ {
+ onSectionTitle( 2 );
}
public void sectionTitle2_()
{
- sectionTitle1_();
+ onSectionTitle_( 2 );
}
public void section2_()
{
- markup( "</subsection>" );
+ onSection_( 2 );
}
public void section3()
{
- markup( "<subsection name=\"" );
+ onSection( 3 );
+ }
+
+ public void sectionTitle3()
+ {
+ onSectionTitle( 3 );
}
public void sectionTitle3_()
{
- sectionTitle1_();
+ onSectionTitle_( 3 );
}
public void section3_()
{
- markup( "</subsection>" );
+ onSection_( 3 );
}
public void section4()
{
- markup( "<subsection name=\"" );
+ onSection( 4 );
+ }
+
+ public void sectionTitle4()
+ {
+ onSectionTitle( 4 );
}
public void sectionTitle4_()
{
- sectionTitle1_();
+ onSectionTitle_( 4 );
}
public void section4_()
{
- markup( "</subsection>" );
+ onSection_( 4 );
}
public void section5()
{
- markup( "<subsection name=\"" );
+ onSection( 5 );
+ }
+
+ public void sectionTitle5()
+ {
+ onSectionTitle( 5 );
}
public void sectionTitle5_()
{
- sectionTitle1_();
+ onSectionTitle_( 5 );
}
public void section5_()
{
- markup( "</subsection>" );
+ onSection_( 5 );
+ }
+
+ private void onSection( int depth )
+ {
+ if ( depth == 1 )
+ {
+ markup( "<section name=\"" );
+ }
+ else
+ {
+ markup( "<subsection name=\"" );
+ }
}
+ private void onSectionTitle( int depth )
+ {
+ titleFlag = true;
+ }
+
+ private void onSectionTitle_( int depth )
+ {
+ markup( "\">" );
+
+ titleFlag = false;
+ }
+
+ private void onSection_( int depth )
+ {
+ if ( depth == 1 )
+ {
+ markup( "</section>" );
+ }
+ else
+ {
+ markup( "</subsection>" );
+ }
+ }
+
+ // -----------------------------------------------------------------------
+ //
+ // -----------------------------------------------------------------------
+
public void list()
{
markup( "<ul>" + EOL );
@@ -467,7 +543,7 @@
public void anchor( String name )
{
- if ( !headFlag )
+ if ( !headFlag && !titleFlag )
{
String id = StructureSink.linkToKey( name );
markup( "<a id=\"" + id + "\" name=\"" + id + "\">" );
@@ -476,7 +552,7 @@
public void anchor_()
{
- if ( !headFlag )
+ if ( !headFlag && !titleFlag )
{
markup( "</a>" );
}
@@ -484,7 +560,7 @@
public void link( String name )
{
- if ( !headFlag )
+ if ( !headFlag && !titleFlag )
{
markup( "<a href=\"" + name + "\">" );
}
@@ -492,7 +568,7 @@
public void link_()
{
- if ( !headFlag )
+ if ( !headFlag && !titleFlag )
{
markup( "</a>" );
}
@@ -500,7 +576,7 @@
public void italic()
{
- if ( !headFlag )
+ if ( !headFlag && !titleFlag )
{
markup( "<i>" );
}
@@ -508,7 +584,7 @@
public void italic_()
{
- if ( !headFlag )
+ if ( !headFlag && !titleFlag )
{
markup( "</i>" );
}
@@ -516,7 +592,7 @@
public void bold()
{
- if ( !headFlag )
+ if ( !headFlag && !titleFlag )
{
markup( "<b>" );
}
@@ -524,7 +600,7 @@
public void bold_()
{
- if ( !headFlag )
+ if ( !headFlag && !titleFlag )
{
markup( "</b>" );
}
@@ -532,7 +608,7 @@
public void monospaced()
{
- if ( !headFlag )
+ if ( !headFlag && !titleFlag )
{
markup( "<tt>" );
}
@@ -540,7 +616,7 @@
public void monospaced_()
{
- if ( !headFlag )
+ if ( !headFlag && !titleFlag )
{
markup( "</tt>" );
}
@@ -548,7 +624,7 @@
public void lineBreak()
{
- if ( headFlag )
+ if ( headFlag || titleFlag )
{
buffer.append( EOL );
}
@@ -560,7 +636,7 @@
public void nonBreakingSpace()
{
- if ( headFlag )
+ if ( headFlag || titleFlag )
{
buffer.append( ' ' );
}
@@ -576,16 +652,13 @@
{
buffer.append( text );
}
+ else if ( verbatimFlag )
+ {
+ verbatimContent( text );
+ }
else
{
- if ( verbatimFlag )
- {
- verbatimContent( text );
- }
- else
- {
- content( text );
- }
+ content( text );
}
}
Modified:
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/latex/LatexBookSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/latex/LatexBookSink.java?rev=424301&r1=424300&r2=424301&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/latex/LatexBookSink.java
(original)
+++
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/latex/LatexBookSink.java
Fri Jul 21 06:02:22 2006
@@ -21,7 +21,6 @@
// ----------------------------------------------------------------------
public LatexBookSink( Writer out )
- throws IOException
{
super( out, null, null, true );
}
