Merge remote-tracking branch 'origin/upstream'

# Conflicts:
#	.github/workflows/broken-links.yml
#	CUSTOMIZE.md
#	INSTALL.md
#	LICENSE
#	README.md
#	_config.yml
#	_pages/about.md
#	_pages/blog.md
#	_pages/dropdown.md
#	_posts/2018-12-22-distill.md

Author: dfuchss

.gitattibutes .gitattributes.gitattibutes renamed to .gitattributes

@@ -7,6 +7,7 @@ on:
       - main
     paths:
       - "assets/**"
+      - "_sass/**"
       - "**.bib"
       - "**.html"
       - "**.js"
@@ -34,6 +35,7 @@ on:
       - main
     paths:
       - "assets/**"
+      - "_sass/**"
       - "**.bib"
       - "**.html"
       - "**.js"

.github/workflows/deploy.yml

@@ -4,7 +4,7 @@ gem 'jekyll'
 
 # Core plugins that directly affect site building
 group :jekyll_plugins do
-    gem 'jekyll-archives'
+    gem 'jekyll-archives-v2'
     gem 'jekyll-email-protect'
     gem 'jekyll-feed'
     gem 'jekyll-get-json'
@@ -32,7 +32,7 @@ group :other_plugins do
     gem 'httparty'
     gem 'observer'       # used by jekyll-scholar
     gem 'ostruct'        # used by jekyll-twitter-plugin
-    gem 'terser'         # used by jekyll-terser
+    # gem 'terser'         # used by jekyll-terser
     # gem 'unicode_utils' -- should be already installed by jekyll
     # gem 'webrick' -- should be already installed by jekyll
 end

Gemfile

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/RobertoJBeltran/jekyll-terser.git
-  revision: 2f737004fe4732b92021c84e4de71e6a8585ff01
+  revision: 1085bf66d692799af09fe39f8162a1e6e42a3cc4
   specs:
-    jekyll-terser (0.2.2)
+    jekyll-terser (0.2.3)
       jekyll (>= 0.10.0)
       terser (>= 1.0.0)
 
@@ -30,8 +30,13 @@ GEM
       latex-decode (~> 0.0)
       racc (~> 1.7)
     bigdecimal (3.1.9)
-    citeproc (1.0.10)
+    citeproc (1.1.0)
+      date
+      forwardable
+      json
       namae (~> 1.0)
+      observer (< 1.0)
+      open-uri (< 1.0)
     citeproc-ruby (1.1.14)
       citeproc (~> 1.0, >= 1.0.9)
       csl (~> 1.6)
@@ -51,6 +56,7 @@ GEM
       addressable
     cssminify2 (2.0.1)
     csv (3.3.2)
+    date (3.4.1)
     deep_merge (1.2.2)
     drb (2.2.1)
     em-websocket (0.5.3)
@@ -70,6 +76,7 @@ GEM
     ffi (1.17.1-x86_64-darwin)
     ffi (1.17.1-x86_64-linux-gnu)
     ffi (1.17.1-x86_64-linux-musl)
+    forwardable (1.3.3)
     forwardable-extended (2.6.0)
     gemoji (4.1.0)
     google-protobuf (4.29.3)
@@ -96,25 +103,29 @@ GEM
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    jekyll (4.3.4)
+    jekyll (4.4.1)
       addressable (~> 2.4)
+      base64 (~> 0.2)
       colorator (~> 1.0)
+      csv (~> 3.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
       jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
+      json (~> 2.6)
       kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (>= 0.3.6, < 0.5)
+      mercenary (~> 0.3, >= 0.3.6)
       pathutil (~> 0.9)
       rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
       terminal-table (>= 1.8, < 4.0)
       webrick (~> 1.7)
-    jekyll-archives (2.3.0)
+    jekyll-archives-v2 (0.0.6)
+      activesupport
       jekyll (>= 3.6, < 5.0)
     jekyll-email-protect (1.1.0)
     jekyll-feed (0.17.0)
@@ -136,8 +147,8 @@ GEM
     jekyll-paginate-v2 (3.0.0)
       jekyll (>= 3.0, < 5.0)
     jekyll-regex-replace (1.1.0)
-    jekyll-sass-converter (3.0.0)
-      sass-embedded (~> 1.54)
+    jekyll-sass-converter (3.1.0)
+      sass-embedded (~> 1.75)
     jekyll-scholar (7.1.3)
       bibtex-ruby (~> 6.0)
       citeproc-ruby (~> 1.0)
@@ -157,7 +168,7 @@ GEM
       gemoji (>= 3, < 5)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    json (2.9.1)
+    json (2.10.1)
     json-minify (0.0.3)
       json (> 0)
     kramdown (2.5.1)
@@ -169,7 +180,7 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.5)
+    logger (1.6.6)
     loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -181,23 +192,27 @@ GEM
       bigdecimal (~> 3.1)
     namae (1.2.0)
       racc (~> 1.7)
