Add GitHub style code fence support to mmark. Fixes gohugoio#1258.

bramp · Dec 17, 2015 · 2d6c8fb · 2d6c8fb
1 parent 5bb8c7d
commit 2d6c8fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/helpers/content_renderer.go b/helpers/content_renderer.go
@@ -20,6 +20,7 @@ import (
 	"github.com/miekg/mmark"
 	"github.com/russross/blackfriday"
 	"github.com/spf13/viper"
+	"github.com/miekg/mmark"
 )
 
 // Wraps a blackfriday.Renderer, typically a blackfriday.Html

diff --git a/helpers/content_renderer_test.go b/helpers/content_renderer_test.go
@@ -53,6 +53,9 @@ func TestCodeFence(t *testing.T) {
 	data := []test{
 		{true, "<html></html>", "<div class=\"highlight\"><pre><code class=\"language-html\" data-lang=\"html\"><span class=\"nt\">&lt;html&gt;&lt;/html&gt;</span>\n</code></pre></div>\n"},
 		{false, "<html></html>", "<pre><code class=\"language-html\">&lt;html&gt;&lt;/html&gt;</code></pre>\n"},
+		// TODO(bramp) Merge conflict, unsure which to use, above or below
+		{true,  "<html></html>", "<div class=\"highlight\"><pre><span class=\"nt\">&lt;html&gt;&lt;/html&gt;</span>\n</pre></div>\n"},
+		{false, "<html></html>", "<pre><code class=\"language-html\">&lt;html&gt;&lt;/html&gt;</code></pre>\n"},
 	}
 
 	viper.Reset()