From 450fe6b28f14605260d3cbbc5b28957996868774 Mon Sep 17 00:00:00 2001
From: Thedro Neely <thedroneely@gmail.com>
Date: Sat, 19 Mar 2022 03:28:50 -0400
Subject: generators/layouts/shortcodes: Don't mix HTML and markdown

Freedom. Use Hugo's newer markdownify feature and convert all posts
to pure markdown. Render hooks will propagate if .RenderString
function gains the ability to render shortcodes in the future.
https://gohugo.io/functions/renderstring/
---
 generators/hugo/themes/tdro/layouts/_default/archive.html          | 3 ++-
 generators/hugo/themes/tdro/layouts/_default/list.html             | 2 +-
 generators/hugo/themes/tdro/layouts/_default/single.html           | 2 +-
 generators/hugo/themes/tdro/layouts/_default/subsection.html       | 2 +-
 generators/hugo/themes/tdro/layouts/_default/summary.html          | 2 +-
 generators/hugo/themes/tdro/layouts/_default/taxonomy.html         | 5 ++++-
 generators/hugo/themes/tdro/layouts/_default/taxonomy_archive.html | 7 +++++--
 generators/hugo/themes/tdro/layouts/abstracts/summary.html         | 2 +-
 generators/hugo/themes/tdro/layouts/shortcodes/footer.html         | 2 +-
 generators/hugo/themes/tdro/layouts/shortcodes/image.html          | 2 +-
 generators/hugo/themes/tdro/layouts/shortcodes/image.rss.xml       | 2 +-
 generators/hugo/themes/tdro/layouts/shortcodes/marginimage.html    | 6 +++---
 generators/hugo/themes/tdro/layouts/shortcodes/marginimage.rss.xml | 2 +-
 generators/hugo/themes/tdro/layouts/shortcodes/marginnote.html     | 4 ++--
 generators/hugo/themes/tdro/layouts/shortcodes/marginnote.rss.xml  | 2 +-
 generators/hugo/themes/tdro/layouts/shortcodes/sideimage.html      | 6 +++---
 generators/hugo/themes/tdro/layouts/shortcodes/sideimage.rss.xml   | 2 +-
 generators/hugo/themes/tdro/layouts/shortcodes/sidenote.html       | 4 ++--
 generators/hugo/themes/tdro/layouts/shortcodes/sidenote.rss.xml    | 2 +-
 generators/hugo/themes/tdro/layouts/shortcodes/video.html          | 2 +-
 20 files changed, 34 insertions(+), 27 deletions(-)

(limited to 'generators')

diff --git a/generators/hugo/themes/tdro/layouts/_default/archive.html b/generators/hugo/themes/tdro/layouts/_default/archive.html
index 784d130..2356340 100644
--- a/generators/hugo/themes/tdro/layouts/_default/archive.html
+++ b/generators/hugo/themes/tdro/layouts/_default/archive.html
@@ -18,7 +18,8 @@
                 {{ if (ne .Params.hidden true) }}
                 <li>
                   <a title="{{ .Title }}" class="is-block" href="{{ .RelPermalink }}">
-                    <span class="article__list__date monospace has-text-grey-dark">{{ .Date.Format "02 Jan" }}</span>{{ .Title }}
+                    <span class="article__list__date monospace has-text-grey-dark">{{ .Date.Format "02 Jan" }}</span>
+                    {{- .Title | markdownify -}}
                   </a>
                 </li>
                 {{ end }}
diff --git a/generators/hugo/themes/tdro/layouts/_default/list.html b/generators/hugo/themes/tdro/layouts/_default/list.html
index abf948e..6605db7 100644
--- a/generators/hugo/themes/tdro/layouts/_default/list.html
+++ b/generators/hugo/themes/tdro/layouts/_default/list.html
@@ -4,7 +4,7 @@
 		<div class="columns is-centered">
 			<div class="column is-7">
 				<article class="content">
-				<h2 class="title">{{ .Title }}</h2>
+				<h2 class="title">{{ .Title | markdownify }}</h2>
 				{{ range .Paginator.Pages }}
 				{{ .Render "summary" }}
 				{{ end }}
