[css2] Generated. Do not edit!

--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402862

Author: bert-github

css2/css2.html

@@ -2938,7 +2938,8 @@ <h3>4.1.7 <a name="rule-sets">Rule sets, declaration blocks, and selectors</a></
 not including) the first left curly brace ({).  A selector always goes
 together with a declaration block. When a user agent can't parse the selector (i.e., it
 is not valid CSS&nbsp;2.1), it must <span class="index-inst" title="ignore"><a name="x16"
-href="#ignore">ignore</a></span> the declaration block as well.
+href="#ignore">ignore</a></span> the selector and the following
+declaration block (if any) as well.
 </p>
 <p>CSS&nbsp;2.1 gives a special meaning to the comma (,) in
 selectors. However, since it is not known if the comma may acquire
@@ -3137,11 +3138,11 @@ <h2>4.2 <a name="parsing-errors">Rules for handling parsing
 <p>A user agent conforming to a future CSS specification may accept one or
 more of the other rules as well.</p>
 </li>
-<li><strong>Malformed statements.</strong> User agents must handle
-unexpected tokens encountered while parsing a statement by reading
-until the end of the statement, while observing the rules for matching
+<li><strong>Malformed declarations.</strong> User agents must handle
+unexpected tokens encountered while parsing a declaration by reading
+until the end of the declaration, while observing the rules for matching
 pairs of (), [], {}, "", and '', and correctly handling escapes. For
-example, a malformed statement may be missing a property, colon (:) or
+example, a malformed declaration may be missing a property, colon (:) or
 value. The following are all equivalent:
 
 
@@ -3159,9 +3160,10 @@ <h2>4.2 <a name="parsing-errors">Rules for handling parsing
 
 
 <li><strong>Invalid at-keywords.</strong> User agents must <span
-class="index-inst" title="ignore"><a name="x28" href="#ignore">ignore</a></span> an
-invalid at-keyword together with everything following it, up to and
-including the next semicolon (;) or block ({...}), whichever
+class="index-inst" title="ignore"><a name="x28" href="#ignore">ignore</a></span>
+an invalid at-keyword together with everything following it, up to and
+including the next semicolon (;), the next block ({...}), or the end
+of the block (}) that contains the invalid at-keyword, whichever
 comes first. For example, consider the following:
 
 <pre class="illegal-example"><code>
@@ -5654,6 +5656,18 @@ <H2>6.3 <a name="at-import">The @import rule</a></h2>
 
 <p>In the absence of any media types, the import is
 unconditional. Specifying 'all' for the medium has the same effect.
+The import only takes effect if the target medium matches the media
+list.
+
+<p>A target medium matches a media list if one of the items in the
+media list is the target medium or 'all'.
+
+<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
+media lists and the definition of matching.
+
+<p>When the same style sheet is imported or linked to a document in
+multiple places, user agents must process (or act as though they do)
+each link as though the link were to a separate style sheet.
 
 <H2>6.4 <a name="cascade">The cascade</a></h2>
 
@@ -5713,7 +5727,10 @@ <H3>6.4.1 <a name="cascading-order">Cascading order</a></H3>
       Find all declarations that apply to the element and property in
       question, for the target <a href="media.html">media type</a>.
       Declarations apply if the associated selector <A
-      HREF="selector.html">matches</A> the element in question.
+      HREF="selector.html">matches</A> the element in question and the
+      target medium matches the media list on all @media rules
+      containing the declaration and on all links on the path through
+      which the style sheet was reached.
 
     <LI>Sort  according to importance (normal or important)
 and origin (author, user, or user agent). In ascending order of
@@ -10031,7 +10048,7 @@ <h3>10.3.2 <a name="inline-replaced-width">Inline, replaced elements</a></h3>
 <p>Percentage intrinsic widths are first evaluated with respect to the
 containing block's width, if that width doesn't itself depend on the
 replaced element's width. If it does, then the resulting layout is
-undefined in CSS2.1.
+undefined in CSS&nbsp;2.1.
 
 
 <h3>10.3.3 <a name="blockwidth">Block-level, non-replaced elements in normal
@@ -10732,7 +10749,9 @@ <h3>10.6.4 <a name="abs-non-replaced-height">Absolutely positioned, non-replaced
 the top margin edge of a hypothetical box that would have been the
 first box of the element if its specified <a href="visuren.html#propdef-position" class="noxref"><span
 class="propinst-position">'position'</span></a> value had been 'static'
