datalog-theme 0.8.0 → 0.9.1

data/_includes/components/revision-notice.html

@@ -0,0 +1,35 @@
+{%- comment -%}
+---
+required:
+  - page
+optional:
+  - date_format
+---
+The newest correction or update of an article (`revision_notice`, set from
+`revisions` by _plugins/revisions.rb), announced under the metadata with a
+link to the full history. Renders nothing without one, or with
+`revision_notice: false` in front matter.
+{%- endcomment -%}
+{%- assign revision = include.page.revision_notice -%}
+{%- if revision -%}
+{%- capture revision_date -%}{% include helpers/date-format.html date=revision.date format=include.date_format %}{%- endcapture -%}
+{%- assign revision_date = revision_date | strip -%}
+<aside class="revision-notice revision-notice--{{ revision.type }}" aria-labelledby="revision-notice-lead">
+  <p class="revision-notice__text">
+    <strong id="revision-notice-lead" class="revision-notice__lead">
+      {%- if revision.type == 'correction' -%}
+        {% t 'post.revisions.corrected_on' date: revision_date %}
+      {%- else -%}
+        {% t 'post.revisions.updated_on' date: revision_date %}
+      {%- endif -%}
+    </strong>
+    {{ revision.summary | escape }}
+    {%- if revision.details_url -%}
+    {%- assign details_url = revision.details_url -%}
+    {%- unless details_url contains '://' -%}{%- assign details_url = details_url | relative_url -%}{%- endunless %}
+    <a class="revision-notice__details" href="{{ details_url | escape }}">{% t 'post.revisions.details' %}</a>
+    {%- endif %}
+    <a class="revision-notice__history" href="#revision-history">{% t 'post.revisions.history_link' %}</a>
+  </p>
+</aside>
+{%- endif -%}

data/_includes/components/series-nav.html

@@ -0,0 +1,64 @@
+{%- comment -%}
+---
+required:
+  - page
+optional:
+  - compact
+---
+Navigation within an article series (`series` in front matter, resolved by
+_plugins/series.rb): the series title, "Part k of n", every part in order
+with the current one marked, and the previous and next parts. With
+`compact: true`, the previous and next parts alone, for the end of the
+article. Renders nothing for a page that is not part of a series.
+{%- endcomment -%}
+{%- assign series = include.page.series -%}
+{%- if series.id -%}
+{%- capture part_of -%}{% t 'post.series.part_of' part: series.position total: series.count %}{%- endcapture -%}
+{%- capture nav_label -%}{% t 'post.series.nav_label' title: series.title %}{%- endcapture -%}
+{%- capture series_links -%}
+{%- if series.previous or series.next %}
+  <div class="series-nav__links">
+    {%- if series.previous %}
+    <a class="series-nav__link series-nav__link--previous" rel="prev" href="{{ series.previous.url | relative_url }}">
+      <span class="series-nav__link-label">{% t 'post.series.previous' %}</span>
+      <span class="series-nav__link-title">{{ series.previous.title | escape }}</span>
+    </a>
+    {%- endif %}
+    {%- if series.next %}
+    <a class="series-nav__link series-nav__link--next" rel="next" href="{{ series.next.url | relative_url }}">
+      <span class="series-nav__link-label">{% t 'post.series.next' %}</span>
+      <span class="series-nav__link-title">{{ series.next.title | escape }}</span>
+    </a>
+    {%- endif %}
+  </div>
+{%- endif %}
+{%- endcapture -%}
+{%- if include.compact -%}
+{%- if series.previous or series.next -%}
+<nav class="series-nav series-nav--compact" aria-label="{{ nav_label | strip | escape }}">
+  <p class="series-nav__context">{{ series.title | escape }} · {{ part_of | strip }}</p>
+  {{- series_links }}
+</nav>
+{%- endif -%}
+{%- else -%}
+<nav class="series-nav" aria-labelledby="series-nav-heading">
+  <p class="series-nav__heading" id="series-nav-heading">
+    <span class="series-nav__label">{% t 'post.series.label' %}</span>
+    <span class="series-nav__title">{{ series.title | escape }}</span>
+    <span class="series-nav__position">{{ part_of | strip }}</span>
+  </p>
+  {%- if series.description %}
+  <p class="series-nav__description">{{ series.description | escape }}</p>
+  {%- endif %}
+  <progress class="series-nav__progress" value="{{ series.position }}" max="{{ series.count }}" aria-hidden="true"></progress>
+  <ol class="series-nav__list">
+    {%- for part in series.parts %}
+    <li class="series-nav__part{% if part.current %} series-nav__part--current{% endif %}">
+      <a href="{{ part.url | relative_url }}"{% if part.current %} aria-current="page"{% endif %}>{{ part.title | escape }}</a>
+    </li>
+    {%- endfor %}
+  </ol>
+  {{- series_links }}
+</nav>
+{%- endif -%}
+{%- endif -%}

