[mdoc export-html] Fixup href generation for nested generics.

In certain situations, the type-parameter counting code doesn't
skip tokens properly.  In some circumstances, this results in
invalid links (e.g. refing KeyValuePair`1, not KeyValuePair`2),
in others it results in an XSLT error with "!WTF 2".

The problem was we weren't properly checking for nested types.

3 files changed, 92 insertions, 2 deletions

diff --git a/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1.html b/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1.html
index 303198a2..4d1042c7 100644
--- a/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1.html
+++ b/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1.html
@@ -343,6 +343,20 @@
                 </td>
                 <td>
                   <b>
+                    <a href="#E:Mono.DocTest.Generic.GenericBase`1.ItemChanged">ItemChanged</a>
+                  </b>
+                </td>
+                <td>
+                  <span class="NotEntered">Documentation for this section has not yet been entered.</span>
+                </td>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <div>
+                  </div>
+                </td>
+                <td>
+                  <b>
                     <a href="#E:Mono.DocTest.Generic.GenericBase`1.MyEvent">MyEvent</a>
                   </b>
                 </td>
@@ -502,6 +516,56 @@
             <b>Namespace: </b>Mono.DocTest.Generic<br /><b>Assembly: </b>DocTest (in DocTest.dll)<br /><b>Assembly Versions: </b>0.0.0.0</blockquote>
           <hr size="1" />
         </blockquote>
+        <h3 id="E:Mono.DocTest.Generic.GenericBase`1.ItemChanged">
+          <a href="javascript:toggle_display('E:Mono.DocTest.Generic.GenericBase`1.ItemChanged:member')">
+            <span id="E:Mono.DocTest.Generic.GenericBase`1.ItemChanged:member:toggle">⊟</span> ItemChanged Event</a>
+        </h3>
+        <blockquote id="E:Mono.DocTest.Generic.GenericBase`1.ItemChanged:member">
+          <p class="Summary">
+            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
+          </p>
+          <div class="Signature">public event <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Action`2">Action&lt;MyList&lt;U&gt;, MyList&lt;U&gt;.Helper&lt;U, U&gt;&gt;</a> <b>ItemChanged</b> </div>
+          <h4 class="Subsection">
+            <a href="javascript:toggle_display('E:Mono.DocTest.Generic.GenericBase`1.ItemChanged:Exceptions')">
+              <span id="E:Mono.DocTest.Generic.GenericBase`1.ItemChanged:Exceptions:toggle">⊟</span> Exceptions</a>
+          </h4>
+          <blockquote class="SubsectionBox" id="E:Mono.DocTest.Generic.GenericBase`1.ItemChanged:Exceptions">
+            <table class="TypeDocumentation">
+              <tr>
+                <th>Type</th>
+                <th>Reason</th>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.ArgumentException">ArgumentException</a>
+                </td>
+                <td>
+                  <span class="NotEntered">Documentation for this section has not yet been entered.</span>
+                </td>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.MulticastNotSupportedException">MulticastNotSupportedException</a>
+                </td>
+                <td>
+                  <span class="NotEntered">Documentation for this section has not yet been entered.</span>
+                </td>
+              </tr>
+            </table>
+          </blockquote>
+          <h4 class="Subsection">
+            <a href="javascript:toggle_display('E:Mono.DocTest.Generic.GenericBase`1.ItemChanged:Remarks')">
+              <span id="E:Mono.DocTest.Generic.GenericBase`1.ItemChanged:Remarks:toggle">⊟</span> Remarks</a>
+          </h4>
+          <blockquote class="SubsectionBox" id="E:Mono.DocTest.Generic.GenericBase`1.ItemChanged:Remarks">E:Mono.DocTest.Generic.GenericBase`1.ItemChanged</blockquote>
+          <h4 class="Subsection">
+            <a href="javascript:toggle_display('E:Mono.DocTest.Generic.GenericBase`1.ItemChanged:Version Information')">
+              <span id="E:Mono.DocTest.Generic.GenericBase`1.ItemChanged:Version Information:toggle">⊟</span> Requirements</a>
+          </h4>
+          <blockquote class="SubsectionBox" id="E:Mono.DocTest.Generic.GenericBase`1.ItemChanged:Version Information">
+            <b>Namespace: </b>Mono.DocTest.Generic<br /><b>Assembly: </b>DocTest (in DocTest.dll)<br /><b>Assembly Versions: </b>0.0.0.0</blockquote>
+          <hr size="1" />
+        </blockquote>
         <h3 id="E:Mono.DocTest.Generic.GenericBase`1.MyEvent">
           <a href="javascript:toggle_display('E:Mono.DocTest.Generic.GenericBase`1.MyEvent:member')">
             <span id="E:Mono.DocTest.Generic.GenericBase`1.MyEvent:member:toggle">⊟</span> MyEvent Event</a>
