Merge remote-tracking branch 'origin/upstream'

# Conflicts:
#	INSTALL.md

Author: dfuchss

.github/workflows/docker-slim.yml

@@ -12,11 +12,7 @@ on:
     workflows: ["Docker Image CI"]
     types:
       - completed
-
-# on:
-#   push:
-#     branches:
-#       - 'master'
+  workflow_dispatch:
 
 jobs:
   build:
@@ -43,7 +39,7 @@ jobs:
           sed -i "s|\.:|${{ github.workspace }}:|g" ${{ github.workspace }}/docker-compose.yml
           cat ${{ github.workspace }}/docker-compose.yml
 
-      - uses: kitabisa/docker-slim-action@v1.1.1
+      - uses: kitabisa/docker-slim-action@v1.2.0
         env:
           DSLIM_PULL: true
           DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml

Gemfile.lock

@@ -9,35 +9,35 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.2)
+    activesupport (8.1.1)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bibtex-ruby (6.1.0)
+    base64 (0.3.0)
+    bibtex-ruby (6.2.0)
       latex-decode (~> 0.0)
+      logger (~> 1.7)
       racc (~> 1.7)
-    bigdecimal (3.1.9)
+    bigdecimal (3.3.1)
     citeproc (1.1.0)
       date
       forwardable
       json
       namae (~> 1.0)
       observer (< 1.0)
       open-uri (< 1.0)
-    citeproc-ruby (2.1.1)
+    citeproc-ruby (2.1.4)
       citeproc (~> 1.0, >= 1.0.9)
       csl (~> 2.0)
       observer (< 1.0)
@@ -46,23 +46,23 @@ GEM
       matrix (~> 0.4)
     colorator (1.1.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    connection_pool (2.5.4)
     crass (1.0.6)
-    csl (2.1.0)
+    csl (2.2.1)
       forwardable (~> 1.3)
       namae (~> 1.2)
       open-uri (< 1.0)
       rexml (~> 3.0)
       set (~> 1.1)
       singleton (< 1.0)
       time (< 1.0)
-    csl-styles (2.0.1)
+    csl-styles (2.0.2)
       csl (~> 2.0)
     css_parser (1.21.1)
       addressable
-    cssminify2 (2.0.1)
-    csv (3.3.4)
-    date (3.4.1)
+    cssminify2 (2.1.0)
+    csv (3.3.5)
+    date (3.5.0)
     deep_merge (1.2.2)
     drb (2.2.3)
     em-websocket (0.5.3)
@@ -71,7 +71,8 @@ GEM
     eventmachine (1.2.7)
     execjs (2.10.0)
     fast-stemmer (1.0.2)
-    feedjira (3.2.5)
+    feedjira (4.0.1)
+      logger (>= 1.0, < 2)
       loofah (>= 2.3.1, < 3)
       sax-machine (>= 1.0, < 2)
     ffi (1.17.2-aarch64-linux-gnu)
@@ -85,33 +86,33 @@ GEM
     forwardable (1.3.3)
     forwardable-extended (2.6.0)
     gemoji (4.1.0)
-    google-protobuf (4.31.0)
+    google-protobuf (4.33.1)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.31.0-aarch64-linux-gnu)
+    google-protobuf (4.33.1-aarch64-linux-gnu)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.31.0-aarch64-linux-musl)
+    google-protobuf (4.33.1-aarch64-linux-musl)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.31.0-arm64-darwin)
+    google-protobuf (4.33.1-arm64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.31.0-x86_64-darwin)
+    google-protobuf (4.33.1-x86_64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.31.0-x86_64-linux-gnu)
+    google-protobuf (4.33.1-x86_64-linux-gnu)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.31.0-x86_64-linux-musl)
+    google-protobuf (4.33.1-x86_64-linux-musl)
       bigdecimal
       rake (>= 13)
     html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     htmlcompressor (0.4.0)
     http_parser.rb (0.8.0)
-    httparty (0.23.1)
+    httparty (0.23.2)
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
@@ -150,20 +151,20 @@ GEM
     jekyll-jupyter-notebook (0.0.6)
       jekyll
     jekyll-link-attributes (1.0.1)
-    jekyll-minifier (0.1.10)
-      cssminify2 (~> 2.0)
+    jekyll-minifier (0.2.2)
+      cssminify2 (~> 2.1.0)
       htmlcompressor (~> 0.4)
-      jekyll (>= 3.5)
+      jekyll (~> 4.0)
       json-minify (~> 0.0.3)
-      uglifier (~> 4.1)
+      terser (~> 1.2.3)
     jekyll-paginate-v2 (3.0.0)
       jekyll (>= 3.0, < 5.0)
     jekyll-regex-replace (1.1.0)
     jekyll-sass-converter (3.1.0)
       sass-embedded (~> 1.75)
-    jekyll-scholar (7.2.0)
+    jekyll-scholar (7.2.2)
       bibtex-ruby (~> 6.0)
-      citeproc-ruby (~> 2.0)
+      citeproc-ruby (>= 2.1.3)
       csl-styles (~> 2.0)
       jekyll (~> 4.0)
     jekyll-sitemap (1.4.0)
@@ -180,7 +181,7 @@ GEM
       gemoji (>= 3, < 5)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    json (2.12.2)
+    json (2.16.0)
     json-minify (0.0.3)
       json (> 0)
     kramdown (2.5.1)
