diff options
Diffstat (limited to 'output/layout.go')
-rw-r--r-- | output/layout.go | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/output/layout.go b/output/layout.go index a2bfd7717..6dba7f3b4 100644 --- a/output/layout.go +++ b/output/layout.go @@ -152,9 +152,11 @@ func (l *LayoutHandler) For(d LayoutDescriptor, layoutOverride string, f Format) } } - return layoutsWithThemeLayouts, nil + layouts = layoutsWithThemeLayouts } + layouts = prependTextPrefixIfNeeded(f, layouts...) + l.mu.Lock() l.cache[key] = layouts l.mu.Unlock() @@ -184,10 +186,26 @@ func resolveListTemplate(d LayoutDescriptor, f Format, } func resolveTemplate(templ string, d LayoutDescriptor, f Format) []string { - return strings.Fields(replaceKeyValues(templ, + layouts := strings.Fields(replaceKeyValues(templ, "SUFFIX", f.MediaType.Suffix, "NAME", strings.ToLower(f.Name), "SECTION", d.Section)) + + return layouts +} + +func prependTextPrefixIfNeeded(f Format, layouts ...string) []string { + if !f.IsPlainText { + return layouts + } + + newLayouts := make([]string, len(layouts)) + + for i, l := range layouts { + newLayouts[i] = "_text/" + l + } + + return newLayouts } func replaceKeyValues(s string, oldNew ...string) string { @@ -195,7 +213,9 @@ func replaceKeyValues(s string, oldNew ...string) string { return replacer.Replace(s) } -func regularPageLayouts(types string, layout string, f Format) (layouts []string) { +func regularPageLayouts(types string, layout string, f Format) []string { + var layouts []string + if layout == "" { layout = "single" } @@ -219,5 +239,5 @@ func regularPageLayouts(types string, layout string, f Format) (layouts []string layouts = append(layouts, fmt.Sprintf("_default/%s.%s.%s", layout, name, suffix)) layouts = append(layouts, fmt.Sprintf("_default/%s.%s", layout, suffix)) - return + return layouts } |