mirror of
https://github.com/gohugoio/hugo.git
synced 2025-08-20 21:31:32 +02:00
Fix goldmark toc rendering
Previously gordmark-based TOC renderes only `KindText` and `KindString` This commit expands target node with Goldmark's renderer I am not sure of what are expected results as TOC contents in some (rare) cases but Blackfriday's behaviours are fundamentally respected. For example, - image `[image text](link)` is rendered as `<img>` tag - GFM AutoLink `gohugo.io` is rendered as text * Render AutoLink as <a> tag as Blackfriday does Fixes #6736 Fixes #6809
This commit is contained in:
@@ -15,6 +15,7 @@
|
||||
package goldmark
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/gohugoio/hugo/markup/markup_config"
|
||||
@@ -74,3 +75,59 @@ And then some.
|
||||
</ul>
|
||||
</nav>`, qt.Commentf(got))
|
||||
}
|
||||
|
||||
func TestEscapeToc(t *testing.T) {
|
||||
c := qt.New(t)
|
||||
|
||||
defaultConfig := markup_config.Default
|
||||
|
||||
safeConfig := defaultConfig
|
||||
unsafeConfig := defaultConfig
|
||||
|
||||
safeConfig.Goldmark.Renderer.Unsafe = false
|
||||
unsafeConfig.Goldmark.Renderer.Unsafe = true
|
||||
|
||||
safeP, _ := Provider.New(
|
||||
converter.ProviderConfig{
|
||||
MarkupConfig: safeConfig,
|
||||
Logger: loggers.NewErrorLogger(),
|
||||
})
|
||||
unsafeP, _ := Provider.New(
|
||||
converter.ProviderConfig{
|
||||
MarkupConfig: unsafeConfig,
|
||||
Logger: loggers.NewErrorLogger(),
|
||||
})
|
||||
safeConv, _ := safeP.New(converter.DocumentContext{})
|
||||
unsafeConv, _ := unsafeP.New(converter.DocumentContext{})
|
||||
|
||||
content := strings.Join([]string{
|
||||
"# A < B & C > D",
|
||||
"# A < B & C > D <div>foo</div>",
|
||||
"# *EMPHASIS*",
|
||||
"# `echo codeblock`",
|
||||
}, "\n")
|
||||
// content := ""
|
||||
b, err := safeConv.Convert(converter.RenderContext{Src: []byte(content), RenderTOC: true})
|
||||
c.Assert(err, qt.IsNil)
|
||||
got := b.(converter.TableOfContentsProvider).TableOfContents().ToHTML(1, 2, false)
|
||||
c.Assert(got, qt.Equals, `<nav id="TableOfContents">
|
||||
<ul>
|
||||
<li><a href="#a--b--c--d">A < B & C > D</a></li>
|
||||
<li><a href="#a--b--c--d-divfoodiv">A < B & C > D <!-- raw HTML omitted -->foo<!-- raw HTML omitted --></a></li>
|
||||
<li><a href="#emphasis"><em>EMPHASIS</em></a></li>
|
||||
<li><a href="#echo-codeblock"><code>echo codeblock</code></a></li>
|
||||
</ul>
|
||||
</nav>`, qt.Commentf(got))
|
||||
|
||||
b, err = unsafeConv.Convert(converter.RenderContext{Src: []byte(content), RenderTOC: true})
|
||||
c.Assert(err, qt.IsNil)
|
||||
got = b.(converter.TableOfContentsProvider).TableOfContents().ToHTML(1, 2, false)
|
||||
c.Assert(got, qt.Equals, `<nav id="TableOfContents">
|
||||
<ul>
|
||||
<li><a href="#a--b--c--d">A < B & C > D</a></li>
|
||||
<li><a href="#a--b--c--d-divfoodiv">A < B & C > D <div>foo</div></a></li>
|
||||
<li><a href="#emphasis"><em>EMPHASIS</em></a></li>
|
||||
<li><a href="#echo-codeblock"><code>echo codeblock</code></a></li>
|
||||
</ul>
|
||||
</nav>`, qt.Commentf(got))
|
||||
}
|
||||
|
Reference in New Issue
Block a user