Fix totality, unicode, examples, paragraph parsing

Also simplify specs and parsers while we're at it. Some parsers were
made more generic.

This commit is a part of GHC pre-merge squash, email
fuuzetsu@fuuzetsu.co.uk if you need the full commit history.

42 files changed, 201 insertions, 393 deletions

diff --git a/html-test/ref/A.html b/html-test/ref/A.html
index 4d55ba16..0346574f 100644
--- a/html-test/ref/A.html
+++ b/html-test/ref/A.html
@@ -123,8 +123,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 	    ></p
 	  ><div class="doc"
 	  ><p
-	    >Doc for test2
-</p
+	    >Doc for test2</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -136,8 +135,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 	    >  </p
 	  ><div class="doc"
 	  ><p
-	    >Should show up on the page for both modules A and B
-</p
+	    >Should show up on the page for both modules A and B</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -150,8 +148,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 		  ></td
 		><td class="doc"
 		><p
-		  >Doc for consructor
-</p
+		  >Doc for consructor</p
 		  ></td
 		></tr
 	      ></table
@@ -166,8 +163,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 	    ></p
 	  ><div class="doc"
 	  ><p
-	    >Should show up on the page for both modules A and B
-</p
+	    >Should show up on the page for both modules A and B</p
 	    ></div
 	  ></div
 	></div
diff --git a/html-test/ref/B.html b/html-test/ref/B.html
index 4dd5d339..ea408d0b 100644
--- a/html-test/ref/B.html
+++ b/html-test/ref/B.html
@@ -115,8 +115,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
 	      >.
    Module link: <a href=""
 	      >Prelude</a
-	      >.
-</p
+	      >.</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -128,8 +127,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
 	    ></p
 	  ><div class="doc"
 	  ><p
-	    >Should show up on the page for both modules A and B
-</p
+	    >Should show up on the page for both modules A and B</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -141,8 +139,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
 	    >  </p
 	  ><div class="doc"
 	  ><p
-	    >Should show up on the page for both modules A and B
-</p
+	    >Should show up on the page for both modules A and B</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -155,8 +152,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
 		  ></td
 		><td class="doc"
 		><p
-		  >Doc for consructor
-</p
+		  >Doc for consructor</p
 		  ></td
 		></tr
 	      ></table
diff --git a/html-test/ref/Bug1.html b/html-test/ref/Bug1.html
index d784fbfa..80e83425 100644
--- a/html-test/ref/Bug1.html
+++ b/html-test/ref/Bug1.html
@@ -72,8 +72,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug1.html");};
 	      ><a href=""
 		>T</a
 		></code
-	      >.
-</p
+	      >.</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
diff --git a/html-test/ref/Bug3.html b/html-test/ref/Bug3.html
index fa9000a6..f5b12e5f 100644
--- a/html-test/ref/Bug3.html
+++ b/html-test/ref/Bug3.html
@@ -66,8 +66,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug3.html");};
 	  ><div class="doc"
 	  ><p
 	    >/multi-line
- emphasis/
-</p
+ emphasis/</p
 	    ></div
 	  ></div
 	></div
diff --git a/html-test/ref/Bug4.html b/html-test/ref/Bug4.html
index f97f375e..ba64535f 100644
--- a/html-test/ref/Bug4.html
+++ b/html-test/ref/Bug4.html
@@ -65,8 +65,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug4.html");};
 	    ></p
 	  ><div class="doc"
 	  ><p
-	    >don't use apostrophe's in the wrong place's
-</p
+	    >don't use apostrophe's in the wrong place's</p
 	    ></div
 	  ></div
 	></div
diff --git a/html-test/ref/Bug6.html b/html-test/ref/Bug6.html
index 384e4dc8..2fde3f10 100644
--- a/html-test/ref/Bug6.html
+++ b/html-test/ref/Bug6.html
@@ -46,8 +46,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	>Description</p
 	><div class="doc"
 	><p
-	  >Exporting records.
-</p
+	  >Exporting records.</p
 	  ></div
 	></div
       ><div id="synopsis"
@@ -138,8 +137,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	    >  </p
 	  ><div class="doc"
 	  ><p
-	    >This record is exported without its field
-</p
+	    >This record is exported without its field</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -168,8 +166,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	  ><div class="doc"
 	  ><p
 	    >.. with its field, but the field is named separately in the export list
