diff options
24 files changed, 227 insertions, 225 deletions
diff --git a/html-test/ref/A.html b/html-test/ref/A.html index 0346574f..fbfb4a53 100644 --- a/html-test/ref/A.html +++ b/html-test/ref/A.html @@ -48,9 +48,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");}; ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >A</a - > = <a href="" + > = <a href="" >A</a ></li ><li class="src short" @@ -68,9 +68,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");}; ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >X</a - > = <a href="" + > = <a href="" >X</a ></li ><li class="src short" @@ -88,9 +88,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:A" class="def" + > <a name="t:A" class="def" >A</a - > </p + ></p ><div class="subs constructors" ><p class="caption" >Constructors</p @@ -130,9 +130,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:X" class="def" + > <a name="t:X" class="def" >X</a - > </p + ></p ><div class="doc" ><p >Should show up on the page for both modules A and B</p diff --git a/html-test/ref/AdvanceTypes.html b/html-test/ref/AdvanceTypes.html index 67920c82..f4c48805 100644 --- a/html-test/ref/AdvanceTypes.html +++ b/html-test/ref/AdvanceTypes.html @@ -48,9 +48,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_AdvanceTypes.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:Pattern" class="def" + > <a name="t:Pattern" class="def" >Pattern</a - > <span class="keyword" + > <span class="keyword" >where</span ></p ><div class="subs constructors" diff --git a/html-test/ref/B.html b/html-test/ref/B.html index ea408d0b..d9a8b948 100644 --- a/html-test/ref/B.html +++ b/html-test/ref/B.html @@ -64,9 +64,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");}; ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >X</a - > = <a href="" + > = <a href="" >X</a ></li ></ul @@ -134,9 +134,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:X" class="def" + > <a name="t:X" class="def" >X</a - > </p + ></p ><div class="doc" ><p >Should show up on the page for both modules A and B</p diff --git a/html-test/ref/Bug1.html b/html-test/ref/Bug1.html index 80e83425..f54093ac 100644 --- a/html-test/ref/Bug1.html +++ b/html-test/ref/Bug1.html @@ -48,9 +48,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug1.html");}; ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >T</a - > = <a href="" + > = <a href="" >T</a ></li ></ul @@ -62,9 +62,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug1.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:T" class="def" + > <a name="t:T" class="def" >T</a - > </p + ></p ><div class="doc" ><p >We should have different anchors for constructors and types/classes. This diff --git a/html-test/ref/Bug6.html b/html-test/ref/Bug6.html index 2fde3f10..5e7d5084 100644 --- a/html-test/ref/Bug6.html +++ b/html-test/ref/Bug6.html @@ -56,9 +56,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");}; ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >A</a - > = <a href="" + > = <a href="" >A</a > <a href="" >Int</a @@ -66,9 +66,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");}; ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >B</a - > = <a href="" + > = <a href="" >B</a > {<ul class="subs" ><li @@ -82,9 +82,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");}; ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >C</a - > = <a href="" + > = <a href="" >C</a > {<ul class="subs" ><li @@ -104,9 +104,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");}; ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >D</a - > = <a href="" + > = <a href="" >D</a > <a href="" >Int</a @@ -116,9 +116,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");}; ><li class="src short" ><span class="keyword" >newtype</span - > <a href="" + > <a href="" >E</a - > = <a href="" + > = <a href="" >E</a > <a href="" >Int</a @@ -132,9 +132,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:A" class="def" + > <a name="t:A" class="def" >A</a - > </p + ></p ><div class="doc" ><p >This record is exported without its field</p @@ -160,9 +160,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:B" class="def" + > <a name="t:B" class="def" >B</a - > </p + ></p ><div class="doc" ><p >.. with its field, but the field is named separately in the export list @@ -207,9 +207,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:C" class="def" + > <a name="t:C" class="def" >C</a - > </p + ></p ><div class="doc" ><p >.. with fields names as subordinate names in the export</p @@ -261,9 +261,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:D" class="def" + > <a name="t:D" class="def" >D</a - > </p + ></p ><div class="doc" ><p >.. with only some of the fields exported (we can't handle this one - @@ -292,9 +292,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");}; ><p class="src" ><span class="keyword" >newtype</span - > <a name="t:E" class="def" + > <a name="t:E" class="def" >E</a - > </p + ></p ><div class="doc" ><p >a newtype with a field</p diff --git a/html-test/ref/Bug7.html b/html-test/ref/Bug7.html index 9f964576..708e0b08 100644 --- a/html-test/ref/Bug7.html +++ b/html-test/ref/Bug7.html @@ -57,17 +57,17 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");}; ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >Foo</a - > = <a href="" + > = <a href="" >Foo</a ></li ><li class="src short" ><span class="keyword" >class</span - > <a href="" + > <a href="" >Bar</a - > x y </li + > x y</li ></ul ></div ><div id="interface" @@ -77,9 +77,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:Foo" class="def" + > <a name="t:Foo" class="def" >Foo</a - > </p + ></p ><div class="doc" ><p >The Foo datatype</p @@ -125,9 +125,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");}; ><p class="src" ><span class="keyword" >class</span - > <a name="t:Bar" class="def" + > <a name="t:Bar" class="def" >Bar</a - > x y </p + > x y</p ><div class="doc" ><p >The Bar class</p diff --git a/html-test/ref/Bug8.html b/html-test/ref/Bug8.html index 8d4b1129..f3845cb2 100644 --- a/html-test/ref/Bug8.html +++ b/html-test/ref/Bug8.html @@ -48,9 +48,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:Typ" class="def" + > <a name="t:Typ" class="def" >Typ</a - > </p + ></p ><div class="subs constructors" ><p class="caption" >Constructors</p diff --git a/html-test/ref/Bugs.html b/html-test/ref/Bugs.html index d38c455b..4f13ba4c 100644 --- a/html-test/ref/Bugs.html +++ b/html-test/ref/Bugs.html @@ -48,9 +48,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bugs.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:A" class="def" + > <a name="t:A" class="def" >A</a - > a </p + > a</p ><div class="subs constructors" ><p class="caption" >Constructors</p diff --git a/html-test/ref/DeprecatedClass.html b/html-test/ref/DeprecatedClass.html index ee6f2679..ecd162b0 100644 --- a/html-test/ref/DeprecatedClass.html +++ b/html-test/ref/DeprecatedClass.html @@ -48,9 +48,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedClass.html") ><li class="src short" ><span class="keyword" >class</span - > <a href="" + > <a href="" >SomeClass</a - > a <span class="keyword" + > a <span class="keyword" >where</span ><ul class="subs" ><li @@ -62,9 +62,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedClass.html") ><li class="src short" ><span class="keyword" >class</span - > <a href="" + > <a href="" >SomeOtherClass</a - > a <span class="keyword" + > a <span class="keyword" >where</span ><ul class="subs" ><li @@ -82,9 +82,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedClass.html") ><p class="src" ><span class="keyword" >class</span - > <a name="t:SomeClass" class="def" + > <a name="t:SomeClass" class="def" >SomeClass</a - > a <span class="keyword" + > a <span class="keyword" >where</span ></p ><div class="doc" @@ -116,9 +116,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedClass.html") ><p class="src" ><span class="keyword" >class</span - > <a name="t:SomeOtherClass" class="def" + > <a name="t:SomeOtherClass" class="def" >SomeOtherClass</a - > a <span class="keyword" + > a <span class="keyword" >where</span ></p ><div class="doc" diff --git a/html-test/ref/DeprecatedData.html b/html-test/ref/DeprecatedData.html index a0d659a9..c8fa945f 100644 --- a/html-test/ref/DeprecatedData.html +++ b/html-test/ref/DeprecatedData.html @@ -48,33 +48,33 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html"); ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >Foo</a - > <ul class="subs" + ><ul class="subs" ><li >= <a href="" >Foo</a - > </li + ></li ><li >| <a href="" >Bar</a - > </li + ></li ></ul ></li ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >One</a - > <ul class="subs" + ><ul class="subs" ><li >= <a href="" >One</a - > </li + ></li ><li >| <a href="" >Two</a - > </li + ></li ></ul ></li ></ul @@ -86,9 +86,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html"); ><p class="src" ><span class="keyword" >data</span - > <a name="t:Foo" class="def" + > <a name="t:Foo" class="def" >Foo</a - > </p + ></p ><div class="doc" ><div class="warning" ><p @@ -136,9 +136,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html"); ><p class="src" ><span class="keyword" >data</span - > <a name="t:One" class="def" + > <a name="t:One" class="def" >One</a - > </p + ></p ><div class="doc" ><div class="warning" ><p diff --git a/html-test/ref/DeprecatedNewtype.html b/html-test/ref/DeprecatedNewtype.html index 4a8024b4..cffea22c 100644 --- a/html-test/ref/DeprecatedNewtype.html +++ b/html-test/ref/DeprecatedNewtype.html @@ -48,9 +48,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedNewtype.html ><li class="src short" ><span class="keyword" >newtype</span - > <a href="" + > <a href="" >SomeNewType</a - > = <a href="" + > = <a href="" >SomeNewTypeConst</a > <a href="" >String</a @@ -58,9 +58,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedNewtype.html ><li class="src short" ><span class="keyword" >newtype</span - > <a href="" + > <a href="" >SomeOtherNewType</a - > = <a href="" + > = <a href="" >SomeOtherNewTypeConst</a > <a href="" >String</a @@ -74,9 +74,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedNewtype.html ><p class="src" ><span class="keyword" >newtype</span - > <a name="t:SomeNewType" class="def" + > <a name="t:SomeNewType" class="def" >SomeNewType</a - > </p + ></p ><div class="doc" ><div class="warning" ><p @@ -112,9 +112,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedNewtype.html ><p class="src" ><span class="keyword" >newtype</span - > <a name="t:SomeOtherNewType" class="def" + > <a name="t:SomeOtherNewType" class="def" >SomeOtherNewType</a - > </p + ></p ><div class="doc" ><div class="warning" ><p diff --git a/html-test/ref/DeprecatedRecord.html b/html-test/ref/DeprecatedRecord.html index d9a4abd4..28be718f 100644 --- a/html-test/ref/DeprecatedRecord.html +++ b/html-test/ref/DeprecatedRecord.html @@ -48,9 +48,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedRecord.html" ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >Foo</a - > = <a href="" + > = <a href="" >Foo</a > {<ul class="subs" ><li @@ -76,9 +76,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedRecord.html" ><p class="src" ><span class="keyword" >data</span - > <a name="t:Foo" class="def" + > <a name="t:Foo" class="def" >Foo</a - > </p + ></p ><div class="doc" ><p >type Foo</p diff --git a/html-test/ref/GADTRecords.html b/html-test/ref/GADTRecords.html index 63297c37..23c230e8 100644 --- a/html-test/ref/GADTRecords.html +++ b/html-test/ref/GADTRecords.html @@ -48,7 +48,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");}; ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >H1</a > a b <span class="keyword" >where</span @@ -58,7 +58,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");}; >C1</a > :: <a href="" >H1</a - > a b </li + > a b</li ><li ><a href="" >C2</a @@ -66,11 +66,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");}; >Ord</a > a => [a] -> <a href="" >H1</a - > a a </li + > a a</li ><li ><a href="" >C3</a - > :: { <ul class="subs" + > :: { <ul class="subs" ><li ><a href="" >field</a @@ -88,7 +88,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");}; ><li ><a href="" >C4</a - > :: { <ul class="subs" + > :: { <ul class="subs" ><li ><a href="" >field2</a @@ -110,7 +110,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:H1" class="def" + > <a name="t:H1" class="def" >H1</a > a b <span class="keyword" >where</span diff --git a/html-test/ref/Hash.html b/html-test/ref/Hash.html index c459b524..3be7c6e0 100644 --- a/html-test/ref/Hash.html +++ b/html-test/ref/Hash.html @@ -83,7 +83,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");}; ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >HashTable</a > key val</li ><li class="src short" @@ -123,9 +123,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");}; ><li class="src short" ><span class="keyword" >class</span - > <a href="" + > <a href="" >Hash</a - > a <span class="keyword" + > a <span class="keyword" >where</span ><ul class="subs" ><li @@ -147,9 +147,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:HashTable" class="def" + > <a name="t:HashTable" class="def" >HashTable</a - > key val </p + > key val</p ><div class="doc" ><p >A hash table with keys of type <code @@ -241,9 +241,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");}; ><p class="src" ><span class="keyword" >class</span - > <a name="t:Hash" class="def" + > <a name="t:Hash" class="def" >Hash</a - > a <span class="keyword" + > a <span class="keyword" >where</span ></p ><div class="doc" diff --git a/html-test/ref/HiddenInstances.html b/html-test/ref/HiddenInstances.html index 963ed6a6..94c0fef3 100644 --- a/html-test/ref/HiddenInstances.html +++ b/html-test/ref/HiddenInstances.html @@ -48,15 +48,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html") ><li class="src short" ><span class="keyword" >class</span - > <a href="" + > <a href="" >VisibleClass</a - > a </li + > a</li ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >VisibleData</a - > </li + ></li ></ul ></div ><div id="interface" @@ -66,9 +66,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html") ><p class="src" ><span class="keyword" >class</span - > <a name="t:VisibleClass" class="def" + > <a name="t:VisibleClass" class="def" >VisibleClass</a - > a </p + > a</p ><div class="doc" ><p >Should be visible</p @@ -110,9 +110,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html") ><p class="src" ><span class="keyword" >data</span - > <a name="t:VisibleData" class="def" + > <a name="t:VisibleData" class="def" >VisibleData</a - > </p + ></p ><div class="doc" ><p >Should be visible</p diff --git a/html-test/ref/HiddenInstancesB.html b/html-test/ref/HiddenInstancesB.html index eabd7e12..52251666 100644 --- a/html-test/ref/HiddenInstancesB.html +++ b/html-test/ref/HiddenInstancesB.html @@ -48,15 +48,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstancesB.html" ><li class="src short" ><span class="keyword" >class</span - > <a href="" + > <a href="" >Foo</a - > a </li + > a</li ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >Bar</a - > </li + ></li ></ul ></div ><div id="interface" @@ -66,9 +66,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstancesB.html" ><p class="src" ><span class="keyword" >class</span - > <a name="t:Foo" class="def" + > <a name="t:Foo" class="def" >Foo</a - > a </p + > a</p ><div class="doc" ><p >Should be visible</p @@ -98,9 +98,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstancesB.html" ><p class="src" ><span class="keyword" >data</span - > <a name="t:Bar" class="def" + > <a name="t:Bar" class="def" >Bar</a - > </p + ></p ><div class="doc" ><p >Should be visible</p diff --git a/html-test/ref/QuasiExpr.html b/html-test/ref/QuasiExpr.html index 4513720d..d4aef4be 100644 --- a/html-test/ref/QuasiExpr.html +++ b/html-test/ref/QuasiExpr.html @@ -48,9 +48,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:Expr" class="def" + > <a name="t:Expr" class="def" >Expr</a - > </p + ></p ><div class="subs constructors" ><p class="caption" >Constructors</p @@ -124,9 +124,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:BinOp" class="def" + > <a name="t:BinOp" class="def" >BinOp</a - > </p + ></p ><div class="subs constructors" ><p class="caption" >Constructors</p diff --git a/html-test/ref/SpuriousSuperclassConstraints.html b/html-test/ref/SpuriousSuperclassConstraints.html index 566eafd6..77e13467 100644 --- a/html-test/ref/SpuriousSuperclassConstraints.html +++ b/html-test/ref/SpuriousSuperclassConstraints.html @@ -74,9 +74,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_SpuriousSuperclassCons ><p class="src" ><span class="keyword" >data</span - > <a name="t:SomeType" class="def" + > <a name="t:SomeType" class="def" >SomeType</a - > f a </p + > f a</p ><div class="subs instances" ><p id="control.i:SomeType" class="caption collapser" onclick="toggleSection('i:SomeType')" >Instances</p diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html index b54b3a05..02146623 100644 --- a/html-test/ref/Test.html +++ b/html-test/ref/Test.html @@ -161,7 +161,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >T</a > a b<ul class="subs" ><li @@ -173,7 +173,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; >Maybe</a > <a href="" >Float</a - >) </li + >)</li ><li >| <a href="" >B</a @@ -185,87 +185,87 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; >Int</a > <a href="" >Float</a - >) </li + >)</li ></ul ></li ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >T2</a > a b</li ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >T3</a > a b<ul class="subs" ><li >= <a href="" >A1</a - > a </li + > a</li ><li >| <a href="" >B1</a - > b </li + > b</li ></ul ></li ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >T4</a > a b<ul class="subs" ><li >= <a href="" >A2</a - > a </li + > a</li ><li >| <a href="" >B2</a - > b </li + > b</li ></ul ></li ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >T5</a > a b<ul class="subs" ><li >= <a href="" >A3</a - > a </li + > a</li ><li >| <a href="" >B3</a - > b </li + > b</li ></ul ></li ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >T6</a - > <ul class="subs" + ><ul class="subs" ><li >= <a href="" >A4</a - > </li + ></li ><li >| <a href="" >B4</a - > </li + ></li ><li >| <a href="" >C4</a - > </li + ></li ></ul ></li ><li class="src short" ><span class="keyword" >newtype</span - > <a href="" + > <a href="" >N1</a > a = <a href="" >N1</a @@ -273,7 +273,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><li class="src short" ><span class="keyword" >newtype</span - > <a href="" + > <a href="" >N2</a > a b = <a href="" >N2</a @@ -287,7 +287,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><li class="src short" ><span class="keyword" >newtype</span - > <a href="" + > <a href="" >N3</a > a b = <a href="" >N3</a @@ -301,13 +301,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >N4</a > a b</li ><li class="src short" ><span class="keyword" >newtype</span - > <a href="" + > <a href="" >N5</a > a b = <a href="" >N5</a @@ -321,7 +321,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><li class="src short" ><span class="keyword" >newtype</span - > <a href="" + > <a href="" >N6</a > a b = <a href="" >N6</a @@ -335,7 +335,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><li class="src short" ><span class="keyword" >newtype</span - > <a href="" + > <a href="" >N7</a > a b = <a href="" >N7</a @@ -349,9 +349,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >R</a - > <ul class="subs" + ><ul class="subs" ><li >= <a href="" >C1</a @@ -367,7 +367,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; >q</a > :: <span class="keyword" >forall</span - > a. a -> a</li + > a. a -> a</li ><li ><a href="" >r</a @@ -429,9 +429,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >R1</a - > = <a href="" + > = <a href="" >C3</a > {<ul class="subs" ><li @@ -461,7 +461,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; >D</a > a => <a href="" >C</a - > a <span class="keyword" + > a <span class="keyword" >where</span ><ul class="subs" ><li @@ -479,9 +479,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><li class="src short" ><span class="keyword" >class</span - > <a href="" + > <a href="" >D</a - > a <span class="keyword" + > a <span class="keyword" >where</span ><ul class="subs" ><li @@ -499,15 +499,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><li class="src short" ><span class="keyword" >class</span - > <a href="" + > <a href="" >E</a - > a </li + > a</li ><li class="src short" ><span class="keyword" >class</span - > <a href="" + > <a href="" >F</a - > a <span class="keyword" + > a <span class="keyword" >where</span ><ul class="subs" ><li @@ -547,7 +547,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >Ex</a > a<ul class="subs" ><li @@ -557,13 +557,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; >C</a > b => <a href="" >Ex1</a - > b </li + > b</li ><li >| <span class="keyword" >forall</span > b . <a href="" >Ex2</a - > b </li + > b</li ><li >| <span class="keyword" >forall</span @@ -571,13 +571,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; >C</a > a => <a href="" >Ex3</a - > b </li + > b</li ><li >| <a href="" >Ex4</a > (<span class="keyword" >forall</span - > a. a -> a) </li + > a. a -> a)</li ></ul ></li ><li class="src short" @@ -669,9 +669,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:T" class="def" + > <a name="t:T" class="def" >T</a - > a b </p + > a b</p ><div class="doc" ><p >This comment applies to the <em @@ -732,9 +732,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:T2" class="def" + > <a name="t:T2" class="def" >T2</a - > a b </p + > a b</p ><div class="doc" ><p >An abstract data declaration</p @@ -744,9 +744,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:T3" class="def" + > <a name="t:T3" class="def" >T3</a - > a b </p + > a b</p ><div class="doc" ><p >A data declaration with no documentation annotations on the constructors</p @@ -778,9 +778,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:T4" class="def" + > <a name="t:T4" class="def" >T4</a - > a b </p + > a b</p ><div class="subs constructors" ><p class="caption" >Constructors</p @@ -808,9 +808,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:T5" class="def" + > <a name="t:T5" class="def" >T5</a - > a b </p + > a b</p ><div class="subs constructors" ><p class="caption" >Constructors</p @@ -850,9 +850,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:T6" class="def" + > <a name="t:T6" class="def" >T6</a - > </p + ></p ><div class="doc" ><p >Testing alternative comment styles</p @@ -910,9 +910,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><span class="keyword" >newtype</span - > <a name="t:N1" class="def" + > <a name="t:N1" class="def" >N1</a - > a </p + > a</p ><div class="doc" ><p >A newtype</p @@ -936,9 +936,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><span class="keyword" >newtype</span - > <a name="t:N2" class="def" + > <a name="t:N2" class="def" >N2</a - > a b </p + > a b</p ><div class="doc" ><p >A newtype with a fieldname</p @@ -980,9 +980,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><span class="keyword" >newtype</span - > <a name="t:N3" class="def" + > <a name="t:N3" class="def" >N3</a - > a b </p + > a b</p ><div class="doc" ><p >A newtype with a fieldname, documentation on the field</p @@ -1030,9 +1030,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:N4" class="def" + > <a name="t:N4" class="def" >N4</a - > a b </p + > a b</p ><div class="doc" ><p >An abstract newtype - we show this one as data rather than newtype because @@ -1043,9 +1043,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><span class="keyword" >newtype</span - > <a name="t:N5" class="def" + > <a name="t:N5" class="def" >N5</a - > a b </p + > a b</p ><div class="subs constructors" ><p class="caption" >Constructors</p @@ -1085,9 +1085,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><span class="keyword" >newtype</span - > <a name="t:N6" class="def" + > <a name="t:N6" class="def" >N6</a - > a b </p + > a b</p ><div class="subs constructors" ><p class="caption" >Constructors</p @@ -1127,9 +1127,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><span class="keyword" >newtype</span - > <a name="t:N7" class="def" + > <a name="t:N7" class="def" >N7</a - > a b </p + > a b</p ><div class="doc" ><p >docs on the newtype and the constructor</p @@ -1179,9 +1179,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:R" class="def" + > <a name="t:R" class="def" >R</a - > </p + ></p ><div class="doc" ><p >This is the documentation for the <code @@ -1250,7 +1250,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; >q</a > :: <span class="keyword" >forall</span - > a. a -> a</dt + > a. a -> a</dt ><dd class="doc" ><p >This comment applies to the <code @@ -1376,9 +1376,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:R1" class="def" + > <a name="t:R1" class="def" >R1</a - > </p + ></p ><div class="doc" ><p >Testing different record commenting styles</p @@ -1472,7 +1472,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; >D</a > a => <a name="t:C" class="def" >C</a - > a <span class="keyword" + > a <span class="keyword" >where</span ></p ><div class="doc" @@ -1520,9 +1520,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><span class="keyword" >class</span - > <a name="t:D" class="def" + > <a name="t:D" class="def" >D</a - > a <span class="keyword" + > a <span class="keyword" >where</span ></p ><div class="doc" @@ -1576,9 +1576,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><span class="keyword" >class</span - > <a name="t:E" class="def" + > <a name="t:E" class="def" >E</a - > a </p + > a</p ><div class="doc" ><p >This is a class declaration with no methods (or no methods exported)</p @@ -1588,9 +1588,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><span class="keyword" >class</span - > <a name="t:F" class="def" + > <a name="t:F" class="def" >F</a - > a <span class="keyword" + > a <span class="keyword" >where</span ></p ><div class="subs methods" @@ -1807,9 +1807,9 @@ test2 ><p class="src" ><span class="keyword" >data</span - > <a name="t:Ex" class="def" + > <a name="t:Ex" class="def" >Ex</a - > a </p + > a</p ><div class="doc" ><p >A data-type using existential/universal types</p @@ -1858,7 +1858,7 @@ test2 >Ex4</a > (<span class="keyword" >forall</span - > a. a -> a)</td + > a. a -> a)</td ><td class="doc empty" > </td ></tr diff --git a/html-test/ref/Ticket253_2.html b/html-test/ref/Ticket253_2.html index fc3c2e51..4bc7a237 100644 --- a/html-test/ref/Ticket253_2.html +++ b/html-test/ref/Ticket253_2.html @@ -54,9 +54,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket253_2.html");}; ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >Baz</a - > = <a href="" + > = <a href="" >Baz</a ></li ></ul @@ -80,9 +80,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket253_2.html");}; ><p class="src" ><span class="keyword" >data</span - > <a name="t:Baz" class="def" + > <a name="t:Baz" class="def" >Baz</a - > </p + ></p ><div class="subs constructors" ><p class="caption" >Constructors</p diff --git a/html-test/ref/Ticket61.html b/html-test/ref/Ticket61.html index 4ff68c29..31ffa62d 100644 --- a/html-test/ref/Ticket61.html +++ b/html-test/ref/Ticket61.html @@ -48,9 +48,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket61.html");}; ><p class="src" ><span class="keyword" >class</span - > <a name="t:C" class="def" + > <a name="t:C" class="def" >C</a - > a <span class="keyword" + > a <span class="keyword" >where</span ></p ><div class="subs methods" diff --git a/html-test/ref/TypeFamilies.html b/html-test/ref/TypeFamilies.html index f3982eb6..27a4564c 100644 --- a/html-test/ref/TypeFamilies.html +++ b/html-test/ref/TypeFamilies.html @@ -54,9 +54,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");}; ><li class="src short" ><span class="keyword" >class</span - > <a href="" + > <a href="" >A</a - > a <span class="keyword" + > a <span class="keyword" >where</span ><ul class="subs" ><li @@ -80,7 +80,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");}; >type family</span > <a href="" >F</a - > a </li + > a</li ><li class="src short" ><a href="" >g</a @@ -112,9 +112,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");}; ><p class="src" ><span class="keyword" >class</span - > <a name="t:A" class="def" + > <a name="t:A" class="def" >A</a - > a <span class="keyword" + > a <span class="keyword" >where</span ></p ><div class="doc" @@ -176,7 +176,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");}; >type family</span > <a name="t:F" class="def" >F</a - > a </p + > a</p ><div class="doc" ><p >Doc for family</p diff --git a/html-test/ref/TypeOperators.html b/html-test/ref/TypeOperators.html index 0c5a5c2d..fa02b57e 100644 --- a/html-test/ref/TypeOperators.html +++ b/html-test/ref/TypeOperators.html @@ -58,25 +58,25 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");} ><li class="src short" ><span class="keyword" >data</span - > a <a href="" + > a <a href="" >:-:</a > b</li ><li class="src short" ><span class="keyword" >data</span - > (a <a href="" + > (a <a href="" >:+:</a > b) c</li ><li class="src short" ><span class="keyword" >data</span - > <a href="" + > <a href="" >Op</a > a b</li ><li class="src short" ><span class="keyword" >newtype</span - > <a href="" + > <a href="" >O</a > g f a = <a href="" >O</a @@ -102,33 +102,33 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");} ><p class="src" ><span class="keyword" >data</span - > a <a name="t::-45-:" class="def" + > a <a name="t::-45-:" class="def" >:-:</a - > b </p + > b</p ></div ><div class="top" ><p class="src" ><span class="keyword" >data</span - > (a <a name="t::-43-:" class="def" + > (a <a name="t::-43-:" class="def" >:+:</a - > b) c </p + > b) c</p ></div ><div class="top" ><p class="src" ><span class="keyword" >data</span - > <a name="t:Op" class="def" + > <a name="t:Op" class="def" >Op</a - > a b </p + > a b</p ></div ><div class="top" ><p class="src" ><span class="keyword" >newtype</span - > <a name="t:O" class="def" + > <a name="t:O" class="def" >O</a - > g f a </p + > g f a</p ><div class="subs constructors" ><p class="caption" >Constructors</p diff --git a/src/Haddock/Backends/Xhtml/Utils.hs b/src/Haddock/Backends/Xhtml/Utils.hs index be1fcb9b..232e18cc 100644 --- a/src/Haddock/Backends/Xhtml/Utils.hs +++ b/src/Haddock/Backends/Xhtml/Utils.hs @@ -103,7 +103,9 @@ hsep htmls = foldr1 (\a b -> a+++" "+++b) htmls infixr 8 <+> (<+>) :: Html -> Html -> Html -a <+> b = a +++ toHtml " " +++ b +a <+> b = a +++ sep +++ b + where + sep = if isNoHtml a || isNoHtml b then noHtml else toHtml " " keyword :: String -> Html |