Skip to content

Commit 230a2f8

Browse files
bert-githubbert-github
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402608
1 parent 290e296 commit 230a2f8

22 files changed

Lines changed: 139 additions & 87 deletions

‎css2/conform.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ <H2 id=defs><a name="q1">3.1 Definitions</a></H2>
9999
inheritance</a>.
100100

101101
<dt><strong><span class="index-def" title="valid style
102-
sheet|validity">><a name="valid-style-sheet">Valid style
102+
sheet|validity"><a name="valid-style-sheet">Valid style
103103
sheet</a></span></strong>
104104

105105
<dd>The validity of a style sheet depends on the level of CSS
@@ -424,7 +424,7 @@ <h2>3.2 <a name="conformance">UA Conformance</a></h2>
424424
href="#valid-style-sheet">valid style sheets</a>
425425

426426
<li>A user agent that <em>renders</em> a document with associated style
427-
sheets must respect points 1-5 and render the document
427+
sheets must respect points 1-6 and render the document
428428
according to the media-specific requirements set forth in this
429429
specification. <a href="cascade.html#actual-value">Values</a>
430430
may be approximated when required by the user agent.

‎css2/css2.html‎

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1904,7 +1904,7 @@ <H2 id=defs><a name="q1">3.1 Definitions</a></H2>
19041904
inheritance</a>.
19051905

19061906
<dt><strong><span class="index-def" title="valid style
1907-
sheet|validity">><a name="valid-style-sheet">Valid style
1907+
sheet|validity"><a name="valid-style-sheet">Valid style
19081908
sheet</a></span></strong>
19091909

19101910
<dd>The validity of a style sheet depends on the level of CSS
@@ -2229,7 +2229,7 @@ <h2>3.2 <a name="conformance">UA Conformance</a></h2>
22292229
href="#valid-style-sheet">valid style sheets</a>
22302230

22312231
<li>A user agent that <em>renders</em> a document with associated style
2232-
sheets must respect points 1-5 and render the document
2232+
sheets must respect points 1-6 and render the document
22332233
according to the media-specific requirements set forth in this
22342234
specification. <a href="cascade.html#actual-value">Values</a>
22352235
may be approximated when required by the user agent.
@@ -2712,8 +2712,8 @@ <h3 id=rule-sets><a name="q10">4.1.7 Rule sets, declaration blocks, and selector
27122712
a declaration block.
27132713
</p>
27142714
<p> A <a name="x14"><span class="index-def"
2715-
title="declaration block"><dfn>declaration block</dfn></span></a> (also
2716-
called a declaration block in the following text) starts with a left curly
2715+
title="declaration block"><dfn>declaration block</dfn></span></a>
2716+
starts with a left curly
27172717
brace ({) and ends with the matching right curly brace (}). In between
27182718
there must be a list of zero or more semicolon-separated (;)
27192719
declarations.
@@ -3338,12 +3338,12 @@ <h3>4.3.5 <a name="counter">Counters</a></h3>
33383338
properties). To refer to the value of a counter, the notation
33393339
<a name="x46"><span class="index-def" title="counter()">
33403340
'counter(&lt;identifier&gt;)'</span></a> or 'counter(&lt;identifier&gt;,
3341-
&lt;list-style-type&gt;)', with optional whitespace separating the tokens,
3341+
&lt;'list-style-type'&gt;)', with optional whitespace separating the tokens,
33423342
is used. The default style is 'decimal'.
33433343
</p>
33443344
<p>To refer to a sequence of nested counters of the same name, the
33453345
notation is 'counters(&lt;identifier&gt;, &lt;string&gt;)' or
3346-
'counters(&lt;identifier&gt;, &lt;string&gt;, &lt;list-style-type&gt;)'
3346+
'counters(&lt;identifier&gt;, &lt;string&gt;, &lt;'list-style-type'&gt;)'
33473347
with optional whitespace separating the tokens.
33483348
</p>
33493349
<p>See <a href="generate.html#scope">"Nested counters and scope"</a>
@@ -3356,7 +3356,7 @@ <h3>4.3.5 <a name="counter">Counters</a></h3>
33563356
<p>In CSS&nbsp;2.1, the values of counters can
33573357
only be referred to from the <a href="generate.html#propdef-content" class="noxref"><span
33583358
class="propinst-content">'content'</span></a> property. Note that 'none'
3359-
is a possible &lt;list-style-type&gt;: 'counter(x,
3359+
is a possible &lt;'list-style-type'&gt;: 'counter(x,
33603360
none)' yields an empty string.
33613361
</p>
33623362
<div class="example"><P style="display:none">Example(s):</P>
@@ -3489,6 +3489,11 @@ <h3>4.3.6 <a name="color-units">Colors</a></h3>
34893489
(inside the device gamut), while other colors inside the 0..255 sRGB
34903490
range will be outside the device gamut and will thus be mapped.
34913491
</p>
3492+
<div class=note><p><em><strong>Note.</strong> It is thus not possible
3493+
to simply clip all colors to the range 0..255. Clipping (or mapping)
3494+
must be done to the actual device gamut, which may be larger or
3495+
smaller than 0..255.</em>
3496+
</div>
34923497

