Update appearance of fixity annotations

This moves them in-line with their corresponding lines, similar to a
presentation envision by @hvr and described in #ghc.

Redundant operator names are also omitted when no ambiguity is present.

2 files changed, 103 insertions, 50 deletions

diff --git a/html-test/ref/Bug8.html b/html-test/ref/Bug8.html
index 7e5b5fee..ffbfe0e2 100644
--- a/html-test/ref/Bug8.html
+++ b/html-test/ref/Bug8.html
@@ -84,22 +84,28 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  >infix 9 --&gt;<br
-	     /><a name="v:-45--45--62-" class="def"
+	  ><a name="v:-45--45--62-" class="def"
 	    >(--&gt;)</a
-	    > ::  t -&gt; t1 -&gt; <a href=""
+	    > ::  t -&gt; t1 -&gt; <a href="Bug8.html#t:Typ"
 	    >Typ</a
+	    > <span class="fixity"
+	    >infix 9</span
+	    ><span class="rightedge"
+	    ></span
 	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  >infix 9 ---&gt;<br
-	     /><a name="v:-45--45--45--62-" class="def"
+	  ><a name="v:-45--45--45--62-" class="def"
 	    >(---&gt;)</a
-	    > ::  [a] -&gt; <a href=""
+	    > ::  [a] -&gt; <a href="Bug8.html#t:Typ"
 	    >Typ</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="Bug8.html#t:Typ"
 	    >Typ</a
+	    > <span class="fixity"
+	    >infix 9</span
+	    ><span class="rightedge"
+	    ></span
 	    ></p
 	  ></div
 	><div class="top"
diff --git a/html-test/ref/Operators.html b/html-test/ref/Operators.html
index fdc46aa6..9c360894 100644
--- a/html-test/ref/Operators.html
+++ b/html-test/ref/Operators.html
@@ -184,10 +184,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  >infixr 7 */<br
-	     /><a name="v:-42--47-" class="def"
+	  ><a name="v:-42--47-" class="def"
 	    >(*/)</a
-	    > ::  a -&gt; a -&gt; a</p
+	    > ::  a -&gt; a -&gt; a <span class="fixity"
+	    >infixr 7</span
+	    ><span class="rightedge"
+	    ></span
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Operator with infixr 7</p
@@ -195,10 +198,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  >infixl 3 `foo`<br
-	     /><a name="v:foo" class="def"
+	  ><a name="v:foo" class="def"
 	    >foo</a
-	    > ::  a -&gt; a -&gt; a</p
+	    > ::  a -&gt; a -&gt; a <span class="fixity"
+	    >infixl 3</span
+	    ><span class="rightedge"
+	    ></span
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Named function with infixl 3</p
@@ -221,13 +227,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>infixl 3 `Bar`<br
-		   /><a href="Operators.html#t:Foo"
+		><a href="Operators.html#t:Foo"
 		  >Foo</a
 		  > <a name="v:Bar" class="def"
 		  >`Bar`</a
 		  > <a href="Operators.html#t:Foo"
 		  >Foo</a
+		  > <span class="fixity"
+		  >infixl 3</span
+		  ><span class="rightedge"
+		  ></span
 		  ></td
 		><td class="doc"
 		><p
@@ -236,13 +245,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		>infixr 5 :-<br
-		   /><a href="Operators.html#t:Foo"
+		><a href="Operators.html#t:Foo"
 		  >Foo</a
 		  > <a name="v::-45-" class="def"
 		  >:-</a
 		  > <a href="Operators.html#t:Foo"
 		  >Foo</a
+		  > <span class="fixity"
+		  >infixr 5</span
+		  ><span class="rightedge"
+		  ></span
 		  ></td
 		><td class="doc"
 		><p
@@ -254,10 +266,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  >infixr 3 :+<br
-	     />pattern  <a name="v::-43-" class="def"
+	  >pattern  <a name="v::-43-" class="def"
 	    >(:+)</a
-	    > t t ::  [t]</p
+	    > t t ::  [t] <span class="fixity"
+	    >infixr 3</span
+	    ><span class="rightedge"
+	    ></span
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Pattern synonym, infixr 3</p
@@ -265,13 +280,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  >infixl 6 &lt;-&gt;<br
-	     /><span class="keyword"
+	  ><span class="keyword"
 	    >data</span
 	    > a <a name="t:-60--45--62-" class="def"
 	    >&lt;-&gt;</a
 	    > b <span class="keyword"
 	    >where</span
+	    > <span class="fixity"
+	    >infixl 6</span
+	    ><span class="rightedge"
+	    ></span
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -283,12 +301,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>infixr 6 :&lt;-&gt;<br
-		   /><a name="v::-60--45--62-" class="def"
+		><a name="v::-60--45--62-" class="def"
 		  >(:&lt;-&gt;)</a
 		  > ::  a -&gt; b -&gt; a <a href="Operators.html#t:-60--45--62-"
 		  >&lt;-&gt;</a
