From 4adf58cce7cfa22401dcb68897fd60142a83885d Mon Sep 17 00:00:00 2001 From: Jacob Gillespie Date: Mon, 5 Jan 2015 12:18:34 -0600 Subject: [PATCH] Group both options under Blackfriday: documentIDAnchor --- commands/hugo.go | 4 +--- helpers/content.go | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/commands/hugo.go b/commands/hugo.go index 6cb153e1b..e04a8a0d1 100644 --- 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 index baccc8574..8770c88e7 100644 --- 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 }