Author: ltheussl
Date: Mon May 18 20:33:02 2009
New Revision: 776084
URL: http://svn.apache.org/viewvc?rev=776084&view=rev
Log:
Put top anchor back where it was, the iTextSink doesn't support empty anchors.
The SiteRendererSink should be fixed so that the top anchors are actually
written.
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java?rev=776084&r1=776083&r2=776084&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
Mon May 18 20:33:02 2009
@@ -222,6 +222,7 @@
{
if ( level == SECTION_LEVEL_1 || level == SECTION_LEVEL_2 )
{
+ // TODO: why are section titles written in head mode?
setHeadFlag( true );
sectionHasID = ( attributes != null && attributes.isDefined (
Attribute.ID.toString() ) );
@@ -246,6 +247,7 @@
resetTextBuffer();
+ // TODO: why are section titles written in head mode?
setHeadFlag( false );
writeStartTag( level == SECTION_LEVEL_1 ? Tag.H2 : Tag.H3 );
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java?rev=776084&r1=776083&r2=776084&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
Mon May 18 20:33:02 2009
@@ -62,16 +62,13 @@
//
//
----------------------------------------------------------------------
- HtmlAnchor a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttributeValue( "name" ), "top" );
-
HtmlDivision div = (HtmlDivision) elementIterator.next();
assertEquals( div.getAttributeValue( "class" ), "section" );
HtmlHeader2 h2 = (HtmlHeader2) elementIterator.next();
assertEquals( h2.asText().trim(), "Oft Asked Questions" );
- a = (HtmlAnchor) elementIterator.next();
+ HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertEquals( a.getAttributeValue( "name" ), "Oft_Asked_Questions" );
HtmlParagraph p = (HtmlParagraph) elementIterator.next();
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java?rev=776084&r1=776083&r2=776084&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
Mon May 18 20:33:02 2009
@@ -364,11 +364,11 @@
sink.head_();
sink.body();
- sink.anchor( "top" );
- sink.anchor_();
sink.section1();
sink.sectionTitle1();
+ sink.anchor( "top" );
sink.text( faqs.getTitle() );
+ sink.anchor_();
sink.sectionTitle1_();
//
----------------------------------------------------------------------
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java?rev=776084&r1=776083&r2=776084&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
Mon May 18 20:33:02 2009
@@ -77,11 +77,11 @@
assertEquals( "title_", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "head_", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "body", ( (SinkEventElement) it.next() ).getName() );
- assertEquals( "anchor", ( (SinkEventElement) it.next() ).getName() );
- assertEquals( "anchor_", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "section1", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "sectionTitle1", ( (SinkEventElement) it.next()
).getName() );
+ assertEquals( "anchor", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "anchor_", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "sectionTitle1_", ( (SinkEventElement) it.next()
).getName() );
assertEquals( "paragraph", ( (SinkEventElement) it.next() ).getName()
);
assertEquals( "bold", ( (SinkEventElement) it.next() ).getName() );
@@ -149,14 +149,14 @@
assertEquals( "title_", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "head_", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "body", ( (SinkEventElement) it.next() ).getName() );
- assertEquals( "anchor", ( (SinkEventElement) it.next() ).getName() );
- assertEquals( "anchor_", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "section1", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "sectionTitle1", ( (SinkEventElement) it.next()
).getName() );
+ assertEquals( "anchor", ( (SinkEventElement) it.next() ).getName() );
// faq title TODO: should be two events
assertTextEvent( (SinkEventElement) it.next(), "&Α" );
+ assertEquals( "anchor_", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "sectionTitle1_", ( (SinkEventElement) it.next()
).getName() );
assertEquals( "paragraph", ( (SinkEventElement) it.next() ).getName()
);
assertEquals( "bold", ( (SinkEventElement) it.next() ).getName() );
