diff options
author | satotake <doublequotation@gmail.com> | 2020-02-23 02:06:30 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-22 18:06:30 +0100 |
commit | ca68abf0bc2fa003c2052143218f7b2ab195a46e (patch) | |
tree | da1732c53edd4ba003e458a74efc0f82bdefc612 /markup/goldmark/convert.go | |
parent | a524124beb0e7ca226c207ea48a90cea2cbef76e (diff) |
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
Diffstat (limited to 'markup/goldmark/convert.go')
-rw-r--r-- | markup/goldmark/convert.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/markup/goldmark/convert.go b/markup/goldmark/convert.go index d4c353353..ffe9cd45a 100644 --- a/markup/goldmark/convert.go +++ b/markup/goldmark/convert.go @@ -81,15 +81,7 @@ func (c *goldmarkConverter) SanitizeAnchorName(s string) string { func newMarkdown(pcfg converter.ProviderConfig) goldmark.Markdown { mcfg := pcfg.MarkupConfig cfg := pcfg.MarkupConfig.Goldmark - - var ( - extensions = []goldmark.Extender{ - newLinks(), - newTocExtension(), - } - rendererOptions []renderer.Option - parserOptions []parser.Option - ) + var rendererOptions []renderer.Option if cfg.Renderer.HardWraps { rendererOptions = append(rendererOptions, html.WithHardWraps()) @@ -103,6 +95,14 @@ func newMarkdown(pcfg converter.ProviderConfig) goldmark.Markdown { rendererOptions = append(rendererOptions, html.WithUnsafe()) } + var ( + extensions = []goldmark.Extender{ + newLinks(), + newTocExtension(rendererOptions), + } + parserOptions []parser.Option + ) + if mcfg.Highlight.CodeFences { extensions = append(extensions, newHighlighting(mcfg.Highlight)) } |