danog/blackfriday
1
0
Fork 0
mirror of https://github.com/danog/blackfriday.git synced 2024-11-26 20:14:43 +01:00
Code Issues Projects Releases Wiki Activity

Make Markdown the most general API call

Browse Source 
Get rid of MarkdownOptions.
This commit is contained in:
Vytautas Šaltenis 2016-04-05 13:45:00 +03:00
parent 83b4cb6062
commit 123179b8f3
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
markdown.go
View File

@ -349,7 +349,7 @@ func MarkdownBasic(input []byte) []byte {
renderer := HTMLRenderer(htmlFlags, CommonExtensions, "", "")
// set up the parser
return MarkdownOptions(input, renderer, Options{Extensions: 0})
return Markdown(input, renderer, Options{Extensions: 0})
}
// Call Markdown with most useful extensions enabled
@ -374,7 +374,7 @@ func MarkdownBasic(input []byte) []byte {
func MarkdownCommon(input []byte) []byte {
// set up the HTML renderer
renderer := HTMLRenderer(CommonHtmlFlags, CommonExtensions, "", "")
return MarkdownOptions(input, renderer, DefaultOptions)
return Markdown(input, renderer, DefaultOptions)
}
// Markdown is the main rendering function.
@ -384,19 +384,11 @@ func MarkdownCommon(input []byte) []byte {
//
// To use the supplied Html or LaTeX renderers, see HtmlRenderer and
// LatexRenderer, respectively.
func Markdown(input []byte, renderer Renderer, extensions Extensions) []byte {
return MarkdownOptions(input, renderer, Options{
Extensions: extensions})
}
// MarkdownOptions is just like Markdown but takes additional options through
// the Options struct.
func MarkdownOptions(input []byte, renderer Renderer, opts Options) []byte {
// no point in parsing if we can't render
func Markdown(input []byte, renderer Renderer, options Options) []byte {
if renderer == nil {
return nil
}
return renderer.Render(Parse(input, opts))
return renderer.Render(Parse(input, options))
}
func Parse(input []byte, opts Options) *Node {

2
test_helpers.go
View File

@ -45,7 +45,7 @@ func execRecoverableTestSuite(t *testing.T, tests []string, params TestParams, s
func runMarkdown(input string, params TestParams) string {
renderer := HTMLRendererWithParameters(params.HTMLFlags,
params.Options.Extensions, "", "", params.HTMLRendererParameters)
return string(MarkdownOptions([]byte(input), renderer, params.Options))
return string(Markdown([]byte(input), renderer, params.Options))
}
func doTestsBlock(t *testing.T, tests []string, extensions Extensions) {