From 25bdeb0feed3fdb11c74a9eff842064cb052b7db Mon Sep 17 00:00:00 2001 From: yuin Date: Sun, 23 Jun 2024 21:46:17 +0900 Subject: [PATCH] Fixes #456 --- _test/extra.txt | 7 +++++++ renderer/html/html.go | 36 ++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/_test/extra.txt b/_test/extra.txt index 742777a..8ae93c9 100644 --- a/_test/extra.txt +++ b/_test/extra.txt @@ -780,3 +780,10 @@ text](logo.png)

alt
 text

//= = = = = = = = = = = = = = = = = = = = = = = =// + +62: Image alt with an escaped character +//- - - - - - - - -// +![\`alt](https://example.com/img.png) +//- - - - - - - - -// +

`alt

+//= = = = = = = = = = = = = = = = = = = = = = = =// diff --git a/renderer/html/html.go b/renderer/html/html.go index b1da368..f9521d0 100644 --- a/renderer/html/html.go +++ b/renderer/html/html.go @@ -680,7 +680,7 @@ func (r *Renderer) renderImage(w util.BufWriter, source []byte, node ast.Node, e _, _ = w.Write(util.EscapeHTML(util.URLEscape(n.Destination, true))) } _, _ = w.WriteString(`" alt="`) - _, _ = w.Write(nodeToHTMLText(n, source)) + r.renderAttribute(w, source, n) _ = w.WriteByte('"') if n.Title != nil { _, _ = w.WriteString(` title="`) @@ -770,6 +770,23 @@ func (r *Renderer) renderString(w util.BufWriter, source []byte, node ast.Node, return ast.WalkContinue, nil } +func (r *Renderer) renderAttribute(w util.BufWriter, source []byte, n ast.Node) { + for c := n.FirstChild(); c != nil; c = c.NextSibling() { + if s, ok := c.(*ast.String); ok { + _, _ = r.renderString(w, source, s, true) + } else if t, ok := c.(*ast.String); ok { + _, _ = r.renderText(w, source, t, true) + } else if !c.HasChildren() { + r.Writer.Write(w, c.Text(source)) + if t, ok := c.(*ast.Text); ok && t.SoftLineBreak() { + w.WriteByte('\n') + } + } else { + r.renderAttribute(w, source, c) + } + } +} + var dataPrefix = []byte("data-") // RenderAttributes renders given node's attributes. @@ -1007,20 +1024,3 @@ func IsDangerousURL(url []byte) bool { return hasPrefix(url, bJs) || hasPrefix(url, bVb) || hasPrefix(url, bFile) || hasPrefix(url, bData) } - -func nodeToHTMLText(n ast.Node, source []byte) []byte { - var buf bytes.Buffer - for c := n.FirstChild(); c != nil; c = c.NextSibling() { - if s, ok := c.(*ast.String); ok && s.IsCode() { - buf.Write(s.Text(source)) - } else if !c.HasChildren() { - buf.Write(util.EscapeHTML(c.Text(source))) - if t, ok := c.(*ast.Text); ok && t.SoftLineBreak() { - buf.WriteByte('\n') - } - } else { - buf.Write(nodeToHTMLText(c, source)) - } - } - return buf.Bytes() -}