Skip to content

Commit d820785

Browse files
committed
[css2] Issues 87, 127, 152, 157, 158, 164, 165, 166, 168, 169
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402299
1 parent cdfde1b commit d820785

4 files changed

Lines changed: 70 additions & 31 deletions

File tree

css2/about.src

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
'http://www.w3.org/TR/html4/strict.dtd'>
33

44
<html lang="en">
5-
<!-- $Id: about.src,v 2.58 2004-12-07 10:38:08 bbos Exp $ -->
5+
<!-- $Id: about.src,v 2.59 2005-04-25 18:20:48 bbos Exp $ -->
66
<HEAD>
77
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
88
<TITLE>About the CSS&nbsp;2.1 Specification</TITLE>
@@ -126,7 +126,7 @@ and two indexes: one for
126126
and attributes</H3>
127127

128128
<ul>
129-
<li>CSS property, descriptor, and pseudo-class names are delimited
129+
<li>CSS property and pseudo-class names are delimited
130130
by single quotes.
131131
<li>CSS values are delimited by single quotes.
132132
<li>Document language element names are in uppercase letters.

css2/properties/properties.db

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ table-cell | table-caption | none | inherit;;
414414
no;;
415415
N/A;;
416416
visual;;
417-
absolute URI
417+
absolute URI or none
418418
*/
419419
/* background-repeat;;
420420
repeat | repeat-x | repeat-y | no-repeat | inherit;;
@@ -940,7 +940,7 @@ leftwards | rightwards | inherit;;
940940
*/
941941

