From 1c1c4001cf7d2167e545d88bd58f97a71778621b Mon Sep 17 00:00:00 2001
From: NunoAlexandre <alexandre.nunomiguel@gmail.com>
Date: Tue, 26 Dec 2017 21:23:49 +0100
Subject: Update html test reference files

---
 html-test/ref/SpuriousSuperclassConstraints.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'html-test/ref/SpuriousSuperclassConstraints.html')

diff --git a/html-test/ref/SpuriousSuperclassConstraints.html b/html-test/ref/SpuriousSuperclassConstraints.html
index 47dfd6cd..747811ea 100644
--- a/html-test/ref/SpuriousSuperclassConstraints.html
+++ b/html-test/ref/SpuriousSuperclassConstraints.html
@@ -4,6 +4,7 @@
      /><title
     >SpuriousSuperclassConstraints</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+     /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-- 
cgit v1.2.3


From 14a659a0a19b490b13e1a7706f5f24c022ce873b Mon Sep 17 00:00:00 2001
From: Nuno Alexandre <nuno@channable.com>
Date: Sun, 4 Feb 2018 13:11:48 +0100
Subject: Update html-test reference files

The package name element in the package-header is now a div instead of a
paragraph, and it is now above the menu ul.links instead of below.
---
 html-test/ref/A.html                             | 8 ++++----
 html-test/ref/B.html                             | 8 ++++----
 html-test/ref/Bold.html                          | 6 +++---
 html-test/ref/Bug1.html                          | 6 +++---
 html-test/ref/Bug195.html                        | 6 +++---
 html-test/ref/Bug2.html                          | 6 +++---
 html-test/ref/Bug201.html                        | 6 +++---
 html-test/ref/Bug253.html                        | 6 +++---
 html-test/ref/Bug26.html                         | 6 +++---
 html-test/ref/Bug280.html                        | 6 +++---
 html-test/ref/Bug294.html                        | 6 +++---
 html-test/ref/Bug298.html                        | 6 +++---
 html-test/ref/Bug3.html                          | 6 +++---
 html-test/ref/Bug308.html                        | 6 +++---
 html-test/ref/Bug308CrossModule.html             | 6 +++---
 html-test/ref/Bug310.html                        | 6 +++---
 html-test/ref/Bug313.html                        | 6 +++---
 html-test/ref/Bug335.html                        | 6 +++---
 html-test/ref/Bug387.html                        | 6 +++---
 html-test/ref/Bug4.html                          | 6 +++---
 html-test/ref/Bug546.html                        | 6 +++---
 html-test/ref/Bug548.html                        | 6 +++---
 html-test/ref/Bug6.html                          | 6 +++---
 html-test/ref/Bug613.html                        | 6 +++---
 html-test/ref/Bug647.html                        | 6 +++---
 html-test/ref/Bug679.html                        | 7 ++++---
 html-test/ref/Bug7.html                          | 6 +++---
 html-test/ref/Bug8.html                          | 6 +++---
 html-test/ref/Bug85.html                         | 6 +++---
 html-test/ref/BugDeprecated.html                 | 6 +++---
 html-test/ref/BugExportHeadings.html             | 6 +++---
 html-test/ref/Bugs.html                          | 6 +++---
 html-test/ref/BundledPatterns.html               | 6 +++---
 html-test/ref/BundledPatterns2.html              | 6 +++---
 html-test/ref/ConstructorPatternExport.html      | 6 +++---
 html-test/ref/CrossPackageDocs.html              | 4 ++--
 html-test/ref/DeprecatedClass.html               | 6 +++---
 html-test/ref/DeprecatedData.html                | 6 +++---
 html-test/ref/DeprecatedFunction.html            | 6 +++---
 html-test/ref/DeprecatedFunction2.html           | 6 +++---
 html-test/ref/DeprecatedFunction3.html           | 6 +++---
 html-test/ref/DeprecatedModule.html              | 6 +++---
 html-test/ref/DeprecatedModule2.html             | 6 +++---
 html-test/ref/DeprecatedNewtype.html             | 6 +++---
 html-test/ref/DeprecatedReExport.html            | 6 +++---
 html-test/ref/DeprecatedRecord.html              | 6 +++---
 html-test/ref/DeprecatedTypeFamily.html          | 6 +++---
 html-test/ref/DeprecatedTypeSynonym.html         | 6 +++---
 html-test/ref/DuplicateRecordFields.html         | 6 +++---
 html-test/ref/Examples.html                      | 6 +++---
 html-test/ref/Extensions.html                    | 6 +++---
 html-test/ref/FunArgs.html                       | 6 +++---
 html-test/ref/GADTRecords.html                   | 6 +++---
 html-test/ref/Hash.html                          | 6 +++---
 html-test/ref/HiddenInstances.html               | 6 +++---
 html-test/ref/HiddenInstancesB.html              | 6 +++---
 html-test/ref/Hyperlinks.html                    | 6 +++---
 html-test/ref/IgnoreExports.html                 | 6 +++---
 html-test/ref/ImplicitParams.html                | 6 +++---
 html-test/ref/Instances.html                     | 6 +++---
 html-test/ref/Math.html                          | 6 +++---
 html-test/ref/Minimal.html                       | 6 +++---
 html-test/ref/ModuleWithWarning.html             | 6 +++---
 html-test/ref/NamedDoc.html                      | 6 +++---
 html-test/ref/Nesting.html                       | 6 +++---
 html-test/ref/NoLayout.html                      | 6 +++---
 html-test/ref/NonGreedy.html                     | 6 +++---
 html-test/ref/Operators.html                     | 6 +++---
 html-test/ref/OrphanInstances.html               | 6 +++---
 html-test/ref/OrphanInstancesClass.html          | 6 +++---
 html-test/ref/OrphanInstancesType.html           | 6 +++---
 html-test/ref/PR643.html                         | 6 +++---
 html-test/ref/PR643_1.html                       | 6 +++---
 html-test/ref/PatternSyns.html                   | 6 +++---
 html-test/ref/PromotedTypes.html                 | 6 +++---
 html-test/ref/Properties.html                    | 6 +++---
 html-test/ref/PruneWithWarning.html              | 6 +++---
 html-test/ref/QuasiExpr.html                     | 6 +++---
 html-test/ref/QuasiQuote.html                    | 6 +++---
 html-test/ref/SpuriousSuperclassConstraints.html | 6 +++---
 html-test/ref/TH.html                            | 6 +++---
 html-test/ref/TH2.html                           | 6 +++---
 html-test/ref/Table.html                         | 6 +++---
 html-test/ref/Test.html                          | 6 +++---
 html-test/ref/Threaded.html                      | 6 +++---
 html-test/ref/Threaded_TH.html                   | 6 +++---
 html-test/ref/Ticket112.html                     | 6 +++---
 html-test/ref/Ticket61.html                      | 6 +++---
 html-test/ref/Ticket75.html                      | 6 +++---
 html-test/ref/TitledPicture.html                 | 6 +++---
 html-test/ref/TypeFamilies.html                  | 6 +++---
 html-test/ref/TypeFamilies2.html                 | 6 +++---
 html-test/ref/TypeOperators.html                 | 6 +++---
 html-test/ref/Unicode.html                       | 6 +++---
 html-test/ref/Visible.html                       | 6 +++---
 95 files changed, 287 insertions(+), 286 deletions(-)

(limited to 'html-test/ref/SpuriousSuperclassConstraints.html')

diff --git a/html-test/ref/A.html b/html-test/ref/A.html
index 537a7bac..9e41e154 100644
--- a/html-test/ref/A.html
+++ b/html-test/ref/A.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -182,4 +182,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/B.html b/html-test/ref/B.html
index 1d7d436c..9c2a9c83 100644
--- a/html-test/ref/B.html
+++ b/html-test/ref/B.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -170,4 +170,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bold.html b/html-test/ref/Bold.html
index 276e7b23..9c684aa5 100644
--- a/html-test/ref/Bold.html
+++ b/html-test/ref/Bold.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug1.html b/html-test/ref/Bug1.html
index 7c025ddf..d17d3f49 100644
--- a/html-test/ref/Bug1.html
+++ b/html-test/ref/Bug1.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug195.html b/html-test/ref/Bug195.html
index dd6fe2d9..3049bf00 100644
--- a/html-test/ref/Bug195.html
+++ b/html-test/ref/Bug195.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug2.html b/html-test/ref/Bug2.html
index e08e37ee..8fe2da5d 100644
--- a/html-test/ref/Bug2.html
+++ b/html-test/ref/Bug2.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug201.html b/html-test/ref/Bug201.html
index 1db6e428..6db101c3 100644
--- a/html-test/ref/Bug201.html
+++ b/html-test/ref/Bug201.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug253.html b/html-test/ref/Bug253.html
index 92a467c3..314feb55 100644
--- a/html-test/ref/Bug253.html
+++ b/html-test/ref/Bug253.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug26.html b/html-test/ref/Bug26.html
index 3593fca3..76645bd2 100644
--- a/html-test/ref/Bug26.html
+++ b/html-test/ref/Bug26.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug280.html b/html-test/ref/Bug280.html
index 84c79832..e480a9cb 100644
--- a/html-test/ref/Bug280.html
+++ b/html-test/ref/Bug280.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug294.html b/html-test/ref/Bug294.html
index 96bf092e..2a1159e4 100644
--- a/html-test/ref/Bug294.html
+++ b/html-test/ref/Bug294.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug298.html b/html-test/ref/Bug298.html
index 4c9e108f..598d1943 100644
--- a/html-test/ref/Bug298.html
+++ b/html-test/ref/Bug298.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug3.html b/html-test/ref/Bug3.html
index 274f663a..bf55cee0 100644
--- a/html-test/ref/Bug3.html
+++ b/html-test/ref/Bug3.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug308.html b/html-test/ref/Bug308.html
index 055d10ba..168c3935 100644
--- a/html-test/ref/Bug308.html
+++ b/html-test/ref/Bug308.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug308CrossModule.html b/html-test/ref/Bug308CrossModule.html
index 5e4cfcb4..091e1d74 100644
--- a/html-test/ref/Bug308CrossModule.html
+++ b/html-test/ref/Bug308CrossModule.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug310.html b/html-test/ref/Bug310.html
index 61580eea..d1f65b08 100644
--- a/html-test/ref/Bug310.html
+++ b/html-test/ref/Bug310.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug313.html b/html-test/ref/Bug313.html
index 4059fd81..a4bc1d8e 100644
--- a/html-test/ref/Bug313.html
+++ b/html-test/ref/Bug313.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug335.html b/html-test/ref/Bug335.html
index 759b4e0f..2971ac05 100644
--- a/html-test/ref/Bug335.html
+++ b/html-test/ref/Bug335.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug387.html b/html-test/ref/Bug387.html
index 7af38143..8f2c19f4 100644
--- a/html-test/ref/Bug387.html
+++ b/html-test/ref/Bug387.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug4.html b/html-test/ref/Bug4.html
index 8ce42486..4208dc2a 100644
--- a/html-test/ref/Bug4.html
+++ b/html-test/ref/Bug4.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug546.html b/html-test/ref/Bug546.html
index ec37016a..940f51fc 100644
--- a/html-test/ref/Bug546.html
+++ b/html-test/ref/Bug546.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug548.html b/html-test/ref/Bug548.html
index de6e04ff..f9cb90de 100644
--- a/html-test/ref/Bug548.html
+++ b/html-test/ref/Bug548.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug6.html b/html-test/ref/Bug6.html
index 22804de0..6cd0af6d 100644
--- a/html-test/ref/Bug6.html
+++ b/html-test/ref/Bug6.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug613.html b/html-test/ref/Bug613.html
index 605e8291..2be84545 100644
--- a/html-test/ref/Bug613.html
+++ b/html-test/ref/Bug613.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug647.html b/html-test/ref/Bug647.html
index e5a1993e..075f8a21 100644
--- a/html-test/ref/Bug647.html
+++ b/html-test/ref/Bug647.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug679.html b/html-test/ref/Bug679.html
index 71eb9360..bc09a82c 100644
--- a/html-test/ref/Bug679.html
+++ b/html-test/ref/Bug679.html
@@ -4,6 +4,7 @@
      /><title
     >Bug679</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+     /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
@@ -12,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -22,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug7.html b/html-test/ref/Bug7.html
index 0b02d297..5c86f6dc 100644
--- a/html-test/ref/Bug7.html
+++ b/html-test/ref/Bug7.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug8.html b/html-test/ref/Bug8.html
index 52aee3a0..d2b837ab 100644
--- a/html-test/ref/Bug8.html
+++ b/html-test/ref/Bug8.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug85.html b/html-test/ref/Bug85.html
index c8e033bf..69296f1f 100644
--- a/html-test/ref/Bug85.html
+++ b/html-test/ref/Bug85.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/BugDeprecated.html b/html-test/ref/BugDeprecated.html
index 6e187686..21440de5 100644
--- a/html-test/ref/BugDeprecated.html
+++ b/html-test/ref/BugDeprecated.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/BugExportHeadings.html b/html-test/ref/BugExportHeadings.html
index 878a767b..a66adf0d 100644
--- a/html-test/ref/BugExportHeadings.html
+++ b/html-test/ref/BugExportHeadings.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bugs.html b/html-test/ref/Bugs.html
index 78d2877e..a81a89d6 100644
--- a/html-test/ref/Bugs.html
+++ b/html-test/ref/Bugs.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/BundledPatterns.html b/html-test/ref/BundledPatterns.html
index e8030b3c..975b430d 100644
--- a/html-test/ref/BundledPatterns.html
+++ b/html-test/ref/BundledPatterns.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/BundledPatterns2.html b/html-test/ref/BundledPatterns2.html
index 2ed734fb..f5eaa212 100644
--- a/html-test/ref/BundledPatterns2.html
+++ b/html-test/ref/BundledPatterns2.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/ConstructorPatternExport.html b/html-test/ref/ConstructorPatternExport.html
index 28845977..11098100 100644
--- a/html-test/ref/ConstructorPatternExport.html
+++ b/html-test/ref/ConstructorPatternExport.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/CrossPackageDocs.html b/html-test/ref/CrossPackageDocs.html
index 39d216e0..04f443f0 100644
--- a/html-test/ref/CrossPackageDocs.html
+++ b/html-test/ref/CrossPackageDocs.html
@@ -15,6 +15,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_CrossPackageDocs.html"
     ></head
   ><body
   ><div id="package-header"
+    ><div class="caption empty"
+    >&nbsp;</div
     ><ul class="links" id="page-menu"
       ><li
 	><a href=""
