Skip to content

Commit 9bd9f0c

Browse files
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402951
1 parent f0634bb commit 9bd9f0c

10 files changed

Lines changed: 177 additions & 105 deletions

File tree

css2/changes.html

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,9 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
416416
<li class="tocline3"><a href="changes.html#q379" class="tocxref">C.5.92 Appendix&nbsp;I. Index</a>
417417
</ul>
418418
<li class="tocline2"><a href="changes.html#errata2" class="tocxref">C.6 Errata since the Candidate Recommendation of April 2009</a>
419+
<ul class="toc">
420+
<li class="tocline3"><a href="changes.html#q381" class="tocxref">C.6.1 Section&nbsp;17.5.2.1 Fixed table layout</a>
421+
</ul>
419422
</ul>
420423
</div>
421424
<P><em>This appendix is informative, not normative.</em></P>
@@ -4461,7 +4464,17 @@ <h2>C.6 <a name=errata2>Errata since the Candidate Recommendation of April
44614464
revision 1, CR version of 23 April 2009.</a> These corrections have the
44624465
status of a draft.
44634466

4464-
<p>There are no errata at this point.
4467+
4468+
4469+
<h3 id="s.17.5.2.1"><a name="q381">C.6.1 </a><a
4470+
href="/TR/2009/CR-CSS2-20090423/tables.html#fixed-table-layout">
4471+
Section&nbsp;17.5.2.1 Fixed table layout</a></h3>
4472+
4473+
<p><span class=date>[2009-05-20]</span> UAs <em>may</em> render extra
4474+
columns if there are unexpect columns in later rows of a 'fixed' table
4475+
layout. In that case, the width of the columns and of the table is
4476+
undefined.
4477+
44654478

44664479

44674480
<hr class="navbar">

css2/cover.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,6 +1140,9 @@ <h2><a name="toc">Full Table of Contents</a></h2>
11401140
<li class="tocline3"><a href="changes.html#q379" class="tocxref">C.5.92 Appendix&nbsp;I. Index</a>
11411141
</ul>
11421142
<li class="tocline2"><a href="changes.html#errata2" class="tocxref">C.6 Errata since the Candidate Recommendation of April 2009</a>
1143+
<ul class="toc">
1144+
<li class="tocline3"><a href="changes.html#q381" class="tocxref">C.6.1 Section&nbsp;17.5.2.1 Fixed table layout</a>
1145+
</ul>
11431146
</ul>
11441147
<li class="tocline1"><a href="sample.html" class="tocxref">Appendix D. Default style sheet for HTML 4</a>
11451148
<li class="tocline1"><a href="zindex.html" class="tocxref">Appendix E. Elaborate description of Stacking Contexts</a>

css2/css2.html

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,6 +1135,9 @@ <h2><a name="toc">Full Table of Contents</a></h2>
11351135
<li class="tocline3"><a href="changes.html#q379" class="tocxref">C.5.92 Appendix&nbsp;I. Index</a>
11361136
</ul>
11371137
<li class="tocline2"><a href="changes.html#errata2" class="tocxref">C.6 Errata since the Candidate Recommendation of April 2009</a>
1138+
<ul class="toc">
1139+
<li class="tocline3"><a href="changes.html#q381" class="tocxref">C.6.1 Section&nbsp;17.5.2.1 Fixed table layout</a>
1140+
</ul>
11381141
</ul>
11391142
<li class="tocline1"><a href="sample.html" class="tocxref">Appendix D. Default style sheet for HTML 4</a>
11401143
<li class="tocline1"><a href="zindex.html" class="tocxref">Appendix E. Elaborate description of Stacking Contexts</a>
@@ -16653,7 +16656,9 @@ <h4>17.5.2.1 <a name="fixed-table-layout">Fixed table layout</a></h4>
1665316656
<p>If a subsequent row has more columns than the greater of the number
1665416657
determined by the table-column elements and the number determined by
1665516658
the first row, then
16656-
additional columns must not be rendered. When using 'table-layout:
16659+
additional columns may not be rendered. CSS&nbsp;2.1 does not define
16660+
the width of the columns and the table if they <em>are</em> rendered.
16661+
When using 'table-layout:
1665716662
fixed', authors should not omit columns from the first row.
1665816663

