[html5] r3329 - [ac] (0) Tentatively allow flow content inside <table><caption> and <figure><leg [...]
whatwg at whatwg.org
whatwg at whatwg.org
Fri Jun 26 02:38:00 PDT 2009
Author: ianh
Date: 2009-06-26 02:37:58 -0700 (Fri, 26 Jun 2009)
New Revision: 3329
Modified:
index
source
Log:
[ac] (0) Tentatively allow flow content inside <table><caption> and <figure><legend>. (bug 7056)
Modified: index
===================================================================
--- index 2009-06-26 09:15:53 UTC (rev 3328)
+++ index 2009-06-26 09:37:58 UTC (rev 3329)
@@ -25995,7 +25995,7 @@
<dt>Contexts in which this element may be used:</dt>
<dd>As the first element child of a <code><a href=#the-table-element>table</a></code> element.</dd>
<dt>Content model:</dt>
- <dd><a href=#phrasing-content-0>Phrasing content</a>.</dd>
+ <dd><a href=#flow-content-0>Flow content</a>, but with no descendant <code><a href=#the-table-element>table</a></code> elements.</dd>
<dt>Content attributes:</dt>
<dd><a href=#global-attributes>Global attributes</a></dd>
<dt>DOM interface:</dt>
@@ -26041,21 +26041,21 @@
and explaining its use, it makes more sense:</p>
<pre><caption>
-<strong>Table 1.</strong>
-This table shows the total score obtained from rolling two six-sided
-dice. The first row represents the value of the first die, the first
-column the value of the second die. The total is given in the cell
-that corresponds to the values of the two dice.
+<p>Table 1.
+<p>This table shows the total score obtained from rolling two
+six-sided dice. The first row represents the value of the first die,
+the first column the value of the second die. The total is given in
+the cell that corresponds to the values of the two dice.
</caption></pre>
<p>This provides the user with more context:</p>
<table class=dice-example><caption>
- <strong>Table 1.</strong>
- This table shows the total score obtained from rolling two six-sided
- dice. The first row represents the value of the first die, the first
- column the value of the second die. The total is given in the cell
- that corresponds to the values of the two dice.
+ <p>Table 1.
+ <p>This table shows the total score obtained from rolling two
+ six-sided dice. The first row represents the value of the first
+ die, the first column the value of the second die. The total is
+ given in the cell that corresponds to the values of the two dice.
</caption>
<tr><th> <th> 1 <th> 2 <th> 3 <th> 4 <th> 5 <th> 6
<tr><th> 1 <td> 2 <td> 3 <td> 4 <td> 5 <td> 6 <td> 7
@@ -39745,9 +39745,10 @@
<dt>Contexts in which this element may be used:</dt>
<dd>As the first child of a <code><a href=#the-fieldset-element>fieldset</a></code> element.</dd>
<dd>As the first child of a <code><a href=#the-details-element>details</a></code> element.</dd>
- <dd>As a child of a <code><a href=#the-figure-element>figure</a></code> element, if there are no other <code><a href=#the-legend-element>legend</a></code> element children of that element.</dd>
+ <dd>As the first or last child of a <code><a href=#the-figure-element>figure</a></code> element, if there are no other <code><a href=#the-legend-element>legend</a></code> element children of that element.</dd>
<dt>Content model:</dt>
- <dd><a href=#phrasing-content-0>Phrasing content</a>.</dd>
+ <dd>When the parent node is a <code><a href=#the-figure-element>figure</a></code> element: <a href=#flow-content-0>flow content</a>, but with no descendant <code><a href=#the-figure-element>figure</a></code> elements.</dd>
+ <dd>Otherwise: <a href=#phrasing-content-0>phrasing content</a>.</dd>
<dt>Content attributes:</dt>
<dd><a href=#global-attributes>Global attributes</a></dd>
<dt>DOM interface:</dt>
@@ -71516,6 +71517,7 @@
Oldřich Vetešník,
Oliver Hunt,
Oliver Rigby,
+ Olivier Gendrin,
Olli Pettay,
Patrick H. Lauke,
Paul Norman,
Modified: source
===================================================================
--- source 2009-06-26 09:15:53 UTC (rev 3328)
+++ source 2009-06-26 09:37:58 UTC (rev 3329)
@@ -28608,7 +28608,7 @@
<dt>Contexts in which this element may be used:</dt>
<dd>As the first element child of a <code>table</code> element.</dd>
<dt>Content model:</dt>
- <dd><span>Phrasing content</span>.</dd>
+ <dd><span>Flow content</span>, but with no descendant <code>table</code> elements.</dd>
<dt>Content attributes:</dt>
<dd><span>Global attributes</span></dd>
<dt>DOM interface:</dt>
@@ -28659,22 +28659,22 @@
and explaining its use, it makes more sense:</p>
<pre><caption>
-<strong>Table 1.</strong>
-This table shows the total score obtained from rolling two six-sided
-dice. The first row represents the value of the first die, the first
-column the value of the second die. The total is given in the cell
-that corresponds to the values of the two dice.
+<p>Table 1.
+<p>This table shows the total score obtained from rolling two
+six-sided dice. The first row represents the value of the first die,
+the first column the value of the second die. The total is given in
+the cell that corresponds to the values of the two dice.
</caption></pre>
<p>This provides the user with more context:</p>
<table class="dice-example">
<caption>
- <strong>Table 1.</strong>
- This table shows the total score obtained from rolling two six-sided
- dice. The first row represents the value of the first die, the first
- column the value of the second die. The total is given in the cell
- that corresponds to the values of the two dice.
+ <p>Table 1.
+ <p>This table shows the total score obtained from rolling two
+ six-sided dice. The first row represents the value of the first
+ die, the first column the value of the second die. The total is
+ given in the cell that corresponds to the values of the two dice.
</caption>
<tr> <th> <th> 1 <th> 2 <th> 3 <th> 4 <th> 5 <th> 6
<tr> <th> 1 <td> 2 <td> 3 <td> 4 <td> 5 <td> 6 <td> 7
@@ -44706,9 +44706,10 @@
<dt>Contexts in which this element may be used:</dt>
<dd>As the first child of a <code>fieldset</code> element.</dd>
<dd>As the first child of a <code>details</code> element.</dd>
- <dd>As a child of a <code>figure</code> element, if there are no other <code>legend</code> element children of that element.</dd>
+ <dd>As the first or last child of a <code>figure</code> element, if there are no other <code>legend</code> element children of that element.</dd>
<dt>Content model:</dt>
- <dd><span>Phrasing content</span>.</dd>
+ <dd>When the parent node is a <code>figure</code> element: <span>flow content</span>, but with no descendant <code>figure</code> elements.</dd>
+ <dd>Otherwise: <span>phrasing content</span>.</dd>
<dt>Content attributes:</dt>
<dd><span>Global attributes</span></dd>
<dt>DOM interface:</dt>
@@ -84377,6 +84378,7 @@
Oldřich Vetešník,
Oliver Hunt,
Oliver Rigby,
+ Olivier Gendrin,
Olli Pettay,
Patrick H. Lauke,
Paul Norman,
More information about the Commit-Watchers
mailing list