Merge branch 'anchors-redux'

1 files changed, 94 insertions, 44 deletions

diff --git a/html-test/ref/Minimal.html b/html-test/ref/Minimal.html
index eb9d1f5d..721260c6 100644
--- a/html-test/ref/Minimal.html
+++ b/html-test/ref/Minimal.html
@@ -57,10 +57,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html&quot
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:Foo" class="def"
+	    > <a id="t:Foo" class="def"
 	    >Foo</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs minimal"
 	  ><p class="caption"
@@ -86,25 +88,33 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Minimal.html&quot
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:foo" class="def"
+	    ><a id="v:foo" class="def"
 	      >foo</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><div class="doc"
 	    ><p
 	      >Any two of these are required...</p
 	      ></div
 	    ><p class="src"
-	    ><a href="#" id="v:bar" class="def"
+	    ><a id="v:bar" class="def"
 	      >bar</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:bat" class="def"
+	    ><a id="v:bat" class="def"
 	      >bat</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:fooBarBat" class="def"
+	    ><a id="v:fooBarBat" class="def"
 	      >fooBarBat</a
-	      > :: (a, a, a)</p
+	      > :: (a, a, a) <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><div class="doc"
 	    ><p
 	      >.. or just this</p
@@ -115,10 +125,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Minimal.html&quot
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:Weird" class="def"
+	    > <a id="t:Weird" class="def"
 	    >Weird</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs minimal"
 	  ><p class="caption"
@@ -144,43 +156,59 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Minimal.html&quot
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:a" class="def"
+	    ><a id="v:a" class="def"
 	      >a</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:b" class="def"
+	    ><a id="v:b" class="def"
 	      >b</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:c" class="def"
+	    ><a id="v:c" class="def"
 	      >c</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:d" class="def"
+	    ><a id="v:d" class="def"
 	      >d</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:e" class="def"
+	    ><a id="v:e" class="def"
 	      >e</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:f" class="def"
+	    ><a id="v:f" class="def"
 	      >f</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:g" class="def"
+	    ><a id="v:g" class="def"
 	      >g</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ></div
 	  ></div
 	><div class="top"
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:NoMins" class="def"
+	    > <a id="t:NoMins" class="def"
 	    >NoMins</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs minimal"
 	  ><p class="caption"
@@ -196,27 +224,35 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Minimal.html&quot
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:x" class="def"
+	    ><a id="v:x" class="def"
 	      >x</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:y" class="def"
+	    ><a id="v:y" class="def"
 	      >y</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:z" class="def"
+	    ><a id="v:z" class="def"
 	      >z</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ></div
 	  ></div
 	><div class="top"
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:FullMin" class="def"
+	    > <a id="t:FullMin" class="def"
 	    >FullMin</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs minimal"
 	  ><p class="caption"
@@ -232,23 +268,29 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Minimal.html&quot
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:aaa" class="def"
+	    ><a id="v:aaa" class="def"
 	      >aaa</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:bbb" class="def"
+	    ><a id="v:bbb" class="def"
 	      >bbb</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ></div
 	  ></div
 	><div class="top"
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:PartialMin" class="def"
+	    > <a id="t:PartialMin" class="def"
 	    >PartialMin</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs minimal"
 	  ><p class="caption"
@@ -262,31 +304,39 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Minimal.html&quot
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:ccc" class="def"
+	    ><a id="v:ccc" class="def"
 	      >ccc</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ></div
 	  ></div
 	><div class="top"
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:EmptyMin" class="def"
+	    > <a id="t:EmptyMin" class="def"
 	    >EmptyMin</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:eee" class="def"
+	    ><a id="v:eee" class="def"
 	      >eee</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:fff" class="def"
+	    ><a id="v:fff" class="def"
 	      >fff</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ></div
 	  ></div
 	></div