datalog-theme 0.9.0 → 0.9.2

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,7 +24,7 @@
 {% 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="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 %}
@@ -34,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 }}" />
@@ -53,8 +54,8 @@
 <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 %}
@@ -154,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 -%}
@@ -355,7 +356,7 @@
 {%- 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 -%}

data/_includes/meta/math-config.html

@@ -37,6 +37,9 @@ only on pages that opt in.
 {%- if math_load == nil -%}
   {%- assign math_load = site.features.mathjax -%}
 {%- endif -%}
+{%- if math_load == nil -%}
+  {%- assign math_load = 'auto' -%}
+{%- endif -%}
 {%- if include.page.math != nil -%}
   {%- assign math_enabled = include.page.math -%}
 {%- elsif include.page.mathjax != nil -%}

data/_includes/meta/person-json.html

@@ -8,20 +8,20 @@ One schema.org Person, as JSON, for a record from `page | page_authors` or
 record names no url of its own.
 {%- endcomment -%}
 {%- assign person_url = include.person.url -%}
-{%- if person_url == nil and include.person.site_author -%}{%- assign person_url = site.url -%}{%- endif -%}
+{%- if person_url == nil and include.person.site_author -%}{%- assign person_url = '/' -%}{%- endif -%}
 {
-    "@type": "Person",
-    "name": {{ include.person.name | jsonify }}
+    "@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 }}
+    "url": {{ person_url | absolute_url | jsonify_script }}
     {%- endif -%}
     {%- if include.person.affiliation -%},
     "affiliation": {
       "@type": "Organization",
-      "name": {{ include.person.affiliation | jsonify }}
+      "name": {{ include.person.affiliation | jsonify_script }}
     }
     {%- endif -%}
     {%- if include.person.same_as.size > 0 -%},
-    "sameAs": {{ include.person.same_as | jsonify }}
+    "sameAs": {{ include.person.same_as | jsonify_script }}
     {%- endif -%}
-  }
+  }

data/_includes/meta/publisher.html

@@ -31,7 +31,7 @@ on the author.
 {%- if site.publisher.url -%}
   {%- assign publisher_url = site.publisher.url | absolute_url -%}
 {%- else -%}
-  {%- assign publisher_url = site.url -%}
+  {%- assign publisher_url = '/' | absolute_url -%}
 {%- endif -%}
 {%- assign publisher_logo = nil -%}
 {%- assign publisher_logo_default = false -%}

data/_includes/meta/schema.html

@@ -7,13 +7,13 @@ optional:
 ---
 Outputs comprehensive JSON-LD metadata for the current page.
 Provides rich structured data for:
-- Article/BlogPosting/TechnicalArticle schema for posts
+- Article/BlogPosting/TechArticle schema for posts
 - WebPage schema for standard pages
 - Author information with social profile links
 - Publisher: a Person or an Organization, from `publisher` in _config.yml
 - Images, keywords, and content metadata
 
-Defaults to TechnicalArticle for posts, WebPage for other pages.
+Defaults to TechArticle for posts, WebPage for other pages.
 {%- endcomment -%}
 {%- assign schema_page = include.page -%}
 {%- include meta/publisher.html -%}
@@ -23,13 +23,15 @@ Defaults to TechnicalArticle for posts, WebPage for other pages.
 {%- endif -%}
 {%- assign default_type = 'WebPage' -%}
 {%- if is_post -%}
-  {%- assign default_type = 'TechnicalArticle' -%}
+  {%- assign default_type = 'TechArticle' -%}
 {%- endif -%}
-{%- assign schema_type = include.type | default: schema_page.schema_type | default: default_type -%}
+{%- assign schema_type = include.type | default: schema_page.schema_type | default: layout.schema_type | default: default_type -%}
+{%- if schema_type == 'TechnicalArticle' -%}{%- assign schema_type = 'TechArticle' -%}{%- endif -%}
 {%- assign csp_registry = site.data.csp | default: {} -%}
 {%- assign nonce_lookup = csp_registry.nonces | default: {} -%}
 {%- assign schema_nonce = schema_page.csp_nonce | default: page.csp_nonce | default: nonce_lookup[schema_page.path] | default: nonce_lookup[page.path] | default: nonce_lookup[page.url] -%}
