Skip to content

Commit 60836e2

Browse files
ianbjacobsianbjacobs
committed
[css2] Changes based on Adam Costello's big email.
(+ Minor typo corrections in fonts.src) Many are typo corrections. Here's the list of substantial changes: about.src: some wording changes about "|" and "||" cascade.src: some wording changes about "style" attribute in HTML. media.src: fixed bug: the "speech" media type was used. shouldn't this be "aural"? selector.src: NEW: Added summary of selector syntax to beginning of chapter and removed individual statements about legal combinations. Still to do: priorities and associativity. syndata.src: wording changes about at-keywords. added section about escaped : in property values. NOTE: Removed word "gradient" (should be "grads" apparently). Added examples of grad->rad->deg. visuren.src: (Comment from Sho). Explicit mention of image dimensions replaced by replaced element dimensions. --HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%401079
1 parent 28588f2 commit 60836e2

14 files changed

Lines changed: 208 additions & 206 deletions

‎css2/DOC/todo.db‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,4 @@ ian 0 Give advice on scaling/inserting images/inline thumbnail images Chris/Ian
106106
bbos 0 Create an XML example that shows the full complexity of writing direction and embedding. visuren.src#direction Bert 13 Feb 1998 - - -
107107
ian 0 Make sure properties database includes tactile and bitmap media groups appropriately Ian - 20 Feb 1998 - - -
108108
ian 0 Define display in a non-visual chapter since applies to all media Editors - 20 Feb 1998 - - -
109+
ian 0 Don't forget better definition of alignment of dropcaps in selector.src Bert - 23 Feb 1998 - - -

‎css2/about.src‎

Lines changed: 5 additions & 5 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: about.src,v 2.10 1998-02-20 23:49:20 ijacobs Exp $ -->
3+
<!-- $Id: about.src,v 2.11 1998-02-24 00:55:20 ijacobs Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>About the CSS2 Specification</TITLE>
@@ -136,10 +136,10 @@ must also appear literally.
136136
<ul>
137137
<li>Several juxtaposed words mean that all of them must occur, in the
138138
given order.
139-
<li>A bar (|) separates alternatives: one of them must
140-
occur.
141-
<li>A double bar (A || B) means that either A or B or both must
142-
occur, in any order.
139+
<li>A bar (|) separates two or more alternatives:
140+
exactly one of them must occur.
141+
<li>A double bar (||) separates
142+
two or more alternatives: one or more of them must occur, in any order.
143143
<li>Brackets ([]) are for grouping.
144144
</ul>
145145

‎css2/cascade.src‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: cascade.src,v 2.7 1998-02-21 04:05:16 ijacobs Exp $ -->
3+
<!-- $Id: cascade.src,v 2.8 1998-02-24 00:55:24 ijacobs Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Assigning property values, Cascading, and Inheritance</TITLE>
77
</HEAD>
88
<BODY>
99
<H1 align="center">Assigning property values, Cascading, and Inheritance</H1>
1010

11-
<H2>Specified, computed, and absolute values</h2>
11+
<H2>Specified, computed, and actual values</h2>
1212
<P>Once a user agent has parsed a document and constructed a <a
1313
href="conform.html#doctree">document tree</a>, it must assign, for
1414
every element in the tree, a value to every property that applies to the
@@ -197,8 +197,8 @@ same property.
197197
of"><a name="value-def-inherit">inherit</a></span>
198198
value</h3>
199199

200-
<P>Each property may also take the value 'inherit', which means that,
201-
for a given element, the property takes the same <a
200+
<P>Each property may also have a specified value of 'inherit', which
201+
means that, for a given element, the property takes the same <a
202202
href="#actual-value">actual value</a> as the property for the
203203
element's parent.
204204

@@ -237,7 +237,7 @@ font). See <a href="sample.html">"A sample style sheet for HTML
237237

238238
<P>Note that the default style sheet may change if system settings are
239239
modified by the user (e.g., system colors). However, due to
240-
limitations in a user agents' internal implementation, it may be
240+
limitations in a user agent's internal implementation, it may be
241241
impossible to change the values in the default style sheet.
242242
</ul>
243243

@@ -359,16 +359,13 @@ since the author's "!important" rule takes precedence.</p>
359359
<P>A selector's specificity is calculated as follows:</p>
360360

361361
<ul>
362-
<li>(a) count the number of "id" attributes in the selector
363-
<li>(b) count the number of other attributes in the selector
362+
<li>(a) count the number of ID attributes in the selector
363+
<li>(b) count the number of other attributes and pseudo-classes
364+
in the selector
364365
<li>(c) count the number of element names in the selector
366+
<li>(d) ignore pseudo-elements.
365367
</ul>
366368

