use partial for page title

layouts/_default/baseof.html

@@ -18,14 +18,9 @@
         content="{{- block "head-description" . -}}{{- $.Site.Params.description | html -}}{{- end -}}"
     />
 
-    <title itemprop="name">
       {{- block "title" . -}}
-        {{- .Site.Title -}}
+      {{- partialCached "head/title.html" ( slice .Site.Title .Site.Params.tagline ) .Site.Title .Site.Params.tagline -}}
-        {{- with .Site.Params.tagline -}}
-          {{- printf " | %s" . -}}
-        {{- end -}}
       {{- end -}}
-    </title>
 
     <link
       rel="license"

layouts/_default/list.html

@@ -1,5 +1,5 @@
 {{ define "title" }}
-  {{ .Type | singularize }}: ‘{{ .Page.Title | plainify }}’ | {{ .Site.Title }}
+  {{- partialCached "head/title.html" ( slice ( printf "%s: ‘%s’" ( .Type | singularize ) ( .Page.Title | plainify ) ) .Site.Params.tagline ) .Site.Title .Type .Page.Title -}}
 {{ end }}
 
 {{ define "main-class" }}--list layouts-default-list{{ end}}

layouts/_default/section.html

@@ -1,5 +1,5 @@
 {{ define "title" }}
-  {{ .Page.Title | plainify }} | {{ .Site.Title }}
+  {{- partialCached "head/title.html" ( slice ( .Page.Title | plainify ) .Site.Title ) .Site.Title .Page.Title -}}
 {{ end }}
 
 {{ define "main-class" }}--section layouts-default-section{{ end }}
@@ -7,7 +7,6 @@
 {{ define "main-type" }}.{{ .Params.mainType }}{{ end }}
 {{ define "item-type" }}{{ .Params.itemsType }}{{ end }}
 
-
 {{ define "main-header" }}
 <header class="site-content__header">
   <h2 class="page-title">{{ .Title | safeHTML }}

layouts/_default/single.html

@@ -1,4 +1,6 @@
-{{ define "title" }}{{ .Title | plainify }} | {{ .Site.Title }}{{ end }}
+{{ define "title" }}
+  {{- partialCached "head/title.html" ( slice ( .Page.Title | plainify ) .Site.Title ) .Site.Title .Page.Title -}}
+{{ end }}
 
 {{ define "head-description" }}{{ .Summary | plainify }}{{ end }}
 

layouts/blog/section.html

@@ -1,6 +1,5 @@
 {{ define "title" }}
-  {{ .Page.Title | plainify }} |
+  {{- partialCached "head/title.html" ( slice ( .Page.Title | plainify ) .Site.Title ) .Site.Title .Page.Title -}}
-  {{ .Site.Title }}
 {{ end }}
 
 {{ define "main-class" }}--section layouts-blog-section{{ end }}

layouts/blog/single.html

@@ -1,6 +1,5 @@
 {{ define "title" }}
-  “{{ .Title | plainify }}” |
+  {{- partialCached "head/title.html" ( slice ( printf "“%s”" ( .Page.Title | plainify ) ) .Site.Title ) .Site.Title .Page.Title -}}
-  {{ .Site.Title }}
 {{ end }}
 
 {{ define "main-class" }}--single layouts-blog-single{{ end }}

layouts/cv/organisations/section.html

@@ -1,6 +1,5 @@
 {{ define "title" }}
-  {{ .Page.Title | plainify }} |
+  {{- partialCached "head/title.html" ( slice ( .Page.Title | plainify ) .Site.Title ) .Site.Title .Page.Title -}}
-  {{ .Site.Title }}
 {{ end }}
 
 {{ define "main-class" }}

layouts/cv/section.html

@@ -1,5 +1,5 @@
 {{ define "title" }}
-  {{ .Page.Title | plainify }} | {{ .Site.Title }}
+  {{- partialCached "head/title.html" ( slice ( .Page.Title | plainify ) .Site.Title ) .Site.Title .Page.Title -}}
 {{ end }}
 
 {{ define "main-class" }}

layouts/locations/list.html

@@ -1,6 +1,5 @@
 {{ define "title" }}
-  Locations |
+  {{- partialCached "head/title.html" ( slice "Locations" .Site.Title ) .Site.Title -}}
-  {{ .Site.Title }}
 {{ end }}
 
 {{ define "main-class" }}--section location-map{{ end }}

layouts/partials/head/title.html

@@ -0,0 +1,18 @@
+{{- /*
+  Renders the page title.
+
+  @params .  Slice of title sections.
+  */
+-}}
+
+<!-- Validation -->
+
+{{- if ( not ( ge ( len . ) 1 ) ) -}}
+  {{- errorf "No site title received" -}}
+{{- end -}}
+
+<!-- Rendering -->
+
+<title itemprop="name">
+  {{- delimit . " | " -}}
+</title>

layouts/portfolio/section.html

@@ -1,5 +1,5 @@
 {{ define "title" }}
-  {{ .Page.Title | plainify }} | {{ .Site.Title }}
+  {{- partialCached "head/title.html" ( slice ( .Page.Title | plainify ) .Site.Title ) .Site.Title .Page.Title -}}
 {{ end }}
 
 {{ define "main-class" }}--section layouts-portfolio-section{{ end }}

layouts/series/list.html

@@ -1,7 +1,8 @@
 {{ define "title" }}
-  {{ .Type | singularize }}: ‘{{ .Page.Title | plainify }}’ | {{ .Site.Title }}
+  {{- partialCached "head/title.html" ( slice ( printf "%s: ‘%s’" ( .Type | singularize ) ( .Page.Title | plainify ) ) .Site.Params.tagline ) .Site.Title .Type .Page.Title -}}
 {{ end }}
 
+
 {{ define "main-class" }}--list layouts-series-list{{ end}}
 
 {{ define "main-header" }}