hugo

Unnamed repository; edit this file 'description' to name the repository.

git clone git://git.shimmy1996.com/hugo.git
commit 4adf58cce7cfa22401dcb68897fd60142a83885d
parent b7716948bcdbf1703149c315f13fde63b067af7b
Author: Jacob Gillespie <jacobwgillespie@gmail.com>
Date:   Mon,  5 Jan 2015 12:18:34 -0600

Group both options under Blackfriday: documentIDAnchor

Diffstat:
Mcommands/hugo.go | 4+---
Mhelpers/content.go | 5+----
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/commands/hugo.go b/commands/hugo.go
@@ -123,8 +123,6 @@ func InitializeConfig() {
 	viper.SetDefault("BuildDrafts", false)
 	viper.SetDefault("BuildFuture", false)
 	viper.SetDefault("UglyUrls", false)
-	viper.SetDefault("DisableFootnoteAnchorPrefix", false)
-	viper.SetDefault("DisableHeaderIDSuffix", false)
 	viper.SetDefault("Verbose", false)
 	viper.SetDefault("CanonifyUrls", false)
 	viper.SetDefault("Indexes", map[string]string{"tag": "tags", "category": "categories"})
@@ -138,7 +136,7 @@ func InitializeConfig() {
 	viper.SetDefault("FootnoteAnchorPrefix", "")
 	viper.SetDefault("FootnoteReturnLinkContents", "")
 	viper.SetDefault("NewContentEditor", "")
-	viper.SetDefault("Blackfriday", map[string]bool{"angledQuotes": false})
+	viper.SetDefault("Blackfriday", map[string]bool{"angledQuotes": false, "documentIDAnchor": true})
 
 	if hugoCmdV.PersistentFlags().Lookup("buildDrafts").Changed {
 		viper.Set("BuildDrafts", Draft)
diff --git a/helpers/content.go b/helpers/content.go
@@ -85,11 +85,8 @@ func GetHtmlRenderer(defaultFlags int, ctx RenderingContext) blackfriday.Rendere
 		FootnoteReturnLinkContents: viper.GetString("FootnoteReturnLinkContents"),
 	}
 
-	if len(ctx.DocumentId) != 0 && !viper.GetBool("DisableFootnoteAnchorPrefix") {
+	if m, ok := ctx.ConfigFlags["documentIDAnchor"]; ok && m && len(ctx.DocumentId) != 0 {
 		renderParameters.FootnoteAnchorPrefix = ctx.DocumentId + ":" + renderParameters.FootnoteAnchorPrefix
-	}
-
-	if len(ctx.DocumentId) != 0 && !viper.GetBool("DisableHeaderIDSuffix") {
 		renderParameters.HeaderIDSuffix = ":" + ctx.DocumentId
 	}