From 9f6b5ad3b4f2ab7815a475cdf9d7dc354701ebb6 Mon Sep 17 00:00:00 2001 From: ypnos Date: Sun, 20 Mar 2016 21:40:03 +0100 Subject: Save auto-detected markup type in Page.Markup If Page.Markup was not set by the user, it will now be set after guessing from the file extension. This means, Page.Markup will be set in any case. It can be used by a theme to differentiate between markup types. Fixes #1950 --- hugolib/shortcode.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hugolib/shortcode.go') diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go index 782f0e21a..36d2058f1 100644 --- a/hugolib/shortcode.go +++ b/hugolib/shortcode.go @@ -234,7 +234,7 @@ func renderShortcode(sc shortcode, parent *ShortcodeWithPage, p *Page, t tpl.Tem if sc.doMarkup { newInner := helpers.RenderBytes(&helpers.RenderingContext{ - Content: []byte(inner), PageFmt: p.guessMarkupType(), + Content: []byte(inner), PageFmt: p.determineMarkupType(), DocumentID: p.UniqueID(), Config: p.getRenderingConfig()}) // If the type is “unknown” or “markdown”, we assume the markdown @@ -250,7 +250,7 @@ func renderShortcode(sc shortcode, parent *ShortcodeWithPage, p *Page, t tpl.Tem // substitutions in
HUGOSHORTCODE-1
which prevents the // generation, but means that you can’t use shortcodes inside of // markdown structures itself (e.g., `[foo]({{% ref foo.md %}})`). - switch p.guessMarkupType() { + switch p.determineMarkupType() { case "unknown", "markdown": if match, _ := regexp.MatchString(innerNewlineRegexp, inner); !match { cleaner, err := regexp.Compile(innerCleanupRegexp) -- cgit v1.2.3