[giow] (3) Try to mitigate the impact of the Noah's Arc algorithm on …

…the Adoption Agency algorithm

Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=22926
Affected topics: HTML Syntax and Parsing

git-svn-id: http://svn.whatwg.org/webapps@8139 340c8d12-0b0e-0410-8428-c7bf67bfef74

complete.html

@@ -91172,7 +91172,23 @@ <h6 id=the-before-head-insertion-mode><span class=secno>12.2.5.4.3 </span>The "<
   a tag name <var title="">subject</var> for which the algorithm is being run, consists of the
   following steps:</p>
 
-  <ol><!-- don't forget about the noah's ark clause when looking at this algorithm! --><li><p>Let <var title="">outer loop counter</var> be zero.</li>
+  <ol><!-- don't forget about the noah's ark clause when looking at this algorithm! --><li>
+
+    <p>If the <a href=#current-node>current node</a> is an <a href=#html-elements title="HTML elements">HTML element</a> whose
+    tag name is <var title="">subject</var>, then run these substeps:
+
+    <ol><li><p>Let <var title="">element</var> be the <a href=#current-node>current node</a>.</li>
+
+     <li><p>Pop <var title="">element</var> off the <a href=#stack-of-open-elements>stack of open elements</a>.</li>
+
+     <li><p>If <var title="">element</var> is also in the <a href=#list-of-active-formatting-elements>list of active formatting
+     elements</a>, remove the element from the list.</li>
+
+     <li><p>Abort the <a href=#adoption-agency-algorithm>adoption agency algorithm</a>.</li>
+
+    </ol></li>
+
+   <li><p>Let <var title="">outer loop counter</var> be zero.</li>
 
    <li><p><i>Outer loop</i>: If <var title="">outer loop counter</var> is greater than or equal to
    eight, then abort these steps.</li>

index

@@ -91172,7 +91172,23 @@ document.body.appendChild(text);
   a tag name <var title="">subject</var> for which the algorithm is being run, consists of the
   following steps:</p>
 
-  <ol><!-- don't forget about the noah's ark clause when looking at this algorithm! --><li><p>Let <var title="">outer loop counter</var> be zero.</li>
+  <ol><!-- don't forget about the noah's ark clause when looking at this algorithm! --><li>
+
+    <p>If the <a href=#current-node>current node</a> is an <a href=#html-elements title="HTML elements">HTML element</a> whose
+    tag name is <var title="">subject</var>, then run these substeps:
+
+    <ol><li><p>Let <var title="">element</var> be the <a href=#current-node>current node</a>.</li>
+
+     <li><p>Pop <var title="">element</var> off the <a href=#stack-of-open-elements>stack of open elements</a>.</li>
+
+     <li><p>If <var title="">element</var> is also in the <a href=#list-of-active-formatting-elements>list of active formatting
+     elements</a>, remove the element from the list.</li>
+
+     <li><p>Abort the <a href=#adoption-agency-algorithm>adoption agency algorithm</a>.</li>
+
+    </ol></li>
+
+   <li><p>Let <var title="">outer loop counter</var> be zero.</li>
 
    <li><p><i>Outer loop</i>: If <var title="">outer loop counter</var> is greater than or equal to
    eight, then abort these steps.</li>

source

@@ -101846,6 +101846,26 @@ document.body.appendChild(text);
 
    <!-- don't forget about the noah's ark clause when looking at this algorithm! -->
 
+   <li>
+
+    <p>If the <span>current node</span> is an <span title="HTML elements">HTML element</span> whose
+    tag name is <var title="">subject</var>, then run these substeps:
+
+    <ol>
+
+     <li><p>Let <var title="">element</var> be the <span>current node</span>.</p></li>
+
+     <li><p>Pop <var title="">element</var> off the <span>stack of open elements</span>.</p></li>
+
+     <li><p>If <var title="">element</var> is also in the <span>list of active formatting
+     elements</span>, remove the element from the list.</p></li>
+
+     <li><p>Abort the <span>adoption agency algorithm</span>.</p></li>
+
+    </ol>
+
+   </li>
+
    <li><p>Let <var title="">outer loop counter</var> be zero.</p></li>
 
    <li><p><i>Outer loop</i>: If <var title="">outer loop counter</var> is greater than or equal to