- (the field isn't documented separately since it is already documented here)
-</p
+ (the field isn't documented separately since it is already documented here)</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -215,8 +212,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	    >  </p
 	  ><div class="doc"
 	  ><p
-	    >.. with fields names as subordinate names in the export
-</p
+	    >.. with fields names as subordinate names in the export</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -271,8 +267,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	  ><div class="doc"
 	  ><p
 	    >.. with only some of the fields exported (we can't handle this one -
- how do we render the declaration?)
-</p
+ how do we render the declaration?)</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -302,8 +297,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	    >  </p
 	  ><div class="doc"
 	  ><p
-	    >a newtype with a field
-</p
+	    >a newtype with a field</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
diff --git a/html-test/ref/Bug7.html b/html-test/ref/Bug7.html
index d3d6ac7d..9f964576 100644
--- a/html-test/ref/Bug7.html
+++ b/html-test/ref/Bug7.html
@@ -47,8 +47,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
 	><div class="doc"
 	><p
 	  >This module caused a duplicate instance in the documentation for the Foo
- type.
-</p
+ type.</p
 	  ></div
 	></div
       ><div id="synopsis"
@@ -83,8 +82,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
 	    >  </p
 	  ><div class="doc"
 	  ><p
-	    >The Foo datatype
-</p
+	    >The Foo datatype</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -116,8 +114,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
 		    ></td
 		  ><td class="doc"
 		  ><p
-		    >Just one instance
-</p
+		    >Just one instance</p
 		    ></td
 		  ></tr
 		></table
@@ -133,8 +130,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
 	    > x y </p
 	  ><div class="doc"
 	  ><p
-	    >The Bar class
-</p
+	    >The Bar class</p
 	    ></div
 	  ><div class="subs instances"
 	  ><p id="control.i:Bar" class="caption collapser" onclick="toggleSection('i:Bar')"
@@ -152,8 +148,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
 		    ></td
 		  ><td class="doc"
 		  ><p
-		    >Just one instance
-</p
+		    >Just one instance</p
 		    ></td
 		  ></tr
 		></table
diff --git a/html-test/ref/BugDeprecated.html b/html-test/ref/BugDeprecated.html
index b3f63665..c65b4cf4 100644
--- a/html-test/ref/BugDeprecated.html
+++ b/html-test/ref/BugDeprecated.html
@@ -141,8 +141,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");}
 	      >Deprecated: for one</p
 	      ></div
 	    ><p
-	    >some documentation for one, two and three
-</p
+	    >some documentation for one, two and three</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -158,8 +157,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");}
 	      >Deprecated: for three</p
 	      ></div
 	    ><p
-	    >some documentation for one, two and three
-</p
+	    >some documentation for one, two and three</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -175,8 +173,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");}
 	      >Deprecated: for two</p
 	      ></div
 	    ><p
-	    >some documentation for one, two and three
-</p
+	    >some documentation for one, two and three</p
 	    ></div
 	  ></div
 	></div
diff --git a/html-test/ref/DeprecatedClass.html b/html-test/ref/DeprecatedClass.html
index 99eea1bd..ee6f2679 100644
--- a/html-test/ref/DeprecatedClass.html
+++ b/html-test/ref/DeprecatedClass.html
@@ -93,8 +93,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedClass.html")
 	      >Deprecated: SomeClass</p
 	      ></div
 	    ><p
-	    >some class
-</p
+	    >some class</p
 	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
@@ -109,8 +108,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedClass.html")
 		>Deprecated: foo</p
 		></div
 	      ><p
-	      >documentation for foo
-</p
+	      >documentation for foo</p
 	      ></div
 	    ></div
 	  ></div
diff --git a/html-test/ref/DeprecatedData.html b/html-test/ref/DeprecatedData.html
index 254ae11e..a0d659a9 100644
--- a/html-test/ref/DeprecatedData.html
+++ b/html-test/ref/DeprecatedData.html
@@ -95,8 +95,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
 	      >Deprecated: Foo</p
 	      ></div
 	    ><p
-	    >type Foo
-</p
+	    >type Foo</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -113,8 +112,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
 		    >Deprecated: Foo</p
 		    ></div
 		  ><p
-		  >constructor Foo
-</p
+		  >constructor Foo</p
 		  ></td
 		></tr
 	      ><tr
@@ -128,8 +126,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
 		    >Deprecated: Bar</p
 		    ></div
 		  ><p
-		  >constructor Bar
-</p
+		  >constructor Bar</p
 		  ></td
 		></tr
 	      ></table
diff --git a/html-test/ref/DeprecatedFunction.html b/html-test/ref/DeprecatedFunction.html
index 2ee6d01e..abd6e976 100644
--- a/html-test/ref/DeprecatedFunction.html
+++ b/html-test/ref/DeprecatedFunction.html
@@ -79,8 +79,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction.htm
 		> instead</p
 	      ></div
 	    ><p
-	    >some documentation for foo
-</p
+	    >some documentation for foo</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -92,8 +91,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction.htm
 	    ></p
 	  ><div class="doc"
 	  ><p
-	    >some documentation for bar
-</p
+	    >some documentation for bar</p
 	    ></div
 	  ></div
 	></div
diff --git a/html-test/ref/DeprecatedModule.html b/html-test/ref/DeprecatedModule.html
index 1ff1e61f..79e61a51 100644
--- a/html-test/ref/DeprecatedModule.html
+++ b/html-test/ref/DeprecatedModule.html
@@ -54,8 +54,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedModule.html"
 	  ><p
 	  >Documentation for <a href=""
 	    >DeprecatedModule</a
-	    >.
-</p
+	    >.</p
 	  ></div
 	></div
       ><div id="interface"
diff --git a/html-test/ref/DeprecatedNewtype.html b/html-test/ref/DeprecatedNewtype.html
index b3675ccf..4a8024b4 100644
--- a/html-test/ref/DeprecatedNewtype.html
+++ b/html-test/ref/DeprecatedNewtype.html
@@ -83,8 +83,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedNewtype.html
 	      >Deprecated: SomeNewType</p
 	      ></div
 	    ><p
-	    >some documentation
-</p
+	    >some documentation</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -103,8 +102,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedNewtype.html
 		    >Deprecated: SomeNewTypeConst</p
 		    ></div
 		  ><p
-		  >constructor docu 
-</p
+		  >constructor docu </p
 		  ></td
 		></tr
 	      ></table
diff --git a/html-test/ref/DeprecatedReExport.html b/html-test/ref/DeprecatedReExport.html
index 159c1086..99b797d0 100644
--- a/html-test/ref/DeprecatedReExport.html
+++ b/html-test/ref/DeprecatedReExport.html
@@ -60,11 +60,10 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedReExport.htm
 	>Description</p
 	><div class="doc"
 	><p
-	  >What is tested here:
-</p
+	  >What is tested here:</p
 	  ><ul
 	  ><li
-	    > Deprecation messages are shown for re-exported items.
+	    >Deprecation messages are shown for re-exported items.
 </li
 	    ></ul
 	  ></div
@@ -101,8 +100,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedReExport.htm
 		> instead</p
 	      ></div
 	    ><p
-	    >some documentation for foo
-</p
+	    >some documentation for foo</p
 	    ></div
 	  ></div
 	><h1 id="g:2"
@@ -112,8 +110,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedReExport.htm
 	  >Not yet working, see <a href=""
 	    >http://trac.haskell.org/haddock/ticket/223</a
 	    >
- , isEmptyChan
-</p
+ , isEmptyChan</p
 	  ></div
 	></div
       ></div
diff --git a/html-test/ref/DeprecatedRecord.html b/html-test/ref/DeprecatedRecord.html
index 5f84dfa8..d9a4abd4 100644
--- a/html-test/ref/DeprecatedRecord.html
+++ b/html-test/ref/DeprecatedRecord.html
@@ -81,8 +81,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedRecord.html"
 	    >  </p
 	  ><div class="doc"
 	  ><p
-	    >type Foo
-</p
+	    >type Foo</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -110,8 +109,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedRecord.html"
 			></dt
 		      ><dd class="doc"
 		      ><p
-			>some name
-</p
+			>some name</p
 			></dd
 		      ><dt class="src"
 		      ><a name="v:fooValue" class="def"
@@ -125,8 +123,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedRecord.html"
 			  >Deprecated: do not use this</p
 			  ></div
 			><p
-			>some value
-</p
+			>some value</p
 			></dd
 		      ></dl
 		    ><div class="clear"
diff --git a/html-test/ref/DeprecatedTypeFamily.html b/html-test/ref/DeprecatedTypeFamily.html
index b9f49036..4ed4d827 100644
--- a/html-test/ref/DeprecatedTypeFamily.html
+++ b/html-test/ref/DeprecatedTypeFamily.html
@@ -75,8 +75,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedTypeFamily.h
 	      >Deprecated: SomeTypeFamily</p
 	      ></div
 	    ><p
-	    >some documentation
-</p
+	    >some documentation</p
 	    ></div
 	  ></div
 	><div class="top"
diff --git a/html-test/ref/DeprecatedTypeSynonym.html b/html-test/ref/DeprecatedTypeSynonym.html
index fe305da7..d7f5785e 100644
--- a/html-test/ref/DeprecatedTypeSynonym.html
+++ b/html-test/ref/DeprecatedTypeSynonym.html
@@ -81,8 +81,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedTypeSynonym.
 	      >Deprecated: TypeSyn</p
 	      ></div
 	    ><p
-	    >some documentation
-</p
+	    >some documentation</p
 	    ></div
 	  ></div
 	><div class="top"
diff --git a/html-test/ref/Examples.html b/html-test/ref/Examples.html
index f14e226b..3270b856 100644
--- a/html-test/ref/Examples.html
+++ b/html-test/ref/Examples.html
@@ -73,11 +73,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Examples.html");};
 	      ><a href=""
 		>Integer</a
 		></code
-	      >.
-</p
+	      >.</p
 	    ><p
-	    >Examples:
-</p
+	    >Examples:</p
 	    ><pre class="screen"
 	    ><code class="prompt"
 	      >&gt;&gt;&gt; </code
@@ -107,8 +105,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Examples.html");};
 	      >55
 </pre
 	    ><p
-	    >One more Example:
-</p
+	    >One more Example:</p
 	    ><pre class="screen"
 	    ><code class="prompt"
 	      >&gt;&gt;&gt; </code
@@ -120,8 +117,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Examples.html");};
 	      >5
 </pre
 	    ><p
-	    >One more Example:
-</p
+	    >One more Example:</p
 	    ><pre class="screen"
 	    ><code class="prompt"
 	      >&gt;&gt;&gt; </code
@@ -133,8 +129,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Examples.html");};
 	      >5
 </pre
 	    ><p
-	    >Example with an import:
-</p
+	    >Example with an import:</p
 	    ><pre class="screen"
 	    ><code class="prompt"
 	      >&gt;&gt;&gt; </code
diff --git a/html-test/ref/FunArgs.html b/html-test/ref/FunArgs.html
index c8c6a25d..48e6dc80 100644
--- a/html-test/ref/FunArgs.html
+++ b/html-test/ref/FunArgs.html
@@ -70,8 +70,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 		  ></td
 		><td class="doc"
 		><p
-		  >First argument
-</p
+		  >First argument</p
 		  ></td
 		></tr
 	      ><tr
@@ -79,8 +78,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 		>-&gt; a</td
 		><td class="doc"
 		><p
-		  >Second argument
-</p
+		  >Second argument</p
 		  ></td
 		></tr
 	      ><tr
@@ -90,8 +88,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 		  ></td
 		><td class="doc"
 		><p
-		  >Third argument
-</p
+		  >Third argument</p
 		  ></td
 		></tr
 	      ><tr
@@ -99,8 +96,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 		>-&gt; (a -&gt; a)</td
 		><td class="doc"
 		><p
-		  >Fourth argument
-</p
+		  >Fourth argument</p
 		  ></td
 		></tr
 	      ><tr
@@ -108,8 +104,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 		>-&gt; ()</td
 		><td class="doc"
 		><p
-		  >Result
-</p
+		  >Result</p
 		  ></td
 		></tr
 	      ></table
@@ -129,8 +124,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 		>:: a</td
 		><td class="doc"
 		><p
-		  >First argument
-</p
+		  >First argument</p
 		  ></td
 		></tr
 	      ><tr
@@ -138,8 +132,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 		>-&gt; b</td
 		><td class="doc"
 		><p
-		  >Second argument
-</p
+		  >Second argument</p
 		  ></td
 		></tr
 	      ><tr
@@ -147,8 +140,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 		>-&gt; c</td
 		><td class="doc"
 		><p
-		  >Third argument
-</p
+		  >Third argument</p
 		  ></td
 		></tr
 	      ><tr
@@ -156,8 +148,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 		>-&gt; d</td
 		><td class="doc"
 		><p
-		  >Result
-</p
+		  >Result</p
 		  ></td
 		></tr
 	      ></table
diff --git a/html-test/ref/GADTRecords.html b/html-test/ref/GADTRecords.html
index a461e075..63297c37 100644
--- a/html-test/ref/GADTRecords.html
+++ b/html-test/ref/GADTRecords.html
@@ -117,8 +117,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 	    ></p
 	  ><div class="doc"
 	  ><p
-	    >h1
-</p
+	    >h1</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -176,8 +175,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 			></dt
 		      ><dd class="doc"
 		      ><p
-			>hello docs
-</p
+			>hello docs</p
 			></dd
 		      ></dl
 		    ><div class="clear"
@@ -209,8 +207,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 			> :: a</dt
 		      ><dd class="doc"
 		      ><p
-			>hello2 docs
-</p
+			>hello2 docs</p
 			></dd
 		      ></dl
 		    ><div class="clear"
diff --git a/html-test/ref/Hash.html b/html-test/ref/Hash.html
index 06a7a19d..c459b524 100644
--- a/html-test/ref/Hash.html
+++ b/html-test/ref/Hash.html
@@ -73,8 +73,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	><div class="doc"
 	><p
 	  >Implementation of fixed-size hash tables, with a type 
-  class for constructing hash values for structured types.
-</p
+  class for constructing hash values for structured types.</p
 	  ></div
 	></div
       ><div id="synopsis"
@@ -164,8 +163,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	      ><a href=""
 		>Eq</a
 		></code
-	      >.
-</p
+	      >.</p
 	    ></div
 	  ></div
 	><h2 id="g:2"
@@ -189,8 +187,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	    > key val)</p
 	  ><div class="doc"
 	  ><p
