Skip to content

Commit 299b428

Browse files
bert-githubbert-github
committed
[css2] Replaced "CSS2" with "CSS2.1" everywhere, unless "CSS2" was meant.
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%401897
1 parent 7dccfd7 commit 299b428

17 files changed

Lines changed: 118 additions & 123 deletions

‎css2/about.src‎

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

44
<html lang="en">
5-
<!-- $Id: about.src,v 2.37 2002-07-08 14:57:50 bbos Exp $ -->
5+
<!-- $Id: about.src,v 2.38 2002-07-25 19:07:36 bbos Exp $ -->
66
<HEAD>
77
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
8-
<TITLE>About the CSS2.1 Specification</TITLE>
8+
<TITLE>About the CSS&nbsp;2.1 Specification</TITLE>
99
</HEAD>
1010
<BODY>
11-
<H1>About the CSS2.1 Specification</H1>
11+
<H1>About the CSS&nbsp;2.1 Specification</H1>
1212

1313
<h2>CSS&nbsp;2.1 vs CSS&nbsp;2</h2>
1414

@@ -21,7 +21,7 @@ gained.
2121

2222
<p>While many of these issues will be addressed by the upcoming CSS3
2323
specifications, the current state of affairs hinders the
24-
implementation and interoperability of CSS2. The CSS2.1 specification
24+
implementation and interoperability of CSS2. The CSS&nbsp;2.1 specification
2525
attempts to address this situation by:
2626

2727
<ul>
@@ -36,18 +36,18 @@ generally accepted practice.
3636

3737
<lI>Removing all CSS2 features which, by virtue of not having been
3838
implemented, have been rejected by the CSS community. Thus, compliant
39-
implementations of CSS2.1 need not be burdened with these constraints.
39+
implementations of CSS&nbsp;2.1 need not be burdened with these constraints.
4040

4141
<li>Removing CSS2 features that will be obsoleted by CSS3, thus
4242
encouraging adoption of the proposed CSS3 features in their place.
4343
</ul>
4444

4545
<p>Thus, while it is not the case that a CSS2 stylesheet is
46-
necessarily forwards-compatible with CSS2.1, it is the case that a
47-
stylesheet restricting itself to CSS2.1 features is more likely to
46+
necessarily forwards-compatible with CSS&nbsp;2.1, it is the case that a
47+
stylesheet restricting itself to CSS&nbsp;2.1 features is more likely to
4848
find a compliant user agent today and to preserve forwards
4949
compatibility in the future. While breaking forward compatibility is
50-
not desirable, we believe the advantages to the revisions in CSS2.1
50+
not desirable, we believe the advantages to the revisions in CSS&nbsp;2.1
5151
are worthwhile.
5252

5353
<h2>Reading the specification</h2>
@@ -75,11 +75,6 @@ numbers will not appear in the electronic version. In case of a
7575
discrepancy, the electronic version is considered the authoritative
7676
version of the document.
7777

78-
<p>For brevity, this specification is sometimes called CSS2 instead of
79-
CSS2.1. Unless explicitly stated, the name "CSS2" refers to this
80-
version of the specification and not to the version published in
81-
1998.</p>
82-
8378
<h2>How the specification is organized</h2>
8479

8580
<P>The specification is organized into the following sections:
@@ -91,10 +86,10 @@ version of the specification and not to the version published in
9186
<dd>The introduction includes a brief tutorial on CSS2 and
9287
a discussion of design principles behind CSS2.
9388

94-
<dt><strong>Sections 3 - 20: CSS2 reference manual.</strong>
89+
<dt><strong>Sections 3 - 20: CSS&nbsp;2.1 reference manual.</strong>
9590