data/_includes/components/subscribe-form.html

@@ -0,0 +1,88 @@
+{%- comment -%}
+---
+optional:
+  - where
+---
+The newsletter subscribe form (assets/js/subscriptions/form.js): an email
+address and, when `subscriptions.topics` lists any, what to receive, sent
+to the site's dynamic services (docs/dynamic-services.md). Renders only
+when the site has a backend with the subscriptions feature on and
+`subscriptions.enabled` is not false; the footer and the post layout
+include it where `subscriptions.placement` says. `where` ("footer",
+"post" or "page", the default) keeps the ids apart when a page carries
+more than one, and picks the heading level.
+
+The footer is an include_cached, rendered once per language and reused on
+every page, so the footer form carries nothing of the page: the script
+reads the page's address from its canonical link and its language from
+<html lang>. For the same reason the block has no accessible name of its
+own, which would make two same-named landmarks on a post.
+{%- endcomment -%}
+{%- assign services = site.dynamic_services -%}
+{%- assign subscriptions = site.subscriptions -%}
+{%- if services.base_url and services.base_url != '' and services.features.subscriptions != false and subscriptions.enabled != false -%}
+{%- assign where = include.where | default: 'page' -%}
+{%- assign topics = subscriptions.topics -%}
+{%- assign privacy_url = subscriptions.privacy_url | default: nil -%}
+{%- capture labels_json -%}
+{
+  "sending": {{ 'subscriptions.sending' | t | jsonify }},
+  "pending": {{ 'subscriptions.pending' | t | jsonify }},
+  "confirmed": {{ 'subscriptions.confirmed' | t | jsonify }},
+  "duplicate": {{ 'subscriptions.duplicate' | t | jsonify }},
+  "email_invalid": {{ 'subscriptions.email_invalid' | t | jsonify }},
+  "topics_required": {{ 'subscriptions.topics_required' | t | jsonify }},
+  "errors": {
+    {%- assign kinds = "disabled,unsupported,version,timeout,network,malformed,unauthorized,forbidden,not_found,conflict,invalid,rate_limited,server,http,aborted,retry_after,reference" | split: "," -%}
+    {%- for kind in kinds -%}
+    {%- assign kind_key = "dynamic_services.errors." | append: kind -%}
+    {{ kind | jsonify }}: {{ kind_key | t | jsonify }}{% unless forloop.last %},{% endunless %}
+    {%- endfor -%}
+  }
+}
+{%- endcapture -%}
+<section class="subscribe subscribe--{{ where }}" data-subscribe{% unless where == 'footer' %} data-subscribe-source="{{ page.url | absolute_url }}" data-subscribe-locale="{{ page.lang | default: site.lang | default: 'en' }}"{% endunless %} data-subscribe-double-opt-in="{% if subscriptions.double_opt_in == false %}false{% else %}true{% endif %}">
+  <script type="application/json" data-subscribe-labels>{{ labels_json | strip }}</script>
+  {%- if where == 'footer' %}
+  <h3 class="subscribe__heading" id="subscribe-heading-{{ where }}">{% t 'footer.subscribe_title' %}</h3>
+  {%- else %}
+  <h2 class="subscribe__heading" id="subscribe-heading-{{ where }}">{% t 'footer.subscribe_title' %}</h2>
+  {%- endif %}
+  <p class="subscribe__description">{% t 'footer.subscribe_description' %}</p>
+  <form class="service-form subscribe__form" id="subscribe-form-{{ where }}" data-state="idle" aria-busy="false" novalidate>
+    <fieldset class="service-form__fields">
+      <legend class="visually-hidden">{% t 'footer.subscribe_title' %}</legend>
+      <div class="service-form__field">
+        <label for="subscribe-email-{{ where }}">{% t 'footer.newsletter_label' %}</label>
+        <input id="subscribe-email-{{ where }}" name="email" type="email" required autocomplete="email">
+        <p class="service-form__error" data-error-for="email" hidden></p>
+      </div>
+      {%- if topics and topics.size > 0 %}
+      <fieldset class="subscribe__topics">
+        <legend>{% t 'subscriptions.topics_legend' %}</legend>
+        {%- for topic in topics %}
+        {%- assign topic_key = "subscriptions.topics." | append: topic %}
+        <label class="subscribe__topic" for="subscribe-topic-{{ where }}-{{ topic | slugify }}">
+          <input id="subscribe-topic-{{ where }}-{{ topic | slugify }}" type="checkbox" name="topics" value="{{ topic | escape }}" checked>
+          {{ topic_key | t }}
+        </label>
+        {%- endfor %}
+        <p class="service-form__error" data-error-for="topics" hidden></p>
+      </fieldset>
+      {%- endif %}
+      <div class="service-form__trap" aria-hidden="true">
+        <label for="subscribe-website-{{ where }}">Website</label>
+        <input id="subscribe-website-{{ where }}" name="website" type="text" tabindex="-1" autocomplete="off">
+      </div>
+    </fieldset>
+    <p class="service-form__privacy">
+      {%- if subscriptions.double_opt_in == false %}{% t 'subscriptions.consent' %}{% else %}{% t 'subscriptions.consent_double' %}{% endif %}
+      {%- if privacy_url %} <a href="{{ privacy_url | relative_url }}">{% t 'subscriptions.privacy_link' %}</a>{% endif -%}
+    </p>
+    <div class="service-form__actions">
+      <button type="submit" class="post-tool">{% t 'footer.newsletter_button' %}</button>
+    </div>
+    <p class="service-form__status" data-form-status role="status" aria-live="polite" hidden></p>
+  </form>
+</section>
+{%- endif -%}

