`html-test --accept` deltas to reference samples

8 files changed, 183 insertions, 115 deletions

diff --git a/html-test/ref/Bug8.html b/html-test/ref/Bug8.html
index d2c03ab3..d6cef1b2 100644
--- a/html-test/ref/Bug8.html
+++ b/html-test/ref/Bug8.html
@@ -89,7 +89,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");
 	><p class="src"
 	  ><a id="v:-45--45--62-" class="def"
 	    >(--&gt;)</a
-	    > :: t -&gt; t1 -&gt; <a href="#"
+	    > :: p1 -&gt; p2 -&gt; <a href="#"
 	    >Typ</a
 	    > <span class="fixity"
 	    >infix 9</span
@@ -147,4 +147,4 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug8.html&quot;);
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Instances.html b/html-test/ref/Instances.html
index b0eb39cb..ba6ef185 100644
--- a/html-test/ref/Instances.html
+++ b/html-test/ref/Instances.html
@@ -276,48 +276,6 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      ></span
 		      > <a href="#"
 		      >Foo</a
-		      > ((-&gt;) a)</span
-		    > <a href="#" class="selflink"
-		    >#</a
-		    ></td
-		  ><td class="doc empty"
-		  ></td
-		  ></tr
-		><tr
-		><td colspan="2"
-		  ><div id="section.i:ic:Foo:Foo:3" class="inst-details hide"
-		    ><div class="subs methods"
-		      ><p class="caption"
-			>Methods</p
-			><p class="src"
-			><a href="#"
-			  >foo</a
-			  > :: (a -&gt; <a href="#"
-			  >Int</a
-			  >) -&gt; a -&gt; a -&gt; a <a href="#" class="selflink"
-			  >#</a
-			  ></p
-			><p class="src"
-			><a href="#"
-			  >foo'</a
-			  > :: (a -&gt; a -&gt; a) -&gt; <a href="#"
-			  >Int</a
-			  > -&gt; a -&gt; a -&gt; <a href="#"
-			  >Int</a
-			  > <a href="#" class="selflink"
-			  >#</a
-			  ></p
-			></div
-		      ></div
-		    ></td
-		  ></tr
-		><tr
-		><td class="src clearfix"
-		  ><span class="inst-left"
-		    ><span id="control.i:ic:Foo:Foo:4" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:4')"
-		      ></span
-		      > <a href="#"
-		      >Foo</a
 		      > (<a href="#"
 		      >Either</a
 		      > a)</span
@@ -329,7 +287,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		  ></tr
 		><tr
 		><td colspan="2"
-		  ><div id="section.i:ic:Foo:Foo:4" class="inst-details hide"
+		  ><div id="section.i:ic:Foo:Foo:3" class="inst-details hide"
 		    ><div class="subs methods"
 		      ><p class="caption"
 			>Methods</p
