datalog-theme 0.6.1 → 0.8.0

data/_includes/csp-meta.html

@@ -1,17 +1,121 @@
 {% assign csp_registry = site.data.csp | default: {} %}
 {% assign nonce_source = page.csp_nonce | default: csp_registry.nonces[page.path] | default: csp_registry.nonces[page.url] | default: '' %}
-{% assign script_hashes = page.csp_hashes | default: [] %}
-{% capture script_hash_directives -%}
-  {%- for hash in script_hashes -%}
-    'sha256-{{ hash }}'{% unless forloop.last %} {% endunless %}
-  {%- endfor -%}
-{%- endcapture -%}
+{%- comment -%}
+  Sources a site adds for its own embeds, listed under `csp` in _config.yml:
+  frame_src for iframes (Shiny apps, slide decks, videos), and script_src,
+  style_src, font_src and connect_src for anything else.
+{%- endcomment -%}
+{% assign frame_hosts = site.csp.frame_src | join: ' ' %}
+{% assign extra_script_src = site.csp.script_src | join: ' ' %}
+{% assign extra_style_src = site.csp.style_src | join: ' ' %}
+{% assign extra_font_src = site.csp.font_src | join: ' ' %}
+{% assign extra_connect_src = site.csp.connect_src | join: ' ' %}
+{%- comment -%}
+  Plotly, the Jupyter widget manager and MathJax can't run under the strict
+  policy. Plotly inserts its rules into a <style> element it creates; the widget
+  manager adds <style> elements too, and compiles widget schemas with
+  new Function; MathJax's CHTML output adds the stylesheet its layout depends
+  on. Only the pages that run them get inline styles, and widget pages eval. A
+  page that loads such a library another way sets csp.unsafe_inline_styles or
+  csp.unsafe_eval in its front matter. A browser ignores 'unsafe-inline' in a
+  directive that also lists a nonce, so those pages drop the style nonce.
+{%- endcomment -%}
+{% assign csp_inline_styles = page.csp.unsafe_inline_styles %}
+{% assign csp_eval = page.csp.unsafe_eval %}
+{%- comment -%}
+  jsDelivr serves any npm package, so the policy names the packages this page
+  loads rather than the whole host: the math engine, from the URLs the head's
+  script tags use (math-config.html and head.html set them), and the chart
+  libraries the visualization and notebook scripts load for the blocks on the
+  page. Keep these in step with the URLs in assets/js/visualizations.js,
+  assets/js/notebook.js and _includes/analytics/dashboard.html;
+  tests/test_csp.rb checks that they are.
+{%- endcomment -%}
+{% assign cdn_scripts = '' %}
+{% assign cdn_styles = '' %}
+{% assign cdn_fonts = '' %}
+{% assign cdn_connect = '' %}
+{% assign cdn_frames = '' %}
+{% if math_enabled %}
+  {% if math_engine == 'katex' %}
+    {% assign cdn_scripts = cdn_scripts | append: ' ' | append: katex_cdn %}
+    {% assign cdn_styles = cdn_styles | append: ' ' | append: katex_cdn %}
+    {% assign cdn_fonts = cdn_fonts | append: ' ' | append: katex_cdn %}
+  {% else %}
+    {%- comment -%} MathJax loads its components, fonts and speech data from the directory of its main script. {%- endcomment -%}
+    {% assign mathjax_file = mathjax_url | split: '/' | last %}
+    {% assign mathjax_dir_length = mathjax_url.size | minus: mathjax_file.size %}
+    {% assign mathjax_dir = mathjax_url | slice: 0, mathjax_dir_length %}
+    {% assign cdn_scripts = cdn_scripts | append: ' ' | append: mathjax_dir %}
+    {% assign cdn_fonts = cdn_fonts | append: ' ' | append: mathjax_dir %}
+    {% assign cdn_connect = cdn_connect | append: ' ' | append: mathjax_dir %}
+    {% assign csp_inline_styles = true %}
+  {% endif %}
+{% endif %}
+{% if content contains 'data-viz-type="plotly"' or content contains "data-viz-type='plotly'" or content contains 'notebook-output-plotly' %}
+  {% assign csp_inline_styles = true %}
+  {% assign cdn_scripts = cdn_scripts | append: ' https://cdn.jsdelivr.net/npm/plotly.js-dist-min@2.27.0/' %}
+{% endif %}
+{% if content contains 'data-viz-type="d3"' or content contains "data-viz-type='d3'" %}
+  {% assign cdn_scripts = cdn_scripts | append: ' https://cdn.jsdelivr.net/npm/d3@7/' %}
+{% endif %}
+{% if content contains 'data-viz-type="bokeh"' or content contains "data-viz-type='bokeh'" %}
+  {% assign cdn_scripts = cdn_scripts | append: ' https://cdn.jsdelivr.net/npm/@bokeh/bokehjs@3.3.3/' %}
+{% endif %}
+{% if content contains 'notebook-output-vega' %}
+  {% assign cdn_scripts = cdn_scripts | append: ' https://cdn.jsdelivr.net/npm/vega@5 https://cdn.jsdelivr.net/npm/vega-lite@5 https://cdn.jsdelivr.net/npm/vega-embed@6' %}
+{% endif %}
+{% if content contains 'npm/chart.js@4.4.0/' %}
+  {% assign cdn_scripts = cdn_scripts | append: ' https://cdn.jsdelivr.net/npm/chart.js@4.4.0/' %}
+{% endif %}
+{%- comment -%}
+  Widget pages load require.js from cdnjs, and allow all of jsDelivr: the widget
+  manager loads any widget package a notebook names from it, and its icon fonts.
+{%- endcomment -%}
+{% if content contains 'data-viz-type="ipywidgets"' or content contains "data-viz-type='ipywidgets'" or content contains 'application/vnd.jupyter.widget-state+json' %}
+  {% assign csp_inline_styles = true %}
+  {% assign csp_eval = true %}
+  {% assign cdn_scripts = cdn_scripts | append: ' https://cdn.jsdelivr.net https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.6/' %}
+  {% assign cdn_fonts = cdn_fonts | append: ' https://cdn.jsdelivr.net' %}
+{% endif %}
+{%- comment -%}
+  The Disqus embed loads its script from the site's shortname subdomain of
+  disqus.com and its assets from disquscdn.com, shows the thread in an iframe
+  from disqus.com, and sizes that iframe with an inline style. The policy
+  allowed none of them.
+{%- endcomment -%}
+{% if content contains 'id="disqus_thread"' %}
+  {% assign csp_inline_styles = true %}
+  {% assign cdn_scripts = cdn_scripts | append: ' https://*.disqus.com https://*.disquscdn.com' %}
+  {% assign cdn_styles = cdn_styles | append: ' https://*.disquscdn.com' %}
+  {% assign cdn_connect = cdn_connect | append: ' https://*.disqus.com' %}
+  {% assign cdn_frames = cdn_frames | append: ' https://disqus.com' %}
+{% endif %}
+{%- comment -%}
+  Google's tag loads only on a site that sets google_analytics, and the policy
+  allowed its hosts on every site. These are the hosts Google documents for GA4,
+  which reports to regional subdomains such as region1.google-analytics.com.
+{%- endcomment -%}
+{% assign csp_analytics = false %}
+{% if site.google_analytics and site.google_analytics != "" %}
+  {% assign csp_analytics = true %}
+{% endif %}
+{%- comment -%}
+  object-src, base-uri and form-action do not fall back to default-src. An
+  injected <base> tag could repoint the page's relative script URLs, which the
+  nonce would then authorise; every theme form submits to the site itself.
+  Observable serves classic notebook embeds from old.observablehq.com, and an
+  observablehq.com embed URL redirects there.
+{%- endcomment -%}
 <meta http-equiv="Content-Security-Policy" content="
   default-src 'self';