-{%- assign description = schema_page.description | default: schema_page.excerpt | strip_html | strip_newlines | truncate: 300 -%}
+{%- assign schema_excerpt = schema_page.excerpt | strip_html -%}
+{%- assign description = schema_page.seo_description | default: schema_page.description | default: schema_excerpt | default: site.description | strip_newlines | truncate: 300 -%}
 {%- assign page_url = schema_page.url | absolute_url -%}
 {%- assign schema_authors = schema_page | page_authors -%}
 {%- assign schema_contributors = schema_page | page_contributors -%}
@@ -38,28 +40,28 @@ Defaults to TechnicalArticle for posts, WebPage for other pages.
 <script type="application/ld+json" nonce="{{ schema_nonce }}">
 {
   "@context": "https://schema.org",
-  "@type": "{{ schema_type }}",
+  "@type": {{ schema_type | jsonify_script }},
   "mainEntityOfPage": {
     "@type": "WebPage",
-    "@id": {{ page_url | jsonify }}
+    "@id": {{ page_url | jsonify_script }}
   },
-  "headline": {{ schema_page.title | default: site.title | truncate: 110 | jsonify }},
+  "headline": {{ schema_page.title | default: site.title | truncate: 110 | jsonify_script }},
   {%- comment -%} Values the page doesn't have are left out: "description": "" and "dateModified": "" are invalid structured data. {%- endcomment -%}
   {%- if description and description != "" -%}
-  "description": {{ description | jsonify }},
+  "description": {{ description | jsonify_script }},
   {%- endif -%}
-  "url": {{ page_url | jsonify }},
+  "url": {{ page_url | jsonify_script }},
   {%- if schema_page.image or schema_page.og_image -%}
   "image": {
     "@type": "ImageObject",
-    "url": {{ schema_page.image | default: schema_page.og_image | absolute_url | jsonify }},
+    "url": {{ schema_page.image | default: schema_page.og_image | absolute_url | jsonify_script }},
     "width": {{ schema_page.image_width | default: 1200 }},
     "height": {{ schema_page.image_height | default: 630 }}
   },
   {%- elsif site.social.default_image -%}
   "image": {
     "@type": "ImageObject",
-    "url": {{ site.social.default_image | absolute_url | jsonify }},
+    "url": {{ site.social.default_image | absolute_url | jsonify_script }},
     "width": 1200,
     "height": 630
   },
@@ -74,10 +76,10 @@ Defaults to TechnicalArticle for posts, WebPage for other pages.
   "wordCount": {{ word_count }},
   {%- endif -%}
   {%- if schema_page.tags and schema_page.tags.size > 0 -%}
-  "keywords": {{ schema_page.tags | jsonify }},
+  "keywords": {{ schema_page.tags | jsonify_script }},
   {%- endif -%}
   {%- if schema_page.categories and schema_page.categories.size > 0 -%}
-  "articleSection": {{ schema_page.categories | first | jsonify }},
+  "articleSection": {{ schema_page.categories | first | jsonify_script }},
   {%- endif -%}
   {%- if is_post -%}
   "inLanguage": "{{ schema_page.lang | default: site.locale | default: 'en' | split: '_' | first }}",
@@ -98,13 +100,13 @@ Defaults to TechnicalArticle for posts, WebPage for other pages.
   ],
   {%- endif -%}
   "publisher": {
-    "@type": {{ publisher_type | jsonify }},
-    "name": {{ publisher_name | jsonify }},
-    "url": {{ publisher_url | jsonify }}
+    "@type": {{ publisher_type | jsonify_script }},
+    "name": {{ publisher_name | jsonify_script }},
+    "url": {{ publisher_url | jsonify_script }}
     {%- if publisher_logo -%},
     "logo": {
       "@type": "ImageObject",
-      "url": {{ publisher_logo | jsonify }}
+      "url": {{ publisher_logo | jsonify_script }}
       {%- if publisher_logo_default -%},
       "width": 512,
       "height": 512
@@ -116,27 +118,27 @@ Defaults to TechnicalArticle for posts, WebPage for other pages.
   "identifier": {
     "@type": "PropertyValue",
     "propertyID": "doi",
-    "value": {{ schema_page.doi | jsonify }}
+    "value": {{ schema_page.doi | jsonify_script }}
   }
   {%- endif -%}
   {%- if schema_page.citation_key -%},
-  "citation": {{ schema_page.citation_key | jsonify }}
+  "citation": {{ schema_page.citation_key | jsonify_script }}
   {%- endif -%}
   {%- comment -%} The licence of the text and figures, and who holds the copyright. {%- endcomment -%}
   {%- assign content_license = schema_page | page_license -%}
   {%- if content_license -%}
   {%- if content_license.url -%},
-  "license": {{ content_license.url | jsonify }}
+  "license": {{ content_license.url | jsonify_script }}
   {%- endif -%}
   {%- if content_license.year -%},
-  "copyrightYear": {{ content_license.year | jsonify }}
+  "copyrightYear": {{ content_license.year | jsonify_script }}
   {%- endif -%}
   {%- if content_license.holder -%},
   "copyrightHolder": {% if content_license.people %}{% if content_license.holders.size > 1 %}[{% endif %}
   {%- for holder in content_license.holders -%}
-  { "@type": "Person", "name": {{ holder | jsonify }} }{% unless forloop.last %},{% endunless %}
+  { "@type": "Person", "name": {{ holder | jsonify_script }} }{% unless forloop.last %},{% endunless %}
   {%- endfor -%}
-  {% if content_license.holders.size > 1 %}]{% endif %}{% else %}{ "@type": "Organization", "name": {{ content_license.holder | jsonify }} }{% endif %}
+  {% if content_license.holders.size > 1 %}]{% endif %}{% else %}{ "@type": "Organization", "name": {{ content_license.holder | jsonify_script }} }{% endif %}
   {%- endif -%}
   {%- endif -%}
   {%- comment -%} Each correction in the revision history, with its date, summary and link. {%- endcomment -%}
@@ -147,11 +149,11 @@ Defaults to TechnicalArticle for posts, WebPage for other pages.
   {
     "@type": "CorrectionComment",
     "datePublished": "{{ correction.date | date_to_xmlschema }}",
-    "text": {{ correction.summary | jsonify }}
+    "text": {{ correction.summary | jsonify_script }}
     {%- if correction.details_url -%}
     {%- assign correction_url = correction.details_url -%}
     {%- unless correction_url contains '://' -%}{%- assign correction_url = correction_url | absolute_url -%}{%- endunless -%},
-    "url": {{ correction_url | jsonify }}
+    "url": {{ correction_url | jsonify_script }}
     {%- endif -%}
   }{% unless forloop.last %},{% endunless %}
   {%- endfor -%}
@@ -170,19 +172,19 @@ Defaults to TechnicalArticle for posts, WebPage for other pages.
       "@type": "ListItem",
       "position": 1,
       "name": "Home",
-      "item": {{ site.url | jsonify }}
+      "item": {{ '/' | absolute_url | jsonify_script }}
     },
     {
       "@type": "ListItem",
       "position": 2,
       "name": "Blog",
-      "item": {{ '/blog/' | absolute_url | jsonify }}
+      "item": {{ '/blog/' | absolute_url | jsonify_script }}
     },
     {
       "@type": "ListItem",
       "position": 3,
-      "name": {{ schema_page.title | truncate: 50 | jsonify }},
-      "item": {{ page_url | jsonify }}
+      "name": {{ schema_page.title | truncate: 50 | jsonify_script }},
+      "item": {{ page_url | jsonify_script }}
     }
   ]
 }