367-
<p>Classes (only in selectors for HTML) and <a
368-
href="selector.html#pseudo-classes">pseudo-classes</a> are counted as
369-
attributes. <a href="selector.html#pseudo-elements">Pseudo-elements</a> are
370-
not counted.
371-
372369
<P>Concatenating the three numbers (in a number system with a large
373370
base) gives the specificity.
374371

@@ -379,17 +376,18 @@ Some examples:
379376
LI {} /* a=0 b=0 c=1 -&gt; specificity = 1 */
380377
UL LI {} /* a=0 b=0 c=2 -&gt; specificity = 2 */
381378
UL OL+LI {} /* a=0 b=0 c=3 -&gt; specificity = 3 */
382-
H1 + [REL=up] {} /* a=0 b=1 c=1 -&gt; specificity = 11 */
379+
H1 + *[REL=up]{} /* a=0 b=1 c=1 -&gt; specificity = 11 */
383380
UL OL LI.red {} /* a=0 b=1 c=3 -&gt; specificity = 13 */
384381
LI.red.level {} /* a=0 b=2 c=1 -&gt; specificity = 21 */
385382
#x34y {} /* a=1 b=0 c=0 -&gt; specificity = 100 */
386383
</PRE>
387384
</div>
388385

389386

390-
<P> A declaration in the "style" attribute of an element has the same
391-
weight as a declaration with an "id"-based selector that is specified
392-
at the end of the style sheet:
387+
<P>In HTML, values of an element's "style" attribute are style sheet
388+
rules. These rules have no selectors, but for the purpose of step 4 of
389+
the cascade algorithm, they are considered to have an ID selector
390+
(specificity = 100).
393391

394392
<div class="html-example"><P>
395393
<PRE>
@@ -406,7 +404,7 @@ at the end of the style sheet:
406404
<P> In the above example, the color of the P element would be
407405
red. Although the specificity is the same for both declarations, the
408406
declaration in the "style" attribute will override the one in the
409-
STYLE element because of cascading rule number 5.
407+
STYLE element because of cascading rule 4.
410408
</div>
411409

412410
<H3>Precedence of non-CSS presentational hints</H3>

‎css2/changes.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: changes.src,v 2.3 1998-02-21 00:05:18 ijacobs Exp $ -->
3+
<!-- $Id: changes.src,v 2.4 1998-02-24 00:55:26 ijacobs Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Appendix B: Changes from CSS1</TITLE>
@@ -50,7 +50,7 @@ numbering</A>
5050
<LI>Text shadows, through the new <LI><span
5151
class="propinst-text-shadow">'text-shadow'</span> property.
5252

53-
<LI>A new <A HREF="selector.html#anchor-pseudo-classes">anchor
53+
<LI>A new <A HREF="selector.html#link-pseudo-classes">link
5454
pseudo-class</A>, :hover.
5555

5656
<LI><A HREF="ui.html#system-colors">System colors</A>

‎css2/colors.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: colors.src,v 2.4 1998-02-21 00:05:52 ijacobs Exp $ -->
3+
<!-- $Id: colors.src,v 2.5 1998-02-24 00:55:29 ijacobs Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Colors and backgrounds</TITLE>
@@ -361,7 +361,7 @@ once per browser invocation thus:
361361

362362
<PRE>
363363
for i := 0 to 255 do
364-
raw := i / 255;
364+
raw := i / 255.0;
365365
corr := pow (raw, gamma);
366366
table[i] := trunc (0.5 + corr * 255.0)
367367
end

‎css2/conform.src‎

Lines changed: 6 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: conform.src,v 2.11 1998-02-21 04:06:00 ijacobs Exp $ -->
3+
<!-- $Id: conform.src,v 2.12 1998-02-24 00:55:33 ijacobs Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Conformance: requirements and recommendations</TITLE>
@@ -45,8 +45,8 @@ All valid level N-1 style sheets are valid level N style sheets. In
4545
particular, all valid CSS1 style sheets are valid CSS2 style sheets.
4646
A valid CSS2 style sheet must respect the <a
4747
href="grammar.html">grammar of CSS2</a> and the <a
48-
href="selector.html">selector syntax</a>. Furthermore, it must only
49-
contain at-rules, property names, and property values defined in this
48+
href="selector.html">selector syntax</a>. Furthermore, it must
49+
contain only at-rules, property names, and property values defined in this
5050
specification. An <span class="index-def"
5151
title="illegal"><dfn>illegal</dfn></span> or invalid
5252
at-rule, property name, or property value is one that is not valid.
@@ -60,7 +60,7 @@ document (e.g., HTML, XML, etc.).
6060

