diff --git a/pkg/mark/markdown.go b/pkg/mark/markdown.go index 335166d..2ff2b71 100644 --- a/pkg/mark/markdown.go +++ b/pkg/mark/markdown.go @@ -437,14 +437,14 @@ func (r *ConfluenceRenderer) renderCodeBlock(writer util.BufWriter, source []byt func CompileMarkdown(markdown []byte, stdlib *stdlib.Lib) string { log.Tracef(nil, "rendering markdown:\n%s", string(markdown)) - colon := regexp.MustCompile(`---bf-COLON---`) + colon := []byte("---bf-COLON---") - tags := regexp.MustCompile(`<(/?ac):(\S+?)>`) + tags := regexp.MustCompile(`]+>`) - markdown = tags.ReplaceAll( - markdown, - []byte(`<$1`+colon.String()+`$2>`), - ) + for _, match := range tags.FindAll(markdown, -1) { + // Replace the colon in all "" tags with the colon bytes to avoid having Goldmark escape the HTML output. + markdown = bytes.ReplaceAll(markdown, match, bytes.ReplaceAll(match, []byte(":"), colon)) + } converter := goldmark.New( goldmark.WithExtensions( @@ -472,7 +472,8 @@ func CompileMarkdown(markdown []byte, stdlib *stdlib.Lib) string { panic(err) } - html := colon.ReplaceAll(buf.Bytes(), []byte(`:`)) + // Restore all the colons we previously replaced. + html := bytes.ReplaceAll(buf.Bytes(), colon, []byte(":")) log.Tracef(nil, "rendered markdown to html:\n%s", string(html)) diff --git a/pkg/mark/testdata/macro-include.html b/pkg/mark/testdata/macro-include.html new file mode 100644 index 0000000..55f1496 --- /dev/null +++ b/pkg/mark/testdata/macro-include.html @@ -0,0 +1,6 @@ +

bar

+ +true +Attention +This is an info! + \ No newline at end of file diff --git a/pkg/mark/testdata/macro-include.md b/pkg/mark/testdata/macro-include.md new file mode 100644 index 0000000..c8d3d89 --- /dev/null +++ b/pkg/mark/testdata/macro-include.md @@ -0,0 +1,7 @@ +bar + + +true +Attention +This is an info! + \ No newline at end of file