aboutsummaryrefslogtreecommitdiffhomepage
path: root/markup
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <[email protected]>2024-09-05 10:46:47 +0200
committerBjørn Erik Pedersen <[email protected]>2024-09-05 12:12:24 +0200
commit66a3a1100167e26a13078c311318cd0576dd14ee (patch)
tree9fa85b2d0170399fca960097e7af050151c68f09 /markup
parent8f2eac0195cf02f7edbcbce4b7e02768b12762fe (diff)
downloadhugo-66a3a1100167e26a13078c311318cd0576dd14ee.tar.gz
hugo-66a3a1100167e26a13078c311318cd0576dd14ee.zip
Fix stray end p tag in Obsidian callout titles
Also remove test references to deprecated funcs now in ERROR. Closes #12828
Diffstat (limited to 'markup')
-rw-r--r--markup/goldmark/blockquotes/blockquotes.go4
-rw-r--r--markup/goldmark/blockquotes/blockquotes_integration_test.go13
-rw-r--r--markup/goldmark/blockquotes/blockquotes_test.go2
3 files changed, 13 insertions, 6 deletions
diff --git a/markup/goldmark/blockquotes/blockquotes.go b/markup/goldmark/blockquotes/blockquotes.go
index f6d1a590e..f9d518850 100644
--- a/markup/goldmark/blockquotes/blockquotes.go
+++ b/markup/goldmark/blockquotes/blockquotes.go
@@ -164,10 +164,12 @@ var blockQuoteAlertRe = regexp.MustCompile(`^<p>\[!([a-zA-Z]+)\](-|\+)?[^\S\r\n]
func resolveBlockQuoteAlert(s string) blockQuoteAlert {
m := blockQuoteAlertRe.FindStringSubmatch(s)
if len(m) == 4 {
+ title := strings.TrimSpace(m[3])
+ title = strings.TrimRight(title, "</p>")
return blockQuoteAlert{
typ: strings.ToLower(m[1]),
sign: m[2],
- title: m[3],
+ title: title,
}
}
diff --git a/markup/goldmark/blockquotes/blockquotes_integration_test.go b/markup/goldmark/blockquotes/blockquotes_integration_test.go
index af3c1fba4..1f671df2b 100644
--- a/markup/goldmark/blockquotes/blockquotes_integration_test.go
+++ b/markup/goldmark/blockquotes/blockquotes_integration_test.go
@@ -123,7 +123,6 @@ title: "Home"
> [!danger]
> Do not approach or handle without protective gear.
-
> [!tip] Callouts can have custom titles
> Like this one.
@@ -135,6 +134,10 @@ title: "Home"
> [!faq]+ Foldable callout
> Yes! In a foldable callout, the contents are hidden when the callout is collapsed
+> [!info] Can callouts be nested?
+> > [!important] Yes!, they can.
+> > > [!tip] You can even use multiple layers of nesting.
+
-- layouts/index.html --
{{ .Content }}
-- layouts/_default/_markup/render-blockquote.html --
@@ -145,9 +148,11 @@ AlertType: {{ .AlertType }}|AlertTitle: {{ .AlertTitle }}|AlertSign: {{ .AlertSi
b := hugolib.Test(t, files)
b.AssertFileContentExact("public/index.html",
"AlertType: tip|AlertTitle: Callouts can have custom titles|AlertSign: |",
- "AlertType: tip|AlertTitle: Title-only callout</p>|AlertSign: |",
- "AlertType: faq|AlertTitle: Foldable negated callout|AlertSign: -|Text: <p>Yes!",
- "AlertType: faq|AlertTitle: Foldable callout|AlertSign: +|",
+ "AlertType: tip|AlertTitle: Title-only callout|AlertSign: |",
+ "AlertType: faq|AlertTitle: Foldable negated callout|AlertSign: -|Text: <p>Yes! In a foldable callout, the contents are hidden when the callout is collapsed</p>\n|",
+ "AlertType: faq|AlertTitle: Foldable callout|AlertSign: +|Text: <p>Yes! In a foldable callout, the contents are hidden when the callout is collapsed</p>\n|",
"AlertType: danger|AlertTitle: |AlertSign: |Text: <p>Do not approach or handle without protective gear.</p>\n|",
+ "AlertTitle: Can callouts be nested?|",
+ "AlertTitle: You can even use multiple layers of nesting.|",
)
}
diff --git a/markup/goldmark/blockquotes/blockquotes_test.go b/markup/goldmark/blockquotes/blockquotes_test.go
index 8b948af08..067cf366e 100644
--- a/markup/goldmark/blockquotes/blockquotes_test.go
+++ b/markup/goldmark/blockquotes/blockquotes_test.go
@@ -63,6 +63,6 @@ func TestResolveBlockQuoteAlert(t *testing.T) {
}
for i, test := range tests {
- c.Assert(resolveBlockQuoteAlert("<p>"+test.input), qt.Equals, test.expected, qt.Commentf("Test %d", i))
+ c.Assert(resolveBlockQuoteAlert("<p>"+test.input+"</p>"), qt.Equals, test.expected, qt.Commentf("Test %d", i))
}
}