Skip to content

Commit 135bf52

Browse files
committed
[css2] Some of the edits agreed at 18 Aug telcom
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402122
1 parent 878f890 commit 135bf52

3 files changed

Lines changed: 44 additions & 38 deletions

File tree

css2/box.src

Lines changed: 8 additions & 4 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.37 2003-08-18 14:19:35 bbos Exp $ -->
5+
<!-- $Id: box.src,v 1.38 2003-08-18 18:16:20 bbos Exp $ -->
66
<HEAD>
77
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
88
<TITLE>Box model</TITLE>
@@ -203,6 +203,9 @@ with respect to the <em>width</em> of the generated box's
203203
<span class="note">Note that this is true for <span
204204
class="propinst-margin-top">'margin-top'</span> and <span
205205
class="propinst-margin-bottom">'margin-bottom'</span> as well.</span>
206+
<ins>If the containing block is intrinsically sized (i.e., it depends on
207+
its content's width) and the current element is not absolutely
208+
positioned, then the percentage is interpreted as '0'.</ins>
206209
<dt><strong>auto</strong>
207210
<dd>See the section on <a
208211
href="visudet.html#Computing_widths_and_margins">computing widths and
@@ -389,6 +392,9 @@ respect to the <em>width</em> of the generated box's <a
389392
href="visuren.html#containing-block">containing block</a>, even for
390393
<span class="propinst-padding-top">'padding-top'</span> and <span
391394
class="propinst-padding-bottom">'padding-bottom'</span>.
395+
<ins>If the containing block is intrinsically sized (i.e., it depends on
396+
its content's width) and the current element is not absolutely
397+
positioned, then the percentage is interpreted as '0'.</ins>
392398
</dl>
393399

394400
<P>Unlike margin properties, values for padding values cannot be
@@ -747,8 +753,7 @@ relevant.
747753
</div>
748754

749755

750-
<ins cite="http://lists.w3.org/Archives/Member/w3c-css-wg/2003JulSep/0280.html">
751-
<h2>The border model for inline elements</h2>
756+
<h2>The box model for inline elements in bidi context</h2>
752757

753758
<p>For each line box, UAs must take the inline boxes generated for
754759
each element and render the margins, borders and padding in visual
@@ -767,7 +772,6 @@ right-most generated box of the first line box in which the element
767772
appears has a right padding, right border and right margin, and the
768773
left-most generated box of the last line box in which the element
769774
appears has a left margin, left border and left padding.
770-
</ins>
771775

772776
</BODY>
773777
</HTML>

css2/selector.src

Lines changed: 32 additions & 33 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.72 2003-08-18 14:19:35 bbos Exp $ -->
3+
<!-- $Id: selector.src,v 2.73 2003-08-18 18:16:20 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Selectors</title>
@@ -287,9 +287,8 @@ pseudo-class below.
287287
<p>Adjacent sibling selectors have the following syntax: E1 + E2,
288288
where E2 is the subject of the selector. The selector matches if E1
289289
and E2 share the same parent in the document tree and E1 immediately
290-
precedes E2<ins
291-
cite="http://lists.w3.org/Archives/Member/w3c-css-wg/1999JanMar/0219.html">,
292-
ignoring non-element nodes (such as text nodes and comments)</ins>.
290+
precedes E2,
291+
ignoring non-element nodes (such as text nodes and comments).
293292

294293
<p>In some contexts, adjacent elements generate formatting objects
295294
whose presentation is handled automatically (e.g., collapsing
@@ -959,9 +958,8 @@ text uses the English quotation marks. </div>
959958
title="pseudo-elements:::first-line|:first-line|first-line"><a
960959
name="first-line-pseudo">:first-line</a></span> pseudo-element</h3>
961960

962-
<p>The :first-line pseudo-element applies special styles to <ins
963-
cite="http://lists.w3.org/Archives/Member/w3c-css-wg/2003AprJun/0384.html">the
964-
contents of</ins> the first formatted line of a paragraph. For
961+
<p>The :first-line pseudo-element applies special styles to the
962+
contents of the first formatted line of a paragraph. For
965963
instance:</p>
966964

967965
<pre class="example">
@@ -1043,9 +1041,7 @@ paragraph.&lt;/P&gt;
10431041
title="pseudo-elements:::first-line">:first-line</span> pseudo-element
10441042
can only be attached to a block-level element.</p>
10451043

1046-
<ins
1047-
cite="http://lists.w3.org/Archives/Public/www-style/2003Jul/0076.html"><p>
1048-
The "first formatted line" of an element may occur inside a
1044+
<p>The "first formatted line" of an element may occur inside a
10491045
block-level descendant in the same flow (i.e., a block-level
10501046
descendant that is not positioned and not a float). E.g., the first
10511047
line of the DIV in <code>&lt;DIV>&lt;P>This
@@ -1054,7 +1050,7 @@ that both P and DIV are block-level).
10541050

10551051
<p>A UA should act as if the fictional start tag of the first-line
10561052
pseudo-element is just inside the smallest enclosing block-level
1057-
element. (Since CSS1 and CSS2 were silent on the this case, authors
1053+
element. (Since CSS1 and CSS2 were silent on this case, authors
10581054
should not rely on this behavior.) Here is an example. The fictional
10591055
tag sequence for
10601056

@@ -1074,8 +1070,6 @@ tag sequence for
10741070
&lt;/DIV>
10751071
</pre>
10761072

1077-
</ins>
1078-
10791073

10801074
<p>The <a name="first-line">:first-line</a> pseudo-element is similar
10811075
to an inline-level element, but with certain restrictions. Only the
@@ -1087,10 +1081,8 @@ class="propinst-word-spacing">'word-spacing',</span> <span
10871081
class="propinst-letter-spacing">'letter-spacing',</span> <span
10881082
class="propinst-text-decoration">'text-decoration',</span> <span
10891083
class="propinst-vertical-align">'vertical-align',</span> <span
1090-
class="propinst-text-transform">'text-transform',</span>
1091-
<ins>and</ins> <span
1092-
class="propinst-line-height">'line-height',</span><del> and <span
1093-
class="propinst-clear">'clear'</span></del>.</p>
1084+
class="propinst-text-transform">'text-transform',</span> <span
1085+
class="propinst-line-height">'line-height',</span>.</p>
10941086

10951087

10961088
<h3><a name="first-letter">The</a> <span class="index-def" title="pseudo-elements:::first-letter|:first-letter|first-letter">:first-letter</span> pseudo-element</h3>
@@ -1107,10 +1099,8 @@ is similar to a floated element.</p>
11071099
<a href="fonts.html">font properties,</a>
11081100
<span class="propinst-text-decoration">'text-decoration',</span>
11091101
<span class="propinst-text-transform">'text-transform',</span>
1110-
<ins cite="http://lists.w3.org/Archives/Member/w3c-css-wg/2003AprJun/0379.html">
11111102
<span class="propinst-letter-spacing">'letter-spacing',</span>
11121103
<span class="propinst-word-spacing">'word-spacing'</span> (when appropriate),
1113-
</ins>
11141104
<span class="propinst-line-height">'line-height',</span>
11151105
<span class="propinst-vertical-align">'vertical-align'</span> (only if 'float' is 'none'),
11161106
<a href="box.html#margin-properties">margin properties,</a>
@@ -1129,11 +1119,10 @@ and, if 'float' is not 'none',
11291119
<span class="propinst-max-height">'max-height',</span>
11301120
and
11311121
<span class="propinst-clear">'clear'</span>.
1132-
<ins>Other properties are explicitly undefined, to allow UAs to render
1133-
a typographically correct drop cap or initial cap. E.g., if 'float' is
1134-
not 'none', the UA may choose a width and height based on the shape of
1135-
the letter, unlike for normal floating elements. CSS3 is expected to
1136-
have specific properties that apply to first-letter.</ins>
1122+
To allow UAs to render a typographically correct drop cap or initial
1123+
cap, the UA may choose a line-height, width and height based on the
1124+
shape of the letter, unlike for normal elements. CSS3 is expected to
1125+
have specific properties that apply to first-letter.
11371126
</p>
11381127

11391128
<div class="html-example"><p></p>
@@ -1197,24 +1186,34 @@ precedes the first letter should be included, as in:</p>
11971186
first letter should be included."></p>
11981187
</div>
11991188

1200-
<del cite="http://lists.w3.org/Archives/Member/w3c-css-wg/1999JanMar/0226.html">
1201-
<p>The :first-letter pseudo-element matches parts of <a
1202-
href="visuren.html#block-level">block-level</a> elements only.</p>
1203-
</del>
1204-
<ins>
12051189
<p>The :first-letter pseudo-element can be used with all elements that
12061190
contain text, or that have a descendant in the same flow that contains
1207-
text.</p>
1208-
</ins>
1191+
text. <ins>A UA should act as if the fictional start tag of the
1192+
first-letter pseudo-element is just before the first text of the
1193+
element, even if that first text is in a descendant.</ins></p>
1194+
1195+
<div class=example>
1196+
<p>Here is an example. The fictional tag sequence for this HTML
1197+
fragment:
1198+
<pre>
1199+
&lt;div>
1200+
&lt;p>The first text.
1201+
</pre>
1202+
<p>is:
1203+
<pre>
1204+
&lt;div>
1205+
&lt;p>&lt;div:first-letter>&lt;p:first-letter>T&lt;/...>&lt;/...>he first text.
1206+
</pre>
1207+
</div>
12091208

12101209
<p>
12111210
Some languages may have specific rules about how to treat certain
12121211
letter combinations. In Dutch, for example, if the letter combination
12131212
"ij" appears at the beginning of a word, both letters should be
12141213
considered within the :first-letter pseudo-element.
12151214

1216-
<ins>
1217-
<p>If the letters that would form the first-letter are not in the
1215+
<p><ins>
1216+
If the letters that would form the first-letter are not in the
12181217
same element, such as "'t" in <code>&lt;p>'&lt;em>t...</code>, the UA
12191218
should not apply the first-letter.
12201219
</ins>

css2/visudet.src

Lines changed: 4 additions & 1 deletion
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.70 2003-08-18 14:19:35 bbos Exp $ -->
3+
<!-- $Id: visudet.src,v 2.71 2003-08-18 18:16:20 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Visual formatting model details</TITLE>
@@ -174,6 +174,9 @@ user agent if the value of this property is different than 'auto'.
174174
<dd>Specifies a percentage width. The percentage is calculated
175175
with respect to the width of the generated box's
176176
<a href="visuren.html#containing-block">containing block</a>.
177+
If the containing block is intrinsically sized (i.e., it depends on
178+
its content's width) and the current element is not absolutely
179+
positioned, then a percentage is interpreted as 'auto'.
177180
<dt><strong>auto</strong>
178181
<dd>The width depends on the values of other properties.
179182
See the sections below.

0 commit comments

Comments
 (0)