svn commit: r775934 - in /maven/doxia: doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/ doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/ doxia/trunk/doxia-modules/do...

[ltheussl]

Author: ltheussl
Date: Mon May 18 13:11:56 2009
New Revision: 775934

URL: http://svn.apache.org/viewvc?rev=775934&view=rev
Log:
Emit top anchor before the section start so SiteRendererSink doesn't get 
confused with anchors for section titles.

Modified:
    
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/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=775934&r1=775933&r2=775934&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 13:11:56 2009
@@ -62,13 +62,16 @@
         //
         // 
----------------------------------------------------------------------
 
+        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" );
 
-        HtmlAnchor a = (HtmlAnchor) elementIterator.next();
+        a = (HtmlAnchor) elementIterator.next();
         assertEquals( a.getAttributeValue( "name" ), "Oft_Asked_Questions" );
 
         HtmlParagraph p = (HtmlParagraph) elementIterator.next();
@@ -146,7 +149,7 @@
         assertEquals( element.asText().trim(), "italic" );
 
         p = (HtmlParagraph) elementIterator.next();
-        assertEquals( p.getAttributeValue( "style" ), "float:right;" );
+        assertEquals( p.getAttributeValue( "align" ), "right" );
 
         a = (HtmlAnchor) elementIterator.next();
         assertEquals( a.getAttributeValue( "href" ), "#top" );
@@ -185,7 +188,7 @@
         assertEquals( pre.asText().trim(), "<source>1.5</source>" );
 
         p = (HtmlParagraph) elementIterator.next();
-        assertEquals( p.getAttributeValue( "style" ), "float:right;" );
+        assertEquals( p.getAttributeValue( "align" ), "right" );
 
         a = (HtmlAnchor) elementIterator.next();
         assertEquals( a.getAttributeValue( "href" ), "#top" );

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=775934&r1=775933&r2=775934&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 13:11:56 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_();
 
         // 
----------------------------------------------------------------------
@@ -495,7 +495,7 @@
     private void writeTopLink( Sink sink )
     {
         SinkEventAttributeSet atts = new SinkEventAttributeSet();
-        atts.addAttribute( SinkEventAttributeSet.STYLE, "float:right;" );
+        atts.addAttribute( SinkEventAttributeSet.ALIGN, "right" );
         sink.paragraph( atts );
         sink.link( "#top" );
         sink.text( "[top]" );

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=775934&r1=775933&r2=775934&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 13:11:56 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(), "&&#913;" );
 
-        assertEquals( "anchor_", ( (SinkEventElement) it.next() ).getName() );
         assertEquals( "sectionTitle1_", ( (SinkEventElement) it.next() 
).getName() );
         assertEquals( "paragraph", ( (SinkEventElement) it.next() ).getName() 
);
         assertEquals( "bold", ( (SinkEventElement) it.next() ).getName() );