34933498
<h3>4.3.7 <a name="strings">Strings</a></h3>
34943499

@@ -8998,7 +9003,9 @@ <h3>9.9.1 <a name="z-index">Specifying the stack level</a>: the <a href="visuren
89989003
relatively positioned elements) having a computed value of 'z-index'
89999004
other than 'auto'. Stacking contexts are not necessarily related to
90009005
containing blocks. In future levels of CSS, other properties may
9001-
introduce stacking contexts, for example '<a href="http://www.w3.org/TR/css3-color/#transparency">opacity</a>'.
9006+
introduce stacking contexts, for example '<a
9007+
href="http://www.w3.org/TR/css3-color/#transparency">opacity</a>'
9008+
<a href="refs.html#ref-CSS3COLOR" rel="biblioentry" class="noxref"><span class="informref">[CSS3COLOR]</span></a>.
90029009
</p>
90039010
<p>
90049011
Each stacking context consists of the following
@@ -12191,7 +12198,7 @@ <h3>12.4.2 <a name="counter-styles">Counter styles</a></h3>
1219112198
<p>for the default style, or:</p>
1219212199

1219312200
<pre>
12194-
counter(<var>name</var>, <a href="generate.html#propdef-list-style-type" class="noxref"><span class="propinst-list-style-type">'list-style-type'</span></a>)
12201+
counter(<var>name</var>, &lt;<a href="generate.html#propdef-list-style-type" class="noxref"><span class="propinst-list-style-type">'list-style-type'</span></a>&gt;)
1219512202
</pre>
1219612203

1219712204
<p>All the styles are allowed, including 'disc', 'circle', 'square',
@@ -16954,8 +16961,7 @@ <h2>18.1 <a name="cursor-props">Cursors:</a> the <a href="ui.html#propdef-cursor
1695416961
<h2>18.2 <a name="system-colors">System Colors</a></h2>
1695516962

1695616963
<div class="note"><p><em><strong>Note.</strong>
16957-
The System Colors are
16958-
<a href="http://www.w3.org/TR/2003/CR-css3-color-20030514/#css2-system">deprecated in the CSS3 Color Module</a>.
16964+
The System Colors are deprecated in the CSS3 Color Module <a href="refs.html#ref-CSS3COLOR" rel="biblioentry" class="noxref"><span class="informref">[CSS3COLOR]</span></a>.
1695916965
</em></p>
1696016966
</div>
1696116967

@@ -18696,6 +18702,12 @@ <H2><a name="q2">B.2 Informative references</a></H2>
1869618702
W. Lie, C. Lilley and I. Jacobs, 12 May 1998,<br>
1869718703
The latest version is available at <a href="http://www.w3.org/TR/REC-CSS2">http://www.w3.org/TR/REC-CSS2</a>
1869818704

18705+
<dt><strong><a name="ref-CSS3COLOR" class="informref">[CSS3COLOR]</a></strong>
18706+
<dd>"CSS3 Color Module," Tantek �elik, Chris Lilley, 14 May 2003,
18707+
W3C Candidate Recommendation. Available at <a
18708+
href="http://www.w3.org/TR/2003/CR-css3-color-20030514">
18709+
http://www.w3.org/TR/2003/CR-css3-color-20030514</a>
18710+
1869918711
<dt><strong><a name="ref-CSS3LIST" class="informref">[CSS3LIST]</a></strong>
1870018712
<dd>"CSS3 module: lists," Tantek �elik, Ian Hickson, 7 November 2002,
1870118713
W3C working draft (work in progress). Available at <a
@@ -21187,6 +21199,7 @@ <h2><a name="q2">G.2 Lexical scanner</a></h2>
2118721199
K k|\\0{0,4}(4b|6b)(\r\n|[ \t\r\n\f])?|\\k
2118821200
M m|\\0{0,4}(4d|6d)(\r\n|[ \t\r\n\f])?|\\m
2118921201
N n|\\0{0,4}(4e|6e)(\r\n|[ \t\r\n\f])?|\\n
21202+
O o|\\0{0,4}(51|71)(\r\n|[ \t\r\n\f])?|\\o
2119021203
P p|\\0{0,4}(50|70)(\r\n|[ \t\r\n\f])?|\\p
2119121204
R r|\\0{0,4}(52|72)(\r\n|[ \t\r\n\f])?|\\r
2119221205
S s|\\0{0,4}(53|73)(\r\n|[ \t\r\n\f])?|\\s
@@ -21218,12 +21231,12 @@ <h2><a name="q2">G.2 Lexical scanner</a></h2>
2121821231