data/_includes/meta/scholarly.html

@@ -14,7 +14,7 @@ the indexed authors alone.
 {%- 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_title = page.citation_title | default: page.title | normalize_whitespace -%}
 {%- assign scholarly_url = page.url | absolute_url -%}
 {%- assign scholarly_authors = page | page_authors -%}
 {%- assign scholarly_names = scholarly_authors | map: 'name' -%}
@@ -26,7 +26,7 @@ the indexed authors alone.
   {%- if citation_source_first == '[' -%}
     {%- assign scholarly_names = page.citation_authors -%}
   {%- else -%}
-    {%- assign scholarly_names = page.citation_authors | replace: ';', ',' | split: ',' -%}
+    {%- assign scholarly_names = page.citation_authors | split: ';' -%}
   {%- endif -%}
 {%- endif -%}
 {%- assign scholarly_pdf = page.pdf_url | default: page.citation_pdf -%}
@@ -36,7 +36,8 @@ the indexed authors alone.
 {%- 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 -%}
+{%- assign scholarly_excerpt = page.excerpt | strip_html -%}
+{%- assign scholarly_description = page.seo_description | default: page.description | default: scholarly_excerpt | normalize_whitespace | truncate: 300 -%}
 <meta name="citation_title" content="{{ scholarly_title | escape }}" />
 {%- if scholarly_override %}
 {%- for name in scholarly_names %}