data/_includes/components/subscription-manage.html

@@ -0,0 +1,69 @@
+{%- comment -%}
+---
+optional: []
+---
+The page the newsletter's emails link to (assets/js/subscriptions/manage.js):
+`?confirm=<token>` confirms a subscription, `?unsubscribe=<token>` ends one
+after a press of the button, `?manage=<token>` changes its topics. Rendered
+by the page layout when the page says `subscription_manage: true`. Without
+a backend offering the feature it says so, since a link in an old email
+may still lead here.
+{%- endcomment -%}
+{%- assign services = site.dynamic_services -%}
+{%- assign subscriptions = site.subscriptions -%}
+{%- if services.base_url and services.base_url != '' and services.features.subscriptions != false and subscriptions.enabled != false -%}
+{%- assign topics = subscriptions.topics -%}
+{%- capture labels_json -%}
+{
+  "confirming": {{ 'subscriptions.manage.confirming' | t | jsonify }},
+  "confirmed": {{ 'subscriptions.manage.confirmed' | t | jsonify }},
+  "invalid_link": {{ 'subscriptions.manage.invalid_link' | t | jsonify }},
+  "unsubscribing": {{ 'subscriptions.manage.unsubscribing' | t | jsonify }},
+  "unsubscribed": {{ 'subscriptions.manage.unsubscribed' | t | jsonify }},
+  "loading": {{ 'subscriptions.manage.loading' | t | jsonify }},
+  "saving": {{ 'subscriptions.manage.saving' | t | jsonify }},
+  "saved": {{ 'subscriptions.manage.saved' | t | jsonify }},
+  "retry": {{ 'subscriptions.manage.retry' | t | jsonify }},
+  "errors": {
+    {%- assign kinds = "disabled,unsupported,version,timeout,network,malformed,unauthorized,forbidden,not_found,conflict,invalid,rate_limited,server,http,aborted,retry_after,reference" | split: "," -%}
+    {%- for kind in kinds -%}
+    {%- assign kind_key = "dynamic_services.errors." | append: kind -%}
+    {{ kind | jsonify }}: {{ kind_key | t | jsonify }}{% unless forloop.last %},{% endunless %}
+    {%- endfor -%}
+  }
+}
+{%- endcapture -%}
+<section class="subscription-manage" id="subscription-manage" data-subscription-manage data-state="idle" aria-busy="false">
+  <script type="application/json" nonce="{{ page.csp_nonce }}" data-manage-labels>{{ labels_json | strip }}</script>
+  <p class="subscription-manage__status" data-manage-status role="status" aria-live="polite" hidden></p>
+  <p class="subscription-manage__idle" data-manage-idle>{% t 'subscriptions.manage.idle' %}</p>
+  <div class="subscription-manage__panel" data-manage-unsubscribe-panel hidden>
+    <p>{% t 'subscriptions.manage.unsubscribe_question' %}</p>
+    <button type="button" class="post-tool" data-manage-unsubscribe>{% t 'subscriptions.manage.unsubscribe' %}</button>
+  </div>
+  <form class="service-form subscription-manage__panel" id="subscription-preferences" data-manage-preferences hidden novalidate>
+    {%- if topics and topics.size > 0 %}
+    <fieldset class="subscribe__topics">
+      <legend>{% t 'subscriptions.manage.preferences' %}</legend>
+      {%- for topic in topics %}
+      {%- assign topic_key = "subscriptions.topics." | append: topic %}
+      <label class="subscribe__topic" for="manage-topic-{{ topic | slugify }}">
+        <input id="manage-topic-{{ topic | slugify }}" type="checkbox" name="topics" value="{{ topic | escape }}">
+        {{ topic_key | t }}
+      </label>
+      {%- endfor %}
+    </fieldset>
+    {%- endif %}
+    <div class="service-form__actions">
+      {%- if topics and topics.size > 0 %}
+      <button type="submit" class="post-tool">{% t 'subscriptions.manage.save' %}</button>
+      {%- endif %}
+      <button type="button" class="post-tool" data-manage-unsubscribe>{% t 'subscriptions.manage.unsubscribe' %}</button>
+    </div>
+  </form>
+</section>
+{%- else -%}
+<section class="subscription-manage" id="subscription-manage">
+  <p class="subscription-manage__idle">{% t 'subscriptions.manage.unavailable' %}</p>
+</section>
+{%- endif -%}