2121921232
"#"{name} {return HASH;}
2122021233

21221-
"@import" {return IMPORT_SYM;}
21222-
"@page" {return PAGE_SYM;}
21223-
"@media" {return MEDIA_SYM;}
21224-
"@charset " {return CHARSET_SYM;}
21234+
@{I}{M}{P}{O}{R}{T} {return IMPORT_SYM;}
21235+
@{P}{A}{G}{E} {return PAGE_SYM;}
21236+
@{M}{E}{D}{I}{A} {return MEDIA_SYM;}
21237+
@{C}{H}{A}{R}{S}{E}{T} {return CHARSET_SYM;}
2122521238

21226-
"!"({w}|{comment})*"important" {return IMPORTANT_SYM;}
21239+
"!"({w}|{comment})*{I}{M}{P}{O}{R}{T}{A}{N}{T} {return IMPORTANT_SYM;}
2122721240

2122821241
{num}{E}{M} {return EMS;}
2122921242
{num}{E}{X} {return EXS;}

‎css2/diffs-rec/conform.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ <H2 id=defs><a name="q1">3.1 Definitions</a></H2>
9999
inheritance</a>.
100100

101101
<dt><strong><span class="index-def" title="valid style
102-
sheet|validity"><ins>></ins><a name="valid-style-sheet">Valid style
102+
sheet|validity"><a name="valid-style-sheet">Valid style
103103
sheet</a></span></strong>
104104

105105
<dd>The validity of a style sheet depends on the level of CSS
@@ -424,7 +424,7 @@ <h2>3.2 <a name="conformance"><ins>UA</ins> Conformance</a></h2>
424424
href="#valid-style-sheet">valid style sheets</a>
425425

426426
<li>A user agent that <em>renders</em> a document with associated style
427-
sheets must respect points <del>1</del> <del>-</del> <del>5</del><ins>1-5</ins> and render the document
427+
sheets must respect points <del>1</del> <del>-</del> <del>5</del><ins>1-6</ins> and render the document
428428
according to the media-specific requirements set forth in this
429429
specification. <a href="cascade.html#actual-value">Values</a>
430430
may be approximated when required by the user agent.

‎css2/diffs-rec/generate.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ <h3> <del>12.5.2</del><ins>12.4.2</ins> <a name="counter-styles">Counter styles<
761761
<p>for the default style, or:</p>
762762

763763
<pre>
764-
counter(<var>name</var>, <a href="generate.html#propdef-list-style-type" class="noxref"><span class="propinst-list-style-type">'list-style-type'</span></a>)
764+
counter(<var>name</var>, <ins>&lt;</ins><a href="generate.html#propdef-list-style-type" class="noxref"><span class="propinst-list-style-type">'list-style-type'</span></a> <del>)</del><ins>&gt;)</ins>
765765
</pre>
766766

767767
<p>All the styles are allowed, including 'disc', 'circle', 'square',

‎css2/diffs-rec/grammar.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ <h2><a name="q2"> <del>D.2</del><ins>G.2</ins> Lexical scanner</a></h2>
203203
<ins>K</ins> <ins>k|\\0{0,4}(4b|6b)(\r\n|[</ins> <ins>\t\r\n\f])?|\\k</ins>
204204
<ins>M</ins> <ins>m|\\0{0,4}(4d|6d)(\r\n|[</ins> <ins>\t\r\n\f])?|\\m</ins>
205205
<ins>N</ins> <ins>n|\\0{0,4}(4e|6e)(\r\n|[</ins> <ins>\t\r\n\f])?|\\n</ins>
206+
<ins>O</ins> <ins>o|\\0{0,4}(51|71)(\r\n|[</ins> <ins>\t\r\n\f])?|\\o</ins>
206207
<ins>P</ins> <ins>p|\\0{0,4}(50|70)(\r\n|[</ins> <ins>\t\r\n\f])?|\\p</ins>
207208
<ins>R</ins> <ins>r|\\0{0,4}(52|72)(\r\n|[</ins> <ins>\t\r\n\f])?|\\r</ins>
208209
<ins>S</ins> <ins>s|\\0{0,4}(53|73)(\r\n|[</ins> <ins>\t\r\n\f])?|\\s</ins>
@@ -234,12 +235,12 @@ <h2><a name="q2"> <del>D.2</del><ins>G.2</ins> Lexical scanner</a></h2>
234235

