From ac5dcd9dc4f0f91e9ed2bf216fddbad02d48cbfa Mon Sep 17 00:00:00 2001
From: George Cushen <gcushen@users.noreply.github.com>
Date: Thu, 11 Jul 2019 21:47:43 +0100
Subject: [PATCH] fix: improve HTML5 validation

See #1197
---
 layouts/partials/search.html    | 2 +-
 layouts/partials/site_head.html | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/layouts/partials/search.html b/layouts/partials/search.html
index bcbfc38a..ad914126 100644
--- a/layouts/partials/search.html
+++ b/layouts/partials/search.html
@@ -14,7 +14,7 @@
       <div id="search-box">
         {{ if eq site.Params.search.engine 1 }}
         <input name="q" id="search-query" placeholder="{{i18n "search_placeholder"}}" autocapitalize="off"
-        autocomplete="off" autocorrect="off" role="textbox" spellcheck="false" type="search">
+        autocomplete="off" autocorrect="off" spellcheck="false" type="search">
         {{ else }}
         <!-- Search box will appear here -->
         {{ end }}
diff --git a/layouts/partials/site_head.html b/layouts/partials/site_head.html
index 3b8aa157..24b62a81 100644
--- a/layouts/partials/site_head.html
+++ b/layouts/partials/site_head.html
@@ -96,7 +96,7 @@
 
   {{/* We cannot use SRI with Google Fonts because the CSS is dynamically generated according to the user agent. */}}
   {{ with ($scr.Get "google_fonts") }}
-  <link rel="stylesheet" {{ printf "href=\"https://fonts.googleapis.com/css?family=%s&display=swap\"" . | safeHTMLAttr }}>
+  <link rel="stylesheet" {{ printf "href=\"https://fonts.googleapis.com/css?family=%s&display=swap\"" (htmlEscape .) | safeHTMLAttr }}>
   {{ end }}
 
   {{ $css_options := (dict "targetPath" "css/academic.css" "outputStyle" "compressed") }}
@@ -135,8 +135,7 @@
   {{ end }}
 
   {{ with .OutputFormats.Get "RSS" }}
-  <link rel="alternate" href="{{ .RelPermalink }}" type="application/rss+xml" title="{{ site.Title }}">
-  <link rel="feed" href="{{ .RelPermalink }}" type="application/rss+xml" title="{{ site.Title }}">
+  <link rel="alternate" href="{{.RelPermalink}}" type="application/rss+xml" title="{{site.Title}}">
   {{ end }}
 
   <link rel="manifest" href="{{ "site.webmanifest" | relURL }}">