-	    >Builds a new hash table with a given size
-</p
+	    >Builds a new hash table with a given size</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -206,8 +203,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	    > ()</p
 	  ><div class="doc"
 	  ><p
-	    >Inserts a new element into the hash table
-</p
+	    >Inserts a new element into the hash table</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -234,8 +230,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	      ><a href=""
 		>Nothing</a
 		></code
-	      > otherwise.
-</p
+	      > otherwise.</p
 	    ></div
 	  ></div
 	><h1 id="g:3"
@@ -253,8 +248,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	    ></p
 	  ><div class="doc"
 	  ><p
-	    >A class of types which can be hashed.
-</p
+	    >A class of types which can be hashed.</p
 	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
@@ -273,8 +267,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 		><a href=""
 		  >Int</a
 		  ></code
-		>
-</p
+		></p
 	      ></div
 	    ></div
 	  ><div class="subs instances"
diff --git a/html-test/ref/HiddenInstances.html b/html-test/ref/HiddenInstances.html
index 3ca45640..963ed6a6 100644
--- a/html-test/ref/HiddenInstances.html
+++ b/html-test/ref/HiddenInstances.html
@@ -71,8 +71,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html")
 	    > a </p
 	  ><div class="doc"
 	  ><p
-	    >Should be visible
-</p
+	    >Should be visible</p
 	    ></div
 	  ><div class="subs instances"
 	  ><p id="control.i:VisibleClass" class="caption collapser" onclick="toggleSection('i:VisibleClass')"
