diff --git a/fake b/fake deleted file mode 100644 index 61ce77f..0000000 --- a/fake +++ /dev/null @@ -1 +0,0 @@ -ajkdfhajksdf diff --git a/pom.xml b/pom.xml index 6fa436c..af87cba 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.atlassian.plugins.confluence.markdown confluence-markdown-macro - 1.2-SNAPSHOT + 1.3.1-SNAPSHOT Atlassian http://www.atlassian.com/ @@ -49,9 +49,9 @@ 2.2.2-atlassian-1 - org.pegdown - pegdown - 1.2.1 + com.vladsch.flexmark + flexmark-all + 0.22.4 @@ -76,14 +76,14 @@ - 4.3.7 - 4.3.7 - 4.2.2 + 5.9.1 + 5.9.1 + 6.2.11 1.1 - scm:git:git@bitbucket.org:atlassianlabs/markdown-macro-for-confluence.git - scm:git:git@bitbucket.org:atlassianlabs/markdown-macro-for-confluence.git - https://bitbucket.org/atlassianlabs/confluence-markdown-macro + scm:git:git@bitbucket.org:atlasauthority/markdown-macro-for-confluence.git + scm:git:git@bitbucket.org:atlasauthority/markdown-macro-for-confluence.git + https://bitbucket.org/atlasauthority/markdown-macro-for-confluence diff --git a/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java b/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java index 1369d5b..45e5195 100644 --- a/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java +++ b/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java @@ -10,6 +10,7 @@ import com.atlassian.confluence.xhtml.api.MacroDefinitionHandler; import com.atlassian.confluence.xhtml.api.XhtmlContent; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -17,8 +18,21 @@ import com.atlassian.renderer.RenderContext; import com.atlassian.renderer.v2.RenderMode; import com.atlassian.renderer.v2.macro.BaseMacro; import com.atlassian.renderer.v2.macro.MacroException; -import org.pegdown.Parser; -import org.pegdown.PegDownProcessor; + +import com.vladsch.flexmark.ast.Node; +import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughSubscriptExtension; +import com.vladsch.flexmark.ext.tables.TablesExtension; +//import com.vladsch.flexmark.ext.superscript.SuperscriptExtension; +import com.vladsch.flexmark.ext.ins.InsExtension; +import com.vladsch.flexmark.ext.definition.DefinitionExtension; +import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension; +import com.vladsch.flexmark.ext.footnotes.FootnoteExtension; +import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension; +import com.vladsch.flexmark.html.HtmlRenderer; +import com.vladsch.flexmark.parser.Parser; +import com.vladsch.flexmark.util.options.MutableDataSet; + + public class MarkdownMacro extends BaseMacro implements Macro { @@ -44,9 +58,30 @@ public class MarkdownMacro extends BaseMacro implements Macro @Override public String execute(Map parameters, String bodyContent, ConversionContext conversionContext) throws MacroExecutionException { - PegDownProcessor translator = new PegDownProcessor(Parser.ALL); - String output = translator.markdownToHtml(bodyContent); - return output; + MutableDataSet options = new MutableDataSet(); + + options.set(Parser.EXTENSIONS, Arrays.asList( + TablesExtension.create(), + StrikethroughSubscriptExtension.create(), +// SuperscriptExtension.create(), + InsExtension.create(), + TaskListExtension.create(), + FootnoteExtension.create(), + WikiLinkExtension.create(), + DefinitionExtension.create() + )); + + + Parser parser = Parser.builder(options).build(); + HtmlRenderer renderer = HtmlRenderer.builder(options).build(); + + Node document = parser.parse(bodyContent); + String html = renderer.render(document); // "

This is Sparta

\n" + return html; + + //PegDownProcessor translator = new PegDownProcessor(Parser.ALL); + //String output = translator.markdownToHtml(bodyContent); + //return output; } @Override diff --git a/src/main/resources/.DS_Store b/src/main/resources/.DS_Store index 2e63a17..0a2e2d9 100644 Binary files a/src/main/resources/.DS_Store and b/src/main/resources/.DS_Store differ diff --git a/src/main/resources/atlassian-plugin.xml b/src/main/resources/atlassian-plugin.xml index 70521a7..ef811bf 100644 --- a/src/main/resources/atlassian-plugin.xml +++ b/src/main/resources/atlassian-plugin.xml @@ -15,8 +15,6 @@ documentation-url="http://daringfireball.net/projects/markdown/"> - - - - diff --git a/src/main/resources/images/1pluginIcon.png b/src/main/resources/images/1pluginIcon.png deleted file mode 100644 index 798d9e2..0000000 Binary files a/src/main/resources/images/1pluginIcon.png and /dev/null differ diff --git a/src/main/resources/images/1pluginLogo.png b/src/main/resources/images/1pluginLogo.png deleted file mode 100644 index 48143ec..0000000 Binary files a/src/main/resources/images/1pluginLogo.png and /dev/null differ diff --git a/src/main/resources/markdownproperties/markdown.properties b/src/main/resources/markdownproperties/markdown.properties index b1b5302..6ead454 100644 --- a/src/main/resources/markdownproperties/markdown.properties +++ b/src/main/resources/markdownproperties/markdown.properties @@ -1,3 +1 @@ -com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.desc=This macro renders text in Markdown syntax into HTML. -com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.param.extended.label=Enable extended Markdown properties: -com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.param.extended.desc=Find info about extended Markdown at: https://github.com/sirthias/pegdown#readme \ No newline at end of file +com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.desc=This macro renders Markdown into HTML. \ No newline at end of file diff --git a/src/main/resources/markdownproperties/markdown_de_DE.properties b/src/main/resources/markdownproperties/markdown_de_DE.properties index 247e086..e7d29ed 100644 --- a/src/main/resources/markdownproperties/markdown_de_DE.properties +++ b/src/main/resources/markdownproperties/markdown_de_DE.properties @@ -1,3 +1 @@ -com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.desc=Dieses Makro wandelt Markdown in HTML um. -com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.param.extended.label=Aktivieren sich weiter Eigenschaften Markdown: -com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.param.extended.desc=Befindet sich information \u00FCber Extended Markdown: https://github.com/sirthias/pegdown#readme \ No newline at end of file +com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.desc=Dieses Makro wandelt Markdown in HTML um. \ No newline at end of file diff --git a/src/main/resources/markdownproperties/markdown_fr_FR.properties b/src/main/resources/markdownproperties/markdown_fr_FR.properties index c6ae523..70ebc42 100644 --- a/src/main/resources/markdownproperties/markdown_fr_FR.properties +++ b/src/main/resources/markdownproperties/markdown_fr_FR.properties @@ -1,3 +1 @@ -com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.desc=Ce macro converti le text format\u00E9 selon Markdown vers HTML -com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.param.extended.label=Activez les propri\u00E9t\u00E9s avanc\u00E9es de Markdown:Pour plus d'information sur -com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.param.extended.desc=Pour plus d'information sur les propri\u00E9t\u00E9s avanc\u00E9es de Markdown: https://github.com/sirthias/pegdown#readme \ No newline at end of file +com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.desc=Ce macro converti Markdown vers HTML \ No newline at end of file diff --git a/src/main/resources/markdownproperties/markdown_it_IT.properties b/src/main/resources/markdownproperties/markdown_it_IT.properties new file mode 100644 index 0000000..f738379 --- /dev/null +++ b/src/main/resources/markdownproperties/markdown_it_IT.properties @@ -0,0 +1 @@ +com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.desc=Ce macro converti le text format\u00E9 selon Markdown vers HTML \ No newline at end of file