From b0e15e0cbc445e12e3aabfe90ee2fc6bf2c33782 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 02 May 2022 16:19:26 +0000
Subject: [PATCH] Merge pull request #118 from aidenybai/add-router
---
layouts/partials/textprocessing.html | 67 +++++++++++++++++++++------------
1 files changed, 42 insertions(+), 25 deletions(-)
diff --git a/layouts/partials/textprocessing.html b/layouts/partials/textprocessing.html
index dfa0b6e..8e8c999 100644
--- a/layouts/partials/textprocessing.html
+++ b/layouts/partials/textprocessing.html
@@ -1,4 +1,5 @@
{{ $content := .Content }}
+{{ $raw := .RawContent }}
{{ $page := .Page }}
{{/* Escape slashes for Latex to fix line breaks */}}
@@ -10,34 +11,50 @@
{{/* Wikilinks */}}
{{$wikilinks := $content | findRE "!?\\[\\[\\S[^\\[\\]\\|]*(?:\\|[^\\[\\]]*)?\\S\\]\\]" }}
+{{$codefences := $raw | findRE "\\x60[^\\x60\\n]+\\x60"}}
+{{$codeblocks := $raw | findRE "\\x60{3}[^\\x60]+\\x60{3}"}}
+{{$code := union $codefences $codeblocks}}
{{range $wikilinks}}
- {{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}}
- {{$content = replace $content . $img}}
- {{else}}
- {{$inner := . | strings.TrimPrefix "[[" | strings.TrimSuffix "]]" }}
- {{$split := split $inner "|"}}
- {{$path := index $split 0}}
- {{$reference := split $path "#"}}
- {{$title := index $reference 0}}
- {{$block := default "" (index $reference 1)}}
- {{$block = strings.TrimRight "/" (cond (eq $block "") $block (printf "#%s" $block))}}
- {{$href := strings.TrimRight "/" ($page.GetPage $title).RelPermalink}}
- {{$display := default $title (index $split 1)}}
- {{if not $href}}
- {{$link := printf "<a class=\"internal-link broken\">%s</a>" $display}}
- {{$content = replace $content . $link}}
+ {{$cur := .}}
+ {{$incode := false}}
+ {{range $code}}
+ {{if (in . $cur)}}
+ {{$incode = true}}
+ {{end}}
+ {{end}}
+ {{if not $incode}}
+ {{if (hasPrefix . "!")}}
+ {{$inner := . | strings.TrimPrefix "![[" | strings.TrimSuffix "]]" }}
+ {{$split := split $inner "|"}}
+ {{$path := index $split 0 | relURL}}
+ {{$reference := split $path "#"}}
+ {{$title := index $reference 0}}
+ {{$display := default $title (index $split 1)}}
+ {{$img := printf "<img src=\"%s\" title=\"%s\">" $path $display}}
+ {{$content = replace $content . $img}}
{{else}}
- {{$fullhref := printf "%s%s" $href $block }}
- {{$link := printf "<a href=\"%s\" rel=\"noopener\" class=\"internal-link\" data-src=\"%s\">%s</a>" $fullhref $href $display}}
- {{$content = replace $content . $link}}
+ {{$inner := . | strings.TrimPrefix "[[" | strings.TrimSuffix "]]" }}
+ {{$split := split $inner "|"}}
+ {{$path := index $split 0}}
+ {{$reference := split $path "#"}}
+ {{$title := index $reference 0}}
+ {{$block := default "" (index $reference 1)}}
+ {{$block = strings.TrimRight "/" (cond (eq $block "") $block (printf "#%s" $block))}}
+ {{$href := strings.TrimRight "/" ($page.GetPage $title).RelPermalink}}
+ {{$display := default $title (index $split 1)}}
+ {{if not $href}}
+ {{$link := printf "<a class=\"internal-link broken\">%s</a>" $display}}
+ {{$content = replace $content . $link}}
+ {{else}}
+ {{$fullhref := printf "%s%s" $href $block }}
+ {{$link := printf "<a href=\"%s\" rel=\"noopener\" class=\"internal-link\" data-src=\"%s\">%s</a>" $fullhref $href $display}}
+ {{$content = replace $content . $link}}
+ {{end}}
{{end}}
{{end}}
{{end}}
+
+{{/* Add copyable anchors */}}
+{{ $content = $content | replaceRE "(<h[1-9] id=\"([^\"]+)\">)(.+)(</h[1-9]>)" `<a href="#${2}">${1}<span class="hanchor" ariaLabel="Anchor"># </span>${3}${4}</a>` }}
+
{{ $content | safeHTML }}
--
Gitblit v1.10.0