[html5] r5158 - [giow] (2) Make the implied </p> magic not cross <button> boundaries since doing [...]

whatwg at whatwg.org whatwg at whatwg.org
Wed Jul 14 11:13:58 PDT 2010


Author: ianh
Date: 2010-07-14 11:13:57 -0700 (Wed, 14 Jul 2010)
New Revision: 5158

Modified:
   complete.html
   index
   source
Log:
[giow] (2) Make the implied </p> magic not cross <button> boundaries since doing that breaks a(n invalid) Ubuntu download page. Rename the 'phrasing' category to 'ordinary' since I keep forgetting that 'phrasing' is not an explicit list but is in fact an open-ended list. Merged the 'special' and 'scoping' categories since nothing distinguished them.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=9829

Modified: complete.html
===================================================================
--- complete.html	2010-07-14 02:02:41 UTC (rev 5157)
+++ complete.html	2010-07-14 18:13:57 UTC (rev 5158)
@@ -78186,39 +78186,35 @@
 
   <dl><dt><dfn id=special>Special</dfn></dt>
    <dd><p>The following HTML elements have varying levels of special
-   parsing rules: <code><a href=#the-address-element>address</a></code>, <code><a href=#the-area-element>area</a></code>,
-   <code><a href=#the-article-element>article</a></code>, <code><a href=#the-aside-element>aside</a></code>, <code><a href=#the-base-element>base</a></code>,
-   <code><a href=#basefont>basefont</a></code>, <code><a href=#bgsound>bgsound</a></code>,
+   parsing rules: <code><a href=#the-address-element>address</a></code>, <code><a href=#the-applet-element>applet</a></code>,
+   <code><a href=#the-area-element>area</a></code>, <code><a href=#the-article-element>article</a></code>, <code><a href=#the-aside-element>aside</a></code>,
+   <code><a href=#the-base-element>base</a></code>, <code><a href=#basefont>basefont</a></code>, <code><a href=#bgsound>bgsound</a></code>,
    <code><a href=#the-blockquote-element>blockquote</a></code>, <code><a href=#the-body-element-0>body</a></code>, <code><a href=#the-br-element>br</a></code>,
