Skip to content

Commit a087fb0

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

7 files changed

Lines changed: 67 additions & 40 deletions

File tree

css2/cover.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,12 @@ <h3>Features at risk</h3>
249249
normatively. (<a href="selector.html#id-selectors">Section
250250
5.8.4.</a>)
251251
</dd>
252+
<dt>Automatic table layout algorithm
253+
<dd>
254+
<p>The input to the suggested (non-normative) automatic layout
255+
algorithm for tables is restricted to (1) the containing block width
256+
and (2) the content and properties of the table and its
257+
children. This restriction may be lifted.
252258
</dl>
253259

254260
<!--NewPage--><!-- this is for html2ps -->

css2/page.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ <h3><a name="q6">13.2.2 Page selectors: selecting left, right, and first pages</
233233
of the first page should be used.
234234

235235

236-
<h3><a name="q7">13.2.3 Content outside the page box</a></h3>
236+
<h3 id="outside-page-box"><a name="q7">13.2.3 Content outside the page box</a></h3>
237237

238238
<P>When formatting content in the page model, some content may end up
239239
outside the page box. For example, an element whose <a href="text.html#propdef-white-space" class="noxref"><span

css2/propidx.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ <H1><a name="q0">Appendix F. Full property table</a></H1>
526526
<tr><td><a href="visufx.html#propdef-overflow"><span class="propinst-overflow xref">'overflow'</span></a>
527527
<td>visible | hidden | scroll | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
528528
<td>visible
529-
<td>block-level and replaced elements, table cells, inline blocks
529+
<td>non-replaced block-level elements, table cells, and inline-block elements
530530
<td>no
531531
<td>&nbsp;
532532
<td><a href="media.html#visual-media-group">visual</a>

css2/tables.html

Lines changed: 44 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ <h2><a name="q1">17.1 Introduction to tables</a></h2>
128128

129129
<pre>
130130
table { border-collapse: collapse }
131-
tr#row1 { border-top: 3px solid blue }
132-
tr#row2 { border-top: 1px solid black }
133-
tr#row3 { border-top: 1px solid black }
131+
tr#row1 { border: 3px solid blue }
132+
tr#row2 { border: 1px solid black }
133+
tr#row3 { border: 1px solid black }
134134
</pre>
135135

136136
<p>Note, however, that the borders around the rows overlap where the
@@ -264,11 +264,18 @@ <h2><a name="q2">17.2 The CSS table model</a></h2>
264264
class="value-def"
265265
name="value-def-table-caption">table-caption</a></span></strong> (In
266266
HTML: CAPTION) <dd>Specifies a caption for the table. Use of
267-
multiple elements with 'display: caption' is undefined; authors
268-
should not put more than one element with 'display: caption' inside
267+
multiple elements with 'display: table-caption' is undefined; authors
268+
should not put more than one element with 'display: table-caption' inside
269269
a table or inline-table element.
270270
</dl>
271271

272+
<p>Replaced elements with these <a href="visuren.html#propdef-display" class="noxref"><span
273+
class="propinst-display">'display'</span></a> values are treated as their
274+
given display types during layout. For example, an image that is set
275+
to 'display: table-cell' will fill the available cell space, and its
276+
dimensions might contribute towards the table sizing algorithms, as
277+
with an ordinary cell.
278+
272279
<p>Elements with <a href="visuren.html#propdef-display" class="noxref"><span class="propinst-display">'display'</span></a> set
273280
to 'table-column' or 'table-column-group' are not rendered (exactly as
274281
if they had 'display: none'), but they are useful, because they may
@@ -310,59 +317,59 @@ <h3>17.2.1 <a name="anonymous-boxes">Anonymous table objects</a></h3>
310317
boxes in visual table layout) according to the following rules:
311318

312319
<ol>
313-
<li>If the parent P of a 'table-cell' element T is not a
314-
'table-row', an object corresponding to a 'table-row' will be
315-
generated between P and T. This object will span all consecutive
320+
<li>If the parent P of a 'table-cell' box T is not a
321+
'table-row', a box corresponding to a 'table-row' will be
322+
generated between P and T. This box will span all consecutive
316323
'table-cell' siblings (in the document tree) of T.
317324

