Skip to content

Commit 50fe474

Browse files
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402945
1 parent b5356f5 commit 50fe474

10 files changed

Lines changed: 84 additions & 80 deletions

File tree

css2/about.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,7 @@ <H2>1.5 <a name="acknowledgements">Acknowledgments</a></H2>
473473
<span class=vcard><span class="fn">Vadim Plessky</span></span>, and the
474474
<span class=vcard><span class="fn org">Open eBook Publication Structure Working Group</span></span>
475475
Editors. We would also like to thank
476+
<span class=vcard><span class="fn">Gary Schnabl</span></span>,
476477
<span class=vcard><span class="fn">Glenn Adams</span></span> and
477478
<span class=vcard><span class="fn">Susan Lesch</span></span>
478479
who helped proofread this document.</p>

css2/conform.html

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ <H2>3.1 <a name="defs">Definitions</a></H2>
7979
<div class=note><p>Notes start with the word "Note," are indented and
8080
shown in green, like this paragraph.</p></div>
8181

82-
<p>Figures are for illustration only, they are not reference
82+
<p>Figures are for illustration only. They are not reference
8383
renderings, unless explicitly stated.
8484

8585
<dl>
@@ -132,7 +132,7 @@ <H2>3.1 <a name="defs">Definitions</a></H2>
132132
<dt><strong><span class="index-def" title="document language"><a
133133
name="doclanguage">Document language</a></span></strong>
134134