-    nokogiri (1.18.1-aarch64-linux-gnu)
+    nokogiri (1.18.3-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.1-aarch64-linux-musl)
+    nokogiri (1.18.3-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.1-arm-linux-gnu)
+    nokogiri (1.18.3-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.1-arm-linux-musl)
+    nokogiri (1.18.3-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.1-arm64-darwin)
+    nokogiri (1.18.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.1-x86_64-darwin)
+    nokogiri (1.18.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.1-x86_64-linux-gnu)
+    nokogiri (1.18.3-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.1-x86_64-linux-musl)
+    nokogiri (1.18.3-x86_64-linux-musl)
       racc (~> 1.4)
     observer (0.1.2)
+    open-uri (0.5.0)
+      stringio
+      time
+      uri
     ostruct (0.6.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
@@ -207,37 +222,40 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.4.0)
+    rexml (3.4.1)
     rouge (4.5.1)
     safe_yaml (1.0.5)
-    sass-embedded (1.83.4-aarch64-linux-gnu)
+    sass-embedded (1.85.1-aarch64-linux-gnu)
       google-protobuf (~> 4.29)
-    sass-embedded (1.83.4-aarch64-linux-musl)
+    sass-embedded (1.85.1-aarch64-linux-musl)
       google-protobuf (~> 4.29)
-    sass-embedded (1.83.4-arm-linux-gnueabihf)
+    sass-embedded (1.85.1-arm-linux-gnueabihf)
       google-protobuf (~> 4.29)
-    sass-embedded (1.83.4-arm-linux-musleabihf)
+    sass-embedded (1.85.1-arm-linux-musleabihf)
       google-protobuf (~> 4.29)
-    sass-embedded (1.83.4-arm64-darwin)
+    sass-embedded (1.85.1-arm64-darwin)
       google-protobuf (~> 4.29)
-    sass-embedded (1.83.4-x86_64-darwin)
+    sass-embedded (1.85.1-x86_64-darwin)
       google-protobuf (~> 4.29)
-    sass-embedded (1.83.4-x86_64-linux-gnu)
+    sass-embedded (1.85.1-x86_64-linux-gnu)
       google-protobuf (~> 4.29)
-    sass-embedded (1.83.4-x86_64-linux-musl)
+    sass-embedded (1.85.1-x86_64-linux-musl)
       google-protobuf (~> 4.29)
     sax-machine (1.3.2)
     securerandom (0.4.1)
+    stringio (3.1.5)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    terser (1.2.4)
+    terser (1.2.5)
       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.2)
+    uri (1.0.3)
     webrick (1.9.1)
 
 PLATFORMS
@@ -260,7 +278,7 @@ DEPENDENCIES
   feedjira
   httparty
   jekyll
-  jekyll-archives
+  jekyll-archives-v2
   jekyll-email-protect
   jekyll-feed
   jekyll-get-json
@@ -279,7 +297,6 @@ DEPENDENCIES
   jemoji
   observer
   ostruct
-  terser
 
 BUNDLED WITH
-   2.6.2
+   2.6.5

Gemfile.lock

@@ -138,24 +138,14 @@ newsletter:
 # -----------------------------------------------------------------------------
 
 collections:
+  books:
+    output: true
   news:
     defaults:
       layout: post
     output: true
-    permalink: /:collection/:title/
   projects:
     output: true
-    permalink: /:collection/:title/
-
-announcements:
-  enabled: false
-  scrollable: true # adds a vertical scroll bar if there are more than 3 news items
-  limit: 5 # leave blank to include all the news in the `_news` folder
-
-latest_posts:
-  enabled: false
-  scrollable: true # adds a vertical scroll bar if there are more than 3 new posts items
-  limit: 3 # leave blank to include all the blog posts
 
 # -----------------------------------------------------------------------------
 # Jekyll settings
@@ -202,7 +192,7 @@ keep_files:
 
 # Plug-ins
 plugins:
