Move taxonomy and term layouts to layouts/_default

Hugo's template system was reimplemented in Hugo version 0.146.0.

"We [the Hugo developers] have aimed to maintain as much backward
compatibility as possible by mapping "old to new," but some reported
breakages have occurred."

Reference: https://gohugo.io/templates/new-templatesystem-overview/

The "mapping "old to new,"" is not yet documented, but moving the
taxonomy and term layouts to layouts/_default seems to be sufficient to
properly generate this theme on Hugo versions later than 0.146.0.

To retain backward compatibility with older Hugo versions, the other
recommended changes to the layouts directory are not made.

Reference: https://gohugo.io/templates/new-templatesystem-overview/#changes-to-the-layouts-folder

8 files changed, 288 insertions, 0 deletions

diff --git a/layouts/_default/taxonomy.atom.xml b/layouts/_default/taxonomy.atom.xml
new file mode 100644
index 0000000..cbcbae8
--- /dev/null
+++ b/layouts/_default/taxonomy.atom.xml
@@ -0,0 +1,56 @@
+{{/* Deprecate site.Author.name in favor of site.Params.author.name */}}
+{{- $authorName := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .name }}
+      {{- $authorName = . }}
+    {{- end }}
+  {{- else }}
+    {{- $authorName  = . }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.name }}
+    {{- $authorName = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }}
+  {{- end }}
+{{- end }}
+
+{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}}
+{{- $authorEmail := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .email }}
+      {{- $authorEmail = . }}
+    {{- end }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.email }}
+    {{- $authorEmail = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }}
+  {{- end }}
+{{- end -}}
+
+{{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" | safeHTML }}
+<feed xmlns="http://www.w3.org/2005/Atom">
+    <id>{{ .Permalink }}</id>
+    <title>{{ .Site.Title }}</title>
+    <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated>
+    <link href="{{ .Permalink }}atom.xml" rel="self" />
+    <link href="{{ .Permalink }}" rel="alternate" />
+    {{- with $authorName }}
+    <author>
+        <name>{{ . }}</name>
+        {{- with $authorEmail }}
+        <email>{{ . }}</email>{{ end }}
+    </author>{{ end }}
+    <generator>Hugo -- gohugo.io</generator>
+    <rights type="html">{{ replace .Site.Copyright "{currentYear}" (now.Format "2006") }}</rights>
+    <subtitle>{{ .Site.Params.Description }}</subtitle>{{ range first .Site.Config.Services.RSS.Limit .Data.Pages }}
+    <entry>
+        <id>{{ .Permalink }}</id>
+        <title type="html">{{ .Title }}</title>
+        <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated>
+        <link href="{{ .Permalink }}" />
+        <content type="html">{{ .Content | html }}</content>
+    </entry>{{ end }}
+</feed>
diff --git a/layouts/_default/taxonomy.gemini_atom.xml b/layouts/_default/taxonomy.gemini_atom.xml
new file mode 100644
index 0000000..76431e3
--- /dev/null
+++ b/layouts/_default/taxonomy.gemini_atom.xml
@@ -0,0 +1,55 @@
+{{/* Deprecate site.Author.name in favor of site.Params.author.name */}}
+{{- $authorName := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .name }}
+      {{- $authorName = . }}
+    {{- end }}
+  {{- else }}
+    {{- $authorName  = . }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.name }}
+    {{- $authorName = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }}
+  {{- end }}
+{{- end }}
+
+{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}}
+{{- $authorEmail := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .email }}
+      {{- $authorEmail = . }}
+    {{- end }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.email }}
+    {{- $authorEmail = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }}
+  {{- end }}
+{{- end -}}
+
+{{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" | safeHTML }}
+<feed xmlns="http://www.w3.org/2005/Atom">
+    <id>{{ .Permalink | strings.TrimSuffix "index.gmi" }}</id>
+    <title>{{ .Site.Title }}</title>
+    <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated>
+    <link href="{{ .Permalink | replaceRE `index.gmi$` "atom.xml" | safeURL }}" rel="self" />
+    <link href="{{ .Permalink | strings.TrimSuffix "index.gmi" | safeURL }}" rel="alternate" />
+    {{- with $authorName }}
+    <author>
+        <name>{{ . }}</name>
+        {{- with $authorEmail }}
+        <email>{{ . }}</email>{{ end }}
+    </author>{{ end }}
+    <generator>Hugo -- gohugo.io</generator>
+    <rights type="html">{{ replace .Site.Copyright "{currentYear}" (now.Format "2006") }}</rights>
+    <subtitle>{{ .Site.Params.Description }}</subtitle>{{ range first .Site.Config.Services.RSS.Limit .Data.Pages }}
+    <entry>
+        <id>{{ .Permalink | strings.TrimSuffix "index.gmi" }}</id>
+        <title>{{ .Title }}</title>
+        <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated>
+        <link href="{{ .Permalink | strings.TrimSuffix "index.gmi" | safeURL }}" rel="alternate" />
+    </entry>{{ end }}
+</feed>
diff --git a/layouts/_default/taxonomy.gmi b/layouts/_default/taxonomy.gmi
new file mode 100644
index 0000000..9c2a9f0
--- /dev/null
+++ b/layouts/_default/taxonomy.gmi
@@ -0,0 +1,17 @@
+{{ define "main" -}}
+=> {{ .Site.Home.RelPermalink | strings.TrimSuffix "index.gmi" }} {{ emojify ":link:" }} {{ i18n "returnHome" }}
+
+
+# {{ .Type | humanize }}
+
+
+## {{ i18n "feeds" }}
+
+=> {{ .RelPermalink | replaceRE `index.gmi$` "atom.xml" }} {{ emojify ":link:" }} {{ i18n "atomFeed" }}
+
+
+## {{ i18n "list" }}
+{{ range .Data.Pages }}
+=> {{ .RelPermalink | strings.TrimSuffix "index.gmi" }} {{ emojify ":link:" }} {{ .Title -}}
+{{ end -}}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
new file mode 100644
index 0000000..86d7f89
--- /dev/null
+++ b/layouts/_default/taxonomy.html
@@ -0,0 +1,16 @@
+{{ define "main" -}}
+<nav>
+  <p>{{ emojify ":link:" }}&nbsp;<a class="link link--internal" href="{{ .Site.Home.RelPermalink }}" rel="noreferrer">{{ i18n "returnHome" }}</a></p>
+</nav>
+<main>
+  <h1>{{ .Type | humanize }}</h1>
+  <h2>{{ i18n "feeds" }}</h2>
+  <p>{{ emojify ":link:" }}&nbsp;<a class="link link--internal" href="{{ print .RelPermalink "atom.xml" }}" rel="noreferrer">{{ i18n "atomFeed" }}</a></p>
+  <h2>{{ i18n "list" }}</h2>
+  <ul class="list">
+  {{- range .Data.Pages }}
+    <li class="list__item">{{ emojify ":link:" }}&nbsp;<a class="link link--internal" href="{{ .RelPermalink }}" rel="noreferrer">{{ .Title }}</a></li>
+  {{- end }}
+  </ul>
+</main>
+{{- end }}
\ No newline at end of file
diff --git a/layouts/_default/term.atom.xml b/layouts/_default/term.atom.xml
new file mode 100644
index 0000000..cbcbae8
--- /dev/null
+++ b/layouts/_default/term.atom.xml
@@ -0,0 +1,56 @@
+{{/* Deprecate site.Author.name in favor of site.Params.author.name */}}
+{{- $authorName := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .name }}
+      {{- $authorName = . }}
+    {{- end }}
+  {{- else }}
+    {{- $authorName  = . }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.name }}
+    {{- $authorName = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }}
+  {{- end }}
+{{- end }}
+
+{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}}
+{{- $authorEmail := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .email }}
+      {{- $authorEmail = . }}
+    {{- end }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.email }}
+    {{- $authorEmail = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }}
+  {{- end }}
+{{- end -}}
+
+{{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" | safeHTML }}
+<feed xmlns="http://www.w3.org/2005/Atom">
+    <id>{{ .Permalink }}</id>
+    <title>{{ .Site.Title }}</title>
+    <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated>
+    <link href="{{ .Permalink }}atom.xml" rel="self" />
+    <link href="{{ .Permalink }}" rel="alternate" />
+    {{- with $authorName }}
+    <author>
+        <name>{{ . }}</name>
+        {{- with $authorEmail }}
+        <email>{{ . }}</email>{{ end }}
+    </author>{{ end }}
+    <generator>Hugo -- gohugo.io</generator>
+    <rights type="html">{{ replace .Site.Copyright "{currentYear}" (now.Format "2006") }}</rights>
+    <subtitle>{{ .Site.Params.Description }}</subtitle>{{ range first .Site.Config.Services.RSS.Limit .Data.Pages }}
+    <entry>
+        <id>{{ .Permalink }}</id>
+        <title type="html">{{ .Title }}</title>
+        <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated>
+        <link href="{{ .Permalink }}" />
+        <content type="html">{{ .Content | html }}</content>
+    </entry>{{ end }}
+</feed>
diff --git a/layouts/_default/term.gemini_atom.xml b/layouts/_default/term.gemini_atom.xml
new file mode 100644
index 0000000..287bcc4
--- /dev/null
+++ b/layouts/_default/term.gemini_atom.xml
@@ -0,0 +1,55 @@
+{{/*Deprecate site.Author.name in favor of site.Params.author.name */}}
+{{- $authorName := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .name }}
+      {{- $authorName = . }}
+    {{- end }}
+  {{- else }}
+    {{- $authorName  = . }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.name }}
+    {{- $authorName = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }}
+  {{- end }}
+{{- end }}
+
+{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}}
+{{- $authorEmail := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .email }}
+      {{- $authorEmail = . }}
+    {{- end }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.email }}
+    {{- $authorEmail = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }}
+  {{- end }}
+{{- end -}}
+
+{{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" | safeHTML }}
+<feed xmlns="http://www.w3.org/2005/Atom">
+    <id>{{ .Permalink | strings.TrimSuffix "index.gmi" }}</id>
+    <title>{{ .Site.Title }}</title>
+    <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated>
+    <link href="{{ .Permalink | replaceRE `index.gmi$` "atom.xml" | safeURL }}" rel="self" />
+    <link href="{{ .Permalink | strings.TrimSuffix "index.gmi" | safeURL }}" rel="alternate" />
+    {{- with $authorName }}
+    <author>
+        <name>{{ . }}</name>
+        {{- with $authorEmail }}
+        <email>{{ . }}</email>{{ end }}
+    </author>{{ end }}
+    <generator>Hugo -- gohugo.io</generator>
+    <rights type="html">{{ replace .Site.Copyright "{currentYear}" (now.Format "2006") }}</rights>
+    <subtitle>{{ .Site.Params.Description }}</subtitle>{{ range first .Site.Config.Services.RSS.Limit .Data.Pages }}
+    <entry>
+        <id>{{ .Permalink | strings.TrimSuffix "index.gmi" }}</id>
+        <title>{{ .Title }}</title>
+        <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated>
+        <link href="{{ .Permalink | strings.TrimSuffix "index.gmi" | safeURL }}" rel="alternate" />
+    </entry>{{ end }}
+</feed>
diff --git a/layouts/_default/term.gmi b/layouts/_default/term.gmi
new file mode 100644
index 0000000..5d7f7b1
--- /dev/null
+++ b/layouts/_default/term.gmi
@@ -0,0 +1,19 @@
+{{ define "main" -}}
+=> {{ .Site.Home.RelPermalink | strings.TrimSuffix "index.gmi" }} {{ emojify ":link:" }} {{ i18n "returnHome" }}
+
+
+# {{ .Type | singularize | humanize }} "{{ .Title }}"
+
+
+## {{ i18n "feeds" }}
+
+=> {{ .RelPermalink | replaceRE `index.gmi$` "atom.xml" }} {{ emojify ":link:" }} {{ i18n "atomFeed" }}
+
+
+## {{ i18n "journalEntries" -}}
+
+{{ range .Data.Pages.ByPublishDate.Reverse }}
+
+{{ partial "metadata.gmi" . -}}
+{{ end -}}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/_default/term.html b/layouts/_default/term.html
new file mode 100644
index 0000000..3b268dd
--- /dev/null
+++ b/layouts/_default/term.html
@@ -0,0 +1,14 @@
+{{ define "main" -}}
+<nav>
+  <p>{{ emojify ":link:" }}&nbsp;<a class="link link--internal" href="{{ .Site.Home.RelPermalink }}" rel="noreferrer">{{ i18n "returnHome" }}</a></p>
+</nav>
+<main>
+  <h1>{{ .Type | singularize | humanize }} "{{ .Title }}"</h1>
+  <h2>{{ i18n "feeds" }}</h2>
+  <p>{{ emojify ":link:" }}&nbsp;<a class="link link--internal" href="{{ print .RelPermalink "atom.xml" }}" rel="noreferrer">{{ i18n "atomFeed" }}</a></p>
+  <h2>{{ i18n "journalEntries" }}</h2>
+  {{- range .Data.Pages.ByPublishDate.Reverse }}
+  {{ partial "metadata.html" . -}}
+  {{ end }}
+</main>
+{{- end }}
\ No newline at end of file