Skip to content

Commit 80a102e

Browse files
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402860
1 parent 7ecb6f6 commit 80a102e

5 files changed

Lines changed: 39 additions & 17 deletions

File tree

css2/cascade.html

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,18 @@ <H2>6.3 <a name="at-import">The @import rule</a></h2>
255255

256256
<p>In the absence of any media types, the import is
257257
unconditional. Specifying 'all' for the medium has the same effect.
258+
The import only takes effect if the target medium matches the media
259+
list.
260+
261+
<p>A target medium matches a media list if one of the items in the
262+
media list is the target medium or 'all'.
263+
264+
<p class=note>Note that Media Queries <a href="refs.html#ref-MEDIAQ" rel="biblioentry" class="noxref"><span class="informref">[MEDIAQ]</span></a> extends the syntax of
265+
media lists and the definition of matching.
266+
267+
<p>When the same style sheet is imported or linked to a document in
268+
multiple places, user agents must process (or act as though they do)
269+
each link as though the link were to a separate style sheet.
258270

259271
<H2>6.4 <a name="cascade">The cascade</a></h2>
260272

@@ -314,7 +326,10 @@ <H3>6.4.1 <a name="cascading-order">Cascading order</a></H3>
314326
Find all declarations that apply to the element and property in
315327
question, for the target <a href="media.html">media type</a>.
316328
Declarations apply if the associated selector <A
317-
HREF="selector.html">matches</A> the element in question.
329+
HREF="selector.html">matches</A> the element in question and the
330+
target medium matches the media list on all @media rules
331+
containing the declaration and on all links on the path through
332+
which the style sheet was reached.
318333

319334
<LI>Sort according to importance (normal or important)
320335
and origin (author, user, or user agent). In ascending order of

css2/fonts.html

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -619,15 +619,11 @@ <h2>15.6 <a name="font-boldness">Font boldness</a>: the
619619
</p>
620620
<ul>
621621
<li>'bolder' selects the next weight that is assigned to a font that
622-
is darker than the inherited one. If there is no such weight, it
623-
simply results in the next darker numerical value (and the font
624-
remains unchanged), unless the inherited value was '900' in which case
625-
the resulting weight is also '900'.
622+
is darker than the inherited one.
626623
</li>
627624
<li>'lighter' is similar, but works in the opposite direction: it
628625
selects the next lighter keyword with a different font from the
629-
inherited one, unless there is no such font, in which case it selects
630-
the next lighter numerical value (and keeps the font unchanged).
626+
inherited one.
631627
</li>
632628
</ul>
633629

css2/refs.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,13 @@ <H2><a name="q2">B.2 Informative references</a></H2>
219219
Available at <a href="http://www.w3.org/TR/2001/REC-MathML2-20010221/">
220220
http://www.w3.org/TR/2001/REC-MathML2-20010221</a>
221221

222+
<dt><strong><a name="ref-MEDIAQ" class="informref">[MEDIAQ]</a></strong>
223+
<dd>"Media Queries", Håkon Wium Lie, Tantek Çelik, Daniel Glazman,
224+
Anne van Kesteren, 28 March 2008<br>
225+
(Work in progress.) Available at <a
226+
href="http://www.w3.org/TR/2008/CR-css3-mediaqueries-20080328/">
227+
http://www.w3.org/TR/2008/CR-css3-mediaqueries-20080328</a>
228+
222229
<dt><strong><a name="ref-P3P" class="informref">[P3P]</a></strong>
223230
<dd>"The Platform for Privacy Preferences 1.0 (P3P1.0) Specification",
224231
L. Cranor, M. Langheinrich, M. Marchiori, M. Presler-Marshall,

css2/syndata.html

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,8 @@ <h3>4.1.7 <a name="rule-sets">Rule sets, declaration blocks, and selectors</a></
489489
not including) the first left curly brace ({). A selector always goes
490490
together with a declaration block. When a user agent can't parse the selector (i.e., it
491491
is not valid CSS&nbsp;2.1), it must <span class="index-inst" title="ignore"><a name="x16"
492-
href="#ignore">ignore</a></span> the declaration block as well.
492+
href="#ignore">ignore</a></span> the selector and the following
493+
declaration block (if any) as well.
493494
</p>
494495
<p>CSS&nbsp;2.1 gives a special meaning to the comma (,) in
495496
selectors. However, since it is not known if the comma may acquire
@@ -688,11 +689,11 @@ <h2>4.2 <a name="parsing-errors">Rules for handling parsing
688689
<p>A user agent conforming to a future CSS specification may accept one or
689690
more of the other rules as well.</p>
690691
</li>
691-
<li><strong>Malformed statements.</strong> User agents must handle
692-
unexpected tokens encountered while parsing a statement by reading
693-
until the end of the statement, while observing the rules for matching
692+
<li><strong>Malformed declarations.</strong> User agents must handle
693+
unexpected tokens encountered while parsing a declaration by reading
694+
until the end of the declaration, while observing the rules for matching
694695
pairs of (), [], {}, "", and '', and correctly handling escapes. For
695-
example, a malformed statement may be missing a property, colon (:) or
696+
example, a malformed declaration may be missing a property, colon (:) or
696697
value. The following are all equivalent:
697698

698699

@@ -710,9 +711,10 @@ <h2>4.2 <a name="parsing-errors">Rules for handling parsing
710711

711712

712713
<li><strong>Invalid at-keywords.</strong> User agents must <span
713-
class="index-inst" title="ignore"><a name="x28" href="#ignore">ignore</a></span> an
714-
invalid at-keyword together with everything following it, up to and
715-
including the next semicolon (;) or block ({...}), whichever
714+
class="index-inst" title="ignore"><a name="x28" href="#ignore">ignore</a></span>
715+
an invalid at-keyword together with everything following it, up to and
716+
including the next semicolon (;), the next block ({...}), or the end
717+
of the block (}) that contains the invalid at-keyword, whichever
716718
comes first. For example, consider the following:
717719

718720
<pre class="illegal-example"><code>

css2/visudet.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ <h3>10.3.2 <a name="inline-replaced-width">Inline, replaced elements</a></h3>
399399
<p>Percentage intrinsic widths are first evaluated with respect to the
400400
containing block's width, if that width doesn't itself depend on the
401401
replaced element's width. If it does, then the resulting layout is
402-
undefined in CSS2.1.
402+
undefined in CSS&nbsp;2.1.
403403

404404

405405
<h3>10.3.3 <a name="blockwidth">Block-level, non-replaced elements in normal
@@ -1100,7 +1100,9 @@ <h3>10.6.4 <a name="abs-non-replaced-height">Absolutely positioned, non-replaced
11001100
the top margin edge of a hypothetical box that would have been the
11011101
first box of the element if its specified <a href="visuren.html#propdef-position" class="noxref"><span
11021102
class="propinst-position">'position'</span></a> value had been 'static'
1103-
and its specified 'float' had been 'none'. (Note that due to the rules
1103+
and its specified <a href="visuren.html#propdef-float" class="noxref"><span class="propinst-float">'float'</span></a> had been
1104+
'none' and <a href="visuren.html#propdef-clear" class="noxref"><span class="propinst-clear">'clear'</span></a> had been
1105+
'none'. (Note that due to the rules
11041106
in <a href="visuren.html#dis-pos-flo">section&nbsp;9.7</a> this might
11051107
require also assuming a different computed value for 'display'.)
11061108
The value is negative if the hypothetical box is above the containing

0 commit comments

Comments
 (0)