datalog-theme 0.7.0 → 0.8.0

data/_includes/head.html

@@ -11,15 +11,15 @@
   {% assign keyword_list = raw_keywords | replace: ';', ',' | split: ',' %}
 {% endif %}
 {% include meta/math-config.html page=page %}
+{%- comment -%} The math engine's URLs, which both the script tags below and the Content Security Policy use. {%- endcomment -%}
+{% assign default_katex_cdn = 'https://cdn.jsdelivr.net/npm/katex@0.16.9/dist/' %}
+{% assign katex_cdn = math_settings.katex_cdn | default: default_katex_cdn %}
+{% assign default_mathjax_url = 'https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml.js' %}
+{% assign mathjax_url = math_settings.mathjax_cdn | default: default_mathjax_url %}
 {% assign js_manifest = site.data.js_manifest %}
-{% assign syntax_config = site.theme_options.syntax_highlighting %}
-{% assign prism_cdn = syntax_config.cdn | default: 'https://cdn.jsdelivr.net/npm/prismjs@1.29.0' %}
-{% assign prism_theme = syntax_config.themes.dark | default: syntax_config.themes.light | default: 'prism-tomorrow' %}
-{% assign prism_theme_url = prism_cdn | append: '/themes/' | append: prism_theme | append: '.css' %}
-{% assign prism_line_numbers_url = prism_cdn | append: '/plugins/line-numbers/prism-line-numbers.min.css' %}
-{% include meta/syntax-config.html %}
 <meta charset="utf-8" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+{%- comment -%} Not include_cached: the CSP nonce is different on every page. {%- endcomment -%}
 {% include csp-meta.html %}
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <meta name="theme-color" content="#0b1d3d" />
@@ -30,7 +30,8 @@
 {% endif %}
 <meta name="generator" content="Jekyll" />
 <meta name="referrer" content="no-referrer-when-downgrade" />
-<meta name="robots" content="index,follow" />
+{%- comment -%} `robots:` in front matter keeps a page out of search results, as the 404, search and admin pages do. {%- endcomment %}
+<meta name="robots" content="{{ page.robots | default: 'index,follow' }}" />
 <meta name="format-detection" content="telephone=no" />
 <meta name="application-name" content="{{ site.title }}" />
 <meta property="og:site_name" content="{{ site.title }}" />
@@ -61,12 +62,31 @@
 <link rel="canonical" href="{{ canonical_url }}" />
 {% if js_manifest and js_manifest.core %}
 <link rel="modulepreload" href="{{ js_manifest.core | relative_url }}" crossorigin="anonymous" />
-{% if js_manifest.features and js_manifest.features.search and site.features.search %}
+{%- comment -%} Only a page that renders the search app uses the search bundle. {%- endcomment -%}
+{% if js_manifest.features and js_manifest.features.search and site.features.search and content contains 'data-search-app' %}
 <link rel="modulepreload" href="{{ js_manifest.features.search | relative_url }}" crossorigin="anonymous" />
 {% endif %}
 {% if js_manifest.features and js_manifest.features.math and math_enabled and math_engine == 'mathjax' %}
 <link rel="modulepreload" href="{{ js_manifest.features.math | relative_url }}" crossorigin="anonymous" />
 {% endif %}
+{%- comment -%}
+  The loader requests a feature bundle only after the core bundle has loaded.
+  Preloading the bundles this page will use, on the same tests the loader
+  applies, starts those downloads alongside core.
+{%- endcomment -%}
+{% if js_manifest.features and js_manifest.features.visualizations and site.features.visualizations and content contains 'data-viz-type' %}
+<link rel="modulepreload" href="{{ js_manifest.features.visualizations | relative_url }}" crossorigin="anonymous" />
+{% endif %}
+{% if js_manifest.features and js_manifest.features.notebook and page.notebook_post %}
+<link rel="modulepreload" href="{{ js_manifest.features.notebook | relative_url }}" crossorigin="anonymous" />
+{% endif %}
+{% if js_manifest.features and js_manifest.features.academic %}
+  {% if site.features.academic_dashboard or site.features.citation_tracking %}
+    {% if content contains 'data-citation-metric' or content contains 'data-citation-table' or content contains 'data-citation-chart' %}
+<link rel="modulepreload" href="{{ js_manifest.features.academic | relative_url }}" crossorigin="anonymous" />
+    {% endif %}
+  {% endif %}
+{% endif %}
 {% endif %}
 {% assign alternate_translations = page.translations %}
 {% if alternate_translations %}