data/_includes/components/visualization-card.html

@@ -4,7 +4,7 @@
     <span class="post-meta__badge">{{ tech }}</span>
     {% if visualization.version %}<span>v{{ visualization.version }}</span>{% endif %}
   </p>
-  <h3>{{ visualization.title }}</h3>
+  <h3>{{ visualization.title | escape }}</h3>
   <p>{{ visualization.summary }}</p>
   {% if visualization.tags %}
   <ul class="post-list-item__tags">

data/_includes/components/webmentions.html

@@ -0,0 +1,48 @@
+{%- comment -%}
+---
+optional: []
+---
+"Mentioned elsewhere" (assets/js/webmentions/list.js): the links, replies
+and reposts other websites sent about this article, read through the
+site's dynamic services (docs/dynamic-services.md) from what the
+Webmention receiver verified. Apart from the comments, which are hosted
+here. Renders only when the site has a backend with the webmentions
+feature on, `webmentions.enabled` is not false, and the page does not say
+`webmentions: false`. The kinds shown come from `webmentions.types`.
+The receiver itself is advertised by meta/webmention-discovery.html.
+{%- endcomment -%}
+{%- assign services = site.dynamic_services -%}
+{%- assign webmentions = site.webmentions -%}
+{%- if services.base_url and services.base_url != '' and services.features.webmentions != false and webmentions.enabled != false and page.webmentions != false -%}
+{%- assign types = webmentions.types -%}
+{%- if types == nil or types.size == 0 -%}
+  {%- assign types = "mention,reply" | split: "," -%}
+{%- endif -%}
+{%- capture labels_json -%}
+{
+  "loading": {{ 'webmentions.loading' | t | jsonify }},
+  "empty": {{ 'webmentions.empty' | t | jsonify }},
+  "retry": {{ 'webmentions.retry' | t | jsonify }},
+  "types": {
+    "mention": {{ 'webmentions.types.mention' | t | jsonify }},
+    "reply": {{ 'webmentions.types.reply' | t | jsonify }},
+    "repost": {{ 'webmentions.types.repost' | t | jsonify }},
+    "like": {{ 'webmentions.types.like' | t | jsonify }}
+  },
+  "errors": {
+    {%- assign kinds = "disabled,unsupported,version,timeout,network,malformed,unauthorized,forbidden,not_found,conflict,invalid,rate_limited,server,http,aborted,retry_after,reference" | split: "," -%}
+    {%- for kind in kinds -%}
+    {%- assign kind_key = "dynamic_services.errors." | append: kind -%}
+    {{ kind | jsonify }}: {{ kind_key | t | jsonify }}{% unless forloop.last %},{% endunless %}
+    {%- endfor -%}
+  }
+}
+{%- endcapture -%}
+<section class="webmentions" id="webmentions" data-webmentions data-webmentions-target="{{ page.url | absolute_url }}" data-webmentions-types="{{ types | join: ',' }}" data-state="idle" aria-labelledby="webmentions-heading">
+  <script type="application/json" nonce="{{ page.csp_nonce }}" data-webmentions-labels>{{ labels_json | strip }}</script>
+  <h2 class="webmentions__heading" id="webmentions-heading">{% t 'webmentions.heading' %}</h2>
+  <p class="webmentions__intro">{% t 'webmentions.intro' %}</p>
+  <p class="webmentions__status" data-webmentions-status role="status" aria-live="polite">{% t 'webmentions.loading' %}</p>
+  <ul class="webmentions__list" data-webmentions-list hidden></ul>
+</section>
+{%- endif -%}

