Author: hboutemy
Date: Sun Sep 20 07:03:07 2015
New Revision: 1704100
URL: http://svn.apache.org/viewvc?rev=1704100&view=rev
Log:
[DOXIA-524] forward secondParsing boolean to Xhtml parser: required for macro
support expected from DOXIA-529
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java?rev=1704100&r1=1704099&r2=1704100&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
Sun Sep 20 07:03:07 2015
@@ -102,7 +102,11 @@ public class MarkdownParser
{
try
{
- new PegDownHtmlParser().parse( new StringReader( toHtml( source )
), sink );
+ // Markdown to HTML (using Pegdown library)
+ String html = toHtml( source );
+ // then HTML to Sink API
+ XhtmlParser parser = new PegDownHtmlParser( isSecondParsing() );
+ parser.parse( new StringReader( html ), sink );
}
catch ( IOException e )
{
@@ -251,6 +255,12 @@ public class MarkdownParser
private static class PegDownHtmlParser
extends XhtmlParser
{
+ PegDownHtmlParser( boolean secondParsing )
+ {
+ super();
+ setSecondParsing( secondParsing );
+ }
+
@Override
protected boolean baseEndTag( XmlPullParser parser, Sink sink )
{
