From 93610e232b366c6f6cb9695d4755fa578dc28aa0 Mon Sep 17 00:00:00 2001
From: Adam Brangenberg <adambrangenberg@proton.me>
Date: Wed, 01 Feb 2023 20:34:18 +0000
Subject: [PATCH] feat: Remove leading slash of folders in graph view (#282)
---
layouts/partials/textprocessing.html | 123 +++++++++++++++++++++++++++++++----------
1 files changed, 93 insertions(+), 30 deletions(-)
diff --git a/layouts/partials/textprocessing.html b/layouts/partials/textprocessing.html
index 7891ea2..c918247 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}}
@@ -14,6 +14,7 @@
{{$codefences := $raw | findRE "\\x60[^\\x60\\n]+\\x60"}}
{{$codeblocks := $raw | findRE "\\x60{3}[^\\x60]+\\x60{3}"}}
{{$code := union $codefences $codeblocks}}
+
{{range $wikilinks}}
{{$cur := .}}
{{$incode := false}}
@@ -22,41 +23,95 @@
{{$incode = true}}
{{end}}
{{end}}
+
{{if not $incode}}
- {{if (hasPrefix . "!")}}
- {{$inner := . | strings.TrimPrefix "![[" | strings.TrimSuffix "]]" }}
- {{$split := split $inner "|"}}
- {{$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}}
- <!-- ADDED LINE TO REMOVE SUBFOLDER FROM TITLE: -->
- {{$title := index (last 1 (split $title "/")) 0}}
- <!-- heading link -->
+
+ <!-- remove link delimiters -->
+ {{$inner := . | strings.TrimPrefix "!" | strings.TrimPrefix "[[" | strings.TrimSuffix "]]" }}
+ <!-- split from alias -->
+ {{$split := split $inner "|"}}
+ <!-- separate link path -->
+ {{$path := index $split 0}}
+
+ {{$reference := split $path "#"}}
+ <!-- path with heading link removed -->
+ {{$title := index $reference 0}}
+ <!-- $display is hyperlink display text -->
+ <!-- use alias, else title -->
+ {{$display := default $title (index $split 1)}}
+ <!-- remove subfolder from title -->
+ {{$display := index (last 1 (split $display "/")) 0}}
+
+ <!-- attempt to get title -->
+ {{$searchtitle := $title }}
+ {{$curpage := $page.GetPage $searchtitle }}
+ <!-- attempt to search md file instead -->
+ {{ if (eq $curpage.String "nopPage") }}
+ {{$searchtitle = (add $title ".md") }}
+ {{$curpage = $page.GetPage $searchtitle }}
+ {{ end }}
+ <!-- attempt to reverse typographer behaviour -->
+ {{ if (eq $curpage.String "nopPage") }}
+ {{$searchtitle = (replace $searchtitle "&" "&") }}
+ {{$searchtitle = (replace $searchtitle """ "\"") }}
+ {{$searchtitle = (replace $searchtitle "”" "\"") }}
+ {{$searchtitle = (replace $searchtitle "“" "\"") }}
+ {{$searchtitle = (replace $searchtitle "’" "'") }}
+ {{$searchtitle = (replace $searchtitle "‘" "'") }}
+ {{$curpage = $page.GetPage $searchtitle }}
+ {{ end }}
+ {{$relpath := relURL $path}}
+
+ <!-- If path to Hugo page -->
+ {{if not (eq $curpage.String "nopPage") }}
{{$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)}}
- {{if not $href}}
- {{$link := printf "<a class=\"internal-link broken\">%s</a>" $display}}
- {{$content = replace $content . $link}}
+ {{$href := strings.TrimRight "/" $curpage.RelPermalink}}
+ {{$link := printf "<a href=\"%s%s\" rel=\"noopener\" class=\"internal-link\" data-src=\"%s\">%s</a>" $href $block $href $display}}
+ {{$content = replace $content . $link}}
+ <!-- If path to existing file -->
+ {{else if fileExists $relpath}}
+ {{$splitpath := split $relpath "/"}}
+ {{$dirname := first (sub (len $splitpath) 1) $splitpath | path.Join | urlize}}
+ {{$basename := index (last 1 $splitpath) 0}}
+ {{$href := printf "/%s/%s" $dirname $basename}}
+ <!-- Embedded? -->
+ {{if (hasPrefix . "!")}}
+ {{ $embed_ext := lower (path.Ext $href) }}
+ <!-- Image -->
+ {{if in ".png .jpg .jpeg .gif .bmp .svg" $embed_ext }}
+ {{$width := default "auto" (index $split 1) }}
+ {{$link := printf "<img src=\"%s\" width=\"%s\" />" $href $width}}
+ {{$content = replace $content . $link}}
+ <!-- Video -->
+ {{else if in ".mp4 .webm .ogv .mov .mkv" $embed_ext}}
+ {{$link := printf "<video src=\"%s\" style=\"width: -webkit-fill-available;\" controls></video>" $href}}
+ {{$content = replace $content . $link}}
+ <!-- Audio -->
+ {{else if in ".mp3 .webm .wav .m4a .ogg .3gp .flac" $embed_ext}}
+ {{$link := printf "<audio src=\"%s\" controls></audio>" $href}}
+ {{$content = replace $content . $link}}
+ <!-- PDF -->
+ {{else if in ".pdf" $embed_ext }}
+ {{$src_link := printf "<a href=\"%s\" rel=\"noopener\" class=\"internal-link\">[source]</a>" $href}}
+ {{$iframe_link := printf "<iframe src=\"%s\" style=\"height: -webkit-fill-available; width: -webkit-fill-available;\"></iframe>" $href}}
+ {{$link := printf "%s<br>%s" $src_link $iframe_link}}
+ {{$content = replace $content . $link}}
+ <!-- other -->
+ {{else}}
+ {{$link := printf "<a href=\"%s\" rel=\"noopener\" class=\"internal-link\">%s</a>" $href $href}}
+ {{$content = replace $content . $link}}
+ {{end}}
{{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}}
+ {{$link := printf "<a href=\"%s\" rel=\"noopener\" class=\"internal-link\">%s</a>" $href $display}}
{{$content = replace $content . $link}}
{{end}}
+ <!-- Broken path -->
+ {{else}}
+ {{$link := printf "<a class=\"internal-link broken\">%s</a>" $display}}
+ {{$content = replace $content . $link}}
{{end}}
+
{{end}}
{{end}}
@@ -94,6 +149,14 @@
{{end}}
{{ $content = $content | replaceRE `\[![a-zA-Z]+\][-\+]?` "" }}
{{ $content = $content | replaceRE "blockquote class=callout" "blockquote" }}
+ {{ $content = $content | replaceRE `(?s)(<blockquote class="\S+-callout">.*?)<br>(.*?<\/blockquote)` `${1}</p><p>${2}` }}
+{{end}}
+
+{{/* Make ==text== into <mark>text</mark> */}}
+{{$mark := findRE "==([^=\n]+)==" $content}}
+{{range $mark}}
+ {{$fixed := printf "<mark>%s</mark>" (replace . "==" "")}}
+ {{$content = replace $content . $fixed}}
{{end}}
{{ $content | safeHTML }}
--
Gitblit v1.10.0