Review and update whitespaces in mermaid and KaTeX to improve shortcode nesting

exampleSite/content.en/docs/shortcodes/mermaid.md

@@ -11,8 +11,7 @@ create a `mermaid.json` file in your `assets` folder!
 ## Example
 
 {{% columns %}}
-
-````tpl
+- ````tpl
   ```mermaid
   stateDiagram-v2
       State1: The state with a note
@@ -25,9 +24,7 @@ stateDiagram-v2
   ```
   ````
 
-<--->
-
-```mermaid
+- ```mermaid
   stateDiagram-v2
       State1: The state with a note
       note right of State1
@@ -37,12 +34,10 @@ stateDiagram-v2
       State1 --> State2
       note left of State2 : This is the note to the left.
   ```
-
 {{% /columns %}}
 
 {{% columns %}}
-
-```tpl
+- ```tpl
   {{</* mermaid [class="..."] >}}
   stateDiagram-v2
       State1: The state with a note
@@ -55,9 +50,7 @@ stateDiagram-v2
   {{< /mermaid */>}}
   ```
 
-<--->
-
-{{< mermaid >}}
+- {{< mermaid >}}
   stateDiagram-v2
       State1: The state with a note
       note right of State1
@@ -67,7 +60,6 @@ stateDiagram-v2
       State1 --> State2
       note left of State2 : This is the note to the left.
   {{< /mermaid >}}
-
 {{% /columns %}}
 
 ## Diagrams

layouts/_markup/render-blockquote.html

@@ -1,9 +1,9 @@
-{{- $attributes := .Attributes }}
-{{- $class := printf "book-hint %s" ($.AlertType | lower) }}
-{{- if isset $attributes "class" }}
-  {{ $class = printf "%s %s" $class (index $attributes "class") }}
+{{- $attributes := .Attributes -}}
+{{- $class := printf "book-hint %s" ($.AlertType | lower) -}}
+{{- if isset $attributes "class" -}}
+  {{- $class = printf "%s %s" $class (index $attributes "class") -}}
 {{ end -}}
-{{- $attributes = merge $attributes (dict "class" $class) }}
+{{- $attributes = merge $attributes (dict "class" $class) -}}
 <blockquote {{ range $key, $value := $attributes }}{{printf "%s='%s'" $key $value | safeHTMLAttr}}{{ end }}>
-  {{ .Text }}
+{{ .Text -}}
 </blockquote>

layouts/_markup/render-codeblock-katex.html

@@ -1,13 +1,13 @@
+{{- with .Inner -}}
+<span>\[ {{ .| htmlEscape | safeHTML  }} \]</span>
+{{- end -}}
 {{- if not (.Page.Store.Get "katex") -}}
-<!-- Include katex only first time -->
+  {{- /* Include katex only first time */ -}}
   <link rel="stylesheet" href="{{ "katex/katex.min.css" | relURL }}" />
+  {{- /* remove whitespaces */ -}}
   <script defer src="{{ "katex/katex.min.js" | relURL }}"></script>
-{{ with resources.Get "katex.json" }}
+  {{- with resources.Get "katex.json" | minify -}}
   <script defer src="{{ "katex/auto-render.min.js" | relURL }}" onload="renderMathInElement(document.body, {{ .Content | safeJS }});"></script>
-{{ end }}
+  {{- end -}}
   {{- .Page.Store.Set "katex" true -}}
 {{- end -}}
-
-{{- with .Inner }}
-<span>\[ {{ .| htmlEscape | safeHTML  }} \]</span>
-{{ end -}}

layouts/_markup/render-codeblock-mermaid.html

@@ -1,12 +1,10 @@
-{{ if not (.Page.Store.Get "mermaid") }}
-<!-- Include mermaid only first time -->
+{{- /* remove whitespaces */ -}}
+<pre class="mermaid">{{ .Inner | htmlEscape | safeHTML -}}</pre>
+{{- if not (.Page.Store.Get "mermaid") -}}
+  {{- /* Include mermaid only first time */ -}}
   <script src="{{ "mermaid.min.js" | relURL }}"></script>
