From f4e1ec81e25fca3ce93ab40627530937f184138a Mon Sep 17 00:00:00 2001
From: Victor Zverovich <viz@meta.com>
Date: Sun, 26 May 2024 19:23:26 -0700
Subject: [PATCH] Cleanup html

---
 doc/_templates/layout.html      | 37 ++++++++++++++++-----------------
 doc/basic-bootstrap/layout.html | 24 ++++++++-------------
 2 files changed, 27 insertions(+), 34 deletions(-)
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
index 715d2445..eb673fb3 100644
--- a/doc/_templates/layout.html
+++ b/doc/_templates/layout.html
@@ -1,21 +1,20 @@
 {% extends "!layout.html" %}
 
-{% block extrahead %}
-<meta name="description" content="A modern formatting library">
-<meta name="keywords" content="C++, formatting, printf, string, library">
-<meta name="author" content="Victor Zverovich">
-<link rel="stylesheet" href="_static/bootstrap.min.css">
-<link rel="stylesheet" href="_static/fmt.css">
-{# Google Analytics #}
-<script async src="https://www.googletagmanager.com/gtag/js?id=UA-20116650-4"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', 'UA-20116650-4');
-</script>
-{% endblock %}
+{%- block extrahead %}
+    <meta name="description" content="A modern formatting library">
+    <meta name="keywords" content="C++, formatting, printf, string, library">
+    <meta name="author" content="Victor Zverovich">
+    <link rel="stylesheet" href="_static/bootstrap.min.css">
+    <link rel="stylesheet" href="_static/fmt.css">
+    {# Google Analytics #}
+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-20116650-4"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag() { dataLayer.push(arguments); }
+      gtag('js', new Date());
+      gtag('config', 'UA-20116650-4');
+    </script>
+{%- endblock %}
 
 {%- macro searchform(classes, button) %}
 <form class="{{classes}}" role="search" action="{{ pathto('search') }}"
@@ -143,6 +142,6 @@
 {% block footer %}
 {{ super() }}
 {# Placed at the end of the document so the pages load faster. #}
-<script src="_static/popper.min.js"></script>
-<script src="_static/bootstrap.min.js"></script>
-{% endblock %}
+    <script src="_static/popper.min.js"></script>
+    <script src="_static/bootstrap.min.js"></script>
+{%- endblock %}
diff --git a/doc/basic-bootstrap/layout.html b/doc/basic-bootstrap/layout.html
index fd1e5c59..5cbeceae 100644
--- a/doc/basic-bootstrap/layout.html
+++ b/doc/basic-bootstrap/layout.html
@@ -8,7 +8,7 @@
     :license: BSD, see LICENSE for details.
 #}
 {%- block doctype -%}
-<!DOCTYPE html>
+<!doctype html>
 {%- endblock %}
 {%- set reldelim1 = reldelim1 is not defined and ' &raquo;' or reldelim1 %}
 {%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %}
@@ -99,27 +99,21 @@
     {%- for scriptfile in script_files %}
     {{ js_tag(scriptfile) }}
     {%- endfor %}
-{%- endmacro %}
-
-{%- macro css() %}
-    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
-    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
-    {%- for cssfile in css_files %}
-    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-    {%- endfor %}
-{%- endmacro %}
+{%- endmacro -%}
 
 <html lang="en">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    {# The above 3 meta tags *must* come first in the head; any other head content
-       must come *after* these tags. #}
+    {# The above meta tags *must* come first in the head; any other head content
+       must come *after* these tags. -#}
     {{ metatags }}
     {%- block htmltitle %}
     <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
     {%- endblock %}
-    {{ css() }}
+    {% for cssfile in css_files %}
+    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" />
+    {%- endfor %}
     {%- if not embedded %}
     {{ script() }}
     {%- if use_opensearch %}
@@ -131,7 +125,7 @@
     <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
     {%- endif %}
     {%- endif %}
-{%- block linktags %}
+{% block linktags %}
     {%- if hasdoc('about') %}
     <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" />
     {%- endif %}
@@ -153,7 +147,7 @@
     {%- if prev %}
     <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}" />
     {%- endif %}
-{%- endblock %}
+{% endblock %}
 {%- block extrahead %} {% endblock %}
   </head>
   <body role="document">
