[e] (0) Clean up the parser a little

Affected topics: HTML Syntax and Parsing git-svn-id: http://svn.whatwg.org/webapps@8138 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Aug 12, 2013 · 6b61d3b · 6b61d3b
1 parent b060990
commit 6b61d3b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/complete.html b/complete.html
@@ -256,7 +256,7 @@
 
   <header class=head id=head><p><a href=http://www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 9 August 2013</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 12 August 2013</h2>
    </hgroup><dl><dt><strong>Web developer edition:</strong></dt>
     <dd><strong><a href=http://developers.whatwg.org/>http://developers.whatwg.org/</a></strong></dd>
     <dt>Multiple-page version:</dt>
@@ -86597,7 +86597,7 @@ <h5 id=the-list-of-active-formatting-elements><span class=secno>12.2.3.3 </span>
   <p>When the steps below require the UA to <dfn id=push-onto-the-list-of-active-formatting-elements>push onto the list of
   active formatting elements</dfn> an element <var title="">element</var>, the UA must perform the following steps:</p>
 
-  <ol><li><p>If there are already three elements in the <a href=#list-of-active-formatting-elements>list of
+  <ol id=noah><li><p>If there are already three elements in the <a href=#list-of-active-formatting-elements>list of
    active formatting elements</a> after the last list marker, if
    any, or anywhere in the list if there are no list markers, that
    have the same tag name, namespace, and attributes as <var title="">element</var>, then remove the earliest such element from
@@ -91139,9 +91139,8 @@ <h6 id=the-before-head-insertion-mode><span class=secno>12.2.5.4.3 </span>The "<
       <ol><li><p><a href=#generate-implied-end-tags>Generate implied end tags</a>, except for <a href=#html-elements>HTML elements</a> with the
        same tag name as the token.</li>
 
-       <li><p>If the tag name of the end tag token does not match the tag name of the <a href=#current-node>current
-       node</a>, or if it is not an <a href=#html-elements title="HTML elements">HTML element</a>, then this is
-       a <a href=#parse-error>parse error</a>.</li>
+       <li><p>If <var title="">node</var> is not the <a href=#current-node>current node</a>, then this is a
+       <a href=#parse-error>parse error</a>.</li>
 
        <li><p>Pop all the nodes from the <a href=#current-node>current node</a> up to <var title="">node</var>,
        including <var title="">node</var>, then stop these steps.</li>
@@ -91173,7 +91172,7 @@ <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><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>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>
@@ -91191,7 +91190,7 @@ <h6 id=the-before-head-insertion-mode><span class=secno>12.2.5.4.3 </span>The "<
      <li>has the tag name <var title="">subject</var>.</li>
 
     </ul><p>If there is no such element, then abort these steps and instead act as described in the "any
-    other end tag" entry below.</p>
+    other end tag" entry above.</p>
 
    </li>
 

diff --git a/index b/index
@@ -256,7 +256,7 @@
 
   <header class=head id=head><p><a href=http://www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 9 August 2013</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 12 August 2013</h2>
    </hgroup><dl><dt><strong>Web developer edition:</strong></dt>
     <dd><strong><a href=http://developers.whatwg.org/>http://developers.whatwg.org/</a></strong></dd>
     <dt>Multiple-page version:</dt>
@@ -86597,7 +86597,7 @@ dictionary <dfn id=storageeventinit>StorageEventInit</dfn> : <a href=#eventinit>
   <p>When the steps below require the UA to <dfn id=push-onto-the-list-of-active-formatting-elements>push onto the list of
   active formatting elements</dfn> an element <var title="">element</var>, the UA must perform the following steps:</p>
 
-  <ol><li><p>If there are already three elements in the <a href=#list-of-active-formatting-elements>list of
+  <ol id=noah><li><p>If there are already three elements in the <a href=#list-of-active-formatting-elements>list of
    active formatting elements</a> after the last list marker, if
    any, or anywhere in the list if there are no list markers, that
    have the same tag name, namespace, and attributes as <var title="">element</var>, then remove the earliest such element from
@@ -91139,9 +91139,8 @@ document.body.appendChild(text);
       <ol><li><p><a href=#generate-implied-end-tags>Generate implied end tags</a>, except for <a href=#html-elements>HTML elements</a> with the
        same tag name as the token.</li>
 
-       <li><p>If the tag name of the end tag token does not match the tag name of the <a href=#current-node>current
-       node</a>, or if it is not an <a href=#html-elements title="HTML elements">HTML element</a>, then this is
-       a <a href=#parse-error>parse error</a>.</li>
+       <li><p>If <var title="">node</var> is not the <a href=#current-node>current node</a>, then this is a
+       <a href=#parse-error>parse error</a>.</li>
 
        <li><p>Pop all the nodes from the <a href=#current-node>current node</a> up to <var title="">node</var>,
        including <var title="">node</var>, then stop these steps.</li>
@@ -91173,7 +91172,7 @@ 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><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>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>
@@ -91191,7 +91190,7 @@ document.body.appendChild(text);
      <li>has the tag name <var title="">subject</var>.</li>
 
     </ul><p>If there is no such element, then abort these steps and instead act as described in the "any
-    other end tag" entry below.</p>
+    other end tag" entry above.</p>
 
    </li>
 

diff --git a/source b/source
@@ -96664,7 +96664,7 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {
   active formatting elements</dfn> an element <var
   title="">element</var>, the UA must perform the following steps:</p>
 
-  <ol>
+  <ol id="noah">
 
    <li><p>If there are already three elements in the <span>list of
    active formatting elements</span> after the last list marker, if
@@ -101798,9 +101798,8 @@ document.body.appendChild(text);
        <li><p><span>Generate implied end tags</span>, except for <span>HTML elements</span> with the
        same tag name as the token.</p></li>
 
-       <li><p>If the tag name of the end tag token does not match the tag name of the <span>current
-       node</span>, or if it is not an <span title="HTML elements">HTML element</span>, then this is
-       a <span>parse error</span>.</p></li>
+       <li><p>If <var title="">node</var> is not the <span>current node</span>, then this is a
+       <span>parse error</span>.</p></li>
 
        <li><p>Pop all the nodes from the <span>current node</span> up to <var title="">node</var>,
        including <var title="">node</var>, then stop these steps.</p></li>
@@ -101845,6 +101844,8 @@ document.body.appendChild(text);
 
   <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.</p></li>
 
    <li><p><i>Outer loop</i>: If <var title="">outer loop counter</var> is greater than or equal to
@@ -101867,7 +101868,7 @@ document.body.appendChild(text);
     </ul>
 
     <p>If there is no such element, then abort these steps and instead act as described in the "any
-    other end tag" entry below.</p>
+    other end tag" entry above.</p>
 
    </li>