From eb8ca07b9f0ceadd8f503f012ccb79663d06f797 Mon Sep 17 00:00:00 2001
From: Rohan Kumar <seirdy@seirdy.one>
Date: Mon, 25 Apr 2022 08:49:13 -0700
Subject: [PATCH] Goldmark 1.4.12, switch to good unminified output

- Goldmark 1.4.12 switches footnotes from a <section> to a <div>; update
  regexes and stylesheet to account for this.
- Goldmark 1.4.12 allows multiple footnotes with the same reference; use
  that.
- Clean up templates for unminified output. Also delete an unused class.
- Switch to unminified output by default.
---
 Makefile                                      |  2 +-
 assets/css/main.css                           |  2 +-
 content/posts/website-best-practices.md       |  2 +-
 .../_markup/render-codeblock-figure.html      | 30 ++++++++---------
 layouts/_default/single.html                  |  4 +--
 layouts/partials/processed-content.html       | 32 +++++++++++--------
 layouts/posts/single.html                     |  4 +--
 7 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/Makefile b/Makefile
index c9035f7..a9f5d91 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ DEVSERVER_URL="http://localhost:1313/"
 
 DOMAIN = seirdy.one
 HUGO_BASEURL = "https://$(DOMAIN)/"
-HUGO_FLAGS = --gc --minify --ignoreCache
+HUGO_FLAGS = --gc --ignoreCache
 USER = deploy@$(DOMAIN)
 WWW_ROOT = /var/www/$(DOMAIN)
 GEMINI_ROOT = /srv/gemini/$(DOMAIN)