@@ -93,19 +113,20 @@
 <title>{{ site.title }}</title>
 {% endif %}
 
+{%- comment -%}
+  Only the weights the stylesheet renders. Sans 700, Serif 400 and Mono 500
+  were requested as well, and no page of the demo site used them.
+{%- endcomment -%}
+{% assign google_fonts_url = 'https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:wght@300;400;500;600&family=IBM+Plex+Serif:wght@600;700&family=IBM+Plex+Mono:wght@400;600&display=swap' %}
 <link rel="preconnect" href="https://fonts.googleapis.com" />
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-<link rel="preload" href="{{ 'https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:wght@300;400;500;600;700&family=IBM+Plex+Serif:wght@400;600;700&family=IBM+Plex+Mono:wght@400;500;600&display=swap' | add_sri }}" as="style" />
-<link rel="stylesheet" href="{{ 'https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:wght@300;400;500;600;700&family=IBM+Plex+Serif:wght@400;600;700&family=IBM+Plex+Mono:wght@400;500;600&display=swap' | add_sri }}" media="print" data-async-style media="print" data-async-style />
+<link rel="preload" href="{{ google_fonts_url | add_sri }}" as="style" />
+<link rel="stylesheet" href="{{ google_fonts_url | add_sri }}" media="print" data-async-style />
 <noscript>
-  <link rel="stylesheet" href="{{ 'https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:wght@300;400;500;600;700&family=IBM+Plex+Serif:wght@400;600;700&family=IBM+Plex+Mono:wght@400;500;600&display=swap' | add_sri }}" />
+  <link rel="stylesheet" href="{{ google_fonts_url | add_sri }}" />
 </noscript>
 
 <link rel="preconnect" href="https://cdn.jsdelivr.net" crossorigin />
-{% if prism_enabled %}
-<link rel="stylesheet" href="{{ prism_theme_url | add_sri }}" />
-<link rel="stylesheet" href="{{ prism_line_numbers_url | add_sri }}" />
-{% endif %}
 {% assign critical_config = site.critical_css | default: {} %}
 {% assign critical_enabled = critical_config.enabled | default: false %}
 {% assign main_stylesheet = '/assets/css/main.css' | relative_url %}
@@ -166,13 +187,9 @@
 </script>
 
 {% if math_enabled %}
-  {% assign default_katex_cdn = 'https://cdn.jsdelivr.net/npm/katex@0.16.9/dist/' %}
-  {% assign katex_cdn = math_settings.katex_cdn | default: default_katex_cdn %}
   {% assign katex_stylesheet_url = katex_cdn | append: 'katex.min.css' %}
   {% assign katex_js_url = katex_cdn | append: 'katex.min.js' %}
   {% assign katex_autorender_url = katex_cdn | append: 'contrib/auto-render.min.js' %}
-  {% assign default_mathjax_url = 'https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml.js' %}
-  {% assign mathjax_url = math_settings.mathjax_cdn | default: default_mathjax_url %}
   {% if math_engine == 'katex' %}
 <link rel="stylesheet" href="{{ katex_stylesheet_url | add_sri }}" />
 <script defer src="{{ katex_js_url | add_sri }}"></script>
@@ -200,7 +217,10 @@
       displayMath: [['$$', '$$'], ['\\[', '\\]']],
       processEscapes: true,
       processEnvironments: true,
-      packages: { '[+]': ['ams', 'mathtools', 'physics', 'mhchem', 'require', 'boldsymbol', 'braket', 'cancel'] },
+      // No 'require': MathJax 3.2 stopped starting up with "Illegal characters
+      // used in \require prefix", and nothing was typeset. Every extension the
+      // pages use is loaded below, so authors never need \require.
+      packages: { '[+]': ['ams', 'mathtools', 'physics', 'mhchem', 'boldsymbol', 'braket', 'cancel'] },
       tags: 'all',
       tagSide: 'right',
       tagIndent: '1.25em',
@@ -226,7 +246,7 @@
     },
     loader: {
       load: [
-        '[tex]/require', '[tex]/ams', '[tex]/mathtools', '[tex]/physics', '[tex]/mhchem',
+        '[tex]/ams', '[tex]/mathtools', '[tex]/physics', '[tex]/mhchem',
         '[tex]/boldsymbol', '[tex]/braket', '[tex]/cancel', 'ui/menu', 'a11y/semantic-enrich', 'a11y/assistive-mml'
       ]
     },