1665916664
<p>In this manner, the user agent can begin to lay out the table once
@@ -19693,6 +19698,9 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
1969319698
<li class="tocline3"><a href="changes.html#q379" class="tocxref">C.5.92 Appendix&nbsp;I. Index</a>
1969419699
</ul>
1969519700
<li class="tocline2"><a href="changes.html#errata2" class="tocxref">C.6 Errata since the Candidate Recommendation of April 2009</a>
19701+
<ul class="toc">
19702+
<li class="tocline3"><a href="changes.html#q381" class="tocxref">C.6.1 Section&nbsp;17.5.2.1 Fixed table layout</a>
19703+
</ul>
1969619704
</ul>
1969719705
</div>
1969819706
<P><em>This appendix is informative, not normative.</em></P>
@@ -23738,7 +23746,17 @@ <h2>C.6 <a name=errata2>Errata since the Candidate Recommendation of April
2373823746
revision 1, CR version of 23 April 2009.</a> These corrections have the
2373923747
status of a draft.
2374023748

23741-
<p>There are no errata at this point.
23749+
23750+
23751+
<h3 id="s.17.5.2.1"><a name="q381">C.6.1 </a><a
23752+
href="/TR/2009/CR-CSS2-20090423/tables.html#fixed-table-layout">
23753+
Section&nbsp;17.5.2.1 Fixed table layout</a></h3>
23754+
23755+
<p><span class=date>[2009-05-20]</span> UAs <em>may</em> render extra
23756+
columns if there are unexpect columns in later rows of a 'fixed' table
23757+
layout. In that case, the width of the columns and of the table is
23758+
undefined.
23759+
2374223760

2374323761

2374423762
<hr class="navbar">

css2/diffs-rec/changes.html

Lines changed: 91 additions & 78 deletions
Large diffs are not rendered by default.

css2/diffs-rec/cover.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,6 +1140,9 @@ <h2><a name="toc">Full Table of Contents</a></h2>
11401140
<li class="tocline3"><a href="changes.html#q379" class="tocxref"><ins>C.5.92 Appendix&nbsp;I. Index</ins></a>
11411141
</ul>
11421142
<li class="tocline2"><a href="changes.html#errata2" class="tocxref"><ins>C.6 Errata since</ins> the <del>focus 18.5 Magnification 19 Aural style sheets 19.1 Introduction to aural style sheets 19.2 Volume properties: 'volume' 19.3 Speaking properties: 'speak' 19.4 Pause properties: 'pause-before' , 'pause-after' , and 'pause' 19.5 Cue properties: 'cue-before' , 'cue-after' , and 'cue' 19.6 Mixing properties: 'play-during' 19.7 Spatial properties: 'azimuth' and 'elevation' 19.8 Voice characteristic properties: 'speech-rate' , 'voice-family' , 'pitch' , 'pitch-range' , 'stress' , and 'richness' 19.9 Speech properties: 'speak-punctuation' and 'speak-numeral'</del><ins>Candidate Recommendation of April 2009</ins></a>
1143+
<ul class="toc">
1144+
<li class="tocline3"><a href="changes.html#q381" class="tocxref"><ins>C.6.1 Section&nbsp;17.5.2.1 Fixed table layout</ins></a>
1145+
</ul>
11431146
</ul>
11441147
<li class="tocline1"><a href="sample.html" class="tocxref">Appendix <del>A. A sample</del><ins>D. Default</ins> style sheet for HTML <del>4.0 Appendix B. Changes from CSS1 B.1 New functionality B.2 Updated descriptions B.3 Semantic changes from CSS1</del><ins>4</ins></a>
11451148
<li class="tocline1"><a href="zindex.html" class="tocxref">Appendix <del>C. Implementation and performance notes for fonts C.1 Glossary of font terms C.2 Font retrieval C.3 Meaning</del><ins>E. Elaborate description</ins> of <del>the Panose Digits C.4 Deducing Unicode Ranges for TrueType C.5 Automatic descriptor generation</del><ins>Stacking Contexts</ins></a>