diff --git a/generators/hugo/themes/tdro/layouts/_default/single.html b/generators/hugo/themes/tdro/layouts/_default/single.html
index b0917f3..572b90a 100644
--- a/generators/hugo/themes/tdro/layouts/_default/single.html
+++ b/generators/hugo/themes/tdro/layouts/_default/single.html
@@ -4,7 +4,7 @@
     <div class="columns is-centered">
       <div class="column is-7">
         <article class="content document">
-          <h1 class="title is-2 serif">{{ .Title }}</h1>
+          <h1 class="title is-2 serif">{{ .Title | markdownify }}</h1>
           {{ if .Params.toc }}
           <div class="tableofcontents marginnote rightnote is-inline">
             <div class="is-size-6 is-uppercase has-text-weight-bold has-spacing-widest has-margin-bottom-sm">Table of Contents</div>
diff --git a/generators/hugo/themes/tdro/layouts/_default/subsection.html b/generators/hugo/themes/tdro/layouts/_default/subsection.html
index ae7d359..8d2cf1c 100644
--- a/generators/hugo/themes/tdro/layouts/_default/subsection.html
+++ b/generators/hugo/themes/tdro/layouts/_default/subsection.html
@@ -4,7 +4,7 @@
     <div class="columns is-centered">
       <div class="column is-7">
         <article class="content document">
-          <h1 class="title is-3">{{ .Title }}</h1>
+          <h1 class="title is-3">{{ .Title | markdownify }}</h1>
           {{- partial "page-status.html" . -}}
           {{- .Content | safeHTML }}
         </article>
diff --git a/generators/hugo/themes/tdro/layouts/_default/summary.html b/generators/hugo/themes/tdro/layouts/_default/summary.html
index 6b7260a..f09f5ad 100644
--- a/generators/hugo/themes/tdro/layouts/_default/summary.html
+++ b/generators/hugo/themes/tdro/layouts/_default/summary.html
@@ -9,7 +9,7 @@
       <header class="post-header">
 
       <h2 class="article__title title is-5 has-text-weight-bold">
-        <a href="{{ .Permalink }}" title="{{ .Title }}">{{ .Title }}</a>
+        <a href="{{ .Permalink }}" title="{{ .Title }}">{{ .Title | markdownify }}</a>
       </h2>
 
       <p class="article__date subtitle is-6">
diff --git a/generators/hugo/themes/tdro/layouts/_default/taxonomy.html b/generators/hugo/themes/tdro/layouts/_default/taxonomy.html
index bbfc41a..a0090e1 100644
--- a/generators/hugo/themes/tdro/layouts/_default/taxonomy.html
+++ b/generators/hugo/themes/tdro/layouts/_default/taxonomy.html
@@ -43,7 +43,10 @@
                   {{ range $article.Pages }}
                   <li>
                     <a title="{{ .Title }}" class="is-block" href="{{ .RelPermalink }}">
-                      <span class="article__list__date monospace has-text-grey-dark">{{ .Date.Format "02 Jan 2006" }}</span>{{ .Title }}
+                      <span class="article__list__date monospace has-text-grey-dark">
+                        {{- .Date.Format "02 Jan 2006" -}}
+                      </span>
+                      {{- .Title | markdownify -}}
                     </a>
                   </li>
                   {{ end }}
diff --git a/generators/hugo/themes/tdro/layouts/_default/taxonomy_archive.html b/generators/hugo/themes/tdro/layouts/_default/taxonomy_archive.html
index f198385..1925575 100644
--- a/generators/hugo/themes/tdro/layouts/_default/taxonomy_archive.html
+++ b/generators/hugo/themes/tdro/layouts/_default/taxonomy_archive.html
@@ -5,7 +5,7 @@
       <div class="column is-7">
         {{ $title := .Title }}
         <article class="content">
-          <h1 class="article__list smallcaps title">{{ .Title | title }}</h1>
+          <h1 class="article__list smallcaps title">{{ .Title | markdownify }}</h1>
           {{ range $taxonomy := .Site.Taxonomies }}
             {{ $title := .Title }}
             {{ range $tag, $article := $taxonomy }}
