From 3cda34976fb776ab78cc4ac5725a569d59391900 Mon Sep 17 00:00:00 2001
From: loikein <wanleiqiong@gmail.com>
Date: Tue, 18 Apr 2023 00:29:12 +0100
Subject: [PATCH] refine figure

---
 assets/scss/components/code-highlight.scss |  4 +-
 assets/scss/vendor/tufte.scss              |  5 +-
 layouts/shortcodes/figure.html             | 70 ++++++++++++----------
 layouts/shortcodes/marginnote.html         |  6 +-
 layouts/shortcodes/sidenote.html           |  8 +--
 5 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/assets/scss/components/code-highlight.scss b/assets/scss/components/code-highlight.scss
index f223756..9225bc8 100644
--- a/assets/scss/components/code-highlight.scss
+++ b/assets/scss/components/code-highlight.scss
@@ -29,6 +29,8 @@ $ht-code-border-radius: .4em;
 
         &::before{
             content: "> ";
+            // font-family: "Noto Emoji";
+            font-family: inherit;
             position: absolute;
             left: 0;
             color: #111;
@@ -65,7 +67,7 @@ $ht-code-border-radius: .4em;
 
 
 @media screen and (max-width: 760px) {
-    .highlight .chroma {
+    .highlight {
         width: 90%;
     }
 }
diff --git a/assets/scss/vendor/tufte.scss b/assets/scss/vendor/tufte.scss
index 8aebf71..8f281e4 100644
--- a/assets/scss/vendor/tufte.scss
+++ b/assets/scss/vendor/tufte.scss
@@ -310,13 +310,12 @@ div.table-wrapper {
 }
 
 @media screen and (max-width: 760px) {
+    h2,
+    h3,
     p,
     footer {
         width: 90%;
     }
-    pre.code {
-        width: 87.5%;
-    }
     ul {
         width: 85%;
     }
diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html
index 097f5a9..5b058ef 100644
--- a/layouts/shortcodes/figure.html
+++ b/layouts/shortcodes/figure.html
@@ -1,47 +1,57 @@
+{{ $alt := .Get "alt" | default "Image" }}
 {{ $type := .Get "type" | default "normal" }}
 
-<!-- begin figure tag -->
-{{ if not (eq $type "margin") }}
-  {{ if eq $type "full" }}
-    <figure class="fullwidth">
-  {{ else }}
-    <figure {{ with .Get "class" }} class="{{ . }}"{{ end }}>
-  {{ end }}
-{{ end }}
+<!-- get a default label just in case -->
+{{- $label := printf "%#v" (add .Ordinal 1) | printf "%s%s" "marginfig-" | printf "%s" -}}
+{{- if .Get "label" -}}
+{{- $label = .Get "label" -}}
+{{- end -}}
 
-<!-- begin inner elements -->
-{{ if eq $type "full" }}
+<!-- begin figure tag -->
+{{- if not (eq $type "margin") -}}
+  {{ if eq $type "full" }}<!-- full -->
+    <figure class="fullwidth">
+  {{ else }}<!-- normal -->
+    <figure {{ with .Get "class" }}class="{{ . }}"{{ end }}>
+  {{ end }}
+{{- end -}}
+
+<!-- begin child elements -->
+{{- if eq $type "full" -}}<!-- child for full -->
   {{ with .Get "link" }}<a href="{{ . }}">{{ end }}
-  <img src="{{ .Get "src" }}" {{ with .Get "alt"}}alt="{{ . }}"{{ end }}>
+  <img src="{{ .Get "src" }}" alt="{{ $alt }}">
   {{ if .Get "link" }}</a>{{ end }}
   <figcaption>
-{{ else }}{{/* margin or normal */}}
-  <label for="{{ .Get "label" }}" class="margin-toggle marginnote-ind">{{ .Site.Params.marginNoteInd }}</label>
-  <input type="checkbox" id="{{ .Get "label" }}" class="margin-toggle"/>
-  <span class="marginnote">
-  {{ if eq $type "margin" }}
+{{- else -}}<!--  child for margin or normal (begin) -->
+
+  {{- if or (or (.Get "caption") (.Get "attr")) (eq $type "margin") -}}<!-- begin marginnote -->
+    <label for="{{ $label }}" class="margin-toggle marginnote-ind">{{ .Site.Params.marginNoteInd }}</label>
+    <input type="checkbox" id="{{ $label }}" class="margin-toggle"/>
+    <span class="marginnote">
+  {{- end -}}
+
+  {{- if eq $type "margin" -}}<!-- margin image inside marginnote -->
     {{ with .Get "link" }}<a href="{{ . }}">{{ end }}
-    <img src="{{ .Get "src" }}" {{ with .Get "alt"}}alt="{{ . }}"{{ end }}>
+    <img src="{{ .Get "src" }}" alt="{{ $alt }}">
     {{ if .Get "link" }}</a>{{ end }}
-  {{ end }}
-{{ end }}
+  {{- end -}}
 
-{{ with .Get "title"}}<strong>{{ . }} </strong>{{ end}}
-{{ with .Get "caption"}}{{ . }}{{ end }}
-{{ with .Get "attrlink"}}<a href="{{ .}}">{{ end }}
-{{ with .Get "attr" }}{{ . }}{{ end }}
-{{ if .Get "attrlink" }}</a>{{ end }}
+{{- end -}}<!--  child for margin or normal (end) -->
 
-<!-- end inner elements -->
-{{ if eq $type "full" }}
+{{ with .Get "title"}}<strong>{{ . | markdownify }}. </strong>{{ end}}
+{{ with .Get "caption"}}{{ . | markdownify }}{{ end }}
+{{ with .Get "attr" }}{{ . | markdownify }}.{{ end }}
+
+<!-- end child elements -->
+{{ if eq $type "full" }}<!-- end full -->
   </figcaption>
-{{ else }}
-  </span>
+{{ else }}<!--  end margin or normal -->
+  {{- if or (or (.Get "caption") (.Get "attr")) (eq $type "margin") -}}</span>{{- end -}}<!-- end marginnote -->
 {{ end }}
 
-{{ if ( eq $type "normal" ) }}
+{{ if (eq $type "normal") }}
   {{ with .Get "link" }}<a href="{{ . }}">{{ end }}
-  <img src="{{ .Get "src" }}" {{ with .Get "alt"}}alt="{{ . }}"{{ end }}>
+  <img src="{{ .Get "src" }}" alt="{{ $alt }}">
   {{ if .Get "link" }}</a>{{ end }}
 {{ end }}
 
diff --git a/layouts/shortcodes/marginnote.html b/layouts/shortcodes/marginnote.html
index fb0e15f..97baf92 100644
--- a/layouts/shortcodes/marginnote.html
+++ b/layouts/shortcodes/marginnote.html
@@ -1,7 +1,7 @@
-{{- $marginnoteDomIdSuffix := (add .Ordinal 1) -}}
+{{- $label := (add .Ordinal 1) -}}
 {{- $ind := .Get "ind" | default .Site.Params.marginNoteInd -}}
-<label for="marginnote-{{ $marginnoteDomIdSuffix }}" class="margin-toggle marginnote-ind">{{ $ind }}</label>
-<input type="checkbox" id="marginnote-{{ $marginnoteDomIdSuffix }}" class="margin-toggle"/>
+<label for="marginnote-{{ $label }}" class="margin-toggle marginnote-ind">{{ $ind }}</label>
+<input type="checkbox" id="marginnote-{{ $label }}" class="margin-toggle"/>
 <span class="marginnote">
 {{ .Inner | markdownify}}
 </span>
diff --git a/layouts/shortcodes/sidenote.html b/layouts/shortcodes/sidenote.html
index d769229..c74d462 100644
--- a/layouts/shortcodes/sidenote.html
+++ b/layouts/shortcodes/sidenote.html
@@ -3,9 +3,9 @@
 {{- else -}}
 {{- $.Page.Scratch.Set "sidenoteCounter" 1 -}}
 {{- end -}}
-{{- $sidenoteDomIdSuffix := $.Page.Scratch.Get "sidenoteCounter" -}}
-<label for="sidenote-{{ $sidenoteDomIdSuffix }}" class="margin-toggle sidenote-number">({{ $sidenoteDomIdSuffix }})</label>
-<input type="checkbox" id="sidenote-{{ $sidenoteDomIdSuffix }}" class="margin-toggle"/>
+{{- $label := $.Page.Scratch.Get "sidenoteCounter" -}}
+<label for="sidenote-{{ $label }}" class="margin-toggle sidenote-number">({{ $label }})</label>
+<input type="checkbox" id="sidenote-{{ $label }}" class="margin-toggle"/>
 <span class="sidenote">
-<span class="sidenote-number">({{ $sidenoteDomIdSuffix }})</span>{{ .Inner | markdownify }}
+<span class="sidenote-number">({{ $label }})</span>{{ .Inner | markdownify }}
 </span>