From 9b72edcd9cce10d6064e4e8b2f61b7db2966515d Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Tue, 25 Oct 2022 20:14:13 +0000
Subject: [PATCH] Merge branch 'hugo' of https://github.com/jackyzha0/quartz into hugo
---
layouts/partials/textprocessing.html | 61 ++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/layouts/partials/textprocessing.html b/layouts/partials/textprocessing.html
index ad76d04..6776fa5 100644
--- a/layouts/partials/textprocessing.html
+++ b/layouts/partials/textprocessing.html
@@ -3,14 +3,14 @@
{{ $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}}
{{/* Wikilinks */}}
-{{$wikilinks := $raw | findRE "!?\\[\\[\\S[^\\[\\]\\|]*(?:\\|[^\\[\\]]*)?\\S\\]\\]" }}
+{{$wikilinks := $content | findRE "!?\\[\\[\\S[^\\[\\]\\|]*(?:\\|[^\\[\\]]*)?\\S\\]\\]" }}
{{$codefences := $raw | findRE "\\x60[^\\x60\\n]+\\x60"}}
{{$codeblocks := $raw | findRE "\\x60{3}[^\\x60]+\\x60{3}"}}
{{$code := union $codefences $codeblocks}}
@@ -26,22 +26,28 @@
{{if (hasPrefix . "!")}}
{{$inner := . | strings.TrimPrefix "![[" | strings.TrimSuffix "]]" }}
{{$split := split $inner "|"}}
- {{$path := index $split 0}}
- {{$reference := split $path "#"}}
- {{$title := index $reference 0}}
- {{$display := default $title (index $split 1)}}
- {{$img := printf "<img src=\"%s\" title=\"%s\">" $path $display}}
+ {{$path := index $split 0 | relURL}}
+ {{$width := index $split 1}}
+ {{$img := printf "<img src=\"%s\" width=\"%s\" />" $path (default "auto" $width)}}
{{$content = replace $content . $img}}
{{else}}
+ <!-- remove link delimiters -->
{{$inner := . | strings.TrimPrefix "[[" | strings.TrimSuffix "]]" }}
+ <!-- split from alias -->
{{$split := split $inner "|"}}
+ <!-- separate link path -->
{{$path := index $split 0}}
{{$reference := split $path "#"}}
+ <!-- path with heading link (i.e. $block) removed -->
{{$title := index $reference 0}}
+ <!-- heading link -->
{{$block := default "" (index $reference 1)}}
- {{$block = strings.TrimRight "/" (cond (eq $block "") $block (printf "#%s" $block))}}
+ {{$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}}
@@ -53,4 +59,41 @@
{{end}}
{{end}}
{{end}}
+
+{{/* Add jumpable anchors */}}
+{{ $content = $content | replaceRE "(<h[1-9] id=\"([^\"]+)\">)(.+)(</h[1-9]>)" `<a href="#${2}">${1}<span class="hanchor" ariaLabel="Anchor"># </span>${3}${4}</a>` }}
+
+{{/* Callouts */}}
+{{if $.Site.Data.config.enableCallouts}}
+ {{ $content = $content | replaceRE "<blockquote>" "<blockquote class=callout>" }}
+ {{ $blockquoteclasses := findRE `\[!.+\]` $content }}
+ {{ $blockquoteclasses1 := findRE "<blockquote.*?>(.|\n)*?</blockquote>" $content }}
+ {{ $blockquotetags := findRE `blockquote class=callout` $content }}
+ {{ $counter := 0 }}
+ {{ $counter1 := 0 }}
+ {{ $finder := index $blockquoteclasses1 $counter }}
+ {{range $blockquotetags}}
+ {{ $finder = index $blockquoteclasses1 $counter }}
+ {{ if (in $finder "[!") }}
+ {{ $inner := index $blockquoteclasses $counter1 }}
+ {{ if (in $finder "]-") }}
+ {{ $inner = $inner | replaceRE `\[!([a-zA-Z]+)\]` `callout-collapsible callout-collapsed ${1}`}}
+ {{ else if (in $finder "]+") }}
+ {{ $inner = $inner | replaceRE `\[!([a-zA-Z]+)\]` `callout-collapsible ${1}`}}
+ {{ else}}
+ {{ $inner = $inner | replaceRE `\[!([a-zA-Z]+)\]` `${1}` }}
+ {{ end }}
+ {{ $inner = printf "blockquote class=\"%s-callout\"" $inner | lower}}
+ {{ $content = replace $content . $inner 1}}
+ {{ $counter1 = add $counter1 1 }}
+ {{ else }}
+ {{ $inner := print "blockquote" }}
+ {{ $content = replace $content . $inner 1}}
+ {{ end }}
+ {{ $counter = add $counter 1 }}
+ {{end}}
+ {{ $content = $content | replaceRE `\[![a-zA-Z]+\][-\+]?` "" }}
+ {{ $content = $content | replaceRE "blockquote class=callout" "blockquote" }}
+{{end}}
+
{{ $content | safeHTML }}
--
Gitblit v1.10.0