Skip to content

Commit c58b6fe

Browse files
committed
[css2] Processed rest of my issues
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402205
1 parent af59d5e commit c58b6fe

9 files changed

Lines changed: 106 additions & 63 deletions

File tree

css2/box.src

Lines changed: 8 additions & 3 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.53 2004-02-02 14:52:02 bbos Exp $ -->
5+
<!-- $Id: box.src,v 1.54 2004-02-09 21:47:46 bbos Exp $ -->
66
<HEAD>
77
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
88
<TITLE>Box model</TITLE>
@@ -199,7 +199,7 @@ If the containing block's width depends on this element, then the
199199
resulting layout is undefined in CSS&nbsp;2.1.
200200
<dt><strong>auto</strong>
201201
<dd>See the section on <a
202-
href="visudet.html#Computing_widths_and_margins">computing widths and
202+
href="visudet.html#Computing_widths_and_margins">calculating widths and
203203
margins</a> for behavior.
204204
</dl>
205205

@@ -298,6 +298,9 @@ href="visuren.html#absolutely-positioned">absolutely</a>
298298
positioned boxes do not collapse (not even with their
299299
in-flow children).
300300

301+
<li>Margins of <span class="index-inst">inline-block</span> elements
302+
do not collapse (not even with their in-flow children).
303+
301304
<li id="collapsed-through">
302305
If the top and bottom margins of a box are adjoining, then it is
303306
possible for margins to collapse through it. In this case, the
@@ -322,6 +325,8 @@ is only required for laying out descendants of these
322325
elements.</p>
323326
</li>
324327

328+
<li>Margins of the root element's box do not collapse.</li>
329+
325330
</ul>
326331

327332
<div id="what-is-adjoining">
@@ -608,7 +613,7 @@ value type, which make take one of the following values:</p>
608613

609614
<dl>
610615
<dt><strong><span class="index-def" title="'none'::as border style"><a name="value-def-bo-none" class="value-def">none</a></span></strong>
611-
<dd>No border.
616+
<dd>No border; the border width is zero.
612617
<dt><strong><span class="index-def" title="'hidden'"><a name="value-def-hidden" class="value-def">hidden</a></span></strong>
613618
<dd>Same as 'none', except in terms of <a
614619
href="tables.html#border-conflict-resolution">border conflict

css2/grammar.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: grammar.src,v 2.36 2004-01-19 16:58:43 bbos Exp $ -->
3+
<!-- $Id: grammar.src,v 2.37 2004-02-09 21:47:46 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Grammar of CSS&nbsp;2.1</TITLE>
@@ -13,7 +13,7 @@
1313
however, a superset of CSS&nbsp;2.1 as this specification imposes additional
1414
semantic constraints not expressed in this grammar. A conforming UA
1515
must also adhere to the <a href="./syndata.html#syntax">
16-
forward-compatible parsing rules</a>, the <a
16+
forward-compatible parsing rules</a>, the selectors notation, the <a
1717
href="./about.html#property-defs">property and value notation</a>,
1818
and the unit notation. In
1919
addition, the document language may impose restrictions, e.g. HTML

css2/images/longdesc/page-info-desc.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ <h1>Long description illustrating relationship between page box
2525
dimensions. Thus, an abstract page box may be rendered to
2626
a variety of target sheets.
2727

28-
<!--
2928
<P><a href="../../page.html#img-page-info">Return to image.</a>
30-
-->
3129
</body>
3230
</html>

css2/properties/properties.db

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
/* margin-right margin-left;;
2525
<margin-width> | inherit;;
2626
0;;
27-
all elements but {tables.html#internal}internal table elements{};;
27+
all elements except elements with table display
28+
types other than table and inline-table;;
2829
no;;
2930
refer to width of containing block;;
3031
visual;;
@@ -34,8 +35,8 @@
3435
/* margin-top margin-bottom;;
3536
<margin-width> | inherit;;
3637
0;;
37-
all elements but inline, non-replaced elements and
38-
{tables.html#internal}internal table elements{};;
38+
all elements except elements with table display
39+
types other than table and inline-table;;
3940
no;;
4041
refer to width of containing block;;
4142
visual;;
@@ -45,7 +46,8 @@
4546
/* margin;;
4647
<margin-width>{1,4} | inherit;;
4748
see individual properties;;
48-
all elements but {tables.html#internal}internal table elements{};;
49+
all elements except elements with table display
50+
types other than table and inline-table;;
4951
no;;
5052
refer to width of containing block;;
5153
visual;;
@@ -55,7 +57,8 @@
5557
/* padding-top padding-right padding-bottom padding-left;;
5658
<padding-width> | inherit;;
5759
0;;
58-
*;;
60+
all elements except elements with table display
61+
types other than table, inline-table, and table-cell;;
5962
no;;
6063
refer to width of containing block;;
6164
visual;;
@@ -64,7 +67,8 @@
6467
/* padding;;
6568
<padding-width>{1,4} | inherit;;
6669
see individual properties;;
67-
*;;
70+
all elements except elements with table display
71+
types other than table, inline-table, and table-cell;;
6872
no;;
6973
refer to width of containing block;;
7074
visual;;
@@ -283,7 +287,7 @@ table-cell | table-caption | none | inherit;;
283287
no;;
284288
refer to width of containing block;;
285289
visual;;
286-
the percentage as specified or the absolute length; 'auto' if the property does not apply
290+
the percentage or 'auto' as specified or the absolute length; 'auto' if the property does not apply
287291
*/
288292