@@ -239,7 +259,10 @@
         settings: {
           assistiveMml: true,
           collapsible: true,
-          explorer: true
+          // MathJax's explorer gives each equation tabindex="1" when it
+          // attaches, which takes the equations out of the page's tab order.
+          // The assistive MathML above is what screen readers read.
+          explorer: false
         }
       }
     },
@@ -268,7 +291,11 @@
         if (window.DatalogMath && typeof window.DatalogMath.onPageReady === 'function') {
           window.DatalogMath.onPageReady();
         }
-        return window.MathJax.startup.defaultPageReady();
+        // Scripts that act on typeset math wait for this event: until MathJax
+        // loads, window.MathJax is only this configuration object.
+        return window.MathJax.startup.defaultPageReady().then(() => {
+          document.dispatchEvent(new CustomEvent('datalog:math-ready'));
+        });
       }
     }
   };
@@ -319,14 +346,24 @@
 
 <link rel="alternate" type="application/atom+xml" title="{{ site.title }}" href="{{ '/feed.xml' | absolute_url }}" />
 <meta http-equiv="Permissions-Policy" content="interest-cohort=()" />
+{%- comment -%} A verification tag renders only when the site sets its code: an empty one verifies nothing. {%- endcomment %}
+{% if site.google_site_verification and site.google_site_verification != "" %}
 <meta name="google-site-verification" content="{{ site.google_site_verification }}" />
+{% endif %}
+{% if site.bing_site_verification and site.bing_site_verification != "" %}
 <meta name="msvalidate.01" content="{{ site.bing_site_verification }}" />
+{% endif %}
+{% if site.yandex_site_verification and site.yandex_site_verification != "" %}
 <meta name="yandex-verification" content="{{ site.yandex_site_verification }}" />
+{% endif %}
+{% if site.baidu_site_verification and site.baidu_site_verification != "" %}
 <meta name="baidu-site-verification" content="{{ site.baidu_site_verification }}" />
+{% endif %}
 <meta name="plausible-domain" content="{{ site.url | replace: 'https://', '' | replace: 'http://', '' }}" />
 
 <script nonce="{{ page.csp_nonce }}">
   document.documentElement.classList.add('js');
 </script>
 
+{%- comment -%} Not include_cached: its inline script carries the page's CSP nonce. {%- endcomment -%}
 {% include analytics.html %}

data/_includes/header/navigation.html

@@ -3,37 +3,34 @@
 required:
   - items
 optional:
-  - page
-  - contexts
+  - active
+  - lang
 ---
-Renders the primary navigation list with active state awareness.
+Renders the primary navigation list. `active` lists the indexes of the items that
+mark the current section, each between commas (",2,"); header.html works them out
+from the page. Nothing else here depends on the page, which is what lets
+header.html render this with include_cached. `lang` is passed only so that each
+page language gets its own copy of any translated descriptions.
 {%- endcomment -%}
 {%- assign nav_items = include.items | default: '' -%}
 {%- if nav_items == '' -%}
   {%- assign nav_items = '' | split: '' -%}
 {%- endif -%}
-{%- assign active_page = include.page | default: page -%}
-{%- assign contexts = include.contexts | default: '' -%}
-{%- if contexts == '' -%}
-  {%- assign contexts = '' | split: '' -%}
-{%- endif -%}
+{%- assign active_items = include.active | default: '' -%}
 <ul class="nav-list">
   {%- for item in nav_items -%}
     {%- assign item_url = item.url | relative_url -%}
+    {%- capture item_marker -%},{{ forloop.index0 }},{%- endcapture -%}
     {%- assign is_active = false -%}
+    {%- if active_items contains item_marker -%}
+      {%- assign is_active = true -%}
+    {%- endif -%}
     {%- assign nav_title = item.title | default: 'Untitled' | strip -%}
     {%- assign nav_section = item.section | default: nav_title | replace: '_', ' ' | replace: '-', ' ' | strip -%}
     {%- assign nav_description = item.description | default: '' -%}
     {%- if nav_description == '' and item.description_key -%}
       {%- capture nav_description -%}{% t item.description_key %}{%- endcapture -%}
     {%- endif -%}