@@ -25,8 +27,6 @@ window.onload = function () {pageLoad();setSynopsis("mini_CrossPackageDocs.html"
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      >&nbsp;</p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedClass.html b/html-test/ref/DeprecatedClass.html
index eb9acd6e..0b7037a2 100644
--- a/html-test/ref/DeprecatedClass.html
+++ b/html-test/ref/DeprecatedClass.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedData.html b/html-test/ref/DeprecatedData.html
index a9bd0f1e..5dc3fda3 100644
--- a/html-test/ref/DeprecatedData.html
+++ b/html-test/ref/DeprecatedData.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedFunction.html b/html-test/ref/DeprecatedFunction.html
index ab45a654..2591f124 100644
--- a/html-test/ref/DeprecatedFunction.html
+++ b/html-test/ref/DeprecatedFunction.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedFunction2.html b/html-test/ref/DeprecatedFunction2.html
index a425627a..d52af866 100644
--- a/html-test/ref/DeprecatedFunction2.html
+++ b/html-test/ref/DeprecatedFunction2.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedFunction3.html b/html-test/ref/DeprecatedFunction3.html
index b6186f45..abc92a8b 100644
--- a/html-test/ref/DeprecatedFunction3.html
+++ b/html-test/ref/DeprecatedFunction3.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedModule.html b/html-test/ref/DeprecatedModule.html
index 925a211e..e9b2e25f 100644
--- a/html-test/ref/DeprecatedModule.html
+++ b/html-test/ref/DeprecatedModule.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedModule2.html b/html-test/ref/DeprecatedModule2.html
index 3c26b5e1..b70b6b97 100644
--- a/html-test/ref/DeprecatedModule2.html
+++ b/html-test/ref/DeprecatedModule2.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedNewtype.html b/html-test/ref/DeprecatedNewtype.html
index 677cd914..1b51ceba 100644
--- a/html-test/ref/DeprecatedNewtype.html
+++ b/html-test/ref/DeprecatedNewtype.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedReExport.html b/html-test/ref/DeprecatedReExport.html
index 040c00c8..732a8dfa 100644
--- a/html-test/ref/DeprecatedReExport.html
+++ b/html-test/ref/DeprecatedReExport.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedRecord.html b/html-test/ref/DeprecatedRecord.html
index 0c35a240..5681e5b6 100644
--- a/html-test/ref/DeprecatedRecord.html
+++ b/html-test/ref/DeprecatedRecord.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedTypeFamily.html b/html-test/ref/DeprecatedTypeFamily.html
index 2754be0c..ba61ea0b 100644
--- a/html-test/ref/DeprecatedTypeFamily.html
+++ b/html-test/ref/DeprecatedTypeFamily.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedTypeSynonym.html b/html-test/ref/DeprecatedTypeSynonym.html
index 2c612502..98bca5be 100644
--- a/html-test/ref/DeprecatedTypeSynonym.html
+++ b/html-test/ref/DeprecatedTypeSynonym.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DuplicateRecordFields.html b/html-test/ref/DuplicateRecordFields.html
index 2aa91466..3f151391 100644
--- a/html-test/ref/DuplicateRecordFields.html
+++ b/html-test/ref/DuplicateRecordFields.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Examples.html b/html-test/ref/Examples.html
index 5cd3f4c4..04a855f8 100644
--- a/html-test/ref/Examples.html
+++ b/html-test/ref/Examples.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Extensions.html b/html-test/ref/Extensions.html
index f08d631e..44fa5573 100644
--- a/html-test/ref/Extensions.html
+++ b/html-test/ref/Extensions.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/FunArgs.html b/html-test/ref/FunArgs.html
index 1fcbabff..04dfb907 100644
--- a/html-test/ref/FunArgs.html
+++ b/html-test/ref/FunArgs.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/GADTRecords.html b/html-test/ref/GADTRecords.html
index 4496ef12..23686adf 100644
--- a/html-test/ref/GADTRecords.html
+++ b/html-test/ref/GADTRecords.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Hash.html b/html-test/ref/Hash.html
index 37777a4c..fd8b5114 100644
--- a/html-test/ref/Hash.html
+++ b/html-test/ref/Hash.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/HiddenInstances.html b/html-test/ref/HiddenInstances.html
index 96e39228..4f80c418 100644
--- a/html-test/ref/HiddenInstances.html
+++ b/html-test/ref/HiddenInstances.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/HiddenInstancesB.html b/html-test/ref/HiddenInstancesB.html
index 803d8724..4039a979 100644
--- a/html-test/ref/HiddenInstancesB.html
+++ b/html-test/ref/HiddenInstancesB.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Hyperlinks.html b/html-test/ref/Hyperlinks.html
index ed3a66eb..12f3ce3d 100644
--- a/html-test/ref/Hyperlinks.html
+++ b/html-test/ref/Hyperlinks.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/IgnoreExports.html b/html-test/ref/IgnoreExports.html
index b5bc1d98..3c02b5f5 100644
--- a/html-test/ref/IgnoreExports.html
+++ b/html-test/ref/IgnoreExports.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/ImplicitParams.html b/html-test/ref/ImplicitParams.html
index 64c9e434..8e398452 100644
--- a/html-test/ref/ImplicitParams.html
+++ b/html-test/ref/ImplicitParams.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Instances.html b/html-test/ref/Instances.html
index 0442a9d5..3af35c04 100644
--- a/html-test/ref/Instances.html
+++ b/html-test/ref/Instances.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Math.html b/html-test/ref/Math.html
index ea602266..c4941c60 100644
--- a/html-test/ref/Math.html
+++ b/html-test/ref/Math.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Minimal.html b/html-test/ref/Minimal.html
index 547ac3e1..065414c4 100644
--- a/html-test/ref/Minimal.html
+++ b/html-test/ref/Minimal.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/ModuleWithWarning.html b/html-test/ref/ModuleWithWarning.html
index f714eed0..f266234b 100644
--- a/html-test/ref/ModuleWithWarning.html
+++ b/html-test/ref/ModuleWithWarning.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/NamedDoc.html b/html-test/ref/NamedDoc.html
index 5e9ff324..285d0a9a 100644
--- a/html-test/ref/NamedDoc.html
+++ b/html-test/ref/NamedDoc.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Nesting.html b/html-test/ref/Nesting.html
index db26aaa4..8d7381b7 100644
--- a/html-test/ref/Nesting.html
+++ b/html-test/ref/Nesting.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/NoLayout.html b/html-test/ref/NoLayout.html
index b2e95565..57b3f71c 100644
--- a/html-test/ref/NoLayout.html
+++ b/html-test/ref/NoLayout.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/NonGreedy.html b/html-test/ref/NonGreedy.html
index 50de62cd..282c0ddd 100644
--- a/html-test/ref/NonGreedy.html
+++ b/html-test/ref/NonGreedy.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Operators.html b/html-test/ref/Operators.html
index 96e24086..b863a140 100644
--- a/html-test/ref/Operators.html
+++ b/html-test/ref/Operators.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/OrphanInstances.html b/html-test/ref/OrphanInstances.html
index cb5edd6a..ac8cb0d5 100644
--- a/html-test/ref/OrphanInstances.html
+++ b/html-test/ref/OrphanInstances.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/OrphanInstancesClass.html b/html-test/ref/OrphanInstancesClass.html
index 3853f22e..70525ae1 100644
--- a/html-test/ref/OrphanInstancesClass.html
+++ b/html-test/ref/OrphanInstancesClass.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/OrphanInstancesType.html b/html-test/ref/OrphanInstancesType.html
index df559a8a..18187600 100644
--- a/html-test/ref/OrphanInstancesType.html
+++ b/html-test/ref/OrphanInstancesType.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/PR643.html b/html-test/ref/PR643.html
index b8daa6e5..6fba5964 100644
--- a/html-test/ref/PR643.html
+++ b/html-test/ref/PR643.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/PR643_1.html b/html-test/ref/PR643_1.html
index 421a6f6f..1bfadae1 100644
--- a/html-test/ref/PR643_1.html
+++ b/html-test/ref/PR643_1.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/PatternSyns.html b/html-test/ref/PatternSyns.html
index 4ec39b17..b106e4f0 100644
--- a/html-test/ref/PatternSyns.html
+++ b/html-test/ref/PatternSyns.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/PromotedTypes.html b/html-test/ref/PromotedTypes.html
index 41672e3b..1bf25665 100644
--- a/html-test/ref/PromotedTypes.html
+++ b/html-test/ref/PromotedTypes.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Properties.html b/html-test/ref/Properties.html
index 7469d488..23c9f3b6 100644
--- a/html-test/ref/Properties.html
+++ b/html-test/ref/Properties.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/PruneWithWarning.html b/html-test/ref/PruneWithWarning.html
index 66747ade..7f736dea 100644
--- a/html-test/ref/PruneWithWarning.html
+++ b/html-test/ref/PruneWithWarning.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/QuasiExpr.html b/html-test/ref/QuasiExpr.html
index 3e79d16b..7da60603 100644
--- a/html-test/ref/QuasiExpr.html
+++ b/html-test/ref/QuasiExpr.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/QuasiQuote.html b/html-test/ref/QuasiQuote.html
index 5afb8db4..f7da2850 100644
--- a/html-test/ref/QuasiQuote.html
+++ b/html-test/ref/QuasiQuote.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/SpuriousSuperclassConstraints.html b/html-test/ref/SpuriousSuperclassConstraints.html
index 747811ea..67ece044 100644
--- a/html-test/ref/SpuriousSuperclassConstraints.html
+++ b/html-test/ref/SpuriousSuperclassConstraints.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/TH.html b/html-test/ref/TH.html
index 9fb5eee2..3c2f36c3 100644
--- a/html-test/ref/TH.html
+++ b/html-test/ref/TH.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/TH2.html b/html-test/ref/TH2.html
index 0f6a5e7d..ebe9a7e7 100644
--- a/html-test/ref/TH2.html
+++ b/html-test/ref/TH2.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Table.html b/html-test/ref/Table.html
index 352277ca..98b83d94 100644
--- a/html-test/ref/Table.html
+++ b/html-test/ref/Table.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html
index 5fbb8f19..ef09f281 100644
--- a/html-test/ref/Test.html
+++ b/html-test/ref/Test.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Threaded.html b/html-test/ref/Threaded.html
index 135831af..b35c800c 100644
--- a/html-test/ref/Threaded.html
+++ b/html-test/ref/Threaded.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Threaded_TH.html b/html-test/ref/Threaded_TH.html
index cbfdc984..9bb68128 100644
--- a/html-test/ref/Threaded_TH.html
+++ b/html-test/ref/Threaded_TH.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Ticket112.html b/html-test/ref/Ticket112.html
index 95792976..72a00667 100644
--- a/html-test/ref/Ticket112.html
+++ b/html-test/ref/Ticket112.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Ticket61.html b/html-test/ref/Ticket61.html
index 06d94941..9fdb81c1 100644
--- a/html-test/ref/Ticket61.html
+++ b/html-test/ref/Ticket61.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Ticket75.html b/html-test/ref/Ticket75.html
index a1a25faf..5b82e8d9 100644
--- a/html-test/ref/Ticket75.html
+++ b/html-test/ref/Ticket75.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/TitledPicture.html b/html-test/ref/TitledPicture.html
index 86e6e39f..e5da2a60 100644
--- a/html-test/ref/TitledPicture.html
+++ b/html-test/ref/TitledPicture.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/TypeFamilies.html b/html-test/ref/TypeFamilies.html
index 8f1aba2e..b51f85a1 100644
--- a/html-test/ref/TypeFamilies.html
+++ b/html-test/ref/TypeFamilies.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/TypeFamilies2.html b/html-test/ref/TypeFamilies2.html
index acddceb6..3241fab4 100644
--- a/html-test/ref/TypeFamilies2.html
+++ b/html-test/ref/TypeFamilies2.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/TypeOperators.html b/html-test/ref/TypeOperators.html
index c8c0f90e..7d74e528 100644
--- a/html-test/ref/TypeOperators.html
+++ b/html-test/ref/TypeOperators.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Unicode.html b/html-test/ref/Unicode.html
index ce3cf7e3..890c401f 100644
--- a/html-test/ref/Unicode.html
+++ b/html-test/ref/Unicode.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Visible.html b/html-test/ref/Visible.html
index daddc6d4..1bafae3f 100644
--- a/html-test/ref/Visible.html
+++ b/html-test/ref/Visible.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
-- 
cgit v1.2.3


From 0cf790508a608ee9137a9b3e68e00a3157da760b Mon Sep 17 00:00:00 2001
From: Nuno Alexandre <nuno@channable.com>
Date: Mon, 5 Feb 2018 21:35:22 +0100
Subject: Add an initial-scale property to all haddock pages

This solves an issue reported about the content looking
incredibly small on mobile devices.
---
 haddock-api/src/Haddock/Backends/Xhtml.hs        | 5 +++--
 html-test/ref/A.html                             | 1 +
 html-test/ref/B.html                             | 1 +
 html-test/ref/Bold.html                          | 1 +
 html-test/ref/Bug1.html                          | 1 +
 html-test/ref/Bug195.html                        | 1 +
 html-test/ref/Bug2.html                          | 1 +
 html-test/ref/Bug201.html                        | 1 +
 html-test/ref/Bug253.html                        | 1 +
 html-test/ref/Bug26.html                         | 1 +
 html-test/ref/Bug280.html                        | 1 +
 html-test/ref/Bug294.html                        | 1 +
 html-test/ref/Bug298.html                        | 1 +
 html-test/ref/Bug3.html                          | 1 +
 html-test/ref/Bug308.html                        | 1 +
 html-test/ref/Bug308CrossModule.html             | 1 +
 html-test/ref/Bug310.html                        | 1 +
 html-test/ref/Bug313.html                        | 1 +
 html-test/ref/Bug335.html                        | 1 +
 html-test/ref/Bug387.html                        | 1 +
 html-test/ref/Bug4.html                          | 1 +
 html-test/ref/Bug546.html                        | 1 +
 html-test/ref/Bug548.html                        | 1 +
 html-test/ref/Bug6.html                          | 1 +
 html-test/ref/Bug613.html                        | 1 +
 html-test/ref/Bug647.html                        | 1 +
 html-test/ref/Bug679.html                        | 1 +
 html-test/ref/Bug7.html                          | 1 +
 html-test/ref/Bug8.html                          | 1 +
 html-test/ref/Bug85.html                         | 1 +
 html-test/ref/BugDeprecated.html                 | 1 +
 html-test/ref/BugExportHeadings.html             | 1 +
 html-test/ref/Bugs.html                          | 1 +
 html-test/ref/BundledPatterns.html               | 1 +
 html-test/ref/BundledPatterns2.html              | 1 +
 html-test/ref/ConstructorPatternExport.html      | 1 +
 html-test/ref/DeprecatedClass.html               | 1 +
 html-test/ref/DeprecatedData.html                | 1 +
 html-test/ref/DeprecatedFunction.html            | 1 +
 html-test/ref/DeprecatedFunction2.html           | 1 +
 html-test/ref/DeprecatedFunction3.html           | 1 +
 html-test/ref/DeprecatedModule.html              | 1 +
 html-test/ref/DeprecatedModule2.html             | 1 +
 html-test/ref/DeprecatedNewtype.html             | 1 +
 html-test/ref/DeprecatedReExport.html            | 1 +
 html-test/ref/DeprecatedRecord.html              | 1 +
 html-test/ref/DeprecatedTypeFamily.html          | 1 +
 html-test/ref/DeprecatedTypeSynonym.html         | 1 +
 html-test/ref/DuplicateRecordFields.html         | 1 +
 html-test/ref/Examples.html                      | 1 +
 html-test/ref/Extensions.html                    | 1 +
 html-test/ref/FunArgs.html                       | 1 +
 html-test/ref/GADTRecords.html                   | 1 +
 html-test/ref/Hash.html                          | 1 +
 html-test/ref/HiddenInstances.html               | 1 +
 html-test/ref/HiddenInstancesB.html              | 1 +
 html-test/ref/Hyperlinks.html                    | 1 +
 html-test/ref/IgnoreExports.html                 | 1 +
 html-test/ref/ImplicitParams.html                | 1 +
 html-test/ref/Instances.html                     | 1 +
 html-test/ref/Math.html                          | 1 +
 html-test/ref/Minimal.html                       | 1 +
 html-test/ref/ModuleWithWarning.html             | 1 +
 html-test/ref/NamedDoc.html                      | 1 +
 html-test/ref/Nesting.html                       | 1 +
 html-test/ref/NoLayout.html                      | 1 +
 html-test/ref/NonGreedy.html                     | 1 +
 html-test/ref/Operators.html                     | 1 +
 html-test/ref/OrphanInstances.html               | 1 +
 html-test/ref/OrphanInstancesClass.html          | 1 +
 html-test/ref/OrphanInstancesType.html           | 1 +
 html-test/ref/PR643.html                         | 1 +
 html-test/ref/PR643_1.html                       | 1 +
 html-test/ref/PatternSyns.html                   | 1 +
 html-test/ref/PromotedTypes.html                 | 1 +
 html-test/ref/Properties.html                    | 1 +
 html-test/ref/PruneWithWarning.html              | 1 +
 html-test/ref/QuasiExpr.html                     | 1 +
 html-test/ref/QuasiQuote.html                    | 1 +
 html-test/ref/SpuriousSuperclassConstraints.html | 1 +
 html-test/ref/TH.html                            | 1 +
 html-test/ref/TH2.html                           | 1 +
 html-test/ref/Table.html                         | 1 +
 html-test/ref/Test.html                          | 1 +
 html-test/ref/Threaded.html                      | 1 +
 html-test/ref/Threaded_TH.html                   | 1 +
 html-test/ref/Ticket112.html                     | 1 +
 html-test/ref/Ticket61.html                      | 1 +
 html-test/ref/Ticket75.html                      | 1 +
 html-test/ref/TitledPicture.html                 | 1 +
 html-test/ref/TypeFamilies.html                  | 1 +
 html-test/ref/TypeFamilies2.html                 | 1 +
 html-test/ref/TypeOperators.html                 | 1 +
 html-test/ref/Unicode.html                       | 1 +
 html-test/ref/Visible.html                       | 1 +
 95 files changed, 97 insertions(+), 2 deletions(-)

(limited to 'html-test/ref/SpuriousSuperclassConstraints.html')

diff --git a/haddock-api/src/Haddock/Backends/Xhtml.hs b/haddock-api/src/Haddock/Backends/Xhtml.hs
index e4a0137e..f589e4c9 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml.hs
@@ -32,7 +32,7 @@ import Haddock.Types
 import Haddock.Version
 import Haddock.Utils
 import Haddock.Utils.Json
-import Text.XHtml hiding ( name, title, p, quote )
+import Text.XHtml hiding ( title, p, quote )
 import Haddock.GhcUtils
 
 import Control.Monad         ( when, unless )
@@ -121,7 +121,8 @@ copyHtmlBits odir libdir themes withQuickjump = do
 headHtml :: String -> Themes -> Maybe String -> Html
 headHtml docTitle themes mathjax_url =
   header << [
-    meta ! [httpequiv "Content-Type", content "text/html; charset=UTF-8"],
+    meta ! [ httpequiv "Content-Type", content "text/html; charset=UTF-8"],
+    meta ! [ name "viewport", content "width=device-width, initial-scale=1"],
     thetitle << docTitle,
     styleSheet themes,
     thelink ! [ rel "stylesheet", thetype "text/css", href quickJumpCssFile] << noHtml,
diff --git a/html-test/ref/A.html b/html-test/ref/A.html
index 9e41e154..31885479 100644
--- a/html-test/ref/A.html
+++ b/html-test/ref/A.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >A</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/B.html b/html-test/ref/B.html
index 9c2a9c83..251486da 100644
--- a/html-test/ref/B.html
+++ b/html-test/ref/B.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >B</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bold.html b/html-test/ref/Bold.html
index 9c684aa5..0a97cc3e 100644
--- a/html-test/ref/Bold.html
+++ b/html-test/ref/Bold.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bold</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug1.html b/html-test/ref/Bug1.html
index d17d3f49..605fb943 100644
--- a/html-test/ref/Bug1.html
+++ b/html-test/ref/Bug1.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug1</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug195.html b/html-test/ref/Bug195.html
index 3049bf00..26aacf63 100644
--- a/html-test/ref/Bug195.html
+++ b/html-test/ref/Bug195.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug195</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug2.html b/html-test/ref/Bug2.html
index 8fe2da5d..24af565c 100644
--- a/html-test/ref/Bug2.html
+++ b/html-test/ref/Bug2.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug2</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug201.html b/html-test/ref/Bug201.html
index 6db101c3..0d0cb610 100644
--- a/html-test/ref/Bug201.html
+++ b/html-test/ref/Bug201.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug201</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug253.html b/html-test/ref/Bug253.html
index 314feb55..b9b68816 100644
--- a/html-test/ref/Bug253.html
+++ b/html-test/ref/Bug253.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug253</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug26.html b/html-test/ref/Bug26.html
index 76645bd2..437f924a 100644
--- a/html-test/ref/Bug26.html
+++ b/html-test/ref/Bug26.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug26</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug280.html b/html-test/ref/Bug280.html
index e480a9cb..6eb5f063 100644
--- a/html-test/ref/Bug280.html
+++ b/html-test/ref/Bug280.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug280</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug294.html b/html-test/ref/Bug294.html
index 2a1159e4..d7978a7c 100644
--- a/html-test/ref/Bug294.html
+++ b/html-test/ref/Bug294.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug294</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug298.html b/html-test/ref/Bug298.html
index 598d1943..b75b3935 100644
--- a/html-test/ref/Bug298.html
+++ b/html-test/ref/Bug298.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug298</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug3.html b/html-test/ref/Bug3.html
index bf55cee0..49583616 100644
--- a/html-test/ref/Bug3.html
+++ b/html-test/ref/Bug3.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug3</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug308.html b/html-test/ref/Bug308.html
index 168c3935..5970f429 100644
--- a/html-test/ref/Bug308.html
+++ b/html-test/ref/Bug308.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug308</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug308CrossModule.html b/html-test/ref/Bug308CrossModule.html
index 091e1d74..acb81bcb 100644
--- a/html-test/ref/Bug308CrossModule.html
+++ b/html-test/ref/Bug308CrossModule.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug308CrossModule</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug310.html b/html-test/ref/Bug310.html
index d1f65b08..e4f9fc24 100644
--- a/html-test/ref/Bug310.html
+++ b/html-test/ref/Bug310.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug310</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug313.html b/html-test/ref/Bug313.html
index a4bc1d8e..0efd2bca 100644
--- a/html-test/ref/Bug313.html
+++ b/html-test/ref/Bug313.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug313</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug335.html b/html-test/ref/Bug335.html
index 2971ac05..ebd3795d 100644
--- a/html-test/ref/Bug335.html
+++ b/html-test/ref/Bug335.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug335</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug387.html b/html-test/ref/Bug387.html
index 8f2c19f4..a62585e7 100644
--- a/html-test/ref/Bug387.html
+++ b/html-test/ref/Bug387.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug387</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug4.html b/html-test/ref/Bug4.html
index 4208dc2a..f246a2c3 100644
--- a/html-test/ref/Bug4.html
+++ b/html-test/ref/Bug4.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug4</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug546.html b/html-test/ref/Bug546.html
index 940f51fc..f5aa4550 100644
--- a/html-test/ref/Bug546.html
+++ b/html-test/ref/Bug546.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug546</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug548.html b/html-test/ref/Bug548.html
index f9cb90de..c1ea885c 100644
--- a/html-test/ref/Bug548.html
+++ b/html-test/ref/Bug548.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug548</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug6.html b/html-test/ref/Bug6.html
index 6cd0af6d..31d81397 100644
--- a/html-test/ref/Bug6.html
+++ b/html-test/ref/Bug6.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug6</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug613.html b/html-test/ref/Bug613.html
index 2be84545..9dcea3da 100644
--- a/html-test/ref/Bug613.html
+++ b/html-test/ref/Bug613.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug613</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug647.html b/html-test/ref/Bug647.html
index 075f8a21..61041a04 100644
--- a/html-test/ref/Bug647.html
+++ b/html-test/ref/Bug647.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug647</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug679.html b/html-test/ref/Bug679.html
index bc09a82c..a9e60a41 100644
--- a/html-test/ref/Bug679.html
+++ b/html-test/ref/Bug679.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug679</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug7.html b/html-test/ref/Bug7.html
index 5c86f6dc..8c697461 100644
--- a/html-test/ref/Bug7.html
+++ b/html-test/ref/Bug7.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug7</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug8.html b/html-test/ref/Bug8.html
index d2b837ab..61aca45b 100644
--- a/html-test/ref/Bug8.html
+++ b/html-test/ref/Bug8.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug8</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bug85.html b/html-test/ref/Bug85.html
index 69296f1f..f281d379 100644
--- a/html-test/ref/Bug85.html
+++ b/html-test/ref/Bug85.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug85</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/BugDeprecated.html b/html-test/ref/BugDeprecated.html
index 21440de5..54d3befd 100644
--- a/html-test/ref/BugDeprecated.html
+++ b/html-test/ref/BugDeprecated.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >BugDeprecated</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/BugExportHeadings.html b/html-test/ref/BugExportHeadings.html
index a66adf0d..4998970f 100644
--- a/html-test/ref/BugExportHeadings.html
+++ b/html-test/ref/BugExportHeadings.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >BugExportHeadings</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Bugs.html b/html-test/ref/Bugs.html
index a81a89d6..4795d05f 100644
--- a/html-test/ref/Bugs.html
+++ b/html-test/ref/Bugs.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bugs</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/BundledPatterns.html b/html-test/ref/BundledPatterns.html
index 975b430d..6e4fbc69 100644
--- a/html-test/ref/BundledPatterns.html
+++ b/html-test/ref/BundledPatterns.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >BundledPatterns</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/BundledPatterns2.html b/html-test/ref/BundledPatterns2.html
index f5eaa212..6e27b29e 100644
--- a/html-test/ref/BundledPatterns2.html
+++ b/html-test/ref/BundledPatterns2.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >BundledPatterns2</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/ConstructorPatternExport.html b/html-test/ref/ConstructorPatternExport.html
index 11098100..a591dc21 100644
--- a/html-test/ref/ConstructorPatternExport.html
+++ b/html-test/ref/ConstructorPatternExport.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >ConstructorPatternExport</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/DeprecatedClass.html b/html-test/ref/DeprecatedClass.html
index 0b7037a2..b9950ab8 100644
--- a/html-test/ref/DeprecatedClass.html
+++ b/html-test/ref/DeprecatedClass.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedClass</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/DeprecatedData.html b/html-test/ref/DeprecatedData.html
index 5dc3fda3..cc825df2 100644
--- a/html-test/ref/DeprecatedData.html
+++ b/html-test/ref/DeprecatedData.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedData</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/DeprecatedFunction.html b/html-test/ref/DeprecatedFunction.html
index 2591f124..e27d0c95 100644
--- a/html-test/ref/DeprecatedFunction.html
+++ b/html-test/ref/DeprecatedFunction.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedFunction</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/DeprecatedFunction2.html b/html-test/ref/DeprecatedFunction2.html
index d52af866..a7e2679c 100644
--- a/html-test/ref/DeprecatedFunction2.html
+++ b/html-test/ref/DeprecatedFunction2.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedFunction2</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/DeprecatedFunction3.html b/html-test/ref/DeprecatedFunction3.html
index abc92a8b..7853195c 100644
--- a/html-test/ref/DeprecatedFunction3.html
+++ b/html-test/ref/DeprecatedFunction3.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedFunction3</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/DeprecatedModule.html b/html-test/ref/DeprecatedModule.html
index e9b2e25f..34b259aa 100644
--- a/html-test/ref/DeprecatedModule.html
+++ b/html-test/ref/DeprecatedModule.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedModule</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/DeprecatedModule2.html b/html-test/ref/DeprecatedModule2.html
index b70b6b97..a2789aa5 100644
--- a/html-test/ref/DeprecatedModule2.html
+++ b/html-test/ref/DeprecatedModule2.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedModule2</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/DeprecatedNewtype.html b/html-test/ref/DeprecatedNewtype.html
index 1b51ceba..6a94e6cc 100644
--- a/html-test/ref/DeprecatedNewtype.html
+++ b/html-test/ref/DeprecatedNewtype.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedNewtype</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/DeprecatedReExport.html b/html-test/ref/DeprecatedReExport.html
index 732a8dfa..232d73d9 100644
--- a/html-test/ref/DeprecatedReExport.html
+++ b/html-test/ref/DeprecatedReExport.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedReExport</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/DeprecatedRecord.html b/html-test/ref/DeprecatedRecord.html
index 5681e5b6..19d10b40 100644
--- a/html-test/ref/DeprecatedRecord.html
+++ b/html-test/ref/DeprecatedRecord.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedRecord</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/DeprecatedTypeFamily.html b/html-test/ref/DeprecatedTypeFamily.html
index ba61ea0b..58833216 100644
--- a/html-test/ref/DeprecatedTypeFamily.html
+++ b/html-test/ref/DeprecatedTypeFamily.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedTypeFamily</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/DeprecatedTypeSynonym.html b/html-test/ref/DeprecatedTypeSynonym.html
index 98bca5be..d1eed82f 100644
--- a/html-test/ref/DeprecatedTypeSynonym.html
+++ b/html-test/ref/DeprecatedTypeSynonym.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedTypeSynonym</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/DuplicateRecordFields.html b/html-test/ref/DuplicateRecordFields.html
index 3f151391..4b5abfcf 100644
--- a/html-test/ref/DuplicateRecordFields.html
+++ b/html-test/ref/DuplicateRecordFields.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DuplicateRecordFields</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Examples.html b/html-test/ref/Examples.html
index 04a855f8..37e23fda 100644
--- a/html-test/ref/Examples.html
+++ b/html-test/ref/Examples.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Examples</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Extensions.html b/html-test/ref/Extensions.html
index 44fa5573..7eb41eff 100644
--- a/html-test/ref/Extensions.html
+++ b/html-test/ref/Extensions.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Extensions</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/FunArgs.html b/html-test/ref/FunArgs.html
index 04dfb907..18f4eaef 100644
--- a/html-test/ref/FunArgs.html
+++ b/html-test/ref/FunArgs.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >FunArgs</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/GADTRecords.html b/html-test/ref/GADTRecords.html
index 23686adf..43657b02 100644
--- a/html-test/ref/GADTRecords.html
+++ b/html-test/ref/GADTRecords.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >GADTRecords</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Hash.html b/html-test/ref/Hash.html
index fd8b5114..177c7553 100644
--- a/html-test/ref/Hash.html
+++ b/html-test/ref/Hash.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Hash</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/HiddenInstances.html b/html-test/ref/HiddenInstances.html
index 4f80c418..673edf63 100644
--- a/html-test/ref/HiddenInstances.html
+++ b/html-test/ref/HiddenInstances.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >HiddenInstances</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/HiddenInstancesB.html b/html-test/ref/HiddenInstancesB.html
index 4039a979..86fb8f69 100644
--- a/html-test/ref/HiddenInstancesB.html
+++ b/html-test/ref/HiddenInstancesB.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >HiddenInstancesB</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Hyperlinks.html b/html-test/ref/Hyperlinks.html
index 12f3ce3d..17c2751e 100644
--- a/html-test/ref/Hyperlinks.html
+++ b/html-test/ref/Hyperlinks.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Hyperlinks</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/IgnoreExports.html b/html-test/ref/IgnoreExports.html
index 3c02b5f5..65262cb0 100644
--- a/html-test/ref/IgnoreExports.html
+++ b/html-test/ref/IgnoreExports.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >IgnoreExports</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/ImplicitParams.html b/html-test/ref/ImplicitParams.html
index 8e398452..ef75ef68 100644
--- a/html-test/ref/ImplicitParams.html
+++ b/html-test/ref/ImplicitParams.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >ImplicitParams</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Instances.html b/html-test/ref/Instances.html
index 3af35c04..6f0347a4 100644
--- a/html-test/ref/Instances.html
+++ b/html-test/ref/Instances.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Instances</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Math.html b/html-test/ref/Math.html
index c4941c60..d48e19c0 100644
--- a/html-test/ref/Math.html
+++ b/html-test/ref/Math.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Math</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Minimal.html b/html-test/ref/Minimal.html
index 065414c4..42ac55a1 100644
--- a/html-test/ref/Minimal.html
+++ b/html-test/ref/Minimal.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Minimal</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/ModuleWithWarning.html b/html-test/ref/ModuleWithWarning.html
index f266234b..672b8700 100644
--- a/html-test/ref/ModuleWithWarning.html
+++ b/html-test/ref/ModuleWithWarning.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >ModuleWithWarning</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/NamedDoc.html b/html-test/ref/NamedDoc.html
index 285d0a9a..f1f110d3 100644
--- a/html-test/ref/NamedDoc.html
+++ b/html-test/ref/NamedDoc.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >NamedDoc</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Nesting.html b/html-test/ref/Nesting.html
index 8d7381b7..26c9852f 100644
--- a/html-test/ref/Nesting.html
+++ b/html-test/ref/Nesting.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Nesting</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/NoLayout.html b/html-test/ref/NoLayout.html
index 57b3f71c..d454a86f 100644
--- a/html-test/ref/NoLayout.html
+++ b/html-test/ref/NoLayout.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >NoLayout</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/NonGreedy.html b/html-test/ref/NonGreedy.html
index 282c0ddd..a8f1179e 100644
--- a/html-test/ref/NonGreedy.html
+++ b/html-test/ref/NonGreedy.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >NonGreedy</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Operators.html b/html-test/ref/Operators.html
index b863a140..e306fc35 100644
--- a/html-test/ref/Operators.html
+++ b/html-test/ref/Operators.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Operators</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/OrphanInstances.html b/html-test/ref/OrphanInstances.html
index ac8cb0d5..ad105fc9 100644
--- a/html-test/ref/OrphanInstances.html
+++ b/html-test/ref/OrphanInstances.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >OrphanInstances</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/OrphanInstancesClass.html b/html-test/ref/OrphanInstancesClass.html
index 70525ae1..3facf55a 100644
--- a/html-test/ref/OrphanInstancesClass.html
+++ b/html-test/ref/OrphanInstancesClass.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >OrphanInstancesClass</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/OrphanInstancesType.html b/html-test/ref/OrphanInstancesType.html
index 18187600..7c87e210 100644
--- a/html-test/ref/OrphanInstancesType.html
+++ b/html-test/ref/OrphanInstancesType.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >OrphanInstancesType</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/PR643.html b/html-test/ref/PR643.html
index 6fba5964..e7932179 100644
--- a/html-test/ref/PR643.html
+++ b/html-test/ref/PR643.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >PR643</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/PR643_1.html b/html-test/ref/PR643_1.html
index 1bfadae1..10f8059f 100644
--- a/html-test/ref/PR643_1.html
+++ b/html-test/ref/PR643_1.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >PR643_1</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/PatternSyns.html b/html-test/ref/PatternSyns.html
index b106e4f0..9f028ad2 100644
--- a/html-test/ref/PatternSyns.html
+++ b/html-test/ref/PatternSyns.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >PatternSyns</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/PromotedTypes.html b/html-test/ref/PromotedTypes.html
index 1bf25665..fb5beda2 100644
--- a/html-test/ref/PromotedTypes.html
+++ b/html-test/ref/PromotedTypes.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >PromotedTypes</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Properties.html b/html-test/ref/Properties.html
index 23c9f3b6..64aac055 100644
--- a/html-test/ref/Properties.html
+++ b/html-test/ref/Properties.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Properties</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/PruneWithWarning.html b/html-test/ref/PruneWithWarning.html
index 7f736dea..1ce9ac2c 100644
--- a/html-test/ref/PruneWithWarning.html
+++ b/html-test/ref/PruneWithWarning.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >PruneWithWarning</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/QuasiExpr.html b/html-test/ref/QuasiExpr.html
index 7da60603..08a7564c 100644
--- a/html-test/ref/QuasiExpr.html
+++ b/html-test/ref/QuasiExpr.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >QuasiExpr</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/QuasiQuote.html b/html-test/ref/QuasiQuote.html
index f7da2850..1349e0c5 100644
--- a/html-test/ref/QuasiQuote.html
+++ b/html-test/ref/QuasiQuote.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >QuasiQuote</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/SpuriousSuperclassConstraints.html b/html-test/ref/SpuriousSuperclassConstraints.html
index 67ece044..d33e56a5 100644
--- a/html-test/ref/SpuriousSuperclassConstraints.html
+++ b/html-test/ref/SpuriousSuperclassConstraints.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >SpuriousSuperclassConstraints</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/TH.html b/html-test/ref/TH.html
index 3c2f36c3..a75089f0 100644
--- a/html-test/ref/TH.html
+++ b/html-test/ref/TH.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >TH</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/TH2.html b/html-test/ref/TH2.html
index ebe9a7e7..c21c7913 100644
--- a/html-test/ref/TH2.html
+++ b/html-test/ref/TH2.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >TH2</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Table.html b/html-test/ref/Table.html
index 98b83d94..a12ee9bc 100644
--- a/html-test/ref/Table.html
+++ b/html-test/ref/Table.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Table</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html
index ef09f281..9b5f1bed 100644
--- a/html-test/ref/Test.html
+++ b/html-test/ref/Test.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Test</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Threaded.html b/html-test/ref/Threaded.html
index b35c800c..3524d6e0 100644
--- a/html-test/ref/Threaded.html
+++ b/html-test/ref/Threaded.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Threaded</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Threaded_TH.html b/html-test/ref/Threaded_TH.html
index 9bb68128..997bf690 100644
--- a/html-test/ref/Threaded_TH.html
+++ b/html-test/ref/Threaded_TH.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Threaded_TH</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Ticket112.html b/html-test/ref/Ticket112.html
index 72a00667..21354660 100644
--- a/html-test/ref/Ticket112.html
+++ b/html-test/ref/Ticket112.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Ticket112</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Ticket61.html b/html-test/ref/Ticket61.html
index 9fdb81c1..3f820beb 100644
--- a/html-test/ref/Ticket61.html
+++ b/html-test/ref/Ticket61.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Ticket61</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Ticket75.html b/html-test/ref/Ticket75.html
index 5b82e8d9..5990fa1b 100644
--- a/html-test/ref/Ticket75.html
+++ b/html-test/ref/Ticket75.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Ticket75</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/TitledPicture.html b/html-test/ref/TitledPicture.html
index e5da2a60..063211b9 100644
--- a/html-test/ref/TitledPicture.html
+++ b/html-test/ref/TitledPicture.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >TitledPicture</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/TypeFamilies.html b/html-test/ref/TypeFamilies.html
index b51f85a1..b5f4fdab 100644
--- a/html-test/ref/TypeFamilies.html
+++ b/html-test/ref/TypeFamilies.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >TypeFamilies</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/TypeFamilies2.html b/html-test/ref/TypeFamilies2.html
index 3241fab4..5e891fe4 100644
--- a/html-test/ref/TypeFamilies2.html
+++ b/html-test/ref/TypeFamilies2.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >TypeFamilies2</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/TypeOperators.html b/html-test/ref/TypeOperators.html
index 7d74e528..e5628628 100644
--- a/html-test/ref/TypeOperators.html
+++ b/html-test/ref/TypeOperators.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >TypeOperators</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Unicode.html b/html-test/ref/Unicode.html
index 890c401f..1551fa25 100644
--- a/html-test/ref/Unicode.html
+++ b/html-test/ref/Unicode.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Unicode</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
diff --git a/html-test/ref/Visible.html b/html-test/ref/Visible.html
index 1bafae3f..a9da3b01 100644
--- a/html-test/ref/Visible.html
+++ b/html-test/ref/Visible.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Visible</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-- 
cgit v1.2.3


From 7f235c7d0b914805827fd4ae0bec62eb0dd93791 Mon Sep 17 00:00:00 2001
From: Herbert Valerio Riedel <hvr@gnu.org>
Date: Wed, 21 Mar 2018 11:37:36 +0100
Subject: html-test --accept

---
 html-test/ref/A.html                             |  2 +-
 html-test/ref/Bold.html                          |  2 +-
 html-test/ref/Bug1.html                          |  2 +-
 html-test/ref/Bug195.html                        |  2 +-
 html-test/ref/Bug2.html                          |  2 +-
 html-test/ref/Bug201.html                        |  2 +-
 html-test/ref/Bug253.html                        |  2 +-
 html-test/ref/Bug26.html                         |  2 +-
 html-test/ref/Bug280.html                        |  2 +-
 html-test/ref/Bug294.html                        |  2 +-
 html-test/ref/Bug298.html                        |  2 +-
 html-test/ref/Bug3.html                          |  2 +-
 html-test/ref/Bug308.html                        |  2 +-
 html-test/ref/Bug308CrossModule.html             |  2 +-
 html-test/ref/Bug310.html                        |  2 +-
 html-test/ref/Bug313.html                        |  2 +-
 html-test/ref/Bug335.html                        |  2 +-
 html-test/ref/Bug387.html                        |  2 +-
 html-test/ref/Bug4.html                          |  2 +-
 html-test/ref/Bug458.html                        | 10 ++++++----
 html-test/ref/Bug546.html                        |  2 +-
 html-test/ref/Bug548.html                        |  2 +-
 html-test/ref/Bug6.html                          |  2 +-
 html-test/ref/Bug613.html                        |  2 +-
 html-test/ref/Bug647.html                        |  2 +-
 html-test/ref/Bug679.html                        |  2 +-
 html-test/ref/Bug7.html                          |  2 +-
 html-test/ref/Bug8.html                          |  2 +-
 html-test/ref/Bug85.html                         |  2 +-
 html-test/ref/BugDeprecated.html                 |  2 +-
 html-test/ref/BugExportHeadings.html             |  2 +-
 html-test/ref/Bugs.html                          |  2 +-
 html-test/ref/BundledPatterns.html               |  2 +-
 html-test/ref/BundledPatterns2.html              |  2 +-
 html-test/ref/ConstructorPatternExport.html      |  2 +-
 html-test/ref/DeprecatedClass.html               |  2 +-
 html-test/ref/DeprecatedData.html                |  2 +-
 html-test/ref/DeprecatedFunction.html            |  2 +-
 html-test/ref/DeprecatedFunction2.html           |  2 +-
 html-test/ref/DeprecatedFunction3.html           |  2 +-
 html-test/ref/DeprecatedModule.html              |  2 +-
 html-test/ref/DeprecatedModule2.html             |  2 +-
 html-test/ref/DeprecatedNewtype.html             |  2 +-
 html-test/ref/DeprecatedReExport.html            |  2 +-
 html-test/ref/DeprecatedRecord.html              |  2 +-
 html-test/ref/DeprecatedTypeFamily.html          |  2 +-
 html-test/ref/DeprecatedTypeSynonym.html         |  2 +-
 html-test/ref/DuplicateRecordFields.html         |  2 +-
 html-test/ref/Examples.html                      |  2 +-
 html-test/ref/Extensions.html                    |  2 +-
 html-test/ref/FunArgs.html                       |  2 +-
 html-test/ref/GADTRecords.html                   |  2 +-
 html-test/ref/Hash.html                          |  2 +-
 html-test/ref/HiddenInstances.html               |  2 +-
 html-test/ref/HiddenInstancesB.html              |  2 +-
 html-test/ref/Hyperlinks.html                    |  2 +-
 html-test/ref/ImplicitParams.html                |  2 +-
 html-test/ref/Instances.html                     |  2 +-
 html-test/ref/Math.html                          |  2 +-
 html-test/ref/Minimal.html                       |  2 +-
 html-test/ref/ModuleWithWarning.html             |  2 +-
 html-test/ref/NamedDoc.html                      |  2 +-
 html-test/ref/Nesting.html                       |  2 +-
 html-test/ref/NoLayout.html                      |  2 +-
 html-test/ref/NonGreedy.html                     |  2 +-
 html-test/ref/Operators.html                     |  2 +-
 html-test/ref/OrphanInstances.html               |  2 +-
 html-test/ref/OrphanInstancesClass.html          |  2 +-
 html-test/ref/OrphanInstancesType.html           |  2 +-
 html-test/ref/PR643.html                         |  2 +-
 html-test/ref/PR643_1.html                       |  2 +-
 html-test/ref/PatternSyns.html                   |  2 +-
 html-test/ref/PromotedTypes.html                 |  2 +-
 html-test/ref/Properties.html                    |  2 +-
 html-test/ref/PruneWithWarning.html              |  2 +-
 html-test/ref/QuasiExpr.html                     |  2 +-
 html-test/ref/QuasiQuote.html                    |  2 +-
 html-test/ref/SpuriousSuperclassConstraints.html |  2 +-
 html-test/ref/TH.html                            |  2 +-
 html-test/ref/TH2.html                           |  2 +-
 html-test/ref/Table.html                         |  2 +-
 html-test/ref/Test.html                          |  2 +-
 html-test/ref/Threaded.html                      |  2 +-
 html-test/ref/Threaded_TH.html                   |  2 +-
 html-test/ref/Ticket112.html                     |  2 +-
 html-test/ref/Ticket61.html                      |  2 +-
 html-test/ref/Ticket75.html                      |  2 +-
 html-test/ref/TitledPicture.html                 |  2 +-
 html-test/ref/TypeFamilies.html                  |  2 +-
 html-test/ref/TypeFamilies2.html                 |  2 +-
 html-test/ref/TypeOperators.html                 |  2 +-
 html-test/ref/Unicode.html                       |  2 +-
 html-test/ref/Visible.html                       |  2 +-
 93 files changed, 98 insertions(+), 96 deletions(-)

(limited to 'html-test/ref/SpuriousSuperclassConstraints.html')

diff --git a/html-test/ref/A.html b/html-test/ref/A.html
index 31885479..ee4dcbef 100644
--- a/html-test/ref/A.html
+++ b/html-test/ref/A.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >A</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bold.html b/html-test/ref/Bold.html
index 0a97cc3e..3125f0bc 100644
--- a/html-test/ref/Bold.html
+++ b/html-test/ref/Bold.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bold</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug1.html b/html-test/ref/Bug1.html
index 605fb943..1ae9a1d0 100644
--- a/html-test/ref/Bug1.html
+++ b/html-test/ref/Bug1.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug1</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug195.html b/html-test/ref/Bug195.html
index 26aacf63..af192402 100644
--- a/html-test/ref/Bug195.html
+++ b/html-test/ref/Bug195.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug195</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug2.html b/html-test/ref/Bug2.html
index 24af565c..7e9ef3a5 100644
--- a/html-test/ref/Bug2.html
+++ b/html-test/ref/Bug2.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug2</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug201.html b/html-test/ref/Bug201.html
index 0d0cb610..2d27f27f 100644
--- a/html-test/ref/Bug201.html
+++ b/html-test/ref/Bug201.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug201</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug253.html b/html-test/ref/Bug253.html
index b9b68816..64ffda7d 100644
--- a/html-test/ref/Bug253.html
+++ b/html-test/ref/Bug253.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug253</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug26.html b/html-test/ref/Bug26.html
index 437f924a..c7de9837 100644
--- a/html-test/ref/Bug26.html
+++ b/html-test/ref/Bug26.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug26</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug280.html b/html-test/ref/Bug280.html
index 6eb5f063..a4a6088c 100644
--- a/html-test/ref/Bug280.html
+++ b/html-test/ref/Bug280.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug280</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug294.html b/html-test/ref/Bug294.html
index d7978a7c..be7e4699 100644
--- a/html-test/ref/Bug294.html
+++ b/html-test/ref/Bug294.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug294</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug298.html b/html-test/ref/Bug298.html
index b75b3935..cda567e8 100644
--- a/html-test/ref/Bug298.html
+++ b/html-test/ref/Bug298.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug298</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug3.html b/html-test/ref/Bug3.html
index 49583616..1e9ab3ad 100644
--- a/html-test/ref/Bug3.html
+++ b/html-test/ref/Bug3.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug3</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug308.html b/html-test/ref/Bug308.html
index 5970f429..685440ef 100644
--- a/html-test/ref/Bug308.html
+++ b/html-test/ref/Bug308.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug308</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug308CrossModule.html b/html-test/ref/Bug308CrossModule.html
index acb81bcb..0b3e555e 100644
--- a/html-test/ref/Bug308CrossModule.html
+++ b/html-test/ref/Bug308CrossModule.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug308CrossModule</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug310.html b/html-test/ref/Bug310.html
index e4f9fc24..b0967fb6 100644
--- a/html-test/ref/Bug310.html
+++ b/html-test/ref/Bug310.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug310</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug313.html b/html-test/ref/Bug313.html
index 0efd2bca..30844790 100644
--- a/html-test/ref/Bug313.html
+++ b/html-test/ref/Bug313.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug313</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug335.html b/html-test/ref/Bug335.html
index ebd3795d..c394b5ad 100644
--- a/html-test/ref/Bug335.html
+++ b/html-test/ref/Bug335.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug335</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug387.html b/html-test/ref/Bug387.html
index a62585e7..cf64c242 100644
--- a/html-test/ref/Bug387.html
+++ b/html-test/ref/Bug387.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug387</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug4.html b/html-test/ref/Bug4.html
index f246a2c3..5b370eed 100644
--- a/html-test/ref/Bug4.html
+++ b/html-test/ref/Bug4.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug4</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug458.html b/html-test/ref/Bug458.html
index f716d7d6..8151da61 100644
--- a/html-test/ref/Bug458.html
+++ b/html-test/ref/Bug458.html
@@ -1,9 +1,11 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug458</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
+     /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
@@ -12,7 +14,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -22,8 +26,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug546.html b/html-test/ref/Bug546.html
index f5aa4550..b3cb1105 100644
--- a/html-test/ref/Bug546.html
+++ b/html-test/ref/Bug546.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug546</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug548.html b/html-test/ref/Bug548.html
index c1ea885c..d63e5afe 100644
--- a/html-test/ref/Bug548.html
+++ b/html-test/ref/Bug548.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug548</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug6.html b/html-test/ref/Bug6.html
index 31d81397..47e4f6a1 100644
--- a/html-test/ref/Bug6.html
+++ b/html-test/ref/Bug6.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug6</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug613.html b/html-test/ref/Bug613.html
index 9dcea3da..9718d731 100644
--- a/html-test/ref/Bug613.html
+++ b/html-test/ref/Bug613.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug613</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug647.html b/html-test/ref/Bug647.html
index 61041a04..56af3429 100644
--- a/html-test/ref/Bug647.html
+++ b/html-test/ref/Bug647.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug647</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug679.html b/html-test/ref/Bug679.html
index a9e60a41..d8725c80 100644
--- a/html-test/ref/Bug679.html
+++ b/html-test/ref/Bug679.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug679</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug7.html b/html-test/ref/Bug7.html
index 8c697461..d8ec9dba 100644
--- a/html-test/ref/Bug7.html
+++ b/html-test/ref/Bug7.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug7</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug8.html b/html-test/ref/Bug8.html
index 61aca45b..67056ac1 100644
--- a/html-test/ref/Bug8.html
+++ b/html-test/ref/Bug8.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug8</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bug85.html b/html-test/ref/Bug85.html
index f281d379..d595433d 100644
--- a/html-test/ref/Bug85.html
+++ b/html-test/ref/Bug85.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bug85</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/BugDeprecated.html b/html-test/ref/BugDeprecated.html
index 54d3befd..2c46d9f7 100644
--- a/html-test/ref/BugDeprecated.html
+++ b/html-test/ref/BugDeprecated.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >BugDeprecated</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/BugExportHeadings.html b/html-test/ref/BugExportHeadings.html
index 4998970f..d1ecc40d 100644
--- a/html-test/ref/BugExportHeadings.html
+++ b/html-test/ref/BugExportHeadings.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >BugExportHeadings</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Bugs.html b/html-test/ref/Bugs.html
index 4795d05f..66589b8b 100644
--- a/html-test/ref/Bugs.html
+++ b/html-test/ref/Bugs.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Bugs</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/BundledPatterns.html b/html-test/ref/BundledPatterns.html
index 6e4fbc69..00933381 100644
--- a/html-test/ref/BundledPatterns.html
+++ b/html-test/ref/BundledPatterns.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >BundledPatterns</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/BundledPatterns2.html b/html-test/ref/BundledPatterns2.html
index 6e27b29e..f5ca34d8 100644
--- a/html-test/ref/BundledPatterns2.html
+++ b/html-test/ref/BundledPatterns2.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >BundledPatterns2</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/ConstructorPatternExport.html b/html-test/ref/ConstructorPatternExport.html
index a591dc21..0105fa14 100644
--- a/html-test/ref/ConstructorPatternExport.html
+++ b/html-test/ref/ConstructorPatternExport.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >ConstructorPatternExport</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/DeprecatedClass.html b/html-test/ref/DeprecatedClass.html
index b9950ab8..ac21bbfb 100644
--- a/html-test/ref/DeprecatedClass.html
+++ b/html-test/ref/DeprecatedClass.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedClass</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/DeprecatedData.html b/html-test/ref/DeprecatedData.html
index cc825df2..91935311 100644
--- a/html-test/ref/DeprecatedData.html
+++ b/html-test/ref/DeprecatedData.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedData</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/DeprecatedFunction.html b/html-test/ref/DeprecatedFunction.html
index e27d0c95..fac1ea06 100644
--- a/html-test/ref/DeprecatedFunction.html
+++ b/html-test/ref/DeprecatedFunction.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedFunction</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/DeprecatedFunction2.html b/html-test/ref/DeprecatedFunction2.html
index a7e2679c..ac97846f 100644
--- a/html-test/ref/DeprecatedFunction2.html
+++ b/html-test/ref/DeprecatedFunction2.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedFunction2</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/DeprecatedFunction3.html b/html-test/ref/DeprecatedFunction3.html
index 7853195c..3d773c9b 100644
--- a/html-test/ref/DeprecatedFunction3.html
+++ b/html-test/ref/DeprecatedFunction3.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedFunction3</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/DeprecatedModule.html b/html-test/ref/DeprecatedModule.html
index 34b259aa..7d5601fd 100644
--- a/html-test/ref/DeprecatedModule.html
+++ b/html-test/ref/DeprecatedModule.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedModule</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/DeprecatedModule2.html b/html-test/ref/DeprecatedModule2.html
index a2789aa5..e5c941cd 100644
--- a/html-test/ref/DeprecatedModule2.html
+++ b/html-test/ref/DeprecatedModule2.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedModule2</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/DeprecatedNewtype.html b/html-test/ref/DeprecatedNewtype.html
index 6a94e6cc..04a57ab6 100644
--- a/html-test/ref/DeprecatedNewtype.html
+++ b/html-test/ref/DeprecatedNewtype.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedNewtype</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/DeprecatedReExport.html b/html-test/ref/DeprecatedReExport.html
index 232d73d9..2918b59e 100644
--- a/html-test/ref/DeprecatedReExport.html
+++ b/html-test/ref/DeprecatedReExport.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedReExport</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/DeprecatedRecord.html b/html-test/ref/DeprecatedRecord.html
index 19d10b40..8f0bb9c6 100644
--- a/html-test/ref/DeprecatedRecord.html
+++ b/html-test/ref/DeprecatedRecord.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedRecord</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/DeprecatedTypeFamily.html b/html-test/ref/DeprecatedTypeFamily.html
index 58833216..bff1297b 100644
--- a/html-test/ref/DeprecatedTypeFamily.html
+++ b/html-test/ref/DeprecatedTypeFamily.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedTypeFamily</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/DeprecatedTypeSynonym.html b/html-test/ref/DeprecatedTypeSynonym.html
index d1eed82f..4a080c27 100644
--- a/html-test/ref/DeprecatedTypeSynonym.html
+++ b/html-test/ref/DeprecatedTypeSynonym.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DeprecatedTypeSynonym</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/DuplicateRecordFields.html b/html-test/ref/DuplicateRecordFields.html
index 4b5abfcf..c8b0d9c8 100644
--- a/html-test/ref/DuplicateRecordFields.html
+++ b/html-test/ref/DuplicateRecordFields.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >DuplicateRecordFields</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Examples.html b/html-test/ref/Examples.html
index 37e23fda..a69f9235 100644
--- a/html-test/ref/Examples.html
+++ b/html-test/ref/Examples.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Examples</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Extensions.html b/html-test/ref/Extensions.html
index 7eb41eff..eef4b96f 100644
--- a/html-test/ref/Extensions.html
+++ b/html-test/ref/Extensions.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Extensions</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/FunArgs.html b/html-test/ref/FunArgs.html
index 18f4eaef..b6aaa332 100644
--- a/html-test/ref/FunArgs.html
+++ b/html-test/ref/FunArgs.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >FunArgs</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/GADTRecords.html b/html-test/ref/GADTRecords.html
index 43657b02..918ec32e 100644
--- a/html-test/ref/GADTRecords.html
+++ b/html-test/ref/GADTRecords.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >GADTRecords</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Hash.html b/html-test/ref/Hash.html
index 177c7553..d8c275fa 100644
--- a/html-test/ref/Hash.html
+++ b/html-test/ref/Hash.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Hash</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/HiddenInstances.html b/html-test/ref/HiddenInstances.html
index 673edf63..a640b2c5 100644
--- a/html-test/ref/HiddenInstances.html
+++ b/html-test/ref/HiddenInstances.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >HiddenInstances</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/HiddenInstancesB.html b/html-test/ref/HiddenInstancesB.html
index 86fb8f69..f67653c8 100644
--- a/html-test/ref/HiddenInstancesB.html
+++ b/html-test/ref/HiddenInstancesB.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >HiddenInstancesB</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Hyperlinks.html b/html-test/ref/Hyperlinks.html
index 17c2751e..bf4ca9bf 100644
--- a/html-test/ref/Hyperlinks.html
+++ b/html-test/ref/Hyperlinks.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Hyperlinks</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/ImplicitParams.html b/html-test/ref/ImplicitParams.html
index ef75ef68..807bf3b4 100644
--- a/html-test/ref/ImplicitParams.html
+++ b/html-test/ref/ImplicitParams.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >ImplicitParams</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Instances.html b/html-test/ref/Instances.html
index 6f0347a4..30cac06f 100644
--- a/html-test/ref/Instances.html
+++ b/html-test/ref/Instances.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Instances</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Math.html b/html-test/ref/Math.html
index d48e19c0..26feba6e 100644
--- a/html-test/ref/Math.html
+++ b/html-test/ref/Math.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Math</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Minimal.html b/html-test/ref/Minimal.html
index 42ac55a1..c425933f 100644
--- a/html-test/ref/Minimal.html
+++ b/html-test/ref/Minimal.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Minimal</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/ModuleWithWarning.html b/html-test/ref/ModuleWithWarning.html
index 672b8700..f6ccf578 100644
--- a/html-test/ref/ModuleWithWarning.html
+++ b/html-test/ref/ModuleWithWarning.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >ModuleWithWarning</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/NamedDoc.html b/html-test/ref/NamedDoc.html
index f1f110d3..ed0cfa03 100644
--- a/html-test/ref/NamedDoc.html
+++ b/html-test/ref/NamedDoc.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >NamedDoc</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Nesting.html b/html-test/ref/Nesting.html
index 26c9852f..29657127 100644
--- a/html-test/ref/Nesting.html
+++ b/html-test/ref/Nesting.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Nesting</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/NoLayout.html b/html-test/ref/NoLayout.html
index d454a86f..1b84596e 100644
--- a/html-test/ref/NoLayout.html
+++ b/html-test/ref/NoLayout.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >NoLayout</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/NonGreedy.html b/html-test/ref/NonGreedy.html
index a8f1179e..b4827db9 100644
--- a/html-test/ref/NonGreedy.html
+++ b/html-test/ref/NonGreedy.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >NonGreedy</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Operators.html b/html-test/ref/Operators.html
index e306fc35..9467343a 100644
--- a/html-test/ref/Operators.html
+++ b/html-test/ref/Operators.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Operators</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/OrphanInstances.html b/html-test/ref/OrphanInstances.html
index ad105fc9..cbd499b5 100644
--- a/html-test/ref/OrphanInstances.html
+++ b/html-test/ref/OrphanInstances.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >OrphanInstances</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/OrphanInstancesClass.html b/html-test/ref/OrphanInstancesClass.html
index 3facf55a..8bcbee30 100644
--- a/html-test/ref/OrphanInstancesClass.html
+++ b/html-test/ref/OrphanInstancesClass.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >OrphanInstancesClass</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/OrphanInstancesType.html b/html-test/ref/OrphanInstancesType.html
index 7c87e210..e7ea133b 100644
--- a/html-test/ref/OrphanInstancesType.html
+++ b/html-test/ref/OrphanInstancesType.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >OrphanInstancesType</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/PR643.html b/html-test/ref/PR643.html
index e7932179..1e70859f 100644
--- a/html-test/ref/PR643.html
+++ b/html-test/ref/PR643.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >PR643</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/PR643_1.html b/html-test/ref/PR643_1.html
index 10f8059f..98def13c 100644
--- a/html-test/ref/PR643_1.html
+++ b/html-test/ref/PR643_1.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >PR643_1</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/PatternSyns.html b/html-test/ref/PatternSyns.html
index 9f028ad2..edc4842f 100644
--- a/html-test/ref/PatternSyns.html
+++ b/html-test/ref/PatternSyns.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >PatternSyns</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/PromotedTypes.html b/html-test/ref/PromotedTypes.html
index fb5beda2..f36bb227 100644
--- a/html-test/ref/PromotedTypes.html
+++ b/html-test/ref/PromotedTypes.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >PromotedTypes</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Properties.html b/html-test/ref/Properties.html
index 64aac055..62701755 100644
--- a/html-test/ref/Properties.html
+++ b/html-test/ref/Properties.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Properties</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/PruneWithWarning.html b/html-test/ref/PruneWithWarning.html
index 1ce9ac2c..abfc1362 100644
--- a/html-test/ref/PruneWithWarning.html
+++ b/html-test/ref/PruneWithWarning.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >PruneWithWarning</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/QuasiExpr.html b/html-test/ref/QuasiExpr.html
index 08a7564c..e008ccd2 100644
--- a/html-test/ref/QuasiExpr.html
+++ b/html-test/ref/QuasiExpr.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >QuasiExpr</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/QuasiQuote.html b/html-test/ref/QuasiQuote.html
index 1349e0c5..dc9c8cc5 100644
--- a/html-test/ref/QuasiQuote.html
+++ b/html-test/ref/QuasiQuote.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >QuasiQuote</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/SpuriousSuperclassConstraints.html b/html-test/ref/SpuriousSuperclassConstraints.html
index d33e56a5..b06300b5 100644
--- a/html-test/ref/SpuriousSuperclassConstraints.html
+++ b/html-test/ref/SpuriousSuperclassConstraints.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >SpuriousSuperclassConstraints</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/TH.html b/html-test/ref/TH.html
index a75089f0..47bdb45e 100644
--- a/html-test/ref/TH.html
+++ b/html-test/ref/TH.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >TH</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/TH2.html b/html-test/ref/TH2.html
index c21c7913..a0c8dd4c 100644
--- a/html-test/ref/TH2.html
+++ b/html-test/ref/TH2.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >TH2</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Table.html b/html-test/ref/Table.html
index a12ee9bc..62e2a5d7 100644
--- a/html-test/ref/Table.html
+++ b/html-test/ref/Table.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Table</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html
index 9b5f1bed..38a70143 100644
--- a/html-test/ref/Test.html
+++ b/html-test/ref/Test.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Test</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Threaded.html b/html-test/ref/Threaded.html
index 3524d6e0..3aa18c08 100644
--- a/html-test/ref/Threaded.html
+++ b/html-test/ref/Threaded.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Threaded</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Threaded_TH.html b/html-test/ref/Threaded_TH.html
index 997bf690..fb9f1ba3 100644
--- a/html-test/ref/Threaded_TH.html
+++ b/html-test/ref/Threaded_TH.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Threaded_TH</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Ticket112.html b/html-test/ref/Ticket112.html
index 21354660..e419b097 100644
--- a/html-test/ref/Ticket112.html
+++ b/html-test/ref/Ticket112.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Ticket112</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Ticket61.html b/html-test/ref/Ticket61.html
index 3f820beb..fee6ea25 100644
--- a/html-test/ref/Ticket61.html
+++ b/html-test/ref/Ticket61.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Ticket61</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Ticket75.html b/html-test/ref/Ticket75.html
index 5990fa1b..45f876c1 100644
--- a/html-test/ref/Ticket75.html
+++ b/html-test/ref/Ticket75.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Ticket75</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/TitledPicture.html b/html-test/ref/TitledPicture.html
index 063211b9..06aa2f52 100644
--- a/html-test/ref/TitledPicture.html
+++ b/html-test/ref/TitledPicture.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >TitledPicture</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/TypeFamilies.html b/html-test/ref/TypeFamilies.html
index b5f4fdab..58b0d41c 100644
--- a/html-test/ref/TypeFamilies.html
+++ b/html-test/ref/TypeFamilies.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >TypeFamilies</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/TypeFamilies2.html b/html-test/ref/TypeFamilies2.html
index 5e891fe4..ef591716 100644
--- a/html-test/ref/TypeFamilies2.html
+++ b/html-test/ref/TypeFamilies2.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >TypeFamilies2</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/TypeOperators.html b/html-test/ref/TypeOperators.html
index e5628628..766e5e36 100644
--- a/html-test/ref/TypeOperators.html
+++ b/html-test/ref/TypeOperators.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >TypeOperators</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Unicode.html b/html-test/ref/Unicode.html
index 1551fa25..34c5d917 100644
--- a/html-test/ref/Unicode.html
+++ b/html-test/ref/Unicode.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Unicode</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
diff --git a/html-test/ref/Visible.html b/html-test/ref/Visible.html
index a9da3b01..fa7f5116 100644
--- a/html-test/ref/Visible.html
+++ b/html-test/ref/Visible.html
@@ -4,7 +4,7 @@
      /><meta name="viewport" content="width=device-width, initial-scale=1"
      /><title
     >Visible</title
-    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="NewOcean"
      /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
-- 
cgit v1.2.3


From 3b9f729f30ec9bc2f4afd45f1d8ffeaaffc394cd Mon Sep 17 00:00:00 2001
From: Nuno Alexandre <nuno@channable.com>
Date: Sat, 21 Apr 2018 17:07:06 +0200
Subject: Update test-suite reference html pages

---
 html-test/ref/A.html                             |  6 +++---
 html-test/ref/B.html                             |  6 +++---
 html-test/ref/Bold.html                          |  6 +++---
 html-test/ref/Bug1.html                          |  6 +++---
 html-test/ref/Bug195.html                        |  6 +++---
 html-test/ref/Bug2.html                          |  6 +++---
 html-test/ref/Bug201.html                        |  6 +++---
 html-test/ref/Bug253.html                        |  6 +++---
 html-test/ref/Bug26.html                         |  6 +++---
 html-test/ref/Bug280.html                        |  6 +++---
 html-test/ref/Bug294.html                        |  6 +++---
 html-test/ref/Bug298.html                        |  6 +++---
 html-test/ref/Bug3.html                          |  6 +++---
 html-test/ref/Bug308.html                        |  6 +++---
 html-test/ref/Bug308CrossModule.html             |  6 +++---
 html-test/ref/Bug310.html                        |  4 ++--
 html-test/ref/Bug313.html                        |  6 +++---
 html-test/ref/Bug335.html                        |  6 +++---
 html-test/ref/Bug387.html                        |  6 +++---
 html-test/ref/Bug4.html                          |  6 +++---
 html-test/ref/Bug458.html                        |  6 +++---
 html-test/ref/Bug546.html                        |  6 +++---
 html-test/ref/Bug548.html                        |  4 ++--
 html-test/ref/Bug6.html                          |  6 +++---
 html-test/ref/Bug613.html                        |  6 +++---
 html-test/ref/Bug647.html                        |  6 +++---
 html-test/ref/Bug679.html                        |  6 +++---
 html-test/ref/Bug7.html                          |  6 +++---
 html-test/ref/Bug8.html                          |  6 +++---
 html-test/ref/Bug85.html                         |  6 +++---
 html-test/ref/BugDeprecated.html                 |  6 +++---
 html-test/ref/BugExportHeadings.html             |  6 +++---
 html-test/ref/Bugs.html                          |  6 +++---
 html-test/ref/BundledPatterns.html               |  6 +++---
 html-test/ref/BundledPatterns2.html              |  6 +++---
 html-test/ref/ConstructorPatternExport.html      |  6 +++---
 html-test/ref/CrossPackageDocs.html              |  4 ++--
 html-test/ref/DeprecatedClass.html               |  6 +++---
 html-test/ref/DeprecatedData.html                |  6 +++---
 html-test/ref/DeprecatedFunction.html            |  6 +++---
 html-test/ref/DeprecatedFunction2.html           |  6 +++---
 html-test/ref/DeprecatedFunction3.html           |  6 +++---
 html-test/ref/DeprecatedModule.html              |  6 +++---
 html-test/ref/DeprecatedModule2.html             |  6 +++---
 html-test/ref/DeprecatedNewtype.html             |  6 +++---
 html-test/ref/DeprecatedReExport.html            |  6 +++---
 html-test/ref/DeprecatedRecord.html              |  6 +++---
 html-test/ref/DeprecatedTypeFamily.html          |  6 +++---
 html-test/ref/DeprecatedTypeSynonym.html         |  6 +++---
 html-test/ref/DuplicateRecordFields.html         |  6 +++---
 html-test/ref/Examples.html                      |  6 +++---
 html-test/ref/Extensions.html                    |  6 +++---
 html-test/ref/FunArgs.html                       |  4 ++--
 html-test/ref/GADTRecords.html                   |  6 +++---
 html-test/ref/Hash.html                          |  6 +++---
 html-test/ref/HiddenInstances.html               |  6 +++---
 html-test/ref/HiddenInstancesB.html              |  6 +++---
 html-test/ref/Hyperlinks.html                    |  6 +++---
 html-test/ref/IgnoreExports.html                 |  6 +++---
 html-test/ref/ImplicitParams.html                |  6 +++---
 html-test/ref/Instances.html                     |  6 +++---
 html-test/ref/Math.html                          |  6 +++---
 html-test/ref/Minimal.html                       |  6 +++---
 html-test/ref/ModuleWithWarning.html             |  6 +++---
 html-test/ref/NamedDoc.html                      |  6 +++---
 html-test/ref/Nesting.html                       |  6 +++---
 html-test/ref/NoLayout.html                      |  6 +++---
 html-test/ref/NonGreedy.html                     |  6 +++---
 html-test/ref/Operators.html                     |  6 +++---
 html-test/ref/OrphanInstances.html               |  6 +++---
 html-test/ref/OrphanInstancesClass.html          |  6 +++---
 html-test/ref/OrphanInstancesType.html           |  6 +++---
 html-test/ref/PR643.html                         |  6 +++---
 html-test/ref/PR643_1.html                       |  6 +++---
 html-test/ref/PatternSyns.html                   |  6 +++---
 html-test/ref/PromotedTypes.html                 |  6 +++---
 html-test/ref/Properties.html                    |  6 +++---
 html-test/ref/PruneWithWarning.html              |  6 +++---
 html-test/ref/QuasiExpr.html                     |  6 +++---
 html-test/ref/QuasiQuote.html                    |  6 +++---
 html-test/ref/SpuriousSuperclassConstraints.html |  6 +++---
 html-test/ref/TH.html                            |  6 +++---
 html-test/ref/TH2.html                           |  6 +++---
 html-test/ref/Table.html                         | 22 +++++++++++-----------
 html-test/ref/Test.html                          |  6 +++---
 html-test/ref/Threaded.html                      |  6 +++---
 html-test/ref/Threaded_TH.html                   |  6 +++---
 html-test/ref/Ticket112.html                     |  6 +++---
 html-test/ref/Ticket61.html                      |  6 +++---
 html-test/ref/Ticket75.html                      |  6 +++---
 html-test/ref/TitledPicture.html                 |  6 +++---
 html-test/ref/TypeFamilies.html                  |  6 +++---
 html-test/ref/TypeFamilies2.html                 |  6 +++---
 html-test/ref/TypeOperators.html                 |  6 +++---
 html-test/ref/Unicode.html                       |  6 +++---
 html-test/ref/Visible.html                       |  6 +++---
 96 files changed, 292 insertions(+), 292 deletions(-)

(limited to 'html-test/ref/SpuriousSuperclassConstraints.html')

diff --git a/html-test/ref/A.html b/html-test/ref/A.html
index ee4dcbef..7fbe05c5 100644
--- a/html-test/ref/A.html
+++ b/html-test/ref/A.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -183,4 +183,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/B.html b/html-test/ref/B.html
index 251486da..4c1506a3 100644
--- a/html-test/ref/B.html
+++ b/html-test/ref/B.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -171,4 +171,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bold.html b/html-test/ref/Bold.html
index 3125f0bc..5d11452e 100644
--- a/html-test/ref/Bold.html
+++ b/html-test/ref/Bold.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -95,4 +95,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug1.html b/html-test/ref/Bug1.html
index 1ae9a1d0..3d989dd5 100644
--- a/html-test/ref/Bug1.html
+++ b/html-test/ref/Bug1.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -98,4 +98,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug195.html b/html-test/ref/Bug195.html
index af192402..ee96e93f 100644
--- a/html-test/ref/Bug195.html
+++ b/html-test/ref/Bug195.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -179,4 +179,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug2.html b/html-test/ref/Bug2.html
index 7e9ef3a5..05818a68 100644
--- a/html-test/ref/Bug2.html
+++ b/html-test/ref/Bug2.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -59,4 +59,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug201.html b/html-test/ref/Bug201.html
index 2d27f27f..920d0e4a 100644
--- a/html-test/ref/Bug201.html
+++ b/html-test/ref/Bug201.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -100,4 +100,4 @@ because there's a space before closing @
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug253.html b/html-test/ref/Bug253.html
index 64ffda7d..ee50bc95 100644
--- a/html-test/ref/Bug253.html
+++ b/html-test/ref/Bug253.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -95,4 +95,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug26.html b/html-test/ref/Bug26.html
index c7de9837..97f69317 100644
--- a/html-test/ref/Bug26.html
+++ b/html-test/ref/Bug26.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -205,4 +205,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug280.html b/html-test/ref/Bug280.html
index a4a6088c..c671e911 100644
--- a/html-test/ref/Bug280.html
+++ b/html-test/ref/Bug280.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -75,4 +75,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug294.html b/html-test/ref/Bug294.html
index be7e4699..528696e6 100644
--- a/html-test/ref/Bug294.html
+++ b/html-test/ref/Bug294.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -361,4 +361,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug298.html b/html-test/ref/Bug298.html
index cda567e8..2ddf6603 100644
--- a/html-test/ref/Bug298.html
+++ b/html-test/ref/Bug298.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -137,4 +137,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug3.html b/html-test/ref/Bug3.html
index 1e9ab3ad..931f5cad 100644
--- a/html-test/ref/Bug3.html
+++ b/html-test/ref/Bug3.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -78,4 +78,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug308.html b/html-test/ref/Bug308.html
index 685440ef..cef834cd 100644
--- a/html-test/ref/Bug308.html
+++ b/html-test/ref/Bug308.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -109,4 +109,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug308CrossModule.html b/html-test/ref/Bug308CrossModule.html
index 0b3e555e..0af0b3ed 100644
--- a/html-test/ref/Bug308CrossModule.html
+++ b/html-test/ref/Bug308CrossModule.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -87,4 +87,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug310.html b/html-test/ref/Bug310.html
index b0967fb6..5dd94b34 100644
--- a/html-test/ref/Bug310.html
+++ b/html-test/ref/Bug310.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
diff --git a/html-test/ref/Bug313.html b/html-test/ref/Bug313.html
index 30844790..bbfc6416 100644
--- a/html-test/ref/Bug313.html
+++ b/html-test/ref/Bug313.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -130,4 +130,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug335.html b/html-test/ref/Bug335.html
index c394b5ad..6f5ba351 100644
--- a/html-test/ref/Bug335.html
+++ b/html-test/ref/Bug335.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -127,4 +127,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug387.html b/html-test/ref/Bug387.html
index cf64c242..ccdeb642 100644
--- a/html-test/ref/Bug387.html
+++ b/html-test/ref/Bug387.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -113,4 +113,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug4.html b/html-test/ref/Bug4.html
index 5b370eed..e42e384b 100644
--- a/html-test/ref/Bug4.html
+++ b/html-test/ref/Bug4.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -77,4 +77,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug458.html b/html-test/ref/Bug458.html
index 8151da61..ea43a8b4 100644
--- a/html-test/ref/Bug458.html
+++ b/html-test/ref/Bug458.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -79,4 +79,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug546.html b/html-test/ref/Bug546.html
index b3cb1105..a56cf672 100644
--- a/html-test/ref/Bug546.html
+++ b/html-test/ref/Bug546.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -272,4 +272,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug548.html b/html-test/ref/Bug548.html
index d63e5afe..8ccd244b 100644
--- a/html-test/ref/Bug548.html
+++ b/html-test/ref/Bug548.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
diff --git a/html-test/ref/Bug6.html b/html-test/ref/Bug6.html
index 47e4f6a1..2790a330 100644
--- a/html-test/ref/Bug6.html
+++ b/html-test/ref/Bug6.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -331,4 +331,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug613.html b/html-test/ref/Bug613.html
index 9718d731..c6876bd3 100644
--- a/html-test/ref/Bug613.html
+++ b/html-test/ref/Bug613.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -271,4 +271,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug647.html b/html-test/ref/Bug647.html
index 56af3429..0f30ff37 100644
--- a/html-test/ref/Bug647.html
+++ b/html-test/ref/Bug647.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -101,4 +101,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug679.html b/html-test/ref/Bug679.html
index d8725c80..d0d0a69d 100644
--- a/html-test/ref/Bug679.html
+++ b/html-test/ref/Bug679.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -195,4 +195,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug7.html b/html-test/ref/Bug7.html
index d8ec9dba..08a87751 100644
--- a/html-test/ref/Bug7.html
+++ b/html-test/ref/Bug7.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -202,4 +202,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug8.html b/html-test/ref/Bug8.html
index 67056ac1..65fcb923 100644
--- a/html-test/ref/Bug8.html
+++ b/html-test/ref/Bug8.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -145,4 +145,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bug85.html b/html-test/ref/Bug85.html
index d595433d..c4217fa1 100644
--- a/html-test/ref/Bug85.html
+++ b/html-test/ref/Bug85.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -133,4 +133,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/BugDeprecated.html b/html-test/ref/BugDeprecated.html
index 2c46d9f7..f7eda6c4 100644
--- a/html-test/ref/BugDeprecated.html
+++ b/html-test/ref/BugDeprecated.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -191,4 +191,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/BugExportHeadings.html b/html-test/ref/BugExportHeadings.html
index d1ecc40d..4c2e822e 100644
--- a/html-test/ref/BugExportHeadings.html
+++ b/html-test/ref/BugExportHeadings.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -223,4 +223,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Bugs.html b/html-test/ref/Bugs.html
index 66589b8b..1e971c79 100644
--- a/html-test/ref/Bugs.html
+++ b/html-test/ref/Bugs.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -75,4 +75,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/BundledPatterns.html b/html-test/ref/BundledPatterns.html
index 00933381..5a5630ca 100644
--- a/html-test/ref/BundledPatterns.html
+++ b/html-test/ref/BundledPatterns.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -455,4 +455,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/BundledPatterns2.html b/html-test/ref/BundledPatterns2.html
index f5ca34d8..e589b4fe 100644
--- a/html-test/ref/BundledPatterns2.html
+++ b/html-test/ref/BundledPatterns2.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -453,4 +453,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/ConstructorPatternExport.html b/html-test/ref/ConstructorPatternExport.html
index 0105fa14..f563331d 100644
--- a/html-test/ref/ConstructorPatternExport.html
+++ b/html-test/ref/ConstructorPatternExport.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -115,4 +115,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/CrossPackageDocs.html b/html-test/ref/CrossPackageDocs.html
index 04f443f0..5dd20c52 100644
--- a/html-test/ref/CrossPackageDocs.html
+++ b/html-test/ref/CrossPackageDocs.html
@@ -15,8 +15,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_CrossPackageDocs.html"
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-    >&nbsp;</div
+    ><span class="caption empty"
+    >&nbsp;</span
     ><ul class="links" id="page-menu"
       ><li
 	><a href=""
diff --git a/html-test/ref/DeprecatedClass.html b/html-test/ref/DeprecatedClass.html
index ac21bbfb..e5c09dde 100644
--- a/html-test/ref/DeprecatedClass.html
+++ b/html-test/ref/DeprecatedClass.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -157,4 +157,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/DeprecatedData.html b/html-test/ref/DeprecatedData.html
index 91935311..d53d3173 100644
--- a/html-test/ref/DeprecatedData.html
+++ b/html-test/ref/DeprecatedData.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -187,4 +187,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/DeprecatedFunction.html b/html-test/ref/DeprecatedFunction.html
index fac1ea06..bba633a1 100644
--- a/html-test/ref/DeprecatedFunction.html
+++ b/html-test/ref/DeprecatedFunction.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -105,4 +105,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/DeprecatedFunction2.html b/html-test/ref/DeprecatedFunction2.html
index ac97846f..c432491f 100644
--- a/html-test/ref/DeprecatedFunction2.html
+++ b/html-test/ref/DeprecatedFunction2.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -79,4 +79,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/DeprecatedFunction3.html b/html-test/ref/DeprecatedFunction3.html
index 3d773c9b..ef36b67c 100644
--- a/html-test/ref/DeprecatedFunction3.html
+++ b/html-test/ref/DeprecatedFunction3.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -79,4 +79,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/DeprecatedModule.html b/html-test/ref/DeprecatedModule.html
index 7d5601fd..b3aa8e63 100644
--- a/html-test/ref/DeprecatedModule.html
+++ b/html-test/ref/DeprecatedModule.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -75,4 +75,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/DeprecatedModule2.html b/html-test/ref/DeprecatedModule2.html
index e5c941cd..a88974a6 100644
--- a/html-test/ref/DeprecatedModule2.html
+++ b/html-test/ref/DeprecatedModule2.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -69,4 +69,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/DeprecatedNewtype.html b/html-test/ref/DeprecatedNewtype.html
index 04a57ab6..cf2558b8 100644
--- a/html-test/ref/DeprecatedNewtype.html
+++ b/html-test/ref/DeprecatedNewtype.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -153,4 +153,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/DeprecatedReExport.html b/html-test/ref/DeprecatedReExport.html
index 2918b59e..9b6bc3f1 100644
--- a/html-test/ref/DeprecatedReExport.html
+++ b/html-test/ref/DeprecatedReExport.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -124,4 +124,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/DeprecatedRecord.html b/html-test/ref/DeprecatedRecord.html
index 8f0bb9c6..9634b651 100644
--- a/html-test/ref/DeprecatedRecord.html
+++ b/html-test/ref/DeprecatedRecord.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -145,4 +145,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/DeprecatedTypeFamily.html b/html-test/ref/DeprecatedTypeFamily.html
index bff1297b..37aee6ff 100644
--- a/html-test/ref/DeprecatedTypeFamily.html
+++ b/html-test/ref/DeprecatedTypeFamily.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -103,4 +103,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/DeprecatedTypeSynonym.html b/html-test/ref/DeprecatedTypeSynonym.html
index 4a080c27..8b2839dc 100644
--- a/html-test/ref/DeprecatedTypeSynonym.html
+++ b/html-test/ref/DeprecatedTypeSynonym.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -111,4 +111,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/DuplicateRecordFields.html b/html-test/ref/DuplicateRecordFields.html
index c8b0d9c8..7fc06af0 100644
--- a/html-test/ref/DuplicateRecordFields.html
+++ b/html-test/ref/DuplicateRecordFields.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -155,4 +155,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Examples.html b/html-test/ref/Examples.html
index a69f9235..d8dfa03d 100644
--- a/html-test/ref/Examples.html
+++ b/html-test/ref/Examples.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -170,4 +170,4 @@ bar
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Extensions.html b/html-test/ref/Extensions.html
index eef4b96f..f9946f3e 100644
--- a/html-test/ref/Extensions.html
+++ b/html-test/ref/Extensions.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -85,4 +85,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/FunArgs.html b/html-test/ref/FunArgs.html
index b6aaa332..409664c5 100644
--- a/html-test/ref/FunArgs.html
+++ b/html-test/ref/FunArgs.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
diff --git a/html-test/ref/GADTRecords.html b/html-test/ref/GADTRecords.html
index 918ec32e..5fd2fa84 100644
--- a/html-test/ref/GADTRecords.html
+++ b/html-test/ref/GADTRecords.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -223,4 +223,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Hash.html b/html-test/ref/Hash.html
index d8c275fa..6c489505 100644
--- a/html-test/ref/Hash.html
+++ b/html-test/ref/Hash.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -430,4 +430,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/HiddenInstances.html b/html-test/ref/HiddenInstances.html
index a640b2c5..3a03d2ba 100644
--- a/html-test/ref/HiddenInstances.html
+++ b/html-test/ref/HiddenInstances.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -313,4 +313,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/HiddenInstancesB.html b/html-test/ref/HiddenInstancesB.html
index f67653c8..f6b4db1e 100644
--- a/html-test/ref/HiddenInstancesB.html
+++ b/html-test/ref/HiddenInstancesB.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -173,4 +173,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Hyperlinks.html b/html-test/ref/Hyperlinks.html
index bf4ca9bf..83728f43 100644
--- a/html-test/ref/Hyperlinks.html
+++ b/html-test/ref/Hyperlinks.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -83,4 +83,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/IgnoreExports.html b/html-test/ref/IgnoreExports.html
index 65262cb0..eed12c00 100644
--- a/html-test/ref/IgnoreExports.html
+++ b/html-test/ref/IgnoreExports.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -97,4 +97,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/ImplicitParams.html b/html-test/ref/ImplicitParams.html
index 807bf3b4..5b5df51f 100644
--- a/html-test/ref/ImplicitParams.html
+++ b/html-test/ref/ImplicitParams.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -111,4 +111,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Instances.html b/html-test/ref/Instances.html
index 30cac06f..e2f16a49 100644
--- a/html-test/ref/Instances.html
+++ b/html-test/ref/Instances.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -2139,4 +2139,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Math.html b/html-test/ref/Math.html
index 26feba6e..892d3e3d 100644
--- a/html-test/ref/Math.html
+++ b/html-test/ref/Math.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -97,4 +97,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Minimal.html b/html-test/ref/Minimal.html
index c425933f..a5e7aa28 100644
--- a/html-test/ref/Minimal.html
+++ b/html-test/ref/Minimal.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -339,4 +339,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/ModuleWithWarning.html b/html-test/ref/ModuleWithWarning.html
index f6ccf578..480f04a4 100644
--- a/html-test/ref/ModuleWithWarning.html
+++ b/html-test/ref/ModuleWithWarning.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -75,4 +75,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/NamedDoc.html b/html-test/ref/NamedDoc.html
index ed0cfa03..e0f7f967 100644
--- a/html-test/ref/NamedDoc.html
+++ b/html-test/ref/NamedDoc.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -61,4 +61,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Nesting.html b/html-test/ref/Nesting.html
index 29657127..b64bd49d 100644
--- a/html-test/ref/Nesting.html
+++ b/html-test/ref/Nesting.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -355,4 +355,4 @@ with more of the indented list content.</p
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/NoLayout.html b/html-test/ref/NoLayout.html
index 1b84596e..b4ce29e2 100644
--- a/html-test/ref/NoLayout.html
+++ b/html-test/ref/NoLayout.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -81,4 +81,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/NonGreedy.html b/html-test/ref/NonGreedy.html
index b4827db9..13fb91c7 100644
--- a/html-test/ref/NonGreedy.html
+++ b/html-test/ref/NonGreedy.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -77,4 +77,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Operators.html b/html-test/ref/Operators.html
index 9467343a..993c7361 100644
--- a/html-test/ref/Operators.html
+++ b/html-test/ref/Operators.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -527,4 +527,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/OrphanInstances.html b/html-test/ref/OrphanInstances.html
index cbd499b5..d0d19e2f 100644
--- a/html-test/ref/OrphanInstances.html
+++ b/html-test/ref/OrphanInstances.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -105,4 +105,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/OrphanInstancesClass.html b/html-test/ref/OrphanInstancesClass.html
index 8bcbee30..04193c50 100644
--- a/html-test/ref/OrphanInstancesClass.html
+++ b/html-test/ref/OrphanInstancesClass.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -125,4 +125,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/OrphanInstancesType.html b/html-test/ref/OrphanInstancesType.html
index e7ea133b..67acfcd5 100644
--- a/html-test/ref/OrphanInstancesType.html
+++ b/html-test/ref/OrphanInstancesType.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -127,4 +127,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/PR643.html b/html-test/ref/PR643.html
index 1e70859f..ecd39632 100644
--- a/html-test/ref/PR643.html
+++ b/html-test/ref/PR643.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -77,4 +77,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/PR643_1.html b/html-test/ref/PR643_1.html
index 98def13c..c85dddd1 100644
--- a/html-test/ref/PR643_1.html
+++ b/html-test/ref/PR643_1.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -77,4 +77,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/PatternSyns.html b/html-test/ref/PatternSyns.html
index edc4842f..7812ff17 100644
--- a/html-test/ref/PatternSyns.html
+++ b/html-test/ref/PatternSyns.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -386,4 +386,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/PromotedTypes.html b/html-test/ref/PromotedTypes.html
index f36bb227..4e15da63 100644
--- a/html-test/ref/PromotedTypes.html
+++ b/html-test/ref/PromotedTypes.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -201,4 +201,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Properties.html b/html-test/ref/Properties.html
index 62701755..f4709e43 100644
--- a/html-test/ref/Properties.html
+++ b/html-test/ref/Properties.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -87,4 +87,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/PruneWithWarning.html b/html-test/ref/PruneWithWarning.html
index abfc1362..9b231a36 100644
--- a/html-test/ref/PruneWithWarning.html
+++ b/html-test/ref/PruneWithWarning.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -62,4 +62,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/QuasiExpr.html b/html-test/ref/QuasiExpr.html
index e008ccd2..88f1b92c 100644
--- a/html-test/ref/QuasiExpr.html
+++ b/html-test/ref/QuasiExpr.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -337,4 +337,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/QuasiQuote.html b/html-test/ref/QuasiQuote.html
index dc9c8cc5..15cb848a 100644
--- a/html-test/ref/QuasiQuote.html
+++ b/html-test/ref/QuasiQuote.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -59,4 +59,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/SpuriousSuperclassConstraints.html b/html-test/ref/SpuriousSuperclassConstraints.html
index b06300b5..17c026d1 100644
--- a/html-test/ref/SpuriousSuperclassConstraints.html
+++ b/html-test/ref/SpuriousSuperclassConstraints.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -235,4 +235,4 @@ Fix spurious superclass constraints bug.</pre
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/TH.html b/html-test/ref/TH.html
index 47bdb45e..2c74cbb0 100644
--- a/html-test/ref/TH.html
+++ b/html-test/ref/TH.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -61,4 +61,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/TH2.html b/html-test/ref/TH2.html
index a0c8dd4c..897f73b9 100644
--- a/html-test/ref/TH2.html
+++ b/html-test/ref/TH2.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -57,4 +57,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Table.html b/html-test/ref/Table.html
index 62e2a5d7..462f7ca5 100644
--- a/html-test/ref/Table.html
+++ b/html-test/ref/Table.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -177,16 +177,16 @@
 	    ><thead
 	      ><tr
 		><th
-		  > Header row, column 1   
+		  > Header row, column 1
  (header rows optional) </th
 		  ><th
-		  > Header 2   
+		  > Header 2
             </th
 		  ><th
-		  > Header 3 
+		  > Header 3
           </th
 		  ><th
-		  > Header 4 
+		  > Header 4
           </th
 		  ></tr
 		></thead
@@ -215,12 +215,12 @@
 		><td
 		  > body row 3             </td
 		  ><td rowspan="2"
-		  > Cells may  
- span rows. 
+		  > Cells may
+ span rows.
             </td
 		  ><td colspan="2" rowspan="2"
-		  > \[                  
- f(n) = \sum_{i=1}   
+		  > \[
+ f(n) = \sum_{i=1}
  \]                  </td
 		  ></tr
 		><tr
@@ -237,4 +237,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html
index 38a70143..5cdee91e 100644
--- a/html-test/ref/Test.html
+++ b/html-test/ref/Test.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -2393,4 +2393,4 @@ is at the beginning of the line).</pre
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Threaded.html b/html-test/ref/Threaded.html
index 3aa18c08..347c725b 100644
--- a/html-test/ref/Threaded.html
+++ b/html-test/ref/Threaded.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -90,4 +90,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Threaded_TH.html b/html-test/ref/Threaded_TH.html
index fb9f1ba3..257b6b99 100644
--- a/html-test/ref/Threaded_TH.html
+++ b/html-test/ref/Threaded_TH.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -95,4 +95,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Ticket112.html b/html-test/ref/Ticket112.html
index e419b097..0c972de6 100644
--- a/html-test/ref/Ticket112.html
+++ b/html-test/ref/Ticket112.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -77,4 +77,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Ticket61.html b/html-test/ref/Ticket61.html
index fee6ea25..a16e30bf 100644
--- a/html-test/ref/Ticket61.html
+++ b/html-test/ref/Ticket61.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -75,4 +75,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Ticket75.html b/html-test/ref/Ticket75.html
index 45f876c1..f2e0ef7a 100644
--- a/html-test/ref/Ticket75.html
+++ b/html-test/ref/Ticket75.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -113,4 +113,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/TitledPicture.html b/html-test/ref/TitledPicture.html
index 06aa2f52..8880e3c9 100644
--- a/html-test/ref/TitledPicture.html
+++ b/html-test/ref/TitledPicture.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -107,4 +107,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/TypeFamilies.html b/html-test/ref/TypeFamilies.html
index 58b0d41c..35f9e542 100644
--- a/html-test/ref/TypeFamilies.html
+++ b/html-test/ref/TypeFamilies.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -1933,4 +1933,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/TypeFamilies2.html b/html-test/ref/TypeFamilies2.html
index ef591716..4c6fcc74 100644
--- a/html-test/ref/TypeFamilies2.html
+++ b/html-test/ref/TypeFamilies2.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -385,4 +385,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/TypeOperators.html b/html-test/ref/TypeOperators.html
index 766e5e36..b467e372 100644
--- a/html-test/ref/TypeOperators.html
+++ b/html-test/ref/TypeOperators.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -185,4 +185,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Unicode.html b/html-test/ref/Unicode.html
index 34c5d917..b5082ffc 100644
--- a/html-test/ref/Unicode.html
+++ b/html-test/ref/Unicode.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -77,4 +77,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
diff --git a/html-test/ref/Visible.html b/html-test/ref/Visible.html
index fa7f5116..97b64796 100644
--- a/html-test/ref/Visible.html
+++ b/html-test/ref/Visible.html
@@ -14,8 +14,8 @@
     ></head
   ><body
   ><div id="package-header"
-    ><div class="caption empty"
-      ></div
+    ><span class="caption empty"
+      ></span
       ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
@@ -61,4 +61,4 @@
     ></div
     ></body
   ></html
->
\ No newline at end of file
+>
-- 
cgit v1.2.3


From 8a491e437f1c8379b66a420f8584c1761b45aa7e Mon Sep 17 00:00:00 2001
From: Alec Theriault <alec.theriault@gmail.com>
Date: Mon, 5 Nov 2018 13:58:11 -0800
Subject: Only run MathJax on entities with "mathjax" class (#960)

Correspondingly, we wrap all inline/diplay math in

    <span class="mathjax"> ... the math .... </span>

This fixes #959.
---
 haddock-api/src/Haddock/Backends/Xhtml.hs          | 24 ++++++++++++++--------
 .../src/Haddock/Backends/Xhtml/DocMarkup.hs        |  4 ++--
 html-test/ref/A.html                               |  4 +++-
 html-test/ref/Bold.html                            |  4 +++-
 html-test/ref/Bug1.html                            |  4 +++-
 html-test/ref/Bug195.html                          |  4 +++-
 html-test/ref/Bug2.html                            |  4 +++-
 html-test/ref/Bug201.html                          |  4 +++-
 html-test/ref/Bug253.html                          |  4 +++-
 html-test/ref/Bug26.html                           |  4 +++-
 html-test/ref/Bug280.html                          |  4 +++-
 html-test/ref/Bug294.html                          |  4 +++-
 html-test/ref/Bug298.html                          |  4 +++-
 html-test/ref/Bug3.html                            |  4 +++-
 html-test/ref/Bug308.html                          |  4 +++-
 html-test/ref/Bug308CrossModule.html               |  4 +++-
 html-test/ref/Bug310.html                          |  4 +++-
 html-test/ref/Bug313.html                          |  4 +++-
 html-test/ref/Bug335.html                          |  4 +++-
 html-test/ref/Bug387.html                          |  4 +++-
 html-test/ref/Bug4.html                            |  4 +++-
 html-test/ref/Bug458.html                          |  4 +++-
 html-test/ref/Bug546.html                          |  4 +++-
 html-test/ref/Bug548.html                          |  4 +++-
 html-test/ref/Bug574.html                          |  4 +++-
 html-test/ref/Bug6.html                            |  4 +++-
 html-test/ref/Bug613.html                          |  4 +++-
 html-test/ref/Bug647.html                          |  4 +++-
 html-test/ref/Bug679.html                          |  4 +++-
 html-test/ref/Bug7.html                            |  4 +++-
 html-test/ref/Bug8.html                            |  4 +++-
 html-test/ref/Bug85.html                           |  4 +++-
 html-test/ref/Bug953.html                          |  4 +++-
 html-test/ref/BugDeprecated.html                   |  4 +++-
 html-test/ref/BugExportHeadings.html               |  4 +++-
 html-test/ref/Bugs.html                            |  4 +++-
 html-test/ref/BundledPatterns.html                 |  4 +++-
 html-test/ref/BundledPatterns2.html                |  4 +++-
 html-test/ref/ConstructorArgs.html                 |  4 +++-
 html-test/ref/ConstructorPatternExport.html        |  4 +++-
 html-test/ref/DeprecatedClass.html                 |  4 +++-
 html-test/ref/DeprecatedData.html                  |  4 +++-
 html-test/ref/DeprecatedFunction.html              |  4 +++-
 html-test/ref/DeprecatedFunction2.html             |  4 +++-
 html-test/ref/DeprecatedFunction3.html             |  4 +++-
 html-test/ref/DeprecatedModule.html                |  4 +++-
 html-test/ref/DeprecatedModule2.html               |  4 +++-
 html-test/ref/DeprecatedNewtype.html               |  4 +++-
 html-test/ref/DeprecatedReExport.html              |  4 +++-
 html-test/ref/DeprecatedRecord.html                |  4 +++-
 html-test/ref/DeprecatedTypeFamily.html            |  4 +++-
 html-test/ref/DeprecatedTypeSynonym.html           |  4 +++-
 html-test/ref/DuplicateRecordFields.html           |  4 +++-
 html-test/ref/Examples.html                        |  4 +++-
 html-test/ref/Extensions.html                      |  4 +++-
 html-test/ref/FunArgs.html                         |  4 +++-
 html-test/ref/GADTRecords.html                     |  4 +++-
 html-test/ref/GadtConstructorArgs.html             |  4 +++-
 html-test/ref/Hash.html                            |  4 +++-
 html-test/ref/HiddenInstances.html                 |  4 +++-
 html-test/ref/HiddenInstancesB.html                |  4 +++-
 html-test/ref/Hyperlinks.html                      |  4 +++-
 html-test/ref/ImplicitParams.html                  |  4 +++-
 html-test/ref/Instances.html                       |  4 +++-
 html-test/ref/Math.html                            | 22 ++++++++++++++------
 html-test/ref/Minimal.html                         |  4 +++-
 html-test/ref/ModuleWithWarning.html               |  4 +++-
 html-test/ref/NamedDoc.html                        |  4 +++-
 html-test/ref/Nesting.html                         |  4 +++-
 html-test/ref/NoLayout.html                        |  4 +++-
 html-test/ref/NonGreedy.html                       |  4 +++-
 html-test/ref/Operators.html                       |  4 +++-
 html-test/ref/OrphanInstances.html                 |  4 +++-
 html-test/ref/OrphanInstancesClass.html            |  4 +++-
 html-test/ref/OrphanInstancesType.html             |  4 +++-
 html-test/ref/PR643.html                           |  4 +++-
 html-test/ref/PR643_1.html                         |  4 +++-
 html-test/ref/PatternSyns.html                     |  4 +++-
 html-test/ref/PromotedTypes.html                   |  4 +++-
 html-test/ref/Properties.html                      |  4 +++-
 html-test/ref/PruneWithWarning.html                |  4 +++-
 html-test/ref/QuantifiedConstraints.html           |  4 +++-
 html-test/ref/QuasiExpr.html                       |  4 +++-
 html-test/ref/QuasiQuote.html                      |  4 +++-
 html-test/ref/SpuriousSuperclassConstraints.html   |  4 +++-
 html-test/ref/TH.html                              |  4 +++-
 html-test/ref/TH2.html                             |  4 +++-
 html-test/ref/Table.html                           | 10 ++++++---
 html-test/ref/Test.html                            |  4 +++-
 html-test/ref/Threaded.html                        |  4 +++-
 html-test/ref/Threaded_TH.html                     |  4 +++-
 html-test/ref/Ticket112.html                       |  4 +++-
 html-test/ref/Ticket61.html                        |  4 +++-
 html-test/ref/Ticket75.html                        |  4 +++-
 html-test/ref/TitledPicture.html                   |  4 +++-
 html-test/ref/TypeFamilies.html                    |  4 +++-
 html-test/ref/TypeFamilies2.html                   |  4 +++-
 html-test/ref/TypeFamilies3.html                   |  4 +++-
 html-test/ref/TypeOperators.html                   |  4 +++-
 html-test/ref/Unicode.html                         |  4 +++-
 html-test/ref/Unicode2.html                        |  4 +++-
 html-test/ref/Visible.html                         |  4 +++-
 102 files changed, 334 insertions(+), 118 deletions(-)

(limited to 'html-test/ref/SpuriousSuperclassConstraints.html')

diff --git a/haddock-api/src/Haddock/Backends/Xhtml.hs b/haddock-api/src/Haddock/Backends/Xhtml.hs
index 6da6a2e8..0a11ca08 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml.hs
@@ -120,17 +120,23 @@ copyHtmlBits odir libdir themes withQuickjump = do
 
 headHtml :: String -> Themes -> Maybe String -> Html
 headHtml docTitle themes mathjax_url =
-  header << [
-    meta ! [httpequiv "Content-Type", content "text/html; charset=UTF-8"],
-    thetitle << docTitle,
-    styleSheet themes,
-    thelink ! [ rel "stylesheet", thetype "text/css", href quickJumpCssFile] << noHtml,
-    script ! [src haddockJsFile, emptyAttr "async", thetype "text/javascript"] << noHtml,
-    script ! [src mjUrl, thetype "text/javascript"] << noHtml
+  header <<
+    [ meta ! [httpequiv "Content-Type", content "text/html; charset=UTF-8"]
+    , thetitle << docTitle
+    , styleSheet themes
+    , thelink ! [ rel "stylesheet", thetype "text/css", href quickJumpCssFile] << noHtml
+    , script ! [src haddockJsFile, emptyAttr "async", thetype "text/javascript"] << noHtml
+    , script ! [thetype "text/x-mathjax-config"] << primHtml mjConf
+    , script ! [src mjUrl, thetype "text/javascript"] << noHtml
     ]
   where
-    mjUrl = maybe "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" id mathjax_url
-
+    mjUrl = maybe "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" id mathjax_url
+    mjConf = unwords [ "MathJax.Hub.Config({"
+                     ,   "tex2jax: {"
+                     ,     "processClass: \"mathjax\","
+                     ,     "ignoreClass: \".*\""
+                     ,   "}"
+                     , "});" ]
 
 srcButton :: SourceURLs -> Maybe Interface -> Maybe Html
 srcButton (Just src_base_url, _, _, _) Nothing =
diff --git a/haddock-api/src/Haddock/Backends/Xhtml/DocMarkup.hs b/haddock-api/src/Haddock/Backends/Xhtml/DocMarkup.hs
index ed323a90..38aa7b7e 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml/DocMarkup.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/DocMarkup.hs
@@ -69,8 +69,8 @@ parHtmlMarkup qual insertAnchors ppId = Markup {
                                   then namedAnchor aname << ""
                                   else noHtml,
   markupPic                  = \(Picture uri t) -> image ! ([src uri] ++ fromMaybe [] (return . title <$> t)),
-  markupMathInline           = \mathjax -> toHtml ("\\(" ++ mathjax ++ "\\)"),
-  markupMathDisplay          = \mathjax -> toHtml ("\\[" ++ mathjax ++ "\\]"),
+  markupMathInline           = \mathjax -> thespan ! [theclass "mathjax"] << toHtml ("\\(" ++ mathjax ++ "\\)"),
+  markupMathDisplay          = \mathjax -> thespan ! [theclass "mathjax"] << toHtml ("\\[" ++ mathjax ++ "\\]"),
   markupProperty             = pre . toHtml,
   markupExample              = examplesToHtml,
   markupHeader               = \(Header l t) -> makeHeader l t,
diff --git a/html-test/ref/A.html b/html-test/ref/A.html
index e4802966..75fbb9ed 100644
--- a/html-test/ref/A.html
+++ b/html-test/ref/A.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bold.html b/html-test/ref/Bold.html
index 112d7aca..f2adb7bf 100644
--- a/html-test/ref/Bold.html
+++ b/html-test/ref/Bold.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug1.html b/html-test/ref/Bug1.html
index d5f9052e..0107cd7e 100644
--- a/html-test/ref/Bug1.html
+++ b/html-test/ref/Bug1.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug195.html b/html-test/ref/Bug195.html
index 17e2e074..68b37fb2 100644
--- a/html-test/ref/Bug195.html
+++ b/html-test/ref/Bug195.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug2.html b/html-test/ref/Bug2.html
index d2d0efd9..73cbbc20 100644
--- a/html-test/ref/Bug2.html
+++ b/html-test/ref/Bug2.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug201.html b/html-test/ref/Bug201.html
index 288a9499..2c127383 100644
--- a/html-test/ref/Bug201.html
+++ b/html-test/ref/Bug201.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug253.html b/html-test/ref/Bug253.html
index 57b1b164..04b442bc 100644
--- a/html-test/ref/Bug253.html
+++ b/html-test/ref/Bug253.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug26.html b/html-test/ref/Bug26.html
index a363fef3..d77e952a 100644
--- a/html-test/ref/Bug26.html
+++ b/html-test/ref/Bug26.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug280.html b/html-test/ref/Bug280.html
index d37fc11f..3229380a 100644
--- a/html-test/ref/Bug280.html
+++ b/html-test/ref/Bug280.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug294.html b/html-test/ref/Bug294.html
index 790c1894..2b432004 100644
--- a/html-test/ref/Bug294.html
+++ b/html-test/ref/Bug294.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug298.html b/html-test/ref/Bug298.html
index 94cb1533..575a2dd7 100644
--- a/html-test/ref/Bug298.html
+++ b/html-test/ref/Bug298.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug3.html b/html-test/ref/Bug3.html
index 3c4b905c..c064a18f 100644
--- a/html-test/ref/Bug3.html
+++ b/html-test/ref/Bug3.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug308.html b/html-test/ref/Bug308.html
index b2d88452..1fb8ad4a 100644
--- a/html-test/ref/Bug308.html
+++ b/html-test/ref/Bug308.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug308CrossModule.html b/html-test/ref/Bug308CrossModule.html
index acd10424..ea1cd0fb 100644
--- a/html-test/ref/Bug308CrossModule.html
+++ b/html-test/ref/Bug308CrossModule.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug310.html b/html-test/ref/Bug310.html
index 8fef21a6..17667054 100644
--- a/html-test/ref/Bug310.html
+++ b/html-test/ref/Bug310.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug313.html b/html-test/ref/Bug313.html
index 17a39600..b7ac001c 100644
--- a/html-test/ref/Bug313.html
+++ b/html-test/ref/Bug313.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug335.html b/html-test/ref/Bug335.html
index f2185045..8a582373 100644
--- a/html-test/ref/Bug335.html
+++ b/html-test/ref/Bug335.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug387.html b/html-test/ref/Bug387.html
index ba2f5c91..2691b416 100644
--- a/html-test/ref/Bug387.html
+++ b/html-test/ref/Bug387.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug4.html b/html-test/ref/Bug4.html
index 6afd37fe..61aa8da9 100644
--- a/html-test/ref/Bug4.html
+++ b/html-test/ref/Bug4.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug458.html b/html-test/ref/Bug458.html
index f716d7d6..fd46a9ca 100644
--- a/html-test/ref/Bug458.html
+++ b/html-test/ref/Bug458.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug546.html b/html-test/ref/Bug546.html
index 221f7b6c..40affb34 100644
--- a/html-test/ref/Bug546.html
+++ b/html-test/ref/Bug546.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug548.html b/html-test/ref/Bug548.html
index b690b8ad..f527bb75 100644
--- a/html-test/ref/Bug548.html
+++ b/html-test/ref/Bug548.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug574.html b/html-test/ref/Bug574.html
index ed0a5e15..875cf094 100644
--- a/html-test/ref/Bug574.html
+++ b/html-test/ref/Bug574.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug6.html b/html-test/ref/Bug6.html
index 15842547..d9b59297 100644
--- a/html-test/ref/Bug6.html
+++ b/html-test/ref/Bug6.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug613.html b/html-test/ref/Bug613.html
index 71e30832..a6b01621 100644
--- a/html-test/ref/Bug613.html
+++ b/html-test/ref/Bug613.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug647.html b/html-test/ref/Bug647.html
index 0928c1ec..16b2a191 100644
--- a/html-test/ref/Bug647.html
+++ b/html-test/ref/Bug647.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug679.html b/html-test/ref/Bug679.html
index 71eb9360..de559436 100644
--- a/html-test/ref/Bug679.html
+++ b/html-test/ref/Bug679.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug7.html b/html-test/ref/Bug7.html
index 26a8e7a3..87b490ca 100644
--- a/html-test/ref/Bug7.html
+++ b/html-test/ref/Bug7.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug8.html b/html-test/ref/Bug8.html
index 9de7cca6..481e7c6a 100644
--- a/html-test/ref/Bug8.html
+++ b/html-test/ref/Bug8.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug85.html b/html-test/ref/Bug85.html
index bf7e1465..ed2dd098 100644
--- a/html-test/ref/Bug85.html
+++ b/html-test/ref/Bug85.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bug953.html b/html-test/ref/Bug953.html
index 40b0f6a1..6d5665c0 100644
--- a/html-test/ref/Bug953.html
+++ b/html-test/ref/Bug953.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/BugDeprecated.html b/html-test/ref/BugDeprecated.html
index 4efe3da2..fe5cd6a3 100644
--- a/html-test/ref/BugDeprecated.html
+++ b/html-test/ref/BugDeprecated.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/BugExportHeadings.html b/html-test/ref/BugExportHeadings.html
index 78af3351..18f20ae5 100644
--- a/html-test/ref/BugExportHeadings.html
+++ b/html-test/ref/BugExportHeadings.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Bugs.html b/html-test/ref/Bugs.html
index abe20dc2..ebc37a91 100644
--- a/html-test/ref/Bugs.html
+++ b/html-test/ref/Bugs.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/BundledPatterns.html b/html-test/ref/BundledPatterns.html
index e9c77612..0fc95001 100644
--- a/html-test/ref/BundledPatterns.html
+++ b/html-test/ref/BundledPatterns.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/BundledPatterns2.html b/html-test/ref/BundledPatterns2.html
index 2f456728..973d862e 100644
--- a/html-test/ref/BundledPatterns2.html
+++ b/html-test/ref/BundledPatterns2.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/ConstructorArgs.html b/html-test/ref/ConstructorArgs.html
index 9aad9c86..371f7e00 100644
--- a/html-test/ref/ConstructorArgs.html
+++ b/html-test/ref/ConstructorArgs.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/ConstructorPatternExport.html b/html-test/ref/ConstructorPatternExport.html
index 6f091de7..b4bee68c 100644
--- a/html-test/ref/ConstructorPatternExport.html
+++ b/html-test/ref/ConstructorPatternExport.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/DeprecatedClass.html b/html-test/ref/DeprecatedClass.html
index 55abc489..04086251 100644
--- a/html-test/ref/DeprecatedClass.html
+++ b/html-test/ref/DeprecatedClass.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/DeprecatedData.html b/html-test/ref/DeprecatedData.html
index 2caed880..23ed7a05 100644
--- a/html-test/ref/DeprecatedData.html
+++ b/html-test/ref/DeprecatedData.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/DeprecatedFunction.html b/html-test/ref/DeprecatedFunction.html
index b43526ba..eddfa959 100644
--- a/html-test/ref/DeprecatedFunction.html
+++ b/html-test/ref/DeprecatedFunction.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/DeprecatedFunction2.html b/html-test/ref/DeprecatedFunction2.html
index db0098b2..bbcc8186 100644
--- a/html-test/ref/DeprecatedFunction2.html
+++ b/html-test/ref/DeprecatedFunction2.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/DeprecatedFunction3.html b/html-test/ref/DeprecatedFunction3.html
index 950c5203..f082f31d 100644
--- a/html-test/ref/DeprecatedFunction3.html
+++ b/html-test/ref/DeprecatedFunction3.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/DeprecatedModule.html b/html-test/ref/DeprecatedModule.html
index 91150577..65a806ff 100644
--- a/html-test/ref/DeprecatedModule.html
+++ b/html-test/ref/DeprecatedModule.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/DeprecatedModule2.html b/html-test/ref/DeprecatedModule2.html
index 6688781f..e9ea3743 100644
--- a/html-test/ref/DeprecatedModule2.html
+++ b/html-test/ref/DeprecatedModule2.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/DeprecatedNewtype.html b/html-test/ref/DeprecatedNewtype.html
index 8158f61d..5641bc85 100644
--- a/html-test/ref/DeprecatedNewtype.html
+++ b/html-test/ref/DeprecatedNewtype.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/DeprecatedReExport.html b/html-test/ref/DeprecatedReExport.html
index f2bbb766..039a5a98 100644
--- a/html-test/ref/DeprecatedReExport.html
+++ b/html-test/ref/DeprecatedReExport.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/DeprecatedRecord.html b/html-test/ref/DeprecatedRecord.html
index c2de1538..1c22e137 100644
--- a/html-test/ref/DeprecatedRecord.html
+++ b/html-test/ref/DeprecatedRecord.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/DeprecatedTypeFamily.html b/html-test/ref/DeprecatedTypeFamily.html
index dab7683d..3e215e90 100644
--- a/html-test/ref/DeprecatedTypeFamily.html
+++ b/html-test/ref/DeprecatedTypeFamily.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/DeprecatedTypeSynonym.html b/html-test/ref/DeprecatedTypeSynonym.html
index fcb7f5ce..ac52217e 100644
--- a/html-test/ref/DeprecatedTypeSynonym.html
+++ b/html-test/ref/DeprecatedTypeSynonym.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/DuplicateRecordFields.html b/html-test/ref/DuplicateRecordFields.html
index 47b14a41..824c2c8e 100644
--- a/html-test/ref/DuplicateRecordFields.html
+++ b/html-test/ref/DuplicateRecordFields.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Examples.html b/html-test/ref/Examples.html
index 77a341f0..f72b0857 100644
--- a/html-test/ref/Examples.html
+++ b/html-test/ref/Examples.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Extensions.html b/html-test/ref/Extensions.html
index ee84df30..0e3d7fc3 100644
--- a/html-test/ref/Extensions.html
+++ b/html-test/ref/Extensions.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/FunArgs.html b/html-test/ref/FunArgs.html
index 97c9a3c5..62efeae9 100644
--- a/html-test/ref/FunArgs.html
+++ b/html-test/ref/FunArgs.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/GADTRecords.html b/html-test/ref/GADTRecords.html
index 5f6141db..939b5cb2 100644
--- a/html-test/ref/GADTRecords.html
+++ b/html-test/ref/GADTRecords.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/GadtConstructorArgs.html b/html-test/ref/GadtConstructorArgs.html
index 7497de83..99b675c5 100644
--- a/html-test/ref/GadtConstructorArgs.html
+++ b/html-test/ref/GadtConstructorArgs.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Hash.html b/html-test/ref/Hash.html
index 8fd04bb4..9aa81b5b 100644
--- a/html-test/ref/Hash.html
+++ b/html-test/ref/Hash.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/HiddenInstances.html b/html-test/ref/HiddenInstances.html
index 9594d8e1..addaf91f 100644
--- a/html-test/ref/HiddenInstances.html
+++ b/html-test/ref/HiddenInstances.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/HiddenInstancesB.html b/html-test/ref/HiddenInstancesB.html
index 5b69947e..a8828e13 100644
--- a/html-test/ref/HiddenInstancesB.html
+++ b/html-test/ref/HiddenInstancesB.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Hyperlinks.html b/html-test/ref/Hyperlinks.html
index f331e741..4a0544eb 100644
--- a/html-test/ref/Hyperlinks.html
+++ b/html-test/ref/Hyperlinks.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/ImplicitParams.html b/html-test/ref/ImplicitParams.html
index eb8456ae..e98a8561 100644
--- a/html-test/ref/ImplicitParams.html
+++ b/html-test/ref/ImplicitParams.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Instances.html b/html-test/ref/Instances.html
index a23f9eb9..d7cf3102 100644
--- a/html-test/ref/Instances.html
+++ b/html-test/ref/Instances.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Math.html b/html-test/ref/Math.html
index 71079bdd..bb3fbca0 100644
--- a/html-test/ref/Math.html
+++ b/html-test/ref/Math.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
@@ -47,11 +49,15 @@
 	    >normalDensity</code
 	    ></p
 	  ><p
-	  >\[
+	  ><span class="mathjax"
+	    >\[
  \int_{-\infty}^{\infty} e^{-x^2/2} = \sqrt{2\pi}
- \]</p
+ \]</span
+	    ></p
 	  ><p
-	  >\(\int_{-\infty}^{\infty} e^{-x^2/2} = \sqrt{2\pi}\)</p
+	  ><span class="mathjax"
+	    >\(\int_{-\infty}^{\infty} e^{-x^2/2} = \sqrt{2\pi}\)</span
+	    ></p
 	  ></div
 	></div
       ><div id="synopsis"
@@ -85,8 +91,12 @@
 	    >Math (inline) for <code
 	      >normalDensity</code
 	      >
- \(\int_{-\infty}^{\infty} e^{-x^2/2} = \sqrt{2\pi}\)
- \[\int_{-\infty}^{\infty} e^{-x^2/2} = \sqrt{2\pi}\]</p
+ <span class="mathjax"
+	      >\(\int_{-\infty}^{\infty} e^{-x^2/2} = \sqrt{2\pi}\)</span
+	      >
+ <span class="mathjax"
+	      >\[\int_{-\infty}^{\infty} e^{-x^2/2} = \sqrt{2\pi}\]</span
+	      ></p
 	    ></div
 	  ></div
 	></div
diff --git a/html-test/ref/Minimal.html b/html-test/ref/Minimal.html
index bc2da115..cf1e45f4 100644
--- a/html-test/ref/Minimal.html
+++ b/html-test/ref/Minimal.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/ModuleWithWarning.html b/html-test/ref/ModuleWithWarning.html
index 7a045575..572e35fe 100644
--- a/html-test/ref/ModuleWithWarning.html
+++ b/html-test/ref/ModuleWithWarning.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/NamedDoc.html b/html-test/ref/NamedDoc.html
index ece4f381..47c6f81d 100644
--- a/html-test/ref/NamedDoc.html
+++ b/html-test/ref/NamedDoc.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Nesting.html b/html-test/ref/Nesting.html
index 76993674..0bc59ad8 100644
--- a/html-test/ref/Nesting.html
+++ b/html-test/ref/Nesting.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/NoLayout.html b/html-test/ref/NoLayout.html
index a92d1a34..20fa4ad0 100644
--- a/html-test/ref/NoLayout.html
+++ b/html-test/ref/NoLayout.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/NonGreedy.html b/html-test/ref/NonGreedy.html
index cc03a20b..1a3c21ac 100644
--- a/html-test/ref/NonGreedy.html
+++ b/html-test/ref/NonGreedy.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Operators.html b/html-test/ref/Operators.html
index d01038a3..9e8db7d7 100644
--- a/html-test/ref/Operators.html
+++ b/html-test/ref/Operators.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/OrphanInstances.html b/html-test/ref/OrphanInstances.html
index 16ac16d6..4176a97b 100644
--- a/html-test/ref/OrphanInstances.html
+++ b/html-test/ref/OrphanInstances.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/OrphanInstancesClass.html b/html-test/ref/OrphanInstancesClass.html
index 81651e18..113e1e68 100644
--- a/html-test/ref/OrphanInstancesClass.html
+++ b/html-test/ref/OrphanInstancesClass.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/OrphanInstancesType.html b/html-test/ref/OrphanInstancesType.html
index ddb85534..3a771df3 100644
--- a/html-test/ref/OrphanInstancesType.html
+++ b/html-test/ref/OrphanInstancesType.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/PR643.html b/html-test/ref/PR643.html
index 6fe27318..1aa44d67 100644
--- a/html-test/ref/PR643.html
+++ b/html-test/ref/PR643.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/PR643_1.html b/html-test/ref/PR643_1.html
index ecba8866..7046bc2b 100644
--- a/html-test/ref/PR643_1.html
+++ b/html-test/ref/PR643_1.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/PatternSyns.html b/html-test/ref/PatternSyns.html
index 19c1fecf..b89c5d61 100644
--- a/html-test/ref/PatternSyns.html
+++ b/html-test/ref/PatternSyns.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/PromotedTypes.html b/html-test/ref/PromotedTypes.html
index 712dde5c..5f472590 100644
--- a/html-test/ref/PromotedTypes.html
+++ b/html-test/ref/PromotedTypes.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Properties.html b/html-test/ref/Properties.html
index daabe6c4..c874339f 100644
--- a/html-test/ref/Properties.html
+++ b/html-test/ref/Properties.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/PruneWithWarning.html b/html-test/ref/PruneWithWarning.html
index 4286831c..09e93fb1 100644
--- a/html-test/ref/PruneWithWarning.html
+++ b/html-test/ref/PruneWithWarning.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/QuantifiedConstraints.html b/html-test/ref/QuantifiedConstraints.html
index fa2c18ec..cfd2c9e3 100644
--- a/html-test/ref/QuantifiedConstraints.html
+++ b/html-test/ref/QuantifiedConstraints.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/QuasiExpr.html b/html-test/ref/QuasiExpr.html
index dfded323..b5028635 100644
--- a/html-test/ref/QuasiExpr.html
+++ b/html-test/ref/QuasiExpr.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/QuasiQuote.html b/html-test/ref/QuasiQuote.html
index c73250b8..fb3b4d21 100644
--- a/html-test/ref/QuasiQuote.html
+++ b/html-test/ref/QuasiQuote.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/SpuriousSuperclassConstraints.html b/html-test/ref/SpuriousSuperclassConstraints.html
index 47dfd6cd..3bf7945e 100644
--- a/html-test/ref/SpuriousSuperclassConstraints.html
+++ b/html-test/ref/SpuriousSuperclassConstraints.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/TH.html b/html-test/ref/TH.html
index a35204ff..98d8934e 100644
--- a/html-test/ref/TH.html
+++ b/html-test/ref/TH.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/TH2.html b/html-test/ref/TH2.html
index b0d5dc64..5f8ee652 100644
--- a/html-test/ref/TH2.html
+++ b/html-test/ref/TH2.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Table.html b/html-test/ref/Table.html
index deaf6b1c..75a21629 100644
--- a/html-test/ref/Table.html
+++ b/html-test/ref/Table.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
@@ -217,9 +219,11 @@
  span rows. 
             </td
 		  ><td colspan="2" rowspan="2"
-		  > \[                  
+		  > <span class="mathjax"
+		    >\[                  
  f(n) = \sum_{i=1}   
- \]                  </td
+ \]</span
+		    >                  </td
 		  ></tr
 		><tr
 		><td
diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html
index ce180a19..74d83161 100644
--- a/html-test/ref/Test.html
+++ b/html-test/ref/Test.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Threaded.html b/html-test/ref/Threaded.html
index e52ca96b..fb503590 100644
--- a/html-test/ref/Threaded.html
+++ b/html-test/ref/Threaded.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Threaded_TH.html b/html-test/ref/Threaded_TH.html
index 14ebe8a9..de2d0b4d 100644
--- a/html-test/ref/Threaded_TH.html
+++ b/html-test/ref/Threaded_TH.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Ticket112.html b/html-test/ref/Ticket112.html
index 00258deb..c1196c7f 100644
--- a/html-test/ref/Ticket112.html
+++ b/html-test/ref/Ticket112.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Ticket61.html b/html-test/ref/Ticket61.html
index 9cab5271..57d27635 100644
--- a/html-test/ref/Ticket61.html
+++ b/html-test/ref/Ticket61.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Ticket75.html b/html-test/ref/Ticket75.html
index 70919c1b..627f8a41 100644
--- a/html-test/ref/Ticket75.html
+++ b/html-test/ref/Ticket75.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/TitledPicture.html b/html-test/ref/TitledPicture.html
index eb6c12f4..ca157039 100644
--- a/html-test/ref/TitledPicture.html
+++ b/html-test/ref/TitledPicture.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/TypeFamilies.html b/html-test/ref/TypeFamilies.html
index 9a4945dd..fdab721b 100644
--- a/html-test/ref/TypeFamilies.html
+++ b/html-test/ref/TypeFamilies.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/TypeFamilies2.html b/html-test/ref/TypeFamilies2.html
index 1b4eed8c..fb37892d 100644
--- a/html-test/ref/TypeFamilies2.html
+++ b/html-test/ref/TypeFamilies2.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/TypeFamilies3.html b/html-test/ref/TypeFamilies3.html
index 2dadf435..a55aa36c 100644
--- a/html-test/ref/TypeFamilies3.html
+++ b/html-test/ref/TypeFamilies3.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/TypeOperators.html b/html-test/ref/TypeOperators.html
index 76a5b280..f3d4cd98 100644
--- a/html-test/ref/TypeOperators.html
+++ b/html-test/ref/TypeOperators.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Unicode.html b/html-test/ref/Unicode.html
index 26d0d60e..6ac71b56 100644
--- a/html-test/ref/Unicode.html
+++ b/html-test/ref/Unicode.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Unicode2.html b/html-test/ref/Unicode2.html
index bf667bae..42320e5c 100644
--- a/html-test/ref/Unicode2.html
+++ b/html-test/ref/Unicode2.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
diff --git a/html-test/ref/Visible.html b/html-test/ref/Visible.html
index 308689e4..32ab3801 100644
--- a/html-test/ref/Visible.html
+++ b/html-test/ref/Visible.html
@@ -7,7 +7,9 @@
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
-    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script type="text/x-mathjax-config"
+    >MathJax.Hub.Config({ tex2jax: { processClass: &quot;mathjax&quot;, ignoreClass: &quot;.*&quot; } });</script
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ></head
   ><body
-- 
cgit v1.2.3


From d701f163017e59107a14d99bdb6c3f71c2578c3c Mon Sep 17 00:00:00 2001
From: Alec Theriault <alec.theriault@gmail.com>
Date: Wed, 7 Nov 2018 13:45:15 -0800
Subject: Accept HTML output changes

---
 html-test/ref/Bug26.html                         |  10 +-
 html-test/ref/Bug294.html                        |  34 ++++---
 html-test/ref/Bug387.html                        |  26 ++---
 html-test/ref/Bug548.html                        |   8 +-
 html-test/ref/Bug613.html                        |  18 ++--
 html-test/ref/Bug679.html                        |  18 ++--
 html-test/ref/Bug7.html                          |  18 ++--
 html-test/ref/BugExportHeadings.html             |  58 +++++------
 html-test/ref/DeprecatedReExport.html            |  26 ++---
 html-test/ref/Hash.html                          |  58 ++++++-----
 html-test/ref/HiddenInstances.html               |  18 ++--
 html-test/ref/HiddenInstancesB.html              |  18 ++--
 html-test/ref/Instances.html                     |  50 ++++++----
 html-test/ref/OrphanInstances.html               |  20 ++--
 html-test/ref/OrphanInstancesClass.html          |  10 +-
 html-test/ref/OrphanInstancesType.html           |  10 +-
 html-test/ref/QuasiExpr.html                     |  18 ++--
 html-test/ref/SpuriousSuperclassConstraints.html |  10 +-
 html-test/ref/Test.html                          | 120 ++++++++++++-----------
 html-test/ref/TypeFamilies.html                  |  74 ++++++++------
 html-test/ref/TypeFamilies2.html                 |  26 +++--
 html-test/ref/TypeFamilies3.html                 |  16 +--
 22 files changed, 381 insertions(+), 283 deletions(-)

(limited to 'html-test/ref/SpuriousSuperclassConstraints.html')

diff --git a/html-test/ref/Bug26.html b/html-test/ref/Bug26.html
index 97f69317..97cf5b24 100644
--- a/html-test/ref/Bug26.html
+++ b/html-test/ref/Bug26.html
@@ -149,9 +149,11 @@
 	      ></div
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:C" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:C"
+	    >Instances</h4
+	    ><details id="i:C" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -205,4 +207,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug294.html b/html-test/ref/Bug294.html
index 528696e6..2dfd775f 100644
--- a/html-test/ref/Bug294.html
+++ b/html-test/ref/Bug294.html
@@ -53,9 +53,11 @@
 	    >#</a
 	    ></p
 	  ><div class="subs instances"
-	  ><details id="i:A" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:A"
+	    >Instances</h4
+	    ><details id="i:A" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -191,9 +193,11 @@
 	    >#</a
 	    ></p
 	  ><div class="subs instances"
-	  ><details id="i:TP" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:TP"
+	    >Instances</h4
+	    ><details id="i:TP" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -251,9 +255,11 @@
 	    >#</a
 	    ></p
 	  ><div class="subs instances"
-	  ><details id="i:DP" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:DP"
+	    >Instances</h4
+	    ><details id="i:DP" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -311,9 +317,11 @@
 	    >#</a
 	    ></p
 	  ><div class="subs instances"
-	  ><details id="i:TO-39-" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:TO-39-"
+	    >Instances</h4
+	    ><details id="i:TO-39-" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -361,4 +369,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug387.html b/html-test/ref/Bug387.html
index ccdeb642..a6b19759 100644
--- a/html-test/ref/Bug387.html
+++ b/html-test/ref/Bug387.html
@@ -41,18 +41,20 @@
 	>Bug387</p
 	></div
       ><div id="table-of-contents"
-      ><p class="caption"
-	>Contents</p
-	><ul
-	><li
-	  ><a href="#"
-	    >Section1</a
-	    ></li
+      ><div id="contents-list"
+	><p class="caption"
+	  >Contents</p
+	  ><ul
 	  ><li
-	  ><a href="#"
-	    >Section2</a
-	    ></li
-	  ></ul
+	    ><a href="#"
+	      >Section1</a
+	      ></li
+	    ><li
+	    ><a href="#"
+	      >Section2</a
+	      ></li
+	    ></ul
+	  ></div
 	></div
       ><div id="synopsis"
       ><details id="syn"
@@ -113,4 +115,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug548.html b/html-test/ref/Bug548.html
index 8ccd244b..3778cd9e 100644
--- a/html-test/ref/Bug548.html
+++ b/html-test/ref/Bug548.html
@@ -91,9 +91,11 @@
 	      ></table
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:WrappedArrow" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:WrappedArrow"
+	    >Instances</h4
+	    ><details id="i:WrappedArrow" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
diff --git a/html-test/ref/Bug613.html b/html-test/ref/Bug613.html
index c6876bd3..86579c88 100644
--- a/html-test/ref/Bug613.html
+++ b/html-test/ref/Bug613.html
@@ -95,9 +95,11 @@
 	      ></p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Functor" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Functor"
+	    >Instances</h4
+	    ><details id="i:Functor" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -215,9 +217,11 @@
 	      ></table
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:ThreeVars" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:ThreeVars"
+	    >Instances</h4
+	    ><details id="i:ThreeVars" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -271,4 +275,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug679.html b/html-test/ref/Bug679.html
index d0d0a69d..4a5e7154 100644
--- a/html-test/ref/Bug679.html
+++ b/html-test/ref/Bug679.html
@@ -67,9 +67,11 @@
 	      ></table
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Bar" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Bar"
+	    >Instances</h4
+	    ><details id="i:Bar" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -139,9 +141,11 @@
 	      ></p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Foo" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Foo"
+	    >Instances</h4
+	    ><details id="i:Foo" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -195,4 +199,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug7.html b/html-test/ref/Bug7.html
index 08a87751..faeb61af 100644
--- a/html-test/ref/Bug7.html
+++ b/html-test/ref/Bug7.html
@@ -102,9 +102,11 @@
 	      ></table
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Foo" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Foo"
+	    >Instances</h4
+	    ><details id="i:Foo" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -156,9 +158,11 @@
 	    >The Bar class</p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Bar" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Bar"
+	    >Instances</h4
+	    ><details id="i:Bar" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -202,4 +206,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/BugExportHeadings.html b/html-test/ref/BugExportHeadings.html
index 4c2e822e..19f19778 100644
--- a/html-test/ref/BugExportHeadings.html
+++ b/html-test/ref/BugExportHeadings.html
@@ -41,34 +41,36 @@
 	>BugExportHeadings</p
 	></div
       ><div id="table-of-contents"
-      ><p class="caption"
-	>Contents</p
-	><ul
-	><li
-	  ><a href="#"
-	    >Foo</a
-	    ></li
-	  ><li
-	  ><a href="#"
-	    >Bar</a
-	    ></li
-	  ><li
-	  ><a href="#"
-	    >Baz</a
-	    ></li
-	  ><li
-	  ><a href="#"
-	    >One</a
-	    ></li
-	  ><li
-	  ><a href="#"
-	    >Two</a
-	    ></li
+      ><div id="contents-list"
+	><p class="caption"
+	  >Contents</p
+	  ><ul
 	  ><li
-	  ><a href="#"
-	    >Three</a
-	    ></li
-	  ></ul
+	    ><a href="#"
+	      >Foo</a
+	      ></li
+	    ><li
+	    ><a href="#"
+	      >Bar</a
+	      ></li
+	    ><li
+	    ><a href="#"
+	      >Baz</a
+	      ></li
+	    ><li
+	    ><a href="#"
+	      >One</a
+	      ></li
+	    ><li
+	    ><a href="#"
+	      >Two</a
+	      ></li
+	    ><li
+	    ><a href="#"
+	      >Three</a
+	      ></li
+	    ></ul
+	  ></div
 	></div
       ><div id="synopsis"
       ><details id="syn"
@@ -223,4 +225,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedReExport.html b/html-test/ref/DeprecatedReExport.html
index 9b6bc3f1..a2c9b4f2 100644
--- a/html-test/ref/DeprecatedReExport.html
+++ b/html-test/ref/DeprecatedReExport.html
@@ -41,18 +41,20 @@
 	>DeprecatedReExport</p
 	></div
       ><div id="table-of-contents"
-      ><p class="caption"
-	>Contents</p
-	><ul
-	><li
-	  ><a href="#"
-	    >Re-exported from an other module</a
-	    ></li
+      ><div id="contents-list"
+	><p class="caption"
+	  >Contents</p
+	  ><ul
 	  ><li
-	  ><a href="#"
-	    >Re-exported from an other package</a
-	    ></li
-	  ></ul
+	    ><a href="#"
+	      >Re-exported from an other module</a
+	      ></li
+	    ><li
+	    ><a href="#"
+	      >Re-exported from an other package</a
+	      ></li
+	    ></ul
+	  ></div
 	></div
       ><div id="description"
       ><p class="caption"
@@ -124,4 +126,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Hash.html b/html-test/ref/Hash.html
index 6c489505..69afe1aa 100644
--- a/html-test/ref/Hash.html
+++ b/html-test/ref/Hash.html
@@ -41,30 +41,32 @@
 	>Hash</p
 	></div
       ><div id="table-of-contents"
-      ><p class="caption"
-	>Contents</p
-	><ul
-	><li
-	  ><a href="#"
-	    >The <code
-	      >HashTable</code
-	      > type</a
-	    ><ul
-	    ><li
-	      ><a href="#"
-		>Operations on <code
-		  >HashTable</code
-		  >s</a
-		></li
-	      ></ul
-	    ></li
+      ><div id="contents-list"
+	><p class="caption"
+	  >Contents</p
+	  ><ul
 	  ><li
-	  ><a href="#"
-	    >The <code
-	      >Hash</code
-	      > class</a
-	    ></li
-	  ></ul
+	    ><a href="#"
+	      >The <code
+		>HashTable</code
+		> type</a
+	      ><ul
+	      ><li
+		><a href="#"
+		  >Operations on <code
+		    >HashTable</code
+		    >s</a
+		  ></li
+		></ul
+	      ></li
+	    ><li
+	    ><a href="#"
+	      >The <code
+		>Hash</code
+		> class</a
+	      ></li
+	    ></ul
+	  ></div
 	></div
       ><div id="description"
       ><p class="caption"
@@ -290,9 +292,11 @@
 	      ></div
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Hash" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Hash"
+	    >Instances</h4
+	    ><details id="i:Hash" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -430,4 +434,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/HiddenInstances.html b/html-test/ref/HiddenInstances.html
index 3a03d2ba..a41327e5 100644
--- a/html-test/ref/HiddenInstances.html
+++ b/html-test/ref/HiddenInstances.html
@@ -77,9 +77,11 @@
 	    >Should be visible</p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:VisibleClass" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:VisibleClass"
+	    >Instances</h4
+	    ><details id="i:VisibleClass" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -159,9 +161,11 @@
 	    >Should be visible</p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:VisibleData" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:VisibleData"
+	    >Instances</h4
+	    ><details id="i:VisibleData" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -313,4 +317,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/HiddenInstancesB.html b/html-test/ref/HiddenInstancesB.html
index f6b4db1e..80acad2e 100644
--- a/html-test/ref/HiddenInstancesB.html
+++ b/html-test/ref/HiddenInstancesB.html
@@ -77,9 +77,11 @@
 	    >Should be visible</p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Foo" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Foo"
+	    >Instances</h4
+	    ><details id="i:Foo" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -129,9 +131,11 @@
 	    >Should be visible</p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Bar" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Bar"
+	    >Instances</h4
+	    ><details id="i:Bar" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -173,4 +177,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Instances.html b/html-test/ref/Instances.html
index e2f16a49..957adde1 100644
--- a/html-test/ref/Instances.html
+++ b/html-test/ref/Instances.html
@@ -67,9 +67,11 @@
 	      ></table
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:-60--126--126-" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:-60--126--126-"
+	    >Instances</h4
+	    ><details id="i:-60--126--126-" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -177,9 +179,11 @@
 	      ></p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Foo" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Foo"
+	    >Instances</h4
+	    ><details id="i:Foo" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -687,9 +691,11 @@
 	      ></p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Bar" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Bar"
+	    >Instances</h4
+	    ><details id="i:Bar" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -1253,9 +1259,11 @@
 	      ></p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Baz" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Baz"
+	    >Instances</h4
+	    ><details id="i:Baz" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -1625,9 +1633,11 @@
 	      ></table
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Quux" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Quux"
+	    >Instances</h4
+	    ><details id="i:Quux" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -1981,9 +1991,11 @@
 	      ></p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Norf" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Norf"
+	    >Instances</h4
+	    ><details id="i:Norf" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -2139,4 +2151,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/OrphanInstances.html b/html-test/ref/OrphanInstances.html
index d0d19e2f..d6cbcf8e 100644
--- a/html-test/ref/OrphanInstances.html
+++ b/html-test/ref/OrphanInstances.html
@@ -41,14 +41,16 @@
 	>OrphanInstances</p
 	></div
       ><div id="table-of-contents"
-      ><p class="caption"
-	>Contents</p
-	><ul
-	><li
-	  ><a href="#"
-	    >Orphan instances</a
-	    ></li
-	  ></ul
+      ><div id="contents-list"
+	><p class="caption"
+	  >Contents</p
+	  ><ul
+	  ><li
+	    ><a href="#"
+	      >Orphan instances</a
+	      ></li
+	    ></ul
+	  ></div
 	></div
       ><div id="interface"
       ><h1
@@ -105,4 +107,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/OrphanInstancesClass.html b/html-test/ref/OrphanInstancesClass.html
index 04193c50..925f7ada 100644
--- a/html-test/ref/OrphanInstancesClass.html
+++ b/html-test/ref/OrphanInstancesClass.html
@@ -67,9 +67,11 @@
 	      ></p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:AClass" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:AClass"
+	    >Instances</h4
+	    ><details id="i:AClass" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -125,4 +127,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/OrphanInstancesType.html b/html-test/ref/OrphanInstancesType.html
index 67acfcd5..7b40b3cb 100644
--- a/html-test/ref/OrphanInstancesType.html
+++ b/html-test/ref/OrphanInstancesType.html
@@ -69,9 +69,11 @@
 	      ></table
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:AType" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:AType"
+	    >Instances</h4
+	    ><details id="i:AType" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -127,4 +129,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/QuasiExpr.html b/html-test/ref/QuasiExpr.html
index 88f1b92c..3c1aff57 100644
--- a/html-test/ref/QuasiExpr.html
+++ b/html-test/ref/QuasiExpr.html
@@ -103,9 +103,11 @@
 	      ></table
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Expr" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Expr"
+	    >Instances</h4
+	    ><details id="i:Expr" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -223,9 +225,11 @@
 	      ></table
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:BinOp" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:BinOp"
+	    >Instances</h4
+	    ><details id="i:BinOp" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -337,4 +341,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/SpuriousSuperclassConstraints.html b/html-test/ref/SpuriousSuperclassConstraints.html
index 17c026d1..61841f06 100644
--- a/html-test/ref/SpuriousSuperclassConstraints.html
+++ b/html-test/ref/SpuriousSuperclassConstraints.html
@@ -79,9 +79,11 @@ Fix spurious superclass constraints bug.</pre
 	    >#</a
 	    ></p
 	  ><div class="subs instances"
-	  ><details id="i:SomeType" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:SomeType"
+	    >Instances</h4
+	    ><details id="i:SomeType" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -235,4 +237,4 @@ Fix spurious superclass constraints bug.</pre
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html
index 5cdee91e..b7f93128 100644
--- a/html-test/ref/Test.html
+++ b/html-test/ref/Test.html
@@ -71,62 +71,64 @@
 	>Test</p
 	></div
       ><div id="table-of-contents"
-      ><p class="caption"
-	>Contents</p
-	><ul
-	><li
-	  ><a href="#"
-	    >Type declarations</a
-	    ><ul
-	    ><li
-	      ><a href="#"
-		>Data types</a
-		></li
-	      ><li
-	      ><a href="#"
-		>Records</a
-		></li
-	      ></ul
-	    ></li
-	  ><li
-	  ><a href="#"
-	    >Class declarations</a
-	    ></li
-	  ><li
-	  ><a href="#"
-	    >Function types</a
-	    ></li
-	  ><li
-	  ><a href="#"
-	    >Auxiliary stuff</a
-	    ></li
-	  ><li
-	  ><a href="#"
-	    >A hidden module</a
-	    ></li
-	  ><li
-	  ><a href="#"
-	    >A visible module</a
-	    ></li
-	  ><li
-	  ><a href="#"
-	    >Existential / Universal types</a
-	    ></li
-	  ><li
-	  ><a href="#"
-	    >Type signatures with argument docs</a
-	    ></li
+      ><div id="contents-list"
+	><p class="caption"
+	  >Contents</p
+	  ><ul
 	  ><li
-	  ><a href="#"
-	    >A section</a
-	    ><ul
+	    ><a href="#"
+	      >Type declarations</a
+	      ><ul
+	      ><li
+		><a href="#"
+		  >Data types</a
+		  ></li
+		><li
+		><a href="#"
+		  >Records</a
+		  ></li
+		></ul
+	      ></li
 	    ><li
-	      ><a href="#"
-		>A subsection</a
-		></li
-	      ></ul
-	    ></li
-	  ></ul
+	    ><a href="#"
+	      >Class declarations</a
+	      ></li
+	    ><li
+	    ><a href="#"
+	      >Function types</a
+	      ></li
+	    ><li
+	    ><a href="#"
+	      >Auxiliary stuff</a
+	      ></li
+	    ><li
+	    ><a href="#"
+	      >A hidden module</a
+	      ></li
+	    ><li
+	    ><a href="#"
+	      >A visible module</a
+	      ></li
+	    ><li
+	    ><a href="#"
+	      >Existential / Universal types</a
+	      ></li
+	    ><li
+	    ><a href="#"
+	      >Type signatures with argument docs</a
+	      ></li
+	    ><li
+	    ><a href="#"
+	      >A section</a
+	      ><ul
+	      ><li
+		><a href="#"
+		  >A subsection</a
+		  ></li
+		></ul
+	      ></li
+	    ></ul
+	  ></div
 	></div
       ><div id="description"
       ><p class="caption"
@@ -1653,9 +1655,11 @@
 	      ></p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:D" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:D"
+	    >Instances</h4
+	    ><details id="i:D" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -2393,4 +2397,4 @@ is at the beginning of the line).</pre
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/TypeFamilies.html b/html-test/ref/TypeFamilies.html
index 35f9e542..d31e9f7b 100644
--- a/html-test/ref/TypeFamilies.html
+++ b/html-test/ref/TypeFamilies.html
@@ -211,9 +211,11 @@
 	      ></table
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:X" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:X"
+	    >Instances</h4
+	    ><details id="i:X" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -673,9 +675,11 @@
 	    >Doc for: data Y</p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Y" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Y"
+	    >Instances</h4
+	    ><details id="i:Y" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -1053,9 +1057,11 @@
 	      ></table
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Z" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Z"
+	    >Instances</h4
+	    ><details id="i:Z" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -1145,9 +1151,11 @@
 	    >Doc for: class Test a</p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Test" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Test"
+	    >Instances</h4
+	    ><details id="i:Test" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -1227,9 +1235,11 @@
 	    >Doc for: type family Foo a</p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Foo" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Foo"
+	    >Instances</h4
+	    ><details id="i:Foo" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -1333,9 +1343,11 @@
 	    >Doc for: data family Bat a</p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Bat" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Bat"
+	    >Instances</h4
+	    ><details id="i:Bat" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -1563,9 +1575,11 @@
 	      ></div
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Assoc" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Assoc"
+	    >Instances</h4
+	    ><details id="i:Assoc" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -1741,9 +1755,11 @@
 	    >#</a
 	    ></p
 	  ><div class="subs instances"
-	  ><details id="i:-60--62-" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:-60--62-"
+	    >Instances</h4
+	    ><details id="i:-60--62-" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -1889,9 +1905,11 @@
 	    >#</a
 	    ></p
 	  ><div class="subs instances"
-	  ><details id="i:-62--60-" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:-62--60-"
+	    >Instances</h4
+	    ><details id="i:-62--60-" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -1933,4 +1951,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/TypeFamilies2.html b/html-test/ref/TypeFamilies2.html
index 4c6fcc74..a60ce077 100644
--- a/html-test/ref/TypeFamilies2.html
+++ b/html-test/ref/TypeFamilies2.html
@@ -83,9 +83,11 @@
 	    >Exported type</p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:W" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:W"
+	    >Instances</h4
+	    ><details id="i:W" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -187,9 +189,11 @@
 	    >Exported type family</p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Foo" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Foo"
+	    >Instances</h4
+	    ><details id="i:Foo" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -291,9 +295,11 @@
 	    >Exported data family</p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Bar" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Bar"
+	    >Instances</h4
+	    ><details id="i:Bar" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -385,4 +391,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/TypeFamilies3.html b/html-test/ref/TypeFamilies3.html
index fa270191..a7e60ce1 100644
--- a/html-test/ref/TypeFamilies3.html
+++ b/html-test/ref/TypeFamilies3.html
@@ -125,9 +125,11 @@
 	    >An open family</p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Bar" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Bar"
+	    >Instances</h4
+	    ><details id="i:Bar" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
@@ -221,9 +223,11 @@
 	    >A data family</p
 	    ></div
 	  ><div class="subs instances"
-	  ><details id="i:Baz" open="open"
-	    ><summary
-	      >Instances</summary
+	  ><h4 class="instances details-toggle-control details-toggle" data-details-id="i:Baz"
+	    >Instances</h4
+	    ><details id="i:Baz" open="open"
+	    ><summary class="hide-when-js-enabled"
+	      >Instances details</summary
 	      ><table
 	      ><tr
 		><td class="src clearfix"
-- 
cgit v1.2.3