css2/diffs-rec/tables.html

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,9 @@ <h4><ins>17.5.2.1</ins> <a name="fixed-table-layout">Fixed table layout</a></h4>
907907
<p><ins>If a subsequent row has more columns than the greater of the number
908908
determined by the table-column elements and the number determined by
909909
the first row, then
910-
additional columns must not be rendered. When using 'table-layout:
910+
additional columns may not be rendered. CSS&nbsp;2.1 does not define
911+
the width of the columns and the table if they</ins> <em><ins>are</ins></em> <ins>rendered.
912+
When using 'table-layout:
911913
fixed', authors should not omit columns from the first row.</ins>
912914

913915
<p>In this manner, the user agent can begin to lay out the table once
@@ -1020,8 +1022,8 @@ <h3>17.5.3 <a name="height-layout">Table height algorithms</a></h3>
10201022
<strong><ins>Note.</ins></strong> <ins>Future
10211023
updates</ins> of <del>its rows. CSS2 does not</del><ins>CSS may</ins> specify <del>rendering when</del><ins>this further.</ins>
10221024

1023-
<p>The <del>specified table</del>height <del>differs from</del><ins>of a 'table-row' element's box is calculated once</ins> the
1024-
<del>content height,</del><ins>user agent has all the cells</ins> in <del>particular whether content height should override specified height; if it doesn't, how extra space should be distributed among rows that add up to less than the specified table height; or, if the content height exceeds the specified table height, whether the UA should provide a scrolling mechanism. Note. Future versions of CSS may specify this further. The height of a 'table-row' element's box is calculated once the user agent has all the cells in the row available:</del><ins>the row available:</ins> it is the maximum
1025+
<p>The <del>specified table</del>height <del>differs from the content height, in particular whether content height should override specified height; if it doesn't, how extra space should be distributed among rows that add up to less than the specified table height; or, if the content height exceeds the specified table height, whether the UA should provide a scrolling mechanism. Note. Future versions of CSS may specify this further. The height of a 'table-row' element's box is calculated once</del><ins>of a 'table-row' element's box is calculated once</ins> the
1026+
user agent has all the cells in the row available: it is the maximum
10251027
of the row's specified <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a>
10261028
and the minimum height (MIN) required by the cells. A <a href="visudet.html#propdef-height" class="noxref"><span
10271029
class="propinst-height">'height'</span></a> value of 'auto' for a
@@ -1157,14 +1159,14 @@ <h3>17.5.4 <a name="column-alignment">Horizontal alignment in a column</a></h3>
11571159

11581160
<p>The horizontal alignment of a cell's <ins>inline</ins> content within a cell
11591161
box <del>is</del><ins>can be</ins> specified <del>with</del><ins>by</ins> the <del>'text-align' property. When</del><ins>value of</ins>
1160-
the <a href="text.html#propdef-text-align" class="noxref"><span class="propinst-text-align">'text-align'</span></a> property <del>for more than one cell in a column is set to a &lt;string&gt; value,</del><ins>on</ins>
1161-
the <del>content of those cells is aligned along a vertical axis.</del><ins>cell.</ins>
1162+
the <a href="text.html#propdef-text-align" class="noxref"><span class="propinst-text-align">'text-align'</span></a> property <del>for more than one cell in a column is set to a &lt;string&gt; value, the content of those cells is aligned along a vertical axis.</del><ins>on</ins>
1163+
the <del>beginning of</del><ins>cell.</ins>
11621164

11631165

11641166