-    {%- if active_page.url == item.url or active_page.url == item_url -%}
-      {%- assign is_active = true -%}
-    {%- elsif item.section and contexts contains item.section -%}
-      {%- assign is_active = true -%}
-    {%- elsif item.url != '/' and active_page.url contains item.url -%}
-      {%- assign is_active = true -%}
-    {%- endif -%}
     {%- if nav_description == '' -%}
       {%- assign nav_description = nav_section | default: nav_title -%}
       {%- assign nav_description = nav_description | append: ' resources' -%}

data/_includes/header.html

@@ -1,10 +1,31 @@
 {% assign localization_config = site.theme_options.localization %}
 {% assign navigation_data = site.data.navigation %}
+{%- comment -%} `header:` (or `main:`) in _data/navigation.yml lists the links. Without it the header has no navigation, rather than links to sections the site may not have. {%- endcomment -%}
+{% assign nav_items = navigation_data.header | default: navigation_data.main %}
+{%- comment -%}
+The navigation is the same on every page except for which links mark the current
+section, so header/navigation.html renders from the indexes of those links (",2,")
+and is cached for each distinct set.
+{%- endcomment -%}
+{% assign page_contexts = '' | split: '' %}
+{% if page.section %}{% assign page_contexts = page_contexts | push: page.section %}{% endif %}
+{% if page.layout %}{% assign page_contexts = page_contexts | push: page.layout %}{% endif %}
+{% if page.collection %}{% assign page_contexts = page_contexts | push: page.collection %}{% endif %}
+{% if page.type %}{% assign page_contexts = page_contexts | push: page.type %}{% endif %}
+{%- capture active_items -%}
+  {%- for item in nav_items -%}
+    {%- assign item_url = item.url | relative_url -%}
+    {%- if page.url == item.url or page.url == item_url -%},{{ forloop.index0 }}
+    {%- elsif item.section and page_contexts contains item.section -%},{{ forloop.index0 }}
+    {%- elsif item.url != '/' and page.url contains item.url -%},{{ forloop.index0 }}
+    {%- endif -%}
+  {%- endfor -%},
+{%- endcapture -%}
 <header class="site-header" role="banner" data-sticky-header>
   <div class="header-progress" aria-hidden="true">
     <progress class="header-progress__bar" value="0" max="100" data-scroll-progress></progress>
   </div>
-  <div class="visually-hidden" aria-live="polite" id="progress-announcement">Reading progress: <span data-scroll-progress-value>0</span>%</div>
+  {%- comment -%} No live region for the percentage: screen readers announced it on every scroll event. {%- endcomment %}
   <div class="container header-container">
     <div class="header-primary">
       {% assign brand_symbol = site.brand.accent_symbol | default: '∀ data · Σ insights' | strip %}
@@ -18,7 +39,7 @@
           </svg>
         </span>
         <span class="site-title-group">
-          <span class="site-title">{{ site.name | default: 'DataLog' }}</span>
+          <span class="site-title">{{ site.name | default: site.title }}</span>
           <span class="site-tagline">{{ brand_symbol }}</span>
         </span>
       </a>
@@ -41,30 +62,18 @@
             </svg>
           </button>
           {% endif %}
+          {% if nav_items.size > 0 %}
           <button class="header-control header-control--icon nav-toggle" type="button" aria-expanded="false" aria-controls="site-nav" aria-label="Toggle navigation">
             <span aria-hidden="true">☰</span>
           </button>
+          {% endif %}
         </div>
       </div>
     </div>
-    {% assign nav_items = navigation_data.header | default: navigation_data.main %}
-    {% if nav_items == nil %}
-      {% assign nav_items = '' | split: '' %}
-      {% assign nav_items = nav_items | push: {"title": "Blog", "url": "/blog/", "section": "blog"} %}
-      {% assign nav_items = nav_items | push: {"title": "Research", "url": "/research/", "section": "research"} %}
-      {% assign nav_items = nav_items | push: {"title": "Projects", "url": "/portfolio/", "section": "portfolio"} %}
-      {% assign nav_items = nav_items | push: {"title": "Datasets", "url": "/datasets/", "section": "datasets"} %}
-      {% assign nav_items = nav_items | push: {"title": "Visualizations", "url": "/visualizations/", "section": "visualizations"} %}
-      {% assign nav_items = nav_items | push: {"title": "Academic Ops", "url": "/academic/", "section": "academic"} %}
-      {% assign nav_items = nav_items | push: {"title": "About", "url": "/about/", "section": "about"} %}
-    {% endif %}
-    {% assign page_contexts = '' | split: '' %}
-    {% if page.section %}{% assign page_contexts = page_contexts | push: page.section %}{% endif %}
-    {% if page.layout %}{% assign page_contexts = page_contexts | push: page.layout %}{% endif %}
-    {% if page.collection %}{% assign page_contexts = page_contexts | push: page.collection %}{% endif %}
-    {% if page.type %}{% assign page_contexts = page_contexts | push: page.type %}{% endif %}
+    {% if nav_items.size > 0 %}
     <nav id="site-nav" class="site-nav" role="navigation" aria-label="Primary navigation" data-open="false">