6161
<P>The primary syntactic constructs of the document language are
6262
called <span class="index-def"
63-
title="element"><em>elements,</em></span> (an SGML term, see [[ISO8879]]). Most CSS style sheet rules refer to
63+
title="element"><em>elements</em></span> (an SGML term, see [[ISO8879]]). Most CSS style sheet rules refer to
6464
these elements and specify rendering information for them. Examples
6565
of elements in HTML include "P" (for paragraphs), "TABLE"
6666
(for creating tables), "OL" (for creating ordered lists), etc.
@@ -104,7 +104,7 @@ only if B is the parent of A.
104104
title="sibling"><dfn>sibling</dfn></span> of an element B, if and only
105105
if B and A share the same parent element. Element A is a preceding
106106
sibling if it comes before B in the document tree. Element B is a
107-
following sibling if it comes after B in the document tree.
107+
following sibling if it comes after A in the document tree.
108108

109109
<P>An element A is called a <span class="index-def" title="preceding
110110
element"><a name="preceding"><dfn>preceding element</dfn></a></span>
@@ -173,7 +173,7 @@ may provide a personal style sheet that encodes personal
173173
preferences.
174174
</dd>
175175

176-
<dt><dfn><strong><a name="user-agent">User agent</a></strong></dfn>
176+
<dt><dfn><strong><a name="user-agent">User agent (UA)</a></strong></dfn>
177177
<dd>A <span class="index-def" title="user agent|UA">user
178178
agent</span> is any program that interprets a document written in
179179
the document language and applies associated style sheets according

‎css2/cover.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: cover.src,v 2.8 1998-02-19 23:27:59 howcome Exp $ -->
3+
<!-- $Id: cover.src,v 2.9 1998-02-24 00:55:36 ijacobs Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Cascading Style Sheets, Level 2</TITLE>
@@ -34,7 +34,7 @@ hspace="0"></a> _THE_ID_<br clear="all"></p>
3434

3535
<h2>Abstract</h2>
3636

37-
<p>This specification defines Cascading Style Sheet, level 2
37+
<p>This specification defines Cascading Style Sheets, level 2
3838
(CSS2). CSS2 is a style sheet language that allows authors and users
3939
to attach style (e.g. fonts, spacing and aural cues) to structured
4040
documents (e.g. HTML and XML). By separating the presentation style of

‎css2/css.dico‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Attika
2121
Automatique
2222
BA
2323
BASEFONT
24-
BB
2524
BDO
2625
BF
2726
BFF
@@ -191,7 +190,6 @@ IDENT
191190
IDs
192191
IEC
193192
IFRAME
194-
IJ
195193
IMG
196194
INFINIFONT
197195
IPA
@@ -428,7 +426,6 @@ WD
428426
WG
429427
WebFont
430428
WebFonts
431-
Webmasters
432429
WERB
433430
WERBEH
434431
Wexler
@@ -514,6 +511,7 @@ cline
514511
cmap
515512
co
516513
cockney
514+
codepoint
517515
cols
518516
colspan
519517
com
@@ -598,6 +596,7 @@ edu
598596
eg
599597
egt
600598
elementtypelist
599+
embeddings
601600
ems
602601
emsq
603602
equiv
@@ -792,6 +791,7 @@ polytonic
792791
poynton
793792
pre
794793
preformatted
794+
prepended
795795
prio
796796
propdef
797797
property's
@@ -863,6 +863,7 @@ stemh
863863
stemv
864864
stringchar
865865
subcode
866+
subproperties
866867
subtotal
867868
sync
868869
syndata
@@ -889,6 +890,7 @@ tokenizer
889890
tooltip
890891
topline
891892
tr
893+
transliterates
892894
trinoids
893895
truedoc
894896
truetype
@@ -925,6 +927,7 @@ visuren
925927
wav
926928
wd
927929
wg
930+
webmasters
928931
website
929932
whilst
930933
wil

‎css2/fonts.src‎

Lines changed: 4 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: fonts.src,v 2.15 1998-02-21 05:07:03 ijacobs Exp $ -->
3+
<!-- $Id: fonts.src,v 2.16 1998-02-24 00:55:41 ijacobs Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Fonts</TITLE>
@@ -231,8 +231,8 @@ space.
231231
<!-- need to check tw for traditional chinese as used in taiwan -->
232232

233233
<p>The * selects any element and the square brackets select elements
234-
which have the lang attribute set to Japanes or to Traditional Chinese
235-
and selects the appriopriate font
234+
which have the lang attribute set to Japanese or to Traditional Chinese
235+
and selects the appropriate font
236236

237237
</div>
238238
<DT><span class="index-def"
@@ -774,7 +774,7 @@ their initial values.
774774
</pre>
775775

776776
<p>If the font used for dropdown menus on a particular system
777-
happended to be 9-point Charcoal, with a weight of 600, then P
777+
happened to be 9-point Charcoal, with a weight of 600, then P
778778
elements which were descendents of BUTTON would be displayed as if
779779
this rule were in effect (the values for the remaining properties
780780
being taken from the initial values):

0 commit comments

Comments
 (0)