diff --git a/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`1.html b/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`1.html
index b37bff26..aa189ef3 100644
--- a/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`1.html
+++ b/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`1.html
@@ -389,6 +389,19 @@
                 </td>
                 <td>
                   <b>
+                    <a href="../Mono.DocTest.Generic/GenericBase`1.html#E:Mono.DocTest.Generic.GenericBase`1.ItemChanged">ItemChanged</a>
+                  </b>
+                </td>
+                <td>
+                  <span class="NotEntered">Documentation for this section has not yet been entered.</span> (<i>Inherited from <a href="../Mono.DocTest.Generic/GenericBase`1.html">GenericBase&lt;U&gt;</a>.</i>)</td>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <div>
+                  </div>
+                </td>
+                <td>
+                  <b>
                     <a href="../Mono.DocTest.Generic/GenericBase`1.html#E:Mono.DocTest.Generic.GenericBase`1.MyEvent">MyEvent</a>
                   </b>
                 </td>
diff --git a/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`2.html b/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`2.html
index 22a30098..450aff9d 100644
--- a/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`2.html
+++ b/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`2.html
@@ -378,7 +378,7 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:Mono.DocTest.Generic.MyList`2.Foo">Foo</a>
-                  </b>()<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Generic.KeyValuePair`1">KeyValuePair&lt;IEnumerable&lt;A&gt;, IEnumerable&lt;B&gt;&gt;</a></nobr><blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>()<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Generic.KeyValuePair`2">KeyValuePair&lt;IEnumerable&lt;A&gt;, IEnumerable&lt;B&gt;&gt;</a></nobr><blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -427,6 +427,19 @@
                 </td>
                 <td>
                   <b>
+                    <a href="../Mono.DocTest.Generic/GenericBase`1.html#E:Mono.DocTest.Generic.GenericBase`1.ItemChanged">ItemChanged</a>
+                  </b>
+                </td>
+                <td>
+                  <span class="NotEntered">Documentation for this section has not yet been entered.</span> (<i>Inherited from <a href="../Mono.DocTest.Generic/GenericBase`1.html">GenericBase&lt;U&gt;</a>.</i>)</td>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <div>
+                  </div>
+                </td>
+                <td>
+                  <b>
                     <a href="../Mono.DocTest.Generic/GenericBase`1.html#E:Mono.DocTest.Generic.GenericBase`1.MyEvent">MyEvent</a>
                   </b>
                 </td>
@@ -796,7 +809,7 @@
           <p class="Summary">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
           </p>
-          <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Generic.KeyValuePair`1">KeyValuePair&lt;IEnumerable&lt;A&gt;, IEnumerable&lt;B&gt;&gt;</a> <b>Foo</b> ()</div>
+          <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Generic.KeyValuePair`2">KeyValuePair&lt;IEnumerable&lt;A&gt;, IEnumerable&lt;B&gt;&gt;</a> <b>Foo</b> ()</div>
           <h4 class="Subsection">
             <a href="javascript:toggle_display('M:Mono.DocTest.Generic.MyList`2.Foo:Returns')">
               <span id="M:Mono.DocTest.Generic.MyList`2.Foo:Returns:toggle">⊟</span> Returns</a>