-      {% include header/navigation.html items=nav_items page=page contexts=page_contexts %}
+      {% include_cached header/navigation.html items=nav_items active=active_items lang=page.lang %}
     </nav>
+    {% endif %}
   </div>
 </header>

data/_includes/layouts/default/article.html

@@ -19,7 +19,11 @@ Renders the standard article scaffold used by the default layout.
   {%- endif -%}
   <header class="article-header">
     {%- unless hero_overlay_title -%}
-      {%- if article_page.title -%}
+      {%- comment -%}
+      `show_title: false`, in a page's front matter or a layout's, leaves the <h1> to a
+      page or layout that renders its own heading, so the page has one.
+      {%- endcomment -%}
+      {%- if article_page.title and article_page.show_title != false and layout.show_title != false -%}
         <h1 class="article-title" itemprop="headline">{{ article_page.title }}</h1>
       {%- endif -%}
       {%- if article_page.subtitle -%}

data/_includes/meta/math-config.html

@@ -10,10 +10,14 @@ Exposes math_enabled, math_engine, math_status_id, and math_has_expressions vari
 
 math_enabled resolves, in order: the page's `mathjax` or `math` front matter,
 then `theme_options.math.render_on_load` (falling back to `features.mathjax`).
-With `render_on_load: auto` the engine is only loaded when the rendered page
-contains math (`$`, `\(`, `\[` or kramdown's `math/tex` scripts) or declares
-`math_expressions`; `true` loads it on every page; `false` only on pages that
-opt in.
+With `render_on_load: auto` the engine is only loaded on pages with math: the
+math preprocessor records each expression it wraps in `math_expressions`, and
+leaves code alone. Kramdown's `math/tex` scripts and the preprocessor's
+`math-expression--source` wrappers in the rendered page count too: notebook
+pages carry the wrappers but record no expressions of their own. Searching the
+rendered page for `$`, `\(` or `\[` instead loaded MathJax for shell variables,
+prices and escaped parentheses in code. `true` loads it on every page; `false`
+only on pages that opt in.
 {%- endcomment -%}
 {%- assign math_settings = site.theme_options.math | default: {} -%}
 {%- assign math_engine = include.page.math_engine | default: math_settings.engine | default: 'mathjax' -%}
@@ -35,7 +39,7 @@ opt in.
   {%- assign math_enabled = include.page.math -%}
 {%- elsif math_load == 'auto' -%}
   {%- assign math_enabled = math_has_expressions -%}
-  {%- if content contains 'math/tex' or content contains '$' or content contains '\(' or content contains '\[' -%}
+  {%- if content contains 'math/tex' or content contains 'math-expression--source' -%}
     {%- assign math_enabled = true -%}
   {%- endif -%}
 {%- else -%}

data/_includes/meta/schema.html

@@ -41,8 +41,9 @@ Defaults to TechnicalArticle for posts, WebPage for other pages.
     "@type": "WebPage",
     "@id": {{ page_url | jsonify }}
   },
-  "headline": {{ schema_page.title | truncate: 110 | jsonify }},
-  {%- if description -%}
+  "headline": {{ schema_page.title | default: site.title | truncate: 110 | jsonify }},
+  {%- comment -%} Values the page doesn't have are left out: "description": "" and "dateModified": "" are invalid structured data. {%- endcomment -%}
+  {%- if description and description != "" -%}
   "description": {{ description | jsonify }},
   {%- endif -%}
   "url": {{ page_url | jsonify }},
