Skip to content

Commit 291cc2f

Browse files
committed
[css2] Processed CR issues
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402279
1 parent 1d87e71 commit 291cc2f

5 files changed

Lines changed: 69 additions & 42 deletions

File tree

css2/cover.src

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,12 @@ in this specification.</p>
234234
normatively. (<a href="selector.html#id-selectors">Section
235235
5.8.4.</a>)
236236
</dd>
237+
<dt>Automatic table layout algorithm
238+
<dd>
239+
<p>The input to the suggested (non-normative) automatic layout
240+
algorithm for tables is restricted to (1) the containing block width
241+
and (2) the content and properties of the table and its
242+
children. This restriction may be lifted.
237243
</dl>
238244

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

css2/page.src

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: page.src,v 2.42 2004-12-07 10:10:25 bbos Exp $ -->
3+
<!-- $Id: page.src,v 2.43 2005-03-03 22:46:08 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Paged media</TITLE>
@@ -190,7 +190,7 @@ on left, right, and first pages. In this case, the page area width
190190
of the first page should be used.
191191

192192

193-
<h3>Content outside the page box</h3>
193+
<h3 id="outside-page-box">Content outside the page box</h3>
194194

195195
<P>When formatting content in the page model, some content may end up
196196
outside the page box. For example, an element whose <span

css2/tables.src

Lines changed: 45 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: tables.src,v 2.80 2005-03-02 04:41:45 bbos Exp $ -->
3+
<!-- $Id: tables.src,v 2.81 2005-03-03 22:46:08 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
66
<title>Tables</title>
@@ -72,9 +72,9 @@ solid blue border and each of the other rows will be surrounded by a
7272

7373
<pre>
7474
table { border-collapse: collapse }
75-
tr#row1 { border-top: 3px solid blue }
76-
tr#row2 { border-top: 1px solid black }
77-
tr#row3 { border-top: 1px solid black }
75+
tr#row1 { border: 3px solid blue }
76+
tr#row2 { border: 1px solid black }
77+
tr#row3 { border: 1px solid black }
7878
</pre>
7979

8080
<p>Note, however, that the borders around the rows overlap where the
@@ -208,11 +208,18 @@ formatting rules to an arbitrary element:
208208
class="value-def"
209209
name="value-def-table-caption">table-caption</a></span></strong> (In
210210
HTML: CAPTION) <dd>Specifies a caption for the table. Use of
211-
multiple elements with 'display: caption' is undefined; authors
212-
should not put more than one element with 'display: caption' inside
211+
multiple elements with 'display: table-caption' is undefined; authors
212+
should not put more than one element with 'display: table-caption' inside
213213
a table or inline-table element.
214214
</dl>
215215

216+
<p>Replaced elements with these <span
217+
class="propinst-display">'display'</span> values are treated as their
218+
given display types during layout. For example, an image that is set
219+
to 'display: table-cell' will fill the available cell space, and its
220+
dimensions might contribute towards the table sizing algorithms, as
221+
with an ordinary cell.
222+
216223
<p>Elements with <span class="propinst-display">'display'</span> set
217224
to 'table-column' or 'table-column-group' are not rendered (exactly as
218225
if they had 'display: none'), but they are useful, because they may
@@ -254,59 +261,59 @@ href="visuren.html#anonymous">anonymous</a> objects (e.g., anonymous
254261
boxes in visual table layout) according to the following rules:
255262

256263
<ol>
257-
<li>If the parent P of a 'table-cell' element T is not a
258-
'table-row', an object corresponding to a 'table-row' will be
259-
generated between P and T. This object will span all consecutive
264+
<li>If the parent P of a 'table-cell' box T is not a
265+
'table-row', a box corresponding to a 'table-row' will be
266+
generated between P and T. This box will span all consecutive
260267
'table-cell' siblings (in the document tree) of T.
261268