-		  > b</td
+		  > b <span class="fixity"
+		  >infixr 6</span
+		  ><span class="rightedge"
+		  ></span
+		  ></td
 		><td class="doc empty"
 		>&nbsp;</td
 		></tr
@@ -297,12 +318,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  >infix 3 ++<br
-	     /><span class="keyword"
+	  ><span class="keyword"
 	    >type family</span
 	    > a <a name="t:-43--43-" class="def"
 	    >++</a
-	    > b</p
+	    > b <span class="fixity"
+	    >infix 3</span
+	    ><span class="rightedge"
+	    ></span
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Type family with fixity</p
@@ -310,12 +334,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  >infix 9 **<br
-	     /><span class="keyword"
+	  ><span class="keyword"
 	    >data family</span
 	    > a <a name="t:-42--42-" class="def"
 	    >**</a
-	    > b</p
+	    > b <span class="fixity"
+	    >infix 9</span
+	    ><span class="rightedge"
+	    ></span
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Data family with fixity</p
@@ -323,13 +350,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  >infixr 1 &gt;&lt;&gt;<br
-	     /><span class="keyword"
+	  ><span class="keyword"
 	    >class</span
 	    > a <a name="t:-62--60--62-" class="def"
 	    >&gt;&lt;&gt;</a
 	    > b <span class="keyword"
 	    >where</span
+	    > <span class="fixity"
+	    >infixr 1</span
+	    ><span class="rightedge"
+	    ></span
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -339,35 +369,43 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	  ><p class="caption"
 	    >Associated Types</p
 	    ><p class="src"
-	    >infixl 2 &lt;&gt;&lt;<br
-	       /><span class="keyword"
+	    ><span class="keyword"
 	      >type</span
 	      > a <a name="t:-60--62--60-" class="def"
 	      >&lt;&gt;&lt;</a
-	      > b :: *</p
+	      > b :: * <span class="fixity"
+	      >infixl 2</span
+	      ><span class="rightedge"
+	      ></span
+	      ></p
 	    ><p class="src"
-	    >infixl 3 &gt;&lt;&lt;<br
-	       /><span class="keyword"
+	    ><span class="keyword"
 	      >data</span
 	      > a <a name="t:-62--60--60-" class="def"
 	      >&gt;&lt;&lt;</a
-	      > b</p
+	      > b <span class="fixity"
+	      >infixl 3</span
+	      ><span class="rightedge"
+	      ></span
+	      ></p
 	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    >infixl 5 &lt;&lt;&gt;<br
-	       />infixr 4 &gt;&gt;&lt;<br
-	       /><a name="v:-62--62--60-" class="def"
+	    ><a name="v:-62--62--60-" class="def"
 	      >(&gt;&gt;&lt;)</a
 	      >, <a name="v:-60--60--62-" class="def"
 	      >(&lt;&lt;&gt;)</a
-	      > :: a -&gt; b -&gt; ()</p
+	      > :: a -&gt; b -&gt; () <span class="fixity"
+	      >infixl 5 &lt;&lt;&gt;</span
+	      ><span class="fixity"
+	      >infixr 4 &gt;&gt;&lt;</span
+	      ><span class="rightedge"
+	      ></span
+	      ></p
 	    ><p class="src"
-	    >infixr 8 **&gt;, &gt;**<br
-	       />infixl 8 &lt;**, **&lt;<br
-	       /><a name="v:-42--42--62-" class="def"
+	    ><a name="v:-42--42--62-" class="def"
 	      >(**&gt;)</a
 	      >, <a name="v:-60--42--42-" class="def"
 	      >(&lt;**)</a
@@ -375,7 +413,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	      >(&gt;**)</a
 	      >, <a name="v:-42--42--60-" class="def"
 	      >(**&lt;)</a
-	      > :: a -&gt; a -&gt; ()</p
+	      > :: a -&gt; a -&gt; () <span class="fixity"
+	      >infixr 8 **&gt;, &gt;**</span
+	      ><span class="fixity"
+	      >infixl 8 &lt;**, **&lt;</span
+	      ><span class="rightedge"
+	      ></span
+	      ></p
 	    ><div class="doc"
 	    ><p
 	      >Multiple fixities</p
@@ -384,14 +428,17 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  >infixl 6 &gt;-&lt;<br
-	     /><span class="keyword"
+	  ><span class="keyword"
 	    >type</span
 	    > <a name="t:-62--45--60-" class="def"
 	    >(&gt;-&lt;)</a
 	    > a b = a <a href="Operators.html#t:-60--45--62-"
 	    >&lt;-&gt;</a
-	    > b</p
+	    > b <span class="fixity"
+	    >infixl 6</span
+	    ><span class="rightedge"
+	    ></span
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Type synonym with fixity</p