Group both options under Blackfriday: documentIDAnchor

This commit is contained in:
Jacob Gillespie 2015-01-05 12:18:34 -06:00 committed by bep
parent b7716948bc
commit 4adf58cce7
2 changed files with 2 additions and 7 deletions

View file

@ -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)

View file

@ -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
}