262-
<li>If the parent P of a 'table-row' element T is not a 'table',
269+
<li>If the parent P of a 'table-row' box T is not a 'table',
263270
'inline-table', 'table-header-group', 'table-footer-group' or
264-
'table-row-group' element, an object corresponding to a 'table'
265-
element will be generated between P and T. This object will span all
271+
'table-row-group' box, a box corresponding to a 'table'
272+
element will be generated between P and T. This box will span all
266273
consecutive siblings (in the document tree) of T that require a
267274
'table' parent: 'table-row', 'table-row-group',
268275
'table-header-group', 'table-footer-group', 'table-column',
269276
'table-column-group', and 'table-caption'. T and T's siblings may
270-
also be anonymous 'table-row' objects generated by rule&nbsp;1.
277+
also be anonymous 'table-row' boxes generated by rule&nbsp;1.
271278

272-
<li>If the parent P of a 'table-column' element T is not a 'table',
273-
'inline-table', or 'table-column-group' element, an object
279+
<li>If the parent P of a 'table-column' box T is not a 'table',
280+
'inline-table', or 'table-column-group' box, a box
274281
corresponding to a 'table' element will be generated between P and
275-
T. This object will span all consecutive siblings (in the document
282+
T. This box will span all consecutive siblings (in the document
276283
tree) of T that require a 'table' parent: 'table-row',
277284
'table-row-group', 'table-header-group', 'table-footer-group',
278285
'table-column', 'table-column-group', and 'table-caption', including
279-
any anonymous 'table-row' objects generated by rule&nbsp;1.
286+
any anonymous 'table-row' boxes generated by rule&nbsp;1.
280287

281288
<li>If the parent P of a 'table-row-group' (or 'table-header-group',
282289
'table-footer-group', or 'table-column-group' or 'table-caption')
283-
element T is not a 'table' or 'inline-table', an object
290+
box T is not a 'table' or 'inline-table', a box
284291
corresponding to a 'table' element will be generated between P and
285-
T. This object will span all consecutive siblings (in the document
292+
T. This box will span all consecutive siblings (in the document
286293
tree) of T that require a 'table' parent: 'table-row',
287294
'table-row-group', 'table-header-group', 'table-footer-group',
288295
'table-column', 'table-column-group', and 'table-caption', including
289-
any anonymous 'table-row' objects generated by rule&nbsp;1.
296+
any anonymous 'table-row' boxes generated by rule&nbsp;1.
290297

291-
<li>If a child T of a 'table' element (or 'inline-table') P is not a
298+
<li>If a child T of a 'table' box (or 'inline-table') P is not a
292299
'table-row-group', 'table-header-group', 'table-footer-group',
293300
'table-caption', 'table-column', 'table-column-group' or 'table-row'
294-
element, an object corresponding to a 'table-row' element will be
295-
generated between P and T. This object spans all consecutive
301+
box, a box corresponding to a 'table-row' element will be
302+
generated between P and T. This box spans all consecutive
296303
siblings of T that are not 'table-row-group', 'table-header-group',
297304
'table-footer-group', 'table-caption', 'table-column',
298-
'table-column-group' or 'table-row' elements.
305+
'table-column-group' or 'table-row' boxes.
299306

300-
<li>If a child T of a 'table-row-group' element (or
307+
<li>If a child T of a 'table-row-group' box (or
301308
'table-header-group' or 'table-footer-group') P is not a 'table-row'
302-
element, an object corresponding to a 'table-row' element will be
303-
generated between P and T. This object spans all consecutive
304-
siblings of T that are not 'table-row' elements.
305-
306-
<li>If a child T of a 'table-row' element P is not a 'table-cell'
307-
element, an object corresponding to a 'table-cell' element will be
308-
generated between P and T. This object spans all consecutive
309-
siblings of T that are not 'table-cell' elements.
309+
box, a box corresponding to a 'table-row' element will be
310+
generated between P and T. This box spans all consecutive
311+
siblings of T that are not 'table-row' boxes.
312+
313+
<li>If a child T of a 'table-row' box P is not a 'table-cell'
314+
box, a box corresponding to a 'table-cell' element will be
315+
generated between P and T. This box spans all consecutive
316+
siblings of T that are not 'table-cell' boxes.
310317
</ol>
311318

312319
<div class="example">
@@ -793,6 +800,10 @@ can use any other algorithm.
793800
to have access to all the content in the table before determining the
794801
final layout and may demand more than one pass.
795802

803+
<p>Input to this algorithm must only include the width of the
804+
containing block and the content of, and any CSS properties set on,
805+
the table and any of its descendants.
806+
796807
<p>Column widths are determined as follows:
797808

798809
<ol>
@@ -891,7 +902,7 @@ what percentage values of <span
891902
class="propinst-height">'height'</span> refer to when specified for
892903
table cells.
893904

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

css2/visudet.src

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: visudet.src,v 2.100 2005-03-02 04:41:45 bbos Exp $ -->
3+
<!-- $Id: visudet.src,v 2.101 2005-03-03 22:46:08 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Visual formatting model details</title>
@@ -199,9 +199,15 @@ user agent if the value of this property is different than 'auto'.
199199
<dd>Specifies a percentage width. The percentage is calculated
200200
with respect to the width of the generated box's
201201
<a href="visuren.html#containing-block">containing block</a>.
202-
If the containing block's width depends on this element's width, then the resulting layout is undefined in CSS 2.1.
202+
If the containing block's width depends on this element's width, then
203+
the resulting layout is undefined in CSS 2.1.
203204
<span class="note">
204-
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.
205+
Note: For absolutely positioned elements whose containing block is
206+
based on a block-level element, the percentage is calculated with
207+
respect to the width of the <em>padding box</em> of that element.
208+
This is a change from CSS1, where the percentage width was always
209+
calculated with respect to the <em>content box</em> of the parent
210+
element.
205211
</span>
206212
</dd>
207213
<dt><strong>auto</strong>
@@ -305,7 +311,7 @@ class="propinst-border-right-width">'border-right-width'</span> +
305311
href="#containing-block-details">containing block</a>
306312
</p>
307313
</blockquote>
308-
<p>If 'width' is not 'auto' and 'border-left-width' + 'padding-left' +
314+
<p>If 'width' is not 'auto' and 'border-left-width' + 'padding-left' +
309315
'width' + 'padding-right' + 'border-right-width' (plus any of
310316
'margin-left' or 'margin-right' that are not 'auto') is larger than
311317
the width of the containing block, then any 'auto' values for

css2/visuren.src

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: visuren.src,v 2.115 2005-03-02 03:18:35 bbos Exp $ -->
3+
<!-- $Id: visuren.src,v 2.116 2005-03-03 22:46:08 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Visual formatting model</title>
@@ -562,6 +562,10 @@ rule</a>, as in:
562562
}
563563
</pre>
564564
</div>
565+
<p>UAs must not paginate the content of fixed boxes. <span
566+
class="note">Note that UAs may print invisible content in other
567+
ways. See <a href="page.html#outside-page-box">"Content outside the
568+
page box"</a> in chapter&nbsp;13.
565569
</dd>
566570
</dl>
567571
<p>
@@ -1353,7 +1357,7 @@ style rules:</p>
13531357
&lt;HTML&gt;
13541358
&lt;HEAD&gt;
13551359
&lt;TITLE&gt;A frame document with CSS&nbsp;2.1&lt;/TITLE&gt;
1356-
&lt;STYLE type="text/css"&gt;
1360+
&lt;STYLE type="text/css" media="screen"&gt;
13571361
BODY { height: 8.5in } /* Required for percentage heights below */
13581362
#header {
13591363
position: fixed;

0 commit comments

Comments
 (0)