Review and update whitespaces in shortcodes to improve shortcode nesting

assets/_markdown.scss

@@ -24,6 +24,7 @@
       font-size: 0.75em;
       vertical-align: middle;
       text-decoration: none;
+      margin-inline-start: .25em;
     }
 
     &:hover a.anchor,

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

@@ -32,5 +32,4 @@ Steps shortcode styles numbered list as series of points for better content orga
 
 4. ## Curabitur sed lacinia velit.
    Curabitur sed lacinia velit. Nullam sed ante non quam lobortis hendrerit. Phasellus elementum, erat sit amet imperdiet pulvinar, odio massa lobortis ipsum, in tincidunt metus dolor vel ligula.
-
 {{% /steps %}}

layouts/_markup/render-heading.html

@@ -1,6 +1,6 @@
 <h{{ .Level }} id="{{ .Anchor }}" {{- with .Attributes.class -}}class="{{ . }}"{{- end -}}>
   {{- .Text -}}
-  {{- if default true .Attributes.anchor }}
+  {{- if default true .Attributes.anchor -}}
   <a class="anchor" href="#{{ .Anchor }}">#</a>
   {{- end -}}
 </h{{ .Level }}>

layouts/_partials/docs/links/portable-link.html

@@ -16,7 +16,7 @@
   {{- else with (resources.Get $path) -}}
     {{- $destination = .RelPermalink -}}
   {{- else -}}
-    {{- warnf "Reference '%s' not found in '%s'" .Destination .Page.Permalink -}}
+    {{- warnf "Reference '%s' not found in '%s'" .Destination .Page.RelPermalink -}}
   {{- end -}}
 
   {{- with $url.RawQuery -}}

layouts/_partials/docs/menu-hugo.html

@@ -19,16 +19,16 @@
   <li>
     {{- $isRemote := (urls.Parse .URL).IsAbs -}}
     <a href="{{ .URL }}"
-      {{- with $class }}class="{{ delimit . " " }}"{{ end -}}
+      {{- with $class }} class="{{ delimit . " " }}"{{- end -}}
-      {{- with .Title }}title="{{ . }}"{{ end -}}
+      {{- with .Title }} title="{{ . }}"{{- end -}}
-      {{- if $isRemote }}target="_blank" rel="noopener"{{ end -}}>
+      {{- if $isRemote }} target="_blank" rel="noopener"{{- end -}}>
       {{- .Pre -}}
-      {{ template "book-menu-title" . }}
+      {{- template "book-menu-title" . -}}
       {{- .Post -}}
     </a>
-    {{- with .Children }}
+    {{- with .Children -}}
-      {{ template "book-menu-hugo" (dict "Page" $.Page "Menu" .) }}
+      {{- template "book-menu-hugo" (dict "Page" $.Page "Menu" .) -}}
-    {{- end }}
+    {{- end -}}
   </li>
 {{- end -}}
 </ul>

layouts/_shortcodes/asciinema.html

@@ -1,15 +1,17 @@
 {{- if not (.Page.Store.Get "asciinema") -}}
-<!-- Include asciinema player only first time -->
+  <!-- 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>
+  <link rel="stylesheet" href="{{ "asciinema/asciinema-player.css" | relURL }}" />
-<script defer src="{{ "asciinema/asciinema-auto.js" | relURL }}"></script>
+  {{- /* remove whitespaces */ -}}
-{{- .Page.Store.Set "asciinema" true -}}
+  <script defer src="{{ "asciinema/asciinema-player.min.js" | relURL }}"></script>
+  {{- /* remove whitespaces */ -}}
+  <script defer src="{{ "asciinema/asciinema-auto.js" | relURL }}"></script>
+  {{- .Page.Store.Set "asciinema" true -}}
 {{- end -}}
 
 {{- with (partial "docs/links/portable-image" (dict "Page" .Page "Destination" (index .Params "cast"))) -}}
-
+  {{- $opts := newScratch -}}
-{{- $opts := newScratch -}}
+  {{- $opts.Set "asciinema" $.Params -}}
-{{- $opts.Set "asciinema" $.Params -}}
+  {{- $opts.DeleteInMap "asciinema" "cast" -}}
-{{- $opts.DeleteInMap "asciinema" "cast" -}}
+  <div class="asciinema" id="asciinema-{{ $.Ordinal }}" x-data-cast="{{ . | safeHTMLAttr }}" x-data-opts="{{ $opts.Get "asciinema" | jsonify | safeHTMLAttr }}"></div>
-<div class="asciinema" id="asciinema-{{ $.Ordinal }}" x-data-cast="{{ . | safeHTMLAttr }}" x-data-opts="{{ $opts.Get "asciinema" | jsonify | safeHTMLAttr }}"></div>
 {{- end -}}