235236
"#"{name} {return HASH;}
236237

237-
"@import" {return IMPORT_SYM;}
238-
"@page" {return PAGE_SYM;}
239-
"@media" {return MEDIA_SYM;}
240-
<del>"@font-face"</del> <del>{return</del> <del>FONT_FACE_SYM;}</del> <del>"@charset"</del><ins>"@charset</ins> <ins>"</ins> {return CHARSET_SYM;}
238+
<del>"@import"</del><ins>@{I}{M}{P}{O}{R}{T}</ins> {return IMPORT_SYM;}
239+
<del>"@page"</del><ins>@{P}{A}{G}{E}</ins> {return PAGE_SYM;}
240+
<del>"@media"</del><ins>@{M}{E}{D}{I}{A}</ins> {return MEDIA_SYM;}
241+
<del>"@font-face"</del> <del>{return</del> <del>FONT_FACE_SYM;}</del> <del>"@charset"</del><ins>@{C}{H}{A}{R}{S}{E}{T}</ins> {return CHARSET_SYM;}
241242

242-
<del>"@"{ident}</del> <del>{return</del> <del>ATKEYWORD;}</del> <del>"!{w}important"</del><ins>"!"({w}|{comment})*"important"</ins> {return IMPORTANT_SYM;}
243+
<del>"@"{ident}</del> <del>{return</del> <del>ATKEYWORD;}</del> <del>"!{w}important"</del><ins>"!"({w}|{comment})*{I}{M}{P}{O}{R}{T}{A}{N}{T}</ins> {return IMPORTANT_SYM;}
243244

244245
<del>{num}em</del><ins>{num}{E}{M}</ins> {return EMS;}
245246
<del>{num}ex</del><ins>{num}{E}{X}</ins> {return EXS;}

‎css2/diffs-rec/refs.html‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ <H2><a name="q1"> <del>E.1</del><ins>B.1</ins> Normative references</a></H2>
3636
<dl>
3737
<dt><strong><a name="ref-COLORIMETRY" class="normref">[COLORIMETRY]</a></strong>
3838
<dd> <del>"Colorimetry,</del> <del>Second</del> <del>Edition",</del><ins>"Colorimetry",</ins> <ins>Third</ins> <ins>Edition,</ins> <ins>Commission</ins> <ins>Internationale</ins> <ins>de</ins>
39-
<ins>l'Eclairage,</ins> CIE Publication <del>15.2-1986,</del><ins>15:2004,</ins> ISBN <del>3-900-734-00-3.</del> <del>Available</del> <del>at</del> <del>http://www.hike.te.chiba-u.ac.jp/ikeda/CIE/publ/abst/15-2-86.html</del> <del>.</del> <del>[CSS1]</del> <del>"Cascading</del> <del>Style</del> <del>Sheets,</del> <del>level</del> <del>1",</del> <del>H.</del> <del>W.</del> <del>Lie</del> <del>and</del> <del>B.</del> <del>Bos,</del> <del>17</del> <del>December</del> <del>1996.</del><ins>3-901-906-33-9.</ins><BR>
39+
<ins>l'Eclairage,</ins> CIE Publication <del>15.2-1986,</del><ins>15:2004,</ins> ISBN <del>3-900-734-00-3.</del><ins>3-901-906-33-9.</ins><BR>
4040
Available at <a href="http://www.cie.co.at/publ/abst/15-2004.html">
41-
<del>http://www.w3.org/TR/REC-CSS1-961217.html.</del><ins>http://www.cie.co.at/publ/abst/15-2004.html</ins></a>
41+
<del>http://www.hike.te.chiba-u.ac.jp/ikeda/CIE/publ/abst/15-2-86.html</del> <del>.</del> <del>[CSS1]</del> <del>"Cascading</del> <del>Style</del> <del>Sheets,</del> <del>level</del> <del>1",</del> <del>H.</del> <del>W.</del> <del>Lie</del> <del>and</del> <del>B.</del> <del>Bos,</del> <del>17</del> <del>December</del> <del>1996.</del> <del>Available</del> <del>at</del> <del>http://www.w3.org/TR/REC-CSS1-961217.html.</del><ins>http://www.cie.co.at/publ/abst/15-2004.html</ins></a>
4242

