[css2] Generated. Do not edit!

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

Author: bert-github

css2/cascade.html

@@ -315,27 +315,29 @@ <H3>6.4.1 <a name="cascading-order">Cascading order</a></H3>
       Declarations apply if the associated selector <A
       HREF="selector.html">matches</A> the element in question.
 
-    <LI>Sort by importance (normal or important) and origin (author, user, or user agent). In ascending order:
+    <LI>Sort  according to importance (normal or important)
+and origin (author, user, or user agent). In ascending order of
+precendence:
 
 <ol>
-<li>user agent style sheets
-<li>user normal style sheets
-<li>author normal style sheets
-<li>author important style sheets
-<li>user important style sheets
+<li>user agent declarations
+<li>user normal declarations
+<li>author normal declarations
+<li>author important declarations
+<li>user important declarations
 </ol>
 
     <LI>
-      Sort by <a href="#specificity">specificity</a> 
+      Sort rules with the same importance and origin by <a href="#specificity">specificity</a> 
       of selector: more specific
       selectors will override more general ones.  Pseudo-elements and
       pseudo-classes are counted as normal elements and classes,
       respectively.
 
-    <LI> Finally, sort by order specified: if two rules have the same
-    weight, origin and specificity,
-    the latter specified wins. Rules in imported style sheets are
-    considered to be before any rules in the style sheet itself.
+    <LI>Finally, sort by order specified: if two declarations have the
+    same weight, origin and specificity, the latter specified wins.
+    Declarations in imported style sheets are considered to be before any
+    declarations in the style sheet itself.
 
 </OL>
 

css2/changes.html

@@ -140,6 +140,11 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
 five groups: known errors, typographical errors, clarifications,
 changes and additions. Typographical errors are not listed here.</P>
 
+<p>This chapter is not a complete list of changes. For changes not
+listed here, please see the "disposition of comments" document that is
+published at the time this specification becomes a Candidate
+Recommendation.
+
 
 <h2>C.1 <a name="new">Additional property values</a></h2>
 

css2/colors.html

@@ -219,6 +219,26 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
 </pre>
 </div>
 
+<p>Intrinsic dimensions expressed as percentages must be resolved
+relative to the dimensions of the rectangle that establishes the
+coordinate system for the <a href="colors.html#propdef-background-position" class="noxref"><span
+class="propinst-background-position">'background-position'</span></a>
+property.
+</p>
+<p>If the image has no intrinsic dimensions and has an intrinsic ratio
+the dimensions must be assumed to be the largest dimensions at that
+ratio such that neither dimension exceeds the dimensions of the
+rectangle that establishes the coordinate system for the <a href="colors.html#propdef-background-position" class="noxref"><span
+class="propinst-background-position">'background-position'</span></a>
+property.
+</p>
+<p>If the image has no intrinsic ratio either, then the dimensions
+must be assumed to be the rectangle that establishes the coordinate
+system for the <a href="colors.html#propdef-background-position" class="noxref"><span
+class="propinst-background-position">'background-position'</span></a>
+property.
+</p>
+
 <div class="propdef">
 <dl><dt>
 <span class="index-def" title="'background-repeat'"><a name="propdef-background-repeat" class="propdef-title"><strong>'background-repeat'</strong></a></span>

css2/generate.html

@@ -229,7 +229,9 @@ <h2>12.2 <a name="content">The</a> <a href="generate.html#propdef-content" class
 <dt><span class="index-inst" title="&lt;uri&gt;"><a name="x12" href="syndata.html#value-def-uri" class="noxref"><span
 class="value-inst-uri"><strong>&lt;uri&gt;</strong></span></a></span>
 <dd>The value is a URI that designates an external resource (such as an image).
-If a user agent cannot display the resource it must ignore it.
+If  the user agent cannot display the resource it must either leave
+it out as if it were not specified or display some indication that
+the resource cannot be displayed.
 
 <dt><span class="index-inst" title="&lt;counter&gt;"><a name="x13" href="syndata.html#value-def-counter" class="noxref"><span
 class="value-inst-counter"><strong>&lt;counter&gt;</strong></span></a></span>

css2/grammar.html

@@ -66,7 +66,7 @@ <h2><a name="q1">G.1 Grammar</a></h2>
 
 <pre>
 stylesheet
