8000 [css2] Issues 28, 36, 37, 38, 49, 75, 92, 129, 150, 162, 163, 166, 16… · w3c/csswg-drafts@3d91530 · GitHub
Skip to content

Commit 3d91530

Browse files
bert-githubbert-github
committed
[css2] Issues 28, 36, 37, 38, 49, 75, 92, 129, 150, 162, 163, 166, 169, 172, 173, 174, 175, 179, 180, 181, 182, 186, 187
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402508
1 parent 8524cca commit 3d91530

13 files changed

Lines changed: 159 additions & 115 deletions

‎css2/cascade.src‎

Lines changed: 3 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.59 2006-04-06 21:32:24 bbos Exp $ -->
3+
<!-- $Id: cascade.src,v 2.60 2006-06-02 16:18:03 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>
@@ -359,7 +359,8 @@ p { font-size: 24pt }
359359
<P>A selector's specificity is calculated as follows:</p>
360360

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

‎css2/changes.src‎

Lines changed: 3 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: changes.src,v 2.53 2006-04-14 16:26:52 bbos Exp $ -->
3+
<!-- $Id: changes.src,v 2.54 2006-06-02 16:18:03 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Changes</TITLE>
@@ -104,8 +104,8 @@ contents:
104104
<p>When both 'width' and 'right' (or 'width' and 'left') are 'auto',
105105
the element's computed width is the width of the contents (using an
106106
algorithm similar to that for table cells) and then 'right' (or
107-
'left') is solved. CSS2 incorrectly said that 'right' (or 'left') was
108-
set to 0 in that case, and then width was solved.
107+
'left') is solved for. CSS2 incorrectly said that 'right' (or 'left') was
108+
set to 0 in that case, and then width was solved for.
109109

110110
<h3 id="s-10-6-4"><a
111111
href="visudet.html#abs-non-replaced-height">Section 10.6.4 Absolutely

‎css2/colors.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: colors.src,v 2.44 2006-05-09 13:31:15 fantasai Exp $ -->
3+
<!-- $Id: colors.src,v 2.45 2006-06-02 16:18:03 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Colors and backgrounds</title>
@@ -408,7 +408,7 @@ on current platforms is:
408408
<dt> Unix using X11</dt>
409409
<dd> none</dd>
410410
<dt> Mac using QuickDraw</dt>
411-
<dd> apply gamma 1.45 [[ICC32]] (ColorSync-savvy applications
411+
<dd> apply gamma 1.45 [[ICC42]] (ColorSync-savvy applications
412412
may simply pass the sRGB ICC profile to ColorSync
413413
to perform correct color correction)</dd>
414414
<dt> SGI using X</dt>

‎css2/cover.src‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ applications). By separating the presentation style of documents from
8484
the content of documents, CSS&nbsp;2.1 simplifies Web authoring and
8585
site maintenance.
8686

87-
<P>CSS&nbsp;2.1 builds on CSS2 [[CSS2]] which builds on CSS1 [[CSS1]].
87+
<P>CSS&nbsp;2.1 builds on CSS2 [[-CSS2]] which builds on CSS1 [[-CSS1]].
8888
It supports media-specific style sheets so that authors may tailor the
8989
presentation of their documents to visual browsers, aural devices,
9090
printers, braille devices, handheld devices, etc. It also supports

‎css2/media.src‎

Lines changed: 3 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.37 2005-09-13 19:16:22 bbos Exp $ -->
3+
<!-- $Id: media.src,v 2.38 2006-06-02 16:18:03 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Media types</TITLE>
@@ -180,7 +180,8 @@ type. The 'tv' media type, for example, is a multimodal media
180180
type that renders both visually and aurally to a single canvas.
181181

182182

183-
<P>Unknown media type names must not result in the @media rule being ignored.
183+
<P>Unknown media type names must not result in the @media rule or
184+
@import rule being ignored.
184185

185186
<!--
186187
<P>Due to rapidly changing technologies, CSS2 does not specify a

‎css2/refs.src‎

