datalog-theme 0.10.0 → 0.11.0

data/_includes/head.html

@@ -36,7 +36,7 @@
 <meta name="robots" content="{{ page.robots | default: 'index,follow' }}" />
 <meta name="format-detection" content="telephone=no" />
 <meta name="application-name" content="{{ site.title | escape }}" />
-<meta property="og:site_name" content="{{ site.title | escape }}" />
+{% assign head_identity = site | site_identity %}<meta property="og:site_name" content="{{ head_identity.name | default: site.title | escape }}" />
 {% if page.layout == 'post' or page.collection == 'posts' %}
 <meta property="og:type" content="article" />
 {% else %}
@@ -45,8 +45,21 @@
 <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 }}" />
+{%- comment -%}
+  The share image: the page's own, else the card the build drew for it
+  (theme_options.social_cards), else the site's default. A blank `image:`
+  is no image, as the card generator reads it.
+{%- endcomment %}
+{%- assign share_image = page.og_image | strip | default: page.image | strip -%}
+{%- assign twitter_share_image = page.twitter_image | strip | default: share_image -%}
+{% if share_image != "" %}
+<meta property="og:image" content="{{ share_image | absolute_url }}" />
+{% elsif page.datalog_social_card %}
+<meta property="og:image" content="{{ page.datalog_social_card.url | absolute_url }}" />
+<meta property="og:image:type" content="image/png" />
+<meta property="og:image:width" content="{{ page.datalog_social_card.width }}" />
+<meta property="og:image:height" content="{{ page.datalog_social_card.height }}" />
+<meta property="og:image:alt" content="{{ page.datalog_social_card.alt | escape }}" />
 {% elsif site.social.default_image %}
 <meta property="og:image" content="{{ site.social.default_image | absolute_url }}" />
 {% endif %}
@@ -56,8 +69,11 @@
 <meta name="twitter:site" content="{{ site.social.twitter | default: site.twitter_username }}" />
 <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 }}" />
+{% if twitter_share_image != "" %}
+<meta name="twitter:image" content="{{ twitter_share_image | absolute_url }}" />
+{% elsif page.datalog_social_card %}
+<meta name="twitter:image" content="{{ page.datalog_social_card.url | absolute_url }}" />
+<meta name="twitter:image:alt" content="{{ page.datalog_social_card.alt | escape }}" />
 {% elsif site.social.default_image %}
 <meta name="twitter:image" content="{{ site.social.default_image | absolute_url }}" />
 {% endif %}
@@ -154,10 +170,17 @@
 <link rel="shortcut icon" href="{{ '/assets/img/favicons/favicon.ico' | relative_url }}" />
 <meta name="msapplication-TileColor" content="#0b1d3d" />
 
+{%- comment -%}
+  ` | <site title>` follows a page's own title. `seo_title_suffix: false` leaves
+  it out, for a title that already names the site; a string replaces the site
+  title after the bar.
+{%- endcomment %}
+{% assign title_suffix = site.title %}
+{% if page.seo_title_suffix == false or page.seo_title_suffix == '' %}{% assign title_suffix = nil %}{% elsif page.seo_title_suffix %}{% assign title_suffix = page.seo_title_suffix %}{% endif %}
 {% if page.seo_title %}
-<title>{{ page.seo_title | normalize_whitespace | escape }} | {{ site.title | escape }}</title>
+<title>{{ page.seo_title | normalize_whitespace | escape }}{% if title_suffix %} | {{ title_suffix | escape }}{% endif %}</title>
 {% elsif page.title and page.title != site.title %}
-<title>{{ page.title | normalize_whitespace | escape }} | {{ site.title | escape }}</title>
+<title>{{ page.title | normalize_whitespace | escape }}{% if title_suffix %} | {{ title_suffix | escape }}{% endif %}</title>
 {% else %}
 <title>{{ site.title | escape }}</title>
 {% endif %}