11651167
<h3><ins>17.5.5</ins> <a name="dynamic-effects"><ins>Dynamic row and column effects</ins></a></h3>
11661168

1167-
<p>The <a href="visufx.html#propdef-visibility" class="noxref"><span class="propinst-visibility"> <del>beginning of the string touches this axis. Character directionality determines whether the string lies to the left or right of the axis. Aligning text in this way is only useful if the text fits on one line. The result is undefined if the cell content spans more than one line. If value of 'text-align' for a table cell is a string but the string doesn't occur in the cell content, the end of the cell's content touches the vertical axis of alignment. Note that the strings do not have to be the same for each cell, although they usually are. CSS does not provide a way specify the offset of the vertical alignment axis with respect to the edge of a column box. Example(s): The following style sheet: TD { text-align: "." } TD:before { content: "$" } will cause the column of dollar figures in the following HTML table: &lt;TABLE&gt; &lt;COL width="40"&gt; &lt;TR&gt; &lt;TH&gt;Long distance calls &lt;TR&gt; &lt;TD&gt; 1.30 &lt;TR&gt; &lt;TD&gt; 2.50 &lt;TR&gt; &lt;TD&gt; 10.80 &lt;TR&gt; &lt;TD&gt; 111.01 &lt;TR&gt; &lt;TD&gt; 85. &lt;TR&gt; &lt;TD&gt; 90 &lt;TR&gt; &lt;TD&gt; .05 &lt;TR&gt; &lt;TD&gt; .06 &lt;/TABLE&gt; to align along the decimal point. For fun, we have used the :before pseudo-element to insert a dollar sign before each figure. The table might be rendered as follows: Long distance calls $1.30 $2.50 $10.80 $111.01 $85. $90 $.05 $.06 17.5.5 Dynamic row and column effects The 'visibility' property takes</del><ins>'visibility'</ins></span></a> <ins>property
1169+
<p>The <a href="visufx.html#propdef-visibility" class="noxref"><span class="propinst-visibility"> <del>string touches this axis. Character directionality determines whether the string lies to the left or right of the axis. Aligning text in this way is only useful if the text fits on one line. The result is undefined if the cell content spans more than one line. If value of 'text-align' for a table cell is a string but the string doesn't occur in the cell content, the end of the cell's content touches the vertical axis of alignment. Note that the strings do not have to be the same for each cell, although they usually are. CSS does not provide a way specify the offset of the vertical alignment axis with respect to the edge of a column box. Example(s): The following style sheet: TD { text-align: "." } TD:before { content: "$" } will cause the column of dollar figures in the following HTML table: &lt;TABLE&gt; &lt;COL width="40"&gt; &lt;TR&gt; &lt;TH&gt;Long distance calls &lt;TR&gt; &lt;TD&gt; 1.30 &lt;TR&gt; &lt;TD&gt; 2.50 &lt;TR&gt; &lt;TD&gt; 10.80 &lt;TR&gt; &lt;TD&gt; 111.01 &lt;TR&gt; &lt;TD&gt; 85. &lt;TR&gt; &lt;TD&gt; 90 &lt;TR&gt; &lt;TD&gt; .05 &lt;TR&gt; &lt;TD&gt; .06 &lt;/TABLE&gt; to align along the decimal point. For fun, we have used the :before pseudo-element to insert a dollar sign before each figure. The table might be rendered as follows: Long distance calls $1.30 $2.50 $10.80 $111.01 $85. $90 $.05 $.06 17.5.5 Dynamic row and column effects The 'visibility' property takes</del><ins>'visibility'</ins></span></a> <ins>property
11681170
takes</ins> the value 'collapse' for row, row group, column, and column
11691171
group elements. This value causes the entire row or column to be
11701172
removed from the display, and the space normally taken up by the row
@@ -1239,13 +1241,13 @@ <h3>17.6.1 <a name="separated-borders">The separated borders model</a></h3>
12391241
spacing and the second the vertical spacing. Lengths may not be
12401242
negative.
12411243