@@ -88,8 +87,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html")
 		    ></td
 		  ><td class="doc"
 		  ><p
-		    >Should be visible
-</p
+		    >Should be visible</p
 		    ></td
 		  ></tr
 		><tr
@@ -101,8 +99,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html")
 		    ></td
 		  ><td class="doc"
 		  ><p
-		    >Should be visible
-</p
+		    >Should be visible</p
 		    ></td
 		  ></tr
 		></table
@@ -118,8 +115,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html")
 	    >  </p
 	  ><div class="doc"
 	  ><p
-	    >Should be visible
-</p
+	    >Should be visible</p
 	    ></div
 	  ><div class="subs instances"
 	  ><p id="control.i:VisibleData" class="caption collapser" onclick="toggleSection('i:VisibleData')"
@@ -135,8 +131,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html")
 		    ></td
 		  ><td class="doc"
 		  ><p
-		    >Should be visible
-</p
+		    >Should be visible</p
 		    ></td
 		  ></tr
 		><tr
@@ -148,8 +143,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html")
 		    ></td
 		  ><td class="doc"
 		  ><p
-		    >Should be visible
-</p
+		    >Should be visible</p
 		    ></td
 		  ></tr
 		></table
diff --git a/html-test/ref/HiddenInstancesB.html b/html-test/ref/HiddenInstancesB.html
index 248b7839..eabd7e12 100644
--- a/html-test/ref/HiddenInstancesB.html
+++ b/html-test/ref/HiddenInstancesB.html
@@ -71,8 +71,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstancesB.html"
 	    > a </p
 	  ><div class="doc"
 	  ><p
-	    >Should be visible
-</p
+	    >Should be visible</p
 	    ></div
 	  ><div class="subs instances"
 	  ><p id="control.i:Foo" class="caption collapser" onclick="toggleSection('i:Foo')"
@@ -88,8 +87,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstancesB.html"
 		    ></td
 		  ><td class="doc"
 		  ><p
-		    >Should be visible
-</p
+		    >Should be visible</p
 		    ></td
 		  ></tr
 		></table
@@ -105,8 +103,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstancesB.html"
 	    >  </p
 	  ><div class="doc"
 	  ><p
-	    >Should be visible
-</p
+	    >Should be visible</p
 	    ></div
 	  ><div class="subs instances"
 	  ><p id="control.i:Bar" class="caption collapser" onclick="toggleSection('i:Bar')"
@@ -122,8 +119,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstancesB.html"
 		    ></td
 		  ><td class="doc"
 		  ><p
-		    >Should be visible
-</p
+		    >Should be visible</p
 		    ></td
 		  ></tr
 		></table
diff --git a/html-test/ref/Hyperlinks.html b/html-test/ref/Hyperlinks.html
index 91237eb2..254b6b72 100644
--- a/html-test/ref/Hyperlinks.html
+++ b/html-test/ref/Hyperlinks.html
@@ -67,13 +67,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hyperlinks.html");};
 	  ><p
 	    >A plain URL: <a href=""
 	      >http://example.com/</a
-	      >
-</p
+	      ></p
 	    ><p
 	    >A URL with a label: <a href=""
 	      >some link</a
-	      >
-</p
+	      ></p
 	    ></div
 	  ></div
 	></div
diff --git a/html-test/ref/IgnoreExports.html b/html-test/ref/IgnoreExports.html
index 8181829b..fc91be84 100644
--- a/html-test/ref/IgnoreExports.html
+++ b/html-test/ref/IgnoreExports.html
@@ -71,8 +71,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_IgnoreExports.html");}
 	    ></p
 	  ><div class="doc"
 	  ><p
-	    >documentation for foo
-</p
+	    >documentation for foo</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -84,8 +83,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_IgnoreExports.html");}
 	    ></p
 	  ><div class="doc"
 	  ><p
-	    >documentation for bar
-</p
+	    >documentation for bar</p
 	    ></div
 	  ></div
 	></div
diff --git a/html-test/ref/ModuleWithWarning.html b/html-test/ref/ModuleWithWarning.html
index 5d8b3832..b3ab62aa 100644
--- a/html-test/ref/ModuleWithWarning.html
+++ b/html-test/ref/ModuleWithWarning.html
@@ -54,8 +54,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_ModuleWithWarning.html
 	  ><p
 	  >Documentation for <a href=""
 	    >ModuleWithWarning</a
-	    >.
-</p
+	    >.</p
 	  ></div
 	></div
       ><div id="interface"
diff --git a/html-test/ref/NamedDoc.html b/html-test/ref/NamedDoc.html
index 9c929548..94d4bad0 100644
--- a/html-test/ref/NamedDoc.html
+++ b/html-test/ref/NamedDoc.html
@@ -52,8 +52,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_NamedDoc.html");};
 	>Documentation</h1
 	><div class="doc"
 	><p
-	  >bar
-</p
+	  >bar</p
 	  ></div
 	></div
       ></div
diff --git a/html-test/ref/NoLayout.html b/html-test/ref/NoLayout.html
index 13c90f3e..4a9f14d2 100644
--- a/html-test/ref/NoLayout.html
+++ b/html-test/ref/NoLayout.html
@@ -69,8 +69,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_NoLayout.html");};
 	      ><a href=""
 		>g</a
 		></code
-	      >
-</p
+	      ></p
 	    ></div
 	  ></div
 	></div
diff --git a/html-test/ref/NonGreedy.html b/html-test/ref/NonGreedy.html
index 8d8f26a5..2f9bd44c 100644
--- a/html-test/ref/NonGreedy.html
+++ b/html-test/ref/NonGreedy.html
@@ -65,8 +65,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_NonGreedy.html");};
 	      >url1</a
 	      > <a href=""
 	      >url2</a
