datalog-theme 0.8.0 → 0.9.0

data/_includes/meta/scholarly.html

@@ -0,0 +1,121 @@
+{%- comment -%}
+---
+optional: []
+---
+Scholarly discovery metadata for a page read as a research article: the
+Highwire meta tags Google Scholar and reference managers read, and their
+Dublin Core equivalents. Only a page the `scholarly` filter accepts gets them
+(_plugins/scholarly.rb): a research article, a page with `scholarly: true`,
+or every post when _config.yml sets `scholarly: true`. A field the page
+lacks leaves its tag out. The authors are the page's (page_authors), as in
+the byline, the JSON-LD and the citation exports; `citation_authors` names
+the indexed authors alone.
+{%- endcomment -%}
+{%- assign is_scholarly = page | scholarly -%}
+{%- if is_scholarly and page.title -%}
+{%- include meta/publisher.html -%}
+{%- assign scholarly_title = page.citation_title | default: page.title | strip_html | normalize_whitespace -%}
+{%- assign scholarly_url = page.url | absolute_url -%}
+{%- assign scholarly_authors = page | page_authors -%}
+{%- assign scholarly_names = scholarly_authors | map: 'name' -%}
+{%- assign scholarly_override = false -%}
+{%- if page.citation_authors -%}
+  {%- assign scholarly_override = true -%}
+  {%- capture citation_source_json -%}{{ page.citation_authors | jsonify }}{%- endcapture -%}
+  {%- assign citation_source_first = citation_source_json | slice: 0, 1 -%}
+  {%- if citation_source_first == '[' -%}
+    {%- assign scholarly_names = page.citation_authors -%}
+  {%- else -%}
+    {%- assign scholarly_names = page.citation_authors | replace: ';', ',' | split: ',' -%}
+  {%- endif -%}
+{%- endif -%}
+{%- assign scholarly_pdf = page.pdf_url | default: page.citation_pdf -%}
+{%- assign scholarly_journal = page.journal | default: page.publication -%}
+{%- assign scholarly_issue = page.issue | default: page.number -%}
+{%- assign scholarly_keywords = page.keywords | default: page.tags -%}
+{%- assign scholarly_publisher = page.publisher | default: publisher_name -%}
+{%- assign scholarly_language = page.lang | default: site.locale | default: 'en' | split: '_' | first | split: '-' | first -%}
+{%- assign scholarly_license = page | page_license -%}
+{%- assign scholarly_description = page.description | default: page.excerpt | strip_html | normalize_whitespace | truncate: 300 -%}
+<meta name="citation_title" content="{{ scholarly_title | escape }}" />
+{%- if scholarly_override %}
+{%- for name in scholarly_names %}
+<meta name="citation_author" content="{{ name | strip | escape }}" />
+{%- endfor %}
+{%- else %}
+{%- for author in scholarly_authors %}
+<meta name="citation_author" content="{{ author.name | strip | escape }}" />
+{%- if author.affiliation %}
+<meta name="citation_author_institution" content="{{ author.affiliation | strip | escape }}" />
+{%- endif %}
+{%- if author.orcid %}
+<meta name="citation_author_orcid" content="{{ author.orcid | escape }}" />
+{%- endif %}
+{%- endfor %}
+{%- endif %}
+{%- if page.date %}
+<meta name="citation_publication_date" content="{{ page.date | date: '%Y/%m/%d' }}" />
+{%- endif %}
+<meta name="citation_public_url" content="{{ scholarly_url }}" />
+<meta name="citation_fulltext_html_url" content="{{ scholarly_url }}" />
+{%- if scholarly_pdf %}
+<meta name="citation_pdf_url" content="{{ scholarly_pdf | absolute_url }}" />
+{%- endif %}
+{%- if page.doi %}
+<meta name="citation_doi" content="{{ page.doi | escape }}" />
+{%- endif %}
+{%- if scholarly_journal %}
+<meta name="citation_journal_title" content="{{ scholarly_journal | escape }}" />
+{%- endif %}
+{%- if page.conference %}
+<meta name="citation_conference_title" content="{{ page.conference | escape }}" />
+{%- endif %}
+{%- if page.volume %}
+<meta name="citation_volume" content="{{ page.volume | escape }}" />
+{%- endif %}
+{%- if scholarly_issue %}
+<meta name="citation_issue" content="{{ scholarly_issue | escape }}" />
+{%- endif %}
+{%- if page.pages %}
+{%- assign page_range = page.pages | append: '' | replace: '–', '-' | replace: '—', '-' | split: '-' %}
+<meta name="citation_firstpage" content="{{ page_range[0] | strip | escape }}" />
+{%- if page_range.size > 1 %}
+<meta name="citation_lastpage" content="{{ page_range[1] | strip | escape }}" />
+{%- endif %}
+{%- endif %}
+{%- if page.issn %}
+<meta name="citation_issn" content="{{ page.issn | escape }}" />
+{%- endif %}
+{%- if page.isbn %}
+<meta name="citation_isbn" content="{{ page.isbn | escape }}" />
+{%- endif %}
+<meta name="citation_publisher" content="{{ scholarly_publisher | escape }}" />
+<meta name="citation_language" content="{{ scholarly_language }}" />
+{%- if scholarly_keywords and scholarly_keywords.size > 0 %}
+<meta name="citation_keywords" content="{{ scholarly_keywords | join: '; ' | escape }}" />
+{%- endif %}
+<link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" />
+<meta name="DC.title" content="{{ scholarly_title | escape }}" />
+{%- for name in scholarly_names %}
+<meta name="DC.creator" content="{{ name | strip | escape }}" />
+{%- endfor %}
+{%- if page.date %}
+<meta name="DC.date" content="{{ page.date | date: '%Y-%m-%d' }}" />
+{%- endif %}
+{%- if page.doi %}
+{%- assign scholarly_identifier = page.doi -%}
+{%- unless scholarly_identifier contains '://' -%}{%- assign scholarly_identifier = 'https://doi.org/' | append: page.doi -%}{%- endunless %}
+<meta name="DC.identifier" content="{{ scholarly_identifier | escape }}" />
+{%- else %}
+<meta name="DC.identifier" content="{{ scholarly_url }}" />
+{%- endif %}
+<meta name="DC.type" content="Text" />
+<meta name="DC.language" content="{{ scholarly_language }}" />
+<meta name="DC.publisher" content="{{ scholarly_publisher | escape }}" />
+{%- if scholarly_license.url %}
+<meta name="DC.rights" content="{{ scholarly_license.url | escape }}" />
+{%- endif %}
+{%- if scholarly_description and scholarly_description != '' %}
+<meta name="DC.description" content="{{ scholarly_description | escape }}" />
+{%- endif %}
+{%- endif -%}

