Skip to content

Commit 6176cf4

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

14 files changed

Lines changed: 153 additions & 104 deletions

css2/cascade.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,8 @@ <H3>6.4.3 <a name="specificity">Calculating a selector's specificity</a></H3>
398398
<P>A selector's specificity is calculated as follows:</p>
399399

400400
<ul>
401-
<li>count 1 if the selector is a 'style' attribute rather than a
401+
<li>count 1 if the declaration is from is a 'style' attribute rather
402+
than a rule with a
402403
selector, 0 otherwise (= a) (In HTML, values of an element's "style"
403404
attribute are style sheet rules. These rules have no selectors, so
404405
a=1, b=0, c=0, and d=0.)

css2/changes.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
135135
<P><em>This appendix is informative, not normative.</em></P>
136136

137137
<P>CSS&nbsp;2.1 is an updated revision of CSS2. The changes between the
138-
CSS2 specification (see <a href="refs.html#ref-CSS2" rel="biblioentry" class="noxref"><span class="normref">[CSS2]</span></a>) and this specification fall into
138+
CSS2 specification (see <a href="refs.html#ref-CSS2" rel="biblioentry" class="noxref"><span class="informref">[CSS2]</span></a>) and this specification fall into
139139
five groups: known errors, typographical errors, clarifications,
140140
changes and additions. Typographical errors are not listed here.</P>
141141

@@ -229,8 +229,8 @@ <h3 id="s-10-3-7"><a name="q13">C.2.6 </a><a
229229
<p>When both 'width' and 'right' (or 'width' and 'left') are 'auto',
230230
the element's computed width is the width of the contents (using an
231231
algorithm similar to that for table cells) and then 'right' (or
232-
'left') is solved. CSS2 incorrectly said that 'right' (or 'left') was
233-
set to 0 in that case, and then width was solved.
232+
'left') is solved for. CSS2 incorrectly said that 'right' (or 'left') was
233+
set to 0 in that case, and then width was solved for.
234234

235235
<h3 id="s-10-6-4"><a name="q14">C.2.7 </a><a
236236
href="visudet.html#abs-non-replaced-height">Section 10.6.4 Absolutely