diff --git a/assets/css/main.css b/assets/css/main.css
index 733b53b..2a6e991 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -182,7 +182,7 @@ img:not(.u-photo) {
  * Also use "content-visibility: auto" to improve performance by
  * reducing the number of DOM nodes rendered at once. */
 footer,
-section[role="doc-endnotes"] {
+div[role="doc-endnotes"] {
 	border-top: 1px solid;
 	content-visibility: auto;
 }
diff --git a/content/posts/website-best-practices.md b/content/posts/website-best-practices.md
index 8e0d8c9..b3bfa3e 100644
--- a/content/posts/website-best-practices.md
+++ b/content/posts/website-best-practices.md
@@ -701,7 +701,7 @@ Color schemes should also look good to users who apply gamma adjustments. Most o
 In defense of link under&shy;lines {#in-defense-of-link-underlines}
 ----------------------------------
 
-Some typographers insist that [underlined on-screen text is obsolete](https://practicaltypography.com/underlining.html), and hyperlinks are no exception. I disagree.
+Some typographers insist that [underlined on-screen text is obsolete](https://practicaltypography.com/underlining.html)[^12], and that hyperlinks are no exception. I disagree.
 
 One reason is that underlines make it easy to separate multiple consecutive inline links:
 
diff --git a/layouts/_default/_markup/render-codeblock-figure.html b/layouts/_default/_markup/render-codeblock-figure.html
index 63d8ef5..9d48458 100644
--- a/layouts/_default/_markup/render-codeblock-figure.html
+++ b/layouts/_default/_markup/render-codeblock-figure.html
@@ -1,18 +1,18 @@
-{{ $contents := .Inner | htmlEscape }}
-{{ $samp := false }}
-{{ with .Attributes }}
-	{{ range $k, $v := . }}
-		{{ if strings.HasPrefix $k "var" }}
-			{{ $after := printf `<var translate="yes">%s</var>` $v }}
-			{{ $contents = $contents | replaceRE $v $after }}
-		{{ else if strings.HasPrefix $k "str" }}
-			{{ $after := printf `<strong translate="yes">%s</strong>` $v }}
-			{{ $contents = $contents | replaceRE $v $after }}
-		{{ else if and (eq $k "samp")}}
-			{{ $samp = $v }}
-		{{ end }}
-	{{ end }}
-{{ end }}
+{{ $contents := .Inner | htmlEscape -}}
+{{- $samp := false -}}
+{{- with .Attributes -}}
+	{{- range $k, $v := . -}}
+		{{- if strings.HasPrefix $k "var" -}}
+			{{- $after := printf `<var translate="yes">%s</var>` $v -}}
+			{{- $contents = $contents | replaceRE $v $after -}}
+		{{- else if strings.HasPrefix $k "str" -}}
+			{{- $after := printf `<strong translate="yes">%s</strong>` $v -}}
+			{{- $contents = $contents | replaceRE $v $after -}}
+		{{- else if and (eq $k "samp")}}
+			{{- $samp = $v -}}
+		{{- end -}}
+	{{- end -}}
+{{- end -}}
 <pre tabindex="0">
 {{- if $samp -}}
 <samp itemprop="text">
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 2f7d304..90a27c1 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,7 +1,7 @@
 {{ define "main" }}
 <div itemprop="blogPost mainEntity" itemscope itemtype="https://schema.org/BlogPosting">
 	<article class="h-entry hentry">
-		<header id="post-header">
+		<header>
 			<h1 itemprop="name headline" class="p-name entry-title">{{ .Title }}</h1>
 			<span class="dateline">
 				Posted <time itemprop="datePublished" class="dt-published published" datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}" title="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Date.Format "2006-01-02" }}</time>
@@ -10,7 +10,7 @@
 			{{ if lt .Date .Lastmod -}}
 				<br>
 				Last updated <time itemprop="dateModified" class="dt-updated updated" datetime="{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }}" title="{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Lastmod.Format "2006-01-02" }}</time>. <a href="{{ .Site.Params.logUrlPrefix }}content/{{ .File.Path }}">Changelog</a>.
-			{{ end }}
+			{{- end }}
 			<br>
 			<small>
 				<span itemprop="wordCount">{{ .WordCount }}</span> words, a <span itemprop="timeRequired" content="PT{{ .ReadingTime }}M">{{ .ReadingTime }} minute</span> read
diff --git a/layouts/partials/processed-content.html b/layouts/partials/processed-content.html
index 59cfe64..8c71d89 100644
--- a/layouts/partials/processed-content.html
+++ b/layouts/partials/processed-content.html
@@ -1,24 +1,28 @@
-{{ $footnote_heading :=  printf "Footnotes" -}}
-{{ if .Params.footnote_heading -}}
-	{{ $footnote_heading =  .Params.footnote_heading -}}
-{{end}}
+{{- $footnote_heading :=  printf "Footnotes" -}}
+{{- if .Params.footnote_heading -}}
+	{{- $footnote_heading =  .Params.footnote_heading -}}
+{{- end -}}
 
-<!--Add heading to footnotes, remove unused class-->
-{{ $referencesWithoutHeading    := `(<(section|div) class="footnotes" role="doc-endnotes">
+<!--
+	Add heading to footnotes, remove unused class.
+	Requires Goldmark v1.4.12 or higher, since that version switched
+	endnotes from a <section> to a <div>.
+-->
+{{- $referencesWithoutHeading    := `(<div class="footnotes" role="doc-endnotes">
 <hr>)` -}}
-{{ $referencesWithHeading := printf `<section role="doc-endnotes" aria-labelledby="note-hd">
+{{- $referencesWithHeading := printf `<div role="doc-endnotes" aria-labelledby="note-hd">
 <h2 id="note-hd">%s</h2>` ($footnote_heading) -}}
 
 <!--Remove deprecated DPUB-ARIA role and unused classes-->
-{{ $endnote := `(role="doc-endnote"|class="footnote-(back)?ref")` }}
-{{ $noEndnote := printf "" }}
+{{- $endnote := `(role="doc-endnote"|class="footnote-(back)?ref")` -}}
+{{- $noEndnote := printf "" -}}
 
 <!--Move the Table of Contents heading *inside* the <nav> element-->
-{{ $tocHeadingOutside := `<h2>Table of Contents</h2><nav(?:.*)>` }}
-{{ $tocHeadingInside := `<nav id=TableOfContents role="doc-toc"><h2 id="toc-hd">Table of Contents</h2>` }}
+{{- $tocHeadingOutside := `<h2>Table of Contents</h2><nav(?:.*)>` -}}
+{{- $tocHeadingInside := `<nav id=TableOfContents role="doc-toc"><h2 id="toc-hd">Table of Contents</h2>` -}}
 
 <!--Give footnote backlinks accessible names-->
-{{ $footnoteBacklinksBad  :=  `<a href="#fnref:([0-9]*)"(.*role="doc-backlink"(?:.*)?)>` }}
-{{ $footnoteBacklinksGood :=  `<a href="#fnref:${1}" title="back to reference ${1}" aria-label="back to reference ${1}"${2}>` }}
+{{- $footnoteBacklinksBad  :=  `<a href="#fnref:([0-9]*)"(.*role="doc-backlink"(?:.*)?)>` -}}
+{{- $footnoteBacklinksGood :=  `<a href="#fnref:${1}" title="back to reference ${1}" aria-label="back to reference ${1}"${2}>` -}}
 
-{{ .Content | replaceRE $referencesWithoutHeading $referencesWithHeading | replaceRE $endnote $noEndnote | replaceRE $tocHeadingOutside $tocHeadingInside | replaceRE $footnoteBacklinksBad $footnoteBacklinksGood | safeHTML -}}
+{{- .Content | replaceRE $referencesWithoutHeading $referencesWithHeading | replaceRE $endnote $noEndnote | replaceRE $tocHeadingOutside $tocHeadingInside | replaceRE $footnoteBacklinksBad $footnoteBacklinksGood | safeHTML -}}
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index 932bd32..314c283 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -2,7 +2,7 @@
 {{ .Scratch.Set "codeIndex" 1 }}
 <div itemprop="blogPost mainEntity" itemscope itemtype="https://schema.org/BlogPosting">
 	<article class="h-entry hentry">
-		<header id="post-header">
+		<header>
 			<h1 itemprop="name headline" class="p-name entry-title">{{ .Title }}</h1>
 			<span class="dateline">
 				Posted <time itemprop="dateCreated datePublished" class="dt-published published" datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}" title="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Date.Format "2006-01-02" }}</time>
@@ -11,7 +11,7 @@
 			{{ if lt .Date .Lastmod -}}
 				<br>
 				Last updated <time itemprop="dateModified" class="dt-updated updated" datetime="{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }}" title="{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Lastmod.Format "2006-01-02" }}</time>. <a href="{{ .Site.Params.logUrlPrefix }}content/{{ .File.Path }}">Changelog</a>.
-			{{ end }}
+			{{- end }}
 			<br>
 			<small>
 				<span itemprop="wordCount">{{ .WordCount }}</span> words, a <span itemprop="timeRequired" content="PT{{ .ReadingTime }}M">{{ .ReadingTime }} minute</span> read