Lines changed: 43 additions & 35 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.41 2006-04-07 19:45:56 bbos Exp $ -->
3+
<!-- $Id: refs.src,v 2.42 2006-06-02 16:18:03 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Bibliography</TITLE>
@@ -11,21 +11,10 @@
1111
<H2>Normative references</H2>
1212
<dl>
1313
<dt><strong><a name="ref-COLORIMETRY" class="normref">[COLORIMETRY]</a></strong>
14-
<dd>"Colorimetry, Second Edition", CIE Publication 15.2-1986,
15-
ISBN 3-900-734-00-3.<BR>
16-
<!--
17-
Available at <a href="http://www.hike.te.chiba-u.ac.jp/ikeda/CIE/publ/abst/15-2-86.html">http://www.hike.te.chiba-u.ac.jp/ikeda/CIE/publ/abst/15-2-86.html</a>.
18-
-->
19-
20-
<dt><strong><a name="ref-CSS1" class="normref">[CSS1]</a></strong>
21-
<dd>"Cascading Style Sheets, level 1", H. W. Lie and B. Bos,
22-
17 December 1996, revised 11 January 1999<BR>
23-
The latest version is available at <a href="http://www.w3.org/TR/REC-CSS1">http://www.w3.org/TR/REC-CSS1</a>
24-
25-
<dt><strong><a name="ref-CSS2" class="normref">[CSS2]</a></strong>
26-
<dd>"Cascading Style Sheets, level 2, CSS2 Specification", B. Bos, H.
27-
W. Lie, C. Lilley and I. Jacobs, 12 May 1998,<br>
28-
The latest version is available at <a href="http://www.w3.org/TR/REC-CSS2">http://www.w3.org/TR/REC-CSS2</a>
14+
<dd>"Colorimetry", Third Edition, Commission Internationale de
15+
l'Eclairage, CIE Publication 15:2004, ISBN 3-901-906-33-9.<BR>
16+
Available at <a href="http://www.cie.co.at/publ/abst/15-2004.html">
17+
http://www.cie.co.at/publ/abst/15-2004.html</a>
2918

3019
<dt><strong><a name="ref-FLEX" class="normref">[FLEX]</a></strong>
3120
<dd>"Flex: The Lexical Scanner Generator", Version 2.3.7, ISBN 1882114213.
@@ -45,11 +34,12 @@ reachable from the Recommendation.
4534
Available at <a href="http://www.iana.org/">
4635
http://www.iana.org/</a>.
4736

48-
<dt><strong><a name="ref-ICC32" class="normref">[ICC32]</a></strong>
49-
<dd>"ICC Profile Format Specification, version 3.2", 1995.<BR>
50-
51-
<!--Available at <A HREF="ftp://sgigate.sgi.com/pub/icc/ICC32.pdf">
52-
ftp://sgigate.sgi.com/pub/icc/ICC32.pdf</a>.-->
37+
<dt><strong><a name="ref-ICC42" class="normref">[ICC42]</a></strong>
38+
<dd>Specification ICC.1:2004-10 (Profile version 4.2.0.0) Image
39+
technology colour management &ndash; Architecture, profile format, and
40+
data structure.<BR>
41+
Available at <a href="http://www.color.org/icc_specs2.html">
42+
http://www.color.org/icc_specs2.html</a>
5343

5444
<dt><strong><a name="ref-ISO8879" class="normref">[ISO8879]</a></strong>
5545
<dd><a href="http://www.iso.ch/cate/d16387.html">ISO 8879:1986</a>
@@ -124,15 +114,20 @@ Available at <a href="http://www.ietf.org/rfc/rfc1738.txt">http://www.ietf.org/r
124114
<dd>"UTF-16, an encoding of ISO 10646", P. Hoffman, F. Yergeau, February 2000<br>
125115
Available at <a href="http://www.ietf.org/rfc/rfc2781.txt">http://www.ietf.org/rfc/rfc2781.txt</a>.
126116

