2017-03-19 20:09:31 +00:00
|
|
|
// Copyright 2017-present The Hugo Authors. All rights reserved.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
package output
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
"path/filepath"
|
|
|
|
"strings"
|
|
|
|
|
2017-06-13 16:42:45 +00:00
|
|
|
"github.com/gohugoio/hugo/helpers"
|
2017-03-19 20:09:31 +00:00
|
|
|
)
|
|
|
|
|
2017-09-03 09:32:26 +00:00
|
|
|
const (
|
|
|
|
baseFileBase = "baseof"
|
|
|
|
)
|
2017-03-19 20:09:31 +00:00
|
|
|
|
|
|
|
var (
|
|
|
|
aceTemplateInnerMarkers = [][]byte{[]byte("= content")}
|
2017-08-11 07:33:45 +00:00
|
|
|
goTemplateInnerMarkers = [][]byte{[]byte("{{define"), []byte("{{ define"), []byte("{{- define"), []byte("{{-define")}
|
2017-03-19 20:09:31 +00:00
|
|
|
)
|
|
|
|
|
2018-09-06 22:00:19 +00:00
|
|
|
// TemplateNames represents a template naming scheme.
|
2017-03-19 20:09:31 +00:00
|
|
|
type TemplateNames struct {
|
2017-03-27 18:43:49 +00:00
|
|
|
// The name used as key in the template map. Note that this will be
|
|
|
|
// prefixed with "_text/" if it should be parsed with text/template.
|
|
|
|
Name string
|
|
|
|
|
2017-03-19 20:09:31 +00:00
|
|
|
OverlayFilename string
|
|
|
|
MasterFilename string
|
|
|
|
}
|
|
|
|
|
2018-09-06 22:00:19 +00:00
|
|
|
// TemplateLookupDescriptor describes the template lookup configuration.
|
2017-03-19 20:09:31 +00:00
|
|
|
type TemplateLookupDescriptor struct {
|
2017-04-12 18:40:36 +00:00
|
|
|
// The full path to the site root.
|
2017-03-19 20:09:31 +00:00
|
|
|
WorkingDir string
|
|
|
|
|
|
|
|
// The path to the template relative the the base.
|
|
|
|
// I.e. shortcodes/youtube.html
|
|
|
|
RelPath string
|
|
|
|
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 14:01:25 +00:00
|
|
|
// The template name prefix to look for.
|
2017-03-19 20:09:31 +00:00
|
|
|
Prefix string
|
|
|
|
|
2017-03-27 18:43:49 +00:00
|
|
|
// All the output formats in play. This is used to decide if text/template or
|
|
|
|
// html/template.
|
|
|
|
OutputFormats Formats
|
|
|
|
|
2017-03-19 20:09:31 +00:00
|
|
|
FileExists func(filename string) (bool, error)
|
|
|
|
ContainsAny func(filename string, subslices [][]byte) (bool, error)
|
|
|
|
}
|
|
|
|
|
2018-07-02 08:33:55 +00:00
|
|
|
func isShorthCodeOrPartial(name string) bool {
|
|
|
|
return strings.HasPrefix(name, "shortcodes/") || strings.HasPrefix(name, "partials/")
|
|
|
|
}
|
|
|
|
|
2018-09-06 22:00:19 +00:00
|
|
|
// CreateTemplateNames returns a TemplateNames object for a given template.
|
2017-03-22 10:34:17 +00:00
|
|
|
func CreateTemplateNames(d TemplateLookupDescriptor) (TemplateNames, error) {
|
2017-03-19 20:09:31 +00:00
|
|
|
|
2017-03-22 10:34:17 +00:00
|
|
|
name := filepath.ToSlash(d.RelPath)
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 14:01:25 +00:00
|
|
|
name = strings.TrimPrefix(name, "/")
|
2017-03-19 20:09:31 +00:00
|
|
|
|
|
|
|
if d.Prefix != "" {
|
|
|
|
name = strings.Trim(d.Prefix, "/") + "/" + name
|
|
|
|
}
|
|
|
|
|
2017-04-12 18:40:36 +00:00
|
|
|
var (
|
|
|
|
id TemplateNames
|
|
|
|
)
|
|
|
|
|
2017-03-19 20:09:31 +00:00
|
|
|
// The filename will have a suffix with an optional type indicator.
|
|
|
|
// Examples:
|
|
|
|
// index.html
|
|
|
|
// index.amp.html
|
|
|
|
// index.json
|
|
|
|
filename := filepath.Base(d.RelPath)
|
2017-03-27 18:43:49 +00:00
|
|
|
isPlainText := false
|
|
|
|
outputFormat, found := d.OutputFormats.FromFilename(filename)
|
|
|
|
|
|
|
|
if found && outputFormat.IsPlainText {
|
|
|
|
isPlainText = true
|
|
|
|
}
|
2017-03-19 20:09:31 +00:00
|
|
|
|
|
|
|
var ext, outFormat string
|
|
|
|
|
|
|
|
parts := strings.Split(filename, ".")
|
|
|
|
if len(parts) > 2 {
|
|
|
|
outFormat = parts[1]
|
|
|
|
ext = parts[2]
|
|
|
|
} else if len(parts) > 1 {
|
|
|
|
ext = parts[1]
|
|
|
|
}
|
|
|
|
|
|
|
|
filenameNoSuffix := parts[0]
|
|
|
|
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 14:01:25 +00:00
|
|
|
id.OverlayFilename = d.RelPath
|
2017-04-12 19:01:22 +00:00
|
|
|
id.Name = name
|
2017-03-19 20:09:31 +00:00
|
|
|
|
2017-03-27 18:43:49 +00:00
|
|
|
if isPlainText {
|
|
|
|
id.Name = "_text/" + id.Name
|
|
|
|
}
|
|
|
|
|
2017-03-19 20:09:31 +00:00
|
|
|
// Ace and Go templates may have both a base and inner template.
|
2018-07-02 08:33:55 +00:00
|
|
|
if ext == "amber" || isShorthCodeOrPartial(name) {
|
2017-03-19 20:09:31 +00:00
|
|
|
// No base template support
|
|
|
|
return id, nil
|
|
|
|
}
|
|
|
|
|
2018-07-02 08:33:55 +00:00
|
|
|
pathDir := filepath.Dir(d.RelPath)
|
|
|
|
|
2017-03-19 20:09:31 +00:00
|
|
|
innerMarkers := goTemplateInnerMarkers
|
|
|
|
|
|
|
|
var baseFilename string
|
|
|
|
|
|
|
|
if outFormat != "" {
|
|
|
|
baseFilename = fmt.Sprintf("%s.%s.%s", baseFileBase, outFormat, ext)
|
|
|
|
} else {
|
|
|
|
baseFilename = fmt.Sprintf("%s.%s", baseFileBase, ext)
|
|
|
|
}
|
|
|
|
|
|
|
|
if ext == "ace" {
|
|
|
|
innerMarkers = aceTemplateInnerMarkers
|
|
|
|
}
|
|
|
|
|
|
|
|
// This may be a view that shouldn't have base template
|
|
|
|
// Have to look inside it to make sure
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 14:01:25 +00:00
|
|
|
needsBase, err := d.ContainsAny(d.RelPath, innerMarkers)
|
2017-03-19 20:09:31 +00:00
|
|
|
if err != nil {
|
|
|
|
return id, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if needsBase {
|
|
|
|
currBaseFilename := fmt.Sprintf("%s-%s", filenameNoSuffix, baseFilename)
|
|
|
|
|
|
|
|
// Look for base template in the follwing order:
|
|
|
|
// 1. <current-path>/<template-name>-baseof.<outputFormat>(optional).<suffix>, e.g. list-baseof.<outputFormat>(optional).<suffix>.
|
|
|
|
// 2. <current-path>/baseof.<outputFormat>(optional).<suffix>
|
|
|
|
// 3. _default/<template-name>-baseof.<outputFormat>(optional).<suffix>, e.g. list-baseof.<outputFormat>(optional).<suffix>.
|
|
|
|
// 4. _default/baseof.<outputFormat>(optional).<suffix>
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 14:01:25 +00:00
|
|
|
//
|
|
|
|
// The filesystem it looks in a a composite of the project and potential theme(s).
|
|
|
|
pathsToCheck := createPathsToCheck(pathDir, baseFilename, currBaseFilename)
|
2017-09-03 09:32:26 +00:00
|
|
|
|
2017-11-17 11:27:50 +00:00
|
|
|
// We may have language code and/or "terms" in the template name. We want the most specific,
|
|
|
|
// but need to fall back to the baseof.html or baseof.ace if needed.
|
|
|
|
// E.g. list-baseof.en.html and list-baseof.terms.en.html
|
|
|
|
// See #3893, #3856.
|
|
|
|
baseBaseFilename, currBaseBaseFilename := helpers.Filename(baseFilename), helpers.Filename(currBaseFilename)
|
|
|
|
p1, p2 := strings.Split(baseBaseFilename, "."), strings.Split(currBaseBaseFilename, ".")
|
|
|
|
if len(p1) > 0 && len(p1) == len(p2) {
|
|
|
|
for i := len(p1); i > 0; i-- {
|
|
|
|
v1, v2 := strings.Join(p1[:i], ".")+"."+ext, strings.Join(p2[:i], ".")+"."+ext
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 14:01:25 +00:00
|
|
|
pathsToCheck = append(pathsToCheck, createPathsToCheck(pathDir, v1, v2)...)
|
2017-11-17 11:27:50 +00:00
|
|
|
|
|
|
|
}
|
2017-03-19 20:09:31 +00:00
|
|
|
}
|
|
|
|
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 14:01:25 +00:00
|
|
|
for _, p := range pathsToCheck {
|
|
|
|
if ok, err := d.FileExists(p); err == nil && ok {
|
|
|
|
id.MasterFilename = p
|
|
|
|
break
|
2017-03-19 20:09:31 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return id, nil
|
|
|
|
|
|
|
|
}
|
|
|
|
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 14:01:25 +00:00
|
|
|
func createPathsToCheck(baseTemplatedDir, baseFilename, currBaseFilename string) []string {
|
|
|
|
return []string{
|
|
|
|
filepath.Join(baseTemplatedDir, currBaseFilename),
|
|
|
|
filepath.Join(baseTemplatedDir, baseFilename),
|
|
|
|
filepath.Join("_default", currBaseFilename),
|
|
|
|
filepath.Join("_default", baseFilename),
|
2017-04-12 18:40:36 +00:00
|
|
|
}
|
2017-03-19 20:09:31 +00:00
|
|
|
}
|