html: Output meta charset before any stylesheet

This moves the charset meta element closer to the beginning of the document but that's not the motivation for this change. The generator meta element has a variable length due to the %%VERSION%% watermarking and that makes the test fail after a 'dune subst'. The generator meta and the charset meta elements are sometimes formatted on the same line, depending on the length of the version string. This do not happen anymore.
Julow · Dec 11, 2023 · 608f24c · 608f24c
1 parent f8844ee
commit 608f24c
Show file tree

Hide file tree

Showing 379 changed files with 706 additions and 641 deletions.
diff --git a/src/html/html_page.ml b/src/html/html_page.ml
@@ -93,8 +93,8 @@ let default_meta_elements ~config ~url =
   let theme_uri = Config.theme_uri config in
   let odoc_css_uri = file_uri ~config ~url theme_uri "odoc.css" in
   [
-    Html.link ~rel:[ `Stylesheet ] ~href:odoc_css_uri ();
     Html.meta ~a:[ Html.a_charset "utf-8" ] ();
+    Html.link ~rel:[ `Stylesheet ] ~href:odoc_css_uri ();
     Html.meta
       ~a:[ Html.a_name "generator"; Html.a_content "odoc %%VERSION%%" ]
       ();

diff --git a/test/generators/html/Alerts-Top1.html b/test/generators/html/Alerts-Top1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>Top1 (Alerts.Top1)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>Top1 (Alerts.Top1)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Alerts-Top2.html b/test/generators/html/Alerts-Top2.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>Top2 (Alerts.Top2)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>Top2 (Alerts.Top2)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Alerts.html b/test/generators/html/Alerts.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>Alerts (Alerts)</title><link rel="stylesheet" href="odoc.css"/>
-  <meta charset="utf-8"/><meta name="generator" content="odoc %%VERSION%%"/>
+ <head><title>Alerts (Alerts)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
+  <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>
   <script>hljs.initHighlightingOnLoad();</script>

diff --git a/test/generators/html/Alias-X.html b/test/generators/html/Alias-X.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>X (Alias.X)</title><link rel="stylesheet" href="odoc.css"/>
-  <meta charset="utf-8"/><meta name="generator" content="odoc %%VERSION%%"/>
+ <head><title>X (Alias.X)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
+  <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>
   <script>hljs.initHighlightingOnLoad();</script>

diff --git a/test/generators/html/Alias.html b/test/generators/html/Alias.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>Alias (Alias)</title><link rel="stylesheet" href="odoc.css"/>
-  <meta charset="utf-8"/><meta name="generator" content="odoc %%VERSION%%"/>
+ <head><title>Alias (Alias)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
+  <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>
   <script>hljs.initHighlightingOnLoad();</script>

diff --git a/test/generators/html/Bugs.html b/test/generators/html/Bugs.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>Bugs (Bugs)</title><link rel="stylesheet" href="odoc.css"/>
-  <meta charset="utf-8"/><meta name="generator" content="odoc %%VERSION%%"/>
+ <head><title>Bugs (Bugs)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
+  <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>
   <script>hljs.initHighlightingOnLoad();</script>

diff --git a/test/generators/html/Bugs_post_406-class-let_open'.html b/test/generators/html/Bugs_post_406-class-let_open'.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head><title>let_open' (Bugs_post_406.let_open')</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+  <meta charset="utf-8"/><link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Bugs_post_406-class-type-let_open.html b/test/generators/html/Bugs_post_406-class-type-let_open.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head><title>let_open (Bugs_post_406.let_open)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+  <meta charset="utf-8"/><link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Bugs_post_406.html b/test/generators/html/Bugs_post_406.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>Bugs_post_406 (Bugs_post_406)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>Bugs_post_406 (Bugs_post_406)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Class-class-empty_virtual'.html b/test/generators/html/Class-class-empty_virtual'.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head><title>empty_virtual' (Class.empty_virtual')</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+  <meta charset="utf-8"/><link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Class-class-mutually'.html b/test/generators/html/Class-class-mutually'.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>mutually' (Class.mutually')</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>mutually' (Class.mutually')</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Class-class-polymorphic'.html b/test/generators/html/Class-class-polymorphic'.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head><title>polymorphic' (Class.polymorphic')</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+  <meta charset="utf-8"/><link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Class-class-recursive'.html b/test/generators/html/Class-class-recursive'.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>recursive' (Class.recursive')</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>recursive' (Class.recursive')</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Class-class-type-empty.html b/test/generators/html/Class-class-type-empty.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>empty (Class.empty)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>empty (Class.empty)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Class-class-type-empty_virtual.html b/test/generators/html/Class-class-type-empty_virtual.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head><title>empty_virtual (Class.empty_virtual)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+  <meta charset="utf-8"/><link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Class-class-type-mutually.html b/test/generators/html/Class-class-type-mutually.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>mutually (Class.mutually)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>mutually (Class.mutually)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Class-class-type-polymorphic.html b/test/generators/html/Class-class-type-polymorphic.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>polymorphic (Class.polymorphic)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>polymorphic (Class.polymorphic)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Class-class-type-recursive.html b/test/generators/html/Class-class-type-recursive.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>recursive (Class.recursive)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>recursive (Class.recursive)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Class.html b/test/generators/html/Class.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>Class (Class)</title><link rel="stylesheet" href="odoc.css"/>
-  <meta charset="utf-8"/><meta name="generator" content="odoc %%VERSION%%"/>
+ <head><title>Class (Class)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
+  <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>
   <script>hljs.initHighlightingOnLoad();</script>