127-
<dt><strong><a name="ref-SRGB" class="normref">[SRGB]</a></strong>
128-
<dd>"Proposal for a Standard Color Space for the Internet - sRGB",
129-
M. Anderson, R. Motta, S. Chandrasekar, M. Stokes.<BR>
130-
Available at <a href="http://www.w3.org/Graphics/Color/sRGB.html">
131-
http://www.w3.org/Graphics/Color/sRGB.html</a>.
117+
<dt><strong><a name="ref-RFC3629" class="normref">[RFC3629]</a></strong>
118+
<dd>"UTF-8, a transformation format of ISO 10646", F. Yergeau,
119+
November 2003.<BR>
120+
Available at <a href="http://www.ietf.org/rfc/rfc3629.txt">
121+
http://www.ietf.org/rfc/rfc3629.txt</a>
132122

133-
<!-- Check out latest version of sRGB spec at
134-
http://www.hpl.hp.com/personal/Michael_Stokes/, then make
135-
it a W3C Note -IJ -->
123+
<dt><strong><a name="ref-SRGB" class="normref">[SRGB]</a></strong>
124+
<dd>IEC 61966-2-1 (1999-10) - "Multimedia systems and equipment -
125+
Colour measurement and management - Part 2-1: Colour management -
126+
Default RGB colour space - sRGB, ISBN: 2-8318-4989-6 � ICS codes:
127+
33.160.60, 37.080 � TC 100 � 51 pp.<BR>
128+
Available at
129+
<a href="http://domino.iec.ch/webstore/webstore.nsf/artnum/025408">
130+
http://domino.iec.ch/web 289D store/webstore.nsf/artnum/025408</a>
136131

137132
<dt><strong><a name="ref-UAAG10" class="normref">[UAAG10]</a></strong>
138133
<dd>"User Agent Accessibility Guidelines 1.0." Ian Jacobs, Jon
@@ -141,16 +136,19 @@ Available at <a href="http://www.w3.org/TR/2002/REC-UAAG10-20021217/">
141136
http://www.w3.org/TR/2002/REC-UAAG10-20021217</a>
142137

143138
<dt><strong><a name="ref-UNICODE" class="normref">[UNICODE]</a></strong>
144-
<dd>The Unicode Consortium. The Unicode Standard, Version 4.0.0,
139+
<dd>The Unicode Consortium. The Unicode Standard, Version 4.1.0,
145140
defined by: The Unicode Standard, Version 4.0 (Boston, MA,
146-
Addison-Wesley, 2003. ISBN 0-321-18578-1) as updated from time to time
147-
by the publication of new versions. (See <a
141+
Addison-Wesley, 2003. ISBN 0-321-18578-1), as amended by <a
142+
href="http://www.unicode.org/versions/Unicode4.0.1/"> Unicode
143+
4.0.1</a> and <a href="http://www.unicode.org/versions/Unicode4.1.0">
144+
Unicode 4.1.0</a> and as updated from time to time by the publication
145+
of new versions. (See <a
148146
href="http://www.unicode.org/unicode/standard/versions">
149147
http://www.unicode.org/unicode/standard/versions</a> for the latest
150148
version and additional information on versions of the standard and of
151-
the Unicode Character Database).<br>
152-
Available at <a href="http://www.unicode.org/versions/Unicode4.0.0/">
153-
http://www.unicode.org/versions/Unicode4.0.0/</a>
149+
the Unicode Character Database).<br> Available at <a
150+
href="http://www.unicode.org/versions/Unicode4.1.0/">
151+
http://www.unicode.org/versions/Unicode4.1.0/</a>
154152

155153
<dt><strong><a name="ref-XML10" class="normref">[XML10]</a></strong>
156154
<dd>"Extensible Markup Language (XML) 1.0 (third edition)"
@@ -172,6 +170,16 @@ charset values from <A
172170
href="http://www.iana.org/assignments/character-sets">
173171
http://www.iana.org/assignments/character-sets</A>. </DD>
174172

173+
<dt><strong><a name="ref-CSS1" class="informref">[CSS1]</a></strong>
174+
<dd>"Cascading Style Sheets, level 1", H. W. Lie and B. Bos,
175+
17 December 1996, revised 11 January 1999<BR>
176+
The latest version is available at <a href="http://www.w3.org/TR/REC-CSS1">http://www.w3.org/TR/REC-CSS1</a>
177+
178+
<dt><strong><a name="ref-CSS2" class="informref">[CSS2]</a></strong>
179+
<dd>"Cascading Style Sheets, level 2, CSS2 Specification", B. Bos, H.
180+
W. Lie, C. Lilley and I. Jacobs, 12 May 1998,<br>
181+
The latest version is available at <a href="http://www.w3.org/TR/REC-CSS2">http://www.w3.org/TR/REC-CSS2</a>
182+
175183
<dt><strong><a name="ref-CSS3LIST" class="informref">[CSS3LIST]</a></strong>
176184
<dd>"CSS3 module: lists," Tantek �elik, Ian Hickson, 7 November 2002,
177185
W3C working draft (work in progress). Available at <a

