Fix problem with escaped ampersands

raykov · May 13, 2021 · ea412c8 · ea412c8
1 parent 8df6650
commit ea412c8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/example/example.md b/example/example.md
@@ -54,6 +54,8 @@ Strikethrough uses two tildes. ~~Scratch this.~~
 
 [You can use numbers for reference-style link definitions][1]
 
+[I'm a link with ampersands](https://www.google.com?some=information&another[]=list&another[]=information)
+
 Or leave it empty and use the [link text itself].
 
 URLs and URLs in angle brackets will automatically get turned into links.

diff --git a/example/example.pdf b/example/example.pdf
diff --git a/renderer.go b/renderer.go
@@ -217,7 +217,7 @@ func (r *Renderer) renderAutoLink(w Writer, source []byte, node ast.Node, enteri
 		return ast.WalkContinue, nil
 	}
 
-	url := string(util.EscapeHTML(util.URLEscape(n.URL(source), false)))
+	url := string(util.URLEscape(n.URL(source), false))
 	if n.AutoLinkType == ast.AutoLinkEmail && !strings.HasPrefix(strings.ToLower(url), "mailto:") {
 		w.SetLink("mailto:" + url)
 	} else {
@@ -255,7 +255,7 @@ func (r *Renderer) renderImage(w Writer, source []byte, node ast.Node, entering
 	}
 	n := node.(*ast.Image)
 
-	filePath := string(util.EscapeHTML(util.URLEscape(n.Destination, true)))
+	filePath := string(util.URLEscape(n.Destination, true))
 	inlineImg := "data:image/"
 
 	switch {
@@ -302,7 +302,7 @@ func (r *Renderer) renderImage(w Writer, source []byte, node ast.Node, entering
 func (r *Renderer) renderLink(w Writer, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
 	n := node.(*ast.Link)
 	if entering {
-		w.SetLink(string(util.EscapeHTML(util.URLEscape(n.Destination, true))))
+		w.SetLink(string(util.URLEscape(n.Destination, true)))
 		currStyle := w.CurrentStyle()
 		newStyle := currStyle.Clone()
 		newStyle.FontStyle += "U"