ref: 1d7f4413f55073b9ea9a9fc9dd4f1792915fe8e1
parent: 4a48b5f32641c15e1f79aaf7aeef25216cdc0254
author: Bjørn Erik Pedersen <[email protected]>
date: Sun Jul 10 07:36:25 EDT 2016
Consolidate the Render funcs
--- a/helpers/content.go
+++ b/helpers/content.go
@@ -241,16 +241,15 @@
}
func markdownRender(ctx *RenderingContext) []byte {+ if ctx.RenderTOC {+ return blackfriday.Markdown(ctx.Content,
+ getHTMLRenderer(blackfriday.HTML_TOC, ctx),
+ getMarkdownExtensions(ctx))
+ }
return blackfriday.Markdown(ctx.Content, getHTMLRenderer(0, ctx),
getMarkdownExtensions(ctx))
}
-func markdownRenderWithTOC(ctx *RenderingContext) []byte {- return blackfriday.Markdown(ctx.Content,
- getHTMLRenderer(blackfriday.HTML_TOC, ctx),
- getMarkdownExtensions(ctx))
-}
-
// getMmarkHTMLRenderer creates a new mmark HTML Renderer with the given configuration.
func getMmarkHTMLRenderer(defaultFlags int, ctx *RenderingContext) mmark.Renderer { renderParameters := mmark.HtmlRendererParameters{@@ -345,6 +344,7 @@
PageFmt string
DocumentID string
Config *Blackfriday
+ RenderTOC bool
FileResolver FileResolverFunc
LinkResolver LinkResolverFunc
configInit sync.Once
@@ -357,22 +357,6 @@
}
})
return c.Config
-}
-
-// RenderBytesWithTOC renders a []byte with table of contents included.
-func RenderBytesWithTOC(ctx *RenderingContext) []byte {- switch ctx.PageFmt {- default:
- return markdownRenderWithTOC(ctx)
- case "markdown":
- return markdownRenderWithTOC(ctx)
- case "asciidoc":
- return []byte(getAsciidocContent(ctx.Content))
- case "mmark":
- return mmarkRender(ctx)
- case "rst":
- return []byte(getRstContent(ctx.Content))
- }
}
// RenderBytes renders a []byte.
--- a/helpers/content_test.go
+++ b/helpers/content_test.go
@@ -289,10 +289,10 @@
}
func TestGetMarkdownRendererWithTOC(t *testing.T) {- ctx := &RenderingContext{}+ ctx := &RenderingContext{RenderTOC: true} ctx.Content = []byte("testContent")ctx.Config = ctx.getConfig()
- actualRenderedMarkdown := markdownRenderWithTOC(ctx)
+ actualRenderedMarkdown := markdownRender(ctx)
expectedRenderedMarkdown := []byte("<nav>\n</nav>\n\n<p>testContent</p>\n") if !bytes.Equal(actualRenderedMarkdown, expectedRenderedMarkdown) { t.Errorf("Actual rendered Markdown (%s) did not match expected markdown (%s)", actualRenderedMarkdown, expectedRenderedMarkdown)--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -280,7 +280,7 @@
return p.Node.Site.SourceRelativeLinkFile(ref, p)
}
}
- return helpers.RenderBytesWithTOC(&helpers.RenderingContext{Content: content, PageFmt: p.determineMarkupType(),+ return helpers.RenderBytes(&helpers.RenderingContext{Content: content, RenderTOC: true, PageFmt: p.determineMarkupType(),DocumentID: p.UniqueID(), Config: p.getRenderingConfig(), LinkResolver: fn, FileResolver: fileFn})
}