[ct] (0) <h1><h2> should close <h1> (but <h1><span><h2> should not)

git-svn-id: http://svn.whatwg.org/webapps@2501 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Dec 2, 2008 · 7b8ebc7 · 7b8ebc7
1 parent 0bd7a6a
commit 7b8ebc7
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 29 deletions.
diff --git a/index b/index
@@ -48445,9 +48445,8 @@ interface <dfn id=messagechannel>MessageChannel</dfn> {
    <!-- the normal ones -->
    <dt>A start tag whose tag name is one of: "address", "article",
    "aside", "blockquote", "center", "datagrid", "details", "dialog",
-   "dir", "div", "dl", "fieldset", "figure", "footer", "h1", "h2",
-   "h3", "h4", "h5", "h6", "header", "menu", "nav", "ol", "p",
-   "section", "ul"</dt>
+   "dir", "div", "dl", "fieldset", "figure", "footer", "header",
+   "menu", "nav", "ol", "p", "section", "ul"</dt>
    <dd>
 
     <!-- As of May 2008 this doesn't match any browser exactly, but is
@@ -48460,18 +48459,25 @@ interface <dfn id=messagechannel>MessageChannel</dfn> {
     scope</a>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
-    <!-- (only applies to <h1>-<h6>)
-         Removed for compatibility with IE7, though all other
-         browsers do it this way. If you do put this back, make
-         sure to handle <h1><a><h2>, as in Webkit bug 12646.
-         http://bugs.webkit.org/show_bug.cgi?id=12646
-    <p>If the <span>stack of open elements</span> <span title="has
-    an element in scope">has in scope</span> an element whose tag
-    name is one of "h1", "h2", "h3", "h4", "h5", or "h6", then
-    this is a <span>parse error</span>; pop elements from the
-    stack until an element with one of those tag names has been
-    popped from the stack.</p>
-    -->
+    <p><a href=#insert-an-html-element>Insert an HTML element</a> for the token.</p>
+
+   </dd>
+
+   <!-- as normal, but close h1-h6 if it's the current node -->
+   <dt>A start tag whose tag name is one of: "h1", "h2", "h3", "h4",
+   "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
+    scope</a>, then act as if an end tag with the tag name
+    "p" had been seen.</p>
+
+    <p>If the <a href=#current-node>current node</a> is an element whose tag name
+    is one of "h1", "h2", "h3", "h4", "h5", or "h6", then this is a
+    <a href=#parse-error>parse error</a>; pop the <a href=#current-node>current node</a> off
+    the <a href=#stack-of-open-elements>stack of open elements</a>.</p>
+    <!-- See https://bugs.webkit.org/show_bug.cgi?id=12646 -->
 
     <p><a href=#insert-an-html-element>Insert an HTML element</a> for the token.</p>
 

diff --git a/source b/source
@@ -55241,9 +55241,8 @@ interface <dfn>MessageChannel</dfn> {
    <!-- the normal ones -->
    <dt>A start tag whose tag name is one of: "address", "article",
    "aside", "blockquote", "center", "datagrid", "details", "dialog",
-   "dir", "div", "dl", "fieldset", "figure", "footer", "h1", "h2",
-   "h3", "h4", "h5", "h6", "header", "menu", "nav", "ol", "p",
-   "section", "ul"</dt>
+   "dir", "div", "dl", "fieldset", "figure", "footer", "header",
+   "menu", "nav", "ol", "p", "section", "ul"</dt>
    <dd>
 
     <!-- As of May 2008 this doesn't match any browser exactly, but is
@@ -55256,18 +55255,25 @@ interface <dfn>MessageChannel</dfn> {
     scope</span>, then act as if an end tag with the tag name
     "p" had been seen.</p>
 
-    <!-- (only applies to <h1>-<h6>)
-         Removed for compatibility with IE7, though all other
-         browsers do it this way. If you do put this back, make
-         sure to handle <h1><a><h2>, as in Webkit bug 12646.
-         http://bugs.webkit.org/show_bug.cgi?id=12646
+    <p><span>Insert an HTML element</span> for the token.</p>
+
+   </dd>
+
+   <!-- as normal, but close h1-h6 if it's the current node -->
+   <dt>A start tag whose tag name is one of: "h1", "h2", "h3", "h4",
+   "h5", "h6"</dt>
+   <dd>
+
     <p>If the <span>stack of open elements</span> <span title="has
-    an element in scope">has in scope</span> an element whose tag
-    name is one of "h1", "h2", "h3", "h4", "h5", or "h6", then
-    this is a <span>parse error</span>; pop elements from the
-    stack until an element with one of those tag names has been
-    popped from the stack.</p>
-    -->
+    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>current node</span> is an element whose tag name
+    is one of "h1", "h2", "h3", "h4", "h5", or "h6", then this is a
+    <span>parse error</span>; pop the <span>current node</span> off
+    the <span>stack of open elements</span>.</p>
+    <!-- See https://bugs.webkit.org/show_bug.cgi?id=12646 -->
 
     <p><span>Insert an HTML element</span> for the token.</p>