summaryrefslogtreecommitdiff
path: root/layouts/_default
diff options
context:
space:
mode:
authorNicholas Johnson <nick@nicholasjohnson.ch>2023-08-25 00:00:00 +0000
committerNicholas Johnson <nick@nicholasjohnson.ch>2023-08-25 00:00:00 +0000
commit632a5422b665a2bf91fa9baeb709a9eb1b5f9773eeec9c2f3a9d22876e53f8be (patch)
tree460032f496120fa11fa141da70066708140b624d28d4b1d33e3f6500ca56cedf /layouts/_default
parentdd70d2fa0b4647771713853577ed175e21dca92e55dd31deee41d93628f920b5 (diff)
downloadhugo-theme-journal-632a5422b665a2bf91fa9baeb709a9eb1b5f9773eeec9c2f3a9d22876e53f8be.tar.gz
hugo-theme-journal-632a5422b665a2bf91fa9baeb709a9eb1b5f9773eeec9c2f3a9d22876e53f8be.zip
Prefer right-aligned whitespace elimination
Diffstat (limited to 'layouts/_default')
-rw-r--r--layouts/_default/baseof.gmi8
-rw-r--r--layouts/_default/baseof.html8
-rw-r--r--layouts/_default/single.gmi116
3 files changed, 66 insertions, 66 deletions
diff --git a/layouts/_default/baseof.gmi b/layouts/_default/baseof.gmi
index a583bfe..8beabc1 100644
--- a/layouts/_default/baseof.gmi
+++ b/layouts/_default/baseof.gmi
@@ -1,7 +1,7 @@
{{ partial "header.gmi" . }}
-{{ block "main" . }}{{ end }}
+{{ block "main" . }}{{ end -}}
-{{- if $.Site.Copyright }}
-{{ partial "footer.gmi" . }}
-{{- end -}} \ No newline at end of file
+{{ if $.Site.Copyright }}
+{{ partial "footer.gmi" . -}}
+{{ end }} \ No newline at end of file
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index f2c9c61..1e32ff9 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -3,9 +3,9 @@
{{ partial "head.html" . }}
<body class="body">
{{ partial "header.html" . }}
- {{ block "main" . }}{{ end }}
- {{- if $.Site.Copyright }}
- {{ partial "footer.html" . }}
- {{- end }}
+ {{ block "main" . }}{{ end -}}
+ {{ if $.Site.Copyright }}
+ {{ partial "footer.html" . -}}
+ {{ end }}
</body>
</html> \ No newline at end of file
diff --git a/layouts/_default/single.gmi b/layouts/_default/single.gmi
index 3f31051..ab94304 100644
--- a/layouts/_default/single.gmi
+++ b/layouts/_default/single.gmi
@@ -7,82 +7,82 @@
{{ end -}}
# {{ .Name | safeHTML }}
-{{ $content := .RawContent }}
-{{- $scratch := newScratch }}
+{{ $content := .RawContent -}}
+{{ $scratch := newScratch -}}
-{{- /* split text into chunks, with each chunk containing 3 parts: above, within, and below preformatted text */}}
-{{- /* the regex matching below the preformatted text matches exactly once in the entire text */}}
-{{- $chunks := findRESubmatch `(?sm)(?:(.+?)(^\x60{3}[^\x60].*?^\x60{3}$))|(.+$)` $content }}
+{{/* split text into chunks, with each chunk containing 3 parts: above, within, and below preformatted text */ -}}
+{{/* the regex matching below the preformatted text matches exactly once in the entire text */ -}}
+{{ $chunks := findRESubmatch `(?sm)(?:(.+?)(^\x60{3}[^\x60].*?^\x60{3}$))|(.+$)` $content -}}
-{{- $ref_index := 0 }}
+{{ $ref_index := 0 -}}
-{{- range $chunks }}
- {{- $above_pre := index . 1 }}
- {{- $pre := index . 2 }}
- {{- $below_pre := index . 3 }}
+{{ range $chunks -}}
+ {{ $above_pre := index . 1 -}}
+ {{ $pre := index . 2 -}}
+ {{ $below_pre := index . 3 -}}
- {{- /* mux regex matches above and below preformatted text for rendering (the matches are mutually exclusive) */}}
- {{- $rendered_text := print $above_pre $below_pre }}
+ {{/* mux regex matches above and below preformatted text for rendering (the matches are mutually exclusive) */ -}}
+ {{ $rendered_text := print $above_pre $below_pre -}}
- {{- if ($.Page.Params.makerefs | default true) }}
+ {{ if ($.Page.Params.makerefs | default true) -}}
- {{- /* find all the links within a chunk */}}
- {{- $chunk_refs := findRESubmatch `!?\[\s*(.+?)\s*\]\(\s*(.+?)(?:\s+"(.+?)")?\s*\)` $rendered_text }}
+ {{/* find all the links within a chunk */ -}}
+ {{ $chunk_refs := findRESubmatch `!?\[\s*(.+?)\s*\]\(\s*(.+?)(?:\s+"(.+?)")?\s*\)` $rendered_text -}}
- {{- $scratch.Add "refs" $chunk_refs }}
- {{- range $chunk_refs }}
- {{- $ref_index = add $ref_index 1 }}
- {{- $ref_text := index . 1 }}
+ {{ $scratch.Add "refs" $chunk_refs -}}
+ {{ range $chunk_refs -}}
+ {{ $ref_index = add $ref_index 1 -}}
+ {{ $ref_text := index . 1 -}}
- {{- /*- replace link with reference numbers enclosed in brackets */}}
- {{- $rendered_text = replace $rendered_text (index . 0) (print $ref_text "[" $ref_index "]") 1 }}
+ {{/*- replace link with reference numbers enclosed in brackets */ -}}
+ {{ $rendered_text = replace $rendered_text (index . 0) (print $ref_text "[" $ref_index "]") 1 -}}
- {{- end }}
- {{- else }}
+ {{ end -}}
+ {{ else -}}
- {{- /* render all links directly */}}
- {{- $rendered_text = $rendered_text | replaceRE `(?m)^!?\[\s*(.+?)\s*\]\(\s*(.+?)(?:\s+"(.+?)")?\s*\)$` (print "=> $2 " $emoji "$1") }}
+ {{/* render all links directly */ -}}
+ {{ $rendered_text = $rendered_text | replaceRE `(?m)^!?\[\s*(.+?)\s*\]\(\s*(.+?)(?:\s+"(.+?)")?\s*\)$` (print "=> $2 " $emoji "$1") -}}
- {{- end }}
+ {{ end -}}
- {{- /* trim extra heading symbols */}}
- {{- $rendered_text = $rendered_text | replaceRE `(?m)^####{1,3}` "###" }}
+ {{/* trim extra heading symbols */ -}}
+ {{ $rendered_text = $rendered_text | replaceRE `(?m)^####{1,3}` "###" -}}
- {{- /* remove bold and italics asterisk symbols */}}
- {{- $rendered_text = $rendered_text | replaceRE `\*{3}(\S|\S.*?\S)\*{3}` "$1" }}
- {{- $rendered_text = $rendered_text | replaceRE `\*{2}(\S|\S.*?\S)\*{2}` "$1" }}
- {{- $rendered_text = $rendered_text | replaceRE `\*{1}(\S|\S.*?\S)\*{1}` "$1" }}
+ {{/* remove bold and italics asterisk symbols */ -}}
+ {{ $rendered_text = $rendered_text | replaceRE `\*{3}(\S|\S.*?\S)\*{3}` "$1" -}}
+ {{ $rendered_text = $rendered_text | replaceRE `\*{2}(\S|\S.*?\S)\*{2}` "$1" -}}
+ {{ $rendered_text = $rendered_text | replaceRE `\*{1}(\S|\S.*?\S)\*{1}` "$1" -}}
- {{- /* convert alternative unordered lists symbols to asterisks */}}
- {{- $rendered_text = $rendered_text | replaceRE `(?m)^[-+] ` "* " }}
+ {{/* convert alternative unordered lists symbols to asterisks */ -}}
+ {{ $rendered_text = $rendered_text | replaceRE `(?m)^[-+] ` "* " -}}
- {{- $rendered_text = $rendered_text | emojify }}
+ {{ $rendered_text = $rendered_text | emojify -}}
- {{- /* demux regex matches above and below preformatted text */}}
- {{- if $above_pre }}
- {{- $rendered_text | safeHTML }}
- {{- $pre | safeHTML }}
- {{- else }}
- {{- $pre | safeHTML }}
- {{- $rendered_text | safeHTML }}
- {{- end }}
+ {{/* demux regex matches above and below preformatted text */ -}}
+ {{ if $above_pre -}}
+ {{ $rendered_text | safeHTML -}}
+ {{ $pre | safeHTML -}}
+ {{ else -}}
+ {{ $pre | safeHTML -}}
+ {{ $rendered_text | safeHTML -}}
+ {{ end -}}
-{{- end }}
+{{ end -}}
-{{- $refs := $scratch.Get "refs" }}
-{{- if and (.Page.Params.makerefs | default true) $refs }}
-{{- $ref_index := 0 }}
+{{ $refs := $scratch.Get "refs" -}}
+{{ if and (.Page.Params.makerefs | default true) $refs -}}
+{{ $ref_index := 0 }}
-## {{ i18n "refs" }}
- {{- range $refs }}
- {{- $ref_index = add $ref_index 1 }}
- {{- $ref_text := index . 1 }}
- {{- $ref_link := index . 2 }}
- {{- $ref_title := index . 3 }}
+## {{ i18n "refs" -}}
+ {{ range $refs -}}
+ {{ $ref_index = add $ref_index 1 -}}
+ {{ $ref_text := index . 1 -}}
+ {{ $ref_link := index . 2 -}}
+ {{ $ref_title := index . 3 -}}
-{{- /* render referenced links */}}
-{{ print "=> " $ref_link (emojify " :link: ") $ref_index ": " (cond (ne (len $ref_title) 0) $ref_title $ref_text) | safeHTML }}
+{{/* render referenced links */ -}}
+{{ print "=> " $ref_link (emojify " :link: ") $ref_index ": " (cond (ne (len $ref_title) 0) $ref_title $ref_text) | safeHTML -}}
- {{- end }}
-{{- end }}
-{{- end }} \ No newline at end of file
+ {{ end -}}
+{{ end -}}
+{{ end }} \ No newline at end of file