data/_includes/csp-meta.html

@@ -10,6 +10,26 @@
 {% 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 -%} The dynamic services' origin, so the browser may call the site's backend (docs/dynamic-services.md). {%- endcomment -%}
+{% assign services_origin = '' %}
+{% if site.dynamic_services.base_url and site.dynamic_services.base_url != '' %}
+  {% assign services_parts = site.dynamic_services.base_url | split: '/' %}
+  {% assign services_origin = services_parts[0] | append: '//' | append: services_parts[2] %}
+{% endif %}
+{%- comment -%} The comments endpoint, when the api provider keeps comments apart from the services (lib/datalog/plugins/comments.rb). {%- endcomment -%}
+{% assign comments_origin = '' %}
+{% assign comments_options = site.datalog_plugins.options['datalog-comments'] %}
+{% assign comments_endpoint = page.datalog_comments.endpoint | default: comments_options.endpoint %}
+{% if comments_endpoint and comments_endpoint != '' %}
+  {% assign comments_parts = comments_endpoint | split: '/' %}
+  {% assign comments_origin = comments_parts[0] | append: '//' | append: comments_parts[2] %}
+{% endif %}
+{%- comment -%} The moderation API, when it lives apart from the services, and only on the inbox page (docs/moderation.md). {%- endcomment -%}
+{% assign moderation_origin = '' %}
+{% if page.moderation_inbox and site.moderation.enabled == true and site.moderation.endpoint and site.moderation.endpoint != '' %}
+  {% assign moderation_parts = site.moderation.endpoint | split: '/' %}
+  {% assign moderation_origin = moderation_parts[0] | append: '//' | append: moderation_parts[2] %}
+{% endif %}
 {%- 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
@@ -113,7 +133,7 @@
   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:{{ 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 %};
+  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 services_origin != '' %} {{ services_origin }}{% endif %}{% if comments_origin != '' and comments_origin != services_origin %} {{ comments_origin }}{% endif %}{% if moderation_origin != '' and moderation_origin != services_origin %} {{ moderation_origin }}{% 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';

data/_includes/footer/nav-column.html

@@ -13,7 +13,7 @@ Renders a footer navigation column with optional item descriptions.
   {%- assign column_items = '' | split: '' -%}
 {%- endif -%}
 <div>
-  <h4>{{ include.title | strip }}</h4>
+  <h4>{{ include.title | strip | escape }}</h4>
   <ul>
     {%- for item in column_items -%}
       {%- capture item_label -%}{% if item.label %}{{ item.label }}{% elsif item.label_key %}{% t item.label_key %}{% endif %}{%- endcapture -%}

data/_includes/footer.html

@@ -6,7 +6,7 @@
 <footer class="site-footer" role="contentinfo">
   <div class="container footer-container">
     <section class="footer-about">
-      <h2>{{ site.name | default: site.title }}</h2>
+      <h2>{{ site.name | default: site.title | escape }}</h2>
       <p class="footer-description">{{ site.description | strip_html | truncate: 160 }}</p>
       <p class="footer-author">
         <strong>{{ site.author.name }}</strong>
@@ -28,7 +28,7 @@
       <h2 id="footer-explore-heading">Explore</h2>
       <ul class="footer-link-list">
         {% for item in footer_links %}
-        <li><a href="{{ item.url | relative_url }}">{{ item.title }}</a></li>
+        <li><a href="{{ item.url | relative_url }}">{{ item.title | escape }}</a></li>
         {% endfor %}
       </ul>
     </nav>
@@ -67,6 +67,9 @@
         <li><a href="{{ '/feed.xml' | relative_url }}">RSS feed</a></li>
         {% endif %}
       </ul>
+      {%- comment -%} The newsletter form, on a site with a backend that takes subscriptions {%- endcomment -%}
+      {% assign subscribe_placement = site.subscriptions.placement | default: 'footer' %}
+      {% if subscribe_placement contains 'footer' %}{% include components/subscribe-form.html where='footer' %}{% endif %}
     </section>
   </div>
   <div class="container footer-bottom">

data/_includes/head.html

@@ -1,5 +1,6 @@
 {% assign page_title = page.seo_title | default: page.title | default: site.title %}
-{% assign page_description = page.seo_description | default: page.description | default: page.excerpt | default: site.description %}
+{% assign excerpt_description = page.excerpt | strip_html %}
+{% assign page_description = page.seo_description | default: page.description | default: excerpt_description | default: site.description %}
 {% assign canonical_url = page.url | default: page.permalink | default: '/' | absolute_url %}
 {% assign raw_keywords = page.keywords | default: page.tags | default: site.keywords %}
 {% assign localization_config = site.theme_options.localization %}
@@ -23,8 +24,9 @@
 {% include csp-meta.html %}
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <meta name="theme-color" content="#0b1d3d" />
-<meta name="description" content="{{ page_description | strip_html | normalize_whitespace }}" />
-<meta name="author" content="{{ page.author | default: site.author.name }}" />
+<meta name="description" content="{{ page_description | normalize_whitespace | escape }}" />
+{% assign head_authors = page | page_authors %}
+<meta name="author" content="{{ head_authors | map: 'name' | join: ', ' | escape }}" />
 {% if keyword_list %}
 <meta name="keywords" content="{{ keyword_list | join: ', ' | strip }}" />
 {% endif %}
@@ -33,15 +35,15 @@
 {%- 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 }}" />
+<meta name="application-name" content="{{ site.title | escape }}" />
+<meta property="og:site_name" content="{{ site.title | escape }}" />
 {% if page.layout == 'post' or page.collection == 'posts' %}
 <meta property="og:type" content="article" />
 {% else %}
 <meta property="og:type" content="website" />
 {% endif %}
-<meta property="og:title" content="{{ page_title | strip_html | normalize_whitespace }}" />
-<meta property="og:description" content="{{ page_description | strip_html | normalize_whitespace }}" />
+<meta property="og:title" content="{{ page_title | normalize_whitespace | escape }}" />
+<meta property="og:description" content="{{ page_description | normalize_whitespace | escape }}" />
 <meta property="og:url" content="{{ canonical_url }}" />
 {% if page.og_image or page.image %}
 <meta property="og:image" content="{{ page.og_image | default: page.image | absolute_url }}" />
@@ -52,14 +54,17 @@
 <meta property="og:see_also" content="{{ site.url }}" />
 <meta name="twitter:card" content="summary_large_image" />
 <meta name="twitter:site" content="{{ site.social.twitter | default: site.twitter_username }}" />
-<meta name="twitter:title" content="{{ page_title | strip_html | normalize_whitespace }}" />
-<meta name="twitter:description" content="{{ page_description | strip_html | normalize_whitespace }}" />
+<meta name="twitter:title" content="{{ page_title | normalize_whitespace | escape }}" />
+<meta name="twitter:description" content="{{ page_description | normalize_whitespace | escape }}" />
 {% if page.twitter_image or page.og_image or page.image %}
 <meta name="twitter:image" content="{{ page.twitter_image | default: page.og_image | default: page.image | absolute_url }}" />
 {% elsif site.social.default_image %}
 <meta name="twitter:image" content="{{ site.social.default_image | absolute_url }}" />
 {% endif %}
 <link rel="canonical" href="{{ canonical_url }}" />
+{% include meta/webmention-discovery.html %}
+{%- assign head_license = page | page_license %}
+{% if head_license.url %}<link rel="license" href="{{ head_license.url | escape }}" />{% endif %}
 {% if js_manifest and js_manifest.core %}
 <link rel="modulepreload" href="{{ js_manifest.core | relative_url }}" crossorigin="anonymous" />
 {%- comment -%} Only a page that renders the search app uses the search bundle. {%- endcomment -%}
@@ -77,6 +82,50 @@
 {% 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 %}
+{%- comment -%} Posts carry the reading-state panel; a page with the saved-articles list carries data-reading-list. {%- endcomment -%}
+{% if js_manifest.features and js_manifest.features['reading-state'] and site.theme_options.reading_state.enabled != false %}
+  {% if page.layout == 'post' or content contains 'data-reading-list' %}
+<link rel="modulepreload" href="{{ js_manifest.features['reading-state'] | relative_url }}" crossorigin="anonymous" />
+  {% endif %}
+{% endif %}
+{%- comment -%} The correction-report form renders on posts of a site with a backend. {%- endcomment -%}
+{% if js_manifest.features and js_manifest.features.corrections and page.layout == 'post' and page.corrections != false %}
+  {% if site.dynamic_services.base_url and site.dynamic_services.base_url != '' and site.dynamic_services.features.corrections != false and site.corrections.enabled != false %}
+<link rel="modulepreload" href="{{ js_manifest.features.corrections | relative_url }}" crossorigin="anonymous" />
+  {% endif %}
+{% endif %}
+{%- comment -%} The contact form renders on a page that asks for it, on a site with a backend. {%- endcomment -%}
+{% if js_manifest.features and js_manifest.features.contact and page.contact_form %}
+  {% if site.dynamic_services.base_url and site.dynamic_services.base_url != '' and site.dynamic_services.features.contact != false and site.contact.enabled != false %}
+<link rel="modulepreload" href="{{ js_manifest.features.contact | relative_url }}" crossorigin="anonymous" />
+  {% endif %}
+{% endif %}
+{%- comment -%} The comments thread of the api provider, on a page that shows comments that way. {%- endcomment -%}
+{% if js_manifest.features and js_manifest.features.comments and page.datalog_comments.provider == 'api' %}
+<link rel="modulepreload" href="{{ js_manifest.features.comments | relative_url }}" crossorigin="anonymous" />
+{% endif %}
+{%- comment -%} "Was this useful?" renders on posts of a site with a backend. {%- endcomment -%}
+{% if js_manifest.features and js_manifest.features.reactions and page.layout == 'post' and page.reactions != false %}
+  {% if site.dynamic_services.base_url and site.dynamic_services.base_url != '' and site.dynamic_services.features.reactions != false and site.reactions.enabled != false %}
+<link rel="modulepreload" href="{{ js_manifest.features.reactions | relative_url }}" crossorigin="anonymous" />
+  {% endif %}
+{% endif %}
+{%- comment -%} "Mentioned elsewhere" renders on posts of a site with a backend. {%- endcomment -%}
+{% if js_manifest.features and js_manifest.features.webmentions and page.layout == 'post' and page.webmentions != false %}
+  {% if site.dynamic_services.base_url and site.dynamic_services.base_url != '' and site.dynamic_services.features.webmentions != false and site.webmentions.enabled != false %}
+<link rel="modulepreload" href="{{ js_manifest.features.webmentions | relative_url }}" crossorigin="anonymous" />
+  {% endif %}
+{% endif %}
+{%- comment -%} The page the newsletter's emails link to acts as soon as it loads; the footer form loads on demand. {%- endcomment -%}
+{% if js_manifest.features and js_manifest.features.subscriptions and page.subscription_manage %}
+  {% if site.dynamic_services.base_url and site.dynamic_services.base_url != '' and site.dynamic_services.features.subscriptions != false and site.subscriptions.enabled != false %}
+<link rel="modulepreload" href="{{ js_manifest.features.subscriptions | relative_url }}" crossorigin="anonymous" />
+  {% endif %}
+{% endif %}
+{%- comment -%} The moderation inbox loads its queue as soon as the page opens. {%- endcomment -%}
+{% if js_manifest.features and js_manifest.features.moderation and page.moderation_inbox and site.moderation.enabled == true %}
+<link rel="modulepreload" href="{{ js_manifest.features.moderation | 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 %}
@@ -106,11 +155,11 @@
 <meta name="msapplication-TileColor" content="#0b1d3d" />
 
 {% if page.seo_title %}
-<title>{{ page.seo_title | strip_html | normalize_whitespace }} | {{ site.title }}</title>
+<title>{{ page.seo_title | normalize_whitespace | escape }} | {{ site.title | escape }}</title>
 {% elsif page.title and page.title != site.title %}
-<title>{{ page.title | strip_html | normalize_whitespace }} | {{ site.title }}</title>
+<title>{{ page.title | normalize_whitespace | escape }} | {{ site.title | escape }}</title>
 {% else %}
-<title>{{ site.title }}</title>
+<title>{{ site.title | escape }}</title>
 {% endif %}
 
 {%- comment -%}
@@ -304,47 +353,10 @@
   {% endif %}
 {% endif %}
 
-{% assign citation_source = page.citation_authors | default: page.authors %}
-{% if page.title or page.citation_title %}
-<meta name="citation_title" content="{{ page.citation_title | default: page_title | strip_html | normalize_whitespace }}" />
-{% endif %}
-{% if citation_source %}
-  {% capture citation_source_json %}{{ citation_source | jsonify }}{% endcapture %}
-  {% assign citation_source_first = citation_source_json | slice: 0, 1 %}
-  {% if citation_source_first == '[' %}
-    {% assign citation_author_list = citation_source %}
-  {% else %}
-    {% assign citation_author_list = citation_source | replace: ';', ',' | split: ',' %}
-  {% endif %}
-  {% for author in citation_author_list %}
-<meta name="citation_author" content="{{ author | strip | escape }}" />
-  {% endfor %}
-{% elsif page.author or site.author.name %}
-<meta name="citation_author" content="{{ page.author | default: site.author.name | strip | escape }}" />
-{% endif %}
-{% if page.date %}
-<meta name="citation_publication_date" content="{{ page.date | date: '%Y/%m/%d' }}" />
-{% endif %}
-{% if page.doi %}
-<meta name="citation_doi" content="{{ page.doi }}" />
-{% endif %}
-{% if page.journal %}
-<meta name="citation_journal_title" content="{{ page.journal }}" />
-{% endif %}
-{% if page.conference %}
-<meta name="citation_conference_title" content="{{ page.conference }}" />
-{% endif %}
-{% if page.orcid or site.author.orcid %}
-<meta name="citation_orcid" content="{{ page.orcid | default: site.author.orcid }}" />
-{% endif %}
-{% if page.dataset_doi %}
-<meta name="citation_dataset_doi" content="{{ page.dataset_doi }}" />
-{% endif %}
-{% if page.citation_pdf %}
-<link rel="citation_pdf_url" href="{{ page.citation_pdf | absolute_url }}" />
-{% endif %}
+{%- comment -%} Highwire and Dublin Core tags, for a page read as a research article; the include decides which. {%- endcomment -%}
+{% include meta/scholarly.html %}
 
-<link rel="alternate" type="application/atom+xml" title="{{ site.title }}" href="{{ '/feed.xml' | absolute_url }}" />
+<link rel="alternate" type="application/atom+xml" title="{{ site.title | escape }}" 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 != "" %}

