shithub: hugo

Info  •  Files  •  Log  •  Branches

Group both options under Blackfriday: documentIDAnchor

--- a/commands/hugo.go

+++ b/commands/hugo.go

@@ -123,8 +123,6 @@

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

 	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)

--- a/helpers/content.go

+++ b/helpers/content.go

@@ -85,11 +85,8 @@

 		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

 	}