4343
<dt><strong><a name="ref-FLEX" class="normref">[FLEX]</a></strong>
4444
<dd>"Flex: The Lexical Scanner Generator", Version 2.3.7, ISBN 1882114213.
@@ -151,7 +151,7 @@ <H2><a name="q1"> <del>E.1</del><ins>B.1</ins> Normative references</a></H2>
151151
<del>http://www.w3.org/Graphics/Color/sRGB.html</del> <del>.</del><ins>http://www.w3.org/TR/2002/REC-UAAG10-20021217</ins></a>
152152

153153
<dt><strong><a name="ref-UNICODE" class="normref">[UNICODE]</a></strong>
154-
<dd> <del>"The</del><ins>The</ins> Unicode <del>Standard:</del><ins>Consortium.</ins> <ins>The</ins> <ins>Unicode</ins> <ins>Standard,</ins> Version <del>2.0",</del><ins>4.1.0,</ins>
154+
<dd> <del>"The</del><ins>The</ins> <ins>Unicode</ins> <ins>Consortium.</ins> <ins>The</ins> Unicode <del>Standard:</del><ins>Standard,</ins> Version <del>2.0",</del><ins>4.1.0,</ins>
155155
<ins>defined</ins> <ins>by:</ins> The Unicode <del>Consortium,</del> <del>Addison-Wesley</del> <del>Developers</del> <del>Press,</del> <del>1996.</del> <del>For</del> <del>bidirectionality,</del> <del>see</del> <del>also</del><ins>Standard,</ins> <ins>Version</ins> <ins>4.0</ins> <ins>(Boston,</ins> <ins>MA,</ins>
156156
<ins>Addison-Wesley,</ins> <ins>2003.</ins> <ins>ISBN</ins> <ins>0-321-18578-1),</ins> <ins>as</ins> <ins>amended</ins> <ins>by</ins> <a
157157
href="http://www.unicode.org/versions/Unicode4.0.1/"> <ins>Unicode</ins>
@@ -195,6 +195,12 @@ <H2><a name="q2"> <del>E.2</del><ins>B.2</ins> Informative references</a></H2>
195195
<ins>W.</ins> <ins>Lie,</ins> <ins>C.</ins> <ins>Lilley</ins> <ins>and</ins> <ins>I.</ins> <ins>Jacobs,</ins> <ins>12</ins> <ins>May</ins> <ins>1998,</ins><br>
196196
<ins>The</ins> <ins>latest</ins> <ins>version</ins> <ins>is</ins> <ins>available</ins> <ins>at</ins> <a href="http://www.w3.org/TR/REC-CSS2"><ins>http://www.w3.org/TR/REC-CSS2</ins></a>
197197

198+
<dt><strong><a name="ref-CSS3COLOR" class="informref"><ins>[CSS3COLOR]</ins></a></strong>
199+
<dd><ins>"CSS3</ins> <ins>Color</ins> <ins>Module,"</ins> <ins>Tantek</ins> <ins>Çelik,</ins> <ins>Chris</ins> <ins>Lilley,</ins> <ins>14</ins> <ins>May</ins> <ins>2003,</ins>
200+
<ins>W3C</ins> <ins>Candidate</ins> <ins>Recommendation.</ins> <ins>Available</ins> <ins>at</ins> <a
201+
href="http://www.w3.org/TR/2003/CR-css3-color-20030514">
202+
<ins>http://www.w3.org/TR/2003/CR-css3-color-20030514</ins></a>
203+
198204
<dt><strong><a name="ref-CSS3LIST" class="informref"><ins>[CSS3LIST]</ins></a></strong>
199205
<dd><ins>"CSS3</ins> <ins>module:</ins> <ins>lists,"</ins> <ins>Tantek</ins> <ins>Çelik,</ins> <ins>Ian</ins> <ins>Hickson,</ins> <ins>7</ins> <ins>November</ins> <ins>2002,</ins>
200206
<ins>W3C</ins> <ins>working</ins> <ins>draft</ins> <ins>(work</ins> <ins>in</ins> <ins>progress).</ins> <ins>Available</ins> <ins>at</ins> <a

0 commit comments

Comments
 (0)