diff options
Diffstat (limited to 'html-test')
44 files changed, 901 insertions, 145 deletions
diff --git a/html-test/ref/Bold.html b/html-test/ref/Bold.html index d936a720..7151862d 100644 --- a/html-test/ref/Bold.html +++ b/html-test/ref/Bold.html @@ -17,11 +17,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bold.html");}; ><div id="package-header" ><ul class="links" id="page-menu" ><li - ><a href="index.html" + ><a href="" >Contents</a ></li ><li - ><a href="doc-index.html" + ><a href="" >Index</a ></li ></ul @@ -46,9 +46,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bold.html");}; >Synopsis</p ><ul id="section.syn" class="hide" onclick="toggleSection('syn')" ><li class="src short" - ><a href="#v:foo" + ><a href="" >foo</a - > :: t</li + > :: t</li ></ul ></div ><div id="interface" @@ -58,7 +58,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bold.html");}; ><p class="src" ><a name="v:foo" class="def" >foo</a - > :: t</p + > :: t</p ><div class="doc" ><p >Some <strong @@ -90,7 +90,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bold.html");}; ></div ><div id="footer" ><p - >Produced by <a href="http://www.haskell.org/haddock/" + >Produced by <a href="" >Haddock</a > version 2.15.0</p ></div diff --git a/html-test/ref/Bug26.html b/html-test/ref/Bug26.html new file mode 100644 index 00000000..117286ce --- /dev/null +++ b/html-test/ref/Bug26.html @@ -0,0 +1,175 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" +><head + ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" + /><title + >Bug26</title + ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean" + /><script src="haddock-util.js" type="text/javascript" + ></script + ><script type="text/javascript" + >//<![CDATA[ +window.onload = function () {pageLoad();setSynopsis("mini_Bug26.html");}; +//]]> +</script + ></head + ><body + ><div id="package-header" + ><ul class="links" id="page-menu" + ><li + ><a href="" + >Contents</a + ></li + ><li + ><a href="" + >Index</a + ></li + ></ul + ><p class="caption empty" + > </p + ></div + ><div id="content" + ><div id="module-header" + ><table class="info" + ><tr + ><th + >Safe Haskell</th + ><td + >Safe-Inferred</td + ></tr + ></table + ><p class="caption" + >Bug26</p + ></div + ><div id="description" + ><p class="caption" + >Description</p + ><div class="doc" + ><p + >This module tests the ‘@since …’ annotation.</p + ><p + ><em + >Since: 1.2.3</em + ></p + ></div + ></div + ><div id="synopsis" + ><p id="control.syn" class="caption expander" onclick="toggleSection('syn')" + >Synopsis</p + ><ul id="section.syn" class="hide" onclick="toggleSection('syn')" + ><li class="src short" + ><a href="" + >f</a + > :: ()</li + ><li class="src short" + ><a href="" + >g</a + > :: ()</li + ><li class="src short" + ><span class="keyword" + >class</span + > <a href="" + >C</a + > a <span class="keyword" + >where</span + ><ul class="subs" + ><li + ><a href="" + >c_f</a + > :: a</li + ></ul + ></li + ></ul + ></div + ><div id="interface" + ><h1 + >Documentation</h1 + ><div class="top" + ><p class="src" + ><a name="v:f" class="def" + >f</a + > :: ()</p + ><div class="doc" + ><p + >Foo</p + ><p + ><em + >Since: 2.10.8</em + ></p + ></div + ></div + ><div class="top" + ><p class="src" + ><a name="v:g" class="def" + >g</a + > :: ()</p + ><div class="doc" + ><p + >Bar</p + ></div + ></div + ><div class="top" + ><p class="src" + ><span class="keyword" + >class</span + > <a name="t:C" class="def" + >C</a + > a <span class="keyword" + >where</span + ></p + ><div class="doc" + ><p + >Class</p + ><p + ><em + >Since: 1.0</em + ></p + ></div + ><div class="subs methods" + ><p class="caption" + >Methods</p + ><p class="src" + ><a name="v:c_f" class="def" + >c_f</a + > :: a</p + ><div class="doc" + ><p + ><em + >Since: 1.2.3</em + ></p + ></div + ></div + ><div class="subs instances" + ><p id="control.i:C" class="caption collapser" onclick="toggleSection('i:C')" + >Instances</p + ><div id="section.i:C" class="show" + ><table + ><tr + ><td class="src" + ><a href="" + >C</a + > ()</td + ><td class="doc" + ><p + >instance for ()</p + ><p + ><em + >Since: 0.7.8</em + ></p + ></td + ></tr + ></table + ></div + ></div + ></div + ></div + ></div + ><div id="footer" + ><p + >Produced by <a href="" + >Haddock</a + > version 2.15.1</p + ></div + ></body + ></html +> diff --git a/html-test/ref/Bug298.html b/html-test/ref/Bug298.html index 03ed5eeb..040eccc4 100644 --- a/html-test/ref/Bug298.html +++ b/html-test/ref/Bug298.html @@ -48,19 +48,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug298.html");}; ><li class="src short" ><a href="" >(<^>)</a - > :: (a -> a) -> a -> a</li + > :: (a -> a) -> a -> a</li ><li class="src short" ><a href="" >(<^)</a - > :: a -> a -> a</li + > :: a -> a -> a</li ><li class="src short" ><a href="" >(^>)</a - > :: a -> a -> a</li + > :: a -> a -> a</li ><li class="src short" ><a href="" >(⋆^)</a - > :: a -> a -> a</li + > :: a -> a -> a</li ><li class="src short" ><a href="" >f</a @@ -74,25 +74,25 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug298.html");}; ><p class="src" ><a name="v:-60--94--62-" class="def" >(<^>)</a - > :: (a -> a) -> a -> a</p + > :: (a -> a) -> a -> a</p ></div ><div class="top" ><p class="src" ><a name="v:-60--94-" class="def" >(<^)</a - > :: a -> a -> a</p + > :: a -> a -> a</p ></div ><div class="top" ><p class="src" ><a name="v:-94--62-" class="def" >(^>)</a - > :: a -> a -> a</p + > :: a -> a -> a</p ></div ><div class="top" ><p class="src" ><a name="v:-8902--94-" class="def" >(⋆^)</a - > :: a -> a -> a</p + > :: a -> a -> a</p ></div ><div class="top" ><p class="src" diff --git a/html-test/ref/Bug188.html b/html-test/ref/Bug310.html index 3e9f4eec..926d6cf2 100644 --- a/html-test/ref/Bug188.html +++ b/html-test/ref/Bug310.html @@ -3,13 +3,13 @@ ><head ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title - >Bug188</title + >Bug310</title ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean" /><script src="haddock-util.js" type="text/javascript" ></script ><script type="text/javascript" >//<![CDATA[ -window.onload = function () {pageLoad();setSynopsis("mini_Bug188.html");}; +window.onload = function () {pageLoad();setSynopsis("mini_Bug310.html");}; //]]> </script ></head @@ -35,11 +35,25 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug188.html");}; ><th >Safe Haskell</th ><td - >Safe-Inferred</td + >None</td ></tr ></table ><p class="caption" - >Bug188</p + >Bug310</p + ></div + ><div id="synopsis" + ><p id="control.syn" class="caption expander" onclick="toggleSection('syn')" + >Synopsis</p + ><ul id="section.syn" class="hide" onclick="toggleSection('syn')" + ><li class="src short" + ><span class="keyword" + >type family</span + > a <a href="" + >+</a + > b :: <a href="" + >Nat</a + ></li + ></ul ></div ><div id="interface" ><h1 @@ -47,25 +61,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug188.html");}; ><div class="top" ><p class="src" ><span class="keyword" - >class</span - > <a name="t:A" class="def" - >A</a - > a <span class="keyword" - >where</span + >type family</span + > a <a name="t:-43-" class="def" + >+</a + > b :: <a href="" + >Nat</a + > <span class="fixity" + >infixl 6</span + ><span class="rightedge" + ></span ></p - ><div class="subs methods" - ><p class="caption" - >Methods</p - ><p class="src" - ><a name="v:f" class="def" - >f</a - >, <a name="v:g" class="def" - >g</a - >, <a name="v:h" class="def" - >h</a - >, <a name="v:i" class="def" - >i</a - > :: a -> ()</p + ><div class="doc" + ><p + >Addition of type-level naturals.</p ></div ></div ></div @@ -74,7 +82,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug188.html");}; ><p >Produced by <a href="" >Haddock</a - > version 2.15.0</p + > version 2.15.1</p ></div ></body ></html diff --git a/html-test/ref/Bug313.html b/html-test/ref/Bug313.html new file mode 100644 index 00000000..5fa34eff --- /dev/null +++ b/html-test/ref/Bug313.html @@ -0,0 +1,132 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" +><head + ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" + /><title + >Bug313</title + ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean" + /><script src="haddock-util.js" type="text/javascript" + ></script + ><script type="text/javascript" + >//<![CDATA[ +window.onload = function () {pageLoad();setSynopsis("mini_Bug313.html");}; +//]]> +</script + ></head + ><body + ><div id="package-header" + ><ul class="links" id="page-menu" + ><li + ><a href="" + >Contents</a + ></li + ><li + ><a href="" + >Index</a + ></li + ></ul + ><p class="caption empty" + > </p + ></div + ><div id="content" + ><div id="module-header" + ><table class="info" + ><tr + ><th + >Safe Haskell</th + ><td + >Safe-Inferred</td + ></tr + ></table + ><p class="caption" + >Bug313</p + ></div + ><div id="description" + ><p class="caption" + >Description</p + ><div class="doc" + ><p + >The first list is incorrectly numbered as 1. 2. 1.; the second example + renders fine (1. 2. 3.).</p + ><p + >See <a href="" + >https://github.com/haskell/haddock/issues/313</a + ></p + ></div + ></div + ><div id="synopsis" + ><p id="control.syn" class="caption expander" onclick="toggleSection('syn')" + >Synopsis</p + ><ul id="section.syn" class="hide" onclick="toggleSection('syn')" + ><li class="src short" + ><a href="" + >a</a + > :: a</li + ><li class="src short" + ><a href="" + >b</a + > :: a</li + ></ul + ></div + ><div id="interface" + ><h1 + >Documentation</h1 + ><div class="top" + ><p class="src" + ><a name="v:a" class="def" + >a</a + > :: a</p + ><div class="doc" + ><p + >Some text.</p + ><ol + ><li + >Item 1</li + ><li + ><p + >Item 2</p + ><pre + >Some code</pre + ></li + ><li + >Item 3</li + ></ol + ><p + >Some more text.</p + ></div + ></div + ><div class="top" + ><p class="src" + ><a name="v:b" class="def" + >b</a + > :: a</p + ><div class="doc" + ><p + >Some text.</p + ><ol + ><li + >Item 1</li + ><li + ><p + >Item 2</p + ><pre + >Some code</pre + ></li + ><li + >Item 3</li + ></ol + ><p + >Some more text.</p + ></div + ></div + ></div + ></div + ><div id="footer" + ><p + >Produced by <a href="" + >Haddock</a + > version 2.15.0</p + ></div + ></body + ></html +> diff --git a/html-test/ref/Bug335.html b/html-test/ref/Bug335.html new file mode 100644 index 00000000..76c39951 --- /dev/null +++ b/html-test/ref/Bug335.html @@ -0,0 +1,125 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" +><head + ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" + /><title + >Bug335</title + ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean" + /><script src="haddock-util.js" type="text/javascript" + ></script + ><script type="text/javascript" + >//<![CDATA[ +window.onload = function () {pageLoad();setSynopsis("mini_Bug335.html");}; +//]]> +</script + ></head + ><body + ><div id="package-header" + ><ul class="links" id="page-menu" + ><li + ><a href="" + >Contents</a + ></li + ><li + ><a href="" + >Index</a + ></li + ></ul + ><p class="caption empty" + > </p + ></div + ><div id="content" + ><div id="module-header" + ><table class="info" + ><tr + ><th + >Safe Haskell</th + ><td + >Safe-Inferred</td + ></tr + ></table + ><p class="caption" + >Bug335</p + ></div + ><div id="synopsis" + ><p id="control.syn" class="caption expander" onclick="toggleSection('syn')" + >Synopsis</p + ><ul id="section.syn" class="hide" onclick="toggleSection('syn')" + ><li class="src short" + ><a href="" + >f</a + > :: ()</li + ><li class="src short" + ><a href="" + >g</a + > :: ()</li + ></ul + ></div + ><div id="interface" + ><h1 + >Documentation</h1 + ><div class="top" + ><p class="src" + ><a name="v:f" class="def" + >f</a + > :: ()</p + ><div class="doc" + ><h3 id="control.ch:f0" class="caption collapser" onclick="toggleSection('ch:f0')" + >ExF:</h3 + ><div id="section.ch:f0" class="show" + ><p + >abc</p + ></div + ></div + ></div + ><div class="top" + ><p class="src" + ><a name="v:g" class="def" + >g</a + > :: ()</p + ><div class="doc" + ><h3 id="control.ch:g0" class="caption collapser" onclick="toggleSection('ch:g0')" + >ExG:</h3 + ><div id="section.ch:g0" class="show" + ><pre class="screen" + ><code class="prompt" + >>>> </code + ><strong class="userinput" + ><code + >a +</code + ></strong + >b +</pre + ><pre class="screen" + ><code class="prompt" + >>>> </code + ><strong class="userinput" + ><code + >c +</code + ></strong + >d +</pre + ><h4 + >Under ex</h4 + ><p + >foo</p + ></div + ><h2 + >Out of Ex</h2 + ><p + >foo</p + ></div + ></div + ></div + ></div + ><div id="footer" + ><p + >Produced by <a href="" + >Haddock</a + > version 2.15.1</p + ></div + ></body + ></html +> diff --git a/html-test/ref/Bug8.html b/html-test/ref/Bug8.html index 3bb044c1..288ee9f5 100644 --- a/html-test/ref/Bug8.html +++ b/html-test/ref/Bug8.html @@ -86,7 +86,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");}; ><p class="src" ><a name="v:-45--45--62-" class="def" >(-->)</a - > :: t -> t1 -> <a href="Bug8.html#t:Typ" + > :: t -> t1 -> <a href="" >Typ</a > <span class="fixity" >infix 9</span @@ -98,9 +98,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");}; ><p class="src" ><a name="v:-45--45--45--62-" class="def" >(--->)</a - > :: [a] -> <a href="Bug8.html#t:Typ" + > :: [a] -> <a href="" >Typ</a - > -> <a href="Bug8.html#t:Typ" + > -> <a href="" >Typ</a > <span class="fixity" >infix 9</span @@ -112,19 +112,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");}; ><p class="src" ><a name="v:s" class="def" >s</a - > :: t</p + > :: t</p ></div ><div class="top" ><p class="src" ><a name="v:t" class="def" >t</a - > :: t</p + > :: t</p ></div ><div class="top" ><p class="src" ><a name="v:main" class="def" >main</a - > :: t</p + > :: t</p ></div ></div ></div diff --git a/html-test/ref/Extensions.html b/html-test/ref/Extensions.html index ba2af28f..b2acb26e 100644 --- a/html-test/ref/Extensions.html +++ b/html-test/ref/Extensions.html @@ -60,7 +60,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Extensions.html");}; ><li class="src short" ><a href="" >foobar</a - > :: t</li + > :: t</li ></ul ></div ><div id="interface" @@ -70,7 +70,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Extensions.html");}; ><p class="src" ><a name="v:foobar" class="def" >foobar</a - > :: t</p + > :: t</p ><div class="doc" ><p >Bar</p diff --git a/html-test/ref/FunArgs.html b/html-test/ref/FunArgs.html index d3fea6b7..5c1fe892 100644 --- a/html-test/ref/FunArgs.html +++ b/html-test/ref/FunArgs.html @@ -55,9 +55,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");}; ><table ><tr ><td class="src" - >:: <span class="keyword" - >forall</span - > a . <a href="" + >:: <a href="" >Ord</a > a</td ><td class="doc empty" @@ -154,6 +152,122 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");}; ></table ></div ></div + ><div class="top" + ><p class="src" + ><a name="v:h" class="def" + >h</a + ></p + ><div class="subs arguments" + ><p class="caption" + >Arguments</p + ><table + ><tr + ><td class="src" + >:: a</td + ><td class="doc" + ><p + >First argument</p + ></td + ></tr + ><tr + ><td class="src" + >-> b</td + ><td class="doc" + ><p + >Second argument</p + ></td + ></tr + ><tr + ><td class="src" + >-> c</td + ><td class="doc" + ><p + >Third argument</p + ></td + ></tr + ><tr + ><td class="src" + >-> d</td + ><td class="doc" + ><p + >Result</p + ></td + ></tr + ></table + ></div + ></div + ><div class="top" + ><p class="src" + ><a name="v:i" class="def" + >i</a + ></p + ><div class="subs arguments" + ><p class="caption" + >Arguments</p + ><table + ><tr + ><td class="src" + >:: <span class="keyword" + >forall</span + > (b :: <a href="" + >()</a + >). (d ~ <a href="" + >()</a + >)</td + ><td class="doc empty" + > </td + ></tr + ><tr + ><td class="src" + >=> a b c d</td + ><td class="doc" + ><p + >abcd</p + ></td + ></tr + ><tr + ><td class="src" + >-> ()</td + ><td class="doc" + ><p + >Result</p + ></td + ></tr + ></table + ></div + ></div + ><div class="top" + ><p class="src" + ><a name="v:j" class="def" + >j</a + ></p + ><div class="subs arguments" + ><p class="caption" + >Arguments</p + ><table + ><tr + ><td class="src" + >:: <span class="keyword" + >forall</span + > (a :: <a href="" + >()</a + >). proxy a</td + ><td class="doc" + ><p + >First argument</p + ></td + ></tr + ><tr + ><td class="src" + >-> b</td + ><td class="doc" + ><p + >Result</p + ></td + ></tr + ></table + ></div + ></div ></div ></div ><div id="footer" diff --git a/html-test/ref/ImplicitParams.html b/html-test/ref/ImplicitParams.html index 9bd826d6..3874af26 100644 --- a/html-test/ref/ImplicitParams.html +++ b/html-test/ref/ImplicitParams.html @@ -94,7 +94,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_ImplicitParams.html"); ><p class="src" ><a name="v:f" class="def" >f</a - > :: ((?x :: <a href="" + > :: ((?x :: <a href="" >X</a >) => a) -> a</p ></div diff --git a/html-test/ref/Nesting.html b/html-test/ref/Nesting.html index e3302d8f..2b0befba 100644 --- a/html-test/ref/Nesting.html +++ b/html-test/ref/Nesting.html @@ -48,31 +48,31 @@ window.onload = function () {pageLoad();setSynopsis("mini_Nesting.html");}; ><li class="src short" ><a href="" >d</a - > :: t</li + > :: t</li ><li class="src short" ><a href="" >e</a - > :: t</li + > :: t</li ><li class="src short" ><a href="" >f</a - > :: t</li + > :: t</li ><li class="src short" ><a href="" >g</a - > :: t</li + > :: t</li ><li class="src short" ><a href="" >h</a - > :: t</li + > :: t</li ><li class="src short" ><a href="" >i</a - > :: t</li + > :: t</li ><li class="src short" ><a href="" >j</a - > :: t</li + > :: t</li ></ul ></div ><div id="interface" @@ -82,7 +82,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Nesting.html");}; ><p class="src" ><a name="v:d" class="def" >d</a - > :: t</p + > :: t</p ><div class="doc" ><ul ><li @@ -114,7 +114,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Nesting.html");}; ><p class="src" ><a name="v:e" class="def" >e</a - > :: t</p + > :: t</p ><div class="doc" ><ul ><li @@ -135,7 +135,7 @@ the presence of this text pushes it out of nesting back to the top.</li ><p class="src" ><a name="v:f" class="def" >f</a - > :: t</p + > :: t</p ><div class="doc" ><ul ><li @@ -153,7 +153,7 @@ the presence of this text pushes it out of nesting back to the top.</li ><p class="src" ><a name="v:g" class="def" >g</a - > :: t</p + > :: t</p ><div class="doc" ><ul ><li @@ -171,7 +171,7 @@ the presence of this text pushes it out of nesting back to the top.</li ><p class="src" ><a name="v:h" class="def" >h</a - > :: t</p + > :: t</p ><div class="doc" ><ul ><li @@ -189,7 +189,7 @@ tracks</pre ><p class="src" ><a name="v:i" class="def" >i</a - > :: t</p + > :: t</p ><div class="doc" ><ul ><li @@ -239,7 +239,7 @@ More of the indented list.</p ><p class="src" ><a name="v:j" class="def" >j</a - > :: t</p + > :: t</p ><div class="doc" ><dl ><dt diff --git a/html-test/ref/NonGreedy.html b/html-test/ref/NonGreedy.html index ceede7cb..91deb281 100644 --- a/html-test/ref/NonGreedy.html +++ b/html-test/ref/NonGreedy.html @@ -48,7 +48,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_NonGreedy.html");}; ><li class="src short" ><a href="" >f</a - > :: a</li + > :: a</li ></ul ></div ><div id="interface" @@ -58,7 +58,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_NonGreedy.html");}; ><p class="src" ><a name="v:f" class="def" >f</a - > :: a</p + > :: a</p ><div class="doc" ><p ><a href="" diff --git a/html-test/ref/Operators.html b/html-test/ref/Operators.html index b076206d..e9be655f 100644 --- a/html-test/ref/Operators.html +++ b/html-test/ref/Operators.html @@ -56,15 +56,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");}; ><li class="src short" ><a href="" >(+-)</a - > :: a -> a -> a</li + > :: a -> a -> a</li ><li class="src short" ><a href="" >(*/)</a - > :: a -> a -> a</li + > :: a -> a -> a</li ><li class="src short" ><a href="" >foo</a - > :: a -> a -> a</li + > :: a -> a -> a</li ><li class="src short" ><span class="keyword" >data</span @@ -153,11 +153,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");}; ><a href="" >(**>)</a >, <a href="" - >(**<)</a + >(<**)</a >, <a href="" >(>**)</a >, <a href="" - >(<**)</a + >(**<)</a > :: a -> a -> ()</li ></ul ></li @@ -178,7 +178,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");}; ><p class="src" ><a name="v:-43--45-" class="def" >(+-)</a - > :: a -> a -> a</p + > :: a -> a -> a</p ><div class="doc" ><p >Operator with no fixity</p @@ -188,7 +188,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");}; ><p class="src" ><a name="v:-42--47-" class="def" >(*/)</a - > :: a -> a -> a <span class="fixity" + > :: a -> a -> a <span class="fixity" >infixr 7</span ><span class="rightedge" ></span @@ -202,7 +202,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");}; ><p class="src" ><a name="v:foo" class="def" >foo</a - > :: a -> a -> a <span class="fixity" + > :: a -> a -> a <span class="fixity" >infixl 3</span ><span class="rightedge" ></span @@ -411,16 +411,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");}; ><p class="src" ><a name="v:-42--42--62-" class="def" >(**>)</a - >, <a name="v:-42--42--60-" class="def" - >(**<)</a - >, <a name="v:-62--42--42-" class="def" - >(>**)</a >, <a name="v:-60--42--42-" class="def" >(<**)</a + >, <a name="v:-62--42--42-" class="def" + >(>**)</a + >, <a name="v:-42--42--60-" class="def" + >(**<)</a > :: a -> a -> () <span class="fixity" >infixr 8 **>, >**</span ><span class="fixity" - >infixl 8 **<, <**</span + >infixl 8 <**, **<</span ><span class="rightedge" ></span ></p diff --git a/html-test/ref/TH2.html b/html-test/ref/TH2.html index 2cd886bb..61145958 100644 --- a/html-test/ref/TH2.html +++ b/html-test/ref/TH2.html @@ -48,7 +48,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TH2.html");}; ><p class="src" ><a name="v:f" class="def" >f</a - > :: t -> t</p + > :: t -> t</p ></div ></div ></div diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html index fcad8657..89491f01 100644 --- a/html-test/ref/Test.html +++ b/html-test/ref/Test.html @@ -487,7 +487,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><li ><a href="" >d</a - > :: <a href="" + > :: <a href="" >T</a > a b</li ><li @@ -657,7 +657,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><li class="src short" ><a href="" >withoutType</a - > :: t</li + > :: t</li ></ul ></div ><div id="interface" @@ -1535,7 +1535,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");}; ><p class="src" ><a name="v:d" class="def" >d</a - > :: <a href="" + > :: <a href="" >T</a > a b</p ><p class="src" @@ -2130,7 +2130,7 @@ is at the beginning of the line).</pre ><p class="src" ><a name="v:withoutType" class="def" >withoutType</a - > :: t</p + > :: t</p ><div class="doc" ><p >Comment on a definition without type signature</p diff --git a/html-test/ref/Ticket112.html b/html-test/ref/Ticket112.html index 9c3932cf..528787c7 100644 --- a/html-test/ref/Ticket112.html +++ b/html-test/ref/Ticket112.html @@ -48,7 +48,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket112.html");}; ><li class="src short" ><a href="" >f</a - > :: a</li + > :: a</li ></ul ></div ><div id="interface" @@ -58,7 +58,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket112.html");}; ><p class="src" ><a name="v:f" class="def" >f</a - > :: a</p + > :: a</p ><div class="doc" ><p >...given a raw <code diff --git a/html-test/ref/TypeOperators.html b/html-test/ref/TypeOperators.html index 1a53b8ec..2e80bf9f 100644 --- a/html-test/ref/TypeOperators.html +++ b/html-test/ref/TypeOperators.html @@ -120,7 +120,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");} ><p class="src" ><a name="v:biO" class="def" >biO</a - > :: (g <a href="" + > :: (g <a href="" >`O`</a > f) a</p ></div diff --git a/html-test/ref/mini_A.html b/html-test/ref/mini_A.html index cbe50e41..c3d36935 100644 --- a/html-test/ref/mini_A.html +++ b/html-test/ref/mini_A.html @@ -25,7 +25,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >A</a - > </p + ></p ></div ><div class="top" ><p class="src" @@ -45,7 +45,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >X</a - > </p + ></p ></div ><div class="top" ><p class="src" diff --git a/html-test/ref/mini_AdvanceTypes.html b/html-test/ref/mini_AdvanceTypes.html index 59d8dcb1..c4b0806a 100644 --- a/html-test/ref/mini_AdvanceTypes.html +++ b/html-test/ref/mini_AdvanceTypes.html @@ -25,7 +25,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >Pattern</a - > </p + ></p ></div ></div ></body diff --git a/html-test/ref/mini_B.html b/html-test/ref/mini_B.html index 211a7deb..9b3ef381 100644 --- a/html-test/ref/mini_B.html +++ b/html-test/ref/mini_B.html @@ -37,7 +37,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >X</a - > </p + ></p ></div ></div ></body diff --git a/html-test/ref/mini_Bug1.html b/html-test/ref/mini_Bug1.html index adf81c73..bab3748c 100644 --- a/html-test/ref/mini_Bug1.html +++ b/html-test/ref/mini_Bug1.html @@ -25,7 +25,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >T</a - > </p + ></p ></div ></div ></body diff --git a/html-test/ref/mini_Bug6.html b/html-test/ref/mini_Bug6.html index 5c5c1119..e448e7a3 100644 --- a/html-test/ref/mini_Bug6.html +++ b/html-test/ref/mini_Bug6.html @@ -25,7 +25,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >A</a - > </p + ></p ></div ><div class="top" ><p class="src" @@ -33,7 +33,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >B</a - > </p + ></p ></div ><div class="top" ><p class="src" @@ -41,7 +41,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >C</a - > </p + ></p ></div ><div class="top" ><p class="src" @@ -49,7 +49,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >D</a - > </p + ></p ></div ><div class="top" ><p class="src" @@ -57,7 +57,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >E</a - > </p + ></p ></div ></div ></body diff --git a/html-test/ref/mini_Bug7.html b/html-test/ref/mini_Bug7.html index 1bec82ee..2cb7ebe1 100644 --- a/html-test/ref/mini_Bug7.html +++ b/html-test/ref/mini_Bug7.html @@ -25,7 +25,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >Foo</a - > </p + ></p ></div ><div class="top" ><p class="src" diff --git a/html-test/ref/mini_Bug8.html b/html-test/ref/mini_Bug8.html index 070dbcf8..ca6ec68a 100644 --- a/html-test/ref/mini_Bug8.html +++ b/html-test/ref/mini_Bug8.html @@ -25,7 +25,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >Typ</a - > </p + ></p ></div ><div class="top" ><p class="src" diff --git a/html-test/ref/mini_BugDeprecated.html b/html-test/ref/mini_BugDeprecated.html index f0410137..9c8fc229 100644 --- a/html-test/ref/mini_BugDeprecated.html +++ b/html-test/ref/mini_BugDeprecated.html @@ -28,13 +28,13 @@ window.onload = function () {pageLoad();}; ><div class="top" ><p class="src" ><a href="" target="main" - >baz</a + >bar</a ></p ></div ><div class="top" ><p class="src" ><a href="" target="main" - >bar</a + >baz</a ></p ></div ><div class="top" @@ -46,13 +46,13 @@ window.onload = function () {pageLoad();}; ><div class="top" ><p class="src" ><a href="" target="main" - >three</a + >two</a ></p ></div ><div class="top" ><p class="src" ><a href="" target="main" - >two</a + >three</a ></p ></div ></div diff --git a/html-test/ref/mini_DeprecatedData.html b/html-test/ref/mini_DeprecatedData.html index 8ef20113..7f11afeb 100644 --- a/html-test/ref/mini_DeprecatedData.html +++ b/html-test/ref/mini_DeprecatedData.html @@ -25,7 +25,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >Foo</a - > </p + ></p ></div ><div class="top" ><p class="src" @@ -33,7 +33,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >One</a - > </p + ></p ></div ></div ></body diff --git a/html-test/ref/mini_DeprecatedNewtype.html b/html-test/ref/mini_DeprecatedNewtype.html index a913525f..84d41828 100644 --- a/html-test/ref/mini_DeprecatedNewtype.html +++ b/html-test/ref/mini_DeprecatedNewtype.html @@ -25,7 +25,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >SomeNewType</a - > </p + ></p ></div ><div class="top" ><p class="src" @@ -33,7 +33,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >SomeOtherNewType</a - > </p + ></p ></div ></div ></body diff --git a/html-test/ref/mini_DeprecatedRecord.html b/html-test/ref/mini_DeprecatedRecord.html index 3d949d2d..54dc9722 100644 --- a/html-test/ref/mini_DeprecatedRecord.html +++ b/html-test/ref/mini_DeprecatedRecord.html @@ -25,7 +25,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >Foo</a - > </p + ></p ></div ></div ></body diff --git a/html-test/ref/mini_DeprecatedTypeSynonym.html b/html-test/ref/mini_DeprecatedTypeSynonym.html index 5ade100d..c04c374f 100644 --- a/html-test/ref/mini_DeprecatedTypeSynonym.html +++ b/html-test/ref/mini_DeprecatedTypeSynonym.html @@ -25,7 +25,7 @@ window.onload = function () {pageLoad();}; >type</span > <a href="" target="main" >TypeSyn</a - > </p + ></p ></div ><div class="top" ><p class="src" @@ -33,7 +33,7 @@ window.onload = function () {pageLoad();}; >type</span > <a href="" target="main" >OtherTypeSyn</a - > </p + ></p ></div ></div ></body diff --git a/html-test/ref/mini_HiddenInstances.html b/html-test/ref/mini_HiddenInstances.html index 0f1a2e04..01bab320 100644 --- a/html-test/ref/mini_HiddenInstances.html +++ b/html-test/ref/mini_HiddenInstances.html @@ -33,7 +33,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >VisibleData</a - > </p + ></p ></div ></div ></body diff --git a/html-test/ref/mini_HiddenInstancesB.html b/html-test/ref/mini_HiddenInstancesB.html index 3ce4f6a9..e02b42b1 100644 --- a/html-test/ref/mini_HiddenInstancesB.html +++ b/html-test/ref/mini_HiddenInstancesB.html @@ -33,7 +33,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >Bar</a - > </p + ></p ></div ></div ></body diff --git a/html-test/ref/mini_QuasiExpr.html b/html-test/ref/mini_QuasiExpr.html index 7dd9b829..06797498 100644 --- a/html-test/ref/mini_QuasiExpr.html +++ b/html-test/ref/mini_QuasiExpr.html @@ -25,7 +25,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >Expr</a - > </p + ></p ></div ><div class="top" ><p class="src" @@ -33,7 +33,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >BinOp</a - > </p + ></p ></div ><div class="top" ><p class="src" diff --git a/html-test/ref/mini_Test.html b/html-test/ref/mini_Test.html index 3a01ff1c..7453387c 100644 --- a/html-test/ref/mini_Test.html +++ b/html-test/ref/mini_Test.html @@ -69,7 +69,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >T6</a - > </p + ></p ></div ><div class="top" ><p class="src" @@ -135,7 +135,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >R</a - > </p + ></p ></div ><div class="top" ><p class="src" @@ -143,7 +143,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >R1</a - > </p + ></p ></div ><h1 >Class declarations</h1 diff --git a/html-test/ref/mini_Ticket253_2.html b/html-test/ref/mini_Ticket253_2.html index 603590a8..ea62c2ad 100644 --- a/html-test/ref/mini_Ticket253_2.html +++ b/html-test/ref/mini_Ticket253_2.html @@ -31,7 +31,7 @@ window.onload = function () {pageLoad();}; >data</span > <a href="" target="main" >Baz</a - > </p + ></p ></div ></div ></body diff --git a/html-test/ref/mini_TypeFamilies.html b/html-test/ref/mini_TypeFamilies.html index 0cf39c88..feb61abc 100644 --- a/html-test/ref/mini_TypeFamilies.html +++ b/html-test/ref/mini_TypeFamilies.html @@ -22,9 +22,49 @@ window.onload = function () {pageLoad();}; ><div class="top" ><p class="src" ><span class="keyword" + >data</span + > <a href="" target="main" + >X</a + ></p + ></div + ><div class="top" + ><p class="src" + ><span class="keyword" + >data</span + > <a href="" target="main" + >Y</a + ></p + ></div + ><div class="top" + ><p class="src" + ><span class="keyword" + >data</span + > <a href="" target="main" + >Z</a + ></p + ></div + ><div class="top" + ><p class="src" + ><span class="keyword" + >class</span + > <a href="" target="main" + >Test</a + > a</p + ></div + ><div class="top" + ><p class="src" + ><span class="keyword" >type family</span > <a href="" - >G</a + >Foo</a + > a :: k</p + ></div + ><div class="top" + ><p class="src" + ><span class="keyword" + >data family</span + > <a href="" + >Bat</a > a :: *</p ></div ><div class="top" @@ -32,7 +72,7 @@ window.onload = function () {pageLoad();}; ><span class="keyword" >class</span > <a href="" target="main" - >A</a + >Assoc</a > a</p ></div ><div class="top" @@ -40,14 +80,24 @@ window.onload = function () {pageLoad();}; ><span class="keyword" >type family</span > <a href="" - >F</a - > a </p + >Bar</a + > b</p ></div ><div class="top" ><p class="src" - ><a href="" target="main" - >g</a - ></p + ><span class="keyword" + >type family</span + > a <a href="" + ><></a + > b :: k</p + ></div + ><div class="top" + ><p class="src" + ><span class="keyword" + >class</span + > a <a href="" target="main" + >><</a + > b</p ></div ></div ></body diff --git a/html-test/ref/mini_TypeOperators.html b/html-test/ref/mini_TypeOperators.html index 02bc918b..ce31643e 100644 --- a/html-test/ref/mini_TypeOperators.html +++ b/html-test/ref/mini_TypeOperators.html @@ -19,9 +19,7 @@ window.onload = function () {pageLoad();}; >TypeOperators</p ></div ><div id="interface" - ><h1 - >stuff</h1 - ><div class="top" + ><div class="top" ><p class="src" ><span class="keyword" >data</span @@ -55,10 +53,42 @@ window.onload = function () {pageLoad();}; ></div ><div class="top" ><p class="src" + ><span class="keyword" + >class</span + > a <a href="" target="main" + ><=></a + > b</p + ></div + ><div class="top" + ><p class="src" ><a href="" target="main" >biO</a ></p ></div + ><div class="top" + ><p class="src" + ><a href="" target="main" + >f</a + ></p + ></div + ><div class="top" + ><p class="src" + ><a href="" target="main" + >g</a + ></p + ></div + ><div class="top" + ><p class="src" + ><a href="" target="main" + >x</a + ></p + ></div + ><div class="top" + ><p class="src" + ><a href="" target="main" + >y</a + ></p + ></div ></div ></body ></html diff --git a/html-test/ref/ocean.css b/html-test/ref/ocean.css index 05597d79..de436324 100644 --- a/html-test/ref/ocean.css +++ b/html-test/ref/ocean.css @@ -49,14 +49,14 @@ a[href]:hover { text-decoration:underline; } For reasons, see: http://yui.yahooapis.com/3.1.1/build/cssfonts/fonts.css */ - + body { font:13px/1.4 sans-serif; *font-size:small; /* for IE */ *font:x-small; /* for IE in quirks mode */ } -h1 { font-size: 146.5%; /* 19pt */ } +h1 { font-size: 146.5%; /* 19pt */ } h2 { font-size: 131%; /* 17pt */ } h3 { font-size: 116%; /* 15pt */ } h4 { font-size: 100%; /* 13pt */ } @@ -98,7 +98,7 @@ pre, code, kbd, samp, tt, .src { /* @group Common */ -.caption, h1, h2, h3, h4, h5, h6 { +.caption, h1, h2, h3, h4, h5, h6 { font-weight: bold; color: rgb(78,98,114); margin: 0.8em 0 0.4em; @@ -122,7 +122,7 @@ ul.links { ul.links li { display: inline; - border-left: 1px solid #d5d5d5; + border-left: 1px solid #d5d5d5; white-space: nowrap; padding: 0; } @@ -378,6 +378,19 @@ div#style-menu-holder { margin: 0 -0.5em 0 0.5em; } +#interface span.fixity { + color: #919191; + border-left: 1px solid #919191; + padding: 0.2em 0.5em 0.2em 0.5em; + margin: 0 -1em 0 1em; +} + +#interface span.rightedge { + border-left: 1px solid #919191; + padding: 0.2em 0 0.2em 0; + margin: 0 0 0 1em; +} + #interface table { border-spacing: 2px; } #interface td { vertical-align: top; @@ -420,19 +433,18 @@ div#style-menu-holder { margin: 0; } -.subs ul { +/* Render short-style data instances */ +.inst ul { height: 100%; padding: 0.5em; margin: 0; } -.subs ul, -.subs ul li.src { +.inst, .inst li { list-style: none; margin-left: 1em; } - .top p.src { border-top: 1px solid #ccc; } @@ -482,7 +494,7 @@ div#style-menu-holder { } #mini > * { - font-size: 93%; /* 12pt */ + font-size: 93%; /* 12pt */ } #mini #module-list .caption, diff --git a/html-test/run.lhs b/html-test/run.lhs index a8664363..a80b265e 100755 --- a/html-test/run.lhs +++ b/html-test/run.lhs @@ -54,7 +54,7 @@ test = do let mods' = map (testDir </>) mods -- add haddock_datadir to environment for subprocesses - env <- Just . (:) ("haddock_datadir", dataDir) <$> getEnvironment + env <- Just . (:) ("haddock_datadir", Main.dataDir) <$> getEnvironment putStrLn "" putStrLn "Haddock version: " diff --git a/html-test/src/Bug188.hs b/html-test/src/Bug188.hs deleted file mode 100644 index 15089699..00000000 --- a/html-test/src/Bug188.hs +++ /dev/null @@ -1,7 +0,0 @@ --- Tests that the listed order of functions grouped under a single --- type signature is preserved as in-source. Before fixing #188, it --- seems to have preserved the first function but reversed the rest. -module Bug188 where - -class A a where - f, g, h, i :: a -> () diff --git a/html-test/src/Bug26.hs b/html-test/src/Bug26.hs new file mode 100644 index 00000000..b0483f03 --- /dev/null +++ b/html-test/src/Bug26.hs @@ -0,0 +1,29 @@ +-- | This module tests the ‘@since …’ annotation. +-- +-- @since 1.2.3 +module Bug26 where + +-- | Foo +-- +-- @since 2.10.7 +-- +-- @since 2.10.8 +f :: () +f = () + +-- | Bar +g :: () +g = () + +-- | Class +-- +-- @since 1.0 +class C a where + -- | @since 1.2.3 + c_f :: a + +-- | instance for () +-- +-- @since 0.7.8 +instance C () where + c_f = () diff --git a/html-test/src/Bug310.hs b/html-test/src/Bug310.hs new file mode 100644 index 00000000..d2492dc0 --- /dev/null +++ b/html-test/src/Bug310.hs @@ -0,0 +1,4 @@ +{-# LANGUAGE ExplicitNamespaces #-} +module Bug310 ( type (+) ) where + +import GHC.TypeLits diff --git a/html-test/src/Bug313.hs b/html-test/src/Bug313.hs new file mode 100644 index 00000000..90d4d3b6 --- /dev/null +++ b/html-test/src/Bug313.hs @@ -0,0 +1,37 @@ +-- | The first list is incorrectly numbered as 1. 2. 1.; the second example +-- renders fine (1. 2. 3.). +-- +-- See https://github.com/haskell/haddock/issues/313 +module Bug313 where + +{- | +Some text. + +1. Item 1 + +2. Item 2 + + > Some code + +3. Item 3 + +Some more text. +-} +a :: a +a = undefined + +{- | +Some text. + +1. Item 1 + +2. Item 2 + + > Some code + +3. Item 3 + +-} +-- | Some more text. +b :: a +b = undefined diff --git a/html-test/src/Bug335.hs b/html-test/src/Bug335.hs new file mode 100644 index 00000000..c1821dd0 --- /dev/null +++ b/html-test/src/Bug335.hs @@ -0,0 +1,26 @@ +-- Tests for collapsable headers +module Bug335 where + +{-| +=== __ExF:__ +abc +-} +f :: () +f = () + +{-| +=== __ExG:__ +>>> a +b + +>>> c +d + +==== Under ex +foo + +== Out of Ex +foo +-} +g :: () +g = () diff --git a/html-test/src/FunArgs.hs b/html-test/src/FunArgs.hs index cfde185d..24e1ccff 100644 --- a/html-test/src/FunArgs.hs +++ b/html-test/src/FunArgs.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE ExplicitForAll #-} +{-# LANGUAGE RankNTypes, DataKinds, TypeFamilies #-} module FunArgs where f :: forall a. Ord a @@ -15,3 +15,24 @@ g :: a -- ^ First argument -> c -- ^ Third argument -> d -- ^ Result g = undefined + + +h :: forall a b c + . a -- ^ First argument + -> b -- ^ Second argument + -> c -- ^ Third argument + -> forall d. d -- ^ Result +h = undefined + + +i :: forall a (b :: ()) d. (d ~ '()) + => forall c + . a b c d -- ^ abcd + -> () -- ^ Result +i = undefined + + +j :: forall proxy (a :: ()) b + . proxy a -- ^ First argument + -> b -- ^ Result +j = undefined |