From aaae918478ca16ee553d0610f14be95410e78eaf Mon Sep 17 00:00:00 2001
From: Stephen Paulger <stephenpaulger@users.noreply.github.com>
Date: Tue, 19 Dec 2023 12:57:52 +0000
Subject: [PATCH] Fix layout section attribute tags (#401)

* Fix attribute tags

* Update test date to expect attribute with ac: prefix
---
 pkg/mark/renderer/htmlblock.go                  | 12 ++++++------
 pkg/mark/testdata/pagelayout-droph1.html        |  4 ++--
 pkg/mark/testdata/pagelayout-stripnewlines.html |  4 ++--
 pkg/mark/testdata/pagelayout.html               |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkg/mark/renderer/htmlblock.go b/pkg/mark/renderer/htmlblock.go
index 7f900b5..acb3206 100644
--- a/pkg/mark/renderer/htmlblock.go
+++ b/pkg/mark/renderer/htmlblock.go
@@ -45,22 +45,22 @@ func (r *ConfluenceHTMLBlockRenderer) renderHTMLBlock(w util.BufWriter, source [
 			_, _ = w.WriteString("</ac:layout>\n")
 			return ast.WalkContinue, nil
 		case "<!-- ac:layout-section type:single -->":
-			_, _ = w.WriteString("<ac:layout-section type=\"single\">\n")
+			_, _ = w.WriteString("<ac:layout-section ac:type=\"single\">\n")
 			return ast.WalkContinue, nil
 		case "<!-- ac:layout-section type:two_equal -->":
-			_, _ = w.WriteString("<ac:layout-section type=\"two_equal\">\n")
+			_, _ = w.WriteString("<ac:layout-section ac:type=\"two_equal\">\n")
 			return ast.WalkContinue, nil
 		case "<!-- ac:layout-section type:two_left_sidebar -->":
-			_, _ = w.WriteString("<ac:layout-section type=\"two_left_sidebar\">\n")
+			_, _ = w.WriteString("<ac:layout-section ac:type=\"two_left_sidebar\">\n")
 			return ast.WalkContinue, nil
 		case "<!-- ac:layout-section type:two_right_sidebar -->":
-			_, _ = w.WriteString("<ac:layout-section type=\"two_right_sidebar\">\n")
+			_, _ = w.WriteString("<ac:layout-section ac:type=\"two_right_sidebar\">\n")
 			return ast.WalkContinue, nil
 		case "<!-- ac:layout-section type:three -->":
-			_, _ = w.WriteString("<ac:layout-section type=\"three\">\n")
+			_, _ = w.WriteString("<ac:layout-section ac:type=\"three\">\n")
 			return ast.WalkContinue, nil
 		case "<!-- ac:layout-section type:three_with_sidebars -->":
-			_, _ = w.WriteString("<ac:layout-section type=\"three_with_sidebars\">\n")
+			_, _ = w.WriteString("<ac:layout-section ac:type=\"three_with_sidebars\">\n")
 			return ast.WalkContinue, nil
 		case "<!-- ac:layout-section end -->":
 			_, _ = w.WriteString("</ac:layout-section>\n")
diff --git a/pkg/mark/testdata/pagelayout-droph1.html b/pkg/mark/testdata/pagelayout-droph1.html
index 66f5783..a244202 100644
--- a/pkg/mark/testdata/pagelayout-droph1.html
+++ b/pkg/mark/testdata/pagelayout-droph1.html
@@ -1,5 +1,5 @@
 <ac:layout>
-<ac:layout-section type="three_with_sidebars">
+<ac:layout-section ac:type="three_with_sidebars">
 <ac:layout-cell>
 <p>More Content</p>
 </ac:layout-cell>
@@ -10,7 +10,7 @@
 <p>Even More Content</p>
 </ac:layout-cell>
 </ac:layout-section>
-<ac:layout-section type="single">
+<ac:layout-section ac:type="single">
 <ac:layout-cell>
 <p>Still More Content</p>
 </ac:layout-cell>
diff --git a/pkg/mark/testdata/pagelayout-stripnewlines.html b/pkg/mark/testdata/pagelayout-stripnewlines.html
index 66f5783..a244202 100644
--- a/pkg/mark/testdata/pagelayout-stripnewlines.html
+++ b/pkg/mark/testdata/pagelayout-stripnewlines.html
@@ -1,5 +1,5 @@
 <ac:layout>
-<ac:layout-section type="three_with_sidebars">
+<ac:layout-section ac:type="three_with_sidebars">
 <ac:layout-cell>
 <p>More Content</p>
 </ac:layout-cell>
@@ -10,7 +10,7 @@
 <p>Even More Content</p>
 </ac:layout-cell>
 </ac:layout-section>
-<ac:layout-section type="single">
+<ac:layout-section ac:type="single">
 <ac:layout-cell>
 <p>Still More Content</p>
 </ac:layout-cell>
diff --git a/pkg/mark/testdata/pagelayout.html b/pkg/mark/testdata/pagelayout.html
index 66f5783..a244202 100644
--- a/pkg/mark/testdata/pagelayout.html
+++ b/pkg/mark/testdata/pagelayout.html
@@ -1,5 +1,5 @@
 <ac:layout>
-<ac:layout-section type="three_with_sidebars">
+<ac:layout-section ac:type="three_with_sidebars">
 <ac:layout-cell>
 <p>More Content</p>
 </ac:layout-cell>
@@ -10,7 +10,7 @@
 <p>Even More Content</p>
 </ac:layout-cell>
 </ac:layout-section>
-<ac:layout-section type="single">
+<ac:layout-section ac:type="single">
 <ac:layout-cell>
 <p>Still More Content</p>
 </ac:layout-cell>