From 8ddc2ec879b6ae2233c29561912bc300a78a17e2 Mon Sep 17 00:00:00 2001
From: Rohan Kumar <seirdy@seirdy.one>
Date: Fri, 22 Apr 2022 11:48:22 -0700
Subject: [PATCH] Make transcript the description of the image.

---
 content/posts/website-best-practices.md       | 50 ++++++++++---------
 layouts/shortcodes/picture.html               |  5 ++
 .../transcribed-image-figcaption.html         |  3 --
 .../shortcodes/transcribed-image-figure.html  |  2 +-
 .../transcribed-image-transcript.html         |  6 +--
 5 files changed, 36 insertions(+), 30 deletions(-)
 delete mode 100644 layouts/shortcodes/transcribed-image-figcaption.html

diff --git a/content/posts/website-best-practices.md b/content/posts/website-best-practices.md
index 2e86e8e..111d747 100644
--- a/content/posts/website-best-practices.md
+++ b/content/posts/website-best-practices.md
@@ -321,16 +321,16 @@ Another common offender is infinite-scrolling. In addition to requiring JavaScri
 
 #### Infinite scrolling {#infinite-scrolling}
 
-{{< transcribed-image-figure id="xkcd-1309" >}}
+{{< transcribed-image-figure id="xkcd-1309" has-transcript="true" >}}
 
 {{< picture name="infinite_scrolling" alt="Comic: if books had infinite-scroll, we'd have to turn pages carefully or risk losing the page." >}}
 
-{{< transcribed-image-figcaption >}}
+<figcaption>
 
-Infinite-scrolling means that accidentally navigating to a link will result in losing your place. Source: [xkcd](https://xkcd.com/1309/).
-
-{{< /transcribed-image-figcaption >}} {{< /transcribed-image-figure >}}
+Infinite-scroll means that accidental navigation to a link results in losing your place. Source: [xkcd](https://xkcd.com/1309/).
 
+</figcaption>
+{{< /transcribed-image-figure >}}
 {{< transcribed-image-transcript >}}
 
 Megan stands at a desk, reading a book, touching it very gingerly. Cueball is standing behind her.
@@ -565,29 +565,33 @@ An image, alt-text, figure caption, and transcript combine to form a complex rel
   <figure aria-describedby="transcript-xkcd-1309">
     <img
       src="SRC"
-      alt="Comic: if books had infinite-scroll, we'd have to
-           turn pages carefully or risk losing the page.">
+      alt="Comic: if books had infinite-scroll,
+           we'd have to turn pages carefully or
+           risk losing the page.">
     <figcaption>
-      Infinite-scrolling means that accidentally navigating
-      to a link will result in losing your place.
+      Infinite-scroll means that accidental navigation
+      to a link results in losing your place.
       See <a href=#transcript-xkcd-1309>transcript</a>.
     </figcaption>
   </figure>
-  <details id="transcript-xkcd-1309">
+  <details>
     <summary>Toggle transcript</summary>
-    <p>
-      Megan stands at a desk, reading a book, touching
-      it very gingerly. Cueball is standing behind her.
-    </p>
-    <dl>
-      <dt>Cueball</dt>
-      <dd>Why are you turning the pages like that?</dd>
-      <dt>Megan</dt>
-      <dd>If I touch the wrong thing, I’ll lose my place and
-          have to start over.</dd>
-      <dt>Caption below the panel</dt>
-      <dd>If books worked like infinite-scrolling webpages</dd>
-    </dl>
+    <div id="transcript-xkcd-1309">
+      <p>
+        Megan stands at a desk, reading a book, touching
+        it very gingerly. Cueball is standing behind her.
+      </p>
+      <dl>
+        <dt>Cueball</dt>
+        <dd>Why are you turning the pages like that?</dd>
+        <dt>Megan</dt>
+        <dd>If I touch the wrong thing, I’ll lose my
+            place and have to start over.</dd>
+        <dt>Caption below the panel</dt>
+        <dd>If books worked like infinite-scrolling
+            webpages</dd>
+      </dl>
+    </div>
   </details>
 </article>
 ```
diff --git a/layouts/shortcodes/picture.html b/layouts/shortcodes/picture.html
index 2ae7e66..5d36afe 100644
--- a/layouts/shortcodes/picture.html
+++ b/layouts/shortcodes/picture.html
@@ -82,5 +82,10 @@
 	<img
 		width="{{ $img_width }}" height="{{ $img_height }}"
 		src="{{ $light_png.RelPermalink }}" alt='{{ .Get "alt" }}'
+		{{ with .Parent -}}
+		{{- with .Get "id" -}}
+		aria-describedby="transcript-{{ . }}"	
+		{{- end -}}
+		{{- end }}
 		decoding="async">
 </picture>{{- /* Strip trailing newline: https://github.com/gohugoio/hugo/issues/1753 */ -}}
diff --git a/layouts/shortcodes/transcribed-image-figcaption.html b/layouts/shortcodes/transcribed-image-figcaption.html
deleted file mode 100644
index e1767e4..0000000
--- a/layouts/shortcodes/transcribed-image-figcaption.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<figcaption>
-	{{ .Inner | markdownify | safeHTML }} See <a href="#transcript-{{ .Parent.Get "id" }}">transcript</a>.
-</figcaption>
diff --git a/layouts/shortcodes/transcribed-image-figure.html b/layouts/shortcodes/transcribed-image-figure.html
index 053befb..ef0249e 100644
--- a/layouts/shortcodes/transcribed-image-figure.html
+++ b/layouts/shortcodes/transcribed-image-figure.html
@@ -1,5 +1,5 @@
 {{ with .Parent -}}
-<figure aria-describedby="transcript-{{ .Get "id" }}">
+<figure>
 {{- end }}
 {{ .Inner | markdownify | safeHTML }}
 </figure>
diff --git a/layouts/shortcodes/transcribed-image-transcript.html b/layouts/shortcodes/transcribed-image-transcript.html
index 75eab7d..c1e1e51 100644
--- a/layouts/shortcodes/transcribed-image-transcript.html
+++ b/layouts/shortcodes/transcribed-image-transcript.html
@@ -1,9 +1,9 @@
-<details
+<details>
+<summary>Toggle transcript</summary>
+<div itemprop="embeddedTextCaption"
 {{ with .Parent -}}
 	id="transcript-{{ .Get "id" }}"
 {{- end -}}>
-<summary>Toggle transcript</summary>
-<div itemprop="embeddedTextCaption">
 {{ .Inner | markdownify | safeHTML }}
 </div>
 </details>