-and its specified 'float' had been 'none'. (Note that due to the rules
+and its specified <a href="visuren.html#propdef-float" class="noxref"><span class="propinst-float">'float'</span></a> had been
+'none' and <a href="visuren.html#propdef-clear" class="noxref"><span class="propinst-clear">'clear'</span></a> had been
+'none'. (Note that due to the rules
 in <a href="visuren.html#dis-pos-flo">section&nbsp;9.7</a> this might
 require also assuming a different computed value for 'display'.)
 The value is negative if the hypothetical box is above the containing
@@ -14626,15 +14645,11 @@ <h2>15.6 <a name="font-boldness">Font boldness</a>: the
 </p>
 <ul>
 <li>'bolder' selects the next weight that is assigned to a font that
-is darker than the inherited one. If there is no such weight, it
-simply results in the next darker numerical value (and the font
-remains unchanged), unless the inherited value was '900' in which case
-the resulting weight is also '900'.
+is darker than the inherited one.
 </li>
 <li>'lighter' is similar, but works in the opposite direction: it
 selects the next lighter keyword with a different font from the
-inherited one, unless there is no such font, in which case it selects
-the next lighter numerical value (and keeps the font unchanged).
+inherited one.
 </li>
 </ul>
 
@@ -19058,6 +19073,13 @@ <H2><a name="q2">B.2 Informative references</a></H2>
 Available at <a href="http://www.w3.org/TR/2001/REC-MathML2-20010221/">
 http://www.w3.org/TR/2001/REC-MathML2-20010221</a>
 
+<dt><strong><a name="ref-MEDIAQ" class="informref">[MEDIAQ]</a></strong>
+<dd>"Media Queries", Håkon Wium Lie, Tantek Çelik, Daniel Glazman,
+Anne van Kesteren, 28 March 2008<br>
+(Work in progress.) Available at <a
+href="http://www.w3.org/TR/2008/CR-css3-mediaqueries-20080328/">
+http://www.w3.org/TR/2008/CR-css3-mediaqueries-20080328</a>
+
 <dt><strong><a name="ref-P3P" class="informref">[P3P]</a></strong>
 <dd>"The Platform for Privacy Preferences 1.0 (P3P1.0) Specification",
 L. Cranor, M. Langheinrich, M. Marchiori, M. Presler-Marshall,

css2/diffs-rec/cascade.html

@@ -255,6 +255,18 @@ <H2>6.3 <a name="at-import">The @import rule</a></h2>
 
 <p>In the absence of any media types, the import is
 unconditional. Specifying 'all' for the medium has the same effect.
+<ins>The</ins> <ins>import</ins> <ins>only</ins> <ins>takes</ins> <ins>effect</ins> <ins>if</ins> <ins>the</ins> <ins>target</ins> <ins>medium</ins> <ins>matches</ins> <ins>the</ins> <ins>media</ins>
+<ins>list.</ins>
+
+<p><ins>A</ins> <ins>target</ins> <ins>medium</ins> <ins>matches</ins> <ins>a</ins> <ins>media</ins> <ins>list</ins> <ins>if</ins> <ins>one</ins> <ins>of</ins> <ins>the</ins> <ins>items</ins> <ins>in</ins> <ins>the</ins>
+<ins>media</ins> <ins>list</ins> <ins>is</ins> <ins>the</ins> <ins>target</ins> <ins>medium</ins> <ins>or</ins> <ins>'all'.</ins>
+
+<p class=note><ins>Note</ins> <ins>that</ins> <ins>Media</ins> <ins>Queries</ins> <a href="refs.html#ref-MEDIAQ" rel="biblioentry" class="noxref"><span class="informref"><ins>[MEDIAQ]</ins></span></a> <ins>extends</ins> <ins>the</ins> <ins>syntax</ins> <ins>of</ins>
+<ins>media</ins> <ins>lists</ins> <ins>and</ins> <ins>the</ins> <ins>definition</ins> <ins>of</ins> <ins>matching.</ins>
+
+<p><ins>When</ins> <ins>the</ins> <ins>same</ins> <ins>style</ins> <ins>sheet</ins> <ins>is</ins> <ins>imported</ins> <ins>or</ins> <ins>linked</ins> <ins>to</ins> <ins>a</ins> <ins>document</ins> <ins>in</ins>
+<ins>multiple</ins> <ins>places,</ins> <ins>user</ins> <ins>agents</ins> <ins>must</ins> <ins>process</ins> <ins>(or</ins> <ins>act</ins> <ins>as</ins> <ins>though</ins> <ins>they</ins> <ins>do)</ins>
+<ins>each</ins> <ins>link</ins> <ins>as</ins> <ins>though</ins> <ins>the</ins> <ins>link</ins> <ins>were</ins> <ins>to</ins> <ins>a</ins> <ins>separate</ins> <ins>style</ins> <ins>sheet.</ins>
 
 <H2>6.4 <a name="cascade">The cascade</a></h2>
 
@@ -285,8 +297,8 @@ <H2>6.4 <a name="cascade">The cascade</a></h2>
 font). See <a href="sample.html"> <del>"A</del><ins>A</ins> sample style sheet for HTML
 </a>  <del>4.0"</del>for a recommended default style sheet for HTML  <del>4.0</del>documents.
 