-  script-src 'self' 'nonce-{{ nonce_source }}'{% if script_hash_directives != '' %} {{ script_hash_directives | strip }}{% endif %} https://cdn.jsdelivr.net https://cdnjs.cloudflare.com https://www.googletagmanager.com https://www.google-analytics.com;
-  style-src 'self' 'nonce-{{ nonce_source }}' https://fonts.googleapis.com https://cdn.jsdelivr.net;
+  script-src 'self' 'nonce-{{ nonce_source }}'{% if csp_eval %} 'unsafe-eval'{% endif %}{{ cdn_scripts }}{% if csp_analytics %} https://*.googletagmanager.com{% endif %}{% if extra_script_src != '' %} {{ extra_script_src }}{% endif %};
+  style-src 'self' {% if csp_inline_styles %}'unsafe-inline'{% else %}'nonce-{{ nonce_source }}'{% endif %} https://fonts.googleapis.com{{ cdn_styles }}{% if extra_style_src != '' %} {{ extra_style_src }}{% endif %};
   img-src 'self' data: https:;
-  font-src 'self' https://fonts.gstatic.com data:;
-  connect-src 'self' https://api.github.com https://www.google-analytics.com https://cdn.jsdelivr.net;
-  frame-src 'self' https://observablehq.com;
+  font-src 'self' https://fonts.gstatic.com data:{{ cdn_fonts }}{% if extra_font_src != '' %} {{ extra_font_src }}{% endif %};
+  connect-src 'self' https://api.github.com{{ cdn_connect }}{% if csp_analytics %} https://*.google-analytics.com https://*.analytics.google.com https://*.googletagmanager.com{% endif %}{% if extra_connect_src != '' %} {{ extra_connect_src }}{% endif %};
+  frame-src 'self' https://observablehq.com https://old.observablehq.com{{ cdn_frames }}{% if frame_hosts != '' %} {{ frame_hosts }}{% endif %};
+  object-src 'none';
+  base-uri 'self';
+  form-action 'self';
 " />

