Merge table columns if two pipes with with no space are next to each other.

readying 1.4.2 release
fixing broken JS for code blocks in url macro, adding js to modify tables for Confluence styling.
2019-03-14 14:49:03 +00:00 · 2018-12-19 10:40:25 -05:00 · 2018-12-19 10:40:12 -05:00 · 2018-11-16 14:55:15 -05:00 · 2018-11-16 14:50:35 -05:00 · 2018-09-28 02:29:39 +00:00
5 changed files with 123 additions and 105 deletions
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ It can be accessed via:

 *   Macro Browser
 *   {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:

--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
    </parent>
    <groupId>com.atlassian.plugins.confluence.markdown</groupId>
    <artifactId>confluence-markdown-macro</artifactId>
-    <version>1.3.2</version>
+    <version>1.4.2</version>
    <organization>
        <name>Atlassian</name>
        <url>http://www.atlassian.com/</url>
@@ -51,27 +51,27 @@
        <dependency>
            <groupId>com.vladsch.flexmark</groupId>
            <artifactId>flexmark-all</artifactId>
-            <version>0.32.24</version>
+            <version>0.34.53</version>
        </dependency>
        <dependency>
            <groupId>com.vladsch.flexmark</groupId>
            <artifactId>flexmark-ext-anchorlink</artifactId>
-            <version>0.32.24</version>
+            <version>0.34.53</version>
        </dependency>
        <dependency>
            <groupId>com.vladsch.flexmark</groupId>
            <artifactId>flexmark-ext-autolink</artifactId>
-            <version>0.32.24</version>
+            <version>0.34.53</version>
        </dependency>
        <dependency>
            <groupId>com.vladsch.flexmark</groupId>
            <artifactId>flexmark-ext-superscript</artifactId>
-            <version>0.32.24</version>
+            <version>0.34.53</version>
        </dependency>
        <dependency>
            <groupId>com.vladsch.flexmark</groupId>
            <artifactId>flexmark-ext-youtube-embedded</artifactId>
-            <version>0.32.24</version>
+            <version>0.34.53</version>
        </dependency>
        <dependency>
            <groupId>com.atlassian.plugin</groupId>
@@ -106,7 +106,7 @@
    <properties>
        <confluence.version>6.9.0</confluence.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>
        <atlassian.spring.scanner.version>2.1.7</atlassian.spring.scanner.version>
    </properties>
--- a/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownFromURLMacro.java
+++ b/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownFromURLMacro.java
@@ -2,52 +2,43 @@ package com.atlassian.plugins.confluence.markdown;

 import com.atlassian.confluence.content.render.xhtml.ConversionContext;
 import com.atlassian.confluence.content.render.xhtml.DefaultConversionContext;
-import com.atlassian.confluence.content.render.xhtml.XhtmlException;
 import com.atlassian.confluence.macro.Macro;
 import com.atlassian.confluence.macro.MacroExecutionException;
-import com.atlassian.confluence.xhtml.api.MacroDefinition;
-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;
-
+import com.atlassian.plugin.spring.scanner.annotation.imports.ComponentImport;
 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 com.atlassian.plugin.spring.scanner.annotation.component.Scanned;
-import com.atlassian.plugin.spring.scanner.annotation.imports.ComponentImport;
 import com.atlassian.webresource.api.assembler.PageBuilderService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-
 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.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.ext.autolink.AutolinkExtension;
 import com.vladsch.flexmark.ext.anchorlink.AnchorLinkExtension;
-import com.vladsch.flexmark.superscript.SuperscriptExtension;
+import com.vladsch.flexmark.ext.autolink.AutolinkExtension;
+import com.vladsch.flexmark.ext.definition.DefinitionExtension;
+import com.vladsch.flexmark.ext.footnotes.FootnoteExtension;
+import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughSubscriptExtension;
+import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension;
+import com.vladsch.flexmark.ext.ins.InsExtension;
+import com.vladsch.flexmark.ext.tables.TablesExtension;
+import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension;
 import com.vladsch.flexmark.ext.youtube.embedded.YouTubeLinkExtension;
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.parser.Parser;
+import com.vladsch.flexmark.superscript.SuperscriptExtension;
 import com.vladsch.flexmark.util.options.MutableDataSet;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Map;


-import java.net.*;
-import java.io.*;
-
-//@Scanned
-public class MarkdownFromURLMacro extends BaseMacro implements Macro
-{
+public class MarkdownFromURLMacro extends BaseMacro implements Macro {

    private final XhtmlContent xhtmlUtils;

@@ -59,31 +50,37 @@ public class MarkdownFromURLMacro extends BaseMacro implements Macro
        this.xhtmlUtils = xhtmlUtils;
    }

-//    public MarkdownFromURLMacro(XhtmlContent xhtmlUtils)
-//    {
-//        this.xhtmlUtils = xhtmlUtils;
-//    }

    @Override
-    public BodyType getBodyType()
-    {
+    public BodyType getBodyType() {
        return BodyType.PLAIN_TEXT;
    }

    @Override
-    public OutputType getOutputType()
-    {
+    public OutputType getOutputType() {
        return OutputType.BLOCK;
    }

    @Override
+
    public String execute(Map<String, String> parameters, String bodyContent, ConversionContext conversionContext) throws MacroExecutionException
    {

 		if (bodyContent != null) {
 			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(TablesExtension.CLASS_NAME, "confluenceTable")
+                    .set(Parser.EXTENSIONS, Arrays.asList(TablesExtension.create()));

 			options.set(Parser.EXTENSIONS, Arrays.asList(
 				TablesExtension.create(), 
@@ -102,11 +99,24 @@ public class MarkdownFromURLMacro extends BaseMacro implements Macro


 			String highlightjs = "<script>\n" +
-					"AJS.$('[data-macro-name=\"markdown\"] code').each(function(i, block) {\n" +
+					"AJS.$('[data-macro-name=\"markdown-from-url\"] code').each(function(i, block) {\n" +
 					"    hljs.highlightBlock(block);\n" +
 					"  });\n" +
 					"</script>";

+			String highlightjscss = "<style>\n"+
+					".hljs {display: inline;}\n" +
+					"pre > code {display: block !important;}\n" +
+					"</style>";
+
+			String tableFixJs = "<script>AJS.$('[data-macro-name=\"markdown-from-url\"] table thead th').each(function(i, block) {\n" +
+                    "    block.classList.add(\"confluenceTh\");\n" +
+                    "});\n" +
+                    "\n" +
+                    "AJS.$('[data-macro-name=\"markdown-from-url\"] table tbody tr td').each(function(i, block) {\n" +
+                    "    block.classList.add(\"confluenceTd\");\n" +
+                    "});</script>";
+
 			class privateRepositoryException extends Exception {
 				public privateRepositoryException(String message) {
 					super(message);
@@ -134,7 +144,7 @@ public class MarkdownFromURLMacro extends BaseMacro implements Macro
 					throw new privateRepositoryException("Cannot import from private repository.");
 				}else {
 					Node document = parser.parse(toParse);
-					html = renderer.render(document) + highlightjs;
+					html = renderer.render(document) + highlightjs + highlightjscss + tableFixJs;
 				}
 			}
 			catch (MalformedURLException u) {
@@ -175,7 +185,7 @@ public class MarkdownFromURLMacro extends BaseMacro implements Macro
        try {
            return execute(map, s, new DefaultConversionContext(renderContext));
        } catch (MacroExecutionException e) {
-            throw new MacroException(e.getMessage(),e);
+            throw new MacroException(e.getMessage(), e);
        }
    }
 }
--- a/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java
+++ b/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java
@@ -2,48 +2,36 @@ package com.atlassian.plugins.confluence.markdown;

 import com.atlassian.confluence.content.render.xhtml.ConversionContext;
 import com.atlassian.confluence.content.render.xhtml.DefaultConversionContext;
-import com.atlassian.confluence.content.render.xhtml.XhtmlException;
 import com.atlassian.confluence.macro.Macro;
 import com.atlassian.confluence.macro.MacroExecutionException;
-import com.atlassian.confluence.xhtml.api.MacroDefinition;
-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;
-
+import com.atlassian.plugin.spring.scanner.annotation.imports.ComponentImport;
 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 com.atlassian.plugin.spring.scanner.annotation.component.Scanned;
-import com.atlassian.plugin.spring.scanner.annotation.imports.ComponentImport;
 import com.atlassian.webresource.api.assembler.PageBuilderService;
-import org.springframework.beans.factory.annotation.Autowired;
-
 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.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.ext.autolink.AutolinkExtension;
 import com.vladsch.flexmark.ext.anchorlink.AnchorLinkExtension;
-import com.vladsch.flexmark.superscript.SuperscriptExtension;
+import com.vladsch.flexmark.ext.autolink.AutolinkExtension;
+import com.vladsch.flexmark.ext.definition.DefinitionExtension;
+import com.vladsch.flexmark.ext.footnotes.FootnoteExtension;
+import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughSubscriptExtension;
+import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension;
+import com.vladsch.flexmark.ext.ins.InsExtension;
+import com.vladsch.flexmark.ext.tables.TablesExtension;
+import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension;
 import com.vladsch.flexmark.ext.youtube.embedded.YouTubeLinkExtension;
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.parser.Parser;
+import com.vladsch.flexmark.superscript.SuperscriptExtension;
 import com.vladsch.flexmark.util.options.MutableDataSet;
+import org.springframework.beans.factory.annotation.Autowired;

+import java.util.Arrays;
+import java.util.Map;

-//@Scanned
-public class MarkdownMacro extends BaseMacro implements Macro
-{
+public class MarkdownMacro extends BaseMacro implements Macro {

    private final XhtmlContent xhtmlUtils;

@@ -55,31 +43,34 @@ public class MarkdownMacro extends BaseMacro implements Macro
        this.xhtmlUtils = xhtmlUtils;
    }

-//    public MarkdownMacro(XhtmlContent xhtmlUtils)
-//    {
-//        this.xhtmlUtils = xhtmlUtils;
-//    }
-
    @Override
-    public BodyType getBodyType()
-    {
+    public BodyType getBodyType() {
        return BodyType.PLAIN_TEXT;
    }

    @Override
-    public OutputType getOutputType()
-    {
+    public OutputType getOutputType() {
        return OutputType.BLOCK;
    }

    @Override
-    public String execute(Map<String, String> parameters, String bodyContent, ConversionContext conversionContext) throws MacroExecutionException
-    {
+    public String execute(Map<String, String> parameters, String bodyContent, ConversionContext conversionContext) throws MacroExecutionException {


        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, true)
+                .set(TablesExtension.APPEND_MISSING_COLUMNS, true)
+                .set(TablesExtension.DISCARD_EXTRA_COLUMNS, true)
+                .set(TablesExtension.HEADER_SEPARATOR_COLUMN_MATCH, true)
+                .set(TablesExtension.CLASS_NAME, "confluenceTable")
+                .set(Parser.EXTENSIONS, Arrays.asList(TablesExtension.create()));

        options.set(Parser.EXTENSIONS, Arrays.asList(
                TablesExtension.create(),
@@ -103,11 +94,27 @@ public class MarkdownMacro extends BaseMacro implements Macro
                "  });\n" +
                "</script>";

+        String highlightjscss = "<style>\n"+
+                ".hljs {display: inline;}\n" +
+                "pre > code {display: block !important;}\n" +
+                "</style>";
+
+        String tableFixJs = "<script> AJS.$('[data-macro-name=\"markdown\"] table thead th').each(function(i, block) {\n" +
+                "    block.classList.add(\"confluenceTh\");\n" +
+                "});\n" +
+                "\n" +
+                "AJS.$('[data-macro-name=\"markdown\"] table tbody tr td').each(function(i, block) {\n" +
+                "    block.classList.add(\"confluenceTd\");\n" +
+                "});</script>";
+
+
        Parser parser = Parser.builder(options).build();
        HtmlRenderer renderer = HtmlRenderer.builder(options).build();

        Node document = parser.parse(bodyContent);
-        String html = renderer.render(document ) + highlightjs;  // "<p>This is <em>Sparta</em></p>\n"
+
+        String html = renderer.render(document ) + highlightjs + highlightjscss + tableFixJs;  // "<p>This is <em>Sparta</em></p>\n"
+
        return html;

    }
@@ -127,7 +134,7 @@ public class MarkdownMacro extends BaseMacro implements Macro
        try {
            return execute(map, s, new DefaultConversionContext(renderContext));
        } catch (MacroExecutionException e) {
-            throw new MacroException(e.getMessage(),e);
+            throw new MacroException(e.getMessage(), e);
        }
    }
 }
--- a/src/main/resources/atlassian-plugin.xml
+++ b/src/main/resources/atlassian-plugin.xml
@@ -6,6 +6,7 @@
        <param name="plugin-icon">images/pluginIcon.png</param>
        <param name="plugin-logo">images/pluginLogo.png</param>
 	<param name="atlassian-data-center-compatible">true</param>
+    <param name="atlassian-data-center-status">compatible</param>
    </plugin-info>
 	
 	<xhtml-macro name="markdown"
Author	SHA1	Message	Date
Arti Zirk	5428422f58	Merge table columns if two pipes with with no space are next to each other.	2019-03-14 14:49:03 +00:00
Boris Berenberg	5ac7422d29	readying 1.4.2 release	2018-12-19 10:40:25 -05:00
Boris Berenberg	add4e0abbd	fixing broken JS for code blocks in url macro, adding js to modify tables for Confluence styling.	2018-12-19 10:40:12 -05:00
Boris Berenberg	9918002f3e	i think this is the right way to merge these'	2018-11-16 14:55:15 -05:00
Boris Berenberg	98e672ff5b	fixes anchors in headings, updated flexmark version, sane settings for tables	2018-11-16 14:50:35 -05:00
Otto Jongerius	c381807317	Merged in optimise_imports_and_remove_dead_code (pull request #3 ) Optimise imports, reformat and remove dead code Approved-by: Joshua Carpenter <joshua@interoctiv.io>	2018-09-28 02:29:39 +00:00
Otto Jongerius	3335c2c97d	optimise imports, reformat and remove dead code	2018-09-17 12:15:23 +12:00
Joshua Carpenter	060b7b2070	Merged in import-from-url (pull request #1 ) Import from url	2018-09-06 14:47:19 +00:00
unknown	1fddfb3f17	Fixed bug with syntax highlighting when importing from URL	2018-09-05 11:16:01 -06:00
Boris Berenberg	cd86baa22f	Merge branch 'import-from-url'	2018-08-21 12:12:07 -04:00
Boris Berenberg	8aa88c0d09	higlight js fixes	2018-08-06 21:24:23 -04:00
Boris Berenberg	1253a02da9	new dc shit	2018-08-06 21:21:18 -04:00