data/_includes/meta/scripts-loader.html

@@ -34,4 +34,6 @@ highlighted by Rouge when the site builds, so the head renders nothing.
   <script nonce="{{ page.csp_nonce }}">
     window.DatalogIntegrations = {{ site.integrations | jsonify }};
   </script>
+  {%- comment -%} The dynamic services' public settings, on a site that has a backend. {%- endcomment -%}
+  {% include meta/dynamic-services-config.html %}
 {%- endif -%}

data/_includes/meta/webmention-discovery.html

@@ -0,0 +1,14 @@
+{%- comment -%}
+---
+optional: []
+---
+Webmention discovery (W3C Webmention, section 3.1.2): the receiver a site
+names in `webmentions.endpoint` is advertised in every page's head, so a
+website that links here can notify it. GitHub Pages cannot send the HTTP
+Link header form, so the <link> form is the one the theme uses. Nothing is
+advertised without an endpoint or with `webmentions.enabled: false`.
+{%- endcomment -%}
+{%- assign webmentions = site.webmentions -%}
+{%- if webmentions.enabled != false and webmentions.endpoint and webmentions.endpoint != '' -%}
+<link rel="webmention" href="{{ webmentions.endpoint }}" />
+{%- endif -%}

data/_includes/scripts.html

@@ -31,6 +31,55 @@
   {% assign academic_flag = 'false' %}
 {% endif %}
 
