Skip to content

Commit e503c1e

Browse files
bert-githubbert-github
committed
[css2] Updated for issues 190, 196, 197, 199 and 200
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402202
1 parent 66ce6b8 commit e503c1e

5 files changed

Lines changed: 104 additions & 82 deletions

File tree

‎css2/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Makefile to generate the CSS2 document based on its "source files"
22
# Arnaud Le Hors - lehors@w3.org
3-
# $Id: Makefile,v 2.81 2003-09-15 18:40:07 bbos Exp $
3+
# $Id: Makefile,v 2.82 2004-02-02 14:52:02 bbos Exp $
44

55
# what needs to be set for every new release:
66
# Note use of full year (1998) in identifier.
@@ -228,7 +228,7 @@ PNMTOGIF_PIPE = pnmscale 0.5 | ppmquant -fs 256 | ppmtogif
228228

229229
# idraw -> png
230230
#PNMTOPNG_PIPE = pnmscale 0.5 | pnmgamma 1.7 | pnmtopng -gamma 1.7
231-
PNMTOPNG_PIPE = pnmscale 0.5 | pnmtopng
231+
PNMTOPNG_PIPE = pnmscale 0.5 | pnmtopng -gamma 1.45455
232232

233233
# include paths
234234
INCLUDES= -Ibuild -I.

‎css2/box.src‎

Lines changed: 9 additions & 9 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: box.src,v 1.52 2004-01-27 09:38:50 bbos Exp $ -->
5+
<!-- $Id: box.src,v 1.53 2004-02-02 14:52:02 bbos Exp $ -->
66
<HEAD>
77
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
88
<TITLE>Box model</TITLE>
@@ -117,8 +117,8 @@ interact. The example HTML document:
117117
&lt;BODY&gt;
118118
&lt;UL&gt;
119119
&lt;LI&gt;First element of list
120-
&lt;LI class="withborder"&gt;Second element of list is longer
121-
to illustrate wrapping.
120+
&lt;LI class="withborder"&gt;Second element of list is
121+
a bit longer to illustrate wrapping.
122122
&lt;/UL&gt;
123123
&lt;/BODY&gt;
124124
&lt;/HTML&gt;
@@ -131,7 +131,7 @@ children.
131131
<P>The first of the following diagrams illustrates what this example
132132
would produce. The second illustrates the relationship between the
133133
margins, padding, and borders of the UL elements and those of its
134-
children LI elements.</P>
134+
children LI elements. (Image is not to scale.)</P>
135135

