Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv616
Modified Files:
Overview.html
Log Message:
Tentatively allow flow content inside <table><caption> and <figure><legend>. (bug 7056) (whatwg r3329)
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.2468
retrieving revision 1.2469
diff -u -d -r1.2468 -r1.2469
--- Overview.html 26 Jun 2009 09:15:59 -0000 1.2468
+++ Overview.html 26 Jun 2009 09:38:03 -0000 1.2469
@@ -22943,7 +22943,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>
@@ -22981,21 +22981,21 @@
and explaining its use, it makes more sense:</p>
<pre>&lt;caption&gt;
-&lt;strong&gt;Table 1.&lt;/strong&gt;
-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.
+&lt;p&gt;Table 1.
+&lt;p&gt;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.
&lt;/caption&gt;</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
@@ -35398,9 +35398,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>
@@ -65262,6 +65263,7 @@
Old&#345;ich Vete&scaron;n&iacute;k,
Oliver Hunt,
Oliver Rigby,
+ Olivier Gendrin,
Olli Pettay,
Patrick H. Lauke,
Paul Norman,