data/_includes/footer.html

@@ -2,10 +2,11 @@
 {% assign footer_year = site.time | date: '%Y' %}
 {% assign navigation_data = site.data.navigation %}
 {% assign social_data = site.data.social %}
+{%- comment -%} The column titles are <h2>: the footer follows the page's own outline, which starts at its <h1>. {%- endcomment %}
 <footer class="site-footer" role="contentinfo">
   <div class="container footer-container">
     <section class="footer-about">
-      <h3>{{ site.name | default: 'DataLog' }}</h3>
+      <h2>{{ site.name | default: site.title }}</h2>
       <p class="footer-description">{{ site.description | strip_html | truncate: 160 }}</p>
       <p class="footer-author">
         <strong>{{ site.author.name }}</strong>
@@ -20,30 +21,24 @@
       {% endif %}
     </section>
 
-    <nav class="footer-navigation">
-      <h3>Explore</h3>
-      {%- comment -%} `footer:` in _data/navigation.yml drives this column; the demo's sections are the fallback. {%- endcomment -%}
-      {% assign footer_links = navigation_data.footer %}
+    {%- comment -%} `footer:` in _data/navigation.yml drives this column, which is left out without it. {%- endcomment -%}
+    {% assign footer_links = navigation_data.footer %}
+    {% if footer_links.size > 0 %}
+    <nav class="footer-navigation" aria-labelledby="footer-explore-heading">
+      <h2 id="footer-explore-heading">Explore</h2>
       <ul class="footer-link-list">
-        {% if footer_links and footer_links.size > 0 %}
         {% for item in footer_links %}
         <li><a href="{{ item.url | relative_url }}">{{ item.title }}</a></li>
         {% endfor %}
-        {% else %}
-        <li><a href="{{ '/blog/' | relative_url }}">Blog</a></li>
-        <li><a href="{{ '/research/' | relative_url }}">Research</a></li>
-        <li><a href="{{ '/portfolio/' | relative_url }}">Projects</a></li>
-        <li><a href="{{ '/datasets/' | relative_url }}">Datasets</a></li>
-        <li><a href="{{ '/visualizations/' | relative_url }}">Visualizations</a></li>
-        <li><a href="{{ '/about/' | relative_url }}">About</a></li>
-        {% endif %}
       </ul>
     </nav>
+    {% endif %}
 
+    {% assign primary_social = social_data.primary %}
+    {% if primary_social.size > 0 or site.author.email %}
     <section class="footer-connect">
-      <h3>Connect</h3>
-      {% assign primary_social = social_data.primary %}
-      {% if primary_social %}
+      <h2>Connect</h2>
+      {% if primary_social.size > 0 %}
       <ul class="footer-link-list">
         {% for profile in primary_social %}
         <li><a href="{{ profile.url }}" target="_blank" rel="{{ profile.rel | default: 'noopener' }}">{{ profile.label }}</a></li>
