.github/workflows/main.yml

@@ -9,7 +9,7 @@ jobs:
       matrix:
         hugo-version:
           - 'latest'
-          - '0.134.2'
+          - '0.124.0'
     steps:
       - uses: actions/checkout@v4
         with:
@@ -17,7 +17,7 @@ jobs:
           fetch-depth: 0    # Fetch all history for .GitInfo and .Lastmod
 
       - name: Setup Hugo
-        uses: peaceiris/actions-hugo@v3
+        uses: peaceiris/actions-hugo@v2
         with:
           hugo-version: ${{ matrix.hugo-version }}
           extended: true

.gitignore

@@ -2,4 +2,3 @@ public/
 exampleSite/public/
 .DS_Store
 .hugo_build.lock
-resources/

README.md

@@ -1,6 +1,6 @@
 # Hugo Book Theme
 
-[![Hugo](https://img.shields.io/badge/hugo-0.134-blue.svg)](https://gohugo.io)
+[![Hugo](https://img.shields.io/badge/hugo-0.79-blue.svg)](https://gohugo.io)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 ![Build with Hugo](https://github.com/alex-shpak/hugo-book/workflows/Build%20with%20Hugo/badge.svg)
 
@@ -33,7 +33,7 @@
 
 ## Requirements
 
-- Hugo 0.134 or higher
+- Hugo 0.79 or higher
 - Hugo extended version, [Installation Instructions](https://gohugo.io/installation/)
 
 ## Installation
@@ -92,8 +92,44 @@ hugo server --minify --theme hugo-book
 
 ## Menu
 
+### File tree menu (default)
+
 By default, the theme will render pages from the `content/docs` section as a menu in a tree structure.  
-You can set `title` and `weight` in the front matter of pages to adjust the order and titles in the menu, as well as other parameters to hide or alter urls in the menu. You can choose which folder to use for generating menu with `BookSection` configuration parameter.
+You can set `title` and `weight` in the front matter of pages to adjust the order and titles in the menu.
+
+### Leaf bundle menu (Deprecated, to be removed in June 2022)
+
+You can also use leaf bundle and the content of its `index.md` file as menu.  
+Given you have the following file structure:
+
+```
+├── content
+│   ├── docs
+│   │   ├── page-one.md
+│   │   └── page-two.md
+│   └── posts
+│       ├── post-one.md
+│       └── post-two.md
+```
+
+Create a file `content/menu/index.md` with the content:
+
+```md
++++
+headless = true
++++
+
+- [Book Example]({{< relref "/docs/" >}})
+  - [Page One]({{< relref "/docs/page-one" >}})
+  - [Page Two]({{< relref "/docs/page-two" >}})
+- [Blog]({{< relref "/posts" >}})
+```
+
+And Enable it by setting `BookMenuBundle: /menu` in Site configuration.
+
+- [Example menu](https://github.com/alex-shpak/hugo-book/blob/master/exampleSite/content.en/menu/index.md)
+- [Example config file](https://github.com/alex-shpak/hugo-book/blob/master/exampleSite/config.yaml)
+- [Leaf bundles](https://gohugo.io/content-management/page-bundles/)
 
 ## Blog
 
@@ -105,7 +141,7 @@ A blog is not the primary usecase of this theme, so it has only minimal features
 ### Site Configuration
 
 There are a few configuration options that you can add to your `hugo.toml` file.  
-You can also see the `yaml` example [here](https://github.com/alex-shpak/hugo-book/blob/master/exampleSite/hugo.yaml).
+You can also see the `yaml` example [here](https://github.com/alex-shpak/hugo-book/blob/master/exampleSite/config.yaml).
 
 ```toml
 # (Optional) Set Google Analytics if you use it to track your website.
@@ -141,6 +177,11 @@ disableKinds = ['taxonomy', 'taxonomyTerm']
   # /static/logo.png then the path would be 'logo.png'
   BookLogo = 'logo.png'
 
+  # (Optional, default none) Set leaf bundle to render as side menu
+  # When not specified file structure and weights will be used
+  # Deprecated, to be removed in June 2022
+  BookMenuBundle = '/menu'
+
   # (Optional, default docs) Specify section of content to render as menu
   # You can also set value to "*" to render all sections to menu
   BookSection = 'docs'
@@ -200,16 +241,16 @@ You can specify additional params in the front matter of individual pages:
 # Set type to 'docs' if you want to render page outside of configured section or if you render section other than 'docs'
 type = 'docs'
 
-# Set page weight to re-arrange items in file-tree menu.
+# Set page weight to re-arrange items in file-tree menu (if BookMenuBundle not set)
 weight = 10
 
-# (Optional) Set to 'true' to mark page as flat section in file-tree menu.
+# (Optional) Set to 'true' to mark page as flat section in file-tree menu (if BookMenuBundle not set)
 bookFlatSection = false
 
 # (Optional) Set to hide nested sections or pages at that level. Works only with file-tree menu mode
 bookCollapseSection = true
 
-# (Optional) Set true to hide page or section from side menu.
+# (Optional) Set true to hide page or section from side menu (if BookMenuBundle not set)
 bookHidden = false
 
 # (Optional) Set 'false' to hide ToC from page
@@ -221,7 +262,7 @@ bookComments = true
 # (Optional) Set to 'false' to exclude page from search index.
 bookSearchExclude = true
 
-# (Optional) Set explicit href attribute for this page in a menu.
+# (Optional) Set explicit href attribute for this page in a menu (if BookMenuBundle not set)
 bookHref = ''
 ```
 

assets/_defaults.scss

@@ -16,6 +16,7 @@ $body-font-weight: normal !default;
 $body-min-width: 20rem !default;
 $container-max-width: 80rem !default;
 
+$header-height: 3.5rem !default;
 $menu-width: 16rem !default;
 $toc-width: 16rem !default;
 
@@ -47,9 +48,9 @@ $hint-colors: (
 }
 
 @mixin theme-dark {
-  --gray-100: #494e54;
+  --gray-100: rgba(255, 255, 255, 0.1);
-  --gray-200: #5c6165;
+  --gray-200: rgba(255, 255, 255, 0.2);
-  --gray-500: #999d9f;
+  --gray-500: rgba(255, 255, 255, 0.5);
 
   --color-link: #84b2ff;
   --color-visited-link: #b88dff;

assets/_fonts.scss

@@ -1,28 +1,33 @@
+/* roboto-regular - latin */
 @font-face {
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 400;
-  font-display: fallback;
+  font-display: swap;
-  src: url(https://fonts.gstatic.com/s/roboto/v32/KFOmCnqEu92Fr1Mu4mxKKTU1Kg.woff2) format('woff2');
+  src: local(''),
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+       url('fonts/roboto-v27-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('fonts/roboto-v27-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 }
-
+/* roboto-700 - latin */
 @font-face {
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 700;
-  font-display: fallback;
+  font-display: swap;
-  src: url(https://fonts.gstatic.com/s/roboto/v32/KFOlCnqEu92Fr1MmWUlfBBc4AMP6lQ.woff2) format('woff2');
+  src: local(''),
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+       url('fonts/roboto-v27-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('fonts/roboto-v27-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 }
 
+/* roboto-mono-regular - latin */
 @font-face {
   font-family: 'Roboto Mono';
   font-style: normal;
   font-weight: 400;
-  font-display: fallback;
+  font-display: swap;
-  src: url(https://fonts.gstatic.com/s/robotomono/v23/L0xuDF4xlVMF-BfR8bXMIhJHg45mwgGEFl0_3vq_ROW4AJi8SJQt.woff2) format('woff2');
+  src: local(''),
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+       url('fonts/roboto-mono-v13-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('fonts/roboto-mono-v13-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 }
 
 body {

assets/_main.scss

@@ -2,7 +2,6 @@ html {
   font-size: $font-size-base;
   scroll-behavior: smooth;
   touch-action: manipulation;
-  scrollbar-gutter: stable;
 }
 
 body {
@@ -10,7 +9,7 @@ body {
   color: var(--body-font-color);
   background: var(--body-background);
 
-  // letter-spacing: 0.33px;
+  letter-spacing: 0.33px;
   font-weight: $body-font-weight;
   text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
@@ -86,12 +85,6 @@ ul.pagination {
   filter: var(--icon-filter);
 }
 
-a .book-icon {
-  height: 1em;
-  width: 1em;
-  margin-inline-end: .5em;
-}
-
 .book-brand {
   margin-top: 0;
   margin-bottom: $padding-16;
@@ -175,17 +168,7 @@ body[dir="rtl"] .book-menu {
 }
 
 .book-post {
-  margin-bottom: $padding-16 * 2;
+  margin-bottom: $padding-16 * 3;
-
-  .book-post-date img {
-    height: 1em;
-    width: 1em;
-    margin-inline-end: .5em;
-  }
-
-  .book-post-content > :first-child {
-    margin-top: $padding-16;
-  }
 }
 
 .book-header {
@@ -196,12 +179,6 @@ body[dir="rtl"] .book-menu {
     line-height: 0;
   }
 
-  h3 {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    margin: 0 $padding-16;
-  }
-
   img.book-icon {
     height: 1.5em;
     width: 1.5em;
@@ -273,6 +250,12 @@ body[dir="rtl"] .book-menu {
 .book-footer {
   padding-top: $padding-16;
   font-size: $font-size-14;
+
+  img {
+    height: 1em;
+    width: 1em;
+    margin-inline-end: $padding-8;
+  }
 }
 
 .book-comments {
@@ -282,6 +265,12 @@ body[dir="rtl"] .book-menu {
 .book-languages {
   margin-block-end: $padding-16 * 2;
 
+  .book-icon {
+    height: 1em;
+    width: 1em;
+    margin-inline-end: .5em;
+  }
+
   ul {
     padding-inline-start: 1.5em;
   }
@@ -307,6 +296,7 @@ body[dir="rtl"] .book-menu {
   .book-menu {
     visibility: hidden;
     margin-inline-start: -$menu-width;
+    font-size: $font-size-base;
     z-index: 1;
   }
 

assets/_markdown.scss

@@ -157,22 +157,16 @@
   .highlight {
     direction: ltr;
     unicode-bidi: embed;
-    border-radius: $border-radius;
+  }
-    overflow: hidden;
+  
-
+  .highlight table tr {
-    table tr {
+    td:nth-child(1) pre {
-      td pre code > span {
+      margin: 0;
-        display: flex;
+      padding-inline-end: 0;
-      }
+    }
-      
+    td:nth-child(2) pre {
-      td:nth-child(1) pre {
+      margin: 0;
-        margin: 0;
+      padding-inline-start: 0;
-        padding-inline-end: 0;
-      }
-      td:nth-child(2) pre {
-        margin: 0;
-        padding-inline-start: 0;
-      }
     }
   }
 

assets/_shortcodes.scss

@@ -71,7 +71,7 @@
 
     > div {
       margin: $padding-16 0;
-      min-width: $body-min-width * 0.66;
+      min-width: $body-min-width / 2;
       padding: 0 $padding-16;
     }
   }

assets/_utils.scss

@@ -50,10 +50,6 @@
   text-align: right;
 }
 
-.text-small {
-  font-size: .875em;
-}
-
 .hidden {
   display: none;
 }

assets/plugins/_numbered.scss

@@ -3,7 +3,7 @@ $endLevel: 6;
 
 .book-page .markdown.book-article {
   @for $currentLevel from $startLevel through $endLevel {
-    h#{$currentLevel} {
+    > h#{$currentLevel} {
       counter-increment: h#{$currentLevel};
       counter-reset: h#{$currentLevel + 1};
 
@@ -20,11 +20,13 @@ $endLevel: 6;
 }
 
 .book-toc nav#TableOfContents ul {
-  counter-reset: item;
-
   li {
     counter-increment: item;
 
+    &:first-child {
+      counter-reset: item;
+    }
+
     &:before {
       content: counters(item, ".") ". ";
       float: left;

assets/search-data.json

@@ -1,6 +1,6 @@
 [
 {{- $pages := where .Site.Pages "Kind" "in" (slice "page" "section") -}}
-{{- $pages = where $pages "Params.bookSearchExclude" "!=" true -}}
+{{- $pages = where $pages "Params.booksearchexclude" "!=" true -}}
 {{/* Remove until we know why it does not work, see https://github.com/alex-shpak/hugo-book/issues/528 */}}
 {{/*- $pages = where $pages "Content" "not in" (slice nil "") -*/}}
 {{- $pages = where $pages "Content" "!=" "" -}}

exampleSite/content.bn/_index.md

@@ -0,0 +1,79 @@
+---
+title: ভূমিকা
+type: docs
+---
+
+# বাংলা ভাষায় শুরু করুন
+
+{{< columns >}}
+## অস্ট্রিস চিপসে ফুর্তিভা 
+
+Est in vagis et Pittheus tu arge accipiter regia iram vocatur nurus. Omnes ut
+olivae sensit **arma sorori** deducit, inesset **crudus**, ego vetuere aliis,
+modo arsit? Utinam rapta fiducia valuere litora _adicit cursu_, ad facies
+
+<--->
+
+## সুইস কোটা ভোটে
+
+Ea _furtique_ risere fratres edidit terrae magis. Colla tam mihi tenebat:
+miseram excita suadent es pecudes iam. Concilio _quam_ velatus posset ait quod
+nunc! Fragosis suae dextra geruntur functus vulgata.
+{{< /columns >}}
+
+
+## টেম্পোরার নিশি
+
+Lorem **markdownum** emicat gestu. Cannis sol pressit ducta. **Est** Idaei,
+tremens ausim se tutaeque, illi ulnis hausit, sed, lumina cutem. Quae avis
+sequens!
+
+    var panel = ram_design;
+    if (backup + system) {
+        file.readPoint = network_native;
+        sidebar_engine_device(cell_tftp_raster,
+                dual_login_paper.adf_vci.application_reader_design(
+                graphicsNvramCdma, lpi_footer_snmp, integer_model));
+    }
+    public_keyboard_docking += error.controller_gibibyte_plug.ip(4,
+            asciiPetaflops, software(supercomputer_compatible_status + 4));
+    dynamic_disk.indexModeLaptop = bufferTftpReality;
+    var export_vlog_sequence = trinitron_flowchart + supercomputer_cluster_rj(
+            -1, toolbar_powerpoint_query, -2 / multiprocessing_impression);
+
+## Locis suis novi cum suoque decidit eadem
+
+Idmoniae ripis, at aves, ali missa adest, ut _et autem_, et ab? Venit spes
+versus finis sermonibus patefecit murum nec est sine oculis. _Ille_ inmota
+macies domoque caelestia cadit tantummodo scelus procul, corde!
+
+1. Dolentem capi parte rostro alvum habentem pudor
+2. Fulgentia sanguine paret
+3. E punior consurgit lentus
+4. Vox hasta eras micantes
+
+## Facibus pharetrae indetonsusque indulsit sic incurrite foliis
+
+Nefandam et prisci palmas! Blandita cutis flectitur montis macies, te _nati_
+Latiis; turbaque inferias. Virginis tibi peracta avidusque facies caper nec, e
+at ademptae, mira.
+
+    direct *= font(inputScareware(sliHome), crossplatform.byte(
+            ppl_encryption.excel_e_rte(integratedModelModifier), timeVirtual,
+            floating_speakers.media_printer(us, yahoo, primaryPhp)));
+    friendly_metal_flatbed(cd, isoPrimaryStorage(reader), dmaMirrored);
+    if (parse_flash_cron.metalGif(1, adServiceDevice, utility)) {
+        adf -= operation_cdma_samba;
+        imapGif.switch += torrent;
+    } else {
+        pmu.disk_captcha = digital_ppp_pci + recursionTransistor(5, dram);
+        ajax_service += grayscalePythonLock;
+        google_scroll_capacity = ftp + engine_dslam_sidebar / tape - 1;
+    }
+    drive_rw = zipTftp;
+    var suffix = software_router_extension.dimm_ddr(-5,
+            kernel_digital_minisite);
+
+Vocavit toto; alas **mitis** maestus in liquidarum ab legi finitimosque dominam
+tibi subitus; Orionis vertitur nota. Currere alti etiam seroque cernitis
+innumeris miraturus amplectique collo sustinet quemque! Litora ante turba?

exampleSite/content.en/_index.md

@@ -5,7 +5,7 @@ type: docs
 
 # Acerbo datus maxime
 
-{{% columns %}}
+{{< columns >}}
 ## Astris ipse furtiva
 
 Est in vagis et Pittheus tu arge accipiter regia iram vocatur nurus. Omnes ut
@@ -19,7 +19,7 @@ modo arsit? Utinam rapta fiducia valuere litora _adicit cursu_, ad facies
 Ea _furtique_ risere fratres edidit terrae magis. Colla tam mihi tenebat:
 miseram excita suadent es pecudes iam. Concilio _quam_ velatus posset ait quod
 nunc! Fragosis suae dextra geruntur functus vulgata.
-{{% /columns %}}
+{{< /columns >}}
 
 
 ## Tempora nisi nunc

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

@@ -9,5 +9,5 @@ Buttons are styled links that can lead to local page or external link.
 {{</* button href="https://github.com/alex-shpak/hugo-book" */>}}Contribute{{</* /button */>}}
 ```
 
-{{<button relref="/">}}Get Home{{</button>}}
+{{< button relref="/" >}}Get Home{{< /button >}}
-{{<button href="https://github.com/alex-shpak/hugo-book">}}Contribute{{</button>}}
+{{< button href="https://github.com/alex-shpak/hugo-book" >}}Contribute{{< /button >}}

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

@@ -2,10 +2,9 @@
 
 Columns help organize shorter pieces of content horizontally for readability.
 
-## Example
 
 ```html
-{{%/* columns [ratio="1:1"] [class="..."] */%}} <!-- begin columns block -->
+{{</* columns */>}} <!-- begin columns block -->
 # Left Content
 Lorem markdownum insigne...
 
@@ -18,11 +17,13 @@ Lorem markdownum insigne...
 
 # Right Content
 Lorem markdownum insigne...
-{{%/* /columns */%}}
+{{</* /columns */>}}
 ```
 
-{{% columns %}}
+## Example
-### Left Content
+
+{{< columns >}}
+## Left Content
 Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
 stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
 protulit, sed sed aere valvis inhaesuro Pallas animam: qui _quid_, ignes.
@@ -30,51 +31,15 @@ Miseratus fonte Ditis conubia.
 
 <--->
 
-### Mid Content
+## Mid Content
 Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
 stringit, frustra Saturnius uteroque inter!
 
 <--->
 
-### Right Content
+## Right Content
 Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
 stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
 protulit, sed sed aere valvis inhaesuro Pallas animam: qui _quid_, ignes.
 Miseratus fonte Ditis conubia.
-{{% /columns %}}
+{{< /columns >}}
-
-## Settings size ratio for columns
-
-```html
-{{%/* columns ratio="1:2" */%}} <!-- begin columns block -->
-
-## x1 Column
-Lorem markdownum insigne...
-
-<---> <!-- magic separator, between columns -->
-
-## x2 Column
-Lorem markdownum insigne...
-
-{{%/* /columns */%}}
-```
-
-{{% columns ratio="1:2" %}}
-### x1 Column
-Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
-stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
-protulit, sed sed aere valvis inhaesuro Pallas animam: qui _quid_, ignes.
-Miseratus fonte Ditis conubia.
-
-<--->
-
-### x2 Column
-Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
-stringit, frustra Saturnius uteroque inter!
-
-Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
-stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
-protulit, sed sed aere valvis inhaesuro Pallas animam: qui _quid_, ignes.
-Miseratus fonte Ditis conubia.
-
-{{% /columns %}}

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

@@ -4,19 +4,19 @@ Details shortcode is a helper for `details` html5 element. It is going to replac
 
 ## Example
 ```tpl
-{{%/* details "Title" [open] */%}}
+{{</* details "Title" [open] */>}}
 ## Markdown content
 Lorem markdownum insigne...
-{{%/* /details */%}}
+{{</* /details */>}}
 ```
 ```tpl
-{{%/* details title="Title" open=true */%}}
+{{</* details title="Title" open=true */>}}
 ## Markdown content
 Lorem markdownum insigne...
-{{%/* /details */%}}
+{{</* /details */>}}
 ```
 
-{{% details "Title" open %}}
+{{< details "Title" open >}}
 ## Markdown content
 Lorem markdownum insigne...
-{{% /details %}}
+{{< /details >}}

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

@@ -0,0 +1,35 @@
+# Expand
+
+Expand shortcode can help to decrease clutter on screen by hiding part of text. Expand content by clicking on it.
+
+## Example
+### Default
+
+```tpl
+{{</* expand */>}}
+## Markdown content
+Lorem markdownum insigne...
+{{</* /expand */>}}
+```
+
+{{< expand >}}
+## Markdown content
+Lorem markdownum insigne...
+{{< /expand >}}
+
+### With Custom Label
+
+```tpl
+{{</* expand "Custom Label" "..." */>}}
+## Markdown content
+Lorem markdownum insigne...
+{{</* /expand */>}}
+```
+
+{{< expand "Custom Label" "..." >}}
+## Markdown content
+Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
+stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
+protulit, sed sed aere valvis inhaesuro Pallas animam: qui _quid_, ignes.
+Miseratus fonte Ditis conubia.
+{{< /expand >}}

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

@@ -4,29 +4,29 @@ Hint shortcode can be used as hint/alerts/notification block.
 There are 3 colors to choose: `info`, `warning` and `danger`.
 
 ```tpl
-{{%/* hint [info|warning|danger] */%}}
+{{</* hint [info|warning|danger] */>}}
 **Markdown content**  
 Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
 stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
-{{%/* /hint */%}}
+{{</* /hint */>}}
 ```
 
 ## Example
 
-{{% hint info %}}
+{{< hint info >}}
 **Markdown content**  
 Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
 stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
-{{% /hint %}}
+{{< /hint >}}
 
-{{% hint warning %}}
+{{< hint warning >}}
 **Markdown content**  
 Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
 stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
-{{% /hint %}}
+{{< /hint >}}
 
-{{% hint danger %}}
+{{< hint danger >}}
 **Markdown content**  
 Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
 stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
-{{% /hint %}}
+{{< /hint >}}

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

@@ -6,21 +6,25 @@ title: KaTeX
 KaTeX shortcode let you render math typesetting in markdown document. See [KaTeX](https://katex.org/)
 
 ## Example
-{{% columns %}}
+
+<div class="book-columns flex flex-wrap">
+  <div class="flex-even markdown-inner">
 
 ```latex
-{{</* katex display=true >}}
+{{</* katex display=true class="optional" >}}
 f(x) = \int_{-\infty}^\infty\hat f(\xi)\,e^{2 \pi i \xi x}\,d\xi
 {{< /katex */>}}
 ```
 
-<--->
+  </div>
+  <div class="flex-even markdown-inner">
 
-{{< katex display=true >}}
+{{< katex display=true class="optional" >}}
 f(x) = \int_{-\infty}^\infty\hat f(\xi)\,e^{2 \pi i \xi x}\,d\xi
 {{< /katex >}}
 
-{{% /columns %}}
+  </div>
+</div>
 
 ## Display Mode Example
 

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

@@ -2,19 +2,21 @@
 
 [MermaidJS](https://mermaid-js.github.io/) is library for generating svg charts and diagrams from text.
 
-{{% hint info %}}
+{{< hint info >}}
-**Override Mermaid initialization config**  
+**Override Mermaid Initialization Config**
+
 To override the [initialization config](https://mermaid-js.github.io/mermaid/#/Setup) for Mermaid,
 create a `mermaid.json` file in your `assets` folder!
-{{% /hint %}}
+{{< /hint >}}
 
 ## Example
 
 
-{{% columns %}}
+<div class="book-columns flex flex-wrap">
+  <div class="flex-even markdown-inner">
 
 ```tpl
-{{</* mermaid [class="..."] >}}
+{{</* mermaid class="optional" >}}
 stateDiagram-v2
     State1: The state with a note
     note right of State1
@@ -26,9 +28,10 @@ stateDiagram-v2
 {{< /mermaid */>}}
 ```
 
-<--->
+  </div>
+  <div class="flex-even markdown-inner">
 
-{{<mermaid>}}
+{{< mermaid class="optional" >}}
 stateDiagram-v2
     State1: The state with a note
     note right of State1
@@ -37,6 +40,7 @@ stateDiagram-v2
     end note
     State1 --> State2
     note left of State2 : This is the note to the left.
-{{</mermaid>}}
+{{< /mermaid >}}
 
-{{% /columns %}}
+  </div>
+</div>

exampleSite/content.en/docs/shortcodes/section/_index.md

@@ -1,6 +1,5 @@
 ---
 bookCollapseSection: true
-bookHidden: true
 ---
 
 # Section
@@ -13,4 +12,4 @@ Section renders pages in section as definition list, using title and description
 {{</* section [summary] */>}}
 ```
 
-{{<section summary>}}
+{{<section summary >}}

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

@@ -3,18 +3,17 @@
 Tabs let you organize content by context, for example installation instructions for each supported platform.
 
 ```tpl
-{{</* tabs "id" */>}}
+{{</* tabs "uniqueid" */>}}
-{{%/* tab "MacOS" */%}} # MacOS Content {{%/* /tab */%}}
+{{</* tab "MacOS" */>}} # MacOS Content {{</* /tab */>}}
-{{%/* tab "Linux" */%}} # Linux Content {{%/* /tab */%}}
+{{</* tab "Linux" */>}} # Linux Content {{</* /tab */>}}
-{{%/* tab "Windows" */%}} # Windows Content {{%/* /tab */%}}
+{{</* tab "Windows" */>}} # Windows Content {{</* /tab */>}}
 {{</* /tabs */>}}
 ```
 
 ## Example
 
-{{< tabs >}}
+{{< tabs "uniqueid" >}}
-
+{{< tab "MacOS" >}}
-{{% tab "MacOS" %}}
 # MacOS
 
 This is tab **MacOS** content.
@@ -23,9 +22,10 @@ Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
 stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
 protulit, sed sed aere valvis inhaesuro Pallas animam: qui _quid_, ignes.
 Miseratus fonte Ditis conubia.
-{{% /tab %}}
+{{< /tab >}}
+
+{{< tab "Linux" >}}
 
-{{% tab "Linux" %}}
 # Linux
 
 This is tab **Linux** content.
@@ -34,9 +34,10 @@ Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
 stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
 protulit, sed sed aere valvis inhaesuro Pallas animam: qui _quid_, ignes.
 Miseratus fonte Ditis conubia.
-{{% /tab %}}
+{{< /tab >}}
+
+{{< tab "Windows" >}}
 
-{{% tab "Windows" %}}
 # Windows
 
 This is tab **Windows** content.
@@ -45,6 +46,5 @@ Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
 stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
 protulit, sed sed aere valvis inhaesuro Pallas animam: qui _quid_, ignes.
 Miseratus fonte Ditis conubia.
-{{% /tab %}}
+{{< /tab >}}
-
 {{< /tabs >}}

exampleSite/content.en/menu/index.md

@@ -0,0 +1,22 @@
+---
+headless: true
+---
+
+- [**Example Site**]({{< relref "/docs/example" >}})
+- [Table of Contents]({{< relref "/docs/example/table-of-contents" >}})
+  - [With ToC]({{< relref "/docs/example/table-of-contents/with-toc" >}})
+  - [Without ToC]({{< relref "/docs/example/table-of-contents/without-toc" >}})
+- [Collapsed]({{< relref "/docs/example/collapsed" >}})
+  - [3rd]({{< relref "/docs/example/collapsed/3rd-level" >}})
+    - [4th]({{< relref "/docs/example/collapsed/3rd-level/4th-level" >}})
+<br />
+
+- **Shortcodes**
+- [Buttons]({{< relref "/docs/shortcodes/buttons" >}})
+- [Columns]({{< relref "/docs/shortcodes/columns" >}})
+- [Expand]({{< relref "/docs/shortcodes/expand" >}})
+- [Hints]({{< relref "/docs/shortcodes/hints" >}})
+- [KaTeX]({{< relref "/docs/shortcodes/katex" >}})
+- [Mermaid]({{< relref "/docs/shortcodes/mermaid" >}})
+- [Tabs]({{< relref "/docs/shortcodes/tabs" >}})
+<br />

exampleSite/content.he/_index.md

@@ -1,41 +0,0 @@
----
-title: Introduction
-type: docs
----
-
-# Example of RTL page
-
-{{% columns %}}
-## Astris ipse furtiva
-
-Est in vagis et Pittheus tu arge accipiter regia iram vocatur nurus. Omnes ut
-olivae sensit **arma sorori** deducit, inesset **crudus**, ego vetuere aliis,
-modo arsit? Utinam rapta fiducia valuere litora _adicit cursu_, ad facies
-
-<--->
-
-## Suis quot vota
-
-Ea _furtique_ risere fratres edidit terrae magis. Colla tam mihi tenebat:
-miseram excita suadent es pecudes iam. Concilio _quam_ velatus posset ait quod
-nunc! Fragosis suae dextra geruntur functus vulgata.
-{{% /columns %}}
-
-
-## Tempora nisi nunc
-
-Lorem **markdownum** emicat gestu. Cannis sol pressit ducta. **Est** Idaei,
-tremens ausim se tutaeque, illi ulnis hausit, sed, lumina cutem. Quae avis
-sequens!
-
-    var panel = ram_design;
-    if (backup + system) {
-        file.readPoint = network_native;
-        sidebar_engine_device(cell_tftp_raster,
-                dual_login_paper.adf_vci.application_reader_design(
-                graphicsNvramCdma, lpi_footer_snmp, integer_model));
-    }
-
-## Locis suis novi cum suoque decidit eadem
-
-Idmoniae ripis, at aves, ali missa adest, ut _et autem_, et ab?

exampleSite/content.ru/_index.md

@@ -0,0 +1,79 @@
+---
+title: Введение
+type: docs
+---
+
+# Стартовая страница на русском языке
+
+{{< columns >}}
+## Astris ipse furtiva
+
+Est in vagis et Pittheus tu arge accipiter regia iram vocatur nurus. Omnes ut
+olivae sensit **arma sorori** deducit, inesset **crudus**, ego vetuere aliis,
+modo arsit? Utinam rapta fiducia valuere litora _adicit cursu_, ad facies
+
+<--->
+
+## Suis quot vota
+
+Ea _furtique_ risere fratres edidit terrae magis. Colla tam mihi tenebat:
+miseram excita suadent es pecudes iam. Concilio _quam_ velatus posset ait quod
+nunc! Fragosis suae dextra geruntur functus vulgata.
+{{< /columns >}}
+
+
+## Tempora nisi nunc
+
+Lorem **markdownum** emicat gestu. Cannis sol pressit ducta. **Est** Idaei,
+tremens ausim se tutaeque, illi ulnis hausit, sed, lumina cutem. Quae avis
+sequens!
+
+    var panel = ram_design;
+    if (backup + system) {
+        file.readPoint = network_native;
+        sidebar_engine_device(cell_tftp_raster,
+                dual_login_paper.adf_vci.application_reader_design(
+                graphicsNvramCdma, lpi_footer_snmp, integer_model));
+    }
+    public_keyboard_docking += error.controller_gibibyte_plug.ip(4,
+            asciiPetaflops, software(supercomputer_compatible_status + 4));
+    dynamic_disk.indexModeLaptop = bufferTftpReality;
+    var export_vlog_sequence = trinitron_flowchart + supercomputer_cluster_rj(
+            -1, toolbar_powerpoint_query, -2 / multiprocessing_impression);
+
+## Locis suis novi cum suoque decidit eadem
+
+Idmoniae ripis, at aves, ali missa adest, ut _et autem_, et ab? Venit spes
+versus finis sermonibus patefecit murum nec est sine oculis. _Ille_ inmota
+macies domoque caelestia cadit tantummodo scelus procul, corde!
+
+1. Dolentem capi parte rostro alvum habentem pudor
+2. Fulgentia sanguine paret
+3. E punior consurgit lentus
+4. Vox hasta eras micantes
+
+## Facibus pharetrae indetonsusque indulsit sic incurrite foliis
+
+Nefandam et prisci palmas! Blandita cutis flectitur montis macies, te _nati_
+Latiis; turbaque inferias. Virginis tibi peracta avidusque facies caper nec, e
+at ademptae, mira.
+
+    direct *= font(inputScareware(sliHome), crossplatform.byte(
+            ppl_encryption.excel_e_rte(integratedModelModifier), timeVirtual,
+            floating_speakers.media_printer(us, yahoo, primaryPhp)));
+    friendly_metal_flatbed(cd, isoPrimaryStorage(reader), dmaMirrored);
+    if (parse_flash_cron.metalGif(1, adServiceDevice, utility)) {
+        adf -= operation_cdma_samba;
+        imapGif.switch += torrent;
+    } else {
+        pmu.disk_captcha = digital_ppp_pci + recursionTransistor(5, dram);
+        ajax_service += grayscalePythonLock;
+        google_scroll_capacity = ftp + engine_dslam_sidebar / tape - 1;
+    }
+    drive_rw = zipTftp;
+    var suffix = software_router_extension.dimm_ddr(-5,
+            kernel_digital_minisite);
+
+Vocavit toto; alas **mitis** maestus in liquidarum ab legi finitimosque dominam
+tibi subitus; Orionis vertitur nota. Currere alti etiam seroque cernitis
+innumeris miraturus amplectique collo sustinet quemque! Litora ante turba?

exampleSite/content.zh/_index.md

@@ -5,7 +5,7 @@ type: docs
 
 # 中文索引页
 
-{{% columns %}}
+{{< columns >}}
 ## Astris ipse furtiva
 
 Est in vagis et Pittheus tu arge accipiter regia iram vocatur nurus. Omnes ut
@@ -19,7 +19,7 @@ modo arsit? Utinam rapta fiducia valuere litora _adicit cursu_, ad facies
 Ea _furtique_ risere fratres edidit terrae magis. Colla tam mihi tenebat:
 miseram excita suadent es pecudes iam. Concilio _quam_ velatus posset ait quod
 nunc! Fragosis suae dextra geruntur functus vulgata.
-{{% /columns %}}
+{{< /columns >}}
 
 
 ## Tempora nisi nunc

exampleSite/hugo.toml

@@ -26,15 +26,14 @@ enableGitInfo = true
   contentDir = 'content.en'
   weight = 1
 
+[languages.ru]
+  languageName = 'Russian'
+  contentDir = 'content.ru'
+  weight = 2
+
 [languages.zh]
   languageName = 'Chinese'
   contentDir = 'content.zh'
-  weight = 2
-
-[languages.he]
-  languageName = 'Hebrew'
-  contentDir = 'content.he'
-  languageDirection = 'rtl'
   weight = 3
 
 [menu]
@@ -67,6 +66,10 @@ enableGitInfo = true
   # If the logo is /static/logo.png then the path would be logo.png
   # BookLogo = 'logo.png'
 
+  # (Optional, default none) Set leaf bundle to render as side menu
+  # When not specified file structure and weights will be used
+  # BookMenuBundle = '/menu'
+
   # (Optional, default docs) Specify root page to render child pages as menu.
   # Page is resoled by .GetPage function: https://gohugo.io/functions/getpage/
   # For backward compatibility you can set '*' to render all sections to menu. Acts same as '/'

exampleSite/hugo.yaml

@@ -25,14 +25,13 @@ languages:
     languageName: English
     contentDir: content.en
     weight: 1
+  ru:
+    languageName: Russian
+    contentDir: content.ru
+    weight: 2
   zh:
     languageName: Chinese
     contentDir: content.zh
-    weight: 2
-  he:
-    languageName: Hebrew
-    contentDir: content.he
-    languageDirection: rtl
     weight: 3
 
 menu:
@@ -63,6 +62,10 @@ params:
   # If the logo is /static/logo.png then the path would be logo.png
   # BookLogo: /logo.png
 
+  # (Optional, default none) Set leaf bundle to render as side menu
+  # When not specified file structure and weights will be used
+  # BookMenuBundle: /menu
+
   # (Optional, default docs) Specify root page to render child pages as menu.
   # Page is resoled by .GetPage function: https://gohugo.io/functions/getpage/
   # For backward compatibility you can set '*' to render all sections to menu. Acts same as '/'

exampleSite/resources/_gen/assets/book.scss_b807c86e8030af4cdc30edccea379f5f.json

@@ -1 +0,0 @@
-{"Target":"book.min.6c8b9d2a1fc95075ed7da46ca81060b39add8fff6741ac51259f768929281e2c.css","MediaType":"text/css","Data":{"Integrity":"sha256-bIudKh/JUHXtfaRsqBBgs5rdj/9nQaxRJZ92iSkoHiw="}}

exampleSite/resources/_gen/assets/book.scss_e129fe35b8d0a70789c8a08429469073.json

@@ -0,0 +1 @@
+{"Target":"book.min.309b7ed028807cdb68d8d61e26d609f48369c098dbf5e4d8c0dcf4cdf49feafc.css","MediaType":"text/css","Data":{"Integrity":"sha256-MJt+0CiAfNto2NYeJtYJ9INpwJjb9eTYwNz0zfSf6vw="}}

i18n/nl.yaml

@@ -1,14 +0,0 @@
-- id: Search
-  translation: Zoeken
-
-- id: Edit this page
-  translation: Bewerk deze pagina
-
-- id: Last modified by
-  translation: Laatst gewijzigd door
-
-- id: Expand
-  translation: Uitbreiden
-
-- id: bookSearchConfig
-  translation: '{ cache: true }'

i18n/oc.yaml

@@ -1,14 +0,0 @@
-- id: Search
-  translation: Recercar
-
-- id: Edit this page
-  translation: Modificar aquesta pagina
-
-- id: Last modified by
-  translation: Darrièra modificacion per
-
-- id: Expand
-  translation: Desplegar
-
-- id: bookSearchConfig
-  translation: '{ cache: true }'

i18n/pl.yaml

@@ -1,14 +0,0 @@
-- id: Search
-  translation: Szukaj
-
-- id: Edit this page
-  translation: Edytuj stronę
-
-- id: Last modified by
-  translation: Ostatnia modyfikacja
-
-- id: Expand
-  translation: Rozwiń
-
-- id: bookSearchConfig
-  translation: '{ cache: true }'

layouts/partials/docs/brand.html

@@ -1,7 +1,7 @@
 <h2 class="book-brand">
-  <a class="flex align-center" href="{{ cond (not .Site.Home.File) .Sites.Default.Home.RelPermalink .Site.Home.RelPermalink }}">
+  <a class="flex align-center" href="{{ cond (not .Site.Home.File) .Sites.First.Home.RelPermalink .Site.Home.RelPermalink }}">
     {{- with .Site.Params.BookLogo -}}
-    <img src="{{ . | relURL }}" alt="Logo" class="book-icon" />
+    <img src="{{ . | relURL }}" alt="Logo" />
     {{- end -}}
     <span>{{ .Site.Title }}</span>
   </a>

layouts/partials/docs/footer.html

@@ -3,7 +3,8 @@
 {{ if and .GitInfo .Site.Params.BookRepo }}
   <div>
     {{- $date := partial "docs/date" (dict "Date" .GitInfo.AuthorDate.Local "Format" .Site.Params.BookDateFormat) -}}
-    <a class="flex align-center" href="{{ partial "docs/links/commit" . }}" title='{{ i18n "Last modified by" }} {{ .GitInfo.AuthorName }} | {{ $date }}' target="_blank" rel="noopener">
+    {{- $commitPath := default "commit" .Site.Params.BookCommitPath -}}
+    <a class="flex align-center" href="{{ .Site.Params.BookRepo }}/{{ $commitPath }}/{{ .GitInfo.Hash }}" title='{{ i18n "Last modified by" }} {{ .GitInfo.AuthorName }} | {{ $date }}' target="_blank" rel="noopener">
       <img src="{{ "svg/calendar.svg" | relURL }}" class="book-icon" alt="" />
       <span>{{ $date }}</span>
     </a>
@@ -12,7 +13,7 @@
 
 {{ if and .File .Site.Params.BookRepo .Site.Params.BookEditPath }}
   <div>
-    <a class="flex align-center" href="{{ partial "docs/links/edit" . }}" target="_blank" rel="noopener">
+    <a class="flex align-center" href="{{ .Site.Params.BookRepo }}/{{ .Site.Params.BookEditPath }}/{{ .Site.Params.contentDir | default "content" }}/{{ replace .File.Path "\\" "/" }}" target="_blank" rel="noopener">
       <img src="{{ "svg/edit.svg" | relURL }}" class="book-icon" alt="" />
       <span>{{ i18n "Edit this page" }}</span>
     </a>

layouts/partials/docs/header.html

@@ -3,7 +3,7 @@
     <img src="{{ "svg/menu.svg" | relURL }}" class="book-icon" alt="Menu" />
   </label>
 
-  <h3>{{ partial "docs/title" . }}</h3>
+  <strong>{{ partial "docs/title" . }}</strong>
 
   <label for="toc-control">
     {{ if default true (default .Site.Params.BookToC .Params.BookToC) }}

layouts/partials/docs/html-head-favicon.html

@@ -1 +0,0 @@
-<link rel="icon" href="{{ .Site.Params.BookFavicon | default "favicon.png" | relURL }}" >

layouts/partials/docs/html-head.html

@@ -12,19 +12,20 @@
 {{- template "_internal/opengraph.html" . -}}
 
 <title>{{ partial "docs/html-head-title" . }}</title>
-{{ partial "docs/html-head-favicon" . }}
 
 {{- $manifest := resources.Get "manifest.json" | resources.ExecuteAsTemplate "manifest.json" . }}
 <link rel="manifest" href="{{ $manifest.RelPermalink }}">
+<link rel="icon" href="{{ .Site.Params.BookFavicon | default "favicon.png" | relURL }}" >
 <link rel="canonical" href="{{ .Permalink }}">
 
 {{- range .Translations }}
-  <link rel="alternate" hreflang="{{ default .Site.LanguageCode .Language.Lang }}" href="{{ .Permalink }}" title="{{ partial "docs/title" . }}">
+  <link rel="alternate" hreflang="{{ default .Language.Lang .Site.LanguageCode }}" href="{{ .Permalink }}" title="{{ partial "docs/title" . }}">
 {{- end -}}
 
 <!-- Theme stylesheet, you can customize scss by creating `assets/custom.scss` in your website -->
-{{- $styles := resources.Get "book.scss" | resources.ExecuteAsTemplate "book.scss" . | css.Sass | resources.Minify | resources.Fingerprint }}
+{{- $styles := resources.Get "book.scss" | resources.ExecuteAsTemplate "book.scss" . | resources.ToCSS | resources.Minify | resources.Fingerprint }}
 <link rel="stylesheet" href="{{ $styles.RelPermalink }}" {{ template "integrity" $styles }}>
+
 {{- if default true .Site.Params.BookSearch -}}
   {{- $searchJSFile := printf "%s.search.js" .Language.Lang }}
   {{- $searchJS := resources.Get "search.js" | resources.ExecuteAsTemplate $searchJSFile . | resources.Minify | resources.Fingerprint }}

layouts/partials/docs/languages.html

@@ -23,7 +23,7 @@
     <ul>
       {{ range .Site.Languages }}{{ with index $translations .Lang }}
       <li>
-        <a href="{{ cond hugo.IsMultihost .Permalink .RelPermalink }}">
+        <a href="{{ .Permalink }}">
           {{ .Language.LanguageName }}
         </a>
       </li>

layouts/partials/docs/links/commit.html

@@ -1,2 +0,0 @@
-{{- $commitPath := default "commit" .Site.Params.BookCommitPath -}}
-{{- .Site.Params.BookRepo }}/{{ $commitPath }}/{{ .GitInfo.Hash -}}

layouts/partials/docs/links/edit.html

@@ -1,2 +0,0 @@
-{{- $bookFilePath := (strings.TrimPrefix hugo.WorkingDir .Page.File.Filename | path.Join) -}}
-{{- .Site.Params.BookRepo }}/{{ .Site.Params.BookEditPath }}{{ ($bookFilePath) -}}

layouts/partials/docs/menu-bundle.html

@@ -0,0 +1,5 @@
+{{ with .Site.GetPage .Site.Params.BookMenuBundle }}
+  {{- $href := printf "href=\"%s\"" $.RelPermalink -}}
+  {{- replace .Content $href (print $href "class=active") | safeHTML -}}
+  {{- warnf "Bundle menu mode is deprecated and will be removed" -}}
+{{ end }}

layouts/partials/docs/menu-filetree.html

@@ -9,7 +9,7 @@
 
 {{ define "book-section-children" }}{{/* (dict "Section" .Section "CurrentPage" .CurrentPage) */}}
   <ul>
-    {{ range (where .Section.Pages "Params.bookHidden" "ne" true) }}
+    {{ range (where .Section.Pages "Params.bookhidden" "ne" true) }}
       {{ if .IsSection }}
         <li {{- if .Params.BookFlatSection }} class="book-section-flat" {{ end -}}>
           {{ template "book-page-link" (dict "Page" . "CurrentPage" $.CurrentPage) }}

layouts/partials/docs/menu.html

@@ -8,7 +8,11 @@
 {{ partial "docs/inject/menu-before" . }}
 {{ partial "docs/menu-hugo" .Site.Menus.before }}
 
-{{ partial "docs/menu-filetree" . }}
+{{ if .Site.Params.BookMenuBundle }}
+  {{ partial "docs/menu-bundle" . }}
+{{ else }}
+  {{ partial "docs/menu-filetree" . }}
+{{ end }}
 
 {{ partial "docs/menu-hugo" .Site.Menus.after }}
 {{ partial "docs/inject/menu-after" . }}

layouts/partials/docs/post-meta.html

@@ -1,16 +1,23 @@
 {{ with .Date }}
-  <div class="flex align-center text-small book-post-date">
+  <h5>{{ partial "docs/date" (dict "Date" . "Format" $.Site.Params.BookDateFormat) }}</h5>
-    <img src="{{ "svg/calendar.svg" | relURL }}" class="book-icon " alt="" />
-    <span>{{ partial "docs/date" (dict "Date" . "Format" $.Site.Params.BookDateFormat) }}</span>
-  </div>
 {{ end }}
 
 {{ range $taxonomy, $_ := .Site.Taxonomies }}
   {{ with $terms := $.GetTerms $taxonomy }}
-  <div class="text-small">
+  <div>
     {{ range $n, $term := $terms }}{{ if $n }}, {{ end }}
       <a href="{{ $term.RelPermalink }}">{{ $term.Title }}</a>
     {{- end }}
   </div>
   {{ end }}
 {{ end }}
+
+{{ if .Params.image }}
+<p>
+  {{ with .Resources.GetMatch .Params.image }}
+    <img src={{ .RelPermalink }} />
+  {{ else }}
+    <img src={{ .Params.image | relURL }} />
+  {{ end }}
+</p>
+{{ end }}

layouts/posts/list.html

@@ -5,12 +5,12 @@
       <a href="{{ .RelPermalink }}">{{ partial "docs/title.html" . }}</a>
     </h2>
     {{ partial "docs/post-meta" . }}
-    <div class="book-post-content">
+    <p>
       {{- .Summary -}}
       {{ if .Truncated }}
         <a href="{{ .RelPermalink }}">...</a>
       {{ end }}
-    </div>
+    </p>
   </article>
   {{ end }}
 

layouts/posts/single.html

@@ -1,12 +1,10 @@
 {{ define "main" }}
 <article class="markdown book-post">
   <h1>
-    {{ partial "docs/title.html" . }}
+    <a href="{{ .RelPermalink }}">{{ partial "docs/title.html" . }}</a>
   </h1>
   {{ partial "docs/post-meta" . }}
-  <div class="book-post-content">
+  {{- .Content -}}
-    {{- .Content -}}
-  </div>
 </article>
 {{ end }}
 

layouts/shortcodes/button.html

@@ -1,12 +1,12 @@
-{{- $ref := "" }}
+{{ $ref := "" }}
-{{- $target := "" -}}
+{{ $target := "" }}
-{{- with .Get "href" -}}
+{{ with .Get "href" }}
-  {{- $ref = . -}}
+  {{ $ref = . }}
-  {{- $target = "_blank" -}}
+  {{ $target = "_blank" }}
-{{- end -}}
+{{ end }}
-{{- with .Get "relref" -}}
+{{ with .Get "relref" }}
-  {{- $ref = relref $ . -}}
+  {{ $ref = relref $ . }}
-{{- end -}}
+{{ end }}
 <a {{ with $ref }} href="{{.}}" {{ end }} {{ with $target }} target="{{.}}" rel="noopener" {{ end }} class="book-btn{{ with .Get "class" }} {{ . }}{{ end }}">
-  {{- .InnerDeindent -}}
+  {{ .Inner | .Page.RenderString }}
 </a>

layouts/shortcodes/columns.html

@@ -1,9 +1,7 @@
-{{- $ratio := (split (.Get "ratio") ":") -}}
+<div class="book-columns flex flex-wrap">
-<div class="book-columns flex flex-wrap{{ with .Get "class" }} {{ . }}{{ end }}">
+{{ range split .Inner "<--->" }}
-{{ range $index, $content := split .InnerDeindent "<--->" }}
+  <div class="flex-even markdown-inner">
-  {{- $grow := default 1 (index $ratio $index) -}}
+    {{ . | $.Page.RenderString }}
-  <div class="flex-even markdown-inner" style="flex-grow: {{ $grow }};">
-    {{ $content | safeHTML }}
   </div>
 {{ end }}
 </div>

layouts/shortcodes/details.html

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

layouts/shortcodes/expand.html

@@ -0,0 +1,13 @@
+{{ warnf "Expand shortcode is deprecated. Use 'details' instead." }}
+<div class="book-expand">
+  <label>
+    <div class="book-expand-head flex justify-between">
+      <span>{{ default (i18n "Expand") (.Get 0) }}</span>
+      <span>{{ default "↕" (.Get 1) }}</span>
+    </div>
+    <input type="checkbox" class="hidden" />
+    <div class="book-expand-content markdown-inner">
+      {{ .Inner | markdownify }}
+    </div>
+  </label>
+</div>

layouts/shortcodes/hint.html

@@ -1,3 +1,3 @@
 <blockquote class="book-hint {{ .Get 0 }}">
-  {{ .Inner | safeHTML }}
+  {{ .Inner | .Page.RenderString }}
 </blockquote>

layouts/shortcodes/html.html

@@ -1 +1 @@
-{{- .Inner | safeHTML -}}
+{{- .Inner -}}

layouts/shortcodes/i18n.html

@@ -1,2 +0,0 @@
-{{- $content := .Get 0 -}}
-{{- default $content (i18n $content) -}}

layouts/shortcodes/katex.html

@@ -8,6 +8,6 @@
 
 <span {{- with .Get "class" }} class="{{ . }}"{{ end }}>
   {{ with .Get "display" }}\[{{else}}\({{end}}
-  {{- .InnerDeindent -}}
+  {{- trim .Inner "\n" -}}
   {{ with .Get "display" }}\]{{else}}\){{end}}
 </span>

layouts/shortcodes/mermaid.html

@@ -7,6 +7,6 @@
 {{ .Page.Scratch.Set "mermaid" true }}
 {{ end }}
 
-<pre class="mermaid{{ with .Get "class" }} {{ . }}{{ end }}">
+<p class="mermaid{{ with .Get "class" }} {{ . }}{{ end }}">
   {{- .Inner -}}
-</pre>
+</p>

layouts/shortcodes/section.html

@@ -1,4 +1,3 @@
-{{- warnf "Section shortcode is deprecated and will be removed" -}}
 <dl>
 {{ range .Page.Pages }}
   <dt>

layouts/shortcodes/tab.html

@@ -1,9 +1,12 @@
-{{- $group := printf "tabs-%v" (default .Parent.Ordinal (.Parent.Get 0)) -}}
+{{ if .Parent }}
-{{- $tab := printf "%s-%d" $group .Ordinal }}
+  {{ $name := .Get 0 }}
-<input type="radio" class="toggle" name="{{ $group }}" id="{{ $tab }}" {{ if not .Ordinal }}checked="checked"{{ end }} />
+  {{ $group := printf "tabs-%s" (.Parent.Get 0) }}
-<label for="{{ $tab }}">
+
-  {{- .Get 0 -}}
+  {{ if not (.Parent.Scratch.Get $group) }}
-</label>
+    {{ .Parent.Scratch.Set $group slice }}
-<div class="book-tabs-content markdown-inner">
+  {{ end }}
-  {{- .Inner -}}
+
-</div>
+  {{ .Parent.Scratch.Add $group (dict "Name" $name "Content" .Inner) }}
+{{ else }}
+  {{ errorf "%q: 'tab' shortcode must be inside 'tabs' shortcode" .Page.Path }}
+{{ end}}

layouts/shortcodes/tabs.html

@@ -1,3 +1,15 @@
+{{ if .Inner }}{{ end }}
+{{ $id := .Get 0 }}
+{{ $group := printf "tabs-%s" $id }}
+
 <div class="book-tabs">
-{{ .Inner }}
+{{- range $index, $tab := .Scratch.Get $group -}}
+  <input type="radio" class="toggle" name="{{ $group }}" id="{{ printf "%s-%d" $group $index }}" {{ if not $index }}checked="checked"{{ end }} />
+  <label for="{{ printf "%s-%d" $group $index }}">
+    {{- $tab.Name -}}
+  </label>
+  <div class="book-tabs-content markdown-inner">
+    {{- .Content | $.Page.RenderString -}}
+  </div>
+{{- end -}}
 </div>

resources/_gen/assets/book.scss_e129fe35b8d0a70789c8a08429469073.json

@@ -0,0 +1 @@
+{"Target":"book.min.309b7ed028807cdb68d8d61e26d609f48369c098dbf5e4d8c0dcf4cdf49feafc.css","MediaType":"text/css","Data":{"Integrity":"sha256-MJt+0CiAfNto2NYeJtYJ9INpwJjb9eTYwNz0zfSf6vw="}}

static/favicon.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px"><path d="M480-160q-48-38-104-59t-116-21q-42 0-82.5 11T100-198q-21 11-40.5-1T40-234v-482q0-11 5.5-21T62-752q46-24 96-36t102-12q58 0 113.5 15T480-740v484q51-32 107-48t113-16q36 0 70.5 6t69.5 18v-480q15 5 29.5 10.5T898-752q11 5 16.5 15t5.5 21v482q0 23-19.5 35t-40.5 1q-37-20-77.5-31T700-240q-60 0-116 21t-104 59Zm80-200v-380l200-200v400L560-360Zm-160 65v-396q-33-14-68.5-21.5T260-720q-37 0-72 7t-68 21v397q35-13 69.5-19t70.5-6q36 0 70.5 6t69.5 19Zm0 0v-396 396Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M3 18h12v-2H3v2zM3 6v2h18V6H3zm0 7h18v-2H3v2z"/></svg>

static/katex/auto-render.min.js

@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("katex")):"function"==typeof define&&define.amd?define(["katex"],t):"object"==typeof exports?exports.renderMathInElement=t(require("katex")):e.renderMathInElement=t(e.katex)}("undefined"!=typeof self?self:this,(function(e){return function(){"use strict";var t={771:function(t){t.exports=e}},n={};function r(e){var o=n[e];if(void 0!==o)return o.exports;var i=n[e]={exports:{}};return t[e](i,i.exports,r),i.exports}r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,{a:t}),t},r.d=function(e,t){for(var n in t)r.o(t,n)&&!r.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)};var o={};return function(){r.d(o,{default:function(){return d}});var e=r(771),t=r.n(e);const n=function(e,t,n){let r=n,o=0;const i=e.length;for(;r<t.length;){const n=t[r];if(o<=0&&t.slice(r,r+i)===e)return r;"\\"===n?r++:"{"===n?o++:"}"===n&&o--,r++}return-1},i=/^\\begin{/;var a=function(e,t){let r;const o=[],a=new RegExp("("+t.map((e=>e.left.replace(/[-/\\^$*+?.()|[\]{}]/g,"\\$&"))).join("|")+")");for(;r=e.search(a),-1!==r;){r>0&&(o.push({type:"text",data:e.slice(0,r)}),e=e.slice(r));const a=t.findIndex((t=>e.startsWith(t.left)));if(r=n(t[a].right,e,t[a].left.length),-1===r)break;const l=e.slice(0,r+t[a].right.length),s=i.test(l)?l:e.slice(t[a].left.length,r);o.push({type:"math",data:s,rawData:l,display:t[a].display}),e=e.slice(r+t[a].right.length)}return""!==e&&o.push({type:"text",data:e}),o};const l=function(e,n){const r=a(e,n.delimiters);if(1===r.length&&"text"===r[0].type)return null;const o=document.createDocumentFragment();for(let e=0;e<r.length;e++)if("text"===r[e].type)o.appendChild(document.createTextNode(r[e].data));else{const i=document.createElement("span");let a=r[e].data;n.displayMode=r[e].display;try{n.preProcess&&(a=n.preProcess(a)),t().render(a,i,n)}catch(i){if(!(i instanceof t().ParseError))throw i;n.errorCallback("KaTeX auto-render: Failed to parse `"+r[e].data+"` with ",i),o.appendChild(document.createTextNode(r[e].rawData));continue}o.appendChild(i)}return o},s=function(e,t){for(let n=0;n<e.childNodes.length;n++){const r=e.childNodes[n];if(3===r.nodeType){let o=r.textContent,i=r.nextSibling,a=0;for(;i&&i.nodeType===Node.TEXT_NODE;)o+=i.textContent,i=i.nextSibling,a++;const s=l(o,t);if(s){for(let e=0;e<a;e++)r.nextSibling.remove();n+=s.childNodes.length-1,e.replaceChild(s,r)}else n+=a}else if(1===r.nodeType){const e=" "+r.className+" ";-1===t.ignoredTags.indexOf(r.nodeName.toLowerCase())&&t.ignoredClasses.every((t=>-1===e.indexOf(" "+t+" ")))&&s(r,t)}}};var d=function(e,t){if(!e)throw new Error("No element provided to render");const n={};for(const e in t)t.hasOwnProperty(e)&&(n[e]=t[e]);n.delimiters=n.delimiters||[{left:"$$",right:"$$",display:!0},{left:"\\(",right:"\\)",display:!1},{left:"\\begin{equation}",right:"\\end{equation}",display:!0},{left:"\\begin{align}",right:"\\end{align}",display:!0},{left:"\\begin{alignat}",right:"\\end{alignat}",display:!0},{left:"\\begin{gather}",right:"\\end{gather}",display:!0},{left:"\\begin{CD}",right:"\\end{CD}",display:!0},{left:"\\[",right:"\\]",display:!0}],n.ignoredTags=n.ignoredTags||["script","noscript","style","textarea","pre","code","option"],n.ignoredClasses=n.ignoredClasses||[],n.errorCallback=n.errorCallback||console.error,n.macros=n.macros||{},s(e,n)}}(),o=o.default}()}));
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("katex")):"function"==typeof define&&define.amd?define(["katex"],t):"object"==typeof exports?exports.renderMathInElement=t(require("katex")):e.renderMathInElement=t(e.katex)}("undefined"!=typeof self?self:this,function(e){return function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}return r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=1)}([function(t,r){t.exports=e},function(e,t,r){"use strict";r.r(t);var n=r(0),o=r.n(n),a=function(e,t,r){for(var n=r,o=0,a=e.length;n<t.length;){var i=t[n];if(o<=0&&t.slice(n,n+a)===e)return n;"\\"===i?n++:"{"===i?o++:"}"===i&&o--,n++}return-1},i=function(e,t,r,n){for(var o=[],i=0;i<e.length;i++)if("text"===e[i].type){var l=e[i].data,d=!0,s=0,f=void 0;for(-1!==(f=l.indexOf(t))&&(s=f,o.push({type:"text",data:l.slice(0,s)}),d=!1);;){if(d){if(-1===(f=l.indexOf(t,s)))break;o.push({type:"text",data:l.slice(s,f)}),s=f}else{if(-1===(f=a(r,l,s+t.length)))break;o.push({type:"math",data:l.slice(s+t.length,f),rawData:l.slice(s,f+r.length),display:n}),s=f+r.length}d=!d}o.push({type:"text",data:l.slice(s)})}else o.push(e[i]);return o},l=function(e,t){for(var r=function(e,t){for(var r=[{type:"text",data:e}],n=0;n<t.length;n++){var o=t[n];r=i(r,o.left,o.right,o.display||!1)}return r}(e,t.delimiters),n=document.createDocumentFragment(),a=0;a<r.length;a++)if("text"===r[a].type)n.appendChild(document.createTextNode(r[a].data));else{var l=document.createElement("span"),d=r[a].data;t.displayMode=r[a].display;try{t.preProcess&&(d=t.preProcess(d)),o.a.render(d,l,t)}catch(e){if(!(e instanceof o.a.ParseError))throw e;t.errorCallback("KaTeX auto-render: Failed to parse `"+r[a].data+"` with ",e),n.appendChild(document.createTextNode(r[a].rawData));continue}n.appendChild(l)}return n};t.default=function(e,t){if(!e)throw new Error("No element provided to render");var r={};for(var n in t)t.hasOwnProperty(n)&&(r[n]=t[n]);r.delimiters=r.delimiters||[{left:"$$",right:"$$",display:!0},{left:"\\(",right:"\\)",display:!1},{left:"\\[",right:"\\]",display:!0}],r.ignoredTags=r.ignoredTags||["script","noscript","style","textarea","pre","code"],r.ignoredClasses=r.ignoredClasses||[],r.errorCallback=r.errorCallback||console.error,r.macros=r.macros||{},function e(t,r){for(var n=0;n<t.childNodes.length;n++){var o=t.childNodes[n];if(3===o.nodeType){var a=l(o.textContent,r);n+=a.childNodes.length-1,t.replaceChild(a,o)}else 1===o.nodeType&&function(){var t=" "+o.className+" ";-1===r.ignoredTags.indexOf(o.nodeName.toLowerCase())&&r.ignoredClasses.every(function(e){return-1===t.indexOf(" "+e+" ")})&&e(o,r)}()}}(e,r)}}]).default});