Fix defaults for Blackfriday

diff --git a/commands/hugo.go b/commands/hugo.go
index e53804f1ce9814b6ddce91d03e5a8f9e107a325c..e963cb288d360e590fd6c1f0f1c509c42d601612 100644 (file)
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -138,7 +138,7 @@ func InitializeConfig() {
        viper.SetDefault("NewContentEditor", "")
        viper.SetDefault("Paginate", 10)
        viper.SetDefault("PaginatePath", "page")
-       viper.SetDefault("Blackfriday", new(helpers.Blackfriday))
+       viper.SetDefault("Blackfriday", helpers.NewBlackfriday())
 
        if hugoCmdV.PersistentFlags().Lookup("buildDrafts").Changed {
                viper.Set("BuildDrafts", Draft)

diff --git a/helpers/content.go b/helpers/content.go
index 59207964e4c8d8536743343acb97afd1708836e7..491e61c0d30cba575f09834f6f4930377a699fa1 100644 (file)
--- a/helpers/content.go
+++ b/helpers/content.go
@@ -44,6 +44,14 @@ type Blackfriday struct {
        Extensions     []string
 }
 
+func NewBlackfriday() *Blackfriday {
+       return &Blackfriday{
+               AngledQuotes:   false,
+               Fractions:      true,
+               PlainIdAnchors: false,
+       }
+}
+
 var blackfridayExtensionMap = map[string]int{
        "noIntraEmphasis":        blackfriday.EXTENSION_NO_INTRA_EMPHASIS,
        "tables":                 blackfriday.EXTENSION_TABLES,
@@ -120,7 +128,6 @@ func GetHtmlRenderer(defaultFlags int, ctx RenderingContext) blackfriday.Rendere
        htmlFlags := defaultFlags
        htmlFlags |= blackfriday.HTML_USE_XHTML
        htmlFlags |= blackfriday.HTML_USE_SMARTYPANTS
-       htmlFlags |= blackfriday.HTML_SMARTYPANTS_FRACTIONS
        htmlFlags |= blackfriday.HTML_SMARTYPANTS_LATEX_DASHES
        htmlFlags |= blackfriday.HTML_FOOTNOTE_RETURN_LINKS
 
@@ -128,8 +135,8 @@ func GetHtmlRenderer(defaultFlags int, ctx RenderingContext) blackfriday.Rendere
                htmlFlags |= blackfriday.HTML_SMARTYPANTS_ANGLED_QUOTES
        }
 
-       if !ctx.getConfig().Fractions {
-               htmlFlags &^= blackfriday.HTML_SMARTYPANTS_FRACTIONS
+       if ctx.getConfig().Fractions {
+               htmlFlags |= blackfriday.HTML_SMARTYPANTS_FRACTIONS
        }
 
        return blackfriday.HtmlRendererWithParameters(htmlFlags, "", "", renderParameters)
@@ -207,7 +214,7 @@ type RenderingContext struct {
 func (c *RenderingContext) getConfig() *Blackfriday {
        c.configInit.Do(func() {
                if c.Config == nil {
-                       c.Config = new(Blackfriday)
+                       c.Config = NewBlackfriday()
                }
        })
        return c.Config

diff --git a/hugolib/page.go b/hugolib/page.go
index 6422474bf00635759998e168979e567c2b834f75..fcb07d3099951a48b0806700dc79d3609b0d6540 100644 (file)
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -211,7 +211,7 @@ func (p *Page) getRenderingConfig() *helpers.Blackfriday {
                                combinedParam[key] = value
                        }
                }
-               p.renderingConfig = new(helpers.Blackfriday)
+               p.renderingConfig = helpers.NewBlackfriday()
                if err := mapstructure.Decode(combinedParam, p.renderingConfig); err != nil {
                        jww.FATAL.Printf("Failed to get rendering config for %s:\n%s", p.BaseFileName(), err.Error())
                }