[css2] Generated. Do not edit!

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

Author: bert-github

css2/css2.html

@@ -1295,6 +1295,7 @@ <h2><a name="toc">Full Table of Contents</a></h2>
       <li class="tocline3"><a href="changes.html#q543" class="tocxref">C.8.49 6.1.2 Computed values</a>
       <li class="tocline3"><a href="changes.html#q544" class="tocxref">C.8.50 10.3.2 Inline, replaced elements</a>
       <li class="tocline3"><a href="changes.html#q545" class="tocxref">C.8.51  Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear' property</a>
+      <li class="tocline3"><a href="changes.html#q546" class="tocxref">C.8.52 G.2 Lexical scanner</a>
     </ul>
   </ul>
   <li class="tocline1"><a href="sample.html" class="tocxref">Appendix D. Default style sheet for HTML 4</a>
@@ -9110,7 +9111,7 @@ <h3>9.5.2 <a name="flow-control">Controlling flow next to floats:</a>
 
 <p>Computing the clearance of an element on which 'clear' is set is
 done by first determining the hypothetical position of the element's
-top border edge within its parent block. This position is
+top border edge. This position is
 where the actual top border edge would have been if the element
 had a non-zero bottom border and its 'clear' property had been 'none'.
 
@@ -10024,7 +10025,7 @@ <h2>9.10 <a name="direction">Text direction:</a>
 <dl>
 <dt><strong>normal</strong></dt>
 <dd>The element does not open an additional level of embedding with
-respect to the bidirectional algorithm. For inline-level elements,
+respect to the bidirectional algorithm. For inline elements,
 implicit reordering works across element boundaries.
 </dd>
 <dt><strong>embed</strong></dt>
@@ -10543,6 +10544,10 @@ <h3>10.3.2 <a name="inline-replaced-width">Inline, replaced elements</a></h3>
 have computed values of 'auto' and the element has an intrinsic ratio
 but no intrinsic height or width, then the used value of 'width' is
 undefined in CSS&nbsp;2.1.
+However, it is suggested that, if the containing block's width
+does not itself depend on the replaced element's width, then the used
+value of 'width' is calculated from the constraint equation used for
+block-level, non-replaced elements in normal flow.
 
 <p>Otherwise, if <a href="visudet.html#propdef-width" class="noxref"><span class="propinst-width">'width'</span></a> has a
 computed value of 'auto', and the element has an intrinsic width, then
@@ -11501,7 +11506,7 @@ <h2>10.7 <a name="min-max-heights">Minimum and maximum heights</a>: <a href="vis
 </p>
 
 <p>In CSS&nbsp;2.1, the effect of 'min-height' and 'max-height' on
-table cells, table rows, and row groups is undefined.
+tables, inline tables, table cells, table rows, and row groups is undefined.
 
 <p>The following algorithm describes how the two properties influence
 the <a href="cascade.html#computed-value">used value</a>
@@ -20404,6 +20409,7 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
       <li class="tocline3"><a href="changes.html#q543" class="tocxref">C.8.49 6.1.2 Computed values</a>
       <li class="tocline3"><a href="changes.html#q544" class="tocxref">C.8.50 10.3.2 Inline, replaced elements</a>
       <li class="tocline3"><a href="changes.html#q545" class="tocxref">C.8.51  Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear' property</a>
+      <li class="tocline3"><a href="changes.html#q546" class="tocxref">C.8.52 G.2 Lexical scanner</a>
     </ul>
   </ul>
 </div>
@@ -25518,8 +25524,8 @@ <h3 id="t.9.10"><a name="q435">C.7.46 </a><a
 <dd>For inline<del>-level</del> elements this creates an override.
 For <del>block-level, table-cell, table-caption, or
 inline-block</del> <ins>block container</ins> elements this creates an
-override for inline-level descendants not within another block-level,
-table-cell, table-caption, or inline-block element. This means that
+override for inline-level descendants not within another block container
+element. This means that
 inside the element, reordering is strictly in sequence according to
 the 'direction' property; the implicit part of the bidirectional
 algorithm is ignored. This corresponds to adding a LRO (U+202D; for
@@ -25718,7 +25724,7 @@ <h3 id="t.10.7"><a name="q445">C.7.56 </a><a
 
 <blockquote>
 <p><ins>In CSS&nbsp;2.1, the effect of 'min-height' and 'max-height'
-on table cells, table rows, and row groups is undefined.</ins>
+on tables, inline tables, table cells, table rows, and row groups is undefined.</ins>
 </blockquote>
 
 
@@ -27957,11 +27963,12 @@ <h3 id=u.10.3.2a><a name="q544">C.8.50 </a><a
 <blockquote>
 <p>If 'height' and 'width' both have computed values of 'auto' and the
 element has an intrinsic ratio but no intrinsic height or width,
-<del>and the containing block's width does not itself depend on the
+<del>and</del> <ins>then the used value of 'width' is
+undefined in CSS&nbsp;2.1. However, it is suggested that, if</ins>
+the containing block's width does not itself depend on the
 replaced element's width, then the used value of 'width' is calculated
 from the constraint equation used for block-level, non-replaced
-elements in normal flow</del> <ins>then the used value of 'width' is
-undefined in CSS&nbsp;2.1</ins>.
+elements in normal flow.
 </blockquote>
 
 
@@ -28008,6 +28015,24 @@ <h3 id="t.9.5.2d"><a name="q545">C.8.51 </a><a
 
 
 
+<h3 id="t.G.2"><a name="q546">C.8.52 </a><a
+href="/TR/2009/CR-CSS2-20090908/grammar.html#scanner">G.2 Lexical
+scanner</a></h3>
+
+<p>The tokenizer in the appendix allowed backslashes in the URI token,
+in contradiction with the same token in the core grammar and the error
+recovery token {baduri}:
+
+<blockquote>
+<pre>
+<del>{U}{R}{L}"("{w}{string}{w}")"      {return URI;}</del>
+<del>{U}{R}{L}"("{w}{url}{w}")"         {return URI;}</del>
+<ins>"url("{w}{string}{w}")"            {return URI;}</ins>
+<ins>"url("{w}{url}{w}")"               {return URI;}</ins>
+</pre>
+</blockquote>
+
+
 <hr class="navbar">
 
 
@@ -29370,7 +29395,7 @@ <h2>G.2 <a name="scanner">Lexical scanner</a></h2>
 %option case-insensitive
 
 h		[0-9a-f]
-nonascii	[\200-\377]
+nonascii	[\240-\377]
 unicode		\\{h}{1,6}(\r\n|[ \t\r\n\f])?
 escape		{unicode}|\\[^\r\n\f0-9a-f]
 nmstart		[_a-z]|{nonascii}|{escape}
@@ -29463,9 +29488,9 @@ <h2>G.2 <a name="scanner">Lexical scanner</a></h2>
 {num}%			{return PERCENTAGE;}
 {num}			{return NUMBER;}
 
-{U}{R}{L}"("{w}{string}{w}")"	{return URI;}
-{U}{R}{L}"("{w}{url}{w}")"	{return URI;}
-{baduri}                        {return BAD_URI;}
+"url("{w}{string}{w}")" {return URI;}
+"url("{w}{url}{w}")"    {return URI;}
+{baduri}                {return BAD_URI;}
 
 {ident}"("		{return FUNCTION;}