289293
/* height;;
@@ -293,7 +297,7 @@ table-cell | table-caption | none | inherit;;
293297
no;;
294298
see prose;;
295299
visual;;
296-
the percentage as specified or the absolute length; 'auto' if the property does not apply
300+
the percentage or 'auto' as specified or the absolute length; 'auto' if the property does not apply
297301
*/
298302

299303
/* min-width;;
@@ -878,7 +882,7 @@ leftwards | rightwards | inherit;;
878882
/* border-spacing;;
879883
<length> <length>? | inherit;;
880884
0;;
881-
'table' and 'inline-table' elements;;
885+
'table' and 'inline-table' elements*;;
882886
yes;;
883887
N/A;;
884888
visual;;

css2/refs.src

Lines changed: 8 additions & 6 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: refs.src,v 2.25 2004-01-27 09:38:50 bbos Exp $ -->
3+
<!-- $Id: refs.src,v 2.26 2004-02-09 21:47:46 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Bibliography</TITLE>
@@ -96,10 +96,12 @@ Frystyk Nielsen, and T. Berners-Lee, January 1997.<BR>
9696
Available at <A href="http://www.ietf.org/rfc/rfc2068.txt">
9797
http://www.ietf.org/rfc/rfc2068.txt</A>. </DD>
9898

99+
<!--
99100
<dt><strong><a name="ref-RFC2070" class="normref">[RFC2070]</a></strong>
100101
<dd>"Internationalization of the HyperText Markup Language", F. Yergeau, G. Nicol, G. Adams, and M. D&#252;rst, January 1997.<BR>
101102
Available at <a
102103
href="http://www.ietf.org/rfc/rfc2070.txt">http://www.ietf.org/rfc/rfc2070.txt</a>.
104+
-->
103105

104106
<DT><STRONG><A name="ref-RFC2119" class="normref">[RFC2119]</A></STRONG></DT>
105107

@@ -193,13 +195,13 @@ J. Reagle, 16 April 2002<br>
193195
Available at <a href="http://www.w3.org/TR/2002/REC-P3P-20020416/">
194196
http://www.w3.org/TR/2002/REC-P3P-20020416</a>
195197

196-
<DT><STRONG><A name="ref-RFC1766"
197-
class="informref">[RFC1766]</A></STRONG></DT>
198+
<DT><STRONG><A name="ref-RFC3066"
199+
class="informref">[RFC3066]</A></STRONG></DT>
198200

199201
<DD>"Tags for the Identification of Languages", H. Alvestrand,
200-
March 1995.<BR>
201-
Available at <A href="http://www.ietf.org/rfc/rfc1766.txt">
202-
http://www.ietf.org/rfc/rfc1766.txt</A>. </DD>
202+
January 2001.<BR>
203+
Available at <A href="http://www.ietf.org/rfc/rfc3066.txt">
204+
http://www.ietf.org/rfc/rfc3066.txt</A>. </DD>
203205

204206
<dt><strong><a name="ref-SVG10" class="informref">[SVG10]</a></strong>
205207
<dd>"Scalable Vector Graphics (SVG) 1.0 Specification", J. Ferraiolo,

css2/selector.src

Lines changed: 23 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: selector.src,v 2.87 2004-02-09 17:24:09 bbos Exp $ -->
3+
<!-- $Id: selector.src,v 2.88 2004-02-09 21:47:46 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Selectors</title>
@@ -444,7 +444,7 @@ subset" of the DTD but <em>is</em> required to look for default
444444
attribute values in the document's "internal subset." (See [[XML10]]
445445
for definitions of these subsets.)
446446

447-
<p>A UA that recognizes an XML namespace [[-XMLNAMESPACE]] is not
447+
<p>A UA that recognizes an XML namespace [[-XMLNAMESPACES]] is not
448448
required to use its knowledge of that namespace to treat default
449449
attribute values as if they were present in the document. (E.g., an
450450
XHTML UA is not required to use its built-in knowledge of the XHTML
@@ -574,7 +574,7 @@ same restriction applies.
574574
identifier to one element instance in the document tree. CSS ID
575575
selectors match an element instance based on its identifier. A CSS
576576
ID selector contains a "#" immediately followed by the ID
577-
value.</p>
577+
value, which must be an identifier.</p>
578578

579579
<p class=note>Note that CSS does not specify how a UA knows the ID
580580
attribute of an element. The UA may, e.g., read a document's DTD, have
@@ -868,7 +868,7 @@ elements react to user events or not, and different devices and UAs
868868
may have different ways of pointing to, or activating elements.
869869

870870
<p>CSS&nbsp;2.1 doesn't define if the parent of an element that is
871-
':active' or ':hover is also in that state.
871+
':active' or ':hover' is also in that state.
872872

873873
<p>User agents are not required to reflow a currently displayed
874874
document due to pseudo-class transitions. For instance, a style sheet
@@ -947,10 +947,10 @@ HTTP headers). XML uses an attribute called xml:lang, and there may be
947947
other document language-specific methods for determining the language.
948948

949949
<p>The pseudo-class ':lang(C)' matches if the element is in language
950-
C. Whether there is a match is based solely on the string C
950+
C. Whether there is a match is based solely on the identifier C
951951
being either equal to, or a hyphen-separated substring of, the
952952
element's language value, in the same way as if performed by the <a
953-
href="#attribute-selectors">'|='</a> operator. The string C doesn't
953+
href="#attribute-selectors">'|='</a> operator. The identifier C doesn't
954954
have to be a valid language name.</p>
955955

956956
<p>Exception: C may be empty, but it is undefined in CSS&nbsp;2.1 what
@@ -960,7 +960,7 @@ it matches in that case. (This is likely to be defined in CSS level
960960
<p class=note>Note: It is recommended, that documents and
961961
protocols indicate language using codes from RFC 3066 [[-RFC3066]] or
962962
its successor, and by means of "xml:lang" attributes in the case of
963-
XML-based documents [[XML]]. See <a
963+
XML-based documents [[XML10]]. See <a
964964
href="http://www.w3.org/International/questions/qa-lang-2or3.html">
965965
"FAQ: Two-letter or three-letter language codes."</a></p>
966966

@@ -1070,8 +1070,11 @@ paragraph.&lt;/P&gt;
10701070

10711071
<p> The <span class="index-inst"
10721072
title="pseudo-elements:::first-line">:first-line</span> pseudo-element
1073-
can only be attached to a block-level element or
1074-
a table cell.</p>
1073+
can only be attached to a <a
1074+
href="visuren.html#block-level">block-level</a> element, <span
1075+
class="index-inst">inline-block</span>, <span
1076+
class="index-inst">table-caption</span> or a <span
1077+
class="index-inst">table-cell</span>.</p>
10751078

10761079
<p><a name="first-formatted-line"></a>The "first formatted line" of an
10771080
element may occur inside a
@@ -1154,6 +1157,7 @@ is similar to a floated element.</p>
11541157
<a href="box.html#border-properties">border properties,</a>
11551158
<a href="colors.html">color property,</a>
11561159
<a href="colors.html#background-properties">background properties.</a>
1160+
UAs may apply other properties as well.
11571161
To allow UAs to render a typographically correct drop cap or initial
11581162
cap, the UA may choose a line-height, width and height based on the
11591163
shape of the letter, unlike for normal elements. CSS3 is expected to
@@ -1235,7 +1239,8 @@ may approximate font sizes, for example to align baselines. Also, the
12351239
glyph outline may be taken into account when formatting.
12361240

12371241
<P>Punctuation (i.e, characters defined in Unicode [[UNICODE]] in the
1238-
"open" (Ps), "close" (Pe), and "other" (Po) punctuation classes), that
1242+
"open" (Ps), "close" (Pe), "initial" (Pi). "final" (Pf) and "other"
1243+
(Po) punctuation classes), that
12391244
precedes or follows the first letter should be included, as in:</p>
12401245

12411246
<div class="figure">
@@ -1246,7 +1251,14 @@ first letter should be included."></p>
12461251
<p>The ':first-letter' also applies if the first letter is in fact a
12471252
digit, e.g., the "6" in "67 million dollars is a lot of money."
12481253

1249-
<p>The :first-letter pseudo-element can be used with all elements that
1254+
<p>The :first-letter pseudo-element applies to <span
1255+
class="index-inst">block</span>, <span
1256+
class="index-inst">list-item</span>, <span
1257+
class="index-inst">table-cell</span>, <span
1258+
class="index-inst">table-caption</span> and <span
1259+
class="index-inst">inline-block</span> elements.
1260+
1261+
<p>The :first-letter pseudo-element can be used with all such elements that
12501262
contain text, or that have a descendant in the same flow that contains
12511263
text. A UA should act as if the fictional start tag of the
12521264
first-letter pseudo-element is just before the first text of the

css2/tables.src

Lines changed: 17 additions & 6 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.73 2004-02-02 14:52:02 bbos Exp $ -->
3+
<!-- $Id: tables.src,v 2.74 2004-02-09 21:47:46 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
66
<title>Tables</title>
@@ -276,7 +276,8 @@ and T. This object will span all consecutive 'table-cell' siblings
276276
(in the document tree) of T.
277277

278278
<li>If the parent P of a 'table-row' element T is not a 'table',
279-
'inline-table', or 'table-row-group' element, an
279+
'inline-table', 'table-header-group', 'table-footer-group' or
280+
'table-row-group' element, an
280281
object corresponding to a 'table' element will be
281282
generated between P and T. This object will span all consecutive siblings
282283
(in the document tree) of T that require a 'table' parent:
@@ -307,11 +308,13 @@ tree) of T that require a 'table' parent: 'table-row',
307308
any anonymous 'table-row' objects generated by rule&nbsp;1.
308309

309310
<li>If a child T of a 'table' element (or 'inline-table') P is not a
310-
'table-row-group', 'table-header-group', 'table-footer-group', or
311+
'table-row-group', 'table-header-group', 'table-footer-group',
312+
'table-caption', 'table-column', 'table-column-group' or
311313
'table-row' element, an object corresponding to a 'table-row' element
312314
will be generated between P and T. This object spans all consecutive
313315
siblings of T that are not 'table-row-group', 'table-header-group',
314-
'table-footer-group', or 'table-row' elements.
316+
'table-footer-group', 'table-caption', 'table-column',
317+
'table-column-group' or 'table-row' elements.
315318

316319
<li>If a child T of a 'table-row-group' element (or
317320
'table-header-group' or 'table-footer-group') P is
@@ -568,8 +571,8 @@ an HTML document, the second an XHTML document:
568571

569572
<pre>
570573
&lt;table&gt;
571-
&lt;tr&gt;&lt;td&gt;1 &lt;/td&gt;&lt;td rowspan="2"&gt;2 &lt;/td&gt;&lt;td&gt;3 &lt;/td&gt;&lt;td&gt;4 &lt;td&gt;&lt;tr&gt;
572-
&lt;tr&gt;&lt;td colspan="2"&gt;5 &lt;td&gt;&lt;tr&gt;
574+
&lt;tr&gt;&lt;td&gt;1 &lt;/td&gt;&lt;td rowspan="2"&gt;2 &lt;/td&gt;&lt;td&gt;3 &lt;/td&gt;&lt;td&gt;4 &lt;/td&gt;&lt;/tr&gt;
575+
&lt;tr&gt;&lt;td colspan="2"&gt;5 &lt;/td&gt;&lt;/tr&gt;
573576
&lt;/table&gt;
574577
</pre>
575578

@@ -1033,6 +1036,14 @@ selects the collapsing borders model. The models are described below.
10331036

10341037
<!-- #include src=properties/border-spacing.srb -->
10351038

1039+
<p class="note">*) Note: user agents may also apply the
1040+
'border-spacing' property to 'frameset' elements. Which elements are
1041+
'frameset' elements is not defined by this specification and is up to
1042+
the document language. For example, HTML4 defines a &lt;FRAMESET>
1043+
element, and XHTML 1.0 defines a &lt;frameset> element. The
1044+
'border-spacing' property on a 'frameset' element can be thus used as
1045+
a valid substitute for the non-standard 'framespacing' attribute.
1046+
10361047
<P>The lengths specify the distance that separates adjoining cell
10371048
borders. If one length is specified, it gives both the horizontal and
10381049
vertical spacing. If two are specified, the first gives the horizontal

0 commit comments

Comments
 (0)