318-
<li>If the parent P of a 'table-row' element T is not a 'table',
325+
<li>If the parent P of a 'table-row' box T is not a 'table',
319326
'inline-table', 'table-header-group', 'table-footer-group' or
320-
'table-row-group' element, an object corresponding to a 'table'
321-
element will be generated between P and T. This object will span all
327+
'table-row-group' box, a box corresponding to a 'table'
328+
element will be generated between P and T. This box will span all
322329
consecutive siblings (in the document tree) of T that require a
323330
'table' parent: 'table-row', 'table-row-group',
324331
'table-header-group', 'table-footer-group', 'table-column',
325332
'table-column-group', and 'table-caption'. T and T's siblings may
326-
also be anonymous 'table-row' objects generated by rule&nbsp;1.
333+
also be anonymous 'table-row' boxes generated by rule&nbsp;1.
327334

328-
<li>If the parent P of a 'table-column' element T is not a 'table',
329-
'inline-table', or 'table-column-group' element, an object
335+
<li>If the parent P of a 'table-column' box T is not a 'table',
336+
'inline-table', or 'table-column-group' box, a box
330337
corresponding to a 'table' element will be generated between P and
331-
T. This object will span all consecutive siblings (in the document
338+
T. This box will span all consecutive siblings (in the document
332339
tree) of T that require a 'table' parent: 'table-row',
333340
'table-row-group', 'table-header-group', 'table-footer-group',
334341
'table-column', 'table-column-group', and 'table-caption', including
335-
any anonymous 'table-row' objects generated by rule&nbsp;1.
342+
any anonymous 'table-row' boxes generated by rule&nbsp;1.
336343

337344
<li>If the parent P of a 'table-row-group' (or 'table-header-group',
338345
'table-footer-group', or 'table-column-group' or 'table-caption')
339-
element T is not a 'table' or 'inline-table', an object
346+
box T is not a 'table' or 'inline-table', a box
340347
corresponding to a 'table' element will be generated between P and
341-
T. This object will span all consecutive siblings (in the document
348+
T. This box will span all consecutive siblings (in the document
342349
tree) of T that require a 'table' parent: 'table-row',
343350
'table-row-group', 'table-header-group', 'table-footer-group',
344351
'table-column', 'table-column-group', and 'table-caption', including
345-
any anonymous 'table-row' objects generated by rule&nbsp;1.
352+
any anonymous 'table-row' boxes generated by rule&nbsp;1.
346353

347-
<li>If a child T of a 'table' element (or 'inline-table') P is not a
354+
<li>If a child T of a 'table' box (or 'inline-table') P is not a
348355
'table-row-group', 'table-header-group', 'table-footer-group',
349356
'table-caption', 'table-column', 'table-column-group' or 'table-row'
350-
element, an object corresponding to a 'table-row' element will be
351-
generated between P and T. This object spans all consecutive
357+
box, a box corresponding to a 'table-row' element will be
358+
generated between P and T. This box spans all consecutive
352359
siblings of T that are not 'table-row-group', 'table-header-group',
353360
'table-footer-group', 'table-caption', 'table-column',
354-
'table-column-group' or 'table-row' elements.
361+
'table-column-group' or 'table-row' boxes.
355362

356-
<li>If a child T of a 'table-row-group' element (or
363+
<li>If a child T of a 'table-row-group' box (or
357364
'table-header-group' or 'table-footer-group') P is not a 'table-row'
358-
element, an object corresponding to a 'table-row' element will be
359-
generated between P and T. This object spans all consecutive
360-
siblings of T that are not 'table-row' elements.
361-
362-
<li>If a child T of a 'table-row' element P is not a 'table-cell'
363-
element, an object corresponding to a 'table-cell' element will be
364-
generated between P and T. This object spans all consecutive
365-
siblings of T that are not 'table-cell' elements.
365+
box, a box corresponding to a 'table-row' element will be
366+
generated between P and T. This box spans all consecutive
367+
siblings of T that are not 'table-row' boxes.
368+
369+
<li>If a child T of a 'table-row' box P is not a 'table-cell'
370+
box, a box corresponding to a 'table-cell' element will be
371+
generated between P and T. This box spans all consecutive
372+
siblings of T that are not 'table-cell' boxes.
366373
</ol>
367374

368375
<div class="example"><P style="display:none">Example(s):</P>
@@ -881,6 +888,10 @@ <h4> <a name="auto-table-layout">Automatic table layout</a></h4>
881888
to have access to all the content in the table before determining the
882889
final layout and may demand more than one pass.
883890

891+
<p>Input to this algorithm must only include the width of the
892+
containing block and the content of, and any CSS properties set on,
893+
the table and any of its descendants.
894+
884895
<p>Column widths are determined as follows:
885896

886897
<ol>
@@ -979,7 +990,7 @@ <h3>17.5.3 <a name="height-layout">Table height algorithms</a></h3>
979990
class="propinst-height">'height'</span></a> refer to when specified for
980991
table cells.
981992

982-
<p>CSS&nbsp;2.1 does not specify how cells that span more than row
993+
<p>CSS&nbsp;2.1 does not specify how cells that span more than one row
983994
affect row height calculations except that the sum of the row heights
984995
involved must be great enough to encompass the cell spanning the rows.
985996

css2/visudet.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,15 @@ <h2>10.2 <a name="the-width-property">Content width</a>: the <a href="visudet.ht
268268
<dd>Specifies a percentage width. The percentage is calculated
269269
with respect to the width of the generated box's
270270
<a href="visuren.html#containing-block">containing block</a>.
271-
If the containing block's width depends on this element's width, then the resulting layout is undefined in CSS 2.1.
271+
If the containing block's width depends on this element's width, then
272+
the resulting layout is undefined in CSS 2.1.
272273
<span class="note">
273-
Note: For absolutely positioned elements whose containing block is based on a block-level element, the percentage is calculated with respect to the width of the <em>padding box</em> of that element. This is a change from CSS1, where the percentage width was always calculated with respect to the <em>content box</em> of the parent element.
274+
Note: For absolutely positioned elements whose containing block is
275+
based on a block-level element, the percentage is calculated with
276+
respect to the width of the <em>padding box</em> of that element.
277+
This is a change from CSS1, where the percentage width was always
278+
calculated with respect to the <em>content box</em> of the parent
279+
element.
274280
</span>
275281
</dd>
276282
<dt><strong>auto</strong>
@@ -374,7 +380,7 @@ <h3>10.3.3 <a name="blockwidth">Block-level, non-replaced elements in normal
374380
href="#containing-block-details">containing block</a>
375381
</p>
376382
</blockquote>
377-
<p>If 'width' is not 'auto' and 'border-left-width' + 'padding-left' +
383+
<p>If 'width' is not 'auto' and 'border-left-width' + 'padding-left' +
378384
'width' + 'padding-right' + 'border-right-width' (plus any of
379385
'margin-left' or 'margin-right' that are not 'auto') is larger than
380386
the width of the containing block, then any 'auto' values for

css2/visufx.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ <h3>11.1.1 <a name="overflow">Overflow</a>: the <a href="visufx.html#propdef-ove
9494
<table class="propinfo" cellspacing=0 cellpadding=0>
9595
<tr valign=baseline><td><em>Value:</em>&nbsp;&nbsp;<td>visible | hidden | scroll | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
9696
<tr valign=baseline><td><em>Initial:</em>&nbsp;&nbsp;<td>visible
97-
<tr valign=baseline><td><em>Applies to:</em>&nbsp;&nbsp;<td>block-level and replaced elements, table cells, inline blocks
97+
<tr valign=baseline><td><em>Applies to:</em>&nbsp;&nbsp;<td>non-replaced block-level elements, table cells, and inline-block elements
9898
<tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>no
9999
<tr valign=baseline><td><em>Percentages:</em>&nbsp;&nbsp;<td>N/A
100100
<tr valign=baseline><td><em>Media:</em>&nbsp;&nbsp;<td><a href="media.html#visual-media-group" class="noxref">visual</a>

css2/visuren.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -663,6 +663,10 @@ <h3>9.3.1 <a name="choose-position">Choosing a positioning scheme:</a> <a href="
663663
}
664664
</pre>
665665
</div>
666+
<p>UAs must not paginate the content of fixed boxes. <span
667+
class="note">Note that UAs may print invisible content in other
668+
ways. See <a href="page.html#outside-page-box">"Content outside the
669+
page box"</a> in chapter&nbsp;13.
666670
</dd>
667671
</dl>
668672
<p>
@@ -1565,7 +1569,7 @@ <h3>9.6.1 <a name="fixed-positioning">Fixed positioning</a></h3>
15651569
&lt;HTML&gt;
15661570
&lt;HEAD&gt;
15671571
&lt;TITLE&gt;A frame document with CSS&nbsp;2.1&lt;/TITLE&gt;
1568-
&lt;STYLE type="text/css"&gt;
1572+
&lt;STYLE type="text/css" media="screen"&gt;
15691573
BODY { height: 8.5in } /* Required for percentage heights below */
15701574
#header {
15711575
position: fixed;

0 commit comments

Comments
 (0)