Skip to content

Commit 0eec0c7

Browse files
bert-githubbert-github
committed
[css2] Some issues edited
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402351
1 parent 858a38e commit 0eec0c7

16 files changed

Lines changed: 141 additions & 80 deletions

‎css2/about.src‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.01//EN'>
22

33
<html lang="en">
4-
<!-- $Id: about.src,v 2.64 2005-08-27 10:17:51 ihickson Exp $ -->
4+
<!-- $Id: about.src,v 2.65 2005-09-13 19:16:22 bbos Exp $ -->
55
<HEAD>
66
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
77
<TITLE>About the CSS&nbsp;2.1 Specification</TITLE>
@@ -34,7 +34,7 @@ specification, modifying the specification to be in accordance with
3434
generally accepted practice.
3535

3636
<li>Removing CSS2 features which, by virtue of not having been
37-
implemented, have been rejected by the CSS community. CSS2.1 aims to
37+
implemented, have been rejected by the CSS community. CSS&nbsp;2.1 aims to
3838
reflect what CSS features are reasonably widely implemented for HTML
3939
and XML languages in general (rather than <em>only</em> for a
4040
particular XML language, or <em>only</em> for HTML).
@@ -47,9 +47,9 @@ property values,</a> when implementation experience has shown that
4747
they are needed for implementing CSS2.
4848
</ul>
4949

50-
<p>Thus, while it is not the case that a CSS2 stylesheet is
50+
<p>Thus, while it is not the case that a CSS2 style sheet is
5151
necessarily forwards-compatible with CSS&nbsp;2.1, it is the case that a
52-
stylesheet restricting itself to CSS&nbsp;2.1 features is more likely to
52+
style sheet restricting itself to CSS&nbsp;2.1 features is more likely to
5353
find a compliant user agent today and to preserve forwards
5454
compatibility in the future. While breaking forward compatibility is
5555
not desirable, we believe the advantages to the revisions in CSS&nbsp;2.1
@@ -93,10 +93,10 @@ version of the document.
9393

9494
<dl>
9595

96-
<dt><Strong>Section 2: An introduction to CSS2.1</strong>
96+
<dt><Strong>Section 2: An introduction to CSS&nbsp;2.1</strong>
9797

98-
<dd>The introduction includes a brief tutorial on CSS2.1 and
99-
a discussion of design principles behind CSS2.1.
98+
<dd>The introduction includes a brief tutorial on CSS&nbsp;2.1 and
99+
a discussion of design principles behind CSS&nbsp;2.1.
100100

101101
<dt><strong>Sections 3 - 20: CSS&nbsp;2.1 reference manual.</strong>
102102

@@ -379,7 +379,7 @@ helped proofread this document.</p>
379379

380380
<p>In addition, we would like to extend special thanks to fantasai,
381381
Ada Chan, and Boris Zbarsky, who have contributed significant
382-
time to CSS2.1, and to Kimberly Blessing, for help with the
382+
time to CSS&nbsp;2.1, and to Kimberly Blessing, for help with the
383383
editing.</p>
384384

385385

‎css2/cascade.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.01//EN">
22
<html lang="en">
3-
<!-- $Id: cascade.src,v 2.54 2005-08-27 09:25:58 ihickson Exp $ -->
3+
<!-- $Id: cascade.src,v 2.55 2005-09-13 19:16:22 bbos 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>
@@ -443,7 +443,7 @@ handled in the user agent style sheet.
443443

444444
<div class="example">
445445

446-
<p>The following user stylesheet would override the font weight of
446+
<p>The following user style sheet would override the font weight of
447447
'b' elements in all documents, and the color of 'font'
448448
elements with color attributes in XML documents. It would not affect
449449
the color of any 'font' elements with color attributes in HTML

‎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.01//EN">
22
<html lang="en">
3-
<!-- $Id: changes.src,v 2.48 2005-08-28 21:19:29 ihickson Exp $ -->
3+
<!-- $Id: changes.src,v 2.49 2005-09-13 19:16:22 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Changes</TITLE>
@@ -9,7 +9,7 @@
99
<H1>Changes</H1>
1010
<P><em>This appendix is informative, not normative.</em></P>
1111

12-
<P>CSS&nbsp;2.1 is an updated version of CSS2. The changes between the
12+
<P>CSS&nbsp;2.1 is an updated revision of CSS2. The changes between the
1313
CSS2 specification (see [[CSS2]]) and this specification fall into
1414
five groups: known errors, typographical errors, clarifications,
1515
changes and additions. Typographical errors are not listed here.</P>