135-
<dd>The encoding language of the source document (e.g., HTML, XHTML or
135+
<dd>The encoding language of the source document (e.g., HTML, XHTML, or
136136
SVG). CSS is used to describe the presentation of document languages
137137
and CSS does not change the underlying semantics of the document
138138
languages.
@@ -157,7 +157,7 @@ <H2>3.1 <a name="defs">Definitions</a></H2>
157157
and an intrinsic ratio. For example, a bitmap image has an intrinsic
158158
width and an intrinsic height specified in absolute units (from which
159159
the intrinsic ratio can obviously be determined). On the other hand,
160-
other documents may not have any intrinsic dimensions (for example a
160+
other documents may not have any intrinsic dimensions (for example, a
161161
blank HTML document).
162162

163163
<p>User agents may consider a replaced element to not have any
@@ -203,14 +203,14 @@ <H2>3.1 <a name="defs">Definitions</a></H2>
203203
specification. First, a CSS parser must follow certain rules when it
204204
discovers unknown or illegal syntax in a style sheet. The parser must
205205
then ignore certain parts of the style sheets. The exact rules for
206-
what parts must be ignored is given in these section: <a
207-
href="syndata.html#declaration">Declarations and properties</a>, <a
206+
which parts must be ignored are described in these sections (<a
207+
href="syndata.html#declaration">Declarations and properties,</a> <a
208208
href="syndata.html#parsing-errors">Rules for handling parsing
209-
errors</a>, <a href="syndata.html#unsupported-values">Unsupported
210-
Values</a>, or may be explained in the text where the term "ignore"
209+
errors,</a> <a href="syndata.html#unsupported-values">Unsupported
210+
Values</a>) or may be explained in the text where the term "ignore"
211211
appears. Second, a user agent may (and, in some cases must) disregard
212-
certain properties or values in the style sheet even if the syntax is
213-
legal. For example, table-column elements can't affect the font of the
212+
certain properties or values in the style sheet, even if the syntax is
213+
legal. For example, table-column elements cannot affect the font of the
214214
column, so the font properties must be ignored.
215215

216216

@@ -315,10 +315,10 @@ <H2>3.1 <a name="defs">Definitions</a></H2>
315315

316316
<dd>CSS defines a finite set of parameters, called properties, that
317317
direct the rendering of a document. Each property has a name (e.g.,
318-
'color', 'font' or border') and a value (e.g., 'red', '12pt Times' or
318+
'color', 'font', or border') and a value (e.g., 'red', '12pt Times', or
319319
'dotted'). Properties are attached to various parts of the document
320320
and to the page on which the document is to be displayed by the
321-
mechanisms of specificity, cascading and inheritance (see the chapter
321+
mechanisms of specificity, cascading, and inheritance (see the chapter
322322
on <a href="cascade.html">Assigning property values, Cascading, and
323323
Inheritance</a>).
324324

@@ -440,7 +440,7 @@ <h2>3.2 <a name="conformance">UA Conformance</a></h2>
440440
<p>UAs must allow users to specify a file that contains the user style
441441
sheet. UAs that run on devices without any means of writing or
442442
specifying files are exempted from this requirement. Additionally, UAs
443-
may offer other means to specify user preferences, for example through
443+
may offer other means to specify user preferences, for example, through
444444
a GUI.
445445

446446
<p>CSS&nbsp;2.1 does not define which properties apply to form controls and

css2/css2.html

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<title>Cascading Style Sheets Level 2 Revision 1 (CSS&nbsp;2.1) Specification</title>
66
<link rel="stylesheet" href="style/default.css" type="text/css">
7-
<link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-CR.css" type="text/css">
7+
<link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-MO.css" type="text/css">
88
<link rel="next" href="about.html">
99
<link rel="contents" href="cover.html#minitoc">
1010
<link rel="CSS-properties" href="propidx.html" title="properties">
@@ -20,18 +20,18 @@
2020
src="http://www.w3.org/Icons/w3c_home" width="72"></a>
2121

2222
<h1 id="title">Cascading Style Sheets Level 2 Revision 1 (CSS&nbsp;2.1) Specification</h1>
23-
<h2 id="W3C-doctype">W3C Candidate Recommendation 23 April 2009</h2>
23+
<h2 id="W3C-doctype">W3C Member-only Draft DD MMMMM YYYY</h2>
2424

2525
<dl>
2626
<dt>This version:
27-
<dd><a href="http://www.w3.org/TR/2009/CR-CSS2-20090423">
28-
http://www.w3.org/TR/2009/CR-CSS2-20090423</a>
27+
<dd><a href="http://www.w3.org/TR/YYYY/MO-CSS2-YYYYMMDD">
28+
http://www.w3.org/TR/YYYY/MO-CSS2-YYYYMMDD</a>
2929
<dt>Latest version:
3030
<dd><a href="http://www.w3.org/TR/CSS2">
3131
http://www.w3.org/TR/CSS2</a>
3232
<dt>Previous versions:
33-
<dd><a href="http://www.w3.org/TR/2007/CR-CSS21-20070719">
34-
http://www.w3.org/TR/2007/CR-CSS21-20070719</a>
33+
<dd><a href="http://www.w3.org/TR/2009/CR-CSS2-20090423">
34+
http://www.w3.org/TR/2009/CR-CSS2-20090423</a>
3535
<dd><a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/">
3636
http://www.w3.org/TR/2008/REC-CSS2-20080411/</a>
3737
<dt>Editors:
@@ -50,7 +50,7 @@ <h2 id="W3C-doctype">W3C Candidate Recommendation 23 April 2009</h2>
5050
</dl>
5151

5252
<p>Please refer to the <a
53-
href="http://www.w3.org/Style/css2-updates/CR-CSS2-20090423-errata.html"><strong>
53+
href="http://www.w3.org/Style/css2-updates/MO-CSS2-YYYYMMDD-errata.html"><strong>
5454
errata</strong></a> for this document.
5555

5656
<p>This document is also available in these non-normative formats:
@@ -1611,6 +1611,7 @@ <H2>1.5 <a name="acknowledgements">Acknowledgments</a></H2>
16111611
<span class=vcard><span class="fn">Vadim Plessky</span></span>, and the
16121612
<span class=vcard><span class="fn org">Open eBook Publication Structure Working Group</span></span>
16131613
Editors. We would also like to thank
1614+
<span class=vcard><span class="fn">Gary Schnabl</span></span>,
16141615
<span class=vcard><span class="fn">Glenn Adams</span></span> and
16151616
<span class=vcard><span class="fn">Susan Lesch</span></span>
16161617
who helped proofread this document.</p>
@@ -1682,7 +1683,7 @@ <H2>2.1 <a name="html-tutorial">A brief CSS&nbsp;2.1 tutorial for HTML</a></H2>
16821683
influence only one of the properties needed for rendering an HTML
16831684
document, it qualifies as a style sheet on its own. Combined with
16841685
other style sheets (one fundamental feature of CSS is that style
1685-
sheets are combined) it will determine the final presentation of the
1686+
sheets are combined), the rule will determine the final presentation of the
16861687
document.
16871688

16881689
<P> The HTML 4 specification defines how style sheet rules may be
@@ -1848,8 +1849,8 @@ <H2>2.2 <a name="xml-tutorial">A brief CSS&nbsp;2.1 tutorial for XML</a></H2>
18481849
<P>The first rule declares INSTRUMENT to be inline and the second
18491850
rule, with its comma-separated list of selectors, declares all the
18501851
other elements to be block-level. Element names in XML are
1851-
case-sensitive, so a selector written in lowercase (e.g. 'instrument')
1852-
is different from uppercase (e.g. 'INSTRUMENT').
1852+
case-sensitive, so a selector written in lowercase (e.g., 'instrument')
1853+
is different from uppercase (e.g., 'INSTRUMENT').
18531854

18541855
<P>One way of linking a style sheet to an XML document is to use
18551856
a processing instruction:
@@ -2182,7 +2183,7 @@ <H2>3.1 <a name="defs">Definitions</a></H2>
21822183
<div class=note><p>Notes start with the word "Note," are indented and
21832184
shown in green, like this paragraph.</p></div>
21842185

2185-
<p>Figures are for illustration only, they are not reference
2186+
<p>Figures are for illustration only. They are not reference
21862187
renderings, unless explicitly stated.
21872188

21882189
<dl>
@@ -2235,7 +2236,7 @@ <H2>3.1 <a name="defs">Definitions</a></H2>
22352236
<dt><strong><span class="index-def" title="document language"><a
22362237
name="doclanguage">Document language</a></span></strong>
22372238

2238-
<dd>The encoding language of the source document (e.g., HTML, XHTML or
2239+
<dd>The encoding language of the source document (e.g., HTML, XHTML, or
22392240
SVG). CSS is used to describe the presentation of document languages
22402241
and CSS does not change the underlying semantics of the document
22412242
languages.
@@ -2260,7 +2261,7 @@ <H2>3.1 <a name="defs">Definitions</a></H2>
22602261
and an intrinsic ratio. For example, a bitmap image has an intrinsic
22612262
width and an intrinsic height specified in absolute units (from which
22622263
the intrinsic ratio can obviously be determined). On the other hand,
2263-
other documents may not have any intrinsic dimensions (for example a
2264+
other documents may not have any intrinsic dimensions (for example, a
22642265
blank HTML document).
22652266

22662267
<p>User agents may consider a replaced element to not have any
@@ -2306,14 +2307,14 @@ <H2>3.1 <a name="defs">Definitions</a></H2>
23062307
specification. First, a CSS parser must follow certain rules when it
23072308
discovers unknown or illegal syntax in a style sheet. The parser must
23082309
then ignore certain parts of the style sheets. The exact rules for
2309-
what parts must be ignored is given in these section: <a
2310-
href="syndata.html#declaration">Declarations and properties</a>, <a
2310+
which parts must be ignored are described in these sections (<a
2311+
href="syndata.html#declaration">Declarations and properties,</a> <a
23112312
href="syndata.html#parsing-errors">Rules for handling parsing
2312-
errors</a>, <a href="syndata.html#unsupported-values">Unsupported
2313-
Values</a>, or may be explained in the text where the term "ignore"
2313+
errors,</a> <a href="syndata.html#unsupported-values">Unsupported
2314+
Values</a>) or may be explained in the text where the term "ignore"
23142315
appears. Second, a user agent may (and, in some cases must) disregard
2315-
certain properties or values in the style sheet even if the syntax is
2316-
legal. For example, table-column elements can't affect the font of the
2316+
certain properties or values in the style sheet, even if the syntax is
2317+
legal. For example, table-column elements cannot affect the font of the
23172318
column, so the font properties must be ignored.
23182319

23192320

@@ -2418,10 +2419,10 @@ <H2>3.1 <a name="defs">Definitions</a></H2>
24182419

24192420
<dd>CSS defines a finite set of parameters, called properties, that
24202421
direct the rendering of a document. Each property has a name (e.g.,
2421-
'color', 'font' or border') and a value (e.g., 'red', '12pt Times' or
2422+
'color', 'font', or border') and a value (e.g., 'red', '12pt Times', or
24222423
'dotted'). Properties are attached to various parts of the document
24232424
and to the page on which the document is to be displayed by the
2424-
mechanisms of specificity, cascading and inheritance (see the chapter
2425+
mechanisms of specificity, cascading, and inheritance (see the chapter
24252426
on <a href="cascade.html">Assigning property values, Cascading, and
24262427
Inheritance</a>).
24272428

@@ -2543,7 +2544,7 @@ <h2>3.2 <a name="conformance">UA Conformance</a></h2>
25432544
<p>UAs must allow users to specify a file that contains the user style
25442545
sheet. UAs that run on devices without any means of writing or
25452546
specifying files are exempted from this requirement. Additionally, UAs
2546-
may offer other means to specify user preferences, for example through
2547+
may offer other means to specify user preferences, for example, through
25472548
a GUI.
25482549

25492550
<p>CSS&nbsp;2.1 does not define which properties apply to form controls and
@@ -2830,7 +2831,7 @@ <h3>4.1.3 <a name="characters">Characters and case</a></h3>
28302831
<ul>
28312832
<li> All CSS syntax is <a name="x1"><span class="index-inst" title="case
28322833
sensitivity">case-insensitive</span></a> within the ASCII
2833-
range (i.e. [a-z] and [A-Z] are equivalent), except for parts that are
2834+
range (i.e., [a-z] and [A-Z] are equivalent), except for parts that are
28342835
not under the control of CSS. For example, the case-sensitivity of
28352836
values of the HTML attributes "id" and "class", of font names, and
28362837
of URIs lies outside the scope of this specification. Note in
@@ -2864,7 +2865,7 @@ <h3>4.1.3 <a name="characters">Characters and case</a></h3>
28642865
</p>
28652866
<p>Second, it cancels the meaning of special CSS characters.
28662867
Except within CSS comments, any character (except a
2867-
hexadecimal digit, linefeed, carriage return or form feed)
2868+
hexadecimal digit, linefeed, carriage return, or form feed)
28682869
can be escaped
28692870
with a backslash to remove its special meaning.
28702871
For example, <samp>"\""</samp> is a string consisting of one

css2/diffs-rec/about.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -473,9 +473,10 @@ <H2> <del>1.4</del><ins>1.5</ins> <a name="acknowledgements">Acknowledgments</a>
473473
<span class=vcard><span class="fn"><ins>Vadim Plessky</ins></span></span><ins>,</ins> and <del>Jason White.</del>the
474474
<span class=vcard><span class="fn org"> <del>discussions on www-style@w3.org have been influential in many key issues for CSS. Especially,</del><ins>Open eBook Publication Structure Working Group</ins></span></span>
475475
<ins>Editors.</ins> We would <ins>also</ins> like to thank
476-
<span class=vcard><span class="fn"> <del>Bjorn Backlund, Todd Fahrner, Lars Marius Garshol, Sue Jordan, Ian Hickson, Susan Lesch, Andrew Marshall, MegaZone, Eric Meyer, Russell O'Connor, David Perrell, Liam Quinn, Jon Seymour, Neil St. Laurent, Taylor, Brian Wilson, and Chris Wilson for their participation. Many thanks to the Web Accessibility Initiative Protocols</del><ins>Glenn Adams</ins></span></span> and
477-
<span class=vcard><span class="fn"> <del>Formats Technical Review Working Group (WAI PF) for helping to improve the accessibility of CSS2. Many thanks to Philippe Le H&eacute;garet, whose CSS validator</del><ins>Susan Lesch</ins></span></span>
478-
<ins>who</ins> helped <del>ensure correct examples and a sensible grammar. Special thanks to Arnaud Le Hors, whose engineering contributions made this document work. Adam Costello improved</del><ins>proofread</ins> this <del>specification by performing a detailed review. Lastly, thanks to Tim Berners-Lee without whom none of this would have been possible. 1.5 Copyright Notice Copyright &copy; 1997 World Wide Web Consortium , ( Massachusetts Institute of Technology , Institut National de Recherche en Informatique et en Automatique , Keio University ). All Rights Reserved. Documents on the W3C site are provided by the copyright holders under the following license. By obtaining, using and/or copying this document, or the W3C document from which this statement is linked, you agree that you have read, understood, and will comply with the following terms and conditions: Permission to use, copy, and distribute the contents of this document, or the W3C document from which this statement is linked, in any medium for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the document, or portions thereof, that you use: A link or URI to the original W3C</del>document.</p>
476+
<span class=vcard><span class="fn"> <del>Bjorn Backlund, Todd Fahrner, Lars Marius Garshol, Sue Jordan, Ian Hickson, Susan Lesch, Andrew Marshall, MegaZone, Eric Meyer, Russell O'Connor, David Perrell, Liam Quinn, Jon Seymour, Neil St. Laurent, Taylor, Brian Wilson, and Chris Wilson for their participation. Many thanks to the Web Accessibility Initiative Protocols and Formats Technical Review Working Group (WAI PF) for helping to improve the accessibility of CSS2. Many thanks to Philippe Le H&eacute;garet, whose CSS validator helped ensure correct examples and a sensible grammar. Special thanks to Arnaud Le Hors, whose engineering contributions made this document work. Adam Costello improved this specification by performing a detailed review. Lastly, thanks to Tim Berners-Lee without whom none of this would have been possible. 1.5 Copyright Notice Copyright &copy; 1997 World Wide Web Consortium , ( Massachusetts Institute of Technology , Institut National de Recherche en Informatique et en Automatique</del><ins>Gary Schnabl</ins></span></span>,
477+
<span class=vcard><span class="fn"> <del>Keio University ). All Rights Reserved. Documents on the W3C site are provided by the copyright holders under the following license. By obtaining, using and/or copying this document, or the W3C document from which this statement is linked, you agree that you have read, understood, and will comply with the following terms and conditions: Permission to use, copy,</del><ins>Glenn Adams</ins></span></span> and
478+
<span class=vcard><span class="fn"> <del>distribute the contents of this document, or the W3C document from which</del><ins>Susan Lesch</ins></span></span>
479+
<ins>who helped proofread</ins> this <del>statement is linked, in any medium for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the document, or portions thereof, that you use: A link or URI to the original W3C</del>document.</p>
479480
<p> <del>The pre-existing copyright notice of the original author, if it doesn't exist, a notice of the form: &quot;Copyright &copy; World Wide Web Consortium , ( Massachusetts Institute of Technology , Institut National de Recherche en Informatique et en Automatique , Keio University ). All Rights Reserved.&quot; If it exists , the STATUS of the W3C document. When space permits, inclusion of the full text of this NOTICE should be provided.</del>In addition, <del>credit shall be attributed to the copyright holders for any software, documents, or other items or products that you create pursuant to the implementation of the contents of this document, or any portion thereof. No right to create modifications or derivatives is granted pursuant</del><ins>we would like</ins> to <del>this license. THIS DOCUMENT IS PROVIDED &quot;AS IS,&quot; AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,</del><ins>extend</ins> special <del>OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF. The name</del><ins>thanks to</ins>
480481
<span class=vcard><span class="fn"><ins>fantasai</ins></span></span><ins>,</ins>
481482
<span class=vcard><span class="fn"><ins>Ada Chan</ins></span></span> and

0 commit comments

Comments
 (0)