[html5] r6618 - [ac] (0) Allow basic flow content in <td> and <th>. (bugs 13174 and 13201)

[whatwg at whatwg.org]

Author: ianh
Date: 2011-10-04 08:43:21 -0700 (Tue, 04 Oct 2011)
New Revision: 6618

Modified:
   complete.html
   source
Log:
[ac] (0) Allow basic flow content in <td> and <th>. (bugs 13174 and 13201)

Modified: complete.html
===================================================================
--- complete.html	2011-10-02 17:24:36 UTC (rev 6617)
+++ complete.html	2011-10-04 15:43:21 UTC (rev 6618)
@@ -239,7 +239,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
    <hgroup><h1>Web Applications 1.0</h1>
-    <h2 class="no-num no-toc">Living Standard — Last Updated 2 October 2011</h2>
+    <h2 class="no-num no-toc">Living Standard — Last Updated 4 October 2011</h2>
    </hgroup><dl><dt>Multiple-page version:</dt>
     <dd><a href=http://www.whatwg.org/specs/web-apps/current-work/complete/>http://www.whatwg.org/specs/web-apps/current-work/complete/</a></dd>
     <dt>One-page version:</dt>
@@ -19029,7 +19029,7 @@
    <dt>Contexts in which this element can be used:</dt>
    <dd>Before <code><a href=#the-dd-element>dd</a></code> or <code><a href=#the-dt-element>dt</a></code> elements inside <code><a href=#the-dl-element>dl</a></code> elements.</dd>
    <dt>Content model:</dt>
-   <dd><a href=#phrasing-content>Phrasing content</a>.</dd>
+   <dd><a href=#flow-content>Flow content</a>, but with no <code><a href=#the-header-element>header</a></code>, <code><a href=#the-footer-element>footer</a></code>, <a href=#sectioning-content>sectioning content</a>, or <a href=#heading-content>heading content</a> descendants.</dd>
    <dt>Content attributes:</dt>
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dt>DOM interface:</dt>
@@ -40391,7 +40391,8 @@
    <dt>Contexts in which this element can be used:</dt>
    <dd>As a child of a <code><a href=#the-tr-element>tr</a></code> element.</dd>
    <dt>Content model:</dt>
-   <dd><a href=#phrasing-content>Phrasing content</a>.</dd>
+   <dd><a href=#flow-content>Flow content</a>, but with no <code><a href=#the-header-element>header</a></code>, <code><a href=#the-footer-element>footer</a></code>, <a href=#sectioning-content>sectioning content</a>, or <a href=#heading-content>heading content</a> descendants.</dd>
+   <!-- EDITING NOTE: If you remove 'heading content' from the list above, make sure to fix the definition of 'sectioning root' to include <th> -->
    <dt>Content attributes:</dt>
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dd><code title=attr-tdth-colspan><a href=#attr-tdth-colspan>colspan</a></code></dd>
@@ -98099,7 +98100,7 @@
      <td>Legend for corresponding <code><a href=#the-dd-element>dd</a></code> element(s)</td>
      <td>none</td>
      <td><code><a href=#the-dl-element>dl</a></code></td>
-     <td><a href=#phrasing-content title="Phrasing content">phrasing</a></td>
+     <td><a href=#flow-content title="Flow content">flow</a>*</td>
      <td><a href=#global-attributes title="global attributes">globals</a></td>
      <td><code><a href=#htmlelement>HTMLElement</a></code></td>
     <tr><th><code><a href=#the-em-element>em</a></code></th>
@@ -98804,7 +98805,7 @@
      <td>Table header cell</td>
      <td>none</td>
      <td><code><a href=#the-tr-element>tr</a></code></td>
-     <td><a href=#phrasing-content title="Phrasing content">phrasing</a></td>
+     <td><a href=#flow-content title="Flow content">flow</a>*</td>
      <td><a href=#global-attributes title="global attributes">globals</a>;
          <code title=attr-tdth-colspan><a href=#attr-tdth-colspan>colspan</a></code>;
          <code title=attr-tdth-rowspan><a href=#attr-tdth-rowspan>rowspan</a></code>;

Modified: source
===================================================================
--- source	2011-10-02 17:24:36 UTC (rev 6617)
+++ source	2011-10-04 15:43:21 UTC (rev 6618)
@@ -20274,7 +20274,7 @@
    <dt>Contexts in which this element can be used:</dt>
    <dd>Before <code>dd</code> or <code>dt</code> elements inside <code>dl</code> elements.</dd>
    <dt>Content model:</dt>
-   <dd><span>Phrasing content</span>.</dd>
+   <dd><span>Flow content</span>, but with no <code>header</code>, <code>footer</code>, <span>sectioning content</span>, or <span>heading content</span> descendants.</dd>
    <dt>Content attributes:</dt>
    <dd><span>Global attributes</span></dd>
    <dt>DOM interface:</dt>
@@ -44857,7 +44857,8 @@
    <dt>Contexts in which this element can be used:</dt>
    <dd>As a child of a <code>tr</code> element.</dd>
    <dt>Content model:</dt>
-   <dd><span>Phrasing content</span>.</dd>
+   <dd><span>Flow content</span>, but with no <code>header</code>, <code>footer</code>, <span>sectioning content</span>, or <span>heading content</span> descendants.</dd>
+   <!-- EDITING NOTE: If you remove 'heading content' from the list above, make sure to fix the definition of 'sectioning root' to include <th> -->
    <dt>Content attributes:</dt>
    <dd><span>Global attributes</span></dd>
    <dd><code title="attr-tdth-colspan">colspan</code></dd>
@@ -111364,7 +111365,7 @@
      <td>Legend for corresponding <code>dd</code> element(s)</td>
      <td>none</td>
      <td><code>dl</code></td>
-     <td><span title="Phrasing content">phrasing</span></td>
+     <td><span title="Flow content">flow</span>*</td>
      <td><span title="global attributes">globals</span></td>
      <td><code>HTMLElement</code></td>
     </tr>
@@ -112258,7 +112259,7 @@
      <td>Table header cell</td>
      <td>none</td>
      <td><code>tr</code></td>
-     <td><span title="Phrasing content">phrasing</span></td>
+     <td><span title="Flow content">flow</span>*</td>
      <td><span title="global attributes">globals</span>;
          <code title="attr-tdth-colspan">colspan</code>;
          <code title="attr-tdth-rowspan">rowspan</code>;