942942
/* content;;
943-
normal | [ <string> | <uri> | <counter> | attr(<identifier>) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | inherit;;
943+
normal | none | [ <string> | <uri> | <counter> | attr(<identifier>) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | inherit;;
944944
normal;;
945945
:before and :after pseudo-elements;;
946946
no;;

css2/tables.src

Lines changed: 39 additions & 11 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.82 2005-04-12 14:02:15 bbos Exp $ -->
3+
<!-- $Id: tables.src,v 2.83 2005-04-25 18:20:48 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
66
<title>Tables</title>
@@ -942,10 +942,18 @@ following meanings:
942942
baseline instead.
943943
</dl>
944944

945-
<p>The baseline of a cell is the baseline of the first <a
946-
href="visuren.html#line-box">line box</a> in the cell. If there is no
947-
text, the baseline is the baseline of whatever object is displayed in
948-
the cell, or, if it has none, the bottom of the cell box. The maximum
945+
<p>The baseline of a cell is the baseline of the first in-flow <a
946+
href="visuren.html#line-box">line box</a> in the cell, or the first
947+
in-flow table-row in the cell, whichever comes first. If there is no
948+
such line box or table-row, the baseline is the bottom of content edge
949+
of the cell box. For the purposes of finding a baseline, in-flow boxes
950+
with a scrolling mechanisms (see the <span
951+
class="propinst-overflow">'overflow'</span> property) must be
952+
considered as if scrolled to their origin position. Note that the
953+
baseline of a cell may end up below its bottom border, see the <a
954+
href="#baseline-below">example</a> below.
955+
956+
<p>The maximum
949957
distance between the top of the cell box and the baseline over all
950958
cells that have 'vertical-align: baseline' is used to set the baseline
951959
of the row. Here is an example:
@@ -960,8 +968,10 @@ of the row. Here is an example:
960968

961969
<p>Cell boxes 1 and 2 are aligned at their baselines. Cell box 2 has
962970
the largest height above the baseline, so that determines the baseline
963-
of the row. Note that if there is no cell box aligned at its baseline,
964-
the row will not have (nor need) a baseline.
971+
of the row.
972+
973+
<p>If a row has no cell box aligned to its baseline, the baseline of
974+
that row is the bottom content edge of the lowest cell in the row.
965975

966976
<p>To avoid ambiguous situations, the alignment of cells proceeds in
967977
the following order:
@@ -987,6 +997,24 @@ the following order:
987997
<p>Cell boxes that are smaller than the height of the row receive
988998
extra top or bottom padding.
989999

1000+
<div class=example id=baseline-below>
1001+
<p>The cell in this example has a baseline below its bottom border,
1002+
which leaves an empty space below the cell in its table row:
1003+
1004+
<pre>
1005+
div { height: 0; overflow: hidden; }
1006+
1007+
&lt;table>
1008+
&lt;tr>
1009+
&lt;td>
1010+
&lt;div> Test &lt;/div>
1011+
&lt;/td>
1012+
&lt;/tr>
1013+
&lt;/table>
1014+
</pre>
1015+
</div>
1016+
1017+
9901018
<h3><a name="column-alignment">Horizontal alignment in a column</a></h3>
9911019

9921020
<p>The horizontal alignment of a cell's content within a cell box is
@@ -1243,8 +1271,8 @@ table { border-collapse: collapse;
12431271
border: 5px solid yellow; }
12441272
*#col1 { border: 3px solid black; }
12451273
td { border: 1px solid red; padding: 1em; }
1246-
td.solid-blue { border: 5px dashed blue; }
1247-
td.solid-green { border: 5px solid green; }
1274+
td.cell5 { border: 5px dashed blue; }
1275+
td.cell6 { border: 5px solid green; }
12481276
</pre>
12491277

12501278
<p>with this HTML source:
@@ -1260,8 +1288,8 @@ td.solid-green { border: 5px solid green; }
12601288
&lt;/TR&gt;
12611289
&lt;TR id=&quot;row2&quot;&gt;
12621290
&lt;TD&gt; 4
1263-
&lt;TD class="solid-blue"&gt; 5
1264-
&lt;TD class="solid-green"&gt; 6
1291+
&lt;TD class="cell5"&gt; 5
1292+
&lt;TD class="cell6"&gt; 6
12651293
&lt;/TR&gt;
12661294
&lt;TR id=&quot;row3&quot;&gt;
12671295
&lt;TD&gt; 7

css2/visudet.src

Lines changed: 27 additions & 16 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.103 2005-04-12 14:02:15 bbos Exp $ -->
3+
<!-- $Id: visudet.src,v 2.104 2005-04-25 18:20:48 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Visual formatting model details</title>
@@ -28,11 +28,14 @@ is defined as follows:</p>
2828

2929
<ol>
3030
<li>The containing block in which the <a href="conform.html#root">root
31-
element</a> lives is the <a href="visuren.html#viewport">viewport</a>
31+
element</a> lives is a rectangle with the dimensions of the <a
32+
href="visuren.html#viewport">viewport</a>, anchored at the canvas
33+
origin
3234
for continuous media, and the page area for paged media. This
3335
containing block is called the <dfn><span class="index-def"
3436
title="initial containing block|containing block::initial">initial
35-
containing block</span></dfn>.
37+
containing block</span></dfn>. The 'direction' property of the initial
38+
containing block is the same as for the root element.
3639
</li>
3740
<li>For other elements, if the element's position is 'relative' or 'static',
3841
the containing block is formed by the content edge of the nearest
@@ -350,7 +353,8 @@ all of the above have a computed value other than 'auto', the values
350353
are said to be "over-constrained" and one of the used values will
351354
have to be different from its computed value. If the <span
352355
class="propinst-direction">'direction'</span>
353-
property has the value 'ltr', the specified value of <span
356+
property of the containing block has the value 'ltr', the specified
357+
value of <span
354358
class="propinst-margin-right">'margin-right'</span> is ignored and the
355359
value is calculated so as to make the equality true. If the value of
356360
<span class="propinst-direction">'direction'</span> is 'rtl', this
@@ -454,7 +458,8 @@ elements is:</p>
454458

455459
<p>If all three of 'left', 'width', and 'right' are 'auto': First set
456460
any 'auto' values for 'margin-left' and 'margin-right' to 0. Then, if
457-
'direction' is 'ltr' set 'left' to the <a
461+
the 'direction' property of the containing block is 'ltr' set 'left'
462+
to the <a
458463
href="#static-position">static position</a> and apply rule number
459464
three below; otherwise, set 'right' to the <a
460465
href="#static-position">static position</a> and apply rule number
@@ -464,11 +469,13 @@ one below.</p>
464469
'margin-right' are 'auto', solve the
465470
equation under the extra constraint that the two margins get equal
466471
values, unless this would make them negative, in which case when
467-
direction is 'ltr' ('rtl'), set 'margin-left' ('margin-right') to zero
472+
direction of the containing block is 'ltr' ('rtl'), set 'margin-left'
473+
('margin-right') to zero
468474
and solve for 'margin-right' ('margin-left'). If one of
469475
'margin-left' or 'margin-right' is 'auto', solve the equation for that
470476
value. If the values are over-constrained, ignore the value for 'left'
471-
(in case 'direction' is 'rtl') or 'right' (in case 'direction' is
477+
(in case the 'direction' property of the containing block is 'rtl') or
478+
'right' (in case 'direction' is
472479
'ltr') and solve for that value.</p>
473480

474481
<p>Otherwise, set 'auto' values for 'margin-left' and 'margin-right'
@@ -480,7 +487,8 @@ to 0, and pick the one of the following six rules that applies.</p>
480487
width is shrink-to-fit. Then solve for 'left'</li>
481488

482489
<li>'left' and 'right' are 'auto' and 'width' is not 'auto', then if
483-
'direction' is 'ltr' set 'left' to the <a
490+
the 'direction' property of the containing block is 'ltr' set 'left'
491+
to the <a
484492
href="#static-position">static position</a>, otherwise set 'right'
485493
to the <a href="#static-position">static position</a>. Then solve
486494
for 'left' (if 'direction is 'rtl') or 'right' (if 'direction' is
@@ -525,7 +533,8 @@ elements</a>.
525533
</li>
526534
<li>If both <span class="propinst-left">'left'</span> and <span
527535
class="propinst-right">'right'</span> have the value 'auto', then if
528-
'direction' is 'ltr', set <span class="propinst-left">'left'</span> to
536+
'direction' of the containing block is 'ltr', set <span
537+
class="propinst-left">'left'</span> to
529538
the static position; else if 'direction' is 'rtl', set <span
530539
class="propinst-right">'right'</span> to the static position.
531540
</li>
@@ -539,7 +548,8 @@ class="propinst-margin-left">'margin-left'</span> and <span
539548
class="propinst-margin-right">'margin-right'</span> are still 'auto',
540549
solve the equation under the extra constraint that the two margins
541550
must get equal values, unless this would make them negative, in which
542-
case when direction is 'ltr' ('rtl'), set <span
551+
case when the direction of the containing block is 'ltr' ('rtl'), set
552+
<span
543553
class="propinst-margin-left">'margin-left'</span> (<span
544554
class="propinst-margin-right">'margin-right'</span>) to zero and solve
545555
for <span class="propinst-margin-right">'margin-right'</span> (<span
@@ -549,8 +559,9 @@ class="propinst-margin-left">'margin-left'</span>).
549559
for that value.
550560
</li>
551561
<li>If at this point the values are over-constrained, ignore the value
552-
for either <span class="propinst-left">'left'</span> (in case <span
553-
class="propinst-direction">'direction'</span> is 'rtl') or <span
562+
for either <span class="propinst-left">'left'</span> (in case the
563+
<span class="propinst-direction">'direction'</span> property of the
564+
containing block is 'rtl') or <span
554565
class="propinst-right">'right'</span> (in case <span
555566
class="propinst-direction">'direction'</span> is 'ltr') and solve for
556567
that value.
@@ -1243,21 +1254,21 @@ subsequent lines to paint over the borders and text of previous lines.
12431254
</p>
12441255
<!-- #include src=properties/line-height.srb -->
12451256

1246-
<p>If the property is set on a <a
1257+
<p>On a <a
12471258
href="visuren.html#block-level">block-level</a>, <span
12481259
class="index-inst">table-cell</span>, <span
12491260
class="index-inst">table-caption</span> or <span
12501261
class="index-inst">inline-block</span> element whose content
12511262
is composed of <a href="visuren.html#inline-level">inline-level</a>
1252-
elements, it specifies the <em>minimal</em> height of line boxes
1263+
elements, 'line-height' specifies the <em>minimal</em> height of line boxes
12531264
within the element. The minimum height consists of a minimum height above
12541265
the block's baseline and a minimum depth below it, exactly as if each
12551266
line box starts with a <a name="strut">zero-width inline box with the
12561267
block's font and line height properties (what T<sub>E</sub>X calls a
12571268
"strut").</a>
12581269
</p>
1259-
<p>If the property is set on an <a
1260-
href="visuren.html#inline-level">inline-level</a> element, it
1270+
<p>On an <a
1271+
href="visuren.html#inline-level">inline-level</a> element, 'line-height'
12611272
specifies the height that is used in the calculation of the line box
12621273
height (except for inline <a
12631274
href="conform.html#replaced-element">replaced</a> elements, where the

0 commit comments

Comments
 (0)