From 261956c1457a273a6a0d6d87cb12b268e7d358ff Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Sun, 21 Feb 2021 13:24:55 +0100
Subject: [PATCH] fix: use custom render hook templates

---
 layouts/_default/_markup/render-heading.html | 18 ++++++++++++++++++
 layouts/_default/_markup/render-image.html   |  1 +
 layouts/_default/_markup/render-link.html    |  2 ++
 layouts/partials/content.html                |  9 +--------
 layouts/shortcodes/img.html                  |  2 +-
 src/sass/_base.scss                          | 14 ++++++++++++++
 6 files changed, 37 insertions(+), 9 deletions(-)
 create mode 100644 layouts/_default/_markup/render-heading.html
 create mode 100644 layouts/_default/_markup/render-image.html
 create mode 100644 layouts/_default/_markup/render-link.html

diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_default/_markup/render-heading.html
new file mode 100644
index 0000000..7351dcd
--- /dev/null
+++ b/layouts/_default/_markup/render-heading.html
@@ -0,0 +1,18 @@
+{{ $showAnchor := (and (default true .Page.Params.GeekblogAnchor) (default true .Page.Site.Params.GeekblogAnchor)) }}
+
+{{ if $showAnchor }}
+<div class="gblog-post__anchorwrap">
+    <h{{ .Level }} id="{{ .Anchor | safeURL }}">
+        {{ .Text | safeHTML }}
+        <a data-clipboard-text="{{ .Page.Permalink }}#{{ .Anchor | safeURL }}" class="gblog-post__anchor gblog-post__anchor--right clip" aria-label="Anchor {{ .Text | safeHTML }}" href="#{{ .Anchor | safeURL }}">
+            <svg class="icon link"><use xlink:href="#link"></use></svg>
+        </a>
+    </h{{ .Level }}>
+</div>
+{{ else }}
+<div class="gblog-post__anchorwrap">
+    <h{{ .Level }} id="{{ .Anchor | safeURL }}">
+        {{ .Text | safeHTML }}
+    </h{{ .Level }}>
+</div>
+{{ end }}
diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
new file mode 100644
index 0000000..8a4d187
--- /dev/null
+++ b/layouts/_default/_markup/render-image.html
@@ -0,0 +1 @@
+<img src="{{ .Destination | safeURL | relURL }}" alt="{{ .Text }}" {{ with .Title}} title="{{ . }}"{{ end }} />
\ No newline at end of file
diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html
new file mode 100644
index 0000000..6234c49
--- /dev/null
+++ b/layouts/_default/_markup/render-link.html
@@ -0,0 +1,2 @@
+{{ $raw := or (hasPrefix .Text "<img") (hasPrefix .Text "<figure") }}
+<a class="gblog-post__link{{ if $raw }}--raw{{ end }}" href="{{ .Destination | safeURL | relURL }}"{{ with .Title }} title="{{ . }}"{{ end }}>{{ .Text | safeHTML }}</a>
diff --git a/layouts/partials/content.html b/layouts/partials/content.html
index d33bc1f..c35e992 100644
--- a/layouts/partials/content.html
+++ b/layouts/partials/content.html
@@ -1,8 +1 @@
-{{ $showAnchor := (and (default true .Page.Params.GeekblogAnchor) (default true .Site.Params.GeekblogAnchor)) }}
-
-{{ $.Scratch.Set "content" (.Content | replaceRE `<nav id="TableOfContents">\s*<ul>\s*<li>\s*<ul>` `<nav id="TableOfContents"><ul>` | replaceRE `</ul>\s*</li>\s*</ul>\s*</nav>` `</ul></nav>` | safeHTML) }}
-{{ if $showAnchor }}
-    {{ $.Scratch.Set "content" ($.Scratch.Get "content" | replaceRE "(<h[2-9] id=\"([^\"]+)\"[^>]*>)(.*?)(</h[2-9]+>)" (printf `<div class="gblog-post__anchorwrap">%s%s<a data-clipboard-text="%s" class="gblog-post__anchor gblog-post__anchor--right clip" aria-label="Anchor %s" href="#%s"><svg class="icon link"><use xlink:href="#link"></use></svg></a>%s</div>` `${1}` `${3}` (absURL (printf "%s#%s" .Permalink `${2}`)) `${3}` `${2}` `${4}`) | safeHTML) }}
-{{ end }}
-
-{{ $.Scratch.Get "content" }}
+{{ .Content | replaceRE `<nav id="TableOfContents">\s*<ul>\s*<li>\s*<ul>` `<nav id="TableOfContents"><ul>` | replaceRE `</ul>\s*</li>\s*</ul>\s*</nav>` `</ul></nav>` | safeHTML }}
diff --git a/layouts/shortcodes/img.html b/layouts/shortcodes/img.html
index 3c12733..b6b0a12 100644
--- a/layouts/shortcodes/img.html
+++ b/layouts/shortcodes/img.html
@@ -14,7 +14,7 @@
 
 <div class="flex justify-center">
 <figure class="gblog-post__figure">
-    <a href="{{ .RelPermalink }}">
+    <a class="gblog-post__link--raw" href="{{ .RelPermalink }}">
         <img
             {{ with $customSize }}
             src="{{ index $size $customSize }}" alt="{{ $caption }}"
diff --git a/src/sass/_base.scss b/src/sass/_base.scss
index bce324c..7995818 100644
--- a/src/sass/_base.scss
+++ b/src/sass/_base.scss
@@ -329,6 +329,20 @@ img {
       font-size: 1.2em;
     }
   }
+
+  &__link--raw {
+    text-decoration: none;
+    color: $body-font-color;
+
+    &:hover {
+      background: none;
+      color: $body-font-color;
+    }
+
+    &:visited {
+      color: $body-font-color;
+    }
+  }
 }
 
 .gblog-footer {