1242-
<p> <del>In this model, each cell has an individual border. The 'border-spacing' property specifies</del>The distance between the <ins>table border and the</ins> borders of <del>adjacent cells. This space</del><ins>the cells
1243-
on the edge of the table</ins> is <del>filled with</del>the <del>background</del><ins>table's padding for that side, plus
1244+
<p> <del>In this model, each cell has an individual border. The 'border-spacing' property specifies</del>The distance between the <ins>table border and the</ins> borders of <del>adjacent cells. This space is filled with</del>the <del>background</del><ins>cells
1245+
on the edge</ins> of the table <del>element.</del><ins>is the table's padding for that side, plus
12441246
the relevant border spacing distance. For example, on the right hand
12451247
side, the distance is</ins> <var><ins>padding-right</ins></var> <ins>+</ins> <var><ins>horizontal
12461248
border-spacing</ins></var><ins>.</ins>
12471249

1248-
<p><ins>The width</ins> of the table <del>element.</del><ins>is the distance from the left inner padding
1250+
<p><ins>The width of the table is the distance from the left inner padding
12491251
edge to the right inner padding edge (including the border spacing but
12501252
excluding padding and border).</ins>
12511253

@@ -1378,7 +1380,7 @@ <h3>17.6.2 <a name="collapsing-borders">The collapsing border model</a></h3>
13781380

13791381
<p> <del>Note only half of the two exterior borders are counted in</del><ins>UAs must compute an initial left and right border width for</ins> the
13801382
table <del>width;</del><ins>by examining</ins> the <del>other half of these two borders lies</del><ins>first and last cells</ins> in the <del>margin area. &nbsp;&nbsp;&nbsp; [D] Schema showing the widths</del><ins>first row</ins> of <del>cells and borders and</del>the
1381-
<del>padding of cells. Note</del><ins>table. The left border width of the table is half of the first cell's
1383+
<del>padding</del><ins>table. The left border width of the table is half of the first cell's
13821384
collapsed left border, and the right border width of the table is half
13831385
of the last cell's collapsed right border. If subsequent rows have
13841386
larger collapsed left and right borders, then any excess spills into
@@ -1402,10 +1404,10 @@ <h3>17.6.2 <a name="collapsing-borders">The collapsing border model</a></h3>
14021404
borders model"><ins>[D]</ins></A></SPAN>
14031405

14041406
<p class="caption"><ins>Schema showing the widths of cells and borders
1405-
and the padding of cells.</ins>
1407+
and the padding</ins> of cells.
14061408
</div>
14071409

1408-
<p><ins>Note</ins> that in this model, the width of the table includes half the
1410+
<p>Note that in this model, the width of the table includes half the
14091411
table border. Also, in this model, a table <del>doesn't</del><ins>does not</ins> have padding (but
14101412
does have margins).
14111413

@@ -1509,31 +1511,31 @@ <h4><ins>17.6.2.1</ins> <a name="border-conflict-resolution">Border conflict res
15091511
</div>
15101512

15111513
<div class="example"><P style="display:none">Example(s):</P>
1512-
<p> <del>The next example shows a table with horizontal rules between the rows. The top border of the table</del><ins>Here</ins> is <del>set to 'hidden' to suppress the top border of the first row. This implements the "rules" attribute</del><ins>an example</ins> of <del>HTML 4.0 (rules="rows"). TABLE[rules=rows] TR { border-top: solid } TABLE[rules=rows] { border-collapse: collapse; border-top:</del>hidden <del>} &nbsp;&nbsp;&nbsp; [D] Table with horizontal rules between the rows. In this case the same effect can also be achieved without setting a 'hidden' border on TABLE, by addressing the first row separately. Which method is preferred is a matter of taste. TR:first-child { border-top: none } TR { border-top: solid } Example(s): Here is another example of hidden collapsing borders:</del><ins>collapsing borders:</ins>
1514+
<p> <del>The next</del><ins>Here is an</ins> example <del>shows a</del><ins>of hidden collapsing borders:</ins>
15131515

