You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2015/11/25 01:51:58 UTC
svn commit: r1716285 - in
/maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src:
main/java/org/apache/maven/doxia/module/markdown/
test/java/org/apache/maven/doxia/module/markdown/ test/resources/
Author: hboutemy
Date: Wed Nov 25 00:51:58 2015
New Revision: 1716285
URL: http://svn.apache.org/viewvc?rev=1716285&view=rev
Log:
[DOXIA-492] fixed macro support, with unit test
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/resources/macro-toc.md
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.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=1716285&r1=1716284&r2=1716285&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 Wed Nov 25 00:51:58 2015
@@ -265,7 +265,6 @@ public class MarkdownParser
public PegDownHtmlParser()
{
super();
- setSecondParsing( true );
}
@Override
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java?rev=1716285&r1=1716284&r2=1716285&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java Wed Nov 25 00:51:58 2015
@@ -1,5 +1,7 @@
package org.apache.maven.doxia.module.markdown;
+import org.apache.maven.doxia.module.xhtml.XhtmlParser;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -293,4 +295,17 @@ public class MarkdownParserTest
return sink;
}
+
+ /** @throws Exception */
+ public void testTocMacro()
+ throws Exception
+ {
+ Iterator<SinkEventElement> it = parseFileToEventTestingSink( "macro-toc" ).getEventList().iterator();
+
+ assertEquals( it, "head", "title", "text", "title_", "head_",
+ "body", "list",
+ "listItem", "link", "text", "link_", "listItem_",
+ "listItem", "link", "text", "link_", "listItem_",
+ "list_", "section1", "section2" );
+ }
}
Added: maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/resources/macro-toc.md
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/resources/macro-toc.md?rev=1716285&view=auto
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/resources/macro-toc.md (added)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/resources/macro-toc.md Wed Nov 25 00:51:58 2015
@@ -0,0 +1,6 @@
+
+<!-- MACRO{toc|fromDepth=1|toDepth=2} -->
+
+### Subsection
+
+### Another