@@ -261,6 +284,9 @@
   {% else %}
 <script nonce="{{ page.csp_nonce }}">
   window.MathJax = {
+    // The maths toolkit's options. MathJax keeps them in MathJax.config, where
+    // ready() below and math.js, whichever runs second, both read them (#421).
+    datalog: { numbering: '{{ math_numbering }}' },
     tex: {
       inlineMath: [['$', '$'], ['\\(', '\\)']],
       displayMath: [['$$', '$$'], ['\\[', '\\]']],
@@ -270,7 +296,8 @@
       // 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',
+      // theme_options.math.numbering: `ams` (the default), `all` or `none`.
+      tags: '{{ math_numbering }}',
       tagSide: 'right',
       tagIndent: '1.25em',
       macros: {
@@ -303,11 +330,23 @@
       enableAssistiveMml: true,
       enableMenu: true,
       skipHtmlTags: ['script', 'noscript', 'style', 'textarea', 'code', 'pre'],
-      renderActions: { addMenu: [0, '', ''] },
+      renderActions: {
+        addMenu: [0, '', ''],
+        // After MathJax inserts an expression (STATE.INSERTED is 200), on every
+        // render: MathJax draws one again into a new container when a reader
+        // changes a menu setting, and that container needs what the toolkit
+        // gave the first (#412). It is configuration rather than added at
+        // start, because the menu builds a new document for some settings.
+        datalogRestore: [210,
+          (doc) => { if (window.DatalogMath) { window.DatalogMath.restoreAll(doc); } return false; },
+          (math) => { if (window.DatalogMath) { window.DatalogMath.restore(math); } return false; }]
+      },
       menuOptions: {
         settings: {
           assistiveMml: true,
-          collapsible: true,
+          // Collapsible math wraps parts of an expression in toggles: a click
+          // meant to select a formula collapsed part of it to ◂…▸ (#412).
+          collapsible: false,
           // 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.
@@ -320,9 +359,29 @@
     startup: {
       ready() {
         const MJ = MathJax;
+        {%- if math_numbering == 'ams' %}
+        // `ams` numbers what amsmath numbers (equation, align, gather and the
+        // rest, not their starred forms) and also a $$...$$ display with a
+        // \label, as the theme's guides write them: MathJax's own `ams` leaves
+        // that display unnumbered, and its \eqref reads (???).
+        const tex = MJ._ && MJ._.input && MJ._.input.tex;
+        const AmsTags = tex && tex.ams && tex.ams.AmsConfiguration && tex.ams.AmsConfiguration.AmsTags;
+        if (AmsTags) {
+          const finalize = AmsTags.prototype.finalize;
+          AmsTags.prototype.finalize = function (node, env) {
+            if (env.display && this.label && this.currentTag.tag == null && !this.currentTag.env &&
+                !this.history.some((tag) => tag.taggable)) {
+              return this.enTag(node, this.getTag(true));
+            }
+            return finalize.call(this, node, env);
+          };
+        }
+        {%- endif %}
         MJ.startup.defaultReady();
+        // math.js may not have arrived yet; if so, it starts the toolkit itself
+        // when it does (#421).
         if (window.DatalogMath && typeof window.DatalogMath.init === 'function') {
-          window.DatalogMath.init(MJ);
+          window.DatalogMath.init(MJ, MJ.config.datalog);
         }
         MJ.startup.promise.then(() => {
           document.querySelectorAll('[data-math-alt]').forEach((el) => {

data/_includes/layouts/default/article.html

@@ -6,64 +6,94 @@ required:
 optional:
   - date_format
 ---
-Renders the standard article scaffold used by the default layout.
+The page's heading and the content of every layout built on the default one.
+
+A layout that renders its own heading sets `show_title: false`, and one that
+renders its own date and authors sets `article_meta: false`; a page may set
+either for itself. The heading carries the page's `summary`, or a document's
+`description`, never the excerpt, which is the content's own first paragraph.
+The date is the one front matter gives, never the time of the build, which
+Jekyll gives an undated document, and the date and authors are labelled.
+
+Structured data comes from the JSON-LD meta/schema.html writes and from the
+microdata of a layout's own item (a post, a notebook, a project, a research
+article). This element is no item of its own: as a ScholarlyArticle around
+every page it contradicted the JSON-LD of most of them (#411).
 {%- endcomment -%}
 {%- assign article_page = include.page -%}
 {%- assign hero_overlay_title = false -%}
 {%- if article_page.post_hero.image and article_page.post_hero.overlay -%}
   {%- assign hero_overlay_title = true -%}
 {%- endif -%}
-<article class="content-block" itemscope itemtype="https://schema.org/ScholarlyArticle">
+{%- assign article_meta = true -%}
+{%- if article_page.article_meta == false or layout.article_meta == false -%}
+  {%- assign article_meta = false -%}
+{%- endif -%}
+{%- assign article_heading = false -%}
+{%- if article_page.title and article_page.show_title != false and layout.show_title != false -%}
+  {%- assign article_heading = true -%}
+{%- endif -%}
+{%- capture article_header -%}
+  {%- unless hero_overlay_title -%}
+    {%- if article_heading -%}
+      <h1 class="article-title">{{ article_page.title | escape }}</h1>
+    {%- endif -%}
+    {%- if article_page.subtitle -%}
+      <p class="article-subtitle">{{ article_page.subtitle | escape }}</p>
+    {%- endif -%}
+  {%- endunless -%}
+  {%- comment -%} A layout with a heading of its own writes its own summary under it {%- endcomment -%}
+  {%- assign article_summary = article_page.summary -%}
+  {%- if article_page.collection -%}{%- assign article_summary = article_summary | default: article_page.description -%}{%- endif -%}
+  {%- if article_heading and article_summary -%}
+    <p class="article-summary">{{ article_summary | strip_html | escape }}</p>
+  {%- endif -%}
+  {%- if article_meta -%}
+    {%- assign published = article_page | published_date -%}
+    {%- assign modified = article_page.last_modified_at | default: article_page.updated -%}
+    {%- if modified and published -%}
+      {%- assign modified_day = modified | date: '%F' -%}
+      {%- assign published_day = published | date: '%F' -%}
+      {%- if modified_day == published_day -%}{%- assign modified = nil -%}{%- endif -%}
+    {%- endif -%}
+    {%- assign article_authors = article_page | page_authors -%}
+    {%- if article_page.show_author == false -%}{%- assign article_authors = '' | split: '' -%}{%- endif -%}
+    {%- if published or modified or article_authors.size > 0 -%}
+      <dl class="post-meta-list article-meta">
+        {%- if published -%}
+          <div>
+            <dt class="post-meta-term">{% t 'article.meta.published' %}</dt>
+            <dd class="post-meta-definition"><time datetime="{{ published | date_to_xmlschema }}">{% include helpers/date-format.html date=published format=include.date_format %}</time></dd>
+          </div>
+        {%- endif -%}
+        {%- if modified -%}
+          <div>
+            <dt class="post-meta-term">{% t 'article.meta.updated' %}</dt>
+            <dd class="post-meta-definition"><time datetime="{{ modified | date_to_xmlschema }}">{% include helpers/date-format.html date=modified format=include.date_format %}</time></dd>
+          </div>
+        {%- endif -%}
+        {%- if article_authors.size > 0 -%}
+          <div>
+            <dt class="post-meta-term">{% if article_authors.size > 1 %}{% t 'article.meta.authors' %}{% else %}{% t 'article.meta.author' %}{% endif %}</dt>
+            <dd class="post-meta-definition">{% include components/author-list.html people=article_authors show_affiliation=false property=false %}</dd>
+          </div>
+        {%- endif -%}
+      </dl>
+    {%- endif -%}
+  {%- endif -%}
+{%- endcapture -%}
+{%- assign article_header = article_header | strip -%}
+<article class="content-block">
   {%- if article_page.post_hero.image -%}
     {% include components/post-hero.html page=article_page %}
   {%- endif -%}
+  {%- if article_header != "" %}
   <header class="article-header">
-    {%- unless hero_overlay_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 | escape }}</h1>
-      {%- endif -%}
-      {%- if article_page.subtitle -%}
-        <p class="article-subtitle">{{ article_page.subtitle | escape }}</p>
-      {%- endif -%}
-    {%- endunless -%}
-    {%- if article_page.excerpt -%}
-      <p class="article-summary" itemprop="abstract">{{ article_page.excerpt | strip_html }}</p>
-    {%- endif -%}
-
-    <dl class="article-meta">
-      {%- if article_page.date -%}
-        <div>
-          <dt class="visually-hidden">{% t 'article.meta.published' %}</dt>
-          <dd itemprop="datePublished" content="{{ article_page.date | date_to_xmlschema }}">
-            {% include helpers/date-format.html date=article_page.date format=include.date_format %}
-          </dd>
-        </div>
-      {%- endif -%}
-      {%- assign modified = article_page.last_modified_at | default: article_page.updated -%}
-      {%- if modified -%}
-        <div>
-          <dt class="visually-hidden">{% t 'article.meta.updated' %}</dt>
-          <dd itemprop="dateModified" content="{{ modified | date_to_xmlschema }}">
-            {% include helpers/date-format.html date=modified format=include.date_format %}
-          </dd>
-        </div>
-      {%- endif -%}
-      {%- 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 article_authors.size > 0 and article_page.show_author != false -%}
-        <div>
-          <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>
+    {{ article_header }}
   </header>
+  {%- endif %}
 
-  <div class="article-body" itemprop="articleBody">
+  <div class="article-body">
     {{ include.content }}
   </div>
 </article>

data/_includes/meta/dataset-json.html

@@ -0,0 +1,171 @@
+{%- comment -%}
+---
+required:
+  - page
+---
+schema.org/Dataset for a page in the `datasets` collection.
+
+Google Dataset Search indexes `Dataset` and nothing else, so a dataset page
+described only as a `WebPage` cannot be found there. Everything this needs is
+already in the front matter the dataset layout renders: the summary, the
+licence, the download and the field schema.
+
+Front matter it reads, all optional beyond the title:
+
+  summary:        the description; the excerpt when there is none
+  updated:        dateModified
+  license:        resolved through `page_license`, so the URL is the licence's
+  download_url:   one distribution; `distributions:` takes a list
+  schema:         name/description per field, as variableMeasured
+  doi:            identifier, as a PropertyValue and a DOI URL
+  keywords:       falls back to `tags`
+  temporal_coverage, spatial_coverage, measurement_technique, citation
+  is_accessible_for_free: false marks a dataset behind a wall
+
+Every field is left out when it has no value: `"license": ""` is not valid
+structured data, and an empty one is worse than none.
+{%- endcomment -%}
+{%- assign ds = include.page -%}
+{%- assign ds_url = ds.url | absolute_url -%}
+{%- assign ds_excerpt = ds.excerpt | strip_html | strip_newlines -%}
+{%- assign ds_description = ds.summary | default: ds.description | default: ds_excerpt | strip_newlines -%}
+{%- assign ds_license = ds | page_license -%}
+{%- assign ds_authors = ds | page_authors -%}
+{%- assign ds_keywords = ds.keywords | default: ds.tags -%}
+{%- comment -%}
+  Jekyll gives a collection document without a `date:` the build time, so
+  `page.date` cannot be trusted to mean anything. Comparing it with the build
+  stamp tells a real publication date from that fallback, and keeps the output
+  the same from one build to the next.
+{%- endcomment -%}
+{%- assign ds_published = ds | published_date -%}
+{%- assign ds_modified = ds.updated | default: ds.last_modified_at | default: ds_published -%}
+{%- comment -%} One download, or a list of them under `distributions`. {%- endcomment -%}
+{%- assign ds_downloads = ds.distributions -%}
+{%- unless ds_downloads -%}
+  {%- if ds.download_url -%}
+    {%- assign ds_downloads = '' | split: '' | push: ds.download_url -%}
+  {%- endif -%}
+{%- endunless -%}
+<script type="application/ld+json" nonce="{{ schema_nonce }}">
+{
+  "@context": "https://schema.org",
+  "@type": "Dataset",
+  "name": {{ ds.title | jsonify_script }},
+  "description": {{ ds_description | jsonify_script }},
+  "url": {{ ds_url | jsonify_script }}
+  {%- if ds_license.url -%},
+  "license": {{ ds_license.url | jsonify_script }}
+  {%- elsif ds_license.name -%},
+  "license": {{ ds_license.name | jsonify_script }}
+  {%- endif -%}
+  {%- if ds.doi -%},
+  "identifier": {
+    "@type": "PropertyValue",
+    "propertyID": "doi",
+    "value": {{ ds.doi | jsonify_script }},
+    "url": {{ ds.doi | prepend: 'https://doi.org/' | replace: 'https://doi.org/https://doi.org/', 'https://doi.org/' | jsonify_script }}
+  }
+  {%- endif -%}
+  {%- if ds_published -%},
+  "datePublished": "{{ ds_published | date_to_xmlschema }}"
+  {%- endif -%}
+  {%- if ds_modified -%},
+  "dateModified": "{{ ds_modified | date_to_xmlschema }}"
+  {%- endif -%}
+  {%- if ds_keywords and ds_keywords.size > 0 -%},
+  "keywords": {{ ds_keywords | jsonify_script }}
+  {%- endif -%}
+  {%- if ds.temporal_coverage -%},
+  "temporalCoverage": {{ ds.temporal_coverage | jsonify_script }}
+  {%- endif -%}
+  {%- if ds.spatial_coverage -%},
+  "spatialCoverage": {{ ds.spatial_coverage | jsonify_script }}
+  {%- endif -%}
+  {%- if ds.measurement_technique -%},
+  "measurementTechnique": {{ ds.measurement_technique | jsonify_script }}
+  {%- endif -%}
+  {%- if ds.citation -%},
+  "citation": {{ ds.citation | jsonify_script }}
+  {%- endif -%}
+  {%- if ds.is_accessible_for_free != nil -%},
+  "isAccessibleForFree": {% if ds.is_accessible_for_free == false %}false{% else %}true{% endif %}
+  {%- endif -%}
+  {%- if ds_authors.size > 0 -%},
+  "creator": {% if ds_authors.size > 1 %}[{% endif %}
+  {%- for author in ds_authors -%}
+  {% include meta/person-json.html person=author %}{% unless forloop.last %},{% endunless %}
+  {%- endfor -%}
+  {% if ds_authors.size > 1 %}]{% endif %}
+  {%- endif -%}
+  {%- if ds.schema and ds.schema.size > 0 -%},
+  "variableMeasured": [
+  {%- for field in ds.schema -%}
+    {
+      "@type": "PropertyValue",
+      "name": {{ field.name | jsonify_script }}
+      {%- if field.description -%},
+      "description": {{ field.description | jsonify_script }}
+      {%- endif -%}
+    }{% unless forloop.last %},{% endunless %}
+  {%- endfor -%}
+  ]
+  {%- endif -%}
+  {%- if ds_downloads and ds_downloads.size > 0 -%},
+  "distribution": [
+  {%- for download in ds_downloads -%}
+    {%- comment -%} A plain URL, or a hash with `url` and optionally `format` and `name`. {%- endcomment -%}
+    {%- if download.url -%}
+      {%- assign download_url = download.url -%}
+      {%- assign download_format = download.format -%}
+      {%- assign download_name = download.name -%}
+    {%- else -%}
+      {%- assign download_url = download -%}
+      {%- assign download_format = nil -%}
+      {%- assign download_name = nil -%}
+    {%- endif -%}
+    {%- unless download_format -%}
+      {%- assign extension = download_url | split: '?' | first | split: '.' | last | downcase -%}
+      {%- case extension -%}
+        {%- when 'csv' -%}{%- assign download_format = 'text/csv' -%}
+        {%- when 'tsv' -%}{%- assign download_format = 'text/tab-separated-values' -%}
+        {%- when 'json' -%}{%- assign download_format = 'application/json' -%}
+        {%- when 'jsonl', 'ndjson' -%}{%- assign download_format = 'application/x-ndjson' -%}
+        {%- when 'zip' -%}{%- assign download_format = 'application/zip' -%}
+        {%- when 'gz', 'gzip' -%}{%- assign download_format = 'application/gzip' -%}
+        {%- when 'parquet' -%}{%- assign download_format = 'application/vnd.apache.parquet' -%}
+        {%- when 'xlsx' -%}{%- assign download_format = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' -%}
+        {%- when 'nc' -%}{%- assign download_format = 'application/x-netcdf' -%}
+        {%- when 'h5', 'hdf5' -%}{%- assign download_format = 'application/x-hdf5' -%}
+        {%- else -%}{%- assign download_format = nil -%}
+      {%- endcase -%}
+    {%- endunless -%}
+    {
+      "@type": "DataDownload",
+      "contentUrl": {{ download_url | absolute_url | jsonify_script }}
+      {%- if download_format -%},
+      "encodingFormat": {{ download_format | jsonify_script }}
+      {%- endif -%}
+      {%- if download_name -%},
+      "name": {{ download_name | jsonify_script }}
+      {%- endif -%}
+    }{% unless forloop.last %},{% endunless %}
+  {%- endfor -%}
+  ]
+  {%- endif -%}
+  {%- if publisher_name -%},
+  "publisher": {
+    "@type": {{ publisher_type | jsonify_script }},
+    "name": {{ publisher_name | jsonify_script }},
+    "url": {{ publisher_url | jsonify_script }}
+  }
+  {%- endif -%}
+  {%- comment -%} The site's own dataset index, so each dataset names the catalogue it belongs to. {%- endcomment -%}
+  {%- assign datasets_index = '/datasets/' | absolute_url -%},
+  "includedInDataCatalog": {
+    "@type": "DataCatalog",
+    "name": {{ site.title | default: site.name | jsonify_script }},
+    "url": {{ datasets_index | jsonify_script }}
+  }
+}
+</script>

data/_includes/meta/math-config.html

@@ -6,7 +6,13 @@ optional:
   - status_id
 ---
 Computes math rendering settings shared by layouts.
-Exposes math_enabled, math_engine, math_status_id, and math_has_expressions variables.
+Exposes math_enabled, math_engine, math_status_id, math_has_expressions,
+math_numbering and math_display_style variables.
+
+math_numbering is theme_options.math.numbering, `ams` unless it is `all` or
+`none`, and becomes MathJax's `tex.tags` in head.html. math_display_style is
+`card` when theme_options.math.display_style says so and `plain` otherwise; the
+layout marks a card site's <body> with `math-card`.
 
 math_enabled resolves, in order: the page's `math` front matter, then its
 `mathjax` front matter, then `theme_options.math.render_on_load` (falling back
@@ -26,6 +32,14 @@ only on pages that opt in.
 {%- assign math_settings = site.theme_options.math | default: {} -%}
 {%- assign math_engine = include.page.math_engine | default: math_settings.engine | default: 'mathjax' -%}
 {%- assign math_status_id = include.status_id | default: 'math-status' -%}
+{%- assign math_numbering = math_settings.numbering | default: 'ams' -%}
+{%- unless math_numbering == 'all' or math_numbering == 'none' -%}
+  {%- assign math_numbering = 'ams' -%}
+{%- endunless -%}
+{%- assign math_display_style = 'plain' -%}
+{%- if math_settings.display_style == 'card' -%}
+  {%- assign math_display_style = 'card' -%}
+{%- endif -%}
 {%- assign math_expressions = include.page.math_expressions | default: '' -%}
 {%- assign math_has_expressions = false -%}
 {%- if math_expressions != blank and math_expressions != empty -%}

data/_includes/meta/package-json.html

@@ -0,0 +1,69 @@
+{%- comment -%}
+---
+required:
+  - page
+---
+schema.org/SoftwareSourceCode for a page in the `packages` collection, beside
+the WebPage that describes the page itself.
+
+The release is the one the package layout shows: from
+_data/package_releases.yml when `datalog packages refresh` has written it,
+else from front matter. Front matter it reads, all optional beyond the title:
+
+  tagline, description:  the description
+  github_url:            codeRepository
+  language:              programmingLanguage
+  registry, pypi_url, cran_url, docs_url:  sameAs, one URL per page
+  license, version:      when the data file has no release; the licence is its
+                         URL when front matter resolves the same licence
+
+Every field is left out when it has no value.
+{%- endcomment -%}
+{%- assign pkg = include.page -%}
+{%- assign pkg_url = pkg.url | absolute_url -%}
+{%- assign pkg_release = pkg | package_release -%}
+{%- assign pkg_links = pkg | package_links | map: 'url' -%}
+{%- if pkg.docs_url -%}{%- assign pkg_links = pkg_links | push: pkg.docs_url -%}{%- endif -%}
+{%- assign pkg_excerpt = pkg.excerpt | strip_html | normalize_whitespace -%}
+{%- assign pkg_description = pkg.description | default: pkg.tagline | default: pkg_excerpt | normalize_whitespace -%}
+{%- assign pkg_authors = pkg | page_authors -%}
+{%- comment -%} The registry's own words (`MIT OR Apache-2.0`) when no URL is known for them. {%- endcomment -%}
+{%- assign pkg_license_value = pkg_release.license_url | default: pkg_release.license -%}
+<script type="application/ld+json" nonce="{{ schema_nonce }}">
+{
+  "@context": "https://schema.org",
+  "@type": "SoftwareSourceCode",
+  "@id": {{ pkg_url | append: '#software' | jsonify_script }},
+  "name": {{ pkg.title | jsonify_script }},
+  "url": {{ pkg_url | jsonify_script }},
+  "mainEntityOfPage": {{ pkg_url | jsonify_script }}
+  {%- if pkg_description != '' -%},
+  "description": {{ pkg_description | jsonify_script }}
+  {%- endif -%}
+  {%- if pkg.github_url -%},
+  "codeRepository": {{ pkg.github_url | jsonify_script }}
+  {%- endif -%}
+  {%- if pkg.language -%},
+  "programmingLanguage": {{ pkg.language | jsonify_script }}
+  {%- endif -%}
+  {%- if pkg_release.requirement -%},
+  "runtimePlatform": {{ pkg_release.requirement | jsonify_script }}
+  {%- endif -%}
+  {%- if pkg_release.version -%},
+  "version": {{ pkg_release.version | jsonify_script }}
+  {%- endif -%}
+  {%- if pkg_license_value -%},
+  "license": {{ pkg_license_value | jsonify_script }}
+  {%- endif -%}
+  {%- if pkg_authors.size > 0 -%},
+  "author": {% if pkg_authors.size > 1 %}[{% endif %}
+  {%- for author in pkg_authors -%}
+  {% include meta/person-json.html person=author %}{% unless forloop.last %},{% endunless %}
+  {%- endfor -%}
+  {% if pkg_authors.size > 1 %}]{% endif %}
+  {%- endif -%}
+  {%- if pkg_links.size > 0 -%},
+  "sameAs": {{ pkg_links | jsonify_script }}
+  {%- endif %}
+}
+</script>

data/_includes/meta/person-json.html

@@ -3,25 +3,48 @@
 required:
   - person
 ---
-One schema.org Person, as JSON, for a record from `page | page_authors` or
-`page | page_contributors`. The site's own author links to the site when the
-record names no url of its own.
+One schema.org Person, as JSON, for a record from `page | page_authors`,
+`page | page_contributors` or `site | site_author_record`. The site's own
+author links to the site when the record names no url of its own, and carries
+the `@id` that the publisher, the homepage's identity graph and a ProfilePage's
+`mainEntity` give it too, so every page names the same person (#322). Each
+other field is written when the record has it.
 {%- endcomment -%}
-{%- assign person_url = include.person.url -%}
-{%- if person_url == nil and include.person.site_author -%}{%- assign person_url = '/' -%}{%- endif -%}
+{%- assign json_person = include.person -%}
+{%- assign json_person_url = json_person.url -%}
+{%- if json_person_url == nil and json_person.site_author -%}{%- assign json_person_url = '/' -%}{%- endif -%}
+{%- assign json_person_description = json_person.bio | strip_html | normalize_whitespace -%}
 {
-    "@type": {% if include.person.type == 'Organization' %}"Organization"{% else %}"Person"{% endif %},
-    "name": {{ include.person.name | jsonify_script }}
-    {%- if person_url -%},
-    "url": {{ person_url | absolute_url | jsonify_script }}
+    "@type": {% if json_person.type == 'Organization' %}"Organization"{% else %}"Person"{% endif %},
+    {%- if json_person.site_author and json_person.type != 'Organization' %}
+    "@id": {{ '/' | absolute_url | append: '#person' | jsonify_script }},
+    {%- endif %}
+    "name": {{ json_person.name | jsonify_script }}
+    {%- if json_person.alternate_names.size > 0 -%},
+    "alternateName": {% if json_person.alternate_names.size == 1 %}{{ json_person.alternate_names.first | jsonify_script }}{% else %}{{ json_person.alternate_names | jsonify_script }}{% endif %}
     {%- endif -%}
-    {%- if include.person.affiliation -%},
+    {%- if json_person_url -%},
+    "url": {{ json_person_url | absolute_url | jsonify_script }}
+    {%- endif -%}
+    {%- if json_person.image -%},
+    "image": {{ json_person.image | absolute_url | jsonify_script }}
+    {%- endif -%}
+    {%- if json_person.job_titles.size > 0 -%},
+    "jobTitle": {% if json_person.job_titles.size == 1 %}{{ json_person.job_titles.first | jsonify_script }}{% else %}{{ json_person.job_titles | jsonify_script }}{% endif %}
+    {%- endif -%}
+    {%- if json_person_description != '' -%},
+    "description": {{ json_person_description | jsonify_script }}
+    {%- endif -%}
+    {%- if json_person.affiliation -%},
     "affiliation": {
       "@type": "Organization",
-      "name": {{ include.person.affiliation | jsonify_script }}
+      "name": {{ json_person.affiliation | jsonify_script }}
     }
     {%- endif -%}
-    {%- if include.person.same_as.size > 0 -%},
-    "sameAs": {{ include.person.same_as | jsonify_script }}
+    {%- if json_person.knows_about.size > 0 -%},
+    "knowsAbout": {{ json_person.knows_about | jsonify_script }}
+    {%- endif -%}
+    {%- if json_person.same_as.size > 0 -%},
+    "sameAs": {{ json_person.same_as | jsonify_script }}
     {%- endif -%}
   }

data/_includes/meta/publisher.html

@@ -7,6 +7,11 @@ Resolves who publishes the site, for structured data. Sets publisher_type
 Organization, publisher_logo and publisher_logo_default (true when the logo is
 the theme's 512px icon, whose size is known).
 
+It also sets publisher_id, the publisher's stable JSON-LD `@id` under the
+site's root: `#person` when the site's author publishes, which is the id the
+author's own Person carries, `#organization` for an Organization and
+`#publisher` for another Person; and publisher_is_site_author.
+
 `publisher` in _config.yml names the publisher. Without it, the site's author
 publishes as a Person, or the site title as an Organization when there is no
 author name. The author's affiliation is not the publisher: schema.html puts it
@@ -43,3 +48,13 @@ on the author.
     {%- assign publisher_logo_default = true -%}
   {%- endif -%}
 {%- endif -%}
+{%- assign identity_root = '/' | absolute_url -%}
+{%- assign publisher_is_site_author = false -%}
+{%- if publisher_type == 'Organization' -%}
+  {%- assign publisher_id = identity_root | append: '#organization' -%}
+{%- elsif publisher_name == site_author_name -%}
+  {%- assign publisher_id = identity_root | append: '#person' -%}
+  {%- assign publisher_is_site_author = true -%}
+{%- else -%}
+  {%- assign publisher_id = identity_root | append: '#publisher' -%}
+{%- endif -%}