diff options
| -rw-r--r-- | config/_default/hugo.toml | 2 | ||||
| -rw-r--r-- | layouts/_default/single.gmi | 2 | ||||
| -rw-r--r-- | layouts/index.gemini_atom.xml | 10 | ||||
| -rw-r--r-- | layouts/partials/metadata.gmi | 2 | ||||
| -rw-r--r-- | layouts/taxonomy/taxonomy.gemini_atom.xml | 10 | ||||
| -rw-r--r-- | layouts/taxonomy/taxonomy.gmi | 6 | ||||
| -rw-r--r-- | layouts/term/term.gemini_atom.xml | 10 | ||||
| -rw-r--r-- | layouts/term/term.gmi | 4 |
8 files changed, 24 insertions, 22 deletions
diff --git a/config/_default/hugo.toml b/config/_default/hugo.toml index 7b4cc1e..da69d63 100644 --- a/config/_default/hugo.toml +++ b/config/_default/hugo.toml @@ -11,9 +11,11 @@ [outputFormats.Gemini] mediaType = "text/gemini" isPlainText = true # Disable HTML renderer + protocol = "gemini://" [outputFormats.Gemini_Atom] mediaType = "application/atom" baseName = "atom" + protocol = "gemini://" [markup] [markup.goldmark] diff --git a/layouts/_default/single.gmi b/layouts/_default/single.gmi index 207bb87..29c740e 100644 --- a/layouts/_default/single.gmi +++ b/layouts/_default/single.gmi @@ -1,6 +1,6 @@ {{ define "main" -}} {{ $emoji := cond (.Page.Params.showlinkemoji | default true) (emojify ":link: ") "" -}} -=> {{ .Site.Home.RelPermalink | replaceRE `(?m)index.gmi$` "" }} {{ emojify ":link:" }} {{ i18n "returnHome" -}} +=> {{ .Site.Home.RelPermalink | replaceRE `index.gmi$` "" }} {{ emojify ":link:" }} {{ i18n "returnHome" -}} {{ if (.Page.Params.pageinfo | default true) }} diff --git a/layouts/index.gemini_atom.xml b/layouts/index.gemini_atom.xml index de1478b..6eb6b8e 100644 --- a/layouts/index.gemini_atom.xml +++ b/layouts/index.gemini_atom.xml @@ -32,11 +32,11 @@ {{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" | safeHTML }} <feed xmlns="http://www.w3.org/2005/Atom"> - <id>{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" }}</id> + <id>{{ .Permalink | replaceRE `index.gmi$` "" }}</id> <title>{{ .Site.Title }}</title> <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated> - <link href="{{ .Permalink | replaceRE `^https://(.*)/index.gmi$` "gemini://$1/atom.xml" | safeURL }}" rel="self" /> - <link href="{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" | safeURL }}" rel="alternate" /> + <link href="{{ .Permalink | replaceRE `index.gmi$` "atom.xml" | safeURL }}" rel="self" /> + <link href="{{ .Permalink | replaceRE `index.gmi$` "" | safeURL }}" rel="alternate" /> {{- with $authorName }} <author> <name>{{ . }}</name> @@ -47,9 +47,9 @@ <rights type="html">{{ replace .Site.Copyright "{currentYear}" (now.Format "2006") }}</rights> <subtitle>{{ .Site.Params.Description }}</subtitle>{{ range first .Site.Config.Services.RSS.Limit .Site.RegularPages }} <entry> - <id>{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" }}</id> + <id>{{ .Permalink | replaceRE `index.gmi$` "" }}</id> <title>{{ .Title }}</title> <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated> - <link href="{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" | safeURL }}" rel="alternate" /> + <link href="{{ .Permalink | replaceRE `index.gmi$` "" | safeURL }}" rel="alternate" /> </entry>{{ end }} </feed> diff --git a/layouts/partials/metadata.gmi b/layouts/partials/metadata.gmi index 7ee4064..7f897c3 100644 --- a/layouts/partials/metadata.gmi +++ b/layouts/partials/metadata.gmi @@ -1,2 +1,2 @@ {{ partial "pageinfo.gmi" . }} -=> {{ .RelPermalink | replaceRE `(?m)index.gmi$` "" }} {{ emojify ":link:" }} {{ .Title }}
\ No newline at end of file +=> {{ .RelPermalink | replaceRE `index.gmi$` "" }} {{ emojify ":link:" }} {{ .Title }}
\ No newline at end of file diff --git a/layouts/taxonomy/taxonomy.gemini_atom.xml b/layouts/taxonomy/taxonomy.gemini_atom.xml index dc08a54..588294b 100644 --- a/layouts/taxonomy/taxonomy.gemini_atom.xml +++ b/layouts/taxonomy/taxonomy.gemini_atom.xml @@ -32,11 +32,11 @@ {{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" | safeHTML }} <feed xmlns="http://www.w3.org/2005/Atom"> - <id>{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" }}</id> + <id>{{ .Permalink | replaceRE `index.gmi$` "" }}</id> <title>{{ .Site.Title }}</title> <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated> - <link href="{{ .Permalink | replaceRE `^https://(.*)/index.gmi$` "gemini://$1/atom.xml" | safeURL }}" rel="self" /> - <link href="{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" | safeURL }}" rel="alternate" /> + <link href="{{ .Permalink | replaceRE `index.gmi$` "atom.xml" | safeURL }}" rel="self" /> + <link href="{{ .Permalink | replaceRE `index.gmi$` "" | safeURL }}" rel="alternate" /> {{- with $authorName }} <author> <name>{{ . }}</name> @@ -47,9 +47,9 @@ <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 | replaceRE `^https://(.*)index.gmi$` "gemini://$1" }}</id> + <id>{{ .Permalink | replaceRE `index.gmi$` "" }}</id> <title>{{ .Title }}</title> <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated> - <link href="{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" | safeURL }}" rel="alternate" /> + <link href="{{ .Permalink | replaceRE `index.gmi$` "" | safeURL }}" rel="alternate" /> </entry>{{ end }} </feed> diff --git a/layouts/taxonomy/taxonomy.gmi b/layouts/taxonomy/taxonomy.gmi index 4777616..02ff4a4 100644 --- a/layouts/taxonomy/taxonomy.gmi +++ b/layouts/taxonomy/taxonomy.gmi @@ -1,5 +1,5 @@ {{ define "main" -}} -=> {{ .Site.Home.RelPermalink | replaceRE `(?m)index.gmi$` "" }} {{ emojify ":link:" }} {{ i18n "returnHome" }} +=> {{ .Site.Home.RelPermalink | replaceRE `index.gmi$` "" }} {{ emojify ":link:" }} {{ i18n "returnHome" }} # {{ .Type | humanize }} @@ -7,11 +7,11 @@ ## {{ i18n "feeds" }} -=> {{ .RelPermalink | replaceRE `(?m)index.gmi$` "atom.xml" }} {{ emojify ":link:" }} {{ i18n "atomFeed" }} +=> {{ .RelPermalink | replaceRE `index.gmi$` "atom.xml" }} {{ emojify ":link:" }} {{ i18n "atomFeed" }} ## {{ i18n "list" }} {{ range .Data.Pages }} -=> {{ .RelPermalink | replaceRE `(?m)index.gmi$` "" }} {{ emojify ":link:" }} {{ .Title -}} +=> {{ .RelPermalink | replaceRE `index.gmi$` "" }} {{ emojify ":link:" }} {{ .Title -}} {{ end -}} {{ end }}
\ No newline at end of file diff --git a/layouts/term/term.gemini_atom.xml b/layouts/term/term.gemini_atom.xml index 27126d7..ec6859f 100644 --- a/layouts/term/term.gemini_atom.xml +++ b/layouts/term/term.gemini_atom.xml @@ -32,11 +32,11 @@ {{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" | safeHTML }} <feed xmlns="http://www.w3.org/2005/Atom"> - <id>{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" }}</id> + <id>{{ .Permalink | replaceRE `index.gmi$` "" }}</id> <title>{{ .Site.Title }}</title> <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated> - <link href="{{ .Permalink | replaceRE `^https://(.*)/index.gmi$` "gemini://$1/atom.xml" | safeURL }}" rel="self" /> - <link href="{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" | safeURL }}" rel="alternate" /> + <link href="{{ .Permalink | replaceRE `index.gmi$` "atom.xml" | safeURL }}" rel="self" /> + <link href="{{ .Permalink | replaceRE `index.gmi$` "" | safeURL }}" rel="alternate" /> {{- with $authorName }} <author> <name>{{ . }}</name> @@ -47,9 +47,9 @@ <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 | replaceRE `^https://(.*)index.gmi$` "gemini://$1" }}</id> + <id>{{ .Permalink | replaceRE `index.gmi$` "" }}</id> <title>{{ .Title }}</title> <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated> - <link href="{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" | safeURL }}" rel="alternate" /> + <link href="{{ .Permalink | replaceRE `index.gmi$` "" | safeURL }}" rel="alternate" /> </entry>{{ end }} </feed> diff --git a/layouts/term/term.gmi b/layouts/term/term.gmi index fc765bf..d3c5a2a 100644 --- a/layouts/term/term.gmi +++ b/layouts/term/term.gmi @@ -1,5 +1,5 @@ {{ define "main" -}} -=> {{ .Site.Home.RelPermalink | replaceRE `(?m)index.gmi$` "" }} {{ emojify ":link:" }} {{ i18n "returnHome" }} +=> {{ .Site.Home.RelPermalink | replaceRE `index.gmi$` "" }} {{ emojify ":link:" }} {{ i18n "returnHome" }} # {{ .Type | singularize | humanize }} "{{ .Title }}" @@ -7,7 +7,7 @@ ## {{ i18n "feeds" }} -=> {{ .RelPermalink | replaceRE `(?m)index.gmi$` "atom.xml" }} {{ emojify ":link:" }} {{ i18n "atomFeed" }} +=> {{ .RelPermalink | replaceRE `index.gmi$` "atom.xml" }} {{ emojify ":link:" }} {{ i18n "atomFeed" }} ## {{ i18n "journalEntries" -}} |