data/_includes/header/navigation.html

@@ -35,9 +35,9 @@ page language gets its own copy of any translated descriptions.
       {%- assign nav_description = nav_section | default: nav_title -%}
       {%- assign nav_description = nav_description | append: ' resources' -%}
     {%- endif -%}
-    <li class="nav-item" data-section="{{ item.section | default: nav_title | downcase }}">
+    <li class="nav-item" data-section="{{ item.section | default: nav_title | downcase | escape }}">
       <a class="nav-link{% if is_active %} is-active{% endif %}" href="{{ item_url }}"{% if is_active %} aria-current="page"{% endif %}>
-        <span class="nav-title">{{ nav_title }}</span>
+        <span class="nav-title">{{ nav_title | escape }}</span>
         <span class="nav-description">{{ nav_description | strip }}</span>
       </a>
     </li>

data/_includes/header.html

@@ -39,7 +39,7 @@ and is cached for each distinct set.
           </svg>
         </span>
         <span class="site-title-group">
-          <span class="site-title">{{ site.name | default: site.title }}</span>
+          <span class="site-title">{{ site.name | default: site.title | escape }}</span>
           <span class="site-tagline">{{ brand_symbol }}</span>
         </span>
       </a>

data/_includes/layouts/default/article.html

@@ -24,10 +24,10 @@ Renders the standard article scaffold used by the default layout.
       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>