96-
<dd>The bulk of the reference manual consists of the CSS2 language
97-
reference. This reference defines what may go into a CSS2 style sheet
91+
<dd>The bulk of the reference manual consists of the CSS&nbsp;2.1 language
92+
reference. This reference defines what may go into a CSS&nbsp;2.1 style sheet
9893
(syntax, properties, property values) and how user agents must
9994
interpret these style sheets in order to claim <a
10095
href="conform.html#conformance">conformance</a>.
@@ -105,7 +100,7 @@ href="conform.html#conformance">conformance</a>.
105100
<dd>Appendixes contain information about <a href="sample.html">a
106101
sample style sheet for HTML 4.0</a>, <a href="changes.html">changes
107102
from CSS1 </a>,
108-
<a href="grammar.html">the grammar of CSS2</a>,
103+
<a href="grammar.html">the grammar of CSS&nbsp;2.1</a>,
109104
a list of normative and informative <a href="refs.html">references</a>,
110105
and two indexes: one for
111106
<a href="propidx.html">properties</a> and one

‎css2/box.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: box.src,v 1.24 2002-07-05 22:19:35 bbos Exp $ -->
3+
<!-- $Id: box.src,v 1.25 2002-07-25 19:07:36 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Box model</TITLE>
@@ -273,7 +273,7 @@ that adjoining margins (no padding or border areas separate them) of
273273
two or more boxes (which may be next to one another or nested) combine
274274
to form a single margin.
275275

276-
<P>In CSS2, <span class="index-inst" title="horizontal
276+
<P>In CSS&nbsp;2.1, <span class="index-inst" title="horizontal
277277
margin|margin::horizontal">horizontal margins</span> never collapse.
278278

279279
<P><span class="index-inst" title="vertical margin|margin::vertical">

‎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.25 2002-07-15 11:39:41 bbos Exp $ -->
3+
<!-- $Id: changes.src,v 2.26 2002-07-25 19:07:36 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Appendix B: Changes</TITLE>
@@ -11,7 +11,7 @@
1111

1212
<H2>Changes from CSS2</H2>
1313

14-
<P>CSS2.1 is an updated version of CSS2. The changes between the CSS2
14+
<P>CSS&nbsp;2.1 is an updated version of CSS2. The changes between the CSS2
1515
specification (see [[CSS2]]) and this specification fall into four
1616
groups: known errors, typographical errors, clarifications, and
1717
changes.</P>

‎css2/conform.src‎

Lines changed: 10 additions & 10 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.48 2002-07-08 14:57:50 bbos Exp $ -->
3+
<!-- $Id: conform.src,v 2.49 2002-07-25 19:07:36 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Conformance: requirements and recommendations</TITLE>
@@ -10,7 +10,7 @@
1010

1111
<H2>Definitions</H2>
1212

13-
<p>In this section, we begin the formal specification of CSS2.1,
13+
<p>In this section, we begin the formal specification of CSS&nbsp;2.1,
1414
starting with the contract between authors, users, and implementors.
1515

1616
<P>The key words <span class="index-def" title="MUST">"MUST"</span>,
@@ -53,11 +53,11 @@ sheet">validity</span> of a style sheet depends on the level of CSS
5353
used for the style sheet. All valid CSS1 style sheets are valid CSS2
5454
style sheets, but some changes from CSS1 mean that
5555
a few CSS1 style sheets will have slightly different semantics in
56-
CSS2.1. Some features in CSS2 are not part of CSS2.1, so not all CSS2
57-
style sheets are valid CSS2.1 style sheets.
56+
CSS&nbsp;2.1. Some features in CSS2 are not part of CSS&nbsp;2.1, so not all CSS2
57+
style sheets are valid CSS&nbsp;2.1 style sheets.
5858

59-
<P>A valid CSS2.1 style sheet must be written according to the <a
60-
href="grammar.html">grammar of CSS2.1</a>. Furthermore, it must contain
59+
<P>A valid CSS&nbsp;2.1 style sheet must be written according to the <a
60+
href="grammar.html">grammar of CSS&nbsp;2.1</a>. Furthermore, it must contain
6161
only at-rules, property names, and property values defined in this
6262
specification. An <span class="index-def"
6363
title="illegal"><strong>illegal</strong></span> (invalid) at-rule,
@@ -100,7 +100,7 @@ intrinsic dimensions are found.
100100
dimensions"><a name="intrinsic">Intrinsic dimensions</a></span></strong>
101101

102102
<dd>The width and height as defined by the element itself, not imposed
103-
by the surroundings. In CSS2.1 it is assumed that all replaced
103+
by the surroundings. In CSS&nbsp;2.1 it is assumed that all replaced
104104
elements, and only replaced elements, come with intrinsic dimensions.
105105