@@ -56,18 +51,22 @@
       </p>
       {% endif %}
     </section>
+    {% endif %}
 
     <section class="footer-subscribe">
-      <h3>Stay updated</h3>
+      <h2>Stay updated</h2>
       <p>Follow via RSS or check back for new research and tutorials.</p>
+      {%- comment -%} jekyll-feed is a dependency of the theme, so /feed.xml exists even when _data/social.yml lists no feeds. {%- endcomment -%}
       {% assign rss_links = social_data.rss %}
-      {% if rss_links %}
       <ul class="footer-link-list">
+        {% if rss_links.size > 0 %}
         {% for feed in rss_links %}
         <li><a href="{{ feed.url | relative_url }}">{{ feed.label }}</a></li>
         {% endfor %}
+        {% else %}
+        <li><a href="{{ '/feed.xml' | relative_url }}">RSS feed</a></li>
+        {% endif %}
       </ul>
-      {% endif %}
     </section>
   </div>
   <div class="container footer-bottom">

data/_includes/head.html

@@ -10,23 +10,16 @@
 {% elsif raw_keywords %}
   {% assign keyword_list = raw_keywords | replace: ';', ',' | split: ',' %}
 {% endif %}
-{% assign math_settings = site.theme_options.math %}
-{% assign math_engine = page.math_engine | default: math_settings.engine | default: 'mathjax' %}
-{% assign math_enabled = page.mathjax %}
-{% if math_enabled == nil %}
-  {% assign math_enabled = page.math %}
-{% endif %}
-{% if math_enabled == nil %}
-  {% assign math_enabled = math_settings.render_on_load | default: site.features.mathjax %}
-{% 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' %}
 <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" />
@@ -37,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 }}" />
@@ -68,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 %}
@@ -100,17 +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 />
+<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 />
-<link rel="stylesheet" href="{{ prism_theme_url | add_sri }}" />
-<link rel="stylesheet" href="{{ prism_line_numbers_url | add_sri }}" />
 {% assign critical_config = site.critical_css | default: {} %}
 {% assign critical_enabled = critical_config.enabled | default: false %}
 {% assign main_stylesheet = '/assets/css/main.css' | relative_url %}
@@ -171,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>
@@ -205,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',
@@ -231,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'
       ]
     },
@@ -244,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
         }
       }
     },
@@ -273,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'));
+        });
       }
     }
   };
@@ -324,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 %}
-    <nav id="site-nav" class="site-nav" role="navigation" aria-label="Primary navigation" data-open="true">
-      {% include header/navigation.html items=nav_items page=page contexts=page_contexts %}
+    {% if nav_items.size > 0 %}
+    <nav id="site-nav" class="site-nav" role="navigation" aria-label="Primary navigation" data-open="false">
+      {% 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

@@ -7,10 +7,20 @@ optional:
 ---
 Computes math rendering settings shared by layouts.
 Exposes math_enabled, math_engine, math_status_id, and math_has_expressions variables.
+
+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 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' -%}
-{%- assign math_enabled = include.page.mathjax | default: include.page.math | default: math_settings.render_on_load | default: site.features.mathjax -%}
 {%- assign math_status_id = include.status_id | default: 'math-status' -%}
 {%- assign math_expressions = include.page.math_expressions | default: '' -%}
 {%- assign math_has_expressions = false -%}
@@ -19,3 +29,19 @@ Exposes math_enabled, math_engine, math_status_id, and math_has_expressions vari
     {%- assign math_has_expressions = true -%}
   {%- endif -%}
 {%- endif -%}
+{%- assign math_load = math_settings.render_on_load -%}
+{%- if math_load == nil -%}
+  {%- assign math_load = site.features.mathjax -%}
+{%- endif -%}
+{%- if include.page.mathjax != nil -%}
+  {%- assign math_enabled = include.page.mathjax -%}
+{%- elsif include.page.math != nil -%}
+  {%- assign math_enabled = include.page.math -%}
+{%- elsif math_load == 'auto' -%}
+  {%- assign math_enabled = math_has_expressions -%}
+  {%- if content contains 'math/tex' or content contains 'math-expression--source' -%}
+    {%- assign math_enabled = true -%}
+  {%- endif -%}
+{%- else -%}
+  {%- assign math_enabled = math_load -%}
+{%- endif -%}

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 -%}