+        <h1 class="article-title" itemprop="headline">{{ article_page.title | escape }}</h1>
       {%- endif -%}
       {%- if article_page.subtitle -%}
-        <p class="article-subtitle">{{ article_page.subtitle }}</p>
+        <p class="article-subtitle">{{ article_page.subtitle | escape }}</p>
       {%- endif -%}
     {%- endunless -%}
     {%- if article_page.excerpt -%}
@@ -52,14 +52,12 @@ Renders the standard article scaffold used by the default layout.
           </dd>
         </div>
       {%- endif -%}
-      {%- assign author_name = article_page.author | default: site.author.name -%}
+      {%- assign article_authors = article_page | page_authors -%}
       {%- comment -%} `show_author: false` hides the byline, for pages that are site chrome rather than articles. {%- endcomment -%}
-      {%- if author_name and article_page.show_author != false -%}
+      {%- if article_authors.size > 0 and article_page.show_author != false -%}
         <div>
-          <dt class="visually-hidden">{% t 'article.meta.author' %}</dt>
-          <dd itemprop="author" itemscope itemtype="https://schema.org/Person">
-            <span itemprop="name">{{ author_name }}</span>
-          </dd>
+          <dt class="visually-hidden">{% if article_authors.size > 1 %}{% t 'article.meta.authors' %}{% else %}{% t 'article.meta.author' %}{% endif %}</dt>
+          <dd>{% include components/author-list.html people=article_authors show_affiliation=false %}</dd>
         </div>
       {%- endif -%}
     </dl>