data/_includes/post/related-posts.html

@@ -41,7 +41,7 @@ Falls back to a friendly message when no related content is available.
               {%- if candidate.teaser -%}
               <a class="related-post__media" href="{{ candidate.url | relative_url }}" tabindex="-1" aria-hidden="true"><img src="{{ candidate.teaser | relative_url }}" alt="" loading="lazy" decoding="async" /></a>
               {%- endif -%}
-              <h3><a href="{{ candidate.url | relative_url }}">{{ candidate.title }}</a></h3>
+              <h3><a href="{{ candidate.url | relative_url }}">{{ candidate.title | escape }}</a></h3>
               <p class="related-post-meta">
                 {% include helpers/date-format.html date=candidate.date format=include.date_format %} · {{ candidate.excerpt | strip_html | default: '' | truncate: 140 }}
               </p>

data/_layouts/dataset.html

@@ -6,7 +6,7 @@ show_title: false # this layout renders the page's <h1>
 {% assign date_format = page.date_format | default: localization_config.date_format | default: 'long' %}
 <article class="dataset">
   <header class="dataset-header">
-    <h1>{{ page.title }}</h1>
+    <h1>{{ page.title | escape }}</h1>
     {% if page.updated %}<p class="dataset-meta"><strong>{% t 'dataset.last_updated' %}</strong> {{ page.updated | localize_date: date_format }}</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 %}

data/_layouts/home.html

@@ -13,7 +13,7 @@ layout: default
           {% if post.teaser %}
           <a class="card-media" href="{{ post.url | relative_url }}" tabindex="-1" aria-hidden="true"><img src="{{ post.teaser | relative_url }}" alt="" loading="lazy" decoding="async" /></a>
           {% endif %}
-          <h3><a href="{{ post.url | relative_url }}">{{ post.title }}</a></h3>
+          <h3><a href="{{ post.url | relative_url }}">{{ post.title | escape }}</a></h3>
           {% assign home_date_format = localization_config.date_format | default: 'long' %}
           {% assign reading_minutes = post.reading_time | default: post.content | number_of_words | divided_by: 180 | ceil %}
           {% capture reading_label %}
@@ -43,7 +43,7 @@ layout: default
       {% assign featured = site.portfolio | sort: 'weight' | slice: 0, 3 %}
       {% for item in featured %}
         <article class="card">
-          <h3><a href="{{ item.url | relative_url }}">{{ item.title }}</a></h3>
+          <h3><a href="{{ item.url | relative_url }}">{{ item.title | escape }}</a></h3>
           <p>{{ item.summary | default: item.excerpt | strip_html | truncate: 120 }}</p>
           <a class="card-link" href="{{ item.url | relative_url }}">{% t 'home.view_project' %}</a>
         </article>

data/_layouts/notebook.html

@@ -20,7 +20,7 @@ show_title: false # this layout renders the page's <h1>
 
   <header class="notebook-article__header">
     <p class="notebook-article__label">{% t 'notebook.label' %}</p>
-    <h1 class="notebook-article__title" itemprop="headline">{{ page.title }}</h1>
+    <h1 class="notebook-article__title" itemprop="headline">{{ page.title | escape }}</h1>
     <p class="notebook-article__summary">{{ page.summary | default: page.excerpt }}</p>
 
     <ul class="notebook-article__meta">

data/_layouts/package.html