@@ -64,7 +65,9 @@ Defaults to TechnicalArticle for posts, WebPage for other pages.
   {%- if schema_page.date -%}
   "datePublished": "{{ schema_page.date | date_to_xmlschema }}",
   {%- endif -%}
+  {%- if modified -%}
   "dateModified": "{{ modified | date_to_xmlschema }}",
+  {%- endif -%}
   {%- if word_count > 0 -%}
   "wordCount": {{ word_count }},
   {%- endif -%}

data/_includes/meta/scripts-loader.html

@@ -2,26 +2,18 @@
 ---
 required:
   - location
-optional:
-  - syntax_config
 ---
-Outputs Prism assets in the head and shared data bootstrapping scripts in the body.
-Pass location="head" or location="body" to control which block renders.
+Outputs the page data scripts and the feature loader at the end of the body
+(location="body"). location="head" used to render Prism's scripts. Code is now
+highlighted by Rouge when the site builds, so the head renders nothing.
 {%- endcomment -%}
-{%- assign syntax = include.syntax_config | default: site.theme_options.syntax_highlighting | default: {} -%}
-{%- assign prism_cdn = syntax.cdn | default: 'https://cdn.jsdelivr.net/npm/prismjs@1.29.0' -%}
-{%- assign default_components = 'python|r|sql|julia|javascript' | split: '|' -%}
-{%- assign prism_components = syntax.components | default: default_components -%}
-{%- include meta/syntax-config.html -%}
-{%- if include.location == 'head' and prism_enabled -%}
-  <script defer src="{{ (prism_cdn | append: '/prism.min.js') | add_sri }}"></script>
-  {%- for component in prism_components -%}
-    {%- unless component == 'core' -%}
-      <script defer src="{{ (prism_cdn | append: '/components/prism-' | append: component | append: '.min.js') | add_sri }}"></script>
-    {%- endunless -%}
-  {%- endfor -%}
-  <script defer src="{{ (prism_cdn | append: '/plugins/normalize-whitespace/prism-normalize-whitespace.min.js') | add_sri }}"></script>
-{%- elsif include.location == 'body' -%}
+{%- if include.location == 'body' -%}
+  {%- comment -%}
+    Only academic.js reads the academic and publication data, and the loader
+    runs it only on pages with citation metrics, tables or charts. Inlined on
+    every page, it was a quarter of the home page's HTML.
+  {%- endcomment -%}
+  {%- if content contains 'data-citation-metric' or content contains 'data-citation-table' or content contains 'data-citation-chart' -%}
   {%- assign publications = site.data.publications | default: {} -%}
   <script nonce="{{ page.csp_nonce }}">
     window.DatalogAcademic = {{ site.data.academic | jsonify }};
@@ -32,22 +24,14 @@ Pass location="head" or location="body" to control which block renders.
       "yearly_totals": {{ publications.yearly_totals | jsonify }}
     };
   </script>
+  {%- endif -%}
+  {%- comment -%} Not include_cached: scripts.html reads the page's math and notebook settings and CSP nonce. {%- endcomment -%}
   {% include scripts.html %}
+  {%- comment -%}
+    core/github-cards.js reads the integration settings. The theme options and
+    content taxonomy were inlined here as well, and no script read them.
+  {%- endcomment -%}
   <script nonce="{{ page.csp_nonce }}">
-    window.DatalogTheme = {{ site.theme_options | jsonify }};
     window.DatalogIntegrations = {{ site.integrations | jsonify }};
-    window.DatalogContent = {{ site.content | jsonify }};
-  </script>
-  <script nonce="{{ page.csp_nonce }}">
-    document.addEventListener('DOMContentLoaded', function () {
-      if (window.Prism && window.Prism.plugins && window.Prism.plugins.NormalizeWhitespace) {
-        Prism.plugins.NormalizeWhitespace.setDefaults({
-          'remove-trailing': true,
-          'remove-indent': true,
-          'left-trim': true,
-          'right-trim': true
-        });
-      }
-    });
   </script>
 {%- endif -%}

data/_includes/post/related-posts.html

@@ -10,17 +10,14 @@ Builds a list of related posts based on overlapping tags or categories.
 Falls back to a friendly message when no related content is available.
 {%- endcomment -%}
 {%- assign related_limit = include.limit | default: 3 -%}