106106
<dt><strong><span class="index-def" title="attribute"><a
@@ -253,7 +253,7 @@ end tags.
253253
<h2><a name="conformance">Conformance</a></h2>
254254

255255
<P>This section defines <span class="index-def"
256-
title="conformance">conformance</span> with the CSS2.1
256+
title="conformance">conformance</span> with the CSS&nbsp;2.1
257257
specification only. There may be other levels of CSS in the future
258258
that may require a user agent to implement a different set of features
259259
in order to conform.
@@ -263,7 +263,7 @@ claiming conformance to this specification:</P>
263263

264264
<ol>
265265

266-
<li>It must support one or more of the CSS2.1 <a href="media.html">media types</a>.
266+
<li>It must support one or more of the CSS&nbsp;2.1 <a href="media.html">media types</a>.
267267

268268
<li>For each source document, it must attempt to retrieve all
269269
associated style sheets that are appropriate for the supported media
@@ -273,7 +273,7 @@ it can retrieve.
273273

274274
<li>It must parse the style sheets according to this specification.
275275
In particular, it must recognize all at-rules, blocks, declarations,
276-
and selectors (see the <a href="grammar.html">grammar of CSS2.1</a>).
276+
and selectors (see the <a href="grammar.html">grammar of CSS&nbsp;2.1</a>).
277277
If a user agent encounters a property that applies for a supported
278278
media type, the user agent must parse the value according to the property
279279
definition. This means that the user agent must accept all valid

‎css2/fonts.src‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
22
"http://www.w3.org/TR/1998/REC-html40-19980424/loose.dtd">
33
<html lang="en">
4-
<!-- $Id: fonts.src,v 2.63 2002-07-08 22:52:59 bbos Exp $ -->
4+
<!-- $Id: fonts.src,v 2.64 2002-07-25 19:07:36 bbos Exp $ -->
55
<HEAD>
66
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
77
<TITLE>Fonts</TITLE>
@@ -36,7 +36,7 @@ presented to each of them).
3636

3737
<OL>
3838

39-
<LI>The User Agent makes (or accesses) a database of relevant CSS2.1
39+
<LI>The User Agent makes (or accesses) a database of relevant CSS&nbsp;2.1
4040
properties of all the fonts of which the UA is aware. The UA may be
4141
aware of a font because it has been installed locally or it has been
4242
previously downloaded over the web. If there are two fonts with
@@ -73,7 +73,7 @@ glyph from one of the font faces available to the UA.
7373
</OL>
7474

7575
<P>(The above algorithm can be optimized to avoid having to revisit
76-
the CSS2.1 properties for each character.)
76+
the CSS&nbsp;2.1 properties for each character.)
7777

7878
<P>The per-property matching rules from (2) above are as follows:
7979

@@ -207,7 +207,7 @@ proportions. The 'font-variant' property selects that font.
207207

208208
<P>A value of 'normal' selects a font that is not a small-caps font,
209209
'small-caps' selects a small-caps font. It is acceptable (but not
210-
required) in CSS2.1 if the small-caps font is a created by taking a
210+
required) in CSS&nbsp;2.1 if the small-caps font is a created by taking a
211211
normal font and replacing the lower case letters by scaled uppercase
212212
characters. As a last resort, uppercase letters will be used as
213213
replacement for a small-caps font.
@@ -222,7 +222,7 @@ em { font-style: oblique }
222222

223223
<P>There may be other variants in the font family as well, such as
224224
fonts with old-style numerals, small-caps numerals, condensed or
225-
expanded letters, etc. CSS2.1 has no properties that select those.
225+
expanded letters, etc. CSS&nbsp;2.1 has no properties that select those.
226226