136136
<div class="figure">
137137
<P><img src="./images/boxdimeg.png"
@@ -468,7 +468,7 @@ element.
468468
<div class="note"><P>
469469
<em><strong>Note.</strong>
470470
Notably for HTML,
471-
user agents may render borders for certain elements (e.g.,
471+
user agents may render borders for certain user interface elements (e.g.,
472472
buttons, menus, etc.) differently than for
473473
"ordinary" elements.
474474
</em>
@@ -765,16 +765,16 @@ order (not logical order).
765765
<p>When the element's <span
766766
class=propinst-direction>'direction'</span> property is 'ltr', the
767767
left-most generated box of the first line box in which the element
768-
appears has a left margin, left border and left padding, and the
768+
appears has the left margin, left border and left padding, and the
769769
right-most generated box of the last line box in which the element
770-
appears has a right padding, right border and right margin.
770+
appears has the right padding, right border and right margin.
771771

772772
<p>When the element's <span
773773
class=propinst-direction>'direction'</span> property is 'rtl', the
774774
right-most generated box of the first line box in which the element
775-
appears has a right padding, right border and right margin, and the
775+
appears has the right padding, right border and right margin, and the
776776
left-most generated box of the last line box in which the element
777-
appears has a left margin, left border and left padding.
777+
appears has the left margin, left border and left padding.
778778

779779
</BODY>
780780
</HTML>

‎css2/images/boxdimeg.fig‎

Lines changed: 75 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#FIG 3.2
22
Portrait
33
Flush left
4-
Inches
4+
Metric
55
Letter
66
100.00
77
Single
@@ -11,128 +11,136 @@ Single
1111
0 33 #5151ff
1212
0 34 #38fb30
1313
# polyline
14-
2 1 0 0 33 33 994 0 20 4.000 0 0 0 0 0 5
15-
2722 9284 2722 8647 5383 8647 5383 9284 2722 9284
16-
# polyline
17-
2 1 0 0 0 0 992 0 -1 4.000 0 0 0 0 0 5
18-
2722 9284 2722 8647 5383 8647 5383 9284 2722 9284
19-
# polyline
2014
2 1 0 0 33 33 988 0 20 4.000 0 0 0 0 0 5
21-
2850 9094 2850 8838 5381 8838 5381 9094 2850 9094
15+
2714 8662 2714 8418 5125 8418 5125 8662 2714 8662
2216
# polyline
2317
2 1 0 0 0 0 986 0 -1 4.000 0 0 0 0 0 5
24-
2850 9094 2850 8838 5381 8838 5381 9094 2850 9094
18+
2714 8662 2714 8418 5125 8418 5125 8662 2714 8662
2519
# polyline
2620
2 1 0 0 0 0 978 0 -1 4.000 0 0 0 0 0 5
27-
1847 11368 1847 7810 6416 7810 6416 11368 1847 11368
28-
# polyline
29-
2 1 0 0 33 33 971 0 20 4.000 0 0 0 0 0 5
30-
2722 10621 2722 9632 5415 9632 5415 10621 2722 10621
21+
1759 10828 1759 7439 6111 7439 6111 10828 1759 10828
3122
# polyline
3223
2 1 0 0 33 33 965 0 20 4.000 0 0 0 0 0 5
33-
2850 10426 2850 9728 5397 9728 5397 10426 2850 10426
34-
# polyline
35-
2 1 0 0 0 0 963 0 -1 4.000 0 0 0 0 0 5
36-
2850 10426 2850 9728 5397 9728 5397 10426 2850 10426
37-
# polyline
38-
2 1 0 0 33 33 938 0 20 4.000 0 0 0 0 0 5
39-
2705 5733 2705 4743 5398 4743 5398 5733 2705 5733
40-
# polyline
41-
2 1 0 0 33 33 929 0 20 4.000 0 0 0 0 0 5
42-
2706 4396 2706 3759 5367 3759 5367 4396 2706 4396
43-
# polyline
44-
2 1 0 0 0 0 927 0 -1 4.000 0 0 0 0 0 5
45-
2706 4396 2706 3759 5367 3759 5367 4396 2706 4396
46-
# polyline
47-
2 1 1 2 34 34 969 0 -1 6.000 0 0 7 0 0 5
48-
2735 10609 2735 9645 5397 9645 5397 10609 2735 10609
49-
# polyline
50-
2 1 1 2 34 34 936 0 -1 6.000 0 0 7 0 0 5
51-
2719 5719 2719 4758 5385 4758 5385 5719 2719 5719
24+
2714 9930 2714 9265 5140 9265 5140 9930 2714 9930
5225
# polyline
5326
2 1 0 1 0 0 922 0 -1 8.000 0 0 7 0 0 4
54-
2929 7595 3057 7627 3057 7563 2929 7595
27+
2789 7234 2911 7264 2911 7203 2789 7234
5528
# polyline
5629
2 1 0 1 0 0 921 0 -1 8.000 0 0 7 0 0 4
57-
5349 7595 5222 7563 5222 7627 5349 7595
30+
5094 7234 4973 7203 4973 7264 5094 7234
5831
# polyline
5932
2 1 0 1 0 0 924 0 -1 8.000 0 0 7 0 0 2
60-
2929 7595 5349 7595
33+
2789 7234 5094 7234
6134
# polyline
6235
2 1 0 1 0 0 953 0 -1 8.000 0 0 7 0 0 4
63-
6432 11958 6305 11926 6305 11989 6432 11958
36+
6126 11389 6005 11359 6005 11419 6126 11389
6437
# polyline
6538
2 1 0 1 0 0 954 0 -1 8.000 0 0 7 0 0 4
66-
1831 11958 1958 11989 1958 11926 1831 11958
39+
1744 11389 1864 11419 1864 11359 1744 11389
6740
# polyline
6841
2 1 0 1 0 0 956 0 -1 8.000 0 0 7 0 0 2
69-
1831 11958 6432 11958
42+
1744 11389 6126 11389
7043
# polyline
7144
2 1 0 1 0 0 940 0 -1 8.000 0 0 7 0 0 4
72-
2467 11480 2595 11512 2595 11448 2467 11480
45+
2349 10934 2471 10965 2471 10904 2349 10934
7346
# polyline
7447
2 1 0 1 0 0 939 0 -1 8.000 0 0 7 0 0 4
75-
5779 11480 5652 11448 5652 11512 5779 11480
48+
5504 10934 5383 10904 5383 10965 5504 10934
7649
# polyline
7750
2 1 0 1 0 0 942 0 -1 8.000 0 0 7 0 0 2
78-
2467 11480 5779 11480
51+
2349 10934 5504 10934
7952
# polyline
8053
2 1 0 1 0 0 948 0 -1 8.000 0 0 7 0 0 4
81-
6543 9601 6575 9474 6512 9474 6543 9601
54+
6232 9144 6262 9023 6202 9023 6232 9144
8255
# polyline
8356
2 1 0 1 0 0 949 0 -1 8.000 0 0 7 0 0 4
84-
6543 9219 6512 9346 6575 9346 6543 9219
57+
6232 8781 6202 8902 6262 8902 6232 8781
8558
# polyline
8659
2 1 0 1 0 0 951 0 -1 8.000 0 0 7 0 0 2
87-
6543 9219 6543 9601
60+
6232 8781 6232 9144
8861
# polyline
8962
2 1 0 1 0 0 973 0 -1 8.000 0 0 7 0 0 5
90-
2467 10875 2467 8455 5779 8455 5779 10875 2467 10875
63+
2349 10358 2349 8053 5504 8053 5504 10358 2349 10358
9164
# polyline
9265
2 1 0 0 0 0 979 0 -1 4.000 0 0 0 0 0 5
93-
1831 6479 1831 2922 6400 2922 6400 6479 1831 6479
66+
1744 6171 1744 2783 6095 2783 6095 6171 1744 6171
9467
# polyline
9568
2 1 0 0 6 6 983 0 20 0.000 0 0 0 0 0 5
96-
2219 6132 2219 3275 6011 3275 6011 6132 2219 6132
69+
2113 5840 2113 3119 5725 3119 5725 5840 2113 5840
9770
# polyline
9871
2 1 0 1 0 0 997 0 -1 4.000 0 0 0 0 0 5
99-
2213 11130 2213 8200 6034 8200 6034 11130 2213 11130
72+
2107 10601 2107 7810 5747 7810 5747 10601 2107 10601
10073
# polyline
10174
2 1 0 0 6 6 999 0 20 0.000 0 0 0 0 0 5
102-
2213 11130 2213 8200 6034 8200 6034 11130 2213 11130
75+
2107 10601 2107 7810 5747 7810 5747 10601 2107 10601
76+
2 1 2 2 0 0 900 -1 -1 4.500 0 0 -1 0 0 2
77+
2725 8420 2725 7230
78+
2 1 2 2 0 0 900 -1 -1 4.500 0 0 -1 0 0 2
79+
5175 8410 5175 7260
80+
2 2 0 1 0 0 973 -1 -1 0.000 0 0 -1 0 0 5
81+
2713 8407 5175 8407 5175 8698 2713 8698 2713 8407
82+
# polyline
83+
2 1 0 0 33 33 994 0 20 0.000 0 0 0 0 0 5
84+
2542 8843 2542 8236 5175 8236 5175 8843 2592 8843
85+
# polyline
86+
2 1 0 1 0 0 900 0 -1 0.000 0 0 0 0 0 5
87+
2543 8843 2543 8236 5175 8236 5175 8843 2543 8841
88+
# polyline
89+
2 1 1 2 34 34 899 0 -1 6.000 0 0 7 0 0 5
90+
2543 10105 2543 9186 5175 9186 5175 10105 2543 10105
91+
2 2 0 1 0 0 900 -1 -1 0.000 0 0 -1 0 0 5
92+
2715 9305 5175 9305 5175 9960 2715 9960 2715 9305
93+
# polyline
94+
2 1 0 0 0 0 963 0 -1 0.000 0 0 0 0 0 5
95+
2714 9930 2714 9265 5175 9265 5175 9930 2714 9930
96+
# polyline
97+
2 1 0 0 33 33 971 0 20 0.000 0 0 0 0 0 5
98+
2530 10116 2525 9174 5184 9174 5184 10116 2592 10116
99+
# polyline
100+
2 1 0 0 0 0 927 0 -1 0.000 0 0 0 0 0 5
101+
2577 4187 2577 3580 5175 3580 5175 4187 2577 4187
102+
# polyline
103+
2 1 0 0 33 33 929 0 20 0.000 0 0 0 0 0 5
104+
2577 4187 2577 3580 5175 3580 5175 4187 2577 4187
105+
# polyline
106+
2 1 1 2 34 34 936 0 -1 6.000 0 0 7 0 0 5
107+
2589 5447 2589 4531 5175 4531 5175 5447 2589 5447
108+
# polyline
109+
2 1 0 0 33 33 938 0 20 0.000 0 0 0 0 0 5
110+
2576 5460 2576 4517 5175 4517 5175 5460 2576 5460
103111
# text
104-
4 0 0 995 -1 17 11 0.0000 4 150 735 2315 11109 UL padding\001
112+
4 0 0 995 -1 17 11 0.0000 4 150 735 2205 10581 UL padding\001
105113
# text
106-
4 0 0 990 -1 17 11 0.0000 4 150 660 2762 9278 LI padding\001
114+
4 0 0 990 -1 17 11 0.0000 4 150 660 2630 8837 LI padding\001
107115
# text
108-
4 0 7 984 -1 16 14 0.0000 4 165 1800 2850 9087 First element of list\001
116+
4 0 0 976 -1 17 11 0.0000 4 150 765 1804 10801 UL margins\001
109117
# text
110-
4 0 0 976 -1 17 11 0.0000 4 150 765 1895 11340 UL margins\001
118+
4 0 0 975 -1 17 11 0.0000 4 150 690 2410 10324 LI margins\001
111119
# text
112-
4 0 0 975 -1 17 11 0.0000 4 150 690 2531 10839 LI margins\001
120+
4 0 0 952 -1 17 11 0.0000 4 120 1140 3366 11673 Box width of UL\001
113121
# text
114-
4 0 7 961 -1 16 14 0.0000 4 165 2100 2881 9947 Second element of list\001
122+
4 0 0 947 -1 17 11 0.0000 4 150 1290 6354 9019 Collapsed margin is\001
115123
# text
116-
4 0 7 959 -1 16 14 0.0000 4 210 1935 2881 10170 is longer to illustrate\001
124+
4 0 0 945 -1 17 11 0.0000 4 150 1635 6354 9185 max(12px, 12px)=12px\001
117125
# text
118-
4 0 7 957 -1 16 14 0.0000 4 210 870 2881 10393 wrapping\001
126+
4 0 0 944 -1 17 11 0.0000 4 120 1440 3207 11188 Content width of UL\001
119127
# text
120-
4 0 0 952 -1 17 11 0.0000 4 120 1140 3534 12256 Box width of UL\001
128+
4 0 0 920 -1 17 11 0.0000 4 120 1365 3260 7108 Content width of LI\001
121129
# text
122-
4 0 0 947 -1 17 11 0.0000 4 150 1290 6671 9469 Collapsed margin is\001
130+
4 0 0 967 -1 17 11 0.0000 4 150 660 2630 10096 LI padding\001
123131
# text
124-
4 0 0 945 -1 17 11 0.0000 4 150 1635 6671 9644 max(12px, 12px)=12px\001
132+
4 0 7 925 -1 16 14 0.0000 4 165 1770 2709 3999 First element of list\001
125133
# text
126-
4 0 0 944 -1 17 11 0.0000 4 120 1440 3367 11746 Content width of UL\001
134+
4 0 7 934 -1 16 14 0.0000 4 165 2475 2709 4818 Second element of list is a\001
127135
# text
128-
4 0 7 934 -1 16 14 0.0000 4 165 2100 2865 5059 Second element of list\001
136+
4 0 7 932 -1 16 14 0.0000 4 210 1950 2709 5031 bit longer to illustrate\001
129137
# text
130-
4 0 7 932 -1 16 14 0.0000 4 210 1935 2865 5282 is longer to illustrate\001
138+
4 0 7 930 -1 16 14 0.0000 4 210 915 2709 5243 wrapping.\001
131139
# text
132-
4 0 7 930 -1 16 14 0.0000 4 210 870 2865 5505 wrapping\001
140+
4 0 7 984 -1 16 14 0.0000 4 165 1770 2714 8655 First element of list\001
133141
# text
134-
4 0 7 925 -1 16 14 0.0000 4 165 1800 2833 4199 First element of list\001
142+
4 0 7 961 -1 16 14 0.0000 4 165 2475 2714 9474 Second element of list is a\001
135143
# text
136-
4 0 0 920 -1 17 11 0.0000 4 120 1365 3423 7463 Content width of LI\001
144+
4 0 7 959 -1 16 14 0.0000 4 210 1950 2714 9686 bit longer to illustrate\001
137145
# text
138-
4 0 0 967 -1 17 11 0.0000 4 150 660 2762 10600 LI padding\001
146+
4 0 7 957 -1 16 14 0.0000 4 210 915 2714 9899 wrapping.\001

‎css2/selector.src‎

Lines changed: 15 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: selector.src,v 2.85 2004-01-27 09:38:50 bbos Exp $ -->
3+
<!-- $Id: selector.src,v 2.86 2004-02-02 14:52:02 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Selectors</title>
@@ -1073,7 +1073,8 @@ title="pseudo-elements:::first-line">:first-line</span> pseudo-element
10731073
can only be attached to a block-level element or
10741074
a table cell.</p>
10751075

1076-
<p>The "first formatted line" of an element may occur inside a
1076+
<p><a name="first-formatted-line"></a>The "first formatted line" of an
1077+
element may occur inside a
10771078
block-level descendant in the same flow (i.e., a block-level
10781079
descendant that is not positioned and not a float). E.g., the first
10791080
line of the DIV in <code>&lt;DIV>&lt;P>This
@@ -1086,6 +1087,11 @@ STYLE="display: inline-block">Hello&lt;BR&gt;Goodbye&lt;/P&gt;
10861087
etcetera&lt;/DIV&gt;</code> the first formatted line of the DIV is not
10871088
the line "Hello".
10881089

1090+
<p class="note">Note that the first line of the P in this fragment:
1091+
<code>&lt;p&gt&lt;br&gt;First...</code> doesn't contain any letters
1092+
(assuming the default style for BR in HTML 4.0). The word "First" is
1093+
not on the first formatted line.
1094+
10891095
<p>A UA should act as if the fictional start tag of the first-line
10901096
pseudo-element is just inside the innermost enclosing block-level
10911097
element. (Since CSS1 and CSS2 were silent on this case, authors
@@ -1266,6 +1272,13 @@ STYLE="display: inline-block">Hello&lt;BR&gt;Goodbye&lt;/P&gt;
12661272
etcetera&lt;/DIV&gt;</code> the first letter of the DIV is not the
12671273
letter "H". In fact, the DIV doesn't have a first letter.
12681274

1275+
<p>The first letter must occur on the <a
1276+
href="#first-formatted-line">first formatted line.</a> For example, in
1277+
this fragment: <code>&lt;p&gt&lt;br&gt;First...</code> the first line
1278+
doesn't contain any letters and ':first-letter' doesn't match anything
1279+
(assuming the default style for BR in HTML 4.0). In particular, it
1280+
does not match the "F" of "First."
1281+
12691282
<p>If an element is a <a href="generate.html#q10">list item</a>
12701283
('display: list-item') with a marker outside ('list-style-position:
12711284
outside'), the ':first-letter' applies to the principal box of the

‎css2/tables.src‎

Lines changed: 3 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: tables.src,v 2.72 2004-01-19 16:58:43 bbos Exp $ -->
3+
<!-- $Id: tables.src,v 2.73 2004-02-02 14:52:02 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
66
<title>Tables</title>
@@ -940,7 +940,8 @@ row it spans.
940940
<dt><strong>middle</strong></dt>
941941
<dd>The center of the cell is aligned with the center of the rows it
942942
spans.
943-
<dt><strong>sub, super, text-top, text-bottom</strong></dt>
943+
<dt><strong>sub, super, text-top, text-bottom, &lt;length&gt;,
944+
&lt;percentage&gt;</strong></dt>
944945
<dd>These values do not apply to cells; the cell is aligned at the
945946
baseline instead.
946947
</dl>

0 commit comments

Comments
 (0)