From e6c7a4e1e2e3b0437b5dbbbeb7abc4e05622db16 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 11 Sep 2022 18:03:55 -0700
Subject: [PATCH] fix: latex rendering bugs + patch for #195

---
 assets/js/popover.js                        | 2 --
 content/_index.md                           | 2 +-
 content/notes/CJK + Latex Support (测试).md | 2 +-
 layouts/partials/head.html                  | 3 +++
 layouts/partials/katex.html                 | 1 +
 layouts/partials/textprocessing.html        | 8 ++++----
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/assets/js/popover.js b/assets/js/popover.js
index c7b1165..3d7a30c 100644
--- a/assets/js/popover.js
+++ b/assets/js/popover.js
@@ -47,8 +47,6 @@ function initPopover(baseURL, useContextualBacklinks, renderLatex) {
               delimiters: [
                 { left: '$$', right: '$$', display: false },
                 { left: '$', right: '$', display: false },
-                { left: '\\(', right: '\\)', display: false },
-                { left: '\\[', right: '\\]', display: false }
               ],
               throwOnError: false
             })
diff --git a/content/_index.md b/content/_index.md
index 27a2036..5b43f8e 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -4,7 +4,7 @@ title: 🪴 Quartz 3.3
 
 Host your second brain and [digital garden](https://jzhao.xyz/posts/networked-thought) for free. Quartz features
 
-1. Extremely fast natural-language [[notes/search|search]]
+1. Extremely fast natural-language [[notes/search]]
 2. Customizable and hackable design based on [Hugo](https://gohugo.io/)
 3. Automatically generated backlinks, link previews, and local graph
 4. Built-in [[notes/CJK + Latex Support (测试) | CJK + Latex Support]] and [[notes/callouts | Admonition-style callouts]]
diff --git a/content/notes/CJK + Latex Support (测试).md b/content/notes/CJK + Latex Support (测试).md
index d6e4ae9..c2d6f84 100644
--- a/content/notes/CJK + Latex Support (测试).md	
+++ b/content/notes/CJK + Latex Support (测试).md	
@@ -37,4 +37,4 @@ a & b & c
 $$
 
 ## RTL
-More information on configuring RTL languages like Arabic in the [config](notes/config.md) page.
+More information on configuring RTL languages like Arabic in the [config](notes/config.md) page.
\ No newline at end of file
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 076e484..59b228a 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -160,6 +160,9 @@
           {left: '$$', right: '$$', display: true},
           {left: '$', right: '$', display: false},
         ],
+        macros: {
+          '’': "'"
+        },
         throwOnError : false
       });
       {{end}}
diff --git a/layouts/partials/katex.html b/layouts/partials/katex.html
index 756ef77..df53045 100644
--- a/layouts/partials/katex.html
+++ b/layouts/partials/katex.html
@@ -2,4 +2,5 @@
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.15.1/dist/katex.min.css" integrity="sha384-R4558gYOUz8mP9YWpZJjofhk+zx0AS11p36HnD2ZKj/6JR5z27gSSULCNHIRReVs" crossorigin="anonymous">
 <script defer src="https://cdn.jsdelivr.net/npm/katex@0.15.1/dist/katex.min.js" integrity="sha384-z1fJDqw8ZApjGO3/unPWUPsIymfsJmyrDVWC8Tv/a1HeOtGmkwNd/7xUS0Xcnvsx" crossorigin="anonymous"></script>
 <script defer src="https://cdn.jsdelivr.net/npm/katex@0.15.1/dist/contrib/auto-render.min.js" integrity="sha384-+XBljXPPiv+OzfbB3cVmLHf4hdUFHlWNZN5spNQ7rmHTXpd7WvJum6fIACpNNfIR" crossorigin="anonymous"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/katex@0.16.2/dist/contrib/copy-tex.min.js" integrity="sha384-ww/583aHhxWkz5DEVn6OKtNiIaLi2iBRNZXfJRiY1Ai7tnJ9UXpEsyvOITVpTl4A" crossorigin="anonymous"></script>
 {{end}}
diff --git a/layouts/partials/textprocessing.html b/layouts/partials/textprocessing.html
index 7891ea2..6776fa5 100644
--- a/layouts/partials/textprocessing.html
+++ b/layouts/partials/textprocessing.html
@@ -3,9 +3,9 @@
 {{ $page := .Page }}
 
 {{/* Escape slashes for Latex to fix line breaks */}}
-{{$latex := findRE "\\$\\$([^\\$]+)\\$\\$" $content}}
+{{$latex := findRE "(?:\\${2}([^\\$]+)\\${2})|(?:\\$([^\\$]*)\\$)" $content}}
 {{range $latex}}
-  {{$fixed := replaceRE "\\\\(?: +|\\n)" "\\\\" .}}
+  {{$fixed := replaceRE "\\\\(?: +|\\n)" "\\\\ " .}}
   {{$content = replace $content . $fixed}}
 {{end}}
 
@@ -40,14 +40,14 @@
       {{$reference := split $path "#"}}
       <!-- path with heading link (i.e. $block) removed -->
       {{$title := index $reference 0}}
-      <!-- ADDED LINE TO REMOVE SUBFOLDER FROM TITLE: -->
-      {{$title := index (last 1 (split $title "/")) 0}}
       <!-- heading link -->
       {{$block := default "" (index $reference 1)}}
       {{$block = strings.TrimRight "/" (cond (eq $block "") $block (printf "#%s" $block)) | urlize | lower}}
       {{$href := strings.TrimRight "/" ($page.GetPage $title).RelPermalink}}
       <!-- if alias given, use alias, else title -->
       {{$display := default $title (index $split 1)}}
+      <!-- ADDED LINE TO REMOVE SUBFOLDER FROM TITLE: -->
+      {{$display := index (last 1 (split $display "/")) 0}}
       {{if not $href}}
         {{$link := printf "<a class=\"internal-link broken\">%s</a>" $display}}
         {{$content = replace $content . $link}}