Merge upstream

landing.bryanroessler.com/_includes/head.html

@@ -2,7 +2,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
-  {% capture title %}
+  {% capture pagetitle %}
     {%- if page.share-title -%}
       {{ page.share-title | strip_html | xml_escape }}
     {%- elsif page.title -%}
@@ -12,6 +12,14 @@
     {%- endif -%}
   {% endcapture %}
 
+  {% capture title %}
+    {%- if site.title and site.title-on-all-pages and (site.title != pagetitle) -%}
+      {{ pagetitle }} | {{ site.title }}
+    {%- else -%}
+      {{ pagetitle }}
+    {%- endif -%}
+  {% endcapture %}
+
   {% capture description %}
     {%- if page.share-description -%}
       {{ page.share-description | strip_html | xml_escape }}
@@ -25,8 +33,15 @@
 
   <title>{{ title }}</title>
 
-  {% if site.author %}
-  <meta name="author" content="{{ site.author }}">
+  {% capture author %}
+    {%- if page.author -%}
+      {{  page.author | strip_html }}
+    {%- elsif site.author -%}
+      {{ site.author }}
+    {%- endif -%}
+  {% endcapture %}
+  {% if author != "" %}
+  <meta name="author" content="{{ author }}">
   {% endif %}
 
   <meta name="description" content="{{ description }}">
@@ -47,6 +62,7 @@
   {% include gtm_head.html %}
   {% include google_analytics.html %}
   {% include cloudflare_analytics.html %}
+  {% include mathjax.html %}
 
   {% if layout.common-ext-css %}
     {% for css in layout.common-ext-css %}
@@ -112,7 +128,9 @@
 
   {% if page.id %}
   <meta property="og:type" content="article">
-  <meta property="og:article:author" content="{{ site.author }}">
+  {% if author != "" %}
+  <meta property="og:article:author" content="{{ author }}">
+  {% endif %}
   <meta property="og:article:published_time" content="{{ page.date | date_to_xmlschema }}">
   <meta property="og:url" content="{{ page.url | absolute_url }}">
   <link rel="canonical" href="{{ page.url | absolute_url }}">
@@ -143,6 +161,11 @@
   <link rel="stylesheet" href="{{ "/assets/css/staticman.css" | relative_url }}">
   {% endif %}
 
+  {% assign favicon_exists = site.static_files | where: "path", "/favicon.ico" | size %}
+  {% if favicon_exists == 1 %}
+  <link rel="icon" href="{{ '/favicon.ico' | relative_url }}" />
+  {% endif %}
+
   {% if page.head-extra %}
     {% for file in page.head-extra %}
       {% include {{ file }} %}