css2/colors.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ <h2>14.3 <a name="gamma-correction">Gamma correction</a></h2>
545545
<dt> Unix using X11</dt>
546546
<dd> none</dd>
547547
<dt> Mac using QuickDraw</dt>
548-
<dd> apply gamma 1.45 <a href="refs.html#ref-ICC32" rel="biblioentry" class="noxref"><span class="normref">[ICC32]</span></a> (ColorSync-savvy applications
548+
<dd> apply gamma 1.45 <a href="refs.html#ref-ICC42" rel="biblioentry" class="noxref"><span class="normref">[ICC42]</span></a> (ColorSync-savvy applications
549549
may simply pass the sRGB ICC profile to ColorSync
550550
to perform correct color correction)</dd>
551551
<dt> SGI using X</dt>

css2/cover.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ <h2 id=abstract>Abstract</h2>
9999
the content of documents, CSS&nbsp;2.1 simplifies Web authoring and
100100
site maintenance.
101101

102-
<P>CSS&nbsp;2.1 builds on CSS2 <a href="refs.html#ref-CSS2" rel="biblioentry" class="noxref"><span class="normref">[CSS2]</span></a> which builds on CSS1 <a href="refs.html#ref-CSS1" rel="biblioentry" class="noxref"><span class="normref">[CSS1]</span></a>.
102+
<P>CSS&nbsp;2.1 builds on CSS2 <a href="refs.html#ref-CSS2" rel="biblioentry" class="noxref"><span class="informref">[CSS2]</span></a> which builds on CSS1 <a href="refs.html#ref-CSS1" rel="biblioentry" class="noxref"><span class="informref">[CSS1]</span></a>.
103103
It supports media-specific style sheets so that authors may tailor the
104104
presentation of their documents to visual browsers, aural devices,
105105
printers, braille devices, handheld devices, etc. It also supports
@@ -553,7 +553,7 @@ <h2><a name="toc">Full Table of Contents</a></h2>
553553
<li class="tocline3"><a href="visudet.html#normal-block" class="tocxref">10.6.3 Block-level non-replaced elements in normal flow when 'overflow' computes to 'visible'</a>
554554
<li class="tocline3"><a href="visudet.html#abs-non-replaced-height" class="tocxref">10.6.4 Absolutely positioned, non-replaced elements</a>
555555
<li class="tocline3"><a href="visudet.html#abs-replaced-height" class="tocxref">10.6.5 Absolutely positioned, replaced elements</a>
556-
<li class="tocline3"><a href="visudet.html#q22" class="tocxref">10.6.6 Block-level, non-replaced elements in normal flow when 'overflow' does not compute to 'visible'; 'inline-block', non-replaced elements; and floating, non-replaced elements</a>
556+
<li class="tocline3"><a href="visudet.html#q22" class="tocxref">10.6.6 Complicated cases</a>
557557
<li class="tocline3"><a href="visudet.html#root-height" class="tocxref">10.6.7 'Auto' heights for block formatting context roots</a>
558558
</ul>
559559
<li class="tocline2"><a href="visudet.html#min-max-heights" class="tocxref">10.7 Minimum and maximum heights: <span class="propinst-min-height">'min-height'</span> and <span class="propinst-max-height">'max-height'</span></a>

css2/media.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ <H2>7.3 <a name="media-types">Recognized media types</a></H2>
195195
type that renders both visually and aurally to a single canvas.
196196

197197

198-
<P>Unknown media type names must not result in the @media rule being ignored.
198+
<P>Unknown media type names must not result in the @media rule or
199+
@import rule being ignored.
199200

200201

201202

css2/propidx.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ <H1><a name="q0">Appendix F. Full property table</a></H1>
2727

2828
<P><em>This appendix is informative, not normative.</em></P>
2929

30-
<table border=1>
30+
<table border=1 align=center>
3131
<thead><tr align=center><th>Name<th>Values<th>Initial value<th>Applies to<br>(Default: all)<th>Inherited?<th>Percentages<br>(Default: N/A)<th>Media groups</thead>
3232
<tr><td><a href="aural.html#propdef-azimuth"><span class="propinst-azimuth xref">'azimuth'</span></a>
3333
<td><a href="aural.html#value-def-angle" class="noxref"><span class="value-inst-angle">&lt;angle&gt;</span></a> | [[ left-side | far-left | left | center-left | center | center-right | right | far-right | right-side ] || behind ] | leftwards | rightwards | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>

css2/refs.html

Lines changed: 42 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,10 @@ <H1><a name="q0">Appendix B. Bibliography</a></H1>
3535
<H2><a name="q1">B.1 Normative references</a></H2>
3636
<dl>
3737
<dt><strong><a name="ref-COLORIMETRY" class="normref">[COLORIMETRY]</a></strong>
38-
<dd>"Colorimetry, Second Edition", CIE Publication 15.2-1986,
39-
ISBN 3-900-734-00-3.<BR>
40-
41-
42-
<dt><strong><a name="ref-CSS1" class="normref">[CSS1]</a></strong>
43-
<dd>"Cascading Style Sheets, level 1", H. W. Lie and B. Bos,
44-
17 December 1996, revised 11 January 1999<BR>
45-
The latest version is available at <a href="http://www.w3.org/TR/REC-CSS1">http://www.w3.org/TR/REC-CSS1</a>
46-
47-
<dt><strong><a name="ref-CSS2" class="normref">[CSS2]</a></strong>
48-
<dd>"Cascading Style Sheets, level 2, CSS2 Specification", B. Bos, H.
49-
W. Lie, C. Lilley and I. Jacobs, 12 May 1998,<br>
50-
The latest version is available at <a href="http://www.w3.org/TR/REC-CSS2">http://www.w3.org/TR/REC-CSS2</a>
38+
<dd>"Colorimetry", Third Edition, Commission Internationale de
39+
l'Eclairage, CIE Publication 15:2004, ISBN 3-901-906-33-9.<BR>
40+
Available at <a href="http://www.cie.co.at/publ/abst/15-2004.html">
41+
http://www.cie.co.at/publ/abst/15-2004.html</a>
5142

5243
<dt><strong><a name="ref-FLEX" class="normref">[FLEX]</a></strong>
5344
<dd>"Flex: The Lexical Scanner Generator", Version 2.3.7, ISBN 1882114213.
@@ -67,10 +58,12 @@ <H2><a name="q1">B.1 Normative references</a></H2>
6758
Available at <a href="http://www.iana.org/">
6859
http://www.iana.org/</a>.
6960

70-
<dt><strong><a name="ref-ICC32" class="normref">[ICC32]</a></strong>
71-
<dd>"ICC Profile Format Specification, version 3.2", 1995.<BR>
72-
73-
61+
<dt><strong><a name="ref-ICC42" class="normref">[ICC42]</a></strong>
62+
<dd>Specification ICC.1:2004-10 (Profile version 4.2.0.0) Image
63+
technology colour management &ndash; Architecture, profile format, and
64+
data structure.<BR>
65+
Available at <a href="http://www.color.org/icc_specs2.html">
66+
http://www.color.org/icc_specs2.html</a>
7467

7568
<dt><strong><a name="ref-ISO8879" class="normref">[ISO8879]</a></strong>
7669
<dd><a href="http://www.iso.ch/cate/d16387.html">ISO 8879:1986</a>
@@ -136,13 +129,20 @@ <H2><a name="q1">B.1 Normative references</a></H2>
136129
<dd>"UTF-16, an encoding of ISO 10646", P. Hoffman, F. Yergeau, February 2000<br>
137130
Available at <a href="http://www.ietf.org/rfc/rfc2781.txt">http://www.ietf.org/rfc/rfc2781.txt</a>.
138131

139-
<dt><strong><a name="ref-SRGB" class="normref">[SRGB]</a></strong>
140-
<dd>"Proposal for a Standard Color Space for the Internet - sRGB",
141-
M. Anderson, R. Motta, S. Chandrasekar, M. Stokes.<BR>
142-
Available at <a href="http://www.w3.org/Graphics/Color/sRGB.html">
143-
http://www.w3.org/Graphics/Color/sRGB.html</a>.
144-
132+
<dt><strong><a name="ref-RFC3629" class="normref">[RFC3629]</a></strong>
133+
<dd>"UTF-8, a transformation format of ISO 10646", F. Yergeau,
134+
November 2003.<BR>
135+
Available at <a href="http://www.ietf.org/rfc/rfc3629.txt">
136+
http://www.ietf.org/rfc/rfc3629.txt</a>
145137

138+
<dt><strong><a name="ref-SRGB" class="normref">[SRGB]</a></strong>
139+
<dd>IEC 61966-2-1 (1999-10) - "Multimedia systems and equipment -
140+
Colour measurement and management - Part 2-1: Colour management -
141+
Default RGB colour space - sRGB, ISBN: 2-8318-4989-6 ­ ICS codes:
142+
33.160.60, 37.080 ­ TC 100 ­ 51 pp.<BR>
143+
Available at
144+
<a href="http://domino.iec.ch/webstore/webstore.nsf/artnum/025408">
145+
http://domino.iec.ch/webstore/webstore.nsf/artnum/025408</a>
146146

147147
<dt><strong><a name="ref-UAAG10" class="normref">[UAAG10]</a></strong>
148148
<dd>"User Agent Accessibility Guidelines 1.0." Ian Jacobs, Jon
@@ -151,16 +151,19 @@ <H2><a name="q1">B.1 Normative references</a></H2>
151151
http://www.w3.org/TR/2002/REC-UAAG10-20021217</a>
152152

153153
<dt><strong><a name="ref-UNICODE" class="normref">[UNICODE]</a></strong>
154-
<dd>The Unicode Consortium. The Unicode Standard, Version 4.0.0,
154+
<dd>The Unicode Consortium. The Unicode Standard, Version 4.1.0,
155155
defined by: The Unicode Standard, Version 4.0 (Boston, MA,
156-
Addison-Wesley, 2003. ISBN 0-321-18578-1) as updated from time to time
157-
by the publication of new versions. (See <a
156+
Addison-Wesley, 2003. ISBN 0-321-18578-1), as amended by <a
157+
href="http://www.unicode.org/versions/Unicode4.0.1/"> Unicode
158+
4.0.1</a> and <a href="http://www.unicode.org/versions/Unicode4.1.0">
159+
Unicode 4.1.0</a> and as updated from time to time by the publication
160+
of new versions. (See <a
158161
href="http://www.unicode.org/unicode/standard/versions">
159162
http://www.unicode.org/unicode/standard/versions</a> for the latest
160163
version and additional information on versions of the standard and of
161-
the Unicode Character Database).<br>
162-
Available at <a href="http://www.unicode.org/versions/Unicode4.0.0/">
163-
http://www.unicode.org/versions/Unicode4.0.0/</a>
164+
the Unicode Character Database).<br> Available at <a
165+
href="http://www.unicode.org/versions/Unicode4.1.0/">
166+
http://www.unicode.org/versions/Unicode4.1.0/</a>
164167

