arti/markdown-macro-for-confluence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes anchors in headings, updated flexmark version, sane settings for tables

Browse Source
This commit is contained in:
Boris Berenberg
2018-11-16 14:50:35 -05:00
parent cd86baa22f
commit 98e672ff5b
4 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -7,7 +7,7 @@ It can be accessed via:
* Macro Browser * Macro Browser
* {markdown} tags * {markdown} tags
* SOAP API using <ac:macro ac:name="markdown">/ac:macro> * SOAP API using <ac:macro ac:name="markdown"></ac:macro>
This macro supports the following languages: This macro supports the following languages:

18
pom.xml
View File

@@ -9,7 +9,7 @@
</parent> </parent>
<groupId>com.atlassian.plugins.confluence.markdown</groupId> <groupId>com.atlassian.plugins.confluence.markdown</groupId>
<artifactId>confluence-markdown-macro</artifactId> <artifactId>confluence-markdown-macro</artifactId>
<version>1.3.4</version> <version>1.4.1</version>
<organization> <organization>
<name>Atlassian</name> <name>Atlassian</name>
<url>http://www.atlassian.com/</url> <url>http://www.atlassian.com/</url>
@@ -51,27 +51,27 @@
<dependency> <dependency>
<groupId>com.vladsch.flexmark</groupId> <groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-all</artifactId> <artifactId>flexmark-all</artifactId>
<version>0.32.24</version> <version>0.34.53</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.vladsch.flexmark</groupId> <groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-ext-anchorlink</artifactId> <artifactId>flexmark-ext-anchorlink</artifactId>
<version>0.32.24</version> <version>0.34.53</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.vladsch.flexmark</groupId> <groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-ext-autolink</artifactId> <artifactId>flexmark-ext-autolink</artifactId>
<version>0.32.24</version> <version>0.34.53</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.vladsch.flexmark</groupId> <groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-ext-superscript</artifactId> <artifactId>flexmark-ext-superscript</artifactId>
<version>0.32.24</version> <version>0.34.53</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.vladsch.flexmark</groupId> <groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-ext-youtube-embedded</artifactId> <artifactId>flexmark-ext-youtube-embedded</artifactId>
<version>0.32.24</version> <version>0.34.53</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.atlassian.plugin</groupId> <groupId>com.atlassian.plugin</groupId>
@@ -90,8 +90,8 @@
<configuration> <configuration>
<productVersion>${confluence.version}</productVersion> <productVersion>${confluence.version}</productVersion>
<productDataVersion>${confluence.data.version}</productDataVersion> <productDataVersion>${confluence.data.version}</productDataVersion>
<enableQuickReload>true</enableQuickReload> <enableQuickReload>true</enableQuickReload>
<enableFastdev>false</enableFastdev> <enableFastdev>false</enableFastdev>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@@ -106,7 +106,7 @@
<properties> <properties>
<confluence.version>6.9.0</confluence.version> <confluence.version>6.9.0</confluence.version>
<confluence.data.version>6.9.0</confluence.data.version> <confluence.data.version>6.9.0</confluence.data.version>
<amps.version>6.3.0</amps.version> <amps.version>6.3.21</amps.version>
<plugin.testrunner.version>1.1</plugin.testrunner.version> <plugin.testrunner.version>1.1</plugin.testrunner.version>
<atlassian.spring.scanner.version>2.1.7</atlassian.spring.scanner.version> <atlassian.spring.scanner.version>2.1.7</atlassian.spring.scanner.version>
</properties> </properties>

13
src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownFromURLMacro.java
View File

@@ -83,7 +83,18 @@ public class MarkdownFromURLMacro extends BaseMacro implements Macro
if (bodyContent != null) { if (bodyContent != null) {
pageBuilderService.assembler().resources().requireWebResource("com.atlassian.plugins.confluence.markdown.confluence-markdown-macro:highlightjs"); pageBuilderService.assembler().resources().requireWebResource("com.atlassian.plugins.confluence.markdown.confluence-markdown-macro:highlightjs");
MutableDataSet options = new MutableDataSet(); MutableDataSet options = new MutableDataSet()
.set(HtmlRenderer.GENERATE_HEADER_ID, true)
.set(HtmlRenderer.INDENT_SIZE, 2)
.set(HtmlRenderer.PERCENT_ENCODE_URLS, true)
// for full GFM table compatibility add the following table extension options:
.set(TablesExtension.COLUMN_SPANS, false)
.set(TablesExtension.APPEND_MISSING_COLUMNS, true)
.set(TablesExtension.DISCARD_EXTRA_COLUMNS, true)
.set(TablesExtension.HEADER_SEPARATOR_COLUMN_MATCH, true)
.set(Parser.EXTENSIONS, Arrays.asList(TablesExtension.create()))
;
options.set(Parser.EXTENSIONS, Arrays.asList( options.set(Parser.EXTENSIONS, Arrays.asList(
TablesExtension.create(), TablesExtension.create(),

14
src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java
View File

@@ -79,7 +79,17 @@ public class MarkdownMacro extends BaseMacro implements Macro
pageBuilderService.assembler().resources().requireWebResource("com.atlassian.plugins.confluence.markdown.confluence-markdown-macro:highlightjs"); pageBuilderService.assembler().resources().requireWebResource("com.atlassian.plugins.confluence.markdown.confluence-markdown-macro:highlightjs");
MutableDataSet options = new MutableDataSet(); MutableDataSet options = new MutableDataSet()
.set(HtmlRenderer.GENERATE_HEADER_ID, true)
.set(HtmlRenderer.INDENT_SIZE, 2)
.set(HtmlRenderer.PERCENT_ENCODE_URLS, true)
// for full GFM table compatibility add the following table extension options:
.set(TablesExtension.COLUMN_SPANS, false)
.set(TablesExtension.APPEND_MISSING_COLUMNS, true)
.set(TablesExtension.DISCARD_EXTRA_COLUMNS, true)
.set(TablesExtension.HEADER_SEPARATOR_COLUMN_MATCH, true)
.set(Parser.EXTENSIONS, Arrays.asList(TablesExtension.create()));
options.set(Parser.EXTENSIONS, Arrays.asList( options.set(Parser.EXTENSIONS, Arrays.asList(
TablesExtension.create(), TablesExtension.create(),
@@ -89,7 +99,7 @@ public class MarkdownMacro extends BaseMacro implements Macro
FootnoteExtension.create(), FootnoteExtension.create(),
WikiLinkExtension.create(), WikiLinkExtension.create(),
DefinitionExtension.create(), DefinitionExtension.create(),
//AnchorLinkExtension.create(), AnchorLinkExtension.create(),
AutolinkExtension.create(), AutolinkExtension.create(),
SuperscriptExtension.create(), SuperscriptExtension.create(),
YouTubeLinkExtension.create() YouTubeLinkExtension.create()