@@ -15,7 +15,10 @@
                   {{ range $article.Pages }}
                     <li>
                       <a title="{{ .Title }}" class="is-block" href="{{ .RelPermalink }}">
-                        <span class="article__list__date monospace has-text-grey-dark">{{ .Date.Format "02 Jan 2006" }}</span>{{ .Title }}
+                        <span class="article__list__date monospace has-text-grey-dark">
+                          {{- .Date.Format "02 Jan 2006" -}}
+                        </span>
+                        {{- .Title | markdownify -}}
                       </a>
                     </li>
                   {{ end }}
diff --git a/generators/hugo/themes/tdro/layouts/abstracts/summary.html b/generators/hugo/themes/tdro/layouts/abstracts/summary.html
index a65beb9..e81dae3 100644
--- a/generators/hugo/themes/tdro/layouts/abstracts/summary.html
+++ b/generators/hugo/themes/tdro/layouts/abstracts/summary.html
@@ -2,7 +2,7 @@
   <article class="abstract tile is-child">
     {{ partial "thumbnail-image.html" . }}
     <h2 class="article__title title is-5 has-text-weight-bold">
-      <a href="{{ .Permalink }}" title="{{ .Title }}">{{ .Title }}</a>
+      <a href="{{ .Permalink }}" title="{{ .Title }}">{{ .Title | markdownify }}</a>
     </h2>
     <p class="article__date subtitle is-6">
     {{ partial "page-date.html" . }} <br> {{ partial "read-time.html" .}}
diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/footer.html b/generators/hugo/themes/tdro/layouts/shortcodes/footer.html
index 68486df..63af9fa 100644
--- a/generators/hugo/themes/tdro/layouts/shortcodes/footer.html
+++ b/generators/hugo/themes/tdro/layouts/shortcodes/footer.html
@@ -1 +1 @@
-<span class="serif blockquote-footer has-text-right is-block">{{ .Inner }}</span>
+<span class="serif blockquote-footer has-text-right is-block">{{ .Inner | markdownify }}</span>
diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/image.html b/generators/hugo/themes/tdro/layouts/shortcodes/image.html
index 639e997..31527e2 100644
--- a/generators/hugo/themes/tdro/layouts/shortcodes/image.html
+++ b/generators/hugo/themes/tdro/layouts/shortcodes/image.html
@@ -5,5 +5,5 @@
   <a href="{{ .Get `source` }}" onclick="return false;">
     <img data-image-zoom src="{{ .Get `source` }}" alt="{{ .Get `title` }}" title="{{ .Get `title` }}" width="{{ $image.Width }}" height="{{ $image.Height }}"/>
   </a>
-  <figcaption class="has-text-centered has-text-grey-dark">{{ .Inner }}</figcaption>
+  <figcaption class="has-text-centered has-text-grey-dark">{{ .Inner | markdownify }}</figcaption>
 </figure>
diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/image.rss.xml b/generators/hugo/themes/tdro/layouts/shortcodes/image.rss.xml
index 69a4202..41244e0 100644
--- a/generators/hugo/themes/tdro/layouts/shortcodes/image.rss.xml
+++ b/generators/hugo/themes/tdro/layouts/shortcodes/image.rss.xml
@@ -10,5 +10,5 @@
   <a href="{{ .Get `source` }}">
     <img data-image-zoom src="{{ .Get `source` }}" alt="{{ .Get `title` }}" title="{{ .Get `title` }}" width="{{ $image.Width }}" height="{{ $image.Height }}"/>
   </a>
-  <figcaption class="has-text-centered has-text-grey-dark">{{ .Inner }}</figcaption>
+  <figcaption class="has-text-centered has-text-grey-dark">{{ .Inner | markdownify }}</figcaption>
 </figure>
diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/marginimage.html b/generators/hugo/themes/tdro/layouts/shortcodes/marginimage.html
index b880adb..24a550f 100644
--- a/generators/hugo/themes/tdro/layouts/shortcodes/marginimage.html
+++ b/generators/hugo/themes/tdro/layouts/shortcodes/marginimage.html
@@ -3,12 +3,12 @@
 {{ $image := imageConfig $imageFile }}
 
 <span class="marginnote-container">