-{{ with resources.Get "mermaid.json" }}
+  {{- with resources.Get "mermaid.json" | minify -}}
     <script>mermaid.initialize({{ .Content | safeJS }})</script>
-{{ end }}
-{{ .Page.Store.Set "mermaid" true }}
-{{ end }}
-
-<pre class="mermaid">
-  {{- .Inner -}}
-</pre>
+  {{- end -}}
+  {{- .Page.Store.Set "mermaid" true -}}
+{{- end -}}

layouts/_partials/docs/languages.html

@@ -1,4 +1,3 @@
-<!-- Merge home and current page translations -->
 {{ $bookTranslatedOnly := default false .Site.Params.BookTranslatedOnly }}
 {{ $translations := dict }}
 {{ if (eq $bookTranslatedOnly false ) }}

layouts/_shortcodes/asciinema.html

@@ -1,6 +1,5 @@
 {{- if not (.Page.Store.Get "asciinema") -}}
-  <!-- Include asciinema player only first time -->
-  {{- /* remove whitespaces */ -}}
+  {{- /* Include asciinema player only first time */ -}}
   <link rel="stylesheet" href="{{ "asciinema/asciinema-player.css" | relURL }}" />
   {{- /* remove whitespaces */ -}}
   <script defer src="{{ "asciinema/asciinema-player.min.js" | relURL }}"></script>

layouts/_shortcodes/katex.html

@@ -1,21 +1,17 @@
+{{- if .Inner -}}
+  {{- if .Get "display" -}}
+  <div>{{ printf "\\[ %s \\]" .Inner }}</div>
+  {{- else -}}
+  <span>{{ printf "\\( %s \\)" .Inner }}</span>
+  {{- end -}}
+{{- end -}}
 {{- if not (.Page.Store.Get "katex") -}}
-  <!-- Include katex only first time -->
-  {{- /* remove whitespaces */ -}}
+  {{- /* Include katex only first time */ -}}
   <link rel="stylesheet" href="{{ "katex/katex.min.css" | relURL }}" />
   {{- /* remove whitespaces */ -}}
   <script defer src="{{ "katex/katex.min.js" | relURL }}"></script>
-  {{- with resources.Get "katex.json" -}}
-  <script defer src="{{ "katex/auto-render.min.js" | relURL }}" onload="renderMathInElement(document.body, {{ . | minify }});"></script>
+  {{- with resources.Get "katex.json" | minify -}}
+    <script defer src="{{ "katex/auto-render.min.js" | relURL }}" onload="renderMathInElement(document.body, {{ .Content | safeJS }});"></script>
   {{- end -}}
   {{- .Page.Store.Set "katex" true -}}
 {{- end -}}
-
-{{- if .Inner -}}
-<span>
-  {{- if .Get "display" -}}
-  \[ {{ .Inner }} \]
-  {{- else -}}
-  \( {{ .Inner }} \)
-  {{- end -}}
-</span>
-{{- end -}}

layouts/_shortcodes/mermaid.html

@@ -1,14 +1,11 @@
-{{- if not (.Page.Store.Get "mermaid") -}}
-  <!-- Include mermaid only first time -->
 {{- /* remove whitespaces */ -}}
-  <script src="{{ "mermaid.min.js" | relURL }}"></script>
-  {{- with resources.Get "mermaid.json" -}}
-    <script>mermaid.initialize({{ .Content | safeJS }})</script>
-  {{- end -}}
-  {{- .Page.Store.Set "mermaid" true -}}
-{{- end -}}
-
 <pre class="mermaid{{ with .Get "class" }} {{ . }}{{ end }}">
   {{- .Inner | htmlEscape | safeHTML -}}
 </pre>
-{{- /* remove whitespaces */ -}}
+{{- if not (.Page.Store.Get "mermaid") -}}
+  {{- /* Include mermaid only first time */ -}}
+  {{- with resources.Get "mermaid.json" | minify -}}
+  <script src="{{ "mermaid.min.js" | relURL }}" onload="mermaid.initialize({{ .Content | safeJS }})"></script>
+  {{- end -}}
+  {{- .Page.Store.Set "mermaid" true -}}
+{{- end -}}