From 1cc638693713d7f4ce564b91302af72e3d8531e2 Mon Sep 17 00:00:00 2001 From: bep Date: Wed, 21 Jan 2015 14:35:33 +0100 Subject: [PATCH] Make ref and relref respect plainIdAnchors Fixes #813 --- hugolib/page.go | 8 ++++++-- hugolib/site.go | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hugolib/page.go b/hugolib/page.go index 479aa1398..937310467 100644 --- a/hugolib/page.go +++ b/hugolib/page.go @@ -78,8 +78,8 @@ type PageMeta struct { } type Position struct { - Prev *Page - Next *Page + Prev *Page + Next *Page PrevInSection *Page NextInSection *Page } @@ -204,6 +204,10 @@ func (p *Page) getRenderingConfigFlags() map[string]bool { return flags } +func (p *Page) isRenderingFlagEnabled(flag string) bool { + return p.getRenderingConfigFlags()[flag] +} + func newPage(filename string) *Page { page := Page{contentType: "", Source: Source{File: *source.NewFile(filename)}, diff --git a/hugolib/site.go b/hugolib/site.go index c7cbec4e9..f17ff3824 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -186,9 +186,9 @@ func (s *SiteInfo) refLink(ref string, page *Page, relative bool) (string, error if refUrl.Fragment != "" { link = link + "#" + refUrl.Fragment - if refUrl.Path != "" && target != nil { + if refUrl.Path != "" && target != nil && !target.isRenderingFlagEnabled("plainIdAnchors") { link = link + ":" + target.UniqueId() - } else if page != nil { + } else if page != nil && !page.isRenderingFlagEnabled("plainIdAnchors") { link = link + ":" + page.UniqueId() } }