165168
<dt><strong><a name="ref-XML10" class="normref">[XML10]</a></strong>
166169
<dd>"Extensible Markup Language (XML) 1.0 (third edition)"
@@ -182,6 +185,16 @@ <H2><a name="q2">B.2 Informative references</a></H2>
182185
href="http://www.iana.org/assignments/character-sets">
183186
http://www.iana.org/assignments/character-sets</A>. </DD>
184187

188+
<dt><strong><a name="ref-CSS1" class="informref">[CSS1]</a></strong>
189+
<dd>"Cascading Style Sheets, level 1", H. W. Lie and B. Bos,
190+
17 December 1996, revised 11 January 1999<BR>
191+
The latest version is available at <a href="http://www.w3.org/TR/REC-CSS1">http://www.w3.org/TR/REC-CSS1</a>
192+
193+
<dt><strong><a name="ref-CSS2" class="informref">[CSS2]</a></strong>
194+
<dd>"Cascading Style Sheets, level 2, CSS2 Specification", B. Bos, H.
195+
W. Lie, C. Lilley and I. Jacobs, 12 May 1998,<br>
196+
The latest version is available at <a href="http://www.w3.org/TR/REC-CSS2">http://www.w3.org/TR/REC-CSS2</a>
197+
185198
<dt><strong><a name="ref-CSS3LIST" class="informref">[CSS3LIST]</a></strong>
186199
<dd>"CSS3 module: lists," Tantek Çelik, Ian Hickson, 7 November 2002,
187200
W3C working draft (work in progress). Available at <a