@@ -12,7 +12,7 @@ show_title: false # this layout renders the page's <h1>
           {% if page.icon %}
             <span class="package-docs__icon">{{ page.icon }}</span>
           {% endif %}
-          {{ page.title }}
+          {{ page.title | escape }}
         </h1>
         {% if page.tagline %}
           <p class="package-docs__tagline">{{ page.tagline }}</p>
@@ -90,12 +90,12 @@ show_title: false # this layout renders the page's <h1>
         {% if page.nav_sections %}
           {% for section in page.nav_sections %}
             <div class="package-nav__section">
-              <h3 class="package-nav__section-title">{{ section.title }}</h3>
+              <h3 class="package-nav__section-title">{{ section.title | escape }}</h3>
               <ul class="package-nav__list">
                 {% for item in section.items %}
                   <li class="package-nav__item">
                     <a href="#{{ item.id }}" class="package-nav__link">
-                      {{ item.title }}
+                      {{ item.title | escape }}
                     </a>
                   </li>
                 {% endfor %}
@@ -171,7 +171,7 @@ show_title: false # this layout renders the page's <h1>
             </svg>
             <div>
               <span class="package-docs__footer-nav-label">Previous</span>
-              <span class="package-docs__footer-nav-title">{{ page.previous_page.title }}</span>
+              <span class="package-docs__footer-nav-title">{{ page.previous_page.title | escape }}</span>
             </div>
           </a>
         {% endif %}
@@ -180,7 +180,7 @@ show_title: false # this layout renders the page's <h1>
           <a href="{{ page.next_page.url | relative_url }}" class="package-docs__footer-nav-link package-docs__footer-nav-link--next">
             <div>
               <span class="package-docs__footer-nav-label">Next</span>
-              <span class="package-docs__footer-nav-title">{{ page.next_page.title }}</span>
+              <span class="package-docs__footer-nav-title">{{ page.next_page.title | escape }}</span>
             </div>
             <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
               <polyline points="9 18 15 12 9 6"></polyline>

data/_layouts/portfolio.html

@@ -4,7 +4,7 @@ show_title: false # this layout renders the page's <h1>
 ---
 <article class="portfolio-item">
   <header class="portfolio-header">
-    <h1>{{ page.title }}</h1>
+    <h1>{{ page.title | escape }}</h1>
     {% if page.hero_image %}
     <div class="portfolio-hero-media">
       {% assign hero_alt = page.hero_alt | default: page.title %}

data/_layouts/post.html

@@ -1,6 +1,6 @@
 ---
 layout: default
-schema_type: TechnicalArticle
+schema_type: TechArticle
 ---
 
 {% assign localization_config = site.theme_options.localization %}
@@ -39,6 +39,10 @@ schema_type: TechnicalArticle
 
 {%- comment -%} Tag/Category flags {%- endcomment -%}
 {% assign post_tags = page.tags %}
+{% assign tag_archive_path = site.tag_archive.path | default: '/tags/' %}
+{% assign category_archive_path = site.category_archive.path | default: '/categories/' %}
+{% assign tag_archive_page = site.pages | where: 'url', tag_archive_path | first %}
+{% assign category_archive_page = site.pages | where: 'url', category_archive_path | first %}
 {% assign has_tags = false %}
 {% if post_tags and post_tags.size > 0 %}{% assign has_tags = true %}{% endif %}
 {% assign has_categories = false %}
@@ -50,7 +54,7 @@ schema_type: TechnicalArticle
 {%- comment -%} Breadcrumb navigation {%- endcomment -%}
 {% include components/breadcrumbs.html %}
 
-<div class="post-wrapper" itemscope itemtype="https://schema.org/TechnicalArticle">
+<div class="post-wrapper" itemscope itemtype="https://schema.org/TechArticle">
   <meta itemprop="url" content="{{ canonical_url }}" />
   <meta itemprop="datePublished" content="{{ page.date | date_to_xmlschema }}" />
   {% if page.last_modified_at or page.updated %}
@@ -127,6 +131,7 @@ schema_type: TechnicalArticle
     {% include components/reading-state-bookmark.html %}
     {% include components/reading-mode-toggle.html %}
   </div>
+  {% include components/reading-state-resume.html %}
   <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 -%}
