You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by lt...@apache.org on 2009/04/03 09:54:20 UTC
svn commit: r761555 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src: main/java/org/apache/maven/doxia/module/confluence/parser/ test/java/org/apache/maven/doxia/module/confluence/ test/resources/

Author: ltheussl
Date: Fri Apr  3 07:54:20 2009
New Revision: 761555

URL: http://svn.apache.org/viewvc?rev=761555&view=rev
Log:
[DOXIA-303] Ignore figure attributes
Submitted by: Kornel

Modified:
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/figure.confluence

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.java?rev=761555&r1=761554&r2=761555&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.java Fri Apr  3 07:54:20 2009
@@ -42,6 +42,12 @@
         throws ParseException
     {
         String image = line.substring( 1, line.lastIndexOf( "!" ) );
+        if ( image.contains( "|" ) )
+        {
+            // DOXIA-303: handle figure attributes
+            image = image.substring( 0, image.indexOf( "|" ) );
+        }
+
         line = line.substring( line.lastIndexOf( "!" ) + 1 ).trim();
 
         if ( line.startsWith( "\\\\" ) )

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java?rev=761555&r1=761554&r2=761555&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java Fri Apr  3 07:54:20 2009
@@ -227,6 +227,9 @@
         // ignore formtting in caption...
         assertContainsLines( result, "figureGraphics, name: images/bold.jpg\n"
             + "begin:figureCaption\ntext: With *bold* caption underneath\nend:figureCaption" );
+        // DOXIA-303: image attributes are ignored
+        assertContainsLines( result, "begin:figure\nfigureGraphics, name: image.gif\nend:figure\n" );
+
         // 2 paragraphs in the input... (the figures do not go in a paragraph by analogy with AptParser)
         assertEquals( 3, result.split( "end:paragraph\n" ).length );
     }

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/figure.confluence
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/figure.confluence?rev=761555&r1=761554&r2=761555&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/figure.confluence (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/figure.confluence Fri Apr  3 07:54:20 2009
@@ -14,3 +14,5 @@
 
 !images/bold.jpg!
 With *bold* caption underneath
+
+!image.gif|align=right, vspace=4!
\ No newline at end of file