-  - jekyll-archives
+  - jekyll-archives-v2
   - jekyll-email-protect
   - jekyll-feed
   - jekyll-get-json
@@ -251,15 +241,14 @@ terser:
 # -----------------------------------------------------------------------------
 
 jekyll-archives:
-  enabled: [year, tags, categories] # enables year, tag and category archives (remove if you need to disable one of them).
-  layouts:
-    year: archive-year
-    tag: archive-tag
-    category: archive-category
-  permalinks:
-    year: "/blog/:year/"
-    tag: "/blog/tag/:name/"
-    category: "/blog/category/:name/"
+  posts:
+    enabled: [year, tags, categories] # enables year, tag and category archives (remove if you need to disable one of them).
+    permalinks:
+      year: "/blog/:year/"
+      tags: "/blog/:type/:name/"
+      categories: "/blog/:type/:name/"
+  books:
+    enabled: [year, tags, categories] # enables year, tag and category archives (remove if you need to disable one of them).
 
 display_tags: ["formatting", "images", "links", "math", "code", "blockquotes"] # these tags will be displayed on the front page of your blog
 display_categories: ["external-services"] # these categories will be displayed on the front page of your blog

_config.yml

@@ -278,7 +278,3 @@
   <script src="{{ '/assets/js/search-data.js' | relative_url }}"></script>
   <script src="{{ '/assets/js/shortcut-key.js' | relative_url | bust_file_cache }}"></script>
 {% endif %}
-
-{% if site.newsletter.enabled %}
-  <script defer src="{{ '/assets/js/newsletter.js' | relative_url | bust_file_cache }}"></script>
-{% endif %}

_includes/distill_scripts.liquid

@@ -1,16 +1,16 @@
 <div class="news">
-  {% if site.latest_posts != blank %}
+  {% if page.latest_posts != blank %}
     {% assign latest_posts_size = site.posts | size %}
     <div
       class="table-responsive"
-      {% if site.latest_posts.scrollable and latest_posts_size > 3 %}
+      {% if page.latest_posts.scrollable and latest_posts_size > 3 %}
         style="max-height: 60vw"
       {% endif %}
     >
       <table class="table table-sm table-borderless">
         {% assign latest_posts = site.posts %}
-        {% if site.latest_posts.limit %}
-          {% assign latest_posts_limit = site.latest_posts.limit %}
+        {% if page.latest_posts.limit %}
+          {% assign latest_posts_limit = page.latest_posts.limit %}
         {% else %}
           {% assign latest_posts_limit = latest_posts_size %}
         {% endif %}

_includes/latest_posts.liquid

@@ -3,14 +3,14 @@
     {% assign news_size = site.news | size %}
     <div
       class="table-responsive"
-      {% if include.limit and site.announcements.scrollable and news_size > 3 %}
+      {% if include.limit and page.announcements.scrollable and news_size > 3 %}
         style="max-height: 60vw"
       {% endif %}
     >
       <table class="table table-sm table-borderless">
         {% assign news = site.news | reverse %}
-        {% if include.limit and site.announcements.limit %}
-          {% assign news_limit = site.announcements.limit %}
+        {% if include.limit and page.announcements.limit %}
+          {% assign news_limit = page.announcements.limit %}
         {% else %}
           {% assign news_limit = news_size %}
         {% endif %}

_includes/news.liquid

@@ -13,7 +13,16 @@
   {% endunless %}
 
   <li class="my-2">
-    <a class="text-pink-700 underline font-semibold hover:text-pink-800" href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a>
+    {% if post.redirect == blank %}
+      <a class="text-pink-700 underline font-semibold hover:text-pink-800" href="{{ post.url | relative_url }}">{{ post.title }}</a>
+    {% elsif post.redirect contains '://' %}
+      <a class="text-pink-700 underline font-semibold hover:text-pink-800" href="{{ post.redirect }}" target="_blank">{{ post.title }}</a>
+      <svg width="1rem" height="1rem" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg">
+        <path d="M17 13.5v6H5v-12h6m3-3h6v6m0-6-9 9" class="icon_svg-stroke" stroke="#999" stroke-width="1.5" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"></path>
+      </svg>
+    {% else %}
+      <a class="text-pink-700 underline font-semibold hover:text-pink-800" href="{{ post.redirect | relative_url }}">{{ post.title }}</a>
+    {% endif %}
   </li>
 {% endfor %}
 {% if site.newsletter.enabled and site.footer_fixed %}