‎css2/conform.src‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: conform.src,v 2.66 2005-08-28 20:34:20 ihickson Exp $ -->
3+
<!-- $Id: conform.src,v 2.67 2005-09-13 19:16:22 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Conformance: requirements and recommendations</TITLE>
@@ -163,7 +163,19 @@ sub-elements.
163163

164164
<dt><strong><span class="index-def" title="ignore">Ignore</span></strong>
165165

166-
<dd>This term has two slightly different meanings this specification. First, a CSS parser must follow certain rules when it discovers unknown or illegal syntax in a style sheet. The parser must then ignore certain parts of the style sheets. The exact rules for what parts must be ignored is given in these section: <a href="syndata.html#declaration">Declarations and properties</a>, <a href="syndata.html#parsing-errors">Rules for handling parsing errors</a>, <a href="syndata.html#unsupportedvalues">Unsupported Values</a>, or may be explained in the text where the term "ignore" appears. Second, a user agent may (and, in some cases must) disregard certain properties or values in the style sheet even if the syntax is legal. For example, table-column-group elements cannot have borders around them, so the border properties must be ignored.
166+
<dd>This term has two slightly different meanings in this
167+
specification. First, a CSS parser must follow certain rules when it
168+
discovers unknown or illegal syntax in a style sheet. The parser must
169+
then ignore certain parts of the style sheets. The exact rules for
170+
what parts must be ignored is given in these section: <a
171+
href="syndata.html#declaration">Declarations and properties</a>, <a
172+
href="syndata.html#parsing-errors">Rules for handling parsing
173+
errors</a>, <a href="syndata.html#unsupportedvalues">Unsupported
174+
Values</a>, or may be explained in the text where the term "ignore"
175+
appears. Second, a user agent may (and, in some cases must) disregard
176+
certain properties or values in the style sheet even if the syntax is
177+
legal. For example, table-column elements can't affect the font of the
178+
column, so the font properties must be ignored.
167179

168180

169181
<dt><strong><span class="index-def" title="rendered
@@ -377,7 +389,7 @@ specifying files are exempted from this requirement. Additionally, UAs
377389
may offer other means to specify user preferences, for example through
378390
a GUI.
379391

380-
<p>CSS2.1 does not define which properties apply to form controls and
392+
<p>CSS&nbsp;2.1 does not define which properties apply to form controls and
381393
frames, or how CSS can be used to style them. User agents may apply CSS
382394
properties to these elements. Authors are recommended to treat such
383395
support as experimental. A future level of CSS may specify this further.

‎css2/generate.src‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,25 +115,25 @@ boxes, such as run-in boxes, as if they were real elements inserted just
115115
inside their associated element.</p>
116116

117117
<div class="example">
118-
<p>For example, the following document fragment and stylesheet:</p>
118+
<p>For example, the following document fragment and style sheet:</p>
119119
<pre>
120120
&lt;h2> Header &lt;/h2> h2 { display: run-in; }
121121
&lt;p> Text &lt;/p> p:before { display: block; content: 'Some'; }
122122
</pre>
123123
<p>...would render in exactly the same way as the following document
124-
fragment and stylesheet:</p>
124+
fragment and style sheet:</p>
125125
<pre>
126126
&lt;h2> Header &lt;/h2> h2 { display: run-in; }
127127
&lt;p>&lt;span>Some&lt;/span> Text &lt;/p> span { display: block }
128128
</pre>
129-
<p>Similarly, the following document fragment and stylesheet:</p>
129+
<p>Similarly, the following document fragment and style sheet:</p>
130130
<pre>
131131
&lt;h2> Header &lt;/h2> h2 { display: run-in; }
132132
h2:after { display: block; content: 'Thing'; }
133133
&lt;p> Text &lt;/p>
134134
</pre>
135135
<p>...would render in exactly the same way as the following document
136-
fragment and stylesheet:</p>
136+
fragment and style sheet:</p>
137137
<pre>
138138
&lt;h2> Header &lt;span>Thing&lt;/span>&lt;/h2> h2 { display: block; }
139139
span { display: block; }
@@ -433,7 +433,7 @@ which inserts nothing, but increments the quotation depth by one.
433433
<h2>Automatic <span class="index-def" title="counters"><a
434434
name="counters">counters</a></span> and numbering</h2>
435435

