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 2022/12/04 17:14:32 UTC
[maven-doxia-converter] 01/01: [DOXIATOOLS-74] add Markdown
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch DOXIATOOLS-74
in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git
commit dab369fb487211cba49712b26902f936a564c6f0
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Dec 4 18:14:19 2022 +0100
[DOXIATOOLS-74] add Markdown
---
pom.xml | 7 ++++++-
src/main/java/org/apache/maven/doxia/DefaultConverter.java | 12 ++++++++----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 960d526..c22fdc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@ under the License.
</distributionManagement>
<properties>
- <doxiaVersion>1.11.1</doxiaVersion>
+ <doxiaVersion>1.12.0-SNAPSHOT</doxiaVersion>
<javaVersion>8</javaVersion>
<project.build.outputTimestamp>2020-03-14T00:00:00Z</project.build.outputTimestamp>
</properties>
@@ -164,6 +164,11 @@ under the License.
<artifactId>doxia-module-xhtml5</artifactId>
<version>${doxiaVersion}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
<!-- Misc -->
<dependency>
<groupId>commons-cli</groupId>
diff --git a/src/main/java/org/apache/maven/doxia/DefaultConverter.java b/src/main/java/org/apache/maven/doxia/DefaultConverter.java
index e6b7223..809a622 100644
--- a/src/main/java/org/apache/maven/doxia/DefaultConverter.java
+++ b/src/main/java/org/apache/maven/doxia/DefaultConverter.java
@@ -94,10 +94,12 @@ public class DefaultConverter
private static final String XHTML5_PARSER = "xhtml5";
+ private static final String MARKDOWN_PARSER = "markdown";
+
/** Supported input format, i.e. supported Doxia parser */
public static final String[] SUPPORTED_FROM_FORMAT =
- { APT_PARSER, CONFLUENCE_PARSER, DOCBOOK_PARSER, FML_PARSER, TWIKI_PARSER, XDOC_PARSER, XHTML_PARSER,
- XHTML5_PARSER};
+ { APT_PARSER, CONFLUENCE_PARSER, DOCBOOK_PARSER, FML_PARSER, MARKDOWN_PARSER, TWIKI_PARSER,
+ XDOC_PARSER, XHTML_PARSER, XHTML5_PARSER };
private static final String APT_SINK = "apt";
@@ -121,10 +123,12 @@ public class DefaultConverter
private static final String XHTML5_SINK = "xhtml5";
+ private static final String MARKDOWN_SINK = "markdown";
+
/** Supported output format, i.e. supported Doxia Sink */
public static final String[] SUPPORTED_TO_FORMAT =
- { APT_SINK, CONFLUENCE_SINK, DOCBOOK_SINK, FO_SINK, ITEXT_SINK, LATEX_SINK, RTF_SINK, TWIKI_SINK, XDOC_SINK,
- XHTML_SINK, XHTML5_SINK };
+ { APT_SINK, CONFLUENCE_SINK, DOCBOOK_SINK, FO_SINK, ITEXT_SINK, LATEX_SINK, MARKDOWN_SINK, RTF_SINK, TWIKI_SINK,
+ XDOC_SINK, XHTML_SINK, XHTML5_SINK };
/** Flag to format the generated files, actually only for XML based sinks. */
private boolean formatOutput;