-  <label for="{{ $id }}" class="marginnote-toggle marginnote-mark" title="{{ .Inner }}"><span>{{ .Get `mark` }}</span></label>
+  <label for="{{ $id }}" class="marginnote-toggle marginnote-mark" title="{{ .Inner | markdownify }}"><span>{{ .Get `mark` | markdownify }}</span></label>
   <input type="checkbox" id="{{ $id }}" class="marginnote-toggle">
   <span class="sans-serif marginnote sideimage {{ .Get `set` }}note">
     <a href="{{.Get `source`}}" onclick="return false;">
-      <img data-image-zoom src="{{ .Get `source`}}" alt="{{ .Inner }}" title="{{ .Get `title`}}" width="{{ $image.Width }}" height="{{ $image.Height }}"/>
+      <img data-image-zoom src="{{ .Get `source`}}" alt="{{ .Inner | markdownify }}" title="{{ .Get `title`}}" width="{{ $image.Width }}" height="{{ $image.Height }}"/>
     </a>
-    <span class="sideimage-footer is-block has-text-centered has-text-grey-dark"><mark>{{ .Inner }}</mark></span>
+    <span class="sideimage-footer is-block has-text-centered has-text-grey-dark"><mark>{{ .Inner | markdownify }}</mark></span>
   </span>
 </span>
diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/marginimage.rss.xml b/generators/hugo/themes/tdro/layouts/shortcodes/marginimage.rss.xml
index b4020b5..6e25cf8 100644
--- a/generators/hugo/themes/tdro/layouts/shortcodes/marginimage.rss.xml
+++ b/generators/hugo/themes/tdro/layouts/shortcodes/marginimage.rss.xml
@@ -1 +1 @@
-<!-- Hide shortcode {{ .Inner }} for RSS feeds. -->
+<!-- Hide shortcode {{ .Inner | markdownify }} for RSS feeds. -->
diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/marginnote.html b/generators/hugo/themes/tdro/layouts/shortcodes/marginnote.html
index 7718cb3..38ed899 100644
--- a/generators/hugo/themes/tdro/layouts/shortcodes/marginnote.html
+++ b/generators/hugo/themes/tdro/layouts/shortcodes/marginnote.html
@@ -1,9 +1,9 @@
 {{ $id := md5 (printf (.Get `mark`) .Inner) }}
 
 <span class="marginnote-container">
-  <label for="{{ $id }}" class="marginnote-toggle marginnote-mark" title="{{ .Inner }}"><span>{{ .Get `mark` }}</span></label>
+  <label for="{{ $id }}" class="marginnote-toggle marginnote-mark" title="{{ .Inner | markdownify }}"><span>{{ .Get `mark` | markdownify }}</span></label>
   <input type="checkbox" id="{{ $id }}" class="marginnote-toggle">
   <span class="sans-serif marginnote {{ .Get `set` }}note">
-    <mark>{{ .Inner }}</mark>
+    <mark>{{ .Inner | markdownify }}</mark>
   </span>
 </span>
diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/marginnote.rss.xml b/generators/hugo/themes/tdro/layouts/shortcodes/marginnote.rss.xml
index b4020b5..6e25cf8 100644
--- a/generators/hugo/themes/tdro/layouts/shortcodes/marginnote.rss.xml
+++ b/generators/hugo/themes/tdro/layouts/shortcodes/marginnote.rss.xml
@@ -1 +1 @@
-<!-- Hide shortcode {{ .Inner }} for RSS feeds. -->
+<!-- Hide shortcode {{ .Inner | markdownify }} for RSS feeds. -->
diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/sideimage.html b/generators/hugo/themes/tdro/layouts/shortcodes/sideimage.html
index 3e4966c..8a265e8 100644
--- a/generators/hugo/themes/tdro/layouts/shortcodes/sideimage.html
+++ b/generators/hugo/themes/tdro/layouts/shortcodes/sideimage.html
@@ -3,12 +3,12 @@
 {{ $image := imageConfig $imageFile }}
 
 <span class="sidenote-container">