-{%- assign source_posts = site.collections.posts.docs | default: site.posts | default: '' | split: '' -%}
-{%- assign layout_filtered = source_posts | where: 'layout', 'post' -%}
-{%- assign collection_filtered = source_posts | where: 'collection', 'posts' -%}
-{%- assign candidate_posts = layout_filtered | concat: collection_filtered -%}
-{%- assign sorted_candidates = candidate_posts | sort: 'date' | reverse -%}
+{%- comment -%} site.posts is already newest first. {%- endcomment -%}
 {%- assign rendered_count = 0 -%}
 <section class="post-related" aria-labelledby="post-related-heading">
   <h2 id="post-related-heading">Related posts</h2>
   <ul class="post-related-list">
-    {%- for candidate in sorted_candidates -%}
-      {%- if candidate.url != include.page.url and rendered_count < related_limit -%}
+    {%- for candidate in site.posts -%}
+      {%- if rendered_count >= related_limit -%}{%- break -%}{%- endif -%}
+      {%- if candidate.url != include.page.url -%}
         {%- assign overlap = 0 -%}
         {%- if include.page.tags and candidate.tags -%}
           {%- for tag in include.page.tags -%}

data/_includes/search/index-data.json

@@ -2,6 +2,7 @@
   "generated_at": "{{ 'now' | date_to_xmlschema }}",
   "documents": [
     {% assign known_langs = 'python,r,sql,julia,javascript,scala,go,java,typescript,html,css' | split: ',' %}
+    {% assign no_code = '' | split: '' %}
     {% assign searchable = '' | split: '' %}
     {% for post in site.posts %}
       {% unless post.exclude_from_search %}
@@ -76,37 +77,19 @@
       {% capture doc_type %}
         {% if doc.collection == 'posts' %}post{% elsif doc.collection == 'portfolio' %}project{% elsif doc.collection == 'datasets' %}dataset{% elsif doc.layout == 'research' %}research{% elsif doc.layout == 'project' %}project{% elsif doc.layout == 'post' %}post{% else %}{{ doc.collection | default: doc.layout | default: 'page' }}{% endif %}
       {% endcapture %}
-      {% assign normalized_title = doc.title | default: doc.name | normalize_search %}
-      {% assign normalized_summary = summary | normalize_search %}
-      {% assign normalized_content = content_text | normalize_search %}
-      {% assign normalized_tags = tags | normalize_search_array %}
-      {% assign normalized_languages = languages | normalize_search_array %}
-      {% assign normalized_difficulty = doc.difficulty | default: doc.level | normalize_search | default: '' %}
+      {%- comment -%}
+      Each text field is written once. The search engine normalizes it in the browser with the
+      function it applies to queries; a precomputed normalized copy doubled the size of the file.
+      The code blocks come from the page's source, collected before rendering by
+      _plugins/search_code_blocks.rb: by the time this renders, a post's content is already HTML.
+      {%- endcomment %}
       {
         "title": {{ doc.title | default: doc.name | jsonify }},
         "url": {{ doc.url | relative_url | jsonify }},
         "type": {{ doc_type | strip | jsonify }},
         "summary": {{ summary | strip | jsonify }},
         "content": {{ content_text | jsonify }},
-        "code": [
-          {% assign raw_blocks = raw_content | split: '```' %}
-          {% assign code_counter = 0 %}
-          {% for block in raw_blocks %}
-            {% assign block_index = forloop.index0 | modulo: 2 %}
-            {% if block_index == 1 %}
-              {% assign lines = block | split: '\n' %}
-              {% assign first_line = lines[0] | default: '' %}
-              {% assign language_hint = first_line | strip | downcase | default: 'text' %}
-              {% assign code_body = block | remove_first: first_line | strip %}
-              {% if code_counter > 0 %},{% endif %}
-              {
-                "language": {{ language_hint | jsonify }},
-                "code": {{ code_body | jsonify }}
-              }
-              {% assign code_counter = code_counter | plus: 1 %}
-            {% endif %}
-          {% endfor %}
-        ],
+        "code": {{ doc.search_code | default: no_code | jsonify }},
         "math": [
           {% assign math_counter = 0 %}
           {% for piece in inline_math_segments %}
@@ -137,15 +120,7 @@
         "difficulty": {{ doc.difficulty | default: doc.level | default: '' | jsonify }},
         "topics": {{ doc.topics | default: tags | uniq | jsonify }},
         "date": {% if doc.date %}{{ doc.date | date_to_xmlschema | jsonify }}{% else %}null{% endif %},
-        "reading_time": {{ doc.reading_time | default: doc.time | default: '' | jsonify }},
-        "normalized": {
-          "title": {{ normalized_title | jsonify }},
-          "summary": {{ normalized_summary | jsonify }},
-          "content": {{ normalized_content | jsonify }},
-          "tags": {{ normalized_tags | uniq | jsonify }},
-          "languages": {{ normalized_languages | uniq | jsonify }},
-          "difficulty": {{ normalized_difficulty | jsonify }}
-        }
+        "reading_time": {{ doc.reading_time | default: doc.time | default: '' | jsonify }}
         {% assign search_extensions = doc.datalog_search_extensions %}
         {% if search_extensions and search_extensions != empty %}
         ,"extensions": {{ search_extensions | jsonify }}

data/_layouts/dataset.html

@@ -1,5 +1,6 @@
 ---
 layout: default
+show_title: false # this layout renders the page's <h1>
 ---
 {% assign localization_config = site.theme_options.localization %}
 {% assign date_format = page.date_format | default: localization_config.date_format | default: 'long' %}

data/_layouts/default.html

@@ -8,25 +8,33 @@
   <head>
     {% include head.html %}
     <meta name="twitter:creator" content="{{ site.author.twitter | default: site.social.twitter }}" />
-    {% if page.tags and page.tags.size > 0 %}
-      <meta name="keywords" content="{% include helpers/array-to-sentence.html items=page.tags conjunction='and' %}" />
-    {% endif %}
-    <meta name="format-detection" content="telephone=no" />
-    <link rel="preconnect" href="https://cdn.jsdelivr.net" crossorigin />
     {% include meta/schema.html page=page %}
-    {% include meta/scripts-loader.html location='head' %}
   </head>
   {% capture body_classes %}
     site-body{% if page.layout %} layout-{{ page.layout | replace: ' ', '-' }}{% endif %}{% if page.page_class %} page-{{ page.page_class | replace: ' ', '-' | downcase }}{% endif %}{% if page.classes %} {{ page.classes | join: ' ' }}{% endif %}{% if site.features.dark_mode_toggle %} has-dark-toggle{% endif %}{% if html_dir == 'rtl' %} rtl{% endif %}
   {% endcapture %}
   <body class="{{ body_classes | strip }}" data-theme="{{ page.theme | default: 'system' }}">
-    {% include skip-link.html %}
+    {%- comment -%}
+    Applies the saved or system color scheme before anything is drawn. core/dark-mode.js
+    applies the same rule, but only once the script bundles have loaded, so readers who
+    chose dark saw the light theme first; keep the two in step.
+    {%- endcomment %}
+    <script nonce="{{ page.csp_nonce }}">
+      try {
+        var mode = localStorage.getItem("datalog-color-mode");
+        if (mode === "dark" || (mode !== "light" && window.matchMedia("(prefers-color-scheme: dark)").matches)) {
+          document.body.classList.add("dark-mode");
+        }
+      } catch (error) {}
+    </script>
+    {%- comment -%} The skip link and the footer take nothing from the page, so each is rendered once per build (the skip link once per language). {%- endcomment -%}
+    {% include_cached skip-link.html lang=page.lang %}
     {% include header.html %}
     <main id="main-content" class="site-main container" role="main" tabindex="-1" aria-describedby="{{ math_status_id }}">
       {% include components/math-fallback.html expressions=page.math_expressions %}
       {% include layouts/default/article.html page=page content=content date_format=date_format %}
     </main>
-    {% include footer.html %}
+    {% include_cached footer.html %}
     <div class="visually-hidden" aria-live="polite" id="{{ math_status_id }}">{% t 'global.math_loading' %}</div>
     {% include meta/scripts-loader.html location='body' %}
   </body>

data/_layouts/notebook.html

@@ -1,5 +1,6 @@
 ---
 layout: default
+show_title: false # this layout renders the page's <h1>
 ---
 
 {%- comment -%}

data/_layouts/package.html

@@ -1,5 +1,6 @@
 ---
 layout: default
+show_title: false # this layout renders the page's <h1>
 ---
 
 <div class="package-docs">

data/_layouts/portfolio.html

@@ -1,5 +1,6 @@
 ---
 layout: default
+show_title: false # this layout renders the page's <h1>
 ---
 <article class="portfolio-item">
   <header class="portfolio-header">