436-
<p>Automatic numbering in CSS2.1 is controlled with two properties,
436+
<p>Automatic numbering in CSS&nbsp;2.1 is controlled with two properties,
437437
<span class="propinst-counter-increment">'counter-increment'</span>
438438
and <span class="propinst-counter-reset">'counter-reset'</span>. The
439439
counters defined by these properties are used with the counter() and
@@ -461,6 +461,9 @@ is 0.
461461
"Chapter 1", "1.1", "1.2", etc.
462462

463463
<pre>
464+
BODY {
465+
counter-reset: chapter; /* Create a chapter counter scope */
466+
}
464467
H1:before {
465468
content: "Chapter " counter(chapter) ". ";
466469
counter-increment: chapter; /* Add 1 to chapter */
@@ -657,6 +660,20 @@ H2.secret {counter-increment: count2; display: none}
657660
</pre>
658661
</div>
659662

663+
<p>Pseudo-elements that are not generated also cannot increment or
664+
reset a counter.
665+
666+
<div class="example">
667+
<p>For example, the following does not increment 'heading':
668+
669+
<pre>
670+
h1::before {
671+
content: normal;
672+
counter-increment: heading;
673+
}
674+
</pre>
675+
</div>
676+
660677
<p>Elements with <span class="propinst-visibility">'visibility'</span>
661678
set to 'hidden', on the other hand, <em>do</em> increment counters.
662679

‎css2/media.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.01//EN">
22
<html lang="en">
3-
<!-- $Id: media.src,v 2.36 2005-08-27 09:25:58 ihickson Exp $ -->
3+
<!-- $Id: media.src,v 2.37 2005-09-13 19:16:22 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Media types</TITLE>
@@ -190,7 +190,7 @@ class="index-inst" title="@media">@media</span>.
190190

191191
<div class="note"><P>
192192
<em><strong>Note.</strong>
193-
Future versions of CSS may extend the list of media types. Authors
193+
Future updates of CSS may extend the list of media types. Authors
194194
should not rely on media type names that are not yet defined
195195
by a CSS specification.
196196
</em>

‎css2/properties/properties.db‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,10 @@ leftwards | rightwards | inherit;;
947947
no;;
948948
N/A;;
949949
all;;
950-
for URI values, the absolute URI; for attr() values, the resulting string; otherwise as specified
950+
On elements, always computes to 'normal'. On :before and :after, if
951+
'normal' is specified, computes to 'none'. Otherwise, for URI
952+
values, the absolute URI; for attr() values, the resulting string;
953+
for other keywords, as specified.
951954
*/
952955

953956
/* quotes;;

‎css2/refs.src‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: refs.src,v 2.35 2005-08-27 09:25:58 ihickson Exp $ -->
3+
<!-- $Id: refs.src,v 2.36 2005-09-13 19:16:22 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Bibliography</TITLE>
@@ -144,8 +144,13 @@ http://www.w3.org/TR/2002/REC-UAAG10-20021217</a>
144144
<dt><strong><a name="ref-UNICODE" class="normref">[UNICODE]</a></strong>
145145
<dd>The Unicode Consortium. The Unicode Standard, Version 4.0.0,
146146
defined by: The Unicode Standard, Version 4.0 (Boston, MA,
147-
Addison-Wesley, 2003. ISBN 0-321-18578-1)<br> Available at <a
148-
href="http://www.unicode.org/versions/Unicode4.0.0/">
147+
Addison-Wesley, 2003. ISBN 0-321-18578-1) as updated from time to time
148+
by the publication of new versions. (See <a
149+
href="http://www.unicode.org/unicode/standard/versions">
150+
http://www.unicode.org/unicode/standard/versions</a> for the latest
151+
version and additional information on versions of the standard and of
152+
the Unicode Character Database).<br>
153+
Available at <a href="http://www.unicode.org/versions/Unicode4.0.0/">
149154
http://www.unicode.org/versions/Unicode4.0.0/</a>
150155

151156
<DT><STRONG><A name="ref-URI" class="normref">[URI]</A></STRONG></DT>

‎css2/selector.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.01//EN'>
22
<html lang="en">
3-
<!-- $Id: selector.src,v 2.96 2005-08-27 20:07:45 ihickson Exp $ -->
3+
<!-- $Id: selector.src,v 2.97 2005-09-13 19:16:22 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Selectors</title>
@@ -838,7 +838,7 @@ a.external:visited { color: blue }
838838
will cause it to be blue.
839839
</div>
840840

841-
<p class=note>Note. It is possible for stylesheet authors to abuse the
841+
<p class=note>Note. It is possible for style sheet authors to abuse the
842842
:link and :visited pseudo-classes to determine which sites a user has
843843
visited without the user's consent.
844844

0 commit comments

Comments
 (0)