-	      >
-</p
+	      ></p
 	    ></div
 	  ></div
 	></div
diff --git a/html-test/ref/Properties.html b/html-test/ref/Properties.html
index 3e590b45..7b2a2799 100644
--- a/html-test/ref/Properties.html
+++ b/html-test/ref/Properties.html
@@ -73,8 +73,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Properties.html");};
 	      ><a href=""
 		>Integer</a
 		></code
-	      >.
-</p
+	      >.</p
 	    ><pre
 	    >fib n &lt;= fib (n + 1)</pre
 	    ></div
diff --git a/html-test/ref/PruneWithWarning.html b/html-test/ref/PruneWithWarning.html
index 220576fa..837c28b4 100644
--- a/html-test/ref/PruneWithWarning.html
+++ b/html-test/ref/PruneWithWarning.html
@@ -46,11 +46,10 @@ window.onload = function () {pageLoad();setSynopsis("mini_PruneWithWarning.html"
 	>Description</p
 	><div class="doc"
 	><p
-	  >What is tested here:
-</p
+	  >What is tested here:</p
 	  ><ul
 	  ><li
-	    > If a binding has a deprecation message but no documentation, it is pruned
+	    >If a binding has a deprecation message but no documentation, it is pruned
    when <code
 	      >OPTIONS_HADDOCK prune</code
 	      > is used.
diff --git a/html-test/ref/SpuriousSuperclassConstraints.html b/html-test/ref/SpuriousSuperclassConstraints.html
index 9b9d8087..566eafd6 100644
--- a/html-test/ref/SpuriousSuperclassConstraints.html
+++ b/html-test/ref/SpuriousSuperclassConstraints.html
@@ -46,32 +46,25 @@ window.onload = function () {pageLoad();setSynopsis("mini_SpuriousSuperclassCons
 	>Description</p
 	><div class="doc"
 	><p
-	  >What is tested here:
-</p
+	  >What is tested here:</p
 	  ><p
 	  >Due to a change in GHC 7.6.1 we had a bug that superclass contraints were
- included in the instances list.  Edward K. repported it here:
-</p
+ included in the instances list.  Edward K. repported it here:</p
 	  ><p
 	  ><a href=""
 	    >http://www.haskell.org/pipermail/haskell-cafe/2012-September/103600.html</a
-	    >
-</p
+	    ></p
 	  ><p
-	  >And here is the corresponding theard on glasgow-haskell-users:
-</p
+	  >And here is the corresponding theard on glasgow-haskell-users:</p
 	  ><p
 	  ><a href=""
 	    >http://www.haskell.org/pipermail/glasgow-haskell-users/2012-September/022914.html</a
-	    >
-</p
+	    ></p
 	  ><p
-	  >It has been fixed in:
-</p
+	  >It has been fixed in:</p
 	  ><pre
 	  > 6ccf78e15a525282fef61bc4f58a279aa9c21771
- Fix spurious superclass constraints bug.
-</pre
+ Fix spurious superclass constraints bug.</pre
 	  ></div
 	></div
       ><div id="interface"
diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html
index 9a25f960..2a3ae350 100644
--- a/html-test/ref/Test.html
+++ b/html-test/ref/Test.html
@@ -151,8 +151,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><a href=""
 	      >visible</a
 	      ></code
-	    >.
-</p
+	    >.</p
 	  ></div
 	></div
       ><div id="synopsis"
@@ -678,8 +677,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    >This comment applies to the <em
 	      >following</em
 	      > declaration
- and it continues until the next non-comment line
-</p
+ and it continues until the next non-comment line</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -702,8 +700,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >A</a
 		      ></code
-		    > constructor
-</p
+		    > constructor</p
 		  ></td
 		></tr
 	      ><tr
@@ -725,8 +722,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >B</a
 		      ></code
-		    > constructor
-</p
+		    > constructor</p
 		  ></td
 		></tr
 	      ></table
@@ -741,8 +737,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    > a b </p
 	  ><div class="doc"
 	  ><p
-	    >An abstract data declaration
-</p
+	    >An abstract data declaration</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -754,8 +749,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    > a b </p
 	  ><div class="doc"
 	  ><p
-	    >A data declaration with no documentation annotations on the constructors
-</p
+	    >A data declaration with no documentation annotations on the constructors</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -832,8 +826,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >A3</a
 		      ></code
-		    >
-</p
+		    ></p
 		  ></td
 		></tr
 	      ><tr
@@ -847,8 +840,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >B3</a
 		      ></code
-		    >
-</p
+		    ></p
 		  ></td
 		></tr
 	      ></table
@@ -863,8 +855,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    >  </p
 	  ><div class="doc"
 	  ><p
-	    >Testing alternative comment styles
-</p
+	    >Testing alternative comment styles</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -881,8 +872,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >A4</a
 		      ></code
-		    >
-</p
+		    ></p
 		  ></td
 		></tr
 	      ><tr
@@ -896,8 +886,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >B4</a
 		      ></code
-		    >
-</p
+		    ></p
 		  ></td
 		></tr
 	      ><tr
@@ -911,8 +900,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >C4</a
 		      ></code
-		    >
-</p
+		    ></p
 		  ></td
 		></tr
 	      ></table
@@ -927,8 +915,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    > a </p
 	  ><div class="doc"
 	  ><p
-	    >A newtype
-</p
+	    >A newtype</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -954,8 +941,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    > a b </p
 	  ><div class="doc"
 	  ><p
-	    >A newtype with a fieldname
-</p
+	    >A newtype with a fieldname</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -999,8 +985,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    > a b </p
 	  ><div class="doc"
 	  ><p
-	    >A newtype with a fieldname, documentation on the field
-</p
+	    >A newtype with a fieldname, documentation on the field</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -1030,8 +1015,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			  ><a href=""
 			    >n3</a
 			    ></code
-			  > field
-</p
+			  > field</p
 			></dd
 		      ></dl
 		    ><div class="clear"
@@ -1052,8 +1036,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><div class="doc"
 	  ><p
 	    >An abstract newtype - we show this one as data rather than newtype because
- the difference isn't visible to the programmer for an abstract type.
-</p
+ the difference isn't visible to the programmer for an abstract type.</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -1087,8 +1070,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			> :: a b</dt
 		      ><dd class="doc"
 		      ><p
-			>no docs on the datatype or the constructor
-</p
+			>no docs on the datatype or the constructor</p
 			></dd
 		      ></dl
 		    ><div class="clear"
@@ -1117,8 +1099,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		  ></td
 		><td class="doc"
 		><p
-		  >docs on the constructor only
-</p
+		  >docs on the constructor only</p
 		  ></td
 		></tr
 	      ><tr
@@ -1151,8 +1132,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    > a b </p
 	  ><div class="doc"
 	  ><p
-	    >docs on the newtype and the constructor
-</p
+	    >docs on the newtype and the constructor</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -1169,8 +1149,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >N7</a
 		      ></code
-		    > constructor
-</p
+		    > constructor</p
 		  ></td
 		></tr
 	      ><tr
@@ -1226,8 +1205,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	      ><a href=""
 		>s</a
 		></code
-	      >.
-</p
+	      >.</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -1244,8 +1222,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >C1</a
 		      ></code
-		    > record constructor, with the following fields:
-</p
+		    > record constructor, with the following fields:</p
 		  ></td
 		></tr
 	      ><tr
@@ -1266,8 +1243,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			  ><a href=""
 			    >p</a
 			    ></code
-			  > field
-</p
+			  > field</p
 			></dd
 		      ><dt class="src"
 		      ><a name="v:q" class="def"
@@ -1281,8 +1257,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			  ><a href=""
 			    >q</a
 			    ></code
-			  > field
-</p
+			  > field</p
 			></dd
 		      ><dt class="src"
 		      ><a name="v:r" class="def"
@@ -1300,8 +1275,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			  ><a href=""
 			    >s</a
 			    ></code
-			  >
-</p
+			  ></p
 			></dd
 		      ><dt class="src"
 		      ><a name="v:s" class="def"
@@ -1319,8 +1293,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			  ><a href=""
 			    >s</a
 			    ></code
-			  >
-</p
+			  ></p
 			></dd
 		      ></dl
 		    ><div class="clear"
@@ -1339,8 +1312,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >C2</a
 		      ></code
-		    > record constructor, also with some fields:
-</p
+		    > record constructor, also with some fields:</p
 		  ></td
 		></tr
 	      ><tr
@@ -1409,8 +1381,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    >  </p
 	  ><div class="doc"
 	  ><p
-	    >Testing different record commenting styles
-</p
+	    >Testing different record commenting styles</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -1427,8 +1398,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >C3</a
 		      ></code
-		    > record constructor
-</p
+		    > record constructor</p
 		  ></td
 		></tr
 	      ><tr
@@ -1449,8 +1419,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			  ><a href=""
 			    >s1</a
 			    ></code
-			  > record selector
-</p
+			  > record selector</p
 			></dd
 		      ><dt class="src"
 		      ><a name="v:s2" class="def"
@@ -1464,8 +1433,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			  ><a href=""
 			    >s2</a
 			    ></code
-			  > record selector
-</p
+			  > record selector</p
 			></dd
 		      ><dt class="src"
 		      ><a name="v:s3" class="def"
@@ -1479,8 +1447,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			  ><a href=""
 			    >s3</a
 			    ></code
-			  > record selector
-</p
+			  > record selector</p
 			></dd
 		      ></dl
 		    ><div class="clear"
@@ -1493,8 +1460,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ></div
 	><div class="doc"
 	><p
-	  >test that we can export record selectors on their own:
-</p
+	  >test that we can export record selectors on their own:</p
 	  ></div
 	><h1 id="g:4"
 	>Class declarations</h1
@@ -1517,8 +1483,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	      ><a href=""
 		>C</a
 		></code
-	      > class)
-</p
+	      > class)</p
 	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
@@ -1535,8 +1500,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><a href=""
 		  >a</a
 		  ></code
-		> method
-</p
+		> method</p
 	      ></div
 	    ><p class="src"
 	    ><a name="v:b" class="def"
@@ -1548,8 +1512,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><a href=""
 		  >b</a
 		  ></code
-		> method
-</p
+		> method</p
 	      ></div
 	    ></div
 	  ></div
@@ -1564,8 +1527,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ></p
 	  ><div class="doc"
 	  ><p
-	    >This is a class declaration with no separate docs for the methods
-</p
+	    >This is a class declaration with no separate docs for the methods</p
 	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
@@ -1619,8 +1581,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    > a </p
 	  ><div class="doc"
 	  ><p
-	    >This is a class declaration with no methods (or no methods exported)
-</p
+	    >This is a class declaration with no methods (or no methods exported)</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -1643,8 +1604,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ></div
 	><div class="doc"
 	><p
-	  >Test that we can export a class method on its own:
-</p
+	  >Test that we can export a class method on its own:</p
 	  ></div
 	><h1 id="g:5"
 	>Function types</h1
@@ -1669,39 +1629,37 @@ using double quotes: <a href=""
 	      >Foo</a
 	      >.  We can add emphasis <em
 	      >like this</em
-	      >.
-</p
+	      >.</p
 	    ><ul
 	    ><li
-	      > This is a bulleted list
+	      >This is a bulleted list
 </li
 	      ><li
-	      > This is the next item (different kind of bullet)
+	      >This is the next item (different kind of bullet)
 </li
 	      ></ul
 	    ><ol
 	    ><li
-	      > This is an ordered list
+	      >This is an ordered list
 </li
 	      ><li
-	      > This is the next item (different kind of bullet)
+	      >This is the next item (different kind of bullet)
 </li
 	      ></ol
 	    ><dl
 	    ><dt
 	      >cat</dt
 	      ><dd
-	      > a small, furry, domesticated mammal
+	      >a small, furry, domesticated mammal
 </dd
 	      ><dt
 	      >pineapple</dt
 	      ><dd
-	      > a fruit grown in the tropics
+	      >a fruit grown in the tropics
 </dd
 	      ></dl
 	    ><pre
-	    >
-     This is a block of code, which can include other markup: <code
+	    >     This is a block of code, which can include other markup: <code
 	      ><a href=""
 		>R</a
 		></code
@@ -1711,13 +1669,11 @@ using double quotes: <a href=""
                  significant
 </pre
 	    ><pre
-	    > this is another block of code
-</pre
+	    > this is another block of code</pre
 	    ><p
 	    >We can also include URLs in documentation: <a href=""
 	      >http://www.haskell.org/</a
-	      >.
-</p
+	      >.</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -1731,8 +1687,7 @@ using double quotes: <a href=""
 	    > CInt</p
 	  ><div class="doc"
 	  ><p
-	    >we can export foreign declarations too
-</p
+	    >we can export foreign declarations too</p
 	    ></div
 	  ></div
 	><h1 id="g:6"
@@ -1741,15 +1696,13 @@ using double quotes: <a href=""
 	><p
 	  >This is some documentation that is attached to a name ($aux1)
  rather than a source declaration.  The documentation may be
- referred to in the export list using its name.
-</p
+ referred to in the export list using its name.</p
 	  ><pre
 	  > code block in named doc</pre
 	  ></div
 	><div class="doc"
 	><p
-	  >This is some documentation that is attached to a name ($aux2)
-</p
+	  >This is some documentation that is attached to a name ($aux2)</p
 	  ></div
 	><div class="doc"
 	><pre
@@ -1761,19 +1714,16 @@ using double quotes: <a href=""
 	  ></div
 	><div class="doc"
 	><p
-	  >a nested, named doc comment
-</p
+	  >a nested, named doc comment</p
 	  ><p
-	  >with a paragraph,
-</p
+	  >with a paragraph,</p
 	  ><pre
 	  > and a code block</pre
 	  ></div
 	><div class="doc"
 	><pre
 	  >test
-test1
-</pre
+test1</pre
 	  ><pre
 	  > test2
   test3
@@ -1781,70 +1731,57 @@ test1
 	  ></div
 	><div class="doc"
 	><pre
-	  >
-test1
+	  >test1
 test2
 </pre
 	  ></div
 	><div class="doc"
 	><pre
 	  >test3
-test4
-</pre
+test4</pre
 	  ></div
 	><div class="doc"
 	><pre
-	  >
-test1
+	  >test1
 test2
 </pre
 	  ><pre
 	  >test3
-test4
-</pre
+test4</pre
 	  ></div
 	><div class="doc"
 	><pre
 	  >test3
-test4
-</pre
+test4</pre
 	  ><pre
-	  >
-test1
+	  >test1
 test2
 </pre
 	  ></div
 	><div class="doc"
 	><p
-	  >aux11:
-</p
+	  >aux11:</p
 	  ><pre
 	  >test3
-test4
-</pre
+test4</pre
 	  ><pre
-	  >
-test1
+	  >test1
 test2
 </pre
 	  ></div
 	><div class="doc"
 	><pre
-	  > foo
-</pre
+	  > foo</pre
 	  ><pre
-	  > bar
-</pre
+	  > bar</pre
 	  ></div
 	><div class="doc"
 	><p
-	  >This is some inline documentation in the export list
-</p
+	  >This is some inline documentation in the export list</p
 	  ><pre
 	  > a code block using bird-tracks
  each line must begin with &gt; (which isn't significant unless it
- is at the beginning of the line).
-</pre
+ is at the beginning of the line).</pre
 	  ></div
 	><h1 id="g:7"
 	>A hidden module</h1
@@ -1868,8 +1805,7 @@ test2
 	  ></div
 	><div class="doc"
 	><p
-	  >nested-style doc comments 
-</p
+	  >nested-style doc comments </p
 	  ></div
 	><h1 id="g:9"
 	>Existential / Universal types</h1
@@ -1882,8 +1818,7 @@ test2
 	    > a </p
 	  ><div class="doc"
 	  ><p
-	    >A data-type using existential/universal types
-</p
+	    >A data-type using existential/universal types</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -1958,8 +1893,7 @@ test2
 		    ><a href=""
 		      >T</a
 		      ></code
-		    >
-</p
+		    ></p
 		  ></td
 		></tr
 	      ><tr
@@ -1973,8 +1907,7 @@ test2
 		  ></td
 		><td class="doc"
 		><p
-		  >This argument has type 'T2 Int Int'
-</p
+		  >This argument has type 'T2 Int Int'</p
 		  ></td
 		></tr
 	      ><tr
@@ -1996,8 +1929,7 @@ test2
 		><p
 		  >This argument has type <code
 		    >T3 Bool Bool -&gt; T4 Float Float</code
-		    >
-</p
+		    ></p
 		  ></td
 		></tr
 	      ><tr
@@ -2009,8 +1941,7 @@ test2
 		><p
 		  >This argument has a very long description that should
  hopefully cause some wrapping to happen when it is finally
- rendered by Haddock in the generated HTML page.
-</p
+ rendered by Haddock in the generated HTML page.</p
 		  ></td
 		></tr
 	      ><tr
@@ -2020,16 +1951,14 @@ test2
 		  > ()</td
 		><td class="doc"
 		><p
-		  >This is the result type
-</p
+		  >This is the result type</p
 		  ></td
 		></tr
 	      ></table
 	    ></div
 	  ><div class="doc"
 	  ><p
-	    >This is a function with documentation for each argument
-</p
+	    >This is a function with documentation for each argument</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -2052,8 +1981,7 @@ test2
 		  >)</td
 		><td class="doc"
 		><p
