From 6f9d4182859ba48e321625b2813a71937b0a8e5f Mon Sep 17 00:00:00 2001
From: Rohan Kumar <seirdy@seirdy.one>
Date: Mon, 8 Aug 2022 17:30:43 -0700
Subject: [PATCH] Replace unnecessary use of <br> with something simpler

---
 assets/css/main.css                     |  3 ++-
 layouts/partials/processed-content.html | 16 ++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/assets/css/main.css b/assets/css/main.css
index 9eca4f9..904552b 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -205,7 +205,7 @@ html {
 	}
 
 	figure,
-	p {
+	:not(li) > p {
 		contain: inline-size layout;
 	}
 
@@ -333,6 +333,7 @@ html {
 		contain: content;
 		display: inline-block;
 		padding: .75em .5em;
+		margin-top: -1em;
 	}
 
 	/* skip link: make it invisible until focused, and put it on the top. */
diff --git a/layouts/partials/processed-content.html b/layouts/partials/processed-content.html
index b007bfb..dc9a573 100644
--- a/layouts/partials/processed-content.html
+++ b/layouts/partials/processed-content.html
@@ -6,7 +6,8 @@
 <!--
 	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>.
+	endnotes from a <section> to a <div>. This switches them back to a section,
+	since doc-endnotes inherits a <section> role.
 -->
 {{- $referencesWithoutHeading    := `(<div class="footnotes" role="doc-endnotes">
 <hr />)` -}}
@@ -43,16 +44,19 @@
 {{- $tocHeadingInside := `<nav id="TableOfContents" role="doc-toc" aria-labelledby="toc-hd" tabindex="-1">
 	<h2 id="toc-hd">Table of Contents</h2>` -}}
 
-<!--Give footnote backlinks accessible names-->
-{{- $footnoteBacklinksBad  :=  `<a href="#fnref:([0-9]*)" class="footnote-backref"(.*role="doc-backlink"(?:[^>]*)?)>([^<]*)` -}}
-{{- $footnoteBacklinksGood :=  `<br /><a href="#fnref:${1}" aria-labelledby="bl1-${1} bl2-${1}"${2}><span id="bl1-${1}">Back</span><span id="bl2-${1}" hidden=""> to reference ${1}</span>` -}}
+<!--
+	Give footnote backlinks accessible names.
+	The backlinks should be located *outside* the footnote paragraphs.
+-->
+{{- $footnoteBacklinksBad  :=  ` ?<a href="#fnref:([0-9]*)" class="footnote-backref"(.*role="doc-backlink"(?:[^>]*)?)>([^<]*)</a></p>` -}}
+{{- $footnoteBacklinksGood :=  `</p><a href="#fnref:${1}" aria-labelledby="bl1-${1} bl2-${1}"${2}><span id="bl1-${1}">Back</span><span id="bl2-${1}" hidden=""> to reference ${1}</span></a>` -}}
 
 <!--
 	If two backlinks exist, give them different names.
 	I currently don't have any triple backlinks; if I ever do, I'll implement this properly with a loop.
 -->
-{{- $repeatedFootnoteBacklinksBad  :=  `<a href="#fnref([0-9]):([0-9]*)"(.*role="doc-backlink"(?:[^>]*)?)>([^<]*)` -}}
-{{- $repeatedFootnoteBacklinksGood :=  `<br /><a href="#fnref${1}:${2}" aria-labelledby="bl1-${2}-2 bl2-${2}-2"${3}><span id="bl1-${2}-2">Back</span><span id="bl2-${2}-2" hidden=""> to reference ${2}, instance 2</span>` -}}
+{{- $repeatedFootnoteBacklinksBad  :=  ` ?<a href="#fnref([0-9]):([0-9]*)"(.*role="doc-backlink"(?:[^>]*)?)>([^<]*)<a></p>` -}}
+		{{- $repeatedFootnoteBacklinksGood :=  `</p><a href="#fnref${1}:${2}" aria-labelledby="bl1-${2}-2 bl2-${2}-2"${3}><span id="bl1-${2}-2">Back</span><span id="bl2-${2}-2" hidden=""> to reference ${2}, instance 2</span></a>` -}}
 
 <!--Make endnotes focusable by ATs. Necessary for VoiceOver compatibility.-->
 {{- $endNotesNotFocusable := `<li id="fn:([0-9]*)">` -}}