@@ -196,80 +197,78 @@ GEM
     loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    matrix (0.4.2)
+    matrix (0.4.3)
     mercenary (0.4.0)
     mini_mime (1.1.5)
-    minitest (5.25.5)
+    minitest (5.26.2)
     multi_xml (0.7.2)
       bigdecimal (~> 3.1)
     namae (1.2.0)
       racc (~> 1.7)
-    nokogiri (1.18.9-aarch64-linux-gnu)
+    nokogiri (1.18.10-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.9-aarch64-linux-musl)
+    nokogiri (1.18.10-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.9-arm-linux-gnu)
+    nokogiri (1.18.10-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.9-arm-linux-musl)
+    nokogiri (1.18.10-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.9-arm64-darwin)
+    nokogiri (1.18.10-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.9-x86_64-darwin)
+    nokogiri (1.18.10-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.9-x86_64-linux-gnu)
+    nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.9-x86_64-linux-musl)
+    nokogiri (1.18.10-x86_64-linux-musl)
       racc (~> 1.4)
     observer (0.1.2)
     open-uri (0.5.0)
       stringio
       time
       uri
-    ostruct (0.6.1)
+    ostruct (0.6.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (6.0.2)
     racc (1.8.1)
-    rake (13.2.1)
+    rake (13.3.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.4.2)
-    rouge (4.5.2)
+    rexml (3.4.4)
+    rouge (4.6.1)
     safe_yaml (1.0.5)
-    sass-embedded (1.89.0-aarch64-linux-gnu)
+    sass-embedded (1.94.2-aarch64-linux-gnu)
       google-protobuf (~> 4.31)
-    sass-embedded (1.89.0-aarch64-linux-musl)
+    sass-embedded (1.94.2-aarch64-linux-musl)
       google-protobuf (~> 4.31)
-    sass-embedded (1.89.0-arm-linux-gnueabihf)
+    sass-embedded (1.94.2-arm-linux-gnueabihf)
       google-protobuf (~> 4.31)
-    sass-embedded (1.89.0-arm-linux-musleabihf)
+    sass-embedded (1.94.2-arm-linux-musleabihf)
       google-protobuf (~> 4.31)
-    sass-embedded (1.89.0-arm64-darwin)
+    sass-embedded (1.94.2-arm64-darwin)
       google-protobuf (~> 4.31)
-    sass-embedded (1.89.0-x86_64-darwin)
+    sass-embedded (1.94.2-x86_64-darwin)
       google-protobuf (~> 4.31)
-    sass-embedded (1.89.0-x86_64-linux-gnu)
+    sass-embedded (1.94.2-x86_64-linux-gnu)
       google-protobuf (~> 4.31)
-    sass-embedded (1.89.0-x86_64-linux-musl)
+    sass-embedded (1.94.2-x86_64-linux-musl)
       google-protobuf (~> 4.31)
     sax-machine (1.3.2)
     securerandom (0.4.1)
     set (1.1.2)
     singleton (0.3.0)
-    stringio (3.1.7)
+    stringio (3.1.8)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    terser (1.2.5)
+    terser (1.2.6)
       execjs (>= 0.3.0, < 3)
     time (0.4.1)
       date
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    uglifier (4.2.1)
-      execjs (>= 0.3.0, < 3)
     unicode-display_width (2.6.0)
-    uri (1.0.3)
+    uri (1.1.1)
     webrick (1.9.1)
 
 PLATFORMS
@@ -313,4 +312,4 @@ DEPENDENCIES
   ostruct
 
 BUNDLED WITH
-   2.6.9
+   2.7.2

_layouts/distill.liquid

@@ -67,7 +67,7 @@
       {% endif %}
 
       <d-article>
-        {% if page.toc %}
+        {% if page.toc and page.toc.size > 0 %}
           <d-contents>
             <nav class="l-text figcaption">
               <h3>Contents</h3>
@@ -87,7 +87,16 @@
               {% endfor %}
             </nav>
           </d-contents>
+
+        {% elsif page.toc == true %}
+          <d-contents>
+            <nav class="l-text figcaption">
+              <h3>Contents</h3>
+              {% toc %}
+            </nav>
+          </d-contents>
         {% endif %}
+
         {{ content }}
       </d-article>
 

_plugins/external-posts.rb

@@ -25,7 +25,12 @@ def generate(site)
     def fetch_from_rss(site, src)
       xml = HTTParty.get(src['rss_url']).body
       return if xml.nil?
-      feed = Feedjira.parse(xml)
+      begin
+        feed = Feedjira.parse(xml)
+      rescue StandardError => e
+        puts "Error parsing RSS feed from #{src['rss_url']} - #{e.message}"
+        return
+      end
       process_entries(site, src, feed.entries)
     end
 

docker-compose.yml

@@ -1,7 +1,7 @@
 # this file uses prebuilt image in dockerhub
 services:
   jekyll:
-    image: amirpourmand/al-folio:v0.14.6
+    image: amirpourmand/al-folio:v0.14.7
     build: .
     # uncomment these if you are having this issue with the build:
     # /usr/local/bundle/gems/jekyll-4.3.4/lib/jekyll/site.rb:509:in `initialize': Permission denied @ rb_sysopen - /srv/jekyll/.jekyll-cache/.gitignore (Errno::EACCES)