summaryrefslogtreecommitdiffstats
path: root/hugolib/page_output.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2017-04-08 11:15:28 +0200
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2017-04-08 11:21:12 +0200
commit2874fc75ce45b17fd4457440e55660d7118fbc46 (patch)
treee18af3d9a659386c99f4b6562b150fb4d0ae7297 /hugolib/page_output.go
parent9e69a92e85937c6e59839e58937ed1db1e497557 (diff)
hugolib, output: Add NotAlternative to OutputFormat
To make sure CSS and similar does not appear in the AlternativeOutputFormats list.
Diffstat (limited to 'hugolib/page_output.go')
-rw-r--r--hugolib/page_output.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/hugolib/page_output.go b/hugolib/page_output.go
index c6a72d324..7b299b575 100644
--- a/hugolib/page_output.go
+++ b/hugolib/page_output.go
@@ -177,8 +177,6 @@ type OutputFormat struct {
// This is value is fetched from the output format definition.
// Note that for pages with only one output format,
// this method will always return "canonical".
- // TODO(bep) output -- the above may not be correct for CSS etc. Figure out a way around that.
- // TODO(bep) output -- re the above, maybe add a "alternate" filter to AlternativeOutputFormats.
// As an example, the AMP output format will, by default, return "amphtml".
//
// See:
@@ -222,10 +220,12 @@ func newOutputFormat(p *Page, f output.Format) *OutputFormat {
}
// OutputFormats gives the alternative output formats for this PageOutput.
+// Note that we use the term "alternative" and not "alternate" here, as it
+// does not necessarily replace the other format, it is an alternative representation.
func (p *PageOutput) AlternativeOutputFormats() (OutputFormats, error) {
var o OutputFormats
for _, of := range p.OutputFormats() {
- if of.f == p.outputFormat {
+ if of.f.NotAlternative || of.f == p.outputFormat {
continue
}
o = append(o, of)