@@ -370,7 +328,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
-		    ><span id="control.i:ic:Foo:Foo:5" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:5')"
+		    ><span id="control.i:ic:Foo:Foo:4" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:4')"
 		      ></span
 		      > (<a href="#"
 		      >Eq</a
@@ -389,7 +347,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		  ></tr
 		><tr
 		><td colspan="2"
-		  ><div id="section.i:ic:Foo:Foo:5" class="inst-details hide"
+		  ><div id="section.i:ic:Foo:Foo:4" class="inst-details hide"
 		    ><div class="subs methods"
 		      ><p class="caption"
 			>Methods</p
@@ -418,7 +376,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
-		    ><span id="control.i:ic:Foo:Foo:6" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:6')"
+		    ><span id="control.i:ic:Foo:Foo:5" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:5')"
 		      ></span
 		      > <a href="#"
 		      >Foo</a
@@ -433,7 +391,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		  ></tr
 		><tr
 		><td colspan="2"
-		  ><div id="section.i:ic:Foo:Foo:6" class="inst-details hide"
+		  ><div id="section.i:ic:Foo:Foo:5" class="inst-details hide"
 		    ><div class="subs methods"
 		      ><p class="caption"
 			>Methods</p
@@ -474,7 +432,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
-		    ><span id="control.i:ic:Foo:Foo:7" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:7')"
+		    ><span id="control.i:ic:Foo:Foo:6" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:6')"
 		      ></span
 		      > <a href="#"
 		      >Foo</a
@@ -489,7 +447,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		  ></tr
 		><tr
 		><td colspan="2"
-		  ><div id="section.i:ic:Foo:Foo:7" class="inst-details hide"
+		  ><div id="section.i:ic:Foo:Foo:6" class="inst-details hide"
 		    ><div class="subs methods"
 		      ><p class="caption"
 			>Methods</p
@@ -518,7 +476,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
-		    ><span id="control.i:ic:Foo:Foo:8" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:8')"
+		    ><span id="control.i:ic:Foo:Foo:7" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:7')"
 		      ></span
 		      > <a href="#"
 		      >Foo</a
@@ -533,7 +491,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		  ></tr
 		><tr
 		><td colspan="2"
-		  ><div id="section.i:ic:Foo:Foo:8" class="inst-details hide"
+		  ><div id="section.i:ic:Foo:Foo:7" class="inst-details hide"
 		    ><div class="subs methods"
 		      ><p class="caption"
 			>Methods</p
@@ -571,6 +529,76 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      ></div
 		    ></td
 		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Foo:Foo:8" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:8')"
+		      ></span
+		      > <a href="#"
+		      >Foo</a
+		      > ((-&gt;) <a href="#"
+		      >LiftedRep</a
+		      > <a href="#"
+		      >LiftedRep</a
+		      > a)</span
+		    > <a href="#" class="selflink"
+		    >#</a
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Foo:Foo:8" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >foo</a
+			  > :: (<a href="#"
+			  >LiftedRep</a
+			  > -&gt; <a href="#"
+			  >LiftedRep</a
+			  >) a <a href="#"
+			  >Int</a
+			  > -&gt; a -&gt; (<a href="#"
+			  >LiftedRep</a
+			  > -&gt; <a href="#"
+			  >LiftedRep</a
+			  >) a a <a href="#" class="selflink"
+			  >#</a
+			  ></p
+			><p class="src"
+			><a href="#"
+			  >foo'</a
+			  > :: (<a href="#"
+			  >LiftedRep</a
+			  > -&gt; <a href="#"
+			  >LiftedRep</a
+			  >) a ((<a href="#"
+			  >LiftedRep</a
+			  > -&gt; <a href="#"
+			  >LiftedRep</a
+			  >) a a) -&gt; <a href="#"
+			  >Int</a
+			  > -&gt; (<a href="#"
+			  >LiftedRep</a
+			  > -&gt; <a href="#"
+			  >LiftedRep</a
+			  >) a ((<a href="#"
+			  >LiftedRep</a
+			  > -&gt; <a href="#"
+			  >LiftedRep</a
+			  >) a <a href="#"
+			  >Int</a
+			  >) <a href="#" class="selflink"
+			  >#</a
+			  ></p
+			></div
+		      ></div
+		    ></td
+		  ></tr
 		></table
 	      ></div
 	    ></div
@@ -608,7 +636,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 	    ><p class="src"
 	    ><a id="v:bar0" class="def"
 	      >bar0</a
-	      >, <a id="v:bar1" class="def"
+	      > :: (f a, f a) -&gt; (f b, f c) <a href="#" class="selflink"
+	      >#</a
+	      ></p
+	    ><p class="src"
+	    ><a id="v:bar1" class="def"
 	      >bar1</a
 	      > :: (f a, f a) -&gt; (f b, f c) <a href="#" class="selflink"
 	      >#</a
@@ -1953,4 +1985,4 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Minimal.html b/html-test/ref/Minimal.html
index 0374ad8a..ac28b0d9 100644
--- a/html-test/ref/Minimal.html
+++ b/html-test/ref/Minimal.html
@@ -132,26 +132,6 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Minimal.html&quot
 	    > <a href="#" class="selflink"
 	    >#</a
 	    ></p
-	  ><div class="subs minimal"
-	  ><p class="caption"
-	    >Minimal complete definition</p
-	    ><p class="src"
-	    ><a href="#"
-	      >a</a
-	      >, <a href="#"
-	      >b</a
-	      >, <a href="#"
-	      >c</a
-	      > | <a href="#"
-	      >d</a
-	      > | <a href="#"
-	      >e</a
-	      >, (<a href="#"
-	      >f</a
-	      > | <a href="#"
-	      >g</a
-	      >)</p
-	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
@@ -345,4 +325,4 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Minimal.html&quot
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Operators.html b/html-test/ref/Operators.html
index 8a54ce3f..27b3427d 100644
--- a/html-test/ref/Operators.html
+++ b/html-test/ref/Operators.html
@@ -97,7 +97,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	    >(:+)</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > t. t -&gt; t -&gt; [t]</li
+	    > a. a -&gt; a -&gt; [a]</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
@@ -271,7 +271,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	    >(:+)</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > t. t -&gt; t -&gt; [t] <span class="fixity"
+	    > a. a -&gt; a -&gt; [a] <span class="fixity"
 	    >infixr 3</span
 	    ><span class="rightedge"
 	    ></span
@@ -432,12 +432,18 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	    ><p class="src"
 	    ><a id="v:-62--62--60-" class="def"
 	      >(&gt;&gt;&lt;)</a
-	      >, <a id="v:-60--60--62-" class="def"
+	      > :: a -&gt; b -&gt; () <span class="fixity"
+	      >infixr 4</span
+	      ><span class="rightedge"
+	      ></span
+	      > <a href="#" class="selflink"
+	      >#</a
+	      ></p
+	    ><p class="src"
+	    ><a id="v:-60--60--62-" class="def"
 	      >(&lt;&lt;&gt;)</a
 	      > :: a -&gt; b -&gt; () <span class="fixity"
-	      >infixl 5 &lt;&lt;&gt;</span
-	      ><span class="fixity"
-	      >infixr 4 &gt;&gt;&lt;</span
+	      >infixl 5</span
 	      ><span class="rightedge"
 	      ></span
 	      > <a href="#" class="selflink"
@@ -446,16 +452,50 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	    ><p class="src"
 	    ><a id="v:-42--42--62-" class="def"
 	      >(**&gt;)</a
-	      >, <a id="v:-42--42--60-" class="def"
+	      > :: a -&gt; a -&gt; () <span class="fixity"
+	      >infixr 8</span
+	      ><span class="rightedge"
+	      ></span
+	      > <a href="#" class="selflink"
+	      >#</a
+	      ></p
+	    ><div class="doc"
+	    ><p
+	      >Multiple fixities</p
+	      ></div
+	    ><p class="src"
+	    ><a id="v:-42--42--60-" class="def"
 	      >(**&lt;)</a
-	      >, <a id="v:-62--42--42-" class="def"
+	      > :: a -&gt; a -&gt; () <span class="fixity"
+	      >infixl 8</span
+	      ><span class="rightedge"
+	      ></span
+	      > <a href="#" class="selflink"
+	      >#</a
+	      ></p
+	    ><div class="doc"
+	    ><p
+	      >Multiple fixities</p
+	      ></div
+	    ><p class="src"
+	    ><a id="v:-62--42--42-" class="def"
 	      >(&gt;**)</a
-	      >, <a id="v:-60--42--42-" class="def"
+	      > :: a -&gt; a -&gt; () <span class="fixity"
+	      >infixr 8</span
+	      ><span class="rightedge"
+	      ></span
+	      > <a href="#" class="selflink"
+	      >#</a
+	      ></p
+	    ><div class="doc"
+	    ><p
+	      >Multiple fixities</p
+	      ></div
+	    ><p class="src"
+	    ><a id="v:-60--42--42-" class="def"
 	      >(&lt;**)</a
 	      > :: a -&gt; a -&gt; () <span class="fixity"
-	      >infixr 8 **&gt;, &gt;**</span
-	      ><span class="fixity"
-	      >infixl 8 **&lt;, &lt;**</span
+	      >infixl 8</span
 	      ><span class="rightedge"
 	      ></span
 	      > <a href="#" class="selflink"
@@ -493,4 +533,4 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/PatternSyns.html b/html-test/ref/PatternSyns.html
index 242803c2..2052d87c 100644
--- a/html-test/ref/PatternSyns.html
+++ b/html-test/ref/PatternSyns.html
@@ -69,9 +69,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    >Foo</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > t. t -&gt; <a href="#"
+	    > x. x -&gt; <a href="#"
 	    >FooType</a
-	    > t</li
+	    > x</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >pattern</span
@@ -79,11 +79,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    >Bar</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > t. t -&gt; <a href="#"
+	    > x. x -&gt; <a href="#"
 	    >FooType</a
 	    > (<a href="#"
 	    >FooType</a
-	    > t)</li
+	    > x)</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >pattern</span
@@ -91,17 +91,19 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    >(:&lt;-&gt;)</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > t t1. t -&gt; t1 -&gt; (<a href="#"
+	    > x x1. x -&gt; x1 -&gt; (<a href="#"
 	    >FooType</a
-	    > t, <a href="#"
+	    > x, <a href="#"
 	    >FooType</a
 	    > (<a href="#"
 	    >FooType</a
-	    > t1))</li
+	    > x1))</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a href="#"
+	    > (a :: <a href="#"
+	    >*</a
+	    >) <a href="#"
 	    >&gt;&lt;</a
 	    > b = <a href="#"
 	    >Empty</a
