From e6c7a4e1e2e3b0437b5dbbbeb7abc4e05622db16 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 12 Sep 2022 01:03:55 +0000
Subject: [PATCH] fix: latex rendering bugs + patch for #195
---
layouts/partials/head.html | 80 ++++++++++++++++++++++------------------
1 files changed, 44 insertions(+), 36 deletions(-)
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index acc2efd..59b228a 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -1,18 +1,21 @@
+<!-- set data/config yaml file based on website language -->
+{{ $config := cond (eq $.Site.Language.Lang "en") "config" (printf "config.%s" $.Site.Language.Lang) }}
+{{ $data := index $.Site.Data $config }}
<head>
<!-- Meta tags -->
<meta charset="UTF-8" />
<meta
name="description"
- content="{{if .IsHome}}{{$.Site.Data.config.description}}{{else}}{{.Summary}}{{end}}"
+ content="{{if .IsHome}}{{$data.description | default $.Site.Data.config.description}}{{else}}{{.Summary}}{{end}}"
/>
<title>
- {{ if .Title }}{{ .Title }}{{ else }}{{ $.Site.Data.config.page_title }}{{
+ {{ if .Title }}{{ .Title }}{{ else }}{{ $data.page_title | default $.Site.Data.config.page_title }}{{
end }}
</title>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<!-- HTML Favicon -->
- {{ $favicon := $.Site.Data.config.favicon | default (slice (dict "rel" "shortcut icon" "type" "image/png" "href" "icon.png")) }}
+ {{ $favicon := $data.favicon | default $.Site.Data.config.favicon | default (slice (dict "rel" "shortcut icon" "type" "image/png" "href" "icon.png")) }}
{{ $type := (printf "%T" $favicon) }}
{{ if eq $type "string" }}
{{ $favicon | safeHTML }}
@@ -29,7 +32,7 @@
{{$scss := . | resources.ToCSS (dict "outputStyle" "compressed") }}
{{$css = $css | append $scss}}
{{end}}
- {{if $.Site.Data.config.enableCallouts}}
+ {{if $data.enableCallouts | default $.Site.Data.config.enableCallouts}}
{{$scss := resources.Get "styles/_callouts.scss" | resources.ToCSS (dict "outputStyle" "compressed") }}
{{$css = $css | append $scss}}
{{end}}
@@ -55,17 +58,17 @@
<script src="{{$popover.Permalink}}"></script>
<!-- Optional scripts -->
- {{ if $.Site.Data.config.enableCodeBlockTitle }}
+ {{ if $data.enableCodeBlockTitle | default $.Site.Data.config.enableCallouts }}
{{ $codeTitle := resources.Get "js/code-title.js" | resources.Fingerprint "md5" | resources.Minify }}
<script src="{{$codeTitle.Permalink}}"></script>
{{end}}
- {{ if $.Site.Data.config.enableCodeBlockCopy }}
+ {{ if $data.enableCodeBlockCopy | default $.Site.Data.config.enableCodeBlockCopy }}
{{ $clipboard := resources.Get "js/clipboard.js" | resources.Fingerprint "md5" | resources.Minify }}
<script src="{{$clipboard.Permalink}}"></script>
{{ end }}
- {{ if $.Site.Data.config.enableCallouts }}
+ {{ if $data.enableCallouts | default $.Site.Data.config.enableCallouts }}
{{ $callouts := resources.Get "js/callouts.js" | resources.Fingerprint "md5" | resources.Minify }}
<script src="{{$callouts.Permalink}}"></script>
{{ end }}
@@ -101,66 +104,71 @@
const pathWindow = window.location.pathname;
const isHome = pathBase == pathWindow;
- {{if $.Site.Data.config.enableCodeBlockCopy -}}
+ {{if $data.enableCodeBlockCopy | default $.Site.Data.config.enableCodeBlockCopy -}}
addCopyButtons();
{{ end }}
- {{if $.Site.Data.config.enableSPA -}}
+ {{if $data.enableSPA | default $.Site.Data.config.enableSPA -}}
addTitleToCodeBlocks();
{{ end }}
- {{if $.Site.Data.config.enableCallouts -}}
+ {{if $data.enableCallouts | default $.Site.Data.config.enableCallouts -}}
addCollapsibleCallouts();
{{ end }}
-
- {{if $.Site.Data.config.enableFooter}}
- const container = document.getElementById("graph-container")
- // retry if the graph is not ready
- if (!container) return requestAnimationFrame(render)
- // clear the graph in case there is anything within it
- container.textContent = ""
-
- const drawGlobal = isHome && {{$.Site.Data.graphConfig.enableGlobalGraph}};
- drawGraph(
- {{strings.TrimRight "/" .Site.BaseURL}},
- drawGlobal,
- {{$.Site.Data.graphConfig.paths}},
- drawGlobal ? {{$.Site.Data.graphConfig.globalGraph}} : {{$.Site.Data.graphConfig.localGraph}}
- );
-
- {{end}}
-
-
- {{if $.Site.Data.config.enableLinkPreview}}
+
+ {{if $data.enableLinkPreview | default $.Site.Data.config.enableLinkPreview}}
initPopover(
{{strings.TrimRight "/" .Site.BaseURL }},
- {{$.Site.Data.config.enableContextualBacklinks}},
- {{$.Site.Data.config.enableLatex}}
+ {{$data.enableContextualBacklinks | default $.Site.Data.config.enableContextualBacklinks}},
+ {{$data.enableLatex | default $.Site.Data.config.enableLatex}}
)
{{end}}
+
+ {{if $data.enableFooter | default $.Site.Data.config.enableFooter}}
+ const footer = document.getElementById("footer")
+ if (footer) {
+ const container = document.getElementById("graph-container")
+ // retry if the graph is not ready
+ if (!container) return requestAnimationFrame(render)
+ // clear the graph in case there is anything within it
+ container.textContent = ""
+
+ const drawGlobal = isHome && {{$.Site.Data.graphConfig.enableGlobalGraph}};
+ drawGraph(
+ {{strings.TrimRight "/" .Site.BaseURL}},
+ drawGlobal,
+ {{$.Site.Data.graphConfig.paths}},
+ drawGlobal ? {{$.Site.Data.graphConfig.globalGraph}} : {{$.Site.Data.graphConfig.localGraph}}
+ );
+
+ }
+ {{end}}
}
const init = (doc = document) => {
// NOTE: everything within this callback will be executed for initial page navigation. This is a good place to put JavaScript that only replaces DOM nodes.
- {{if $.Site.Data.config.enableCodeBlockCopy -}}
+ {{if $data.enableCodeBlockCopy | default $.Site.Data.config.enableCodeBlockCopy -}}
addCopyButtons();
{{ end }}
- {{if $.Site.Data.config.enableCodeBlockTitle -}}
+ {{if $data.enableCodeBlockTitle | default $.Site.Data.config.enableCodeBlockTitle -}}
addTitleToCodeBlocks();
{{- end -}}
- {{if $.Site.Data.config.enableLatex}}
+ {{if $data.enableLatex | default $.Site.Data.config.enableLatex}}
renderMathInElement(doc.body, {
delimiters: [
{left: '$$', right: '$$', display: true},
{left: '$', right: '$', display: false},
],
+ macros: {
+ '’': "'"
+ },
throwOnError : false
});
{{end}}
};
</script>
- {{if $.Site.Data.config.enableSPA}}
+ {{if $data.enableSPA | default $.Site.Data.config.enableSPA}}
{{ $router := resources.Get "js/router.js" | resources.Fingerprint "md5" |
resources.Minify }}
<script type="module">
--
Gitblit v1.10.0