15141516
<div class="figure">
15151517
<p><img src="images/CSStbl3.png" width="57" height="48" alt="Table
1516-
with two omitted borders"><SPAN class="dlink">&nbsp;&nbsp;&nbsp;<A name="img-CSStbl3" href="images/longdesc/CSStbl3-desc.html" title="Long description of example illustrating hidden internal
1517-
borders">[D]</A></SPAN>
1518+
with two omitted borders"><SPAN class="dlink"><ins>&nbsp;&nbsp;&nbsp;</ins><A name="img-CSStbl3" href="images/longdesc/CSStbl3-desc.html" title="Long description of example illustrating hidden internal
1519+
borders"><ins>[D]</ins></A></SPAN>
15181520

1519-
<p class="caption"> Table with two omitted internal borders.
1521+
<p class="caption"> Table with <del>horizontal rules between the rows. The top</del><ins>two omitted internal borders.</ins>
15201522
</div>
15211523

1522-
<p>HTML source:
1524+
<p><ins>HTML source:</ins>
15231525

15241526
<pre class="html-example">
1525-
&lt;TABLE style="border-collapse: collapse; border: solid;"&gt;
1527+
<ins>&lt;TABLE style="border-collapse: collapse; border: solid;"&gt;
15261528
&lt;TR&gt;&lt;TD style="border-right: hidden; border-bottom: hidden"&gt;foo&lt;/TD&gt;
15271529
&lt;TD style="border: solid"&gt;bar&lt;/TD&gt;&lt;/TR&gt;
15281530
&lt;TR&gt;&lt;TD style="border: none"&gt;foo&lt;/TD&gt;
15291531
&lt;TD style="border: solid"&gt;bar&lt;/TD&gt;&lt;/TR&gt;
1530-
&lt;/TABLE&gt;
1532+
&lt;/TABLE&gt;</ins>
15311533
</pre>
15321534
</div>
15331535

1534-
<h3>17.6.3 <a name="table-border-styles">Border styles</a></h3>
1536+
<h3><ins>17.6.3</ins> <a name="table-border-styles">Border <ins>styles</ins></a></h3>
15351537

1536-
<p>Some of the values of the <span class="index-inst"
1538+
<p><ins>Some</ins> of the <del>table is set to 'hidden' to suppress the top border of the first row. This implements the "rules" attribute of HTML 4.0 (rules="rows"). TABLE[rules=rows] TR { border-top: solid } TABLE[rules=rows] { border-collapse: collapse; border-top: hidden } &nbsp;&nbsp;&nbsp; [D] Table with horizontal rules between the rows. In this case the same effect can also be achieved without setting a 'hidden' border on TABLE, by addressing the first row separately. Which method is preferred is a matter of taste. TR:first-child { border-top: none } TR { border-top: solid } Example(s): Here is another example of hidden collapsing borders: &nbsp;&nbsp;&nbsp; [D] Table with two omitted internal borders. HTML source: &lt;TABLE style="border-collapse: collapse; border: solid;"&gt; &lt;TR&gt;&lt;TD style="border-right: hidden; border-bottom: hidden"&gt;foo&lt;/TD&gt; &lt;TD style="border: solid"&gt;bar&lt;/TD&gt;&lt;/TR&gt; &lt;TR&gt;&lt;TD style="border: none"&gt;foo&lt;/TD&gt; &lt;TD style="border: solid"&gt;bar&lt;/TD&gt;&lt;/TR&gt; &lt;/TABLE&gt; 17.6.3 Border styles Some of the values</del><ins>values</ins> of the <span class="index-inst"
15371539
title="&lt;border-style&gt;"><a name="x22" href="box.html#propdef-border-style" class="noxref"><span
15381540
class="propinst-border-style">'border-style'</span></a></span> have
15391541
different meanings in tables than for other elements. In the list

0 commit comments

Comments
 (0)