@@ -113,9 +115,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    >E</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > k t t1. <a href="#"
+	    > k a (b :: k). <a href="#"
 	    >(&gt;&lt;)</a
-	    > k t t1</li
+	    > k a b</li
 	  ></ul
 	></div
       ><div id="interface"
@@ -157,9 +159,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    >Foo</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > t. t -&gt; <a href="#"
+	    > x. x -&gt; <a href="#"
 	    >FooType</a
-	    > t <a href="#" class="selflink"
+	    > x <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -179,11 +181,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    >Bar</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > t. t -&gt; <a href="#"
+	    > x. x -&gt; <a href="#"
 	    >FooType</a
 	    > (<a href="#"
 	    >FooType</a
-	    > t) <a href="#" class="selflink"
+	    > x) <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -203,13 +205,13 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    >(:&lt;-&gt;)</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > t t1. t -&gt; t1 -&gt; (<a href="#"
+	    > x x1. x -&gt; x1 -&gt; (<a href="#"
 	    >FooType</a
-	    > t, <a href="#"
+	    > x, <a href="#"
 	    >FooType</a
 	    > (<a href="#"
 	    >FooType</a
-	    > t1)) <a href="#" class="selflink"
+	    > x1)) <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -225,7 +227,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a id="t:-62--60-" class="def"
+	    > (a :: <a href="#"
+	    >*</a
+	    >) <a id="t:-62--60-" class="def"
 	    >&gt;&lt;</a
 	    > b <a href="#" class="selflink"
 	    >#</a