227227
<P><EM>Note:</EM> insofar as this property causes text to be
228228
transformed to uppercase, the same considerations as for <A
@@ -264,7 +264,7 @@ a font that you might think of as being bold might be described as
264264
being <EM>Regular, Roman, Book, Medium, Semi-</EM> or <EM>DemiBold,
265265
Bold,</EM> or <EM>Black,</EM> depending on how black the "normal" face
266266
of the font is within the design. Because there is no standard usage
267-
of names, the weight property values in CSS2.1 are given on a numerical
267+
of names, the weight property values in CSS&nbsp;2.1 are given on a numerical
268268
scale in which the value '400' (or 'normal') corresponds to the
269269
"normal" text face for that family. The weight name associated with
270270
that face will typically be <EM>Book, Regular, Roman, Normal</EM> or

‎css2/generate.src‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ principal block box. Values have the following meanings:</p>
672672

673673
<dl>
674674
<dt><strong>outside</strong>
675-
<dd>The marker box is outside the principal block box. CSS2.1 does not specify the precise location
675+
<dd>The marker box is outside the principal block box. CSS&nbsp;2.1 does not specify the precise location
676676
of the marker box.
677677

678678
<dt><strong>inside</strong>

‎css2/grammar.src‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: grammar.src,v 2.23 2002-07-08 14:57:51 bbos Exp $ -->
3+
<!-- $Id: grammar.src,v 2.24 2002-07-25 19:07:37 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
6-
<TITLE>Appendix: grammar of CSS2</TITLE>
6+
<TITLE>Appendix: grammar of CSS&nbsp;2.1</TITLE>
77
</HEAD>
88
<BODY>
9-
<H1 align="center">Grammar of CSS2</H1>
9+
<H1 align="center">Grammar of CSS&nbsp;2.1</H1>
1010
<P><em>This appendix is normative.</em>
1111

12-
<P>The grammar below defines the syntax of CSS2. It is in some sense,
13-
however, a superset of CSS2 as this specification imposes additional
12+
<P>The grammar below defines the syntax of CSS&nbsp;2.1. It is in some sense,
13+
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">
1616
forward-compatible parsing rules</a>, the <a
@@ -28,7 +28,7 @@ find anything in the spec that corresponded. -->
2828
title="LL(1)">LL(1)</span> (but note that most UA's should not use it
2929
directly, since it doesn't express the <a
3030
href="syndata.html#parsing-errors">parsing conventions</a>, only the
31-
CSS2 syntax). The format of the productions is optimized for human
31+
CSS&nbsp;2.1 syntax). The format of the productions is optimized for human
3232
consumption and some shorthand notation beyond Yacc (see [[YACC]]) is
3333
used:</P>
3434

@@ -222,7 +222,7 @@ U\+{h}{1,6}-{h}{1,6} {return UNICODERANGE;}
222222
. {return *yytext;}
223223
</pre>
224224

225-
<h2><a name="tokenizer-diffs">Comparison of tokenization in CSS2 and
225+
<h2><a name="tokenizer-diffs">Comparison of tokenization in CSS&nbsp;2.1 and
226226
CSS1</a></h2>
227227

228228
<p>There are some differences in the syntax specified in the CSS1
@@ -234,7 +234,7 @@ syntax. They are explained below.
234234

235235
<ul>
236236
<li>CSS1 style sheets could only be in 1-byte-per-character
237-
encodings, such as ASCII and ISO-8859-1. CSS2 has no such
237+
encodings, such as ASCII and ISO-8859-1. CSS&nbsp;2.1 has no such
238238
limitation. In practice, there was little difficulty in extrapolating
239239
the CSS1 tokenizer, and some UAs have accepted 2-byte encodings.
240240

‎css2/intro.src‎

Lines changed: 14 additions & 14 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: intro.src,v 2.37 2002-07-08 14:57:51 bbos Exp $ -->
3+
<!-- $Id: intro.src,v 2.38 2002-07-25 19:07:37 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
6-
<TITLE>Introduction to CSS2</TITLE>
6+
<TITLE>Introduction to CSS&nbsp;2.1</TITLE>
77
</HEAD>
88
<BODY>
9-
<H1 align="center">Introduction to CSS2</H1>
9+
<H1 align="center">Introduction to CSS&nbsp;2.1</H1>
1010

11-
<H2>A brief CSS2 tutorial for HTML</H2>
11+
<H2>A brief CSS&nbsp;2.1 tutorial for HTML</H2>
1212