-		  >takes a triple
-</p
+		  >takes a triple</p
 		  ></td
 		></tr
 	      ><tr
@@ -2067,8 +1995,7 @@ test2
 		    ><a href=""
 		      >Int</a
 		      ></code
-		    >
-</p
+		    ></p
 		  ></td
 		></tr
 	      ></table
@@ -2098,8 +2025,7 @@ test2
 		  > ()</td
 		><td class="doc"
 		><p
-		  >one of the arguments
-</p
+		  >one of the arguments</p
 		  ></td
 		></tr
 	      ><tr
@@ -2111,16 +2037,14 @@ test2
 		  ></td
 		><td class="doc"
 		><p
-		  >and the return value
-</p
+		  >and the return value</p
 		  ></td
 		></tr
 	      ></table
 	    ></div
 	  ><div class="doc"
 	  ><p
-	    >This function has some arg docs
-</p
+	    >This function has some arg docs</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -2139,8 +2063,7 @@ test2
 		  ></td
 		><td class="doc"
 		><p
-		  >The input float
-</p
+		  >The input float</p
 		  ></td
 		></tr
 	      ><tr
@@ -2152,16 +2075,14 @@ test2
 		  ></td
 		><td class="doc"
 		><p
-		  >The output float
-</p
+		  >The output float</p
 		  ></td
 		></tr
 	      ></table
 	    ></div
 	  ><div class="doc"
 	  ><p