css2/selector.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -592,15 +592,15 @@ <h3>5.8.3 <a name="class-html">Class selectors</a></h3>
592592
</div>
593593

594594
<p>To match a subset of "class" values, each value must be preceded
595-
by a ".", in any order.</P>
595+
by a ".".</P>
596596

597597
<div class="example"><P style="display:none">Example(s):</P><P>
598598
For example, the following rule matches any P element whose "class" attribute
599599
has been assigned a list of space-separated values that includes "pastoral"
600600
and "marine":</p>
601601

602602
<pre>
603-
p.pastoral.marine { color: green }
603+
p.marine.pastoral { color: green }
604604
</pre>
605605

606606
<p>This rule matches when <samp>class="pastoral blue aqua
@@ -1024,7 +1024,7 @@ <h3>5.11.4 <a name="lang">The language pseudo-class:</a> <a name="x41"><span
10241024

10251025
<p>C must not be empty.
10261026

1027-
<p class=note>Note: It is recommended, that documents and
1027+
<p class=note>Note: It is recommended that documents and
10281028
protocols indicate language using codes from RFC 3066 <a href="refs.html#ref-RFC3066" rel="biblioentry" class="noxref"><span class="informref">[RFC3066]</span></a> or
10291029
its successor, and by means of "xml:lang" attributes in the case of
10301030
XML-based documents <a href="refs.html#ref-XML10" rel="biblioentry" class="noxref"><span class="normref">[XML10]</span></a>. See <a
@@ -1057,7 +1057,7 @@ <h3>5.11.4 <a name="lang">The language pseudo-class:</a> <a name="x41"><span
10571057
:lang(fr) (because both are in French).
10581058

10591059
<pre>&lt;body lang=fr>
1060-
&lt;p>Je suis fran&ccedil;ais.&lt;/p>
1060+
&lt;p>Je suis Fran&ccedil;ais.&lt;/p>
10611061
&lt;/body></pre>
10621062
</div>
10631063

css2/syndata.html

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,9 @@ <h3>4.1.2 <a name="keywords">Keywords</a></h3>
206206

207207

208208

209-
<p>Keywords have the form of <a href="">identifiers.</a> Keywords must not be placed
210-
between quotes ("..." or '...'). Thus,
209+
<p>Keywords have the form of <a
210+
href="#value-def-identifier">identifiers.</a> Keywords must not be
211+
placed between quotes ("..." or '...'). Thus,
211212
</p>
212213
<pre>
213214
red
@@ -231,10 +232,10 @@ <h3>4.1.2 <a name="keywords">Keywords</a></h3>
231232

232233
<h4 id="vendor-keywords"><a name="q4">4.1.2.1 Vendor-specific extensions</a></h4>
233234

