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/confluen
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
svn commit: r761569 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src: main/java/org/apache/maven/doxia/module/confluence/ main/java/org/apache/maven/doxia/module/confluence/pars
Author: ltheussl
Date: Fri Apr 3 08:38:09 2009
New Revision: 761569
URL: http://svn.apache.org/viewvc?rev=761569&view=rev
Log:
[DOXIA-302] {code} tag is not interpreted correctly if there is no empty line
before it
Submitted by: Kornel
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.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/code.confluence
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.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/ConfluenceParser.java?rev=761569&r1=761568&r2=761569&view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
Fri Apr 3 08:38:09 2009
@@ -67,7 +67,8 @@
BlockParser listParser = new ListBlockParser();
BlockParser tableParser = new TableBlockParser();
-BlockParser[] subparsers = new BlockParser[] { headingParser,
figureParser, listParser, tableParser };
+BlockParser[] subparsers =
+new BlockParser[] { headingParser, figureParser, listParser,
tableParser, verbatimParser };
BlockParser paragraphParser = new ParagraphBlockParser( subparsers );
parsers =
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlock.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/ParagraphBlock.java?rev=761569&r1=761568&r2=761569&view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlock.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlock.java
Fri Apr 3 08:38:09 2009
@@ -30,21 +30,35 @@
class ParagraphBlock
extends AbstractFatherBlock
{
+
+private boolean generateParagraphTags = true;
+
ParagraphBlock( List blocks )
-throws IllegalArgumentException
{
super( blocks );
}
+ParagraphBlock( List blocks, boolean generateParagraphTags )
+{
+super( blocks );
+this.generateParagraphTags = generateParagraphTags;
+}
+
/** {...@inheritdoc} */
public void before( Sink sink )
{
-sink.paragraph();
+if ( this.generateParagraphTags )
+{
+sink.paragraph();
+}
}
/** {...@inheritdoc} */
public void after( Sink sink )
{
-sink.paragraph_();
+if ( this.generateParagraphTags )
+{
+sink.paragraph_();
+}
}
}
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.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/ParagraphBlockParser.java?rev=761569&r1=761568&r2=761569&view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java
Fri Apr 3 08:38:09 2009
@@ -35,7 +35,7 @@
/**
* Constructor for ParagraphBlockParser.
*
- * @param parsers
+ * @param parsers the parsers.
*/
public ParagraphBlockParser( BlockParser[] parsers )
{
@@ -49,6 +49,30 @@
return true;
}
+/**
+ * Visit the Block.
+ *
+ * @param line the line to visit
svn commit: r761580 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src: main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java test/resources/simple-l
Author: ltheussl
Date: Fri Apr 3 09:25:23 2009
New Revision: 761580
URL: http://svn.apache.org/viewvc?rev=761580&view=rev
Log:
[DOXIA-300] Bold markup on start of a document does not work
Submitted by: Kornel
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/simple-list.confluence
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.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/list/ListBlockParser.java?rev=761580&r1=761579&r2=761580&view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java
Fri Apr 3 09:25:23 2009
@@ -130,6 +130,20 @@
{
line = line.trim();
-return ( line.startsWith( "*" ) || line.startsWith( "-" ) ||
line.startsWith( "#" ) );
+if ( line.startsWith( "*" ) || line.startsWith( "-" ) ||
line.startsWith( "#" ) )
+{
+String temp = line.substring( 1 );
+while ( temp.charAt( 0 ) == '*' || temp.charAt( 0 ) == '-' ||
temp.charAt( 0 ) == '#')
+{
+temp = temp.substring( 1 );
+}
+
+if (temp.charAt( 0 ) == ' ')
+{
+return true;
+}
+}
+
+return false;
}
}
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/simple-list.confluence
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/simple-list.confluence?rev=761580&r1=761579&r2=761580&view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/simple-list.confluence
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/simple-list.confluence
Fri Apr 3 09:25:23 2009
@@ -11,3 +11,4 @@
* A list item with
more than one line
+*bold text, not a list!*
\ No newline at end of file