-	    >A foreign import with argument docs
-</p
+	    >A foreign import with argument docs</p
 	    ></div
 	  ></div
 	><h1 id="g:11"
@@ -2170,13 +2091,11 @@ test2
 	>A subsection</h2
 	><div class="doc"
 	><pre
-	  > a literal line
-</pre
+	  > a literal line</pre
 	  ><p
 	  >$ a non <em
 	    >literal</em
-	    > line $
-</p
+	    > line $</p
 	  ></div
 	><div class="top"
 	><p class="src"
@@ -2192,8 +2111,7 @@ test2
 		>f'</a
 		></code
 	      >
- but f' doesn't get link'd 'f\''
-</p
+ but f' doesn't get link'd 'f\''</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -2205,8 +2123,7 @@ test2
 	    ></p
 	  ><div class="doc"
 	  ><p
-	    >Comment on a definition with type signature
-</p
+	    >Comment on a definition with type signature</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -2216,8 +2133,7 @@ test2
 	    > ::  t</p
 	  ><div class="doc"
 	  ><p
-	    >Comment on a definition without type signature
-</p
+	    >Comment on a definition without type signature</p
 	    ></div
 	  ></div
 	></div
diff --git a/html-test/ref/Ticket112.html b/html-test/ref/Ticket112.html
index b80c18c4..a190c72b 100644
--- a/html-test/ref/Ticket112.html
+++ b/html-test/ref/Ticket112.html
@@ -65,8 +65,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket112.html");};
 	      ><a href=""
 		>Addr#</a
 		></code