@@ -261,9 +265,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    >E</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > k t t1. <a href="#"
+	    > k a (b :: k). <a href="#"
 	    >(&gt;&lt;)</a
-	    > k t t1 <a href="#" class="selflink"
+	    > k a b <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -281,4 +285,4 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/SpuriousSuperclassConstraints.html b/html-test/ref/SpuriousSuperclassConstraints.html
index ab796909..285ab05c 100644
--- a/html-test/ref/SpuriousSuperclassConstraints.html
+++ b/html-test/ref/SpuriousSuperclassConstraints.html
@@ -181,6 +181,18 @@ Fix spurious superclass constraints bug.</pre
 			  ></p
 			><p class="src"
 			><a href="#"
+			  >liftA2</a
+			  > :: (a -&gt; b -&gt; c) -&gt; <a href="#"
+			  >SomeType</a
+			  > f a -&gt; <a href="#"
+			  >SomeType</a
+			  > f b -&gt; <a href="#"
+			  >SomeType</a
+			  > f c <a href="#" class="selflink"
+			  >#</a
+			  ></p
+			><p class="src"
+			><a href="#"
 			  >(*&gt;)</a
 			  > :: <a href="#"
 			  >SomeType</a
@@ -217,4 +229,4 @@ Fix spurious superclass constraints bug.</pre
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/TH2.html b/html-test/ref/TH2.html
index c9bcafef..71bc1083 100644
--- a/html-test/ref/TH2.html
+++ b/html-test/ref/TH2.html
@@ -49,7 +49,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TH2.html&quot;);}
 	><p class="src"
 	  ><a id="v:f" class="def"
 	    >f</a
-	    > :: t -&gt; t <a href="#" class="selflink"
+	    > :: p -&gt; p <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
@@ -59,4 +59,4 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TH2.html&quot;);}
     ></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 ca794e51..2890ca6b 100644
--- a/html-test/ref/Threaded_TH.html
+++ b/html-test/ref/Threaded_TH.html
@@ -36,7 +36,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Threaded_TH.html&
 	  ><th
 	    >Safe Haskell</th
 	    ><td
-	    >None</td
+	    >Safe</td
 	    ></tr
 	  ></table
 	><p class="caption"
@@ -87,4 +87,4 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Threaded_TH.html&
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file