5 files changed, 18 insertions, 12 deletions
diff --git a/layouts/shortcodes/column.html b/layouts/shortcodes/column.html
deleted file mode 100644
index 1951150..0000000
--- a/layouts/shortcodes/column.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{{ if .Inner }}
-<div class="flex">
-  <div class="flex-even">
-    {{ .Inner | markdownify }}
-  </div>
-</div>
-{{ else }}
-  </div> <!-- close current column -->
-  <div class="flex-even"> <!-- open new column -->
-{{ end }}
diff --git a/layouts/shortcodes/columns.html b/layouts/shortcodes/columns.html
new file mode 100644
index 0000000..ec62322
--- /dev/null
+++ b/layouts/shortcodes/columns.html
@@ -0,0 +1,7 @@
+<div class="book-columns flex">
+  {{ range split .Inner "<--->" }}
+  <div class="flex-even">
+    {{ . | markdownify }}
+  </div>
+  {{ end }}
+</div>
diff --git a/layouts/shortcodes/expand.html b/layouts/shortcodes/expand.html
index 049fdd1..547fb3f 100644
--- a/layouts/shortcodes/expand.html
+++ b/layouts/shortcodes/expand.html
@@ -6,7 +6,7 @@
     </div>
     <input type="checkbox" style="display: none" />
     <div class="book-expand-content markdown-inner">
-      {{- .Inner | markdownify -}}
+      {{ .Inner | markdownify }}
     </div>
   </label>
 </div>
diff --git a/layouts/shortcodes/mermaid.html b/layouts/shortcodes/mermaid.html
new file mode 100644
index 0000000..d156f07
--- /dev/null
+++ b/layouts/shortcodes/mermaid.html
@@ -0,0 +1,9 @@
+{{ if not (.Page.Scratch.Get "mermaid") }}
+<!-- Include mermaid only first time -->
+<script src="{{ "mermaid.min.js" | absURL }}"></script>
+{{ .Page.Scratch.Set "mermaid" true }}
+{{ end }}
+
+<p class="mermaid flex align-center">
+  {{ .Inner }}
+</p>
diff --git a/layouts/shortcodes/tab.html b/layouts/shortcodes/tab.html
index 24520e7..ce78cb8 100644
--- a/layouts/shortcodes/tab.html
+++ b/layouts/shortcodes/tab.html
@@ -8,5 +8,5 @@
     
   {{ .Parent.Scratch.Add $group (dict "Name" $name "Content" .Inner) }}
 {{ else }}
-  {{- errorf "%q: tab shortcode must be inside tabs shortcode" .Page.Path -}}
+  {{ errorf "%q: 'tab' shortcode must be inside 'tabs' shortcode" .Page.Path }}
 {{ end}}