diff --git a/test/generators/html/Class_comments-class-c.html b/test/generators/html/Class_comments-class-c.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>c (Class_comments.c)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>c (Class_comments.c)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Class_comments-class-x.html b/test/generators/html/Class_comments-class-x.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>x (Class_comments.x)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>x (Class_comments.x)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Class_comments.html b/test/generators/html/Class_comments.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>Class_comments (Class_comments)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>Class_comments (Class_comments)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/External.html b/test/generators/html/External.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>External (External)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>External (External)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Functor-F1-argument-1-Arg.html b/test/generators/html/Functor-F1-argument-1-Arg.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>Arg (Functor.F1.Arg)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>Arg (Functor.F1.Arg)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Functor-F1.html b/test/generators/html/Functor-F1.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>F1 (Functor.F1)</title><link rel="stylesheet" href="odoc.css"/>
-  <meta charset="utf-8"/><meta name="generator" content="odoc %%VERSION%%"/>
+ <head><title>F1 (Functor.F1)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
+  <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>
   <script>hljs.initHighlightingOnLoad();</script>

diff --git a/test/generators/html/Functor-F2-argument-1-Arg.html b/test/generators/html/Functor-F2-argument-1-Arg.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>Arg (Functor.F2.Arg)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>Arg (Functor.F2.Arg)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Functor-F2.html b/test/generators/html/Functor-F2.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>F2 (Functor.F2)</title><link rel="stylesheet" href="odoc.css"/>
-  <meta charset="utf-8"/><meta name="generator" content="odoc %%VERSION%%"/>
+ <head><title>F2 (Functor.F2)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
+  <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>
   <script>hljs.initHighlightingOnLoad();</script>

diff --git a/test/generators/html/Functor-F3-argument-1-Arg.html b/test/generators/html/Functor-F3-argument-1-Arg.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>Arg (Functor.F3.Arg)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>Arg (Functor.F3.Arg)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Functor-F3.html b/test/generators/html/Functor-F3.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>F3 (Functor.F3)</title><link rel="stylesheet" href="odoc.css"/>
-  <meta charset="utf-8"/><meta name="generator" content="odoc %%VERSION%%"/>
+ <head><title>F3 (Functor.F3)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
+  <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>
   <script>hljs.initHighlightingOnLoad();</script>

diff --git a/test/generators/html/Functor-F4-argument-1-Arg.html b/test/generators/html/Functor-F4-argument-1-Arg.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>Arg (Functor.F4.Arg)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>Arg (Functor.F4.Arg)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Functor-F4.html b/test/generators/html/Functor-F4.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>F4 (Functor.F4)</title><link rel="stylesheet" href="odoc.css"/>
-  <meta charset="utf-8"/><meta name="generator" content="odoc %%VERSION%%"/>
+ <head><title>F4 (Functor.F4)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
+  <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>
   <script>hljs.initHighlightingOnLoad();</script>

diff --git a/test/generators/html/Functor-F5.html b/test/generators/html/Functor-F5.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>F5 (Functor.F5)</title><link rel="stylesheet" href="odoc.css"/>
-  <meta charset="utf-8"/><meta name="generator" content="odoc %%VERSION%%"/>
+ <head><title>F5 (Functor.F5)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
+  <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>
   <script>hljs.initHighlightingOnLoad();</script>

diff --git a/test/generators/html/Functor-module-type-S.html b/test/generators/html/Functor-module-type-S.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>S (Functor.S)</title><link rel="stylesheet" href="odoc.css"/>
-  <meta charset="utf-8"/><meta name="generator" content="odoc %%VERSION%%"/>
+ <head><title>S (Functor.S)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
+  <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>
   <script>hljs.initHighlightingOnLoad();</script>

diff --git a/test/generators/html/Functor-module-type-S1-argument-1-_.html b/test/generators/html/Functor-module-type-S1-argument-1-_.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>_ (Functor.S1._)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>_ (Functor.S1._)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Functor-module-type-S1.html b/test/generators/html/Functor-module-type-S1.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>S1 (Functor.S1)</title><link rel="stylesheet" href="odoc.css"/>
-  <meta charset="utf-8"/><meta name="generator" content="odoc %%VERSION%%"/>
+ <head><title>S1 (Functor.S1)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
+  <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>
   <script>hljs.initHighlightingOnLoad();</script>

diff --git a/test/generators/html/Functor.html b/test/generators/html/Functor.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>Functor (Functor)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>Functor (Functor)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Functor2-X-argument-1-Y.html b/test/generators/html/Functor2-X-argument-1-Y.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>Y (Functor2.X.Y)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>Y (Functor2.X.Y)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/generators/html/Functor2-X-argument-2-Z.html b/test/generators/html/Functor2-X-argument-2-Z.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>Z (Functor2.X.Z)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>Z (Functor2.X.Z)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>