‎css2/selector.src‎

Lines changed: 5 additions & 5 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.101 2006-04-25 14:22:55 bbos Exp $ -->
3+
<!-- $Id: selector.src,v 2.102 2006-06-02 16:18:03 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Selectors</title>
@@ -539,15 +539,15 @@ text, while the second would:</p>
539539
</div>
540540

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

544544
<div class="example"><P>
545545
For example, the following rule matches any P element whose "class" attribute
546546
has been assigned a list of space-separated values that includes "pastoral"
547547
and "marine":</p>
548548

549549
<pre>
550-
p.pastoral.marine { color: green }
550+
p.marine.pastoral { color: green }
551551
</pre>
552552

553553
<p>This rule matches when <samp>class="pastoral blue aqua
@@ -973,7 +973,7 @@ have to be a valid language name.</p>
973973

974974
<p>C must not be empty.
975975

976-
<p class=note>Note: It is recommended, that documents and
976+
<p class=note>Note: It is recommended that documents and
977977
protocols indicate language using codes from RFC 3066 [[-RFC3066]] or
978978
its successor, and by means of "xml:lang" attributes in the case of
979979
XML-based documents [[XML10]]. See <a
@@ -1006,7 +1006,7 @@ text uses the English quotation marks. </div>
10061006
:lang(fr) (because both are in French).
10071007

10081008
<pre>&lt;body lang=fr>
1009-
&lt;p>Je suis fran&ccedil;ais.&lt;/p>
1009+
&lt;p>Je suis Fran&ccedil;ais.&lt;/p>
10101010
&lt;/body></pre>
10111011
</div>
10121012

‎css2/syndata.src‎

Lines changed: 17 additions & 16 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: syndata.src,v 2.143 2006-05-10 08:46:14 bbos Exp $ -->
3+
<!-- $Id: syndata.src,v 2.144 2006-06-02 16:18:03 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Syntax and basic data types</title>
@@ -154,8 +154,9 @@ undefined in CSS&nbsp;2.1.
154154
<!-- provide better explanation of where keywords appear:
155155
media types, at-rules, etc. -IJ -->
156156

157-
<p>Keywords have the form of <a href="">identifiers.</a> Keywords must not be placed
158-
between quotes ("..." or '...'). Thus,
157+
<p>Keywords have the form of <a
158+
href="#value-def-identifier">identifiers.</a> Keywords must not be
159+
placed between quotes ("..." or '...'). Thus,
159160
</p>
160161
<pre>
161162
red
@@ -179,10 +180,10 @@ background: "red";
179180

180181
<h4 id="vendor-keywords">Vendor-specific extensions</h4>
181182

182-
<p>In CSS&nbsp;2.1, identifiers may begin with '<code
183+
<p>In CSS, identifiers may begin with '<code
183184
class="css">-</code>' (dash) or '<code
184185
class="css">_</code>' (underscore). Keywords
185-
and <a href="#properties">property names,</a> beginning
186+
and <a href="#properties">property names</a> beginning
186187
with <code class="css">-</code>' or '<code
187188
class="css">_</code>' are reserved for vendor-specific extensions. Such vendor-specific extensions should have one of the following formats:
188189
</p>
@@ -727,7 +728,7 @@ in a conformant UA.
727728
semicolon after 'color: red') is invalid and is dropped.
728729
</p>
729730
</li>
730-
<li>See also <a href="#rules-sets">Rule sets, declaration blocks, and
731+
<li>See also <a href="#rule-sets">Rule sets, declaration blocks, and
731732
selectors</a> for parsing rules for declaration blocks.
732733
</li>
733734
</ul>
@@ -973,7 +974,7 @@ p { line-height: 120% } /* 120% of 'font-size' */
973974
<h3><a name="uri">URLs and URIs</a></h3>
974975