-   <code><a href=#the-button-element>button</a></code>, <code><a href=#center>center</a></code>, <code><a href=#the-col-element>col</a></code>,
-   <code><a href=#the-colgroup-element>colgroup</a></code>, <code><a href=#the-command>command</a></code>, <!--v2DDATAGRID
-   <code>datagrid</code>-->, <code><a href=#the-dd-element>dd</a></code>, <code><a href=#the-details-element>details</a></code>,
-   <code><a href=#dir>dir</a></code>, <code><a href=#the-div-element>div</a></code>, <code><a href=#the-dl-element>dl</a></code>,
-   <code><a href=#the-dt-element>dt</a></code>, <code><a href=#the-embed-element>embed</a></code>, <code><a href=#the-fieldset-element>fieldset</a></code>,
-   <code><a href=#the-figure-element>figure</a></code>, <code><a href=#the-footer-element>footer</a></code>, <code><a href=#the-form-element>form</a></code>,
-   <code><a href=#frame>frame</a></code>, <code><a href=#frameset>frameset</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>,
-   <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>,
-   <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code>, <code><a href=#the-head-element-0>head</a></code>, <code><a href=#the-header-element>header</a></code>,
-   <code><a href=#the-hgroup-element>hgroup</a></code>, <code><a href=#the-hr-element>hr</a></code>, <code><a href=#the-iframe-element>iframe</a></code>, <!--
+   <code><a href=#the-button-element>button</a></code>, <code><a href=#the-button-element>button</a></code>, <code><a href=#the-caption-element>caption</a></code>,
+   <code><a href=#center>center</a></code>, <code><a href=#the-col-element>col</a></code>, <code><a href=#the-colgroup-element>colgroup</a></code>,
+   <code><a href=#the-command>command</a></code>, <!--v2DDATAGRID <code>datagrid</code>,-->
+   <code><a href=#the-dd-element>dd</a></code>, <code><a href=#the-details-element>details</a></code>, <code><a href=#dir>dir</a></code>,
+   <code><a href=#the-div-element>div</a></code>, <code><a href=#the-dl-element>dl</a></code>, <code><a href=#the-dt-element>dt</a></code>,
+   <code><a href=#the-embed-element>embed</a></code>, <code><a href=#the-fieldset-element>fieldset</a></code>, <code><a href=#the-figure-element>figure</a></code>,
+   <code><a href=#the-footer-element>footer</a></code>, <code><a href=#the-form-element>form</a></code>, <code><a href=#frame>frame</a></code>,
+   <code><a href=#frameset>frameset</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>,
+   <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code>,
+   <code><a href=#the-head-element-0>head</a></code>, <code><a href=#the-header-element>header</a></code>, <code><a href=#the-hgroup-element>hgroup</a></code>,
+   <code><a href=#the-hr-element>hr</a></code>, <code><a href=#the-html-element-0>html</a></code>, <code><a href=#the-iframe-element>iframe</a></code>, <!--
    <code>image</code>, (commented out because this isn't an element
    that can end up on the stack, so it doesn't matter) -->
    <code><a href=#the-img-element>img</a></code>, <code><a href=#the-input-element>input</a></code>, <code><a href=#isindex-0>isindex</a></code>,
    <code><a href=#the-li-element>li</a></code>, <code><a href=#the-link-element>link</a></code>, <code><a href=#listing>listing</a></code>,
-   <code><a href=#menus>menu</a></code>, <code><a href=#meta>meta</a></code>, <code><a href=#the-nav-element>nav</a></code>,
-   <code><a href=#noembed>noembed</a></code>, <code><a href=#noframes>noframes</a></code>, <code><a href=#the-noscript-element>noscript</a></code>,
-   <code><a href=#the-ol-element>ol</a></code>, <code><a href=#the-p-element>p</a></code>, <code><a href=#the-param-element>param</a></code>,
-   <code><a href=#plaintext>plaintext</a></code>, <code><a href=#the-pre-element>pre</a></code>, <code><a href=#script>script</a></code>,
-   <code><a href=#the-section-element>section</a></code>, <code><a href=#the-select-element>select</a></code>, <code><a href=#the-style-element>style</a></code>,
-   <code><a href=#the-tbody-element>tbody</a></code>, <code><a href=#the-textarea-element>textarea</a></code>, <code><a href=#the-tfoot-element>tfoot</a></code>,
-   <code><a href=#the-thead-element>thead</a></code>, <code><a href=#the-title-element-0>title</a></code>, <code><a href=#the-tr-element>tr</a></code>,
-   <code><a href=#the-ul-element>ul</a></code>, <code><a href=#the-wbr-element>wbr</a></code>, and <code><a href=#xmp>xmp</a></code>.</dd>
-
-   <dt><dfn id=scoping>Scoping</dfn></dt>
-   <dd><p>The following HTML elements introduce new <a href=#has-an-element-in-scope title="has
-   an element in scope">scopes</a> for various parts of the
-   parsing: <code><a href=#the-applet-element>applet</a></code>, <code><a href=#the-caption-element>caption</a></code>,
-   <code><a href=#the-html-element-0>html</a></code>, <code><a href=#the-marquee-element>marquee</a></code>, <code><a href=#the-object-element>object</a></code>,
-   <code><a href=#the-table-element>table</a></code>, <code><a href=#the-td-element>td</a></code>, <code><a href=#the-th-element>th</a></code>, and SVG's
+   <code><a href=#the-marquee-element>marquee</a></code>, <code><a href=#menus>menu</a></code>, <code><a href=#meta>meta</a></code>,
+   <code><a href=#the-nav-element>nav</a></code>, <code><a href=#noembed>noembed</a></code>, <code><a href=#noframes>noframes</a></code>,
+   <code><a href=#the-noscript-element>noscript</a></code>, <code><a href=#the-object-element>object</a></code>, <code><a href=#the-ol-element>ol</a></code>,
+   <code><a href=#the-p-element>p</a></code>, <code><a href=#the-param-element>param</a></code>, <code><a href=#plaintext>plaintext</a></code>,
+   <code><a href=#the-pre-element>pre</a></code>, <code><a href=#script>script</a></code>, <code><a href=#the-section-element>section</a></code>,
+   <code><a href=#the-select-element>select</a></code>, <code><a href=#the-style-element>style</a></code>, <code><a href=#the-table-element>table</a></code>,
+   <code><a href=#the-tbody-element>tbody</a></code>, <code><a href=#the-td-element>td</a></code>, <code><a href=#the-textarea-element>textarea</a></code>,
+   <code><a href=#the-tfoot-element>tfoot</a></code>, <code><a href=#the-th-element>th</a></code>, <code><a href=#the-thead-element>thead</a></code>,
+   <code><a href=#the-title-element-0>title</a></code>, <code><a href=#the-tr-element>tr</a></code>, <code><a href=#the-ul-element>ul</a></code>,
+   <code><a href=#the-wbr-element>wbr</a></code>, <code><a href=#xmp>xmp</a></code>, and SVG's
    <code>foreignObject</code>.</dd>
 
    <dt><dfn id=formatting>Formatting</dfn></dt>
@@ -78230,7 +78226,7 @@
    <code><a href=#strike>strike</a></code>, <code><a href=#the-strong-element>strong</a></code>, <code><a href=#tt>tt</a></code>, and
    <code><a href=#u>u</a></code>.</dd>
 
-   <dt><dfn id=phrasing>Phrasing</dfn></dt>
+   <dt><dfn id=ordinary>Ordinary</dfn></dt>
    <dd><p>All other elements found while parsing an HTML
    document.</dd>
 
@@ -78276,10 +78272,17 @@
    in scope</a></i> algorithm.</li>
    <li><code><a href=#the-ol-element>ol</a></code> in the HTML namespace</li>
    <li><code><a href=#the-ul-element>ul</a></code> in the HTML namespace</li>
-  </ul><p>The <a href=#stack-of-open-elements>stack of open elements</a> is said to <dfn id=has-an-element-in-table-scope title="has an element in table scope">have an element in <em>table
-  scope</em></dfn> when it <a href=#has-an-element-in-the-specific-scope>has an element in the specific
+  </ul><p>The <a href=#stack-of-open-elements>stack of open elements</a> is said to <dfn id=has-an-element-in-button-scope title="has an element in button scope">have an element in button
+  scope</dfn> when it <a href=#has-an-element-in-the-specific-scope>has an element in the specific
   scope</a> consisting of the following element types:</p>
 
+  <ul class=brief><li>All the element types listed above for the <i><a href=#has-an-element-in-scope>has an element
+   in scope</a></i> algorithm.</li>
+   <li><code><a href=#the-button-element>button</a></code> in the HTML namespace</li>
+  </ul><p>The <a href=#stack-of-open-elements>stack of open elements</a> is said to <dfn id=has-an-element-in-table-scope title="has an element in table scope">have an element in table
+  scope</dfn> when it <a href=#has-an-element-in-the-specific-scope>has an element in the specific
+  scope</a> consisting of the following element types:</p>
+
   <ul class=brief><li><code><a href=#the-html-element-0>html</a></code> in the HTML namespace</li> <!-- (This can only happen if the <var title="">node</var> is the topmost node of the <span>stack of open elements</span>, and prevents the next step from being invoked if there are no more elements in the stack.) -->
    <li><code><a href=#the-table-element>table</a></code> in the HTML namespace</li>
   </ul><p>Nothing happens if at any time any of the elements in the
@@ -81662,10 +81665,10 @@
     DOM nonsense, and thus should actually afford better compatibility
     when implemented by the other browsers. -->
 
-    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-scope title="has
-    an element in scope">has a <code>p</code> element in
-    scope</a>, then act as if an end tag with the tag name
-    "p" had been seen.</p>
+    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-button-scope title="has an
+    element in button scope">has a <code>p</code> element in button
+    scope</a>, then act as if an end tag with the tag name "p" had
+    been seen.</p>
 
     <p><a href=#insert-an-html-element>Insert an HTML element</a> for the token.</p>
 
@@ -81676,8 +81679,8 @@
    "h5", "h6"</dt>
    <dd>
 
-    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-scope title="has
-    an element in scope">has a <code>p</code> element in
+    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-button-scope title="has
+    an element in button scope">has a <code>p</code> element in button
     scope</a>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
@@ -81695,8 +81698,8 @@
    <dt>A start tag whose tag name is one of: "pre", "listing"</dt>
    <dd>
 
-    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-scope title="has
-    an element in scope">has a <code>p</code> element in
+    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-button-scope title="has
+    an element in button scope">has a <code>p</code> element in button
     scope</a>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
@@ -81724,8 +81727,8 @@
 
     <p>Otherwise:</p>
 
-    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-scope title="has
-    an element in scope">has a <code>p</code> element in
+    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-button-scope title="has
+    an element in button scope">has a <code>p</code> element in button
     scope</a>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
@@ -81752,7 +81755,7 @@
 
      <li><p>If <var title="">node</var> is not in the
      <a href=#formatting>formatting</a> category, and is not in the
-     <a href=#phrasing>phrasing</a> category, and is not an
+     <a href=#ordinary>ordinary</a> category, and is not an
      <code><a href=#the-address-element>address</a></code>, <code><a href=#the-div-element>div</a></code>, or <code><a href=#the-p-element>p</a></code>
      element, then jump to the last step.</li> <!-- an element
      <foo> is in this list if the following markup:
@@ -81771,8 +81774,8 @@
 
       <p>This is the last step.</p>
 
-      <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-scope title="has
-      an element in scope">has a <code>p</code> element in
+      <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-button-scope title="has
+      an element in button scope">has a <code>p</code> element in button
       scope</a>, then act as if an end tag with the tag name
       "p" had been seen.</p>
 
@@ -81801,7 +81804,7 @@
 
      <li><p>If <var title="">node</var> is not in the
      <a href=#formatting>formatting</a> category, and is not in the
-     <a href=#phrasing>phrasing</a> category, and is not an
+     <a href=#ordinary>ordinary</a> category, and is not an
      <code><a href=#the-address-element>address</a></code>, <code><a href=#the-div-element>div</a></code>, or <code><a href=#the-p-element>p</a></code>
      element, then jump to the last step.</li> <!-- an element
      <foo> is in this list if the following markup:
@@ -81820,8 +81823,8 @@
 
       <p>This is the last step.</p>
 
-      <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-scope title="has
-      an element in scope">has a <code>p</code> element in
+      <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-button-scope title="has
+      an element in button scope">has a <code>p</code> element in button
       scope</a>, then act as if an end tag with the tag name
       "p" had been seen.</p>
 
@@ -81836,8 +81839,8 @@
    <dt>A start tag whose tag name is "plaintext"</dt>
    <dd>
 
-    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-scope title="has
-    an element in scope">has a <code>p</code> element in
+    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-button-scope title="has
+    an element in button scope">has a <code>p</code> element in button
     scope</a>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
@@ -81933,10 +81936,10 @@
    <dt>An end tag whose tag name is "p"</dt>
    <dd>
 
-    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> does not <a href=#has-an-element-in-scope title="has an element in scope">have an element in scope</a>
-    with the same tag name as that of the token, then this is a
-    <a href=#parse-error>parse error</a>; act as if a start tag with the tag name
-    "p" had been seen, then reprocess the current token.</p>
+    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> does not <a href=#has-an-element-in-button-scope title="has an element in button scope">have an element in sbutton
+    cope</a> with the same tag name as that of the token, then this
+    is a <a href=#parse-error>parse error</a>; act as if a start tag with the tag
+    name "p" had been seen, then reprocess the current token.</p>
 
     <p>Otherwise, run these steps:</p>
 
@@ -82145,7 +82148,7 @@
      topmost node in the <a href=#stack-of-open-elements>stack of open elements</a> that
      is lower in the stack than the <var title="">formatting
      element</var>, and is not an element in the
-     <a href=#phrasing>phrasing</a> or <a href=#formatting>formatting</a>
+     <a href=#ordinary>ordinary</a> or <a href=#formatting>formatting</a>
      categories. There might not be one.</li>
 
      <li><p>If there is no <var title="">furthest block</var>,
@@ -82301,12 +82304,12 @@
 
     <p>If the <code><a href=#document>Document</a></code> is <em>not</em> set to
     <a href=#quirks-mode>quirks mode</a>, and the <a href=#stack-of-open-elements>stack of open
-    elements</a> <a href=#has-an-element-in-scope title="has an element in scope">has a
-    <code>p</code> element in scope</a>, then act as if an end tag
-    with the tag name "p" had been seen.</p> <!-- i hate myself (this
-    quirk was basically caused by acid2; if i'd realised we could
-    change the specs when i wrote acid2, we could have avoided having
-    any parsing-mode quirks) -Hixie -->
+    elements</a> <a href=#has-an-element-in-button-scope title="has an element in button scope">has a
+    <code>p</code> element in button scope</a>, then act as if an
+    end tag with the tag name "p" had been seen.</p> <!-- i hate
+    myself (this quirk was basically caused by acid2; if i'd realised
+    we could change the specs when i wrote acid2, we could have
+    avoided having any parsing-mode quirks) -Hixie -->
 
     <p><a href=#insert-an-html-element>Insert an HTML element</a> for the token.</p>
 
@@ -82350,8 +82353,8 @@
    <dt>A start tag whose tag name is "hr"</dt>
    <dd>
 
-    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-scope title="has
-    an element in scope">has a <code>p</code> element in
+    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-button-scope title="has
+    an element in button scope">has a <code>p</code> element in button
     scope</a>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
@@ -82464,8 +82467,8 @@
    <dt>A start tag whose tag name is "xmp"</dt>
    <dd>
 
-    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-scope title="has
-    an element in scope">has a <code>p</code> element in
+    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-button-scope title="has
+    an element in button scope">has a <code>p</code> element in button
     scope</a>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
@@ -82670,7 +82673,7 @@
 
     <p><a href=#insert-an-html-element>Insert an HTML element</a> for the token.</p>
 
-    <p class=note>This element will be a <a href=#phrasing>phrasing</a>
+    <p class=note>This element will be a <a href=#ordinary>ordinary</a>
     element.</p>
 
    </dd>
@@ -82698,7 +82701,7 @@
       </ol></li>
 
      <li><p>Otherwise, if <var title="">node</var> is in neither the
-     <a href=#formatting>formatting</a> category nor the <a href=#phrasing>phrasing</a>
+     <a href=#formatting>formatting</a> category nor the <a href=#ordinary>ordinary</a>
      category, then this is a <a href=#parse-error>parse error</a>; ignore the
      token, and abort these steps.</li>
 

Modified: index
===================================================================
--- index	2010-07-14 02:02:41 UTC (rev 5157)
+++ index	2010-07-14 18:13:57 UTC (rev 5158)
@@ -71427,39 +71427,35 @@
 
   <dl><dt><dfn id=special>Special</dfn></dt>
    <dd><p>The following HTML elements have varying levels of special
-   parsing rules: <code><a href=#the-address-element>address</a></code>, <code><a href=#the-area-element>area</a></code>,
-   <code><a href=#the-article-element>article</a></code>, <code><a href=#the-aside-element>aside</a></code>, <code><a href=#the-base-element>base</a></code>,
-   <code><a href=#basefont>basefont</a></code>, <code><a href=#bgsound>bgsound</a></code>,
+   parsing rules: <code><a href=#the-address-element>address</a></code>, <code><a href=#the-applet-element>applet</a></code>,
+   <code><a href=#the-area-element>area</a></code>, <code><a href=#the-article-element>article</a></code>, <code><a href=#the-aside-element>aside</a></code>,
+   <code><a href=#the-base-element>base</a></code>, <code><a href=#basefont>basefont</a></code>, <code><a href=#bgsound>bgsound</a></code>,
    <code><a href=#the-blockquote-element>blockquote</a></code>, <code><a href=#the-body-element-0>body</a></code>, <code><a href=#the-br-element>br</a></code>,
-   <code><a href=#the-button-element>button</a></code>, <code><a href=#center>center</a></code>, <code><a href=#the-col-element>col</a></code>,
-   <code><a href=#the-colgroup-element>colgroup</a></code>, <code><a href=#the-command>command</a></code>, <!--v2DDATAGRID
-   <code>datagrid</code>-->, <code><a href=#the-dd-element>dd</a></code>, <code><a href=#the-details-element>details</a></code>,
-   <code><a href=#dir>dir</a></code>, <code><a href=#the-div-element>div</a></code>, <code><a href=#the-dl-element>dl</a></code>,
-   <code><a href=#the-dt-element>dt</a></code>, <code><a href=#the-embed-element>embed</a></code>, <code><a href=#the-fieldset-element>fieldset</a></code>,
-   <code><a href=#the-figure-element>figure</a></code>, <code><a href=#the-footer-element>footer</a></code>, <code><a href=#the-form-element>form</a></code>,
-   <code><a href=#frame>frame</a></code>, <code><a href=#frameset>frameset</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>,
-   <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>,
-   <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code>, <code><a href=#the-head-element-0>head</a></code>, <code><a href=#the-header-element>header</a></code>,
-   <code><a href=#the-hgroup-element>hgroup</a></code>, <code><a href=#the-hr-element>hr</a></code>, <code><a href=#the-iframe-element>iframe</a></code>, <!--
+   <code><a href=#the-button-element>button</a></code>, <code><a href=#the-button-element>button</a></code>, <code><a href=#the-caption-element>caption</a></code>,
+   <code><a href=#center>center</a></code>, <code><a href=#the-col-element>col</a></code>, <code><a href=#the-colgroup-element>colgroup</a></code>,
+   <code><a href=#the-command>command</a></code>, <!--v2DDATAGRID <code>datagrid</code>,-->
+   <code><a href=#the-dd-element>dd</a></code>, <code><a href=#the-details-element>details</a></code>, <code><a href=#dir>dir</a></code>,
+   <code><a href=#the-div-element>div</a></code>, <code><a href=#the-dl-element>dl</a></code>, <code><a href=#the-dt-element>dt</a></code>,
+   <code><a href=#the-embed-element>embed</a></code>, <code><a href=#the-fieldset-element>fieldset</a></code>, <code><a href=#the-figure-element>figure</a></code>,
+   <code><a href=#the-footer-element>footer</a></code>, <code><a href=#the-form-element>form</a></code>, <code><a href=#frame>frame</a></code>,
+   <code><a href=#frameset>frameset</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>,
+   <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code>,
+   <code><a href=#the-head-element-0>head</a></code>, <code><a href=#the-header-element>header</a></code>, <code><a href=#the-hgroup-element>hgroup</a></code>,
+   <code><a href=#the-hr-element>hr</a></code>, <code><a href=#the-html-element-0>html</a></code>, <code><a href=#the-iframe-element>iframe</a></code>, <!--
    <code>image</code>, (commented out because this isn't an element
    that can end up on the stack, so it doesn't matter) -->
    <code><a href=#the-img-element>img</a></code>, <code><a href=#the-input-element>input</a></code>, <code><a href=#isindex-0>isindex</a></code>,
    <code><a href=#the-li-element>li</a></code>, <code><a href=#the-link-element>link</a></code>, <code><a href=#listing>listing</a></code>,
-   <code><a href=#menus>menu</a></code>, <code><a href=#meta>meta</a></code>, <code><a href=#the-nav-element>nav</a></code>,
-   <code><a href=#noembed>noembed</a></code>, <code><a href=#noframes>noframes</a></code>, <code><a href=#the-noscript-element>noscript</a></code>,
-   <code><a href=#the-ol-element>ol</a></code>, <code><a href=#the-p-element>p</a></code>, <code><a href=#the-param-element>param</a></code>,
-   <code><a href=#plaintext>plaintext</a></code>, <code><a href=#the-pre-element>pre</a></code>, <code><a href=#script>script</a></code>,
-   <code><a href=#the-section-element>section</a></code>, <code><a href=#the-select-element>select</a></code>, <code><a href=#the-style-element>style</a></code>,
-   <code><a href=#the-tbody-element>tbody</a></code>, <code><a href=#the-textarea-element>textarea</a></code>, <code><a href=#the-tfoot-element>tfoot</a></code>,
-   <code><a href=#the-thead-element>thead</a></code>, <code><a href=#the-title-element-0>title</a></code>, <code><a href=#the-tr-element>tr</a></code>,
-   <code><a href=#the-ul-element>ul</a></code>, <code><a href=#the-wbr-element>wbr</a></code>, and <code><a href=#xmp>xmp</a></code>.</dd>
-
-   <dt><dfn id=scoping>Scoping</dfn></dt>
-   <dd><p>The following HTML elements introduce new <a href=#has-an-element-in-scope title="has
-   an element in scope">scopes</a> for various parts of the
-   parsing: <code><a href=#the-applet-element>applet</a></code>, <code><a href=#the-caption-element>caption</a></code>,
-   <code><a href=#the-html-element-0>html</a></code>, <code><a href=#the-marquee-element>marquee</a></code>, <code><a href=#the-object-element>object</a></code>,
-   <code><a href=#the-table-element>table</a></code>, <code><a href=#the-td-element>td</a></code>, <code><a href=#the-th-element>th</a></code>, and SVG's
+   <code><a href=#the-marquee-element>marquee</a></code>, <code><a href=#menus>menu</a></code>, <code><a href=#meta>meta</a></code>,
+   <code><a href=#the-nav-element>nav</a></code>, <code><a href=#noembed>noembed</a></code>, <code><a href=#noframes>noframes</a></code>,
+   <code><a href=#the-noscript-element>noscript</a></code>, <code><a href=#the-object-element>object</a></code>, <code><a href=#the-ol-element>ol</a></code>,
+   <code><a href=#the-p-element>p</a></code>, <code><a href=#the-param-element>param</a></code>, <code><a href=#plaintext>plaintext</a></code>,
+   <code><a href=#the-pre-element>pre</a></code>, <code><a href=#script>script</a></code>, <code><a href=#the-section-element>section</a></code>,
+   <code><a href=#the-select-element>select</a></code>, <code><a href=#the-style-element>style</a></code>, <code><a href=#the-table-element>table</a></code>,
+   <code><a href=#the-tbody-element>tbody</a></code>, <code><a href=#the-td-element>td</a></code>, <code><a href=#the-textarea-element>textarea</a></code>,
+   <code><a href=#the-tfoot-element>tfoot</a></code>, <code><a href=#the-th-element>th</a></code>, <code><a href=#the-thead-element>thead</a></code>,
+   <code><a href=#the-title-element-0>title</a></code>, <code><a href=#the-tr-element>tr</a></code>, <code><a href=#the-ul-element>ul</a></code>,
+   <code><a href=#the-wbr-element>wbr</a></code>, <code><a href=#xmp>xmp</a></code>, and SVG's
    <code>foreignObject</code>.</dd>
 
    <dt><dfn id=formatting>Formatting</dfn></dt>
@@ -71471,7 +71467,7 @@
    <code><a href=#strike>strike</a></code>, <code><a href=#the-strong-element>strong</a></code>, <code><a href=#tt>tt</a></code>, and
    <code><a href=#u>u</a></code>.</dd>
 
-   <dt><dfn id=phrasing>Phrasing</dfn></dt>
+   <dt><dfn id=ordinary>Ordinary</dfn></dt>
    <dd><p>All other elements found while parsing an HTML
    document.</dd>
 
@@ -71517,10 +71513,17 @@
    in scope</a></i> algorithm.</li>
    <li><code><a href=#the-ol-element>ol</a></code> in the HTML namespace</li>
    <li><code><a href=#the-ul-element>ul</a></code> in the HTML namespace</li>
-  </ul><p>The <a href=#stack-of-open-elements>stack of open elements</a> is said to <dfn id=has-an-element-in-table-scope title="has an element in table scope">have an element in <em>table
-  scope</em></dfn> when it <a href=#has-an-element-in-the-specific-scope>has an element in the specific
+  </ul><p>The <a href=#stack-of-open-elements>stack of open elements</a> is said to <dfn id=has-an-element-in-button-scope title="has an element in button scope">have an element in button
+  scope</dfn> when it <a href=#has-an-element-in-the-specific-scope>has an element in the specific
   scope</a> consisting of the following element types:</p>
 
+  <ul class=brief><li>All the element types listed above for the <i><a href=#has-an-element-in-scope>has an element
+   in scope</a></i> algorithm.</li>
+   <li><code><a href=#the-button-element>button</a></code> in the HTML namespace</li>
+  </ul><p>The <a href=#stack-of-open-elements>stack of open elements</a> is said to <dfn id=has-an-element-in-table-scope title="has an element in table scope">have an element in table
+  scope</dfn> when it <a href=#has-an-element-in-the-specific-scope>has an element in the specific
+  scope</a> consisting of the following element types:</p>
+
   <ul class=brief><li><code><a href=#the-html-element-0>html</a></code> in the HTML namespace</li> <!-- (This can only happen if the <var title="">node</var> is the topmost node of the <span>stack of open elements</span>, and prevents the next step from being invoked if there are no more elements in the stack.) -->
    <li><code><a href=#the-table-element>table</a></code> in the HTML namespace</li>
   </ul><p>Nothing happens if at any time any of the elements in the
@@ -74903,10 +74906,10 @@
     DOM nonsense, and thus should actually afford better compatibility
     when implemented by the other browsers. -->
 
-    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-scope title="has
-    an element in scope">has a <code>p</code> element in
-    scope</a>, then act as if an end tag with the tag name
-    "p" had been seen.</p>
+    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-button-scope title="has an
+    element in button scope">has a <code>p</code> element in button
+    scope</a>, then act as if an end tag with the tag name "p" had
+    been seen.</p>
 
     <p><a href=#insert-an-html-element>Insert an HTML element</a> for the token.</p>
 
@@ -74917,8 +74920,8 @@
    "h5", "h6"</dt>
    <dd>
 
-    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-scope title="has
-    an element in scope">has a <code>p</code> element in
+    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-button-scope title="has
+    an element in button scope">has a <code>p</code> element in button
     scope</a>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
@@ -74936,8 +74939,8 @@
    <dt>A start tag whose tag name is one of: "pre", "listing"</dt>
    <dd>
 
-    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-scope title="has
-    an element in scope">has a <code>p</code> element in
+    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-button-scope title="has
+    an element in button scope">has a <code>p</code> element in button
     scope</a>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
@@ -74965,8 +74968,8 @@
 
     <p>Otherwise:</p>
 
-    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-scope title="has
-    an element in scope">has a <code>p</code> element in
+    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-button-scope title="has
+    an element in button scope">has a <code>p</code> element in button
     scope</a>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
@@ -74993,7 +74996,7 @@
 
      <li><p>If <var title="">node</var> is not in the
      <a href=#formatting>formatting</a> category, and is not in the
-     <a href=#phrasing>phrasing</a> category, and is not an
+     <a href=#ordinary>ordinary</a> category, and is not an
      <code><a href=#the-address-element>address</a></code>, <code><a href=#the-div-element>div</a></code>, or <code><a href=#the-p-element>p</a></code>
      element, then jump to the last step.</li> <!-- an element
      <foo> is in this list if the following markup:
@@ -75012,8 +75015,8 @@
 
       <p>This is the last step.</p>
 
-      <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-scope title="has
-      an element in scope">has a <code>p</code> element in
+      <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-button-scope title="has
+      an element in button scope">has a <code>p</code> element in button
       scope</a>, then act as if an end tag with the tag name
       "p" had been seen.</p>
 
@@ -75042,7 +75045,7 @@
 
      <li><p>If <var title="">node</var> is not in the
      <a href=#formatting>formatting</a> category, and is not in the
-     <a href=#phrasing>phrasing</a> category, and is not an
+     <a href=#ordinary>ordinary</a> category, and is not an
      <code><a href=#the-address-element>address</a></code>, <code><a href=#the-div-element>div</a></code>, or <code><a href=#the-p-element>p</a></code>
      element, then jump to the last step.</li> <!-- an element
      <foo> is in this list if the following markup:
@@ -75061,8 +75064,8 @@
 
       <p>This is the last step.</p>
 
-      <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-scope title="has
-      an element in scope">has a <code>p</code> element in
+      <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-button-scope title="has
+      an element in button scope">has a <code>p</code> element in button
       scope</a>, then act as if an end tag with the tag name
       "p" had been seen.</p>
 
@@ -75077,8 +75080,8 @@
    <dt>A start tag whose tag name is "plaintext"</dt>
    <dd>
 
-    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-scope title="has
-    an element in scope">has a <code>p</code> element in
+    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-button-scope title="has
+    an element in button scope">has a <code>p</code> element in button
     scope</a>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
@@ -75174,10 +75177,10 @@
    <dt>An end tag whose tag name is "p"</dt>
    <dd>
 
-    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> does not <a href=#has-an-element-in-scope title="has an element in scope">have an element in scope</a>
-    with the same tag name as that of the token, then this is a
-    <a href=#parse-error>parse error</a>; act as if a start tag with the tag name
-    "p" had been seen, then reprocess the current token.</p>
+    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> does not <a href=#has-an-element-in-button-scope title="has an element in button scope">have an element in sbutton
+    cope</a> with the same tag name as that of the token, then this
+    is a <a href=#parse-error>parse error</a>; act as if a start tag with the tag
+    name "p" had been seen, then reprocess the current token.</p>
 
     <p>Otherwise, run these steps:</p>
 
@@ -75386,7 +75389,7 @@
      topmost node in the <a href=#stack-of-open-elements>stack of open elements</a> that
      is lower in the stack than the <var title="">formatting
      element</var>, and is not an element in the
-     <a href=#phrasing>phrasing</a> or <a href=#formatting>formatting</a>
+     <a href=#ordinary>ordinary</a> or <a href=#formatting>formatting</a>
      categories. There might not be one.</li>
 
      <li><p>If there is no <var title="">furthest block</var>,
@@ -75542,12 +75545,12 @@
 
     <p>If the <code><a href=#document>Document</a></code> is <em>not</em> set to
     <a href=#quirks-mode>quirks mode</a>, and the <a href=#stack-of-open-elements>stack of open
-    elements</a> <a href=#has-an-element-in-scope title="has an element in scope">has a
-    <code>p</code> element in scope</a>, then act as if an end tag
-    with the tag name "p" had been seen.</p> <!-- i hate myself (this
-    quirk was basically caused by acid2; if i'd realised we could
-    change the specs when i wrote acid2, we could have avoided having
-    any parsing-mode quirks) -Hixie -->
+    elements</a> <a href=#has-an-element-in-button-scope title="has an element in button scope">has a
+    <code>p</code> element in button scope</a>, then act as if an
+    end tag with the tag name "p" had been seen.</p> <!-- i hate
+    myself (this quirk was basically caused by acid2; if i'd realised
+    we could change the specs when i wrote acid2, we could have
+    avoided having any parsing-mode quirks) -Hixie -->
 
     <p><a href=#insert-an-html-element>Insert an HTML element</a> for the token.</p>
 
@@ -75591,8 +75594,8 @@
    <dt>A start tag whose tag name is "hr"</dt>
    <dd>
 
-    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-scope title="has
-    an element in scope">has a <code>p</code> element in
+    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-button-scope title="has
+    an element in button scope">has a <code>p</code> element in button
     scope</a>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
@@ -75705,8 +75708,8 @@
    <dt>A start tag whose tag name is "xmp"</dt>
    <dd>
 
-    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-scope title="has
-    an element in scope">has a <code>p</code> element in
+    <p>If the <a href=#stack-of-open-elements>stack of open elements</a> <a href=#has-an-element-in-button-scope title="has
+    an element in button scope">has a <code>p</code> element in button
     scope</a>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
@@ -75911,7 +75914,7 @@
 
     <p><a href=#insert-an-html-element>Insert an HTML element</a> for the token.</p>
 
-    <p class=note>This element will be a <a href=#phrasing>phrasing</a>
+    <p class=note>This element will be a <a href=#ordinary>ordinary</a>
     element.</p>
 
    </dd>
@@ -75939,7 +75942,7 @@
       </ol></li>
 
      <li><p>Otherwise, if <var title="">node</var> is in neither the
-     <a href=#formatting>formatting</a> category nor the <a href=#phrasing>phrasing</a>
+     <a href=#formatting>formatting</a> category nor the <a href=#ordinary>ordinary</a>
      category, then this is a <a href=#parse-error>parse error</a>; ignore the
      token, and abort these steps.</li>
 

Modified: source
===================================================================
--- source	2010-07-14 02:02:41 UTC (rev 5157)
+++ source	2010-07-14 18:13:57 UTC (rev 5158)
@@ -89286,39 +89286,35 @@
 
    <dt><dfn>Special</dfn></dt>
    <dd><p>The following HTML elements have varying levels of special
-   parsing rules: <code>address</code>, <code>area</code>,
-   <code>article</code>, <code>aside</code>, <code>base</code>,
-   <code>basefont</code>, <code>bgsound</code>,
+   parsing rules: <code>address</code>, <code>applet</code>,
+   <code>area</code>, <code>article</code>, <code>aside</code>,
+   <code>base</code>, <code>basefont</code>, <code>bgsound</code>,
    <code>blockquote</code>, <code>body</code>, <code>br</code>,
-   <code>button</code>, <code>center</code>, <code>col</code>,
-   <code>colgroup</code>, <code>command</code>, <!--v2DDATAGRID
-   <code>datagrid</code>-->, <code>dd</code>, <code>details</code>,
-   <code>dir</code>, <code>div</code>, <code>dl</code>,
-   <code>dt</code>, <code>embed</code>, <code>fieldset</code>,
-   <code>figure</code>, <code>footer</code>, <code>form</code>,
-   <code>frame</code>, <code>frameset</code>, <code>h1</code>,
-   <code>h2</code>, <code>h3</code>, <code>h4</code>, <code>h5</code>,
-   <code>h6</code>, <code>head</code>, <code>header</code>,
-   <code>hgroup</code>, <code>hr</code>, <code>iframe</code>, <!--
+   <code>button</code>, <code>button</code>, <code>caption</code>,
+   <code>center</code>, <code>col</code>, <code>colgroup</code>,
+   <code>command</code>, <!--v2DDATAGRID <code>datagrid</code>,-->
+   <code>dd</code>, <code>details</code>, <code>dir</code>,
+   <code>div</code>, <code>dl</code>, <code>dt</code>,
+   <code>embed</code>, <code>fieldset</code>, <code>figure</code>,
+   <code>footer</code>, <code>form</code>, <code>frame</code>,
+   <code>frameset</code>, <code>h1</code>, <code>h2</code>,
+   <code>h3</code>, <code>h4</code>, <code>h5</code>, <code>h6</code>,
+   <code>head</code>, <code>header</code>, <code>hgroup</code>,
+   <code>hr</code>, <code>html</code>, <code>iframe</code>, <!--
    <code>image</code>, (commented out because this isn't an element
    that can end up on the stack, so it doesn't matter) -->
    <code>img</code>, <code>input</code>, <code>isindex</code>,
    <code>li</code>, <code>link</code>, <code>listing</code>,
-   <code>menu</code>, <code>meta</code>, <code>nav</code>,
-   <code>noembed</code>, <code>noframes</code>, <code>noscript</code>,
-   <code>ol</code>, <code>p</code>, <code>param</code>,
-   <code>plaintext</code>, <code>pre</code>, <code>script</code>,
-   <code>section</code>, <code>select</code>, <code>style</code>,
-   <code>tbody</code>, <code>textarea</code>, <code>tfoot</code>,
-   <code>thead</code>, <code>title</code>, <code>tr</code>,
-   <code>ul</code>, <code>wbr</code>, and <code>xmp</code>.</p></dd>
-
-   <dt><dfn>Scoping</dfn></dt>
-   <dd><p>The following HTML elements introduce new <span title="has
-   an element in scope">scopes</span> for various parts of the
-   parsing: <code>applet</code>, <code>caption</code>,
-   <code>html</code>, <code>marquee</code>, <code>object</code>,
-   <code>table</code>, <code>td</code>, <code>th</code>, and SVG's
+   <code>marquee</code>, <code>menu</code>, <code>meta</code>,
+   <code>nav</code>, <code>noembed</code>, <code>noframes</code>,
+   <code>noscript</code>, <code>object</code>, <code>ol</code>,
+   <code>p</code>, <code>param</code>, <code>plaintext</code>,
+   <code>pre</code>, <code>script</code>, <code>section</code>,
+   <code>select</code>, <code>style</code>, <code>table</code>,
+   <code>tbody</code>, <code>td</code>, <code>textarea</code>,
+   <code>tfoot</code>, <code>th</code>, <code>thead</code>,
+   <code>title</code>, <code>tr</code>, <code>ul</code>,
+   <code>wbr</code>, <code>xmp</code>, and SVG's
    <code>foreignObject</code>.</p></dd>
 
    <dt><dfn>Formatting</dfn></dt>
@@ -89330,7 +89326,7 @@
    <code>strike</code>, <code>strong</code>, <code>tt</code>, and
    <code>u</code>.</p></dd>
 
-   <dt><dfn>Phrasing</dfn></dt>
+   <dt><dfn>Ordinary</dfn></dt>
    <dd><p>All other elements found while parsing an HTML
    document.</p></dd>
 
@@ -89393,11 +89389,22 @@
   </ul>
 
   <p>The <span>stack of open elements</span> is said to <dfn
-  title="has an element in table scope">have an element in <em>table
-  scope</em></dfn> when it <span>has an element in the specific
+  title="has an element in button scope">have an element in button
+  scope</dfn> when it <span>has an element in the specific
   scope</span> consisting of the following element types:</p>
 
   <ul class="brief">
+   <li>All the element types listed above for the <i>has an element
+   in scope</i> algorithm.</li>
+   <li><code>button</code> in the HTML namespace</li>
+  </ul>
+
+  <p>The <span>stack of open elements</span> is said to <dfn
+  title="has an element in table scope">have an element in table
+  scope</dfn> when it <span>has an element in the specific
+  scope</span> consisting of the following element types:</p>
+
+  <ul class="brief">
    <li><code>html</code> in the HTML namespace</li> <!-- (This can only happen if the <var title="">node</var> is the topmost node of the <span>stack of open elements</span>, and prevents the next step from being invoked if there are no more elements in the stack.) -->
    <li><code>table</code> in the HTML namespace</li>
   </ul>
@@ -93258,10 +93265,10 @@
     DOM nonsense, and thus should actually afford better compatibility
     when implemented by the other browsers. -->
 
-    <p>If the <span>stack of open elements</span> <span title="has
-    an element in scope">has a <code>p</code> element in
-    scope</span>, then act as if an end tag with the tag name
-    "p" had been seen.</p>
+    <p>If the <span>stack of open elements</span> <span title="has an
+    element in button scope">has a <code>p</code> element in button
+    scope</span>, then act as if an end tag with the tag name "p" had
+    been seen.</p>
 
     <p><span>Insert an HTML element</span> for the token.</p>
 
@@ -93273,7 +93280,7 @@
    <dd>
 
     <p>If the <span>stack of open elements</span> <span title="has
-    an element in scope">has a <code>p</code> element in
+    an element in button scope">has a <code>p</code> element in button
     scope</span>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
@@ -93292,7 +93299,7 @@
    <dd>
 
     <p>If the <span>stack of open elements</span> <span title="has
-    an element in scope">has a <code>p</code> element in
+    an element in button scope">has a <code>p</code> element in button
     scope</span>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
@@ -93321,7 +93328,7 @@
     <p>Otherwise:</p>
 
     <p>If the <span>stack of open elements</span> <span title="has
-    an element in scope">has a <code>p</code> element in
+    an element in button scope">has a <code>p</code> element in button
     scope</span>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
@@ -93350,7 +93357,7 @@
 
      <li><p>If <var title="">node</var> is not in the
      <span>formatting</span> category, and is not in the
-     <span>phrasing</span> category, and is not an
+     <span>ordinary</span> category, and is not an
      <code>address</code>, <code>div</code>, or <code>p</code>
      element, then jump to the last step.</p></li> <!-- an element
      <foo> is in this list if the following markup:
@@ -93370,7 +93377,7 @@
       <p>This is the last step.</p>
 
       <p>If the <span>stack of open elements</span> <span title="has
-      an element in scope">has a <code>p</code> element in
+      an element in button scope">has a <code>p</code> element in button
       scope</span>, then act as if an end tag with the tag name
       "p" had been seen.</p>
 
@@ -93403,7 +93410,7 @@
 
      <li><p>If <var title="">node</var> is not in the
      <span>formatting</span> category, and is not in the
-     <span>phrasing</span> category, and is not an
+     <span>ordinary</span> category, and is not an
      <code>address</code>, <code>div</code>, or <code>p</code>
      element, then jump to the last step.</p></li> <!-- an element
      <foo> is in this list if the following markup:
@@ -93423,7 +93430,7 @@
       <p>This is the last step.</p>
 
       <p>If the <span>stack of open elements</span> <span title="has
-      an element in scope">has a <code>p</code> element in
+      an element in button scope">has a <code>p</code> element in button
       scope</span>, then act as if an end tag with the tag name
       "p" had been seen.</p>
 
@@ -93441,7 +93448,7 @@
    <dd>
 
     <p>If the <span>stack of open elements</span> <span title="has
-    an element in scope">has a <code>p</code> element in
+    an element in button scope">has a <code>p</code> element in button
     scope</span>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
@@ -93548,10 +93555,10 @@
    <dd>
 
     <p>If the <span>stack of open elements</span> does not <span
-    title="has an element in scope">have an element in scope</span>
-    with the same tag name as that of the token, then this is a
-    <span>parse error</span>; act as if a start tag with the tag name
-    "p" had been seen, then reprocess the current token.</p>
+    title="has an element in button scope">have an element in sbutton
+    cope</span> with the same tag name as that of the token, then this
+    is a <span>parse error</span>; act as if a start tag with the tag
+    name "p" had been seen, then reprocess the current token.</p>
 
     <p>Otherwise, run these steps:</p>
 
@@ -93786,7 +93793,7 @@
      topmost node in the <span>stack of open elements</span> that
      is lower in the stack than the <var title="">formatting
      element</var>, and is not an element in the
-     <span>phrasing</span> or <span>formatting</span>
+     <span>ordinary</span> or <span>formatting</span>
      categories. There might not be one.</p></li>
 
      <li><p>If there is no <var title="">furthest block</var>,
@@ -93959,12 +93966,12 @@
 
     <p>If the <code>Document</code> is <em>not</em> set to
     <span>quirks mode</span>, and the <span>stack of open
-    elements</span> <span title="has an element in scope">has a
-    <code>p</code> element in scope</span>, then act as if an end tag
-    with the tag name "p" had been seen.</p> <!-- i hate myself (this
-    quirk was basically caused by acid2; if i'd realised we could
-    change the specs when i wrote acid2, we could have avoided having
-    any parsing-mode quirks) -Hixie -->
+    elements</span> <span title="has an element in button scope">has a
+    <code>p</code> element in button scope</span>, then act as if an
+    end tag with the tag name "p" had been seen.</p> <!-- i hate
+    myself (this quirk was basically caused by acid2; if i'd realised
+    we could change the specs when i wrote acid2, we could have
+    avoided having any parsing-mode quirks) -Hixie -->
 
     <p><span>Insert an HTML element</span> for the token.</p>
 
@@ -94010,7 +94017,7 @@
    <dd>
 
     <p>If the <span>stack of open elements</span> <span title="has
-    an element in scope">has a <code>p</code> element in
+    an element in button scope">has a <code>p</code> element in button
     scope</span>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
@@ -94131,7 +94138,7 @@
    <dd>
 
     <p>If the <span>stack of open elements</span> <span title="has
-    an element in scope">has a <code>p</code> element in
+    an element in button scope">has a <code>p</code> element in button
     scope</span>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
@@ -94339,7 +94346,7 @@
 
     <p><span>Insert an HTML element</span> for the token.</p>
 
-    <p class="note">This element will be a <span>phrasing</span>
+    <p class="note">This element will be a <span>ordinary</span>
     element.</p>
 
    </dd>
@@ -94374,7 +94381,7 @@
      </li>
 
      <li><p>Otherwise, if <var title="">node</var> is in neither the
-     <span>formatting</span> category nor the <span>phrasing</span>
+     <span>formatting</span> category nor the <span>ordinary</span>
      category, then this is a <span>parse error</span>; ignore the
      token, and abort these steps.</p></li>
 




More information about the Commit-Watchers mailing list