shithub: hugo

Download patch

ref: cc98fc8ad20525d08a9c028680afba8807faa9bb
parent: 3b86b4a9f5ce010c9714d813d5b8ecddda22c69f
parent: 8b73644d81a81e82851b7f7c90aa8ab5524fbe93
author: Bjørn Erik Pedersen <[email protected]>
date: Tue Apr 9 19:59:59 EDT 2019 

Merge commit '8b73644d81a81e82851b7f7c90aa8ab5524fbe93'


--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -2,3 +2,4 @@
 /public
 nohup.out
 .DS_Store
+trace.out
\ No newline at end of file
binary files /dev/null b/docs/content/en/news/0.55.0-relnotes/featured.png differ
--- a/docs/content/en/news/0.55.0-relnotes/index.md
+++ b/docs/content/en/news/0.55.0-relnotes/index.md
@@ -1,12 +1,12 @@
 
 ---
 date: 2019-04-08
-title: "0.55.0"
-description: "0.55.0"
+title: "Hugo 0.55.0: The early Easter Egg Edition!"
+description: "Faster, virtualized Output Formats, revised shortcodes, new return keyword, and much more …"
 categories: ["Releases"]
 ---
 
-	Hugo `0.55` is **the early Easter Egg Edition** with lots of great improvements and fixes. The original motivation for this release was to prepare for [Issue #5074](https://github.com/gohugoio/hugo/issues/5074), but the structural changes needed for that paved the way for lots of others. Please study the list of changes below, and especially the **Notes** section, but some headlines include:
+Hugo `0.55` is **the early Easter Egg Edition** with lots of great improvements and fixes. The original motivation for this release was to prepare for [Issue #5074](https://github.com/gohugoio/hugo/issues/5074), but the structural changes needed for that paved the way for lots of others. Please study the list of changes below, and especially the **Notes** section, but some headlines include:
 
 ## Virtualized Output Formats
 
@@ -20,7 +20,7 @@
 
 ## Shortcodes Revised
 
-Shortcodes using the `{{%` as the outer-most delimiter will now be fully rendered when sent to the content renderer (e.g. Blackfriday for Markdown), meaning they can be part of the generated table of contents, footnotes, etc.
+Shortcodes using the `{{%/* */%}}` as the outer-most delimiter will now be fully rendered when sent to the content renderer (e.g. Blackfriday for Markdown), meaning they can be part of the generated table of contents, footnotes, etc.
 
 If you want the old behavior, you can put the following line in the start of your shortcode template:
 
@@ -28,7 +28,7 @@
 {{ $_hugo_config := `{ "version": 1 }` }}
 ```
 
-But using the `{{<` delimiter will, in most cases, be a better alternative, possibly in combination with the `markdownify` template func.
+But using the `{{</* */>}}` delimiter will, in most cases, be a better alternative, possibly in combination with the `markdownify` template func.
 
 See [#5763](https://github.com/gohugoio/hugo/issues/5763).
 
@@ -64,8 +64,6 @@
 ```
 
 See [#5719](https://github.com/gohugoio/hugo/issues/5719).
-
-
 
 ## And it's Faster!
 
--- a/docs/content/en/troubleshooting/faq.md
+++ b/docs/content/en/troubleshooting/faq.md
@@ -43,7 +43,7 @@
 
 Yes you can! Read [this](/hosting-and-deployment/hosting-on-netlify/#configure-hugo-version-in-netlify).
 
-## I get "this feature is not available in your current Hugo version"
+## I get "TOCSS ... this feature is not available in your current Hugo version"
 
 If you process `SCSS` or `SASS` to `CSS` in your Hugo project, you need the Hugo `extended` version, or else you may see this error message:
 
--- a/docs/layouts/shortcodes/note.html
+++ b/docs/layouts/shortcodes/note.html
@@ -1,3 +1,4 @@
+{{ $_hugo_config := `{ "version": 1 }` }}
 <aside class="admonition note">
 	<div class="note-icon">
 		{{partial "svg/exclamation.svg" (dict "size" "20px" ) }}
--- a/docs/layouts/shortcodes/tip.html
+++ b/docs/layouts/shortcodes/tip.html
@@ -1,3 +1,4 @@
+{{ $_hugo_config := `{ "version": 1 }` }}
 <aside class="admonition tip">
 	<div class="tip-icon">
 		{{partial "svg/exclamation.svg" .}}
--- a/docs/layouts/shortcodes/warning.html
+++ b/docs/layouts/shortcodes/warning.html
@@ -1,3 +1,4 @@
+{{ $_hugo_config := `{ "version": 1 }` }}
 <aside class="admonition warning">
 	<div class="admonition-icon">
 		{{partial "svg/exclamation.svg" .}}
--- a/docs/netlify.toml
+++ b/docs/netlify.toml
@@ -3,7 +3,7 @@
 command = "hugo --gc --minify"
 
 [context.production.environment]
-HUGO_VERSION = "0.54.0"
+HUGO_VERSION = "0.55.0"
 HUGO_ENV = "production"
 HUGO_ENABLEGITINFO = "true"
 
@@ -11,7 +11,7 @@
 command = "hugo --gc --minify --enableGitInfo"
 
 [context.split1.environment]
-HUGO_VERSION = "0.54.0"
+HUGO_VERSION = "0.55.0"
 HUGO_ENV = "production"
 
 [context.deploy-preview]
@@ -18,13 +18,13 @@
 command = "hugo --gc --minify --buildFuture -b $DEPLOY_PRIME_URL"
 
 [context.deploy-preview.environment]
-HUGO_VERSION = "0.54.0"
+HUGO_VERSION = "0.55.0"
 
 [context.branch-deploy]
 command = "hugo --gc --minify -b $DEPLOY_PRIME_URL"
 
 [context.branch-deploy.environment]
-HUGO_VERSION = "0.54.0"
+HUGO_VERSION = "0.55.0"
 
 [context.next.environment]
 HUGO_ENABLEGITINFO = "true"
--- a/docs/resources/_gen/assets/css/output/css/app.css_d11fe7b62c27961c87ecd0f2490357b9.content
+++ b/docs/resources/_gen/assets/css/output/css/app.css_d11fe7b62c27961c87ecd0f2490357b9.content
@@ -1,1 +1,1 @@
-@font-face{font-family:muli;font-style:normal;font-display:swap;font-weight:200;src:local('Muli Extra Light '),local('Muli-Extra Light'),url(/fonts/muli-latin-200.woff2) format('woff2'),url(/fonts/muli-latin-200.woff) format('woff')}@font-face{font-family:muli;font-style:italic;font-display:swap;font-weight:200;src:local('Muli Extra Light italic'),local('Muli-Extra Lightitalic'),url(/fonts/muli-latin-200italic.woff2) format('woff2'),url(/fonts/muli-latin-200italic.woff) format('woff')}@font-face{font-family:muli;font-style:normal;font-display:swap;font-weight:300;src:local('Muli Light '),local(Muli-Light),url(/fonts/muli-latin-300.woff2) format('woff2'),url(/fonts/muli-latin-300.woff) format('woff')}@font-face{font-family:muli;font-style:italic;font-display:swap;font-weight:300;src:local('Muli Light italic'),local(Muli-Lightitalic),url(/fonts/muli-latin-300italic.woff2) format('woff2'),url(/fonts/muli-latin-300italic.woff) format('woff')}@font-face{font-family:muli;font-style:normal;font-display:swap;font-weight:400;src:local('Muli Regular '),local(Muli-Regular),url(/fonts/muli-latin-400.woff2) format('woff2'),url(/fonts/muli-latin-400.woff) format('woff')}@font-face{font-family:muli;font-style:italic;font-display:swap;font-weight:400;src:local('Muli Regular italic'),local(Muli-Regularitalic),url(/fonts/muli-latin-400italic.woff2) format('woff2'),url(/fonts/muli-latin-400italic.woff) format('woff')}@font-face{font-family:muli;font-style:normal;font-display:swap;font-weight:600;src:local('Muli SemiBold '),local(Muli-SemiBold),url(/fonts/muli-latin-600.woff2) format('woff2'),url(/fonts/muli-latin-600.woff) format('woff')}@font-face{font-family:muli;font-style:italic;font-display:swap;font-weight:600;src:local('Muli SemiBold italic'),local(Muli-SemiBolditalic),url(/fonts/muli-latin-600italic.woff2) format('woff2'),url(/fonts/muli-latin-600italic.woff) format('woff')}@font-face{font-family:muli;font-style:normal;font-display:swap;font-weight:700;src:local('Muli Bold '),local(Muli-Bold),url(/fonts/muli-latin-700.woff2) format('woff2'),url(/fonts/muli-latin-700.woff) format('woff')}@font-face{font-family:muli;font-style:italic;font-display:swap;font-weight:700;src:local('Muli Bold italic'),local(Muli-Bolditalic),url(/fonts/muli-latin-700italic.woff2) format('woff2'),url(/fonts/muli-latin-700italic.woff) format('woff')}@font-face{font-family:muli;font-style:normal;font-display:swap;font-weight:800;src:local('Muli ExtraBold '),local(Muli-ExtraBold),url(/fonts/muli-latin-800.woff2) format('woff2'),url(/fonts/muli-latin-800.woff) format('woff')}@font-face{font-family:muli;font-style:italic;font-display:swap;font-weight:800;src:local('Muli ExtraBold italic'),local(Muli-ExtraBolditalic),url(/fonts/muli-latin-800italic.woff2) format('woff2'),url(/fonts/muli-latin-800italic.woff) format('woff')}@font-face{font-family:muli;font-style:normal;font-display:swap;font-weight:900;src:local('Muli Black '),local(Muli-Black),url(/fonts/muli-latin-900.woff2) format('woff2'),url(/fonts/muli-latin-900.woff) format('woff')}@font-face{font-family:muli;font-style:italic;font-display:swap;font-weight:900;src:local('Muli Black italic'),local(Muli-Blackitalic),url(/fonts/muli-latin-900italic.woff2) format('woff2'),url(/fonts/muli-latin-900italic.woff) format('woff')}/*!TACHYONS v4.7.0 | http://tachyons.io*//*!normalize.css v8.0.0 | MIT License | github.com/necolas/normalize.css*/html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}h1{font-size:2em;margin:.67em 0}hr{-webkit-box-sizing:content-box;box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}b,strong{font-weight:bolder}code{font-family:monospace,monospace;font-size:1em}small{font-size:80%}img{border-style:none}button,input{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button{text-transform:none}button,[type=button],[type=reset],[type=submit]{-webkit-appearance:button}button::-moz-focus-inner,[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=subm
\ No newline at end of file
+@font-face{font-family:muli;font-style:normal;font-display:swap;font-weight:200;src:local('Muli Extra Light '),local('Muli-Extra Light'),url(/fonts/muli-latin-200.woff2) format('woff2'),url(/fonts/muli-latin-200.woff) format('woff')}@font-face{font-family:muli;font-style:italic;font-display:swap;font-weight:200;src:local('Muli Extra Light italic'),local('Muli-Extra Lightitalic'),url(/fonts/muli-latin-200italic.woff2) format('woff2'),url(/fonts/muli-latin-200italic.woff) format('woff')}@font-face{font-family:muli;font-style:normal;font-display:swap;font-weight:300;src:local('Muli Light '),local(Muli-Light),url(/fonts/muli-latin-300.woff2) format('woff2'),url(/fonts/muli-latin-300.woff) format('woff')}@font-face{font-family:muli;font-style:italic;font-display:swap;font-weight:300;src:local('Muli Light italic'),local(Muli-Lightitalic),url(/fonts/muli-latin-300italic.woff2) format('woff2'),url(/fonts/muli-latin-300italic.woff) format('woff')}@font-face{font-family:muli;font-style:normal;font-display:swap;font-weight:400;src:local('Muli Regular '),local(Muli-Regular),url(/fonts/muli-latin-400.woff2) format('woff2'),url(/fonts/muli-latin-400.woff) format('woff')}@font-face{font-family:muli;font-style:italic;font-display:swap;font-weight:400;src:local('Muli Regular italic'),local(Muli-Regularitalic),url(/fonts/muli-latin-400italic.woff2) format('woff2'),url(/fonts/muli-latin-400italic.woff) format('woff')}@font-face{font-family:muli;font-style:normal;font-display:swap;font-weight:600;src:local('Muli SemiBold '),local(Muli-SemiBold),url(/fonts/muli-latin-600.woff2) format('woff2'),url(/fonts/muli-latin-600.woff) format('woff')}@font-face{font-family:muli;font-style:italic;font-display:swap;font-weight:600;src:local('Muli SemiBold italic'),local(Muli-SemiBolditalic),url(/fonts/muli-latin-600italic.woff2) format('woff2'),url(/fonts/muli-latin-600italic.woff) format('woff')}@font-face{font-family:muli;font-style:normal;font-display:swap;font-weight:700;src:local('Muli Bold '),local(Muli-Bold),url(/fonts/muli-latin-700.woff2) format('woff2'),url(/fonts/muli-latin-700.woff) format('woff')}@font-face{font-family:muli;font-style:italic;font-display:swap;font-weight:700;src:local('Muli Bold italic'),local(Muli-Bolditalic),url(/fonts/muli-latin-700italic.woff2) format('woff2'),url(/fonts/muli-latin-700italic.woff) format('woff')}@font-face{font-family:muli;font-style:normal;font-display:swap;font-weight:800;src:local('Muli ExtraBold '),local(Muli-ExtraBold),url(/fonts/muli-latin-800.woff2) format('woff2'),url(/fonts/muli-latin-800.woff) format('woff')}@font-face{font-family:muli;font-style:italic;font-display:swap;font-weight:800;src:local('Muli ExtraBold italic'),local(Muli-ExtraBolditalic),url(/fonts/muli-latin-800italic.woff2) format('woff2'),url(/fonts/muli-latin-800italic.woff) format('woff')}@font-face{font-family:muli;font-style:normal;font-display:swap;font-weight:900;src:local('Muli Black '),local(Muli-Black),url(/fonts/muli-latin-900.woff2) format('woff2'),url(/fonts/muli-latin-900.woff) format('woff')}@font-face{font-family:muli;font-style:italic;font-display:swap;font-weight:900;src:local('Muli Black italic'),local(Muli-Blackitalic),url(/fonts/muli-latin-900italic.woff2) format('woff2'),url(/fonts/muli-latin-900italic.woff) format('woff')}/*!TACHYONS v4.7.0 | http://tachyons.io*//*!normalize.css v8.0.0 | MIT License | github.com/necolas/normalize.css*/html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}h1{font-size:2em;margin:.67em 0}hr{-webkit-box-sizing:content-box;box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select,textarea{font-family:inh
\ No newline at end of file
--- a/docs/resources/_gen/assets/css/output/css/app.css_d11fe7b62c27961c87ecd0f2490357b9.json
+++ b/docs/resources/_gen/assets/css/output/css/app.css_d11fe7b62c27961c87ecd0f2490357b9.json
@@ -1,1 +1,1 @@
-{"Target":"output/css/app.min.7b23725c013f7650fd9e3f14b7f6b0bc02f71e14088ecd41bbe57661163fbcbb.css","MediaType":"text/css","Data":{"Integrity":"sha256-eyNyXAE/dlD9nj8Ut/awvAL3HhQIjs1Bu+V2YRY/vLs="}}
\ No newline at end of file
+{"Target":"output/css/app.min.2ac9b5935f7ff7709fe13c2b042a4a2d49fa96fb508e3e8870019ee9b72cf329.css","MediaType":"text/css","Data":{"Integrity":"sha256-Ksm1k19/93Cf4TwrBCpKLUn6lvtQjj6IcAGe6bcs8yk="}}
\ No newline at end of file
binary files /dev/null b/docs/resources/_gen/images/news/0.55.0-relnotes/featured_hu9474666a09966109e944f93e1ecf78c0_1221797_480x0_resize_catmullrom_2.png differ
binary files /dev/null b/docs/resources/_gen/images/news/0.55.0-relnotes/featured_hu9474666a09966109e944f93e1ecf78c0_1221797_640x0_resize_catmullrom_2.png differ
binary files /dev/null b/docs/resources/_gen/images/showcase/fireship/featured_hu3bba74627b7e233d29d5aecb29c8d0f1_136959_1024x512_fill_catmullrom_top_2.png differ
binary files /dev/null b/docs/resources/_gen/images/showcase/fireship/featured_hu3bba74627b7e233d29d5aecb29c8d0f1_136959_640x0_resize_catmullrom_2.png differ
binary files /dev/null b/docs/resources/_gen/images/showcase/fireship/featured_hu3bba74627b7e233d29d5aecb29c8d0f1_136959_9bf5371384e80c9f59e1f5e018440c34.png differ
--- a/docs/themes/gohugoioTheme/layouts/_default/baseof.html
+++ b/docs/themes/gohugoioTheme/layouts/_default/baseof.html
@@ -12,7 +12,7 @@
     <title>{{ block "title" . }}{{ with .Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }}</title>
 
     <meta name="viewport" content="width=device-width,minimum-scale=1">
-     {{ .Hugo.Generator }}
+     {{ hugo.Generator }}
 
       {{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production")  }}
         <META NAME="ROBOTS" CONTENT="INDEX, FOLLOW">
--- a/docs/themes/gohugoioTheme/layouts/news/single.html
+++ b/docs/themes/gohugoioTheme/layouts/news/single.html
@@ -1,5 +1,5 @@
 {{ define "main" }}
-  {{ $currentPageUrl := .URL }}
+  {{ $currentPageUrl := .RelPermalink }}
 
   <article class="cf ph4 pv3 pv5-ns">
       <!-- header spans the full width -->
@@ -13,7 +13,7 @@
       {{end}}
 
       <h1 class="lh-title fw9 mb7 mv0 pt3">
-        <a href="{{ .URL }}" class="link primary-color dim">
+        <a href="{{ .RelPermalink }}" class="link primary-color dim">
           {{ .Title }}
         </a>
       </h1>
@@ -66,9 +66,9 @@
             <ul class="list dib nested-links ml0 pl0">
               <li class="dib mb2 mr2">Related:</li>
               {{ range $tags.Pages }}
-                {{ if ne .URL $currentPageUrl }}
+                {{ if ne .RelPermalink $currentPageUrl }}
                   <li class="mb2 mr3">
-                     <a href="{{ .URL }}" class="link">
+                     <a href="{{ .RelPermalink }}" class="link">
                        {{ .LinkTitle }}
                      </a>
                    </li>
--- a/docs/themes/gohugoioTheme/layouts/partials/boxes-section-summaries.html
+++ b/docs/themes/gohugoioTheme/layouts/partials/boxes-section-summaries.html
@@ -8,7 +8,7 @@
     {{ end }}
 
     <h1 class="near-black f3">
-      <a href="{{ .context.URL }}" class="link primary-color dim">
+      <a href="{{ .context.RelPermalink }}" class="link primary-color dim">
       {{- if eq .context.Section "functions" -}}
         {{ .context.LinkTitle }}
       {{- else -}}
--- a/docs/themes/gohugoioTheme/layouts/partials/boxes-small-news.html
+++ b/docs/themes/gohugoioTheme/layouts/partials/boxes-small-news.html
@@ -6,7 +6,7 @@
     {{ range first 4 ( sort (where .Pages "Section" "news") "Date" "desc" ) }}
       <!-- only show 2 boxes on mobile -->
       {{ $.Scratch.Add "i" 1 }}{{ $i := $.Scratch.Get "i" }}
-      <a href="{{ .URL }}" class="link lh-copy light-gray f6 w-100 w-50-m w-25-l bg-animate hover-bg-accent-color hover-white pv3 pv4-ns ph3 ph4-ns{{ if ge $i 3 }} dn dib-l{{ else }} dib{{ end }}">
+      <a href="{{ .RelPermalink }}" class="link lh-copy light-gray f6 w-100 w-50-m w-25-l bg-animate hover-bg-accent-color hover-white pv3 pv4-ns ph3 ph4-ns{{ if ge $i 3 }} dn dib-l{{ else }} dib{{ end }}">
         <span class="f6 gray pb1 db">
           {{ .Date.Format "January 2, 2006" }}
         </span>
--- a/docs/themes/gohugoioTheme/layouts/partials/entry-summary.html
+++ b/docs/themes/gohugoioTheme/layouts/partials/entry-summary.html
@@ -2,7 +2,7 @@
   <div class="bg-white mb3 pa4 gray overflow-hidden">
     <span class="f6 db">{{ humanize .Section }}</span>
     <h1 class="f3 near-black">
-      <a href="{{ .URL }}" class="link black dim">
+      <a href="{{ .RelPermalink }}" class="link black dim">
         {{ .Title }}
       </a>
     </h1>
--- a/docs/themes/gohugoioTheme/layouts/partials/page-header.html
+++ b/docs/themes/gohugoioTheme/layouts/partials/page-header.html
@@ -1,5 +1,5 @@
 {{ $currentPage := . }}
-{{ $currentURL := .URL }}
+{{ $currentURL := .RelPermalink }}
 <header class="ph4 flex pv4 bg-light-gray">
   <ul class="list ma0 pa0 ">
       <!-- TODO: Active classes -->
--- a/docs/themes/gohugoioTheme/layouts/partials/tags.html
+++ b/docs/themes/gohugoioTheme/layouts/partials/tags.html
@@ -1,4 +1,4 @@
-{{ $currentPageUrl := .URL }}
+{{ $currentPageUrl := .RelPermalink }}
 {{ if and .Params.tags .Site.Taxonomies.tags }}
   {{ $name := index .Params.tags 0 }}
   {{ $name := $name | urlize }}
@@ -24,9 +24,9 @@
             Related entries:
           </li>
         {{ end }}
-        {{ if ne .URL $currentPageUrl }}
+        {{ if ne .RelPermalink $currentPageUrl }}
           <li class="db dib-l mb2 mr3">
-            <a href="{{ .URL }}" class="link">
+            <a href="{{ .RelPermalink }}" class="link">
               {{ .LinkTitle }}
             </a>
           </li>
--- a/docs/themes/gohugoioTheme/layouts/shortcodes/note.html
+++ b/docs/themes/gohugoioTheme/layouts/shortcodes/note.html
@@ -1,3 +1,4 @@
+{{ $_hugo_config := `{ "version": 1 }` }}
 <aside class="admonition note">
 	<div class="note-icon">
 		{{partial "svg/exclamation.svg" (dict "size" "20px" ) }}
--- a/docs/themes/gohugoioTheme/layouts/shortcodes/tip.html
+++ b/docs/themes/gohugoioTheme/layouts/shortcodes/tip.html
@@ -1,3 +1,4 @@
+{{ $_hugo_config := `{ "version": 1 }` }}
 <aside class="admonition tip">
 	<div class="tip-icon">
 		{{partial "svg/exclamation.svg" .}}
--- a/docs/themes/gohugoioTheme/layouts/shortcodes/warning.html
+++ b/docs/themes/gohugoioTheme/layouts/shortcodes/warning.html
@@ -1,3 +1,4 @@
+{{ $_hugo_config := `{ "version": 1 }` }}
 <aside class="admonition warning">
 	<div class="admonition-icon">
 		{{partial "svg/exclamation.svg" .}}