-  <label for="{{ $id }}" class="sidenote-toggle sidenote-mark" title="{{ .Inner }}"><span>{{ .Get `mark` }}</span></label>
+  <label for="{{ $id }}" class="sidenote-toggle sidenote-mark" title="{{ .Inner | markdownify }}"><span>{{ .Get `mark` | markdownify }}</span></label>
   <input type="checkbox" id="{{ $id }}" class="sidenote-toggle">
   <span class="sans-serif sidenote sideimage {{ .Get `set` }}note">
     <a href="{{.Get `source`}}" onclick="return false;">
-      <img data-image-zoom src="{{ .Get `source`}}" alt="{{ .Inner }}" title="{{ .Get `title`}}" width="{{ $image.Width }}" height="{{ $image.Height }}"/>
+      <img data-image-zoom src="{{ .Get `source`}}" alt="{{ .Inner | markdownify }}" title="{{ .Get `title`}}" width="{{ $image.Width }}" height="{{ $image.Height }}"/>
     </a>
-    <span class="sideimage-footer is-block has-text-centered has-text-grey-dark"><mark>{{ .Inner }}</mark></span>
+    <span class="sideimage-footer is-block has-text-centered has-text-grey-dark"><mark>{{ .Inner | markdownify }}</mark></span>
   </span>
 </span>
diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/sideimage.rss.xml b/generators/hugo/themes/tdro/layouts/shortcodes/sideimage.rss.xml
index b4020b5..6e25cf8 100644
--- a/generators/hugo/themes/tdro/layouts/shortcodes/sideimage.rss.xml
+++ b/generators/hugo/themes/tdro/layouts/shortcodes/sideimage.rss.xml
@@ -1 +1 @@
-<!-- Hide shortcode {{ .Inner }} for RSS feeds. -->
+<!-- Hide shortcode {{ .Inner | markdownify }} for RSS feeds. -->
diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/sidenote.html b/generators/hugo/themes/tdro/layouts/shortcodes/sidenote.html
index f4c994c..1f3f765 100644
--- a/generators/hugo/themes/tdro/layouts/shortcodes/sidenote.html
+++ b/generators/hugo/themes/tdro/layouts/shortcodes/sidenote.html
@@ -1,9 +1,9 @@
 {{ $id := md5 (printf (.Get `mark`) .Inner) }}
 
 <span class="sidenote-container">
-  <label for="{{ $id }}" class="sidenote-toggle sidenote-mark" title="{{ .Inner }}"><span>{{ .Get `mark` }}</span></label>
+  <label for="{{ $id }}" class="sidenote-toggle sidenote-mark" title="{{ .Inner | markdownify }}"><span>{{ .Get `mark` | markdownify }}</span></label>
   <input type="checkbox" id="{{ $id }}" class="sidenote-toggle">
   <span class="sans-serif sidenote {{ .Get `set` }}note">
-    <mark>{{ .Inner }}</mark>
+    <mark>{{ .Inner | markdownify }}</mark>
   </span>
 </span>
diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/sidenote.rss.xml b/generators/hugo/themes/tdro/layouts/shortcodes/sidenote.rss.xml
index b4020b5..6e25cf8 100644
--- a/generators/hugo/themes/tdro/layouts/shortcodes/sidenote.rss.xml
+++ b/generators/hugo/themes/tdro/layouts/shortcodes/sidenote.rss.xml
@@ -1 +1 @@
-<!-- Hide shortcode {{ .Inner }} for RSS feeds. -->
+<!-- Hide shortcode {{ .Inner | markdownify }} for RSS feeds. -->
diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/video.html b/generators/hugo/themes/tdro/layouts/shortcodes/video.html
index ea88034..47d0c46 100644
--- a/generators/hugo/themes/tdro/layouts/shortcodes/video.html
+++ b/generators/hugo/themes/tdro/layouts/shortcodes/video.html
@@ -3,5 +3,5 @@
     <source src="{{ .Get `source` }}" type="video/mp4">
     Your browser does not support the video tag.
   </video>
-  <footer class="has-text-centered has-text-grey-dark">{{ .Inner }}</footer>
+  <footer class="has-text-centered has-text-grey-dark">{{ .Inner | markdownify }}</footer>
 </div>
-- 
cgit v1.2.3