commit be627fa718d23278aeb53da5651a8a4a1be14c27
parent bec9b92d0cf45a893d3cd56460270b55d97c93f7
Author: bep <bjorn.erik.pedersen@gmail.com>
Date: Wed, 1 Apr 2015 15:40:08 +0200
Remove paragraph tags produced by markdownify
Fixes #1025
Diffstat:
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/tpl/template.go b/tpl/template.go
@@ -948,8 +948,14 @@ func Highlight(in interface{}, lang string) template.HTML {
return template.HTML(helpers.Highlight(html.UnescapeString(str), lang))
}
+var markdownTrimPrefix = []byte("<p>")
+var markdownTrimSuffix = []byte("</p>\n")
+
func Markdownify(text string) template.HTML {
- return template.HTML(helpers.RenderBytes(&helpers.RenderingContext{Content: []byte(text), PageFmt: "markdown"}))
+ m := helpers.RenderBytes(&helpers.RenderingContext{Content: []byte(text), PageFmt: "markdown"})
+ m = bytes.TrimPrefix(m, markdownTrimPrefix)
+ m = bytes.TrimSuffix(m, markdownTrimSuffix)
+ return template.HTML(m)
}
func refPage(page interface{}, ref, methodName string) template.HTML {
diff --git a/tpl/template_test.go b/tpl/template_test.go
@@ -956,7 +956,7 @@ func TestMarkdownify(t *testing.T) {
result := Markdownify("Hello **World!**")
- expect := template.HTML("<p>Hello <strong>World!</strong></p>\n")
+ expect := template.HTML("Hello <strong>World!</strong>")
if result != expect {
t.Errorf("Markdownify: got '%s', expected '%s'", result, expect)