From 04bf20c0a3b1485e441e8a848407f59fb97d11d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
Date: Mon, 23 Oct 2023 21:03:57 +0200
Subject: [PATCH] change: Move back to XHTML

---
 pkg/mark/markdown.go                          | 4 ++++
 pkg/mark/testdata/links-droph1.html           | 2 +-
 pkg/mark/testdata/links-stripnewlines.html    | 2 +-
 pkg/mark/testdata/links.html                  | 2 +-
 pkg/mark/testdata/newlines-droph1.html        | 2 +-
 pkg/mark/testdata/newlines-stripnewlines.html | 2 +-
 pkg/mark/testdata/newlines.html               | 2 +-
 7 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkg/mark/markdown.go b/pkg/mark/markdown.go
index 809f5f5..2f057d3 100644
--- a/pkg/mark/markdown.go
+++ b/pkg/mark/markdown.go
@@ -78,6 +78,9 @@ func CompileMarkdown(markdown []byte, stdlib *stdlib.Lib, path string, mermaidPr
 			extension.GFM,
 			extension.Footnote,
 			extension.DefinitionList,
+			extension.NewTable(
+				extension.WithTableCellAlignMethod(extension.TableCellAlignStyle),
+			),
 			confluenceExtension,
 		),
 		goldmark.WithParserOptions(
@@ -85,6 +88,7 @@ func CompileMarkdown(markdown []byte, stdlib *stdlib.Lib, path string, mermaidPr
 		),
 		goldmark.WithRendererOptions(
 			html.WithUnsafe(),
+			html.WithXHTML(),
 		))
 
 	var buf bytes.Buffer
diff --git a/pkg/mark/testdata/links-droph1.html b/pkg/mark/testdata/links-droph1.html
index b7e77aa..82fd040 100644
--- a/pkg/mark/testdata/links-droph1.html
+++ b/pkg/mark/testdata/links-droph1.html
@@ -8,7 +8,7 @@
 <p><ac:image ac:alt="My External Image"><ri:url ri:value="http://confluence.atlassian.com/images/logo/confluence_48_trans.png?key1=value1&amp;key2=value2"/></ac:image></p>
 <p>Use footnotes link <sup id="fnref:1"><a href="#fn:1" class="footnote-ref" role="doc-noteref">1</a></sup></p>
 <div class="footnotes" role="doc-endnotes">
-<hr>
+<hr />
 <ol>
 <li id="fn:1">
 <p>a footnote link&#160;<a href="#fnref:1" class="footnote-backref" role="doc-backlink">&#x21a9;&#xfe0e;</a></p>
diff --git a/pkg/mark/testdata/links-stripnewlines.html b/pkg/mark/testdata/links-stripnewlines.html
index b7e77aa..82fd040 100644
--- a/pkg/mark/testdata/links-stripnewlines.html
+++ b/pkg/mark/testdata/links-stripnewlines.html
@@ -8,7 +8,7 @@
 <p><ac:image ac:alt="My External Image"><ri:url ri:value="http://confluence.atlassian.com/images/logo/confluence_48_trans.png?key1=value1&amp;key2=value2"/></ac:image></p>
 <p>Use footnotes link <sup id="fnref:1"><a href="#fn:1" class="footnote-ref" role="doc-noteref">1</a></sup></p>
 <div class="footnotes" role="doc-endnotes">
-<hr>
+<hr />
 <ol>
 <li id="fn:1">
 <p>a footnote link&#160;<a href="#fnref:1" class="footnote-backref" role="doc-backlink">&#x21a9;&#xfe0e;</a></p>
diff --git a/pkg/mark/testdata/links.html b/pkg/mark/testdata/links.html
index b7e77aa..82fd040 100644
--- a/pkg/mark/testdata/links.html
+++ b/pkg/mark/testdata/links.html
@@ -8,7 +8,7 @@
 <p><ac:image ac:alt="My External Image"><ri:url ri:value="http://confluence.atlassian.com/images/logo/confluence_48_trans.png?key1=value1&amp;key2=value2"/></ac:image></p>
 <p>Use footnotes link <sup id="fnref:1"><a href="#fn:1" class="footnote-ref" role="doc-noteref">1</a></sup></p>
 <div class="footnotes" role="doc-endnotes">
-<hr>
+<hr />
 <ol>
 <li id="fn:1">
 <p>a footnote link&#160;<a href="#fnref:1" class="footnote-backref" role="doc-backlink">&#x21a9;&#xfe0e;</a></p>
diff --git a/pkg/mark/testdata/newlines-droph1.html b/pkg/mark/testdata/newlines-droph1.html
index 22d4385..b97e510 100644
--- a/pkg/mark/testdata/newlines-droph1.html
+++ b/pkg/mark/testdata/newlines-droph1.html
@@ -6,5 +6,5 @@ one-2</p>
 <p>three-2</p>
 <p>space-1
 space-2</p>
-<p>2space-1<br>
+<p>2space-1<br />
 2space-2</p>
diff --git a/pkg/mark/testdata/newlines-stripnewlines.html b/pkg/mark/testdata/newlines-stripnewlines.html
index 7bf8b25..2fd4dc0 100644
--- a/pkg/mark/testdata/newlines-stripnewlines.html
+++ b/pkg/mark/testdata/newlines-stripnewlines.html
@@ -4,5 +4,5 @@
 <p>three-1</p>
 <p>three-2</p>
 <p>space-1 space-2</p>
-<p>2space-1<br>
+<p>2space-1<br />
 2space-2</p>
diff --git a/pkg/mark/testdata/newlines.html b/pkg/mark/testdata/newlines.html
index 22d4385..b97e510 100644
--- a/pkg/mark/testdata/newlines.html
+++ b/pkg/mark/testdata/newlines.html
@@ -6,5 +6,5 @@ one-2</p>
 <p>three-2</p>
 <p>space-1
 space-2</p>
-<p>2space-1<br>
+<p>2space-1<br />
 2space-2</p>