234-
<p>In CSS&nbsp;2.1, identifiers may begin with '<code
235+
<p>In CSS, identifiers may begin with '<code
235236
class="css">-</code>' (dash) or '<code
236237
class="css">_</code>' (underscore). Keywords
237-
and <a href="#properties">property names,</a> beginning
238+
and <a href="#properties">property names</a> beginning
238239
with <code class="css">-</code>' or '<code
239240
class="css">_</code>' are reserved for vendor-specific extensions. Such vendor-specific extensions should have one of the following formats:
240241
</p>
@@ -779,7 +780,7 @@ <h2>4.2 <a name="parsing-errors">Rules for handling parsing
779780
semicolon after 'color: red') is invalid and is dropped.
780781
</p>
781782
</li>
782-
<li>See also <a href="#rules-sets">Rule sets, declaration blocks, and
783+
<li>See also <a href="#rule-sets">Rule sets, declaration blocks, and
783784
selectors</a> for parsing rules for declaration blocks.
784785
</li>
785786
</ul>
@@ -1022,7 +1023,7 @@ <h3>4.3.3 <a name="percentage-units">Percentages</a></h3>
10221023
<h3>4.3.4 <a name="uri">URLs and URIs</a></h3>
10231024

10241025
<p>URI values (Uniform Resource Identifiers, see <a href="refs.html#ref-RFC3986" rel="biblioentry" class="noxref"><span class="normref">[RFC3986]</span></a>, which
1025-
includes URLs, URNs, etc)in this specification are denoted by <span
1026+
includes URLs, URNs, etc) in this specification are denoted by <span
10261027
class="index-def" title="&lt;uri&gt;::definition of"><a
10271028
name="value-def-uri" class="value-def">&lt;uri&gt;</a></span>. The
10281029
functional notation used to designate URIs in property values is
@@ -1103,11 +1104,16 @@ <h3>4.3.5 <a name="counter">Counters</a></h3>
11031104
<p>To refer to a sequence of nested counters of the same name, the
11041105
notation is 'counters(&lt;identifier&gt;, &lt;string&gt;)' or
11051106
'counters(&lt;identifier&gt;, &lt;string&gt;, &lt;list-style-type&gt;)'
1106-
with optional whitespace separating the tokens. See
1107-
<a href="generate.html#scope">"Nested counters and scope"</a> in
1108-
the chapter on <a href="generate.html">generated content</a>.
1107+
with optional whitespace separating the tokens.
11091108
</p>
1110-
<p>In CSS2.1, the values of counters can
1109+
<p>See <a href="generate.html#scope">"Nested counters and scope"</a>
1110+
in the chapter on <a href="generate.html">generated content</a> for
1111+
how user agents must determine the value or values of the counter. See
1112+
the definition of counter values of the <a href="generate.html#propdef-content" class="noxref"><span
1113+
class="propinst-content">'content'</span></a> property for how it must
1114+
convert these values to a string.
1115+
</p>
1116+
<p>In CSS&nbsp;2.1, the values of counters can
11111117
only be referred to from the <a href="generate.html#propdef-content" class="noxref"><span
11121118
class="propinst-content">'content'</span></a> property. Note that 'none'
11131119
is a possible &lt;list-style-type&gt;: 'counter(x,
@@ -1125,11 +1131,6 @@ <h3>4.3.5 <a name="counter">Counters</a></h3>
11251131
</code></pre>
11261132
</div>
11271133

1128-
<p>Counters that are not in the <a
1129-
href="generate.html#scope">scope</a> of any 'counter-reset', are
1130-
assumed to have been reset to 0 by a 'counter-reset' on the root
1131-
element.
1132-
</p>
11331134
<h3>4.3.6 <a name="color-units">Colors</a></h3>
11341135
<p>
11351136
A <span class="index-def" title="&lt;color&gt;::definition of"><a

css2/tables.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,10 +1012,7 @@ <h3>17.5.3 <a name="height-layout">Table height algorithms</a></h3>
10121012
class="propinst-height">'height'</span></a> property for the 'table' or
10131013
'inline-table' element. A value of 'auto' means that the height is the
10141014
sum of the row heights plus any cell spacing or borders. Any other
1015-
value specifies the height explicitly; the table may thus be taller or
1016-
shorter than the height of its rows.
1017-
The <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a> property on 'table'
1018-
boxes is treated as a minimum height. CSS 2.1 does not define how
1015+
value is treated as a minimum height. CSS 2.1 does not define how
10191016
extra space is distributed when the 'height' property causes the table
10201017
to be taller than it otherwise would be.
10211018
<strong>Note.</strong> Future

0 commit comments

Comments
 (0)