@@ -139,13 +144,13 @@ schema_type: TechnicalArticle
         {% if has_tags %}
           {% for tag in post_tags %}
             {% assign tag_slug = tag | slugify %}
-            <li><a class="post-tag" href="{{ site.tag_archive.path | default: '/tags/' | append: '#' | append: tag_slug | relative_url }}">{{ tag }}</a></li>
+            <li>{% if tag_archive_page %}<a class="post-tag" href="{{ tag_archive_path | append: '#' | append: tag_slug | relative_url }}">{{ tag | escape }}</a>{% else %}<span class="post-tag">{{ tag | escape }}</span>{% endif %}</li>
           {% endfor %}
         {% endif %}
         {% if has_categories %}
           {% for category in page.categories %}
             {% assign cat_slug = category | slugify %}
-            <li><a class="post-tag post-category" href="{{ site.category_archive.path | default: '/categories/' | append: '#' | append: cat_slug | relative_url }}">{{ category }}</a></li>
+            <li>{% if category_archive_page %}<a class="post-tag post-category" href="{{ category_archive_path | append: '#' | append: cat_slug | relative_url }}">{{ category | escape }}</a>{% else %}<span class="post-tag post-category">{{ category | escape }}</span>{% endif %}</li>
           {% endfor %}
         {% endif %}
       </ul>
@@ -195,7 +200,7 @@ schema_type: TechnicalArticle
       <ul class="post-interactive-list">
         {% for demo in page.interactive_components %}
           <li>
-            <strong>{{ demo.title }}</strong>
+            <strong>{{ demo.title | escape }}</strong>
             {% if demo.description %}<p>{{ demo.description }}</p>{% endif %}
             {% if demo.url %}<p><a href="{{ demo.url | relative_url }}" target="_blank" rel="noopener noreferrer">{% t 'post.interactive.launch' %}</a></p>{% endif %}
           </li>
@@ -283,7 +288,7 @@ schema_type: TechnicalArticle
     {% if page.previous %}
       <div class="post-prev">
         <span class="post-pagination-label">Previous</span>
-        <a href="{{ page.previous.url | relative_url }}">{{ page.previous.title }}</a>
+        <a href="{{ page.previous.url | relative_url }}">{{ page.previous.title | escape }}</a>
         {% if page.previous.tags and page.tags %}
           {% assign shared_prev = '' %}
           {% for tag in page.tags %}
@@ -302,7 +307,7 @@ schema_type: TechnicalArticle
     {% if page.next %}
       <div class="post-next">
         <span class="post-pagination-label">Next</span>
-        <a href="{{ page.next.url | relative_url }}">{{ page.next.title }}</a>
+        <a href="{{ page.next.url | relative_url }}">{{ page.next.title | escape }}</a>
         {% if page.next.tags and page.tags %}
           {% assign shared_next = '' %}
           {% for tag in page.tags %}

data/_layouts/project.html

@@ -8,9 +8,9 @@ show_title: false # this layout renders the page's <h1>
   <header class="project-case__header">
     <div class="project-case__intro">
       <p class="project-case__eyebrow">{% t 'project.header.eyebrow' %}</p>
-      <h1 class="project-case__title" itemprop="name">{{ page.title }}</h1>
+      <h1 class="project-case__title" itemprop="name">{{ page.title | escape }}</h1>
       {% if page.description %}
-      <p class="project-case__description" itemprop="description">{{ page.description }}</p>
+      <p class="project-case__description" itemprop="description">{{ page.description | escape }}</p>
       {% endif %}
     </div>
     <div class="project-case__meta">
@@ -192,7 +192,7 @@ show_title: false # this layout renders the page's <h1>
       <ul class="project-case__related">
         {% for project in page.related_projects %}
         <li>
-          {% if project.url %}<a href="{{ project.url | relative_url }}">{{ project.title | default: project }}</a>{% else %}<span>{{ project.title | default: project }}</span>{% endif %}
+          {% if project.url %}<a href="{{ project.url | relative_url }}">{{ project.title | default: project | escape }}</a>{% else %}<span>{{ project.title | default: project | escape }}</span>{% endif %}
           {% if project.description %}<p>{{ project.description }}</p>{% endif %}
         </li>
         {% endfor %}