layouts/_shortcodes/badge.html

@@ -1,5 +1,6 @@
 {{- $style := default "default" (.Get "style") -}}
 <span class="book-badge {{ $style }}">
-  {{- with .Get "title" }}<span class="book-badge-title">{{ . | plainify }}</span>{{ end -}}
+  {{- with .Get "title" -}}<span class="book-badge-title">{{ . | plainify }}</span>{{- end -}}
-  {{- with .Get "value" }}<span class="book-badge-value">{{ . | plainify }}</span>{{ end -}}
+  {{- with .Get "value" -}}<span class="book-badge-value">{{ . | plainify }}</span>{{- end -}}
-</span>
+</span>
+{{- /* remove whitespaces */ -}}

layouts/_shortcodes/button.html

@@ -3,3 +3,4 @@
 <a {{ with $href }}href="{{ $href }}"{{ end }} {{ with $isRemote }}target="_blank" rel="noopener"{{ end }} class="book-btn{{ with .Get "class" }} {{ . }}{{ end }}">
   {{- .InnerDeindent -}}
 </a>
+{{- /* remove whitespaces */ -}}

layouts/_shortcodes/card.html

@@ -1,9 +1,7 @@
-{{- /* remove whitespace */ -}}
 {{- with .Get "href" -}}
-{{- $destination := partial "docs/links/portable-link" (dict "Page" $.Page "Destination" .) -}}
+<div><a class="book-card{{ with $.Get "class" }} {{ . }}{{ end }}" href="{{ . | safeURL }}">
-<a class="book-card{{ with $.Get "class" }} {{ . }}{{ end }}" href="{{ $destination | safeURL }}">
 {{- template "book-card-content" $ -}}
-</a>
+</a></div>
 {{- else -}}
 <div class="book-card{{ with .Get "class" }} {{ . }}{{ end }}">
 {{- template "book-card-content" $ -}}
@@ -14,9 +12,8 @@
 {{- with .Get "image" -}}
   {{- $destination := partial "docs/links/portable-image" (dict "Page" $.Page "Destination" .) -}}
   <img src="{{ $destination | safeURL }}" />
-{{- end }}
+  {{- end -}}
   <div class="markdown-inner">
-  {{ with .Inner }}{{ . }}{{ end }}
+{{ with .Inner }}{{ . }}{{ end -}}
   </div>
 {{- end -}}
-{{- /* remove whitespace */ -}}

layouts/_shortcodes/columns.html

@@ -1,21 +1,21 @@
 {{- $ratio := (split (.Get "ratio") ":") -}}
 {{- if strings.Contains .InnerDeindent "<--->" -}}
-{{ warnf "Columns shortcode seprator '<--->' is deprecated, use markdown list instead." -}}
+{{- warnf "Columns shortcode seprator '<--->' is deprecated, use markdown list instead." -}}
 <div class="book-columns flex flex-wrap{{ with .Get "class" }} {{ . }}{{ end }}">
-{{ range $index, $content := split .InnerDeindent "<--->" }}
+{{- range $index, $content := split .InnerDeindent "<--->" -}}
   {{- $grow := default 1 (index $ratio $index) -}}
   <div class="flex-even markdown-inner" style="flex-grow: {{ $grow }};">
-    {{ $content | safeHTML }}
+    {{- $content | safeHTML -}}
   </div>
-{{ end }}
+{{- end -}}
 </div>
-{{ else }}
+{{- else -}}
-{{- if .Get "ratio" }}<style>{{ range $index, $grow := $ratio }}
+{{- if .Get "ratio" -}}<style>{{- range $index, $grow := $ratio -}}
   .book-columns-{{ $.Ordinal }}>ul>li:nth-child({{ $index | add 1 }}){
     flex-grow: {{ default 1 $grow }};
   }
-{{ end }}</style>{{ end -}}
+{{- end -}}</style>{{- end -}}
-<div class="book-columns book-columns-{{ .Ordinal }} {{ with .Get "class" }}{{ . }}{{ end }}">
+<div class="book-columns book-columns-{{ .Ordinal }}{{ with .Get "class" }} {{ . }}{{ end }}">
-{{ .InnerDeindent | safeHTML }}
+{{ .Inner | safeHTML -}}
 </div>