-	      > to the string, and the length of the string.
-</p
+	      > to the string, and the length of the string.</p
 	    ></div
 	  ></div
 	></div
diff --git a/html-test/ref/Ticket253_1.html b/html-test/ref/Ticket253_1.html
index 2bcc2e21..cd4d19a7 100644
--- a/html-test/ref/Ticket253_1.html
+++ b/html-test/ref/Ticket253_1.html
@@ -69,15 +69,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket253_1.html");};
 	      ><a href=""
 		>bar</a
 		></code
-	      >.
-</p
+	      >.</p
 	    ><p
 	    >Also see <code
 	      ><a href=""
 		>Baz</a
 		></code
-	      >
-</p
+	      ></p
 	    ></div
 	  ></div
 	></div
diff --git a/html-test/ref/Ticket253_2.html b/html-test/ref/Ticket253_2.html
index aabe3486..fc3c2e51 100644
--- a/html-test/ref/Ticket253_2.html
+++ b/html-test/ref/Ticket253_2.html
@@ -73,8 +73,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket253_2.html");};
 	    ></p
 	  ><div class="doc"
 	  ><p
-	    >Comment
-</p
+	    >Comment</p
 	    ></div
 	  ></div
 	><div class="top"
diff --git a/html-test/ref/Ticket61.html b/html-test/ref/Ticket61.html
index e0858dc0..4ff68c29 100644
--- a/html-test/ref/Ticket61.html
+++ b/html-test/ref/Ticket61.html
@@ -62,8 +62,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket61.html");};
 	      > :: a</p
 	    ><div class="doc"
 	    ><p
-	      >A comment about f
-</p
+	      >A comment about f</p
 	      ></div
 	    ></div
 	  ></div
diff --git a/html-test/ref/Ticket75.html b/html-test/ref/Ticket75.html
index 4caa1196..c6746f39 100644
--- a/html-test/ref/Ticket75.html
+++ b/html-test/ref/Ticket75.html
@@ -99,8 +99,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket75.html");};
 	      ><a href=""
 		>:-</a
 		></code
-	      >
-</p
+	      ></p
 	    ></div
 	  ></div
 	></div
diff --git a/html-test/ref/TitledPicture.html b/html-test/ref/TitledPicture.html
index c3f2bbbc..7ed7ce85 100644
--- a/html-test/ref/TitledPicture.html
+++ b/html-test/ref/TitledPicture.html
@@ -76,8 +76,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TitledPicture.html");}
 		>foo</a
 		></code
 	      > without a title <img src="bar"
-	       />
-</p
+	       /></p
 	    ></div
 	  ></div
 	><div class="top"
@@ -94,8 +93,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TitledPicture.html");}
 		>bar</a
 		></code
 	      > with title <img src="un&#8739;&#8705;&#8728;" title="&#948;&#8712;"
-	       />
-</p
+	       /></p
 	    ></div
 	  ></div
 	></div
diff --git a/html-test/ref/TypeFamilies.html b/html-test/ref/TypeFamilies.html
index e7c4de6e..f3982eb6 100644
--- a/html-test/ref/TypeFamilies.html
+++ b/html-test/ref/TypeFamilies.html
@@ -105,8 +105,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	    > a :: *</p
 	  ><div class="doc"
 	  ><p
-	    >Type family G
-</p
+	    >Type family G</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -120,8 +119,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	    ></p
 	  ><div class="doc"
 	  ><p
-	    >A class with an associated type
-</p
+	    >A class with an associated type</p
 	    ></div
 	  ><div class="subs associated-types"
 	  ><p class="caption"
@@ -134,8 +132,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	      > a :: * -&gt; *</p
 	    ><div class="doc"
 	    ><p
-	      >An associated type
-</p
+	      >An associated type</p
 	      ></div
 	    ></div
 	  ><div class="subs methods"
@@ -151,8 +148,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	      ></p
 	    ><div class="doc"
 	    ><p
-	      >A method
-</p
+	      >A method</p
 	      ></div
 	    ></div
 	  ><div class="subs instances"
@@ -183,8 +179,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	    > a </p
 	  ><div class="doc"
 	  ><p
-	    >Doc for family
-</p
+	    >Doc for family</p
 	    ></div
 	  ></div
 	><div class="top"
diff --git a/html-test/ref/Unicode.html b/html-test/ref/Unicode.html
index 747cedb5..699ea209 100644
--- a/html-test/ref/Unicode.html
+++ b/html-test/ref/Unicode.html
@@ -65,8 +65,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Unicode.html");};
 	    ></p
 	  ><div class="doc"
 	  ><p
-	    >&#947;&#955;&#974;&#963;&#963;&#945;
-</p
+	    >&#947;&#955;&#974;&#963;&#963;&#945;</p
 	    ></div
 	  ></div
 	></div
diff --git a/html-test/ref/mini_Test.html b/html-test/ref/mini_Test.html
index 8cd3321a..3a01ff1c 100644
--- a/html-test/ref/mini_Test.html
+++ b/html-test/ref/mini_Test.html
@@ -232,7 +232,7 @@ window.onload = function () {pageLoad();};
       ><h1
       >A section</h1
       ><h2
-      >A subsection </h2
+      >A subsection</h2
       ><div class="top"
       ><p class="src"
 	><a href="" target="main"