-  : [ CHARSET_SYM S* STRING S* ';' ]?
+  : [ CHARSET_SYM STRING ';' ]?
     [S|CDO|CDC]* [ import [S|CDO|CDC]* ]*
     [ [ ruleset | media | page ] [S|CDO|CDC]* ]*
   ;
@@ -182,14 +182,15 @@ <h2><a name="q2">G.2 Lexical scanner</a></h2>
 invalid1	\"([^\n\r\f\\"]|\\{nl}|{escape})*
 invalid2	\'([^\n\r\f\\']|\\{nl}|{escape})*
 
+comment		\/\*[^*]*\*+([^/*][^*]*\*+)*\/
 ident		-?{nmstart}{nmchar}*
 name		{nmchar}+
 num		[0-9]+|[0-9]*"."[0-9]+
 string		{string1}|{string2}
 invalid		{invalid1}|{invalid2}
 url		([!#$%&amp;*-~]|{nonascii}|{escape})*
 s		[ \t\r\n\f]
-w		{s}*
+w		({s}|{comment})*
 nl		\n|\r\n|\r|\f
 
 A		a|\\0{0,4}(41|61)(\r\n|[ \t\r\n\f])?
@@ -211,7 +212,7 @@ <h2><a name="q2">G.2 Lexical scanner</a></h2>
 
 %%
 
-{s}+			{return S;}
+{s}			{return S;}
 
 \/\*[^*]*\*+([^/*][^*]*\*+)*\/		/* ignore comments */
 {s}+\/\*[^*]*\*+([^/*][^*]*\*+)*\/	{unput(' '); /*replace by space*/}
@@ -236,7 +237,7 @@ <h2><a name="q2">G.2 Lexical scanner</a></h2>
 "@import"		{return IMPORT_SYM;}
 "@page"			{return PAGE_SYM;}
 "@media"		{return MEDIA_SYM;}
-"@charset"		{return CHARSET_SYM;}
+"@charset "		{return CHARSET_SYM;}
 
 "!"{w}"important"	{return IMPORTANT_SYM;}
 

css2/propidx.html

@@ -429,7 +429,7 @@ <H1><a name="q0">Appendix F. Full property table</a></H1>
 <a href="box.html#propdef-margin-left"><span class="propinst-margin-left xref">'margin-left'</span></a>
 <td><a href="box.html#value-def-margin-width" class="noxref"><span class="value-inst-margin-width">&lt;margin-width&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
 <td>0
-<td>all elements except elements with table display     types other than table and inline-table
+<td>all elements except elements with table display     types other than table-caption, table and inline-table
 <td>no
 <td>refer to width of containing block
 <td><a href="media.html#visual-media-group">visual</a>
@@ -438,15 +438,15 @@ <H1><a name="q0">Appendix F. Full property table</a></H1>
 <a href="box.html#propdef-margin-bottom"><span class="propinst-margin-bottom xref">'margin-bottom'</span></a>
 <td><a href="box.html#value-def-margin-width" class="noxref"><span class="value-inst-margin-width">&lt;margin-width&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
 <td>0
-<td>all elements except elements with table display     types other than table and inline-table
+<td>all elements except elements with table display     types other than table-caption, table and inline-table
 <td>no
 <td>refer to width of containing block
 <td><a href="media.html#visual-media-group">visual</a>
 
 <tr><td><a href="box.html#propdef-margin"><span class="propinst-margin xref">'margin'</span></a>
 <td><a href="box.html#value-def-margin-width" class="noxref"><span class="value-inst-margin-width">&lt;margin-width&gt;</span></a>{1,4} | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
 <td>see individual properties
-<td>all elements except elements with table display     types other than table and inline-table
+<td>all elements except elements with table display     types other than table-caption, table and inline-table
 <td>no
 <td>refer to width of containing block
 <td><a href="media.html#visual-media-group">visual</a>
@@ -537,15 +537,15 @@ <H1><a name="q0">Appendix F. Full property table</a></H1>
 <a href="box.html#propdef-padding-left"><span class="propinst-padding-left xref">'padding-left'</span></a>
 <td><a href="box.html#value-def-padding-width" class="noxref"><span class="value-inst-padding-width">&lt;padding-width&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
 <td>0
-<td>all elements except elements with table display     types other than table, inline-table, and table-cell
+<td>all elements except table-row-group, table-header-group, table-footer-group, table-row, table-column-group and table-column
 <td>no
 <td>refer to width of containing block
 <td><a href="media.html#visual-media-group">visual</a>
 
 <tr><td><a href="box.html#propdef-padding"><span class="propinst-padding xref">'padding'</span></a>
 <td><a href="box.html#value-def-padding-width" class="noxref"><span class="value-inst-padding-width">&lt;padding-width&gt;</span></a>{1,4} | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
 <td>see individual properties
-<td>all elements except elements with table display     types other than table, inline-table, and table-cell
+<td>all elements except table-row-group, table-header-group, table-footer-group, table-row, table-column-group and table-column
 <td>no
 <td>refer to width of containing block
 <td><a href="media.html#visual-media-group">visual</a>

css2/syndata.html

@@ -212,7 +212,7 @@ <h3>4.1.2 <a name="keywords">Keywords</a></h3>
 "red"
 </pre>
 
-is not. (It is a <a href="#strings">string</a>.) Other illegal examples:
+<p>is not. (It is a <a href="#strings">string</a>.) Other illegal examples:
 
 <div class="illegal-example"><P style="display:none">Illegal example(s):</P>
 <pre><code>
@@ -321,7 +321,7 @@ <h3><a name="q6">4.1.3 Characters and case</a></h3>
     stand for the ISO 10646 (<a href="refs.html#ref-ISO10646" rel="biblioentry" class="noxref"><span class="normref">[ISO10646]</span></a>) 
     character with that number, which must not be zero. 
     (It is undefined in CSS&nbsp;2.1 what happens if a style sheet
-    <em>does</em> contain a zero.)
+    <em>does</em> contain a character with Unicode codepoint zero.)
     If a character in the range [0-9a-fA-F] follows the hexadecimal number,
     the end of the number needs to be made clear. There are two ways
     to do that:
@@ -339,7 +339,8 @@ <h3><a name="q6">4.1.3 Characters and case</a></h3>
     escaped or doubled.
     </p>
 	</li>
-    <li>Backslash escapes are always considered to be part of an <a
+    <li class=note>Note: Backslash escapes, where allowed, are always
+    considered to be part of an <a
     href="#value-def-identifier">identifier</a> or a string (i.e.,
     "\7B" is not punctuation, even though "{" is, and "\32" is allowed
     at the start of a class name, even though "2" is not).

css2/tables.html

@@ -707,16 +707,16 @@ <h3>17.5.1 <a name="table-layers">Table layers and transparency</a></h3>
   extends from the top of the cells in the top row to the bottom of
   the cells on the bottom row and from the left edge of its leftmost
   column to the right edge of its rightmost column. The background
-  extends to cover the full area of all cells that originate in the
-  column group, but this extension does not affect background image
-  positioning.
+  covers exactly the full area of all cells that originate in the
+  column group, even if they span outside the column group, but this
+  difference in area does not affect background image positioning.
 
   <li>On top of the column groups are the areas representing the
   column boxes. Each column is as tall as the column groups and as
   wide as a normal (single-column-spanning) cell in the column. The
-  background extends to cover the full area of all cells that
-  originate in the column, even if they span outside the column, but
-  this extension does not affect background image positioning.
+  background covers exactly the full area of all cells that originate
+  in the column, even if they span outside the column, but this
+  difference in area does not affect background image positioning.
 
   <li>Next is the layer containing the row groups. Each row group
   extends from the top left corner of its topmost cell in the first
@@ -725,14 +725,17 @@ <h3>17.5.1 <a name="table-layers">Table layers and transparency</a></h3>
 
   <li>The next to last layer contains the rows. Each row is as wide as
   the row groups and as tall as a normal (single-row-spanning) cell in
-  the row. As with columns, the background extends to cover the full
+  the row. As with columns, the background covers exactly the full
   area of all cells that originate in the row, even if they span
-  outside the row, but this extension does not affect background
-  image positioning.
+  outside the row, but this difference in area does not affect
+  background image positioning.
 
   <li>The topmost layer contains the cells themselves. As the figure
   shows, although all rows contain the same number of cells, not every
-  cell may have specified content. If the value of their <a href="tables.html#propdef-empty-cells" class="noxref"><span
+  cell may have specified content.
+  In the <a href="#separated-borders">separated borders model</a>
+  (<a href="tables.html#propdef-border-collapse" class="noxref"><span class="propinst-border-collapse">'border-collapse'</span></a> is
+  'separate'), if the value of their <a href="tables.html#propdef-empty-cells" class="noxref"><span
   class="propinst-empty-cells">'empty-cells'</span></a> property is 'hide'
   these "empty" cells are transparent through the cell, row, row
   group, column and column group backgrounds, letting the table
@@ -744,31 +747,33 @@ <h3>17.5.1 <a name="table-layers">Table layers and transparency</a></h3>
 as if an anonymous table-cell box occupied their position in the grid.
 
 <div class="html-example">
-<p>In the following example, the first row contains four cells, but
-the second row contains no cells, and thus the table background shines
-through, except where a cell from the first row spans into this row.
-The following HTML code and style rules.
+<p>In the following example, the first row contains four non-empty
+cells, but the second row contains only one non-empty cell, and thus
+the table background shines through, except where a cell from the
+first row spans into this row. The following HTML code and style rules
 
 <pre>
 &lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"&gt;
 &lt;HTML&gt;
   &lt;HEAD&gt;
     &lt;TITLE&gt;Table example&lt;/TITLE&gt;
     &lt;STYLE type="text/css"&gt;
-      TABLE { background: #ff0; border: solid black;
-              empty-cells: hide }
-      TD    { background: red; border: solid black }
+      TABLE  { background: #ff0; border: solid black;
+               empty-cells: hide }
+      TR.top { background: red }
+      TD     { border: solid black }
     &lt;/STYLE&gt;
   &lt;/HEAD&gt;
   &lt;BODY&gt;
     &lt;TABLE&gt;
-      &lt;TR&gt;
+      &lt;TR CLASS="top"&gt;
         &lt;TD&gt; 1 
         &lt;TD rowspan="2"&gt; 2
         &lt;TD&gt; 3 
         &lt;TD&gt; 4 
-      &lt;/TR&gt;
-      &lt;TR&gt;&lt;TD&gt;&lt;/TD&gt;&lt;/TR&gt;
+      &lt;TR&gt;
+        &lt;TD&gt; 5
+        &lt;TD&gt;
     &lt;/TABLE&gt; 
   &lt;/BODY&gt;
 &lt;/HTML&gt;
@@ -781,7 +786,7 @@ <h3>17.5.1 <a name="table-layers">Table layers and transparency</a></h3>
   in bottom row"><SPAN class="dlink">&nbsp;&nbsp;&nbsp;<A name="img-tbl-empty" href="images/longdesc/tbl-empty-desc.html" title="Long description of example illustrating background calculation
 ">[D]</A></SPAN>
 
-  <p class="caption">Table with three empty cells in the bottom row.
+  <p class="caption">Table with empty cells in the bottom row.
 </div>
 </div>
 

css2/text.html

@@ -239,7 +239,7 @@ <h3>16.3.1 <a name="lining-striking-props">Underlining, overlining, striking, an
 'inline-block' descendants.
 </p><p>
 If an element contains no text (ignoring white space in elements 
-that have 'white-space' set to 'normal', 'pre-line', or 'no-wrap'), 
+that have 'white-space' set to 'normal', 'pre-line', or 'nowrap'), 
 user agents must refrain from rendering text decorations on the 
 element. For example, elements containing only images and collapsed 
 white space will not be underlined.
@@ -577,7 +577,7 @@ <h3 id="white-space-model"><a name="q8">16.6.1 The 'white-space' processing mode
 <li>
 Each tab (U+0009), carriage return (U+000D), or space (U+0020) 
 character surrounding a linefeed (U+000A) character is removed if 
-'white-space' is set to 'normal', 'no-wrap', or 'pre-line'.
+'white-space' is set to 'normal', 'nowrap', or 'pre-line'.
      </li>
 <li>If 'white-space' is set to 'pre' or 'pre-wrap', any sequence of
      spaces (U+0020) unbroken by an element boundary is treated as a