1313
<P> In this tutorial, we show how easy it can be to design simple
1414
style sheets. For this tutorial, you will need to know a little HTML
@@ -125,7 +125,7 @@ but the second rule overrides the inherited value. In CSS there are
125125
often such conflicts between different values, and this specification
126126
describes how to resolve them.
127127

128-
<P>CSS2 has more than 100 different properties, including <span
128+
<P>CSS&nbsp;2.1 has more than 100 different properties, including <span
129129
class="propinst-color">'color'</span>. Let's look at some of the
130130
others:
131131

@@ -171,7 +171,7 @@ to its surroundings. The "em" unit refers to the font size of the
171171
element. In this case the result is that the margins around the BODY
172172
element are three times wider than the font size.
173173

174-
<H2>A brief CSS2 tutorial for XML</H2>
174+
<H2>A brief CSS&nbsp;2.1 tutorial for XML</H2>
175175

176176
<P>CSS can be used with any structured document format, for example
177177
with applications of the eXtensible Markup Language [[-XML10]]. In
@@ -257,7 +257,7 @@ ARTICLE, HEADLINE, AUTHOR, PARA { margin: 0.5em }
257257
improve the presentation of the document.
258258

259259

260-
<H2><a name="processing-model">The CSS2 processing model</a></H2>
260+
<H2><a name="processing-model">The CSS&nbsp;2.1 processing model</a></H2>
261261

262262
<P>This section presents one possible model of how user
263263
agents that support CSS work. This is only a conceptual model; real
@@ -339,9 +339,9 @@ viewport</a>. User agents rendering to a page generally impose
339339
width and height constraints. Aural user agents may impose limits
340340
in audio space, but not in time.
341341

342-
<h3>CSS2 addressing model</h3>
342+
<h3>CSS&nbsp;2.1 addressing model</h3>
343343

344-
<P> CSS2 <a href="selector.html">selectors</a> and properties allow
344+
<P> CSS&nbsp;2.1 <a href="selector.html">selectors</a> and properties allow
345345
style sheets to refer to the following parts of a document
346346
or user agent:</p>
347347

@@ -369,14 +369,14 @@ interface</a>).
369369

370370
<H2>CSS design principles</H2>
371371

372-
<P>CSS2.1, as CSS2 and CSS1 before it, is based on a set of design principles:</p>
372+
<P>CSS&nbsp;2.1, as CSS2 and CSS1 before it, is based on a set of design principles:</p>
373373

374374
<UL>
375375

376376
<LI>
377-
<P><STRONG>Forward and backward compatibility</STRONG>. CSS2 user
377+
<P><STRONG>Forward and backward compatibility</STRONG>. CSS&nbsp;2.1 user
378378
agents will be able to understand CSS1 style sheets. CSS1 user agents
379-
will be able to read CSS2 style sheets and discard parts they don't
379+
will be able to read CSS&nbsp;2.1 style sheets and discard parts they don't
380380
understand. Also, user agents with no CSS support will be able to
381381
display style-enhanced documents. Of course, the stylistic
382382
enhancements made possible by CSS will not be rendered, but all
@@ -395,7 +395,7 @@ change the style sheet with little or no impact on the markup.</P>
395395
<P><STRONG>Vendor, platform, and device independence</STRONG>. Style
396396
sheets enable documents to remain vendor, platform, and device
397397
independent. Style sheets themselves are also vendor and platform
398-
independent, but CSS2 allows you to target a style sheet for a group of
398+
independent, but CSS&nbsp;2.1 allows you to target a style sheet for a group of
399399
devices (e.g., printers).</P>
400400
</LI>
401401

@@ -436,7 +436,7 @@ rendering effects increases the richness of the Web as a medium of
436436
expression. Designers have been longing for functionality commonly
437437
found in desktop publishing and slide-show applications. Some of
438438
the requested rendering effects conflict with device independence, but
439-
CSS2 goes a long way toward granting designers their requests.</P>
439+
CSS&nbsp;2.1 goes a long way toward granting designers their requests.</P>
440440
</LI>
441441

442442
<LI>

0 commit comments

Comments
 (0)