+{% if site.theme_options.reading_state.enabled == false %}
+  {% assign reading_state_flag = 'false' %}
+{% else %}
+  {% assign reading_state_flag = 'auto' %}
+{% endif %}
+
+{%- comment -%} The correction-report form needs a backend with the feature on (components/correction-report.html). {%- endcomment -%}
+{% assign corrections_flag = '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 %}
+  {% assign corrections_flag = 'auto' %}
+{% endif %}
+
+{%- comment -%} The contact form likewise (components/contact-form.html). {%- endcomment -%}
+{% assign contact_flag = 'false' %}
+{% if site.dynamic_services.base_url and site.dynamic_services.base_url != '' and site.dynamic_services.features.contact != false and site.contact.enabled != false %}
+  {% assign contact_flag = 'auto' %}
+{% endif %}
+
+{%- comment -%} The comments thread of the api provider (components/comments-thread.html), site-wide or for this page. {%- endcomment -%}
+{% assign comments_flag = 'false' %}
+{% assign comments_options = site.datalog_plugins.options['datalog-comments'] %}
+{% if comments_options.provider == 'api' or page.datalog_comments.provider == 'api' %}
+  {% assign comments_flag = 'auto' %}
+{% endif %}
+
+{%- comment -%} "Was this useful?" needs a backend with the feature on (components/reactions.html). {%- endcomment -%}
+{% assign reactions_flag = '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 %}
+  {% assign reactions_flag = 'auto' %}
+{% endif %}
+
+{%- comment -%} "Mentioned elsewhere" needs a backend with the feature on (components/webmentions.html). {%- endcomment -%}
+{% assign webmentions_flag = '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 %}
+  {% assign webmentions_flag = 'auto' %}
+{% endif %}
+
+{%- comment -%} The newsletter form and its manage page need a backend with the feature on (components/subscribe-form.html). {%- endcomment -%}
+{% assign subscriptions_flag = 'false' %}
+{% if site.dynamic_services.base_url and site.dynamic_services.base_url != '' and site.dynamic_services.features.subscriptions != false and site.subscriptions.enabled != false %}
+  {% assign subscriptions_flag = 'auto' %}
+{% endif %}
+
+{%- comment -%} The moderation inbox is off unless the site turns it on (components/moderation-inbox.html). {%- endcomment -%}
+{% assign moderation_flag = 'false' %}
+{% if site.moderation.enabled == true %}
+  {% assign moderation_flag = 'auto' %}
+{% endif %}
+
 <script nonce="{{ page.csp_nonce }}">
   (function () {
     const body = document.body;
@@ -42,6 +91,14 @@
     body.dataset.featureMath = "{{ math_flag }}";
     body.dataset.featureNotebook = "{{ notebook_flag }}";
     body.dataset.featureAcademic = "{{ academic_flag }}";
+    body.dataset.featureReadingState = "{{ reading_state_flag }}";
+    body.dataset.featureCorrections = "{{ corrections_flag }}";
+    body.dataset.featureContact = "{{ contact_flag }}";
+    body.dataset.featureComments = "{{ comments_flag }}";
+    body.dataset.featureReactions = "{{ reactions_flag }}";
+    body.dataset.featureWebmentions = "{{ webmentions_flag }}";
+    body.dataset.featureSubscriptions = "{{ subscriptions_flag }}";
+    body.dataset.featureModeration = "{{ moderation_flag }}";
   })();
 </script>
 

data/_layouts/dataset.html

@@ -8,7 +8,8 @@ show_title: false # this layout renders the page's <h1>
   <header class="dataset-header">
     <h1>{{ page.title }}</h1>
     {% if page.updated %}<p class="dataset-meta"><strong>{% t 'dataset.last_updated' %}</strong> {{ page.updated | localize_date: date_format }}</p>{% endif %}
-    {% if page.license %}<p class="dataset-meta"><strong>{% t 'dataset.license' %}</strong> {{ page.license }}</p>{% endif %}
+    {% assign dataset_license = page | page_license %}
+    {% if dataset_license %}<p class="dataset-meta"><strong>{% t 'dataset.license' %}</strong> {% include components/license-link.html license=dataset_license %}</p>{% endif %}
   </header>
   <div class="dataset-summary">
     {{ page.summary | default: page.excerpt }}
@@ -45,9 +46,9 @@ show_title: false # this layout renders the page's <h1>
     </section>
   {% endif %}
   {% assign citation_key = page.citation_key | default: page.slug | default: page.title | slugify %}
-  {% assign citation_authors = page.authors | default: page.author | default: site.author.name %}
+  {% assign citation_authors = page | page_authors %}
   {% assign citation_date = page.date | default: page.updated %}
   {% assign citation_url = page.url | absolute_url %}
-  {% include components/citation-tools.html title=page.title authors=citation_authors date=citation_date url=citation_url citation_key=citation_key publisher=site.author.affiliation citation_type='dataset' doi=page.doi %}
+  {% include components/citation-tools.html title=page.title authors=citation_authors date=citation_date url=citation_url citation_key=citation_key citation_type='dataset' doi=page.doi %}
   {% include components/open-science-badges.html %}
 </article>

data/_layouts/default.html

@@ -34,7 +34,7 @@
       {% include components/math-fallback.html expressions=page.math_expressions %}
       {% include layouts/default/article.html page=page content=content date_format=date_format %}
     </main>
-    {% include_cached footer.html %}
+    {% include_cached footer.html lang=page.lang %}
     <div class="visually-hidden" aria-live="polite" id="{{ math_status_id }}">{% t 'global.math_loading' %}</div>
     {% include meta/scripts-loader.html location='body' %}
   </body>

data/_layouts/package.html

@@ -224,13 +224,14 @@ show_title: false # this layout renders the page's <h1>
     observer.observe(heading);
   });
 
-  // Smooth scroll for anchor links
+  // Scroll to anchor targets. The stylesheet's scroll-behavior decides whether
+  // the scroll is smooth, so reduced-motion preferences are respected.
   document.querySelectorAll('.package-nav__link[href^="#"]').forEach(link => {
     link.addEventListener('click', (e) => {
       e.preventDefault();
       const target = document.querySelector(link.getAttribute('href'));
       if (target) {
-        target.scrollIntoView({ behavior: 'smooth', block: 'start' });
+        target.scrollIntoView({ block: 'start' });
         history.pushState(null, null, link.getAttribute('href'));
       }
     });

data/_layouts/page.html

@@ -11,6 +11,21 @@ layout: default
     {% endif %}
     <div class="page-content">
       {{ content }}
+      {%- if page.contact_form %}
+      {%- comment -%} The contact and collaboration form, or the email address without a backend {%- endcomment %}
+      {% include components/contact-form.html %}
+      {%- endif %}
+      {%- if page.subscription_manage %}
+      {%- comment -%} Where the newsletter's emails lead: confirm, change topics, unsubscribe {%- endcomment %}
+      {% include components/subscription-manage.html %}
+      {%- endif %}
+      {%- if page.subscribe_form %}
+      {% include components/subscribe-form.html where='page' %}
+      {%- endif %}
+      {%- if page.moderation_inbox %}
+      {%- comment -%} The moderation inbox: a shell; the service authenticates every request {%- endcomment %}
+      {% include components/moderation-inbox.html %}
+      {%- endif %}
     </div>
   </div>
 </section>

data/_layouts/post.html

@@ -34,8 +34,8 @@ schema_type: TechnicalArticle
 
 {%- comment -%} Canonical URL & author info {%- endcomment -%}
 {% assign canonical_url = page.url | absolute_url %}
-{% assign author_name = page.author | default: site.author.name %}
-{% assign author_affiliation = page.author_affiliation | default: site.author.affiliation %}
+{% assign authors = page | page_authors %}
+{% assign contributors = page | page_contributors %}
 
 {%- comment -%} Tag/Category flags {%- endcomment -%}
 {% assign post_tags = page.tags %}
@@ -56,8 +56,8 @@ schema_type: TechnicalArticle
   {% if page.last_modified_at or page.updated %}
     <meta itemprop="dateModified" content="{{ page.last_modified_at | default: page.updated | date_to_xmlschema }}" />
   {% endif %}
-  <meta itemprop="author" content="{{ author_name }}" />
-  <meta itemprop="publisher" content="{{ site.author.affiliation | default: site.title }}" />
+  {% include meta/publisher.html %}
+  <meta itemprop="publisher" content="{{ publisher_name | escape }}" />
   <meta itemprop="timeRequired" content="{{ time_required }}" />
   {% if difficulty %}<meta itemprop="learningResourceType" content="{{ difficulty }}" />{% endif %}
   {% if has_tags %}<meta itemprop="keywords" content="{{ post_tags | join: ', ' }}" />{% endif %}
@@ -69,17 +69,28 @@ schema_type: TechnicalArticle
         <dt class="post-meta-term">{% t 'post.meta.published' %}</dt>
         <dd class="post-meta-definition">{{ page.date | localize_date: date_format }}</dd>
       </div>
+      {%- comment -%} The last change, when it fell on another day than the publication {%- endcomment -%}
+      {% assign modified = page.last_modified_at | default: page.updated %}
+      {% if modified %}
+        {% assign modified_day = modified | date: '%F' %}
+        {% assign published_day = page.date | date: '%F' %}
+        {% if modified_day != published_day %}
+          <div>
+            <dt class="post-meta-term">{% t 'post.meta.updated' %}</dt>
+            <dd class="post-meta-definition">{{ modified | localize_date: date_format }}</dd>
+          </div>
+        {% endif %}
+      {% endif %}
       <div>
-        <dt class="post-meta-term">{% t 'post.meta.author' %}</dt>
-        <dd class="post-meta-definition">
-          <span itemprop="author" itemscope itemtype="https://schema.org/Person">
-            <span itemprop="name">{{ author_name }}</span>
-            {% if author_affiliation %}
-              <span class="post-author-affiliation" itemprop="affiliation">{{ author_affiliation }}</span>
-            {% endif %}
-          </span>
-        </dd>
+        <dt class="post-meta-term">{% if authors.size > 1 %}{% t 'post.meta.authors' %}{% else %}{% t 'post.meta.author' %}{% endif %}</dt>
+        <dd class="post-meta-definition">{% include components/author-list.html people=authors %}</dd>
       </div>
+      {% if contributors.size > 0 %}
+        <div>
+          <dt class="post-meta-term">{% t 'post.meta.contributors' %}</dt>
+          <dd class="post-meta-definition">{% include components/author-list.html people=contributors property='contributor' %}</dd>
+        </div>
+      {% endif %}
       <div>
         <dt class="post-meta-term">{% t 'post.meta.reading_time' %}</dt>
         <dd class="post-meta-definition"><span data-reading-time>{{ reading_label }}</span></dd>
@@ -111,6 +122,16 @@ schema_type: TechnicalArticle
     </dl>
   </section>
 
+  {%- comment -%} The reader's tools: save for later and reading mode; and the article's address on paper {%- endcomment -%}
+  <div class="post-tools">
+    {% include components/reading-state-bookmark.html %}
+    {% include components/reading-mode-toggle.html %}
+  </div>
+  <p class="post-print-source print-only">{% t 'post.print.source' %} {{ canonical_url }}{% if page.doi %} · DOI {{ page.doi | escape }}{% endif %}</p>
+
+  {%- comment -%} The newest correction or update, with a link to the revision history {%- endcomment -%}
+  {% include components/revision-notice.html page=page date_format=date_format %}
+
   {% if has_tags or has_categories %}
     <section class="post-taxonomy" aria-labelledby="post-taxonomy-heading">
       <h2 id="post-taxonomy-heading" class="visually-hidden">{% t 'post.topics_heading' %}</h2>
@@ -134,6 +155,9 @@ schema_type: TechnicalArticle
   {%- comment -%} Editorial provenance (why_this_exists, evidence, methodology, reviewed_at) {%- endcomment -%}
   {% include components/content-provenance.html page=page date_format=date_format %}
 
+  {%- comment -%} The article's series: every part in order, and the previous and next ones {%- endcomment -%}
+  {% include components/series-nav.html page=page %}
+
   {%- comment -%} Enhanced social sharing {%- endcomment -%}
   {% include components/social-share.html url=canonical_url title=page.title description=page.excerpt %}
 
@@ -148,6 +172,24 @@ schema_type: TechnicalArticle
     </div>
   </div>
 
+  {%- comment -%} The previous and next parts of the series, for a reader who has finished this one {%- endcomment -%}
+  {% include components/series-nav.html page=page compact=true %}
+
+  {%- comment -%} Was this useful? A reaction without a comment, on a site with a backend {%- endcomment -%}
+  {% include components/reactions.html %}
+
+  {%- comment -%} The reader's own: resume prompt, highlights and notes, kept in the browser {%- endcomment -%}
+  {% include components/reading-state-panel.html %}
+
+  {%- comment -%} The code, data and environment behind the analysis {%- endcomment -%}
+  {% include components/reproducibility.html page=page %}
+
+  {%- comment -%} Report an error: structured feedback to the author, on a site with a backend {%- endcomment -%}
+  {% include components/correction-report.html %}
+
+  {%- comment -%} What changed since publication (revisions in front matter) {%- endcomment -%}
+  {% include components/revision-history.html page=page date_format=date_format %}
+
   <section class="post-interactive" aria-label="{% t 'post.interactive.label' %}">
     {% if page.interactive_components and page.interactive_components.size > 0 %}
       <ul class="post-interactive-list">
@@ -195,22 +237,44 @@ schema_type: TechnicalArticle
     </section>
   {% endif %}
 
+  {%- comment -%} What other websites said about this article, apart from the comments hosted here {%- endcomment -%}
+  {% include components/webmentions.html %}
+
+  {%- comment -%} Reuse terms: the licence of the text and figures, and of the code samples {%- endcomment -%}
+  {% include components/license-notice.html page=page %}
+
   {%- comment -%} ===== Citation tools & badges ===== {%- endcomment -%}
   {% assign citation_key = page.citation_key | default: page.slug | default: page.title | slugify %}
-  {% assign citation_authors = page.authors | default: page.author | default: author_name %}
   {% include components/citation-tools.html
        title=page.title
-       authors=citation_authors
+       authors=authors
        date=page.date
        url=canonical_url
        citation_key=citation_key
-       publisher=site.author.affiliation
        citation_type='article'
        doi=page.doi %}
   {% include components/open-science-badges.html %}
 
-  {%- comment -%} Author bio card {%- endcomment -%}
-  {% include components/author-bio.html author=author_name %}
+  {%- comment -%}
+    Author cards: a full card for a single author, or for each author with
+    `author_cards: detailed`; a compact card each for several authors;
+    none with `author_cards: false`.
+  {%- endcomment -%}
+  {% unless page.author_cards == false %}
+    {% assign detailed_cards = false %}
+    {% if authors.size == 1 or page.author_cards == 'detailed' %}{% assign detailed_cards = true %}{% endif %}
+    {% for author in authors %}
+      {% if detailed_cards %}
+        {% include components/author-bio.html person=author %}
+      {% else %}
+        {% include components/author-bio.html person=author compact=true %}
+      {% endif %}
+    {% endfor %}
+  {% endunless %}
+
+  {%- comment -%} The newsletter form at the end of the article, when subscriptions.placement says so {%- endcomment -%}
+  {% assign subscribe_placement = site.subscriptions.placement | default: 'footer' %}
+  {% if subscribe_placement contains 'post' %}{% include components/subscribe-form.html where='post' %}{% endif %}
 
   {%- comment -%} ===== Robust related posts (no where_exp, no nil sort) ===== {%- endcomment -%}
   {% include post/related-posts.html page=page date_format=date_format %}

data/_layouts/project.html

@@ -209,10 +209,10 @@ show_title: false # this layout renders the page's <h1>
   {% endif %}
 
   {% assign citation_key = page.citation_key | default: page.slug | default: page.title | slugify %}
-  {% assign citation_authors = page.authors | default: page.author | default: site.author.name %}
+  {% assign citation_authors = page | page_authors %}
   {% assign citation_date = page.date | default: page.last_updated %}
   {% assign citation_url = page.url | absolute_url %}
-  {% include components/citation-tools.html title=page.title authors=citation_authors date=citation_date url=citation_url citation_key=citation_key publisher=site.author.affiliation citation_type='software' doi=page.doi %}
+  {% include components/citation-tools.html title=page.title authors=citation_authors date=citation_date url=citation_url citation_key=citation_key citation_type='software' doi=page.doi %}
 
   {% include components/open-science-badges.html %}
 

data/_layouts/research.html

@@ -3,8 +3,7 @@ layout: default
 schema_type: ScholarlyArticle
 ---
 {% assign date_format = site.date_format | default: '%B %-d, %Y' %}
-{% assign authors_source = page.authors | default: page.author | default: site.author %}
-{% assign authors = authors_source | arrayify %}
+{% assign authors = page | page_authors %}
 {% assign publication_name = page.publication | default: page.journal | default: page.conference %}
 {% assign publication_status = page.publication_status | default: page.status %}
 {% assign doi = page.doi %}
@@ -20,7 +19,13 @@ schema_type: ScholarlyArticle
 {% assign methodology_content = page.methodology %}
 {% assign results_content = page.results %}
 {% assign data_availability = page.data_availability %}
-{% assign reproducibility = page.reproducibility | default: page.reproducibility_notes %}
+{%- comment -%} `reproducibility` is free text here, or a map of artifacts for the panel (components/reproducibility.html). {%- endcomment -%}
+{% capture reproducibility_shape %}{{ page.reproducibility | jsonify | slice: 0, 1 }}{% endcapture %}
+{% if reproducibility_shape == '{' %}
+  {% assign reproducibility = page.reproducibility_notes %}
+{% else %}
+  {% assign reproducibility = page.reproducibility | default: page.reproducibility_notes %}
+{% endif %}
 {% assign peer_review = page.peer_review | default: page.peer_review_notes %}
 {% assign version_history = page.version_history %}
 {% assign appendices = page.appendices %}
@@ -28,8 +33,8 @@ schema_type: ScholarlyArticle
 {% assign references = page.references %}
 {% assign references_array = references | arrayify %}
 {% assign funding = page.funding %}
-{% assign rights = page.rights | default: page.license %}
-{% assign affiliation_default = site.author.affiliation %}
+{% assign rights = page.rights %}
+{% assign research_license = page | page_license %}
 {% assign show_publications = page.show_publications | default: false %}
 
 <div class="research-wrapper" itemscope itemtype="https://schema.org/ScholarlyArticle">
@@ -57,9 +62,9 @@ schema_type: ScholarlyArticle
       <h2 class="visually-hidden">Authors</h2>
       <ul class="research-author-list">
         {% for author in authors %}
-          {% assign author_name = author.name | default: author %}
-          {% assign author_affiliation = author.affiliation | default: author.institution | default: affiliation_default %}
-          {% assign author_orcid = author.orcid | default: site.author.orcid %}
+          {% assign author_name = author.name | escape %}
+          {% assign author_affiliation = author.affiliation | escape %}
+          {% assign author_orcid = author.orcid %}
           {% assign author_email = author.email | default: author.contact %}
           <li class="research-author" itemprop="author" itemscope itemtype="https://schema.org/Person">
             <span class="research-author-name" itemprop="name">{{ author_name }}</span>
@@ -125,6 +130,11 @@ schema_type: ScholarlyArticle
           <dt>Rights</dt>
           <dd>{{ rights }}</dd>
         </div>
+      {% elsif research_license %}
+        <div>
+          <dt>Rights</dt>
+          <dd>{% include components/license-link.html license=research_license %}</dd>
+        </div>
       {% endif %}
     </dl>
 
@@ -321,6 +331,8 @@ ER  -
     </section>
   {% endif %}
 
+  {% include components/reproducibility.html page=page %}
+
   {% if supplementary or appendices %}
     <section class="research-appendices" aria-labelledby="appendix-heading">
       <h2 id="appendix-heading">Appendix and supplementary materials</h2>