Skip to content
Permalink
Browse files

Preserve HTML Text for image render hooks

Fixes #6639
  • Loading branch information
bep committed Dec 19, 2019
1 parent ad6504e commit a67d95fe1a033ca4934957b5a98b12ecc8a9edbd
Showing with 27 additions and 6 deletions.
  1. +18 −0 hugolib/content_render_hooks_test.go
  2. +9 −6 markup/goldmark/render_link.go
@@ -217,13 +217,24 @@ P3: <p>P3. xml-link: https://www.example.org|</p>
func TestRenderLinkWithMarkupInText(t *testing.T) {

b := newTestSitesBuilder(t)
b.WithConfigFile("toml", `
baseURL="https://example.org"
[markup]
[markup.goldmark]
[markup.goldmark.renderer]
unsafe = true
`)

b.WithTemplates("index.html", `
{{ $p := site.GetPage "p1.md" }}
P1: {{ $p.Content }}
`,
"_default/_markup/render-link.html", `html-link: {{ .Destination | safeURL }}|Text: {{ .Text | safeHTML }}|Plain: {{ .PlainText | safeHTML }}`,
"_default/_markup/render-image.html", `html-image: {{ .Destination | safeURL }}|Text: {{ .Text | safeHTML }}|Plain: {{ .PlainText | safeHTML }}`,
)

b.WithContent("p1.md", `---
@@ -233,13 +244,19 @@ title: "p1"
START: [**should be bold**](https://gohugo.io)END
Some regular **markup**.
Image:
![Hello<br> Goodbye](image.jpg)END
`)

b.Build(BuildCfg{})

b.AssertFileContent("public/index.html", `
P1: <p>START: html-link: https://gohugo.io|Text: <strong>should be bold</strong>|Plain: should be boldEND</p>
<p>Some regular <strong>markup</strong>.</p>
<p>html-image: image.jpg|Text: Hello<br> Goodbye|Plain: Hello GoodbyeEND</p>
`)

}
@@ -256,6 +273,7 @@ RSTART:{{ "**Bold Markdown**" | $p.RenderString }}:REND
RSTART:{{ "**Bold Block Markdown**" | $p.RenderString $optBlock }}:REND
RSTART:{{ "/italic org mode/" | $p.RenderString $optOrg }}:REND
`)

b.WithContent("p1.md", `---
@@ -137,7 +137,7 @@ func (r *linkRenderer) renderImage(w util.BufWriter, source []byte, node ast.Nod
n := node.(*ast.Image)
var h *hooks.Render

ctx, ok := w.(renderContextData)
ctx, ok := w.(*renderContext)
if ok {
h = ctx.RenderContext().RenderHooks
ok = h != nil && h.ImageRenderer != nil
@@ -147,26 +147,29 @@ func (r *linkRenderer) renderImage(w util.BufWriter, source []byte, node ast.Nod
return r.renderDefaultImage(w, source, node, entering)
}

if !entering {
if entering {
// Store the current pos so we can capture the rendered text.
ctx.pos = ctx.Buffer.Len()
return ast.WalkContinue, nil
}

text := string(n.Text(source))
text := ctx.Buffer.Bytes()[ctx.pos:]
ctx.Buffer.Truncate(ctx.pos)

err := h.ImageRenderer.Render(
w,
linkContext{
page: ctx.DocumentContext().Document,
destination: string(n.Destination),
title: string(n.Title),
text: text,
plainText: text,
text: string(text),
plainText: string(n.Text(source)),
},
)

ctx.AddIdentity(h.ImageRenderer.GetIdentity())

return ast.WalkSkipChildren, err
return ast.WalkContinue, err

}

0 comments on commit a67d95f

Please sign in to comment.
You can’t perform that action at this time.