-{{ end -}}
+{{- end -}}

layouts/_shortcodes/details.html

@@ -1,7 +1,9 @@
+{{- /* remove whitespaces */ -}}
 <details {{ if or (.Get "open") (in .Params "open") }}open{{ end }}>
-  {{- $summary := cond .IsNamedParams (.Get "title") (.Get 0) -}}
+{{- $summary := cond .IsNamedParams (.Get "title") (.Get 0) -}}
-  <summary>{{ $summary | .Page.RenderString }}</summary>
+<summary>{{ $summary | .Page.RenderString }}</summary>
-  <div class="markdown-inner">
+{{- /* remove whitespaces */ -}}
-    {{ .InnerDeindent | safeHTML }}
+<div class="markdown-inner">
-  </div>
+{{ .Inner | safeHTML -}}
-</details>
+</div></details>
+{{- /* remove whitespaces */ -}}

layouts/_shortcodes/hint.html

@@ -1,3 +1,5 @@
+{{- /* remove whitespaces */ -}}
 <blockquote class="book-hint {{ default "default" (.Get 0) }}">
-  {{ .Inner | safeHTML }}
+{{ .Inner | safeHTML -}}
 </blockquote>
+{{- /* remove whitespaces */ -}}

layouts/_shortcodes/image.html

@@ -1,4 +1,3 @@
-{{- /* remove whitespaces */ -}}
 {{- $destination := partial "docs/links/portable-image" (dict "Page" .Page "Destination" (.Get "src")) -}}
 <label class="book-image" for="book-image-toggle-{{ .Ordinal }}">
   <input class="hidden toggle" type="checkbox" id="book-image-toggle-{{ .Ordinal }}" />

layouts/_shortcodes/katex.html

@@ -1,19 +1,21 @@
 {{- 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>
+  <link rel="stylesheet" href="{{ "katex/katex.min.css" | relURL }}" />
-{{ with resources.Get "katex.json" }}
+  {{- /* remove whitespaces */ -}}
-  <script defer src="{{ "katex/auto-render.min.js" | relURL }}" onload="renderMathInElement(document.body, {{ .Content | safeJS }});"></script>
+  <script defer src="{{ "katex/katex.min.js" | relURL }}"></script>
-{{ end }}
+  {{- with resources.Get "katex.json" -}}
-{{- .Page.Store.Set "katex" true -}}
+  <script defer src="{{ "katex/auto-render.min.js" | relURL }}" onload="renderMathInElement(document.body, {{ . | minify }});"></script>
+  {{- end -}}
+  {{- .Page.Store.Set "katex" true -}}
 {{- end -}}
 
-{{ if .Inner }}
+{{- if .Inner -}}
 <span>
-  {{- if .Get "display" }}
+  {{- if .Get "display" -}}
   \[ {{ .Inner }} \]
-  {{ else }}
+  {{- else -}}
   \( {{ .Inner }} \)
-  {{ end -}}
+  {{- end -}}
 </span>
-{{ end }}
+{{- end -}}

layouts/_shortcodes/mermaid.html

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

layouts/_shortcodes/steps.html

@@ -1,3 +1,5 @@
+{{- /* remove whitespaces */ -}}
 <div class="book-steps {{ with .Get "class" }}{{ . }}{{ end }}">
-  {{ .Inner }}
+{{ .Inner -}}
-</div>
+</div>
+{{- /* remove whitespaces */ -}}

layouts/_shortcodes/tab.html

@@ -1,9 +1,12 @@
 {{- $group := printf "tabs-%v" (default .Parent.Ordinal (.Parent.Get 0)) -}}
-{{- $tab := printf "%s-%d" $group .Ordinal }}
+{{- $tab := printf "%s-%d" $group .Ordinal -}}
 <input type="radio" class="toggle" name="{{ $group }}" id="{{ $tab }}" {{ if not .Ordinal }}checked="checked"{{ end }} />
+{{- /* remove whitespaces */ -}}
 <label for="{{ $tab }}">
   {{- .Get 0 -}}
 </label>
+{{- /* remove whitespaces */ -}}
 <div class="book-tabs-content markdown-inner">
-  {{- .Inner -}}
+{{ .Inner -}}
 </div>
+{{- /* remove whitespaces */ -}}

layouts/_shortcodes/tabs.html

@@ -1,3 +1,5 @@
+{{- /* remove whitespaces */ -}}
 <div class="book-tabs">
-{{ .Inner }}
+{{- .Inner -}}
 </div>
+{{- /* remove whitespaces */ -}}