-<p class="note"> <del>Note</del> <del>that</del> <del>the</del> <del>default</del> <del>style</del> <del>sheet</del> <del>may</del> <del>change</del> <del>if</del> <del>system</del> <del>settings</del> <del>are</del> <del>modified</del> <del>by</del><ins>Note</ins> <ins>that</ins> the user  <del>(e.g.,</del><ins>may</ins> <ins>modify</ins> system  <del>colors).</del><ins>settings</ins> <ins>(e.g.</ins> 
-<ins>system</ins> <ins>colors)</ins> <ins>that</ins> <ins>affect</ins> <ins>the</ins> <ins>default</ins> <ins>style</ins> <ins>sheet.</ins> However,  <del>due</del> <del>to</del> <del>limitations</del> <del>in</del> <del>a</del><ins>some</ins> user 
+<p class="note">Note that the  <del>default</del> <del>style</del> <del>sheet</del><ins>user</ins> may  <del>change</del> <del>if</del><ins>modify</ins> system settings  <del>are</del> <del>modified</del> <del>by</del> <del>the</del> <del>user</del> <del>(e.g.,</del><ins>(e.g.</ins> 
+system  <del>colors).</del><ins>colors)</ins> <ins>that</ins> <ins>affect</ins> <ins>the</ins> <ins>default</ins> <ins>style</ins> <ins>sheet.</ins> However,  <del>due</del> <del>to</del> <del>limitations</del> <del>in</del> <del>a</del><ins>some</ins> user 
  <del>agent's</del> <del>internal</del> <del>implementation,</del><ins>agent</ins> <ins>implementations</ins> <ins>make</ins> it  <del>may</del> <del>be</del>impossible to change the values in the 
 default style sheet.
 </ul>
@@ -314,14 +326,17 @@ <H3> <del>Imported</del> <del>style</del> <del>sheets</del> <del>also</del> <del
       Find all declarations that apply to the element and property in
       question, for the target <a href="media.html">media type</a>.
       Declarations apply if the associated selector <A
-      HREF="selector.html">matches</A> the element in question.
+      HREF="selector.html">matches</A> the element in  <del>question.</del><ins>question</ins> <ins>and</ins> the
+       <del>primary</del> <del>sort</del> <del>of</del><ins>target</ins> <ins>medium</ins> <ins>matches</ins> the  <del>declarations</del> <del>is</del> <del>by</del> <del>weight</del><ins>media</ins> <ins>list</ins> <ins>on</ins> <ins>all</ins> <ins>@media</ins> <ins>rules</ins>
+      <ins>containing</ins> <ins>the</ins> <ins>declaration</ins> and  <del>origin:</del> <del>for</del> <del>normal</del> <del>declarations,</del> <del>author</del> <del>style</del> <del>sheets</del> <del>override</del> <del>user</del> <del>style</del> <del>sheets</del><ins>on</ins> <ins>all</ins> <ins>links</ins> <ins>on</ins> <ins>the</ins> <ins>path</ins> <ins>through</ins>
+      which  <del>override</del>the  <del>default</del>style  <del>sheet.</del> <del>For</del> <del>"!important"</del> <del>declarations,</del><ins>sheet</ins> <ins>was</ins> <ins>reached.</ins>
 
-    <LI> <del>The</del> <del>primary</del>Sort   <del>of</del> <del>the</del> <del>declarations</del> <del>is</del> <del>by</del> <del>weight</del><ins>according</ins> <ins>to</ins> <ins>importance</ins> <ins>(normal</ins> <ins>or</ins> <ins>important)</ins>
-and  <del>origin:</del> <del>for</del> <del>normal</del> <del>declarations,</del> <del>author</del> <del>style</del> <del>sheets</del> <del>override</del><ins>origin</ins> <ins>(author,</ins> <ins>user,</ins> <ins>or</ins> user  <del>style</del> <del>sheets</del> <del>which</del> <del>override</del> <del>the</del> <del>default</del> <del>style</del> <del>sheet.</del> <del>For</del> <del>"!important"</del> <del>declarations,</del><ins>agent).</ins> <ins>In</ins> <ins>ascending</ins> <ins>order</ins> <ins>of</ins>
+    <LI><ins>Sort</ins>  <ins>according</ins> <ins>to</ins> <ins>importance</ins> <ins>(normal</ins> <ins>or</ins> <ins>important)</ins>
+<ins>and</ins> <ins>origin</ins> <ins>(author,</ins> <ins>user,</ins> <ins>or</ins> user  <del>style</del> <del>sheets</del> <del>override</del><ins>agent).</ins> <ins>In</ins> <ins>ascending</ins> <ins>order</ins> <ins>of</ins>
 <ins>precedence:</ins>
 
 <ol>
-<li>user  <del>style</del> <del>sheets</del> <del>override</del><ins>agent</ins> <ins>declarations</ins>
+<li><ins>user</ins> <ins>agent</ins> <ins>declarations</ins>
 <li><ins>user</ins> <ins>normal</ins> <ins>declarations</ins>
 <li>author  <del>style</del> <del>sheets</del> <del>which</del> <del>override</del> <del>the</del> <del>default</del> <del>style</del> <del>sheet.</del> <del>"!important"</del> <del>declaration</del> <del>override</del>normal  <del>declarations.</del> <del>An</del> <del>imported</del> <del>style</del> <del>sheet</del> <del>has</del><ins>declarations</ins>
 <li><ins>author</ins> <ins>important</ins> <ins>declarations</ins>