975976
<p>URI values (Uniform Resource Identifiers, see [[RFC3986]], which
976-
includes URLs, URNs, etc)in this specification are denoted by <span
977+
includes URLs, URNs, etc) in this specification are denoted by <span
977978
class="index-def" title="&lt;uri&gt;::definition of"><a
978979
name="value-def-uri" class="value-def">&lt;uri&gt;</a></span>. The
979980
functional notation used to designate URIs in property values is
@@ -1054,11 +1055,16 @@ is used. The default style is 'decimal'.
10541055
<p>To refer to a sequence of nested counters of the same name, the
10551056
notation is 'counters(&lt;identifier&gt;, &lt;string&gt;)' or
10561057
'counters(&lt;identifier&gt;, &lt;string&gt;, &lt;list-style-type&gt;)'
1057-
with optional whitespace separating the tokens. See
1058-
<a href="generate.html#scope">"Nested counters and scope"</a> in
1059-
the chapter on <a href="generate.html">generated content</a>.
1058+
with optional whitespace separating the tokens.
10601059
</p>
1061-
<p>In CSS2.1, the values of counters can
1060+
<p>See <a href="generate.html#scope">"Nested counters and scope"</a>
1061+
in the chapter on <a href="generate.html">generated content</a> for
1062+
how user agents must determine the value or values of the counter. See
1063+
the definition of counter values of the <span
1064+
class="propinst-content">'content'</span> property for how it must
1065+
convert these values to a string.
1066+
</p>
1067+
<p>In CSS&nbsp;2.1, the values of counters can
10621068
only be referred to from the <span
10631069
class="propinst-content">'content'</span> property. Note that 'none'
10641070
is a possible &lt;list-style-type&gt;: 'counter(x,
@@ -1076,11 +1082,6 @@ p:before {content: counter(par-num, upper-roman) ". "}
10761082
</code></pre>
10771083
</div>
10781084

1079-
<p>Counters that are not in the <a
1080-
href="generate.html#scope">scope</a> of any 'counter-reset', are
1081-
assumed to have been reset to 0 by a 'counter-reset' on the root
1082-
element.
1083-
</p>
10841085
<h3><a name="color-units">Colors</a></h3>
10851086
<p>
10861087
A <span class="index-def" title="&lt;color&gt;::definition of"><a

‎css2/tables.src‎

Lines changed: 2 additions & 5 deletions
926
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: tables.src,v 2.94 2006-04-06 21:32:24 bbos Exp $ -->
3+
<!-- $Id: tables.src,v 2.95 2006-06-02 16:18:03 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
66
<title>Tables</title>
@@ -924,10 +924,7 @@ vice versa.</em>
924924
class="propinst-height">'height'</span> property for the 'table' or
925925
'inline-table' element. A value of 'auto' means that the height is the
926
sum of the row heights plus any cell spacing or borders. Any other
927-
value specifies the height explicitly; the table may thus be taller or
928-
shorter than the height of its rows.
929-
The <span class="propinst-height">'height'</span> property on 'table'
930-
boxes is treated as a minimum height. CSS 2.1 does not define how
927+
value is treated as a minimum height. CSS 2.1 does not define how
931928
extra space is distributed when the 'height' property causes the table
932929
to be taller than it otherwise would be.
933930
<strong>Note.</strong> Future

‎css2/text.src‎

Lines changed: 5 additions & 1 deletion
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: text.src,v 2.54 2006-05-09 14:01:15 fantasai Exp $ -->
3+
<!-- $Id: text.src,v 2.55 2006-06-02 16:18:03 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Text</title>
@@ -482,6 +482,10 @@ As each line is laid out,
482482
'white-space' set to 'pre-wrap', UAs may visually collapse them.
483483
</ol>
484484

485+
<p>
486+
A float should not introduce a line break opportunity.
487+
</p>
488+
485489
<div class="note"><p>
486490
<em><strong>Note.</strong>
487491
CSS 2.1 does not fully define where line breaking opportunities occur.

0 commit comments

Comments
 (0)