svn commit: r578418 - /maven/doxia/doxia-sitetools/trunk/pom.xml
Author: vsiveton
Date: Sat Sep 22 05:35:21 2007
New Revision: 578418
URL: http://svn.apache.org/viewvc?rev=578418&view=rev
Log:
o using the doxia:1.0-beta-1-SNAPSHOT instead of the release
Modified:
maven/doxia/doxia-sitetools/trunk/pom.xml
Modified: maven/doxia/doxia-sitetools/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=578418&r1=578417&r2=578418&view=diff
==
--- maven/doxia/doxia-sitetools/trunk/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/pom.xml Sat Sep 22 05:35:21 2007
@@ -39,7 +39,7 @@
${project.version}
-1.0-alpha-9
+1.0-beta-1-SNAPSHOT
svn commit: r578469 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc: XdocParser.java XdocSink.java
Author: ltheussl
Date: Sat Sep 22 11:22:11 2007
New Revision: 578469
URL: http://svn.apache.org/viewvc?rev=578469&view=rev
Log:
Fix table captions, numbered lists and sectionings beyond sub-sections.
Modified:
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
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=578469&r1=578468&r2=578469&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
Sat Sep 22 11:22:11 2007
@@ -75,6 +75,12 @@
/** The macro parameters. */
private Map macroParameters = new HashMap();
+/** For tables. */
+private boolean hasCaption;
+
+/** Counts section level. */
+private int sectionLevel;
+
/** [EMAIL PROTECTED] */
public void parse( Reader source, Sink sink )
throws ParseException
@@ -124,6 +130,8 @@
}
else if ( parser.getName().equals( SECTION_TAG.toString() ) )
{
+closeOpenSections( Sink.SECTION_LEVEL_1, sink );
+
sink.section1();
sink.sectionTitle1();
@@ -138,6 +146,8 @@
}
else if ( parser.getName().equals( SUBSECTION_TAG.toString() ) )
{
+closeOpenSections( Sink.SECTION_LEVEL_2, sink );
+
sink.section2();
sink.sectionTitle2();
@@ -150,17 +160,28 @@
sink.sectionTitle2_();
}
-// TODO section3 section4 section5
else if ( parser.getName().equals( Tag.H4.toString() ) )
{
+closeOpenSections( Sink.SECTION_LEVEL_3, sink );
+
+sink.section3();
+
sink.sectionTitle3();
}
else if ( parser.getName().equals( Tag.H5.toString() ) )
{
+closeOpenSections( Sink.SECTION_LEVEL_4, sink );
+
+sink.section4();
+
sink.sectionTitle4();
}
else if ( parser.getName().equals( Tag.H6.toString() ) )
{
+closeOpenSections( Sink.SECTION_LEVEL_5, sink );
+
+sink.section5();
+
sink.sectionTitle5();
}
else if ( parser.getName().equals( Tag.P.toString() ) )
@@ -177,7 +198,36 @@
}
else if ( parser.getName().equals( Tag.OL.toString() ) )
{
-sink.numberedList( Sink.NUMBERING_DECIMAL );
+int numbering = Sink.NUMBERING_DECIMAL;
+
+// this will have to be generalized if we handle styles
+String style = parser.getAttributeValue( null,
Attribute.STYLE.toString() );
+
+if ( style != null )
+{
+if ( "list-style-type: upper-alpha".equals( style ) )
+{
+numbering = Sink.NUMBERING_UPPER_ALPHA;
+}
+else if ( "list-style-type: lower-alpha".equals( style ) )
+{
+numbering = Sink.NUMBERING_LOWER_ALPHA;
+}
+else if ( "list-style-type: upper-roman".equals( style ) )
+{
+numbering = Sink.NUMBERING_UPPER_ROMAN;
+}
+else if ( "list-style-type: lower-roman".equals( style ) )
+{
+numbering = Sink.NUMBERING_LOWER_ROMAN;
+}
+else if ( "list-style-type: decimal".equals( style ) )
+{
+numbering = Sink.NUMBERING_DECIMAL;
+}
+}
+
+sink.numberedList( numbering );
orderedListDepth++;
}
else if ( parser.getName().equals( Tag.LI.toString() ) )
@@ -294,6 +344,30 @@
else if ( parser.getName().equals( Tag.TABLE.toString() ) )
{
sink.table();
+
+String border = parser.getAttributeValue( null,
Attribute.BORDER.toString() );
+
+boolean grid = true;
+
+if ( "0".equals( border ) )
+{
+grid = false;
+}
+
+String align = parser.getAttributeValue( null,
Attribute.ALIGN.toString() );
+
+int[] justif = { JUSTIFY_CENTER };
+
+if ( "left".equals( align ) )
+{
+justif[0] = JUSTIFY_LEFT;
+}
+else if ( "right".equals( align ) )
+{
+
svn commit: r578498 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
Author: ltheussl
Date: Sat Sep 22 14:07:01 2007
New Revision: 578498
URL: http://svn.apache.org/viewvc?rev=578498&view=rev
Log:
Small bug
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
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=578498&r1=578497&r2=578498&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
Sat Sep 22 14:07:01 2007
@@ -697,7 +697,7 @@
*/
private void closeOpenSections( int newLevel, Sink sink )
{
-while ( this.sectionLevel > newLevel )
+while ( this.sectionLevel >= newLevel )
{
if ( sectionLevel == Sink.SECTION_LEVEL_5)
{
svn commit: r578499 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
Author: ltheussl Date: Sat Sep 22 14:08:47 2007 New Revision: 578499 URL: http://svn.apache.org/viewvc?rev=578499&view=rev Log: Adapt test case to changes in xdoc parser: h4 sections now also fire a section event. Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java?rev=578499&r1=578498&r2=578499&view=diff == --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java Sat Sep 22 14:08:47 2007 @@ -166,6 +166,10 @@ // -- // Unordered lists // -- +div = (HtmlDivision) elementIterator.next(); +assertNotNull( div ); +assertEquals( div.getAttributeValue( "class" ), "section" ); + HtmlHeader4 h4 = (HtmlHeader4) elementIterator.next(); assertNotNull( h4 ); assertEquals( h4.asText(), "Unordered lists" ); @@ -250,6 +254,10 @@ // -- // Ordered lists // -- +div = (HtmlDivision) elementIterator.next(); +assertNotNull( div ); +assertEquals( div.getAttributeValue( "class" ), "section" ); + h4 = (HtmlHeader4) elementIterator.next(); assertNotNull( h4 ); assertEquals( h4.asText(), "Ordered lists" ); @@ -331,6 +339,10 @@ // -- // Definition lists // -- +div = (HtmlDivision) elementIterator.next(); +assertNotNull( div ); +assertEquals( div.getAttributeValue( "class" ), "section" ); + h4 = (HtmlHeader4) elementIterator.next(); assertNotNull( h4 ); assertEquals( h4.asText(), "Definition lists" );
