[css2] Generated. Do not edit!

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

Author: bert-github

css2/aural.html

@@ -390,8 +390,8 @@ <H2>A.5 <a name="pause-props">Pause properties</a>: <a href="aural.html#propdef-
 meanings:</p>
 
 <p class=note><strong>Note.</strong> In CSS3 pauses are inserted
-around the cues and content rather than between them. See [[CSS3
-Speech]] for details.
+around the cues and content rather than between them. See
+<a href="refs.html#ref-CSS3SPEECH" rel="biblioentry" class="noxref"><span class="informref">[CSS3SPEECH]</span></a> for details.
 
 <dl>
 <dt><span class="index-inst" title="&lt;time&gt;"><a name="x16" href="aural.html#value-def-time" class="noxref"><span class="value-inst-time"><strong>&lt;time&gt;</strong></span></a></span>

css2/cover.html

@@ -26,18 +26,18 @@
 
   <h1 id="title">Cascading Style Sheets, level 2 revision 1<br>
     CSS 2.1 Specification</h1>
-  <h2 id="W3C-doctype">W3C Working Draft 06 November 2006</h2>
+  <h2 id="W3C-doctype">W3C Candidate Recommendation XX April 2007</h2>
 
   <dl>
   <dt>This version:
-  <dd><a href="http://www.w3.org/TR/2006/WD-CSS21-20061106">
-               http://www.w3.org/TR/2006/WD-CSS21-20061106</a>
+  <dd><a href="http://www.w3.org/TR/2007/CR-CSS21-200704XX">
+               http://www.w3.org/TR/2007/CR-CSS21-200704XX</a>
   <dt>Latest version:
   <dd><a href="http://www.w3.org/TR/CSS21">
                http://www.w3.org/TR/CSS21</a>
   <dt>Previous version:
-  <dd><a href="http://www.w3.org/TR/2006/WD-CSS21-20060411">
-               http://www.w3.org/TR/2006/WD-CSS21-20060411</a>
+  <dd><a href="http://www.w3.org/TR/2006/WD-CSS21-20061106">
+               http://www.w3.org/TR/2006/WD-CSS21-20061106</a>
   <dt>Editors:
   <dd class="vcard"><a class="url fn" lang=nl href="http://www.w3.org/People/Bos/">
                Bert Bos</a>
@@ -54,7 +54,7 @@ <h2 id="W3C-doctype">W3C Working Draft 06 November 2006</h2>
   </dl>
 
   <!--<p>Please refer to the <a
-  href="http://www.w3.org/Style/css2-updates/WD-CSS21-20061106-errata.html"><strong>
+  href="http://www.w3.org/Style/css2-updates/CR-CSS21-200704XX-errata.html"><strong>
   errata</strong></a> for this document, which may include some
   normative corrections.-->
 

css2/css2.html

@@ -21,18 +21,18 @@
 
   <h1 id="title">Cascading Style Sheets, level 2 revision 1<br>
     CSS 2.1 Specification</h1>
-  <h2 id="W3C-doctype">W3C Working Draft 06 November 2006</h2>
+  <h2 id="W3C-doctype">W3C Candidate Recommendation XX April 2007</h2>
 
   <dl>
   <dt>This version:
-  <dd><a href="http://www.w3.org/TR/2006/WD-CSS21-20061106">
-               http://www.w3.org/TR/2006/WD-CSS21-20061106</a>
+  <dd><a href="http://www.w3.org/TR/2007/CR-CSS21-200704XX">
+               http://www.w3.org/TR/2007/CR-CSS21-200704XX</a>
   <dt>Latest version:
   <dd><a href="http://www.w3.org/TR/CSS21">
                http://www.w3.org/TR/CSS21</a>
   <dt>Previous version:
-  <dd><a href="http://www.w3.org/TR/2006/WD-CSS21-20060411">
-               http://www.w3.org/TR/2006/WD-CSS21-20060411</a>
+  <dd><a href="http://www.w3.org/TR/2006/WD-CSS21-20061106">
+               http://www.w3.org/TR/2006/WD-CSS21-20061106</a>
   <dt>Editors:
   <dd class="vcard"><a class="url fn" lang=nl href="http://www.w3.org/People/Bos/">
                Bert Bos</a>
@@ -49,7 +49,7 @@ <h2 id="W3C-doctype">W3C Working Draft 06 November 2006</h2>
   </dl>
 
   <!--<p>Please refer to the <a
-  href="http://www.w3.org/Style/css2-updates/WD-CSS21-20061106-errata.html"><strong>
+  href="http://www.w3.org/Style/css2-updates/CR-CSS21-200704XX-errata.html"><strong>
   errata</strong></a> for this document, which may include some
   normative corrections.-->
 
@@ -8458,7 +8458,32 @@ <h3>9.5.2 <a name="flow-control">Controlling flow next to floats:</a>
 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 determined after the top margin of the element has been collapsed with previous adjacent margins (including the top margin of the parent block). 
 </p>
 <p>
-If the element's top border edge has not passed the relevant floats, then its clearance is set to the amount necessary to place the border edge of the block even with the bottom outer edge of the lowest float that must be cleared.
+If this hypothetical position of the element's top border edge is not
+past the relevant floats, then its clearance must be set to the
+greater of:
+</p>
+<ol>
+  <li>The amount necessary to place the border edge of the block even
+  with the bottom outer edge of the lowest float that is to be
+  cleared.
+ 
+  <li>The amount necessary to make the sum of the following equal to
+  the distance to which these margins collapsed when the hypothetical
+  position was calculated:
+  <ul>
+    <li>the margins collapsing above the clearance
+
+    <li>the clearance itself
+
+    <li>if the block's own margins collapse together: the block's top
+    margin
+
+    <li>if the block's own margins do not collapse together: the
+    margins collapsing below the clearance
+  </ul>
+</ol>
+<p class=note>
+Note: The clearance can be negative.
 </p>
 
 <p>When the property is set on floating elements, it results in a
@@ -10396,19 +10421,9 @@ <h3>10.6.2 <a name="inline-replaced-height">Inline replaced elements</a>,
 intrinsic height is the used value of <a href="visudet.html#propdef-height" class="noxref"><span
 class="propinst-height">'height'</span></a>.
 
-<p>If <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a> and <a href="visudet.html#propdef-width" class="noxref"><span
-class="propinst-width">'width'</span></a> both have computed values of
-'auto' and the element has no intrinsic height, but does have an
-intrinsic width and intrinsic ratio; or if <a href="visudet.html#propdef-height" class="noxref"><span
-class="propinst-height">'height'</span></a> has a computed value of
-'auto', and the element does have an intrinsic ratio;
-or if <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a>
-and <a href="visudet.html#propdef-width" class="noxref"><span class="propinst-width">'width'</span></a> both have computed
-values of 'auto' and the element has an intrinsic ratio but no
-intrinsic height or width and the containing block's width doesn't
-itself depend on the replaced element's width;
-then the
-used value of <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a> is:
+<p>Otherwise, if <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a> has a
+computed value of 'auto', and the element has an intrinsic ratio then
+the used value of <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a> is:
 
 <blockquote><p>(used width) / (intrinsic ratio)</blockquote>
 
@@ -10463,9 +10478,10 @@ <h3>10.6.3 <a name="normal-block">Block-level non-replaced elements in normal
 of the topmost and bottommost children, while in the second case the
 presence of the padding/border prevents the top margins from <a
 href="box.html#collapsing-margins">collapsing</a>.) Similarly, if the
-element has a non-zero bottom padding and/or bottom border, then the
-content ends at the bottom <em>margin</em> edge of the bottommost
-child.
+bottom margin of the block does not collapse with the bottom margin of
+its last in-flow child, then the content ends at the bottom margin
+edge of the bottommost child.
+
 
 <p>Only children in the normal flow are taken into account (i.e.,
 floating boxes and absolutely positioned boxes are ignored, and
@@ -10781,7 +10797,7 @@ <h2>10.8 <a name="line-height">Line height calculations</a>: the <a href="visude
 </li>
 <li>If the resulting height is smaller than the minimal height of line
 boxes for this block, as specified by the <a href="visudet.html#propdef-line-height" class="noxref"><span
-class=propinst-line-height>line-height</span></a> property, the height is
+class=propinst-line-height>'line-height'</span></a> property, the height is
 increased to be that minimal height.</li>
 </ol>
 
@@ -17649,8 +17665,8 @@ <H2>A.5 <a name="pause-props">Pause properties</a>: <a href="aural.html#propdef-
 meanings:</p>
 
 <p class=note><strong>Note.</strong> In CSS3 pauses are inserted
-around the cues and content rather than between them. See [[CSS3
-Speech]] for details.
+around the cues and content rather than between them. See
+<a href="refs.html#ref-CSS3SPEECH" rel="biblioentry" class="noxref"><span class="informref">[CSS3SPEECH]</span></a> for details.
 
 <dl>
 <dt><span class="index-inst" title="&lt;time&gt;"><a name="x16" href="aural.html#value-def-time" class="noxref"><span class="value-inst-time"><strong>&lt;time&gt;</strong></span></a></span>
@@ -18588,12 +18604,6 @@ <H2><a name="q1">B.1 Normative references</a></H2>
 document type definitions: Strict, Transitional, and Frameset, all
 reachable from the Recommendation.
 
-<dt><strong><a name="ref-IANA" class="normref">[IANA]</a></strong>
-
-<dd>"Assigned Numbers", Online database<BR> 
-Available at <a href="http://www.iana.org/">
-http://www.iana.org/</a>.
-
 <dt><strong><a name="ref-ICC42" class="normref">[ICC42]</a></strong>
 <dd>Specification ICC.1:2004-10 (Profile version 4.2.0.0)  Image
 technology colour management &ndash; Architecture, profile format, and
@@ -18644,8 +18654,6 @@ <H2><a name="q1">B.1 Normative references</a></H2>
 Available at <A href="http://www.ietf.org/rfc/rfc2616.txt">
 http://www.ietf.org/rfc/rfc2616.txt</A>. </DD>
 
-
-
 <DT><STRONG><A name="ref-RFC2119" class="normref">[RFC2119]</A></STRONG></DT>
 
 <DD>"Key words for use in RFCs to Indicate Requirement Levels", S.
@@ -18658,19 +18666,6 @@ <H2><a name="q1">B.1 Normative references</a></H2>
 Available at <a
 href="http://www.ietf.org/rfc/rfc2318.txt">http://www.ietf.org/rfc/rfc2318.txt</a>.
 
-
-
-
-<dt><strong><a name="ref-RFC2781" class="normref">[RFC2781]</a></strong>
-<dd>"UTF-16, an encoding of ISO 10646", P. Hoffman, F. Yergeau, February 2000<br>
-Available at <a href="http://www.ietf.org/rfc/rfc2781.txt">http://www.ietf.org/rfc/rfc2781.txt</a>.
-
-<dt><strong><a name="ref-RFC3629" class="normref">[RFC3629]</a></strong>
-<dd>"UTF-8, a transformation format of ISO 10646", F. Yergeau,
-November 2003.<BR>
-Available at <a href="http://www.ietf.org/rfc/rfc3629.txt">
-http://www.ietf.org/rfc/rfc3629.txt</a>
-
 <dt><strong><a name="ref-SRGB" class="normref">[SRGB]</a></strong>
 <dd>IEC 61966-2-1 (1999-10) - "Multimedia systems and equipment -
 Colour measurement and management - Part 2-1: Colour management -

css2/diffs-rec/aural.html

@@ -390,8 +390,8 @@ <H2> <del>19.4</del><ins>A.5</ins> <a name="pause-props">Pause properties</a>: <
 meanings:</p>
 
 <p class=note><strong><ins>Note.</ins></strong> <ins>In</ins> <ins>CSS3</ins> <ins>pauses</ins> <ins>are</ins> <ins>inserted</ins>
-<ins>around</ins> <ins>the</ins> <ins>cues</ins> <ins>and</ins> <ins>content</ins> <ins>rather</ins> <ins>than</ins> <ins>between</ins> <ins>them.</ins> <ins>See</ins> <ins>[[CSS3</ins>
-<ins>Speech]]</ins> <ins>for</ins> <ins>details.</ins>
+<ins>around</ins> <ins>the</ins> <ins>cues</ins> <ins>and</ins> <ins>content</ins> <ins>rather</ins> <ins>than</ins> <ins>between</ins> <ins>them.</ins> <ins>See</ins>
+<a href="refs.html#ref-CSS3SPEECH" rel="biblioentry" class="noxref"><span class="informref"><ins>[CSS3SPEECH]</ins></span></a> <ins>for</ins> <ins>details.</ins>
 
 <dl>
 <dt><span class="index-inst" title="&lt;time&gt;"><a name="x16" href="aural.html#value-def-time" class="noxref"><span class="value-inst-time"><strong>&lt;time&gt;</strong></span></a></span>

css2/diffs-rec/cover.html

@@ -26,18 +26,18 @@
 
   <h1 id="title"> <del>REC-CSS2-19980512</del>Cascading Style Sheets, level 2  <del>CSS2</del><ins>revision</ins> <ins>1</ins><br>
     <ins>CSS</ins> <ins>2.1</ins> Specification</h1>
-  <h2 id="W3C-doctype">W3C  <del>Recommendation</del> <del>12-May-1998</del><ins>Working</ins> <ins>Draft</ins> <ins>06</ins> <ins>November</ins> <ins>2006</ins></h2>
+  <h2 id="W3C-doctype">W3C <ins>Candidate</ins> Recommendation  <del>12-May-1998</del><ins>XX</ins> <ins>April</ins> <ins>2007</ins></h2>
 
   <dl>
   <dt>This version:
-  <dd><a href="http://www.w3.org/TR/2006/WD-CSS21-20061106">
-                <del>http://www.w3.org/TR/1998/REC-CSS2-19980512</del><ins>http://www.w3.org/TR/2006/WD-CSS21-20061106</ins></a>
+  <dd><a href="http://www.w3.org/TR/2007/CR-CSS21-200704XX">
+                <del>http://www.w3.org/TR/1998/REC-CSS2-19980512</del><ins>http://www.w3.org/TR/2007/CR-CSS21-200704XX</ins></a>
   <dt>Latest version:
   <dd><a href="http://www.w3.org/TR/CSS21">
                 <del>http://www.w3.org/TR/REC-CSS2</del><ins>http://www.w3.org/TR/CSS21</ins></a>
   <dt>Previous version:
-  <dd><a href="http://www.w3.org/TR/2006/WD-CSS21-20060411">
-                <del>http://www.w3.org/TR/1998/PR-CSS2-19980324</del><ins>http://www.w3.org/TR/2006/WD-CSS21-20060411</ins></a>
+  <dd><a href="http://www.w3.org/TR/2006/WD-CSS21-20061106">
+                <del>http://www.w3.org/TR/1998/PR-CSS2-19980324</del><ins>http://www.w3.org/TR/2006/WD-CSS21-20061106</ins></a>
   <dt>Editors:
   <dd class="vcard"><a class="url fn" lang=nl href="http://www.w3.org/People/Bos/">
                Bert Bos</a>
@@ -54,7 +54,7 @@ <h2 id="W3C-doctype">W3C  <del>Recommendation</del> <del>12-May-1998</del><ins>W
   </dl>
 
   <!--<p><ins>Please</ins> <ins>refer</ins> <ins>to</ins> <ins>the</ins> <a
-  href="http://www.w3.org/Style/css2-updates/WD-CSS21-20061106-errata.html"><strong>
+  href="http://www.w3.org/Style/css2-updates/CR-CSS21-200704XX-errata.html"><strong>
   <ins>errata</ins></strong></a> <ins>for</ins> <ins>this</ins> <ins>document,</ins> <ins>which</ins> <ins>may</ins> <ins>include</ins> <ins>some</ins>
   <ins>normative</ins> <ins>corrections.--></ins>
 
@@ -123,9 +123,9 @@ <h2 id=abstract>Abstract</h2>
 <ins>features,</ins> or  <del>cited</del> <del>as</del> <del>a</del> <del>normative</del><ins>preferably</ins> reference  <del>from</del> <del>another</del> <del>document.</del> <del>W3C's</del> <del>role</del><ins>such</ins> <ins>feature(s)</ins> in  <del>making</del> <del>the</del> <del>Recommendation</del> <del>is</del> <del>to</del> <del>draw</del> <del>attention</del> <del>to</del>the  <del>specification</del> <del>and</del> <del>to</del> <del>promote</del> <del>its</del> <del>widespread</del> <del>deployment.</del><ins>respective</ins>
 <ins>CSS3</ins> <ins>Module</ins> <ins>that</ins> <ins>includes</ins> <ins>those</ins> <ins>feature(s)).</ins>
 
-<h2 id=status><ins>Status</ins> <ins>of</ins> <ins>this</ins> <ins>document</ins></h2>
+<h2 id=status><ins>Status</ins> <ins>of</ins> this  <del>enhances</del><ins>document</ins></h2>
 
-<p><em>This  <del>enhances</del><ins>section</ins> <ins>describes</ins> the  <del>functionality</del> <del>and</del> <del>interoperability</del><ins>status</ins> of <ins>this</ins> <ins>document</ins> <ins>at</ins> the  <del>Web.</del><ins>time</ins>
+<p><em><ins>This</ins> <ins>section</ins> <ins>describes</ins> the  <del>functionality</del> <del>and</del> <del>interoperability</del><ins>status</ins> of <ins>this</ins> <ins>document</ins> <ins>at</ins> the  <del>Web.</del><ins>time</ins>
 <ins>of</ins> <ins>its</ins> <ins>publication.</ins> <ins>Other</ins> <ins>documents</ins> <ins>may</ins> <ins>supersede</ins> <ins>this</ins> <ins>document.</ins> A
 list of current W3C  <del>Recommendations</del><ins>publications</ins> and  <del>other</del><ins>the</ins> <ins>latest</ins> <ins>revision</ins> <ins>of</ins> <ins>this</ins>
 technical  <del>documents</del><ins>report</ins> can be found  <del>at</del> <del>http://www.w3.org/TR</del> <del>.</del> <del>Public</del> <del>discussion</del> <del>of</del> <del>CSS</del> <del>features</del> <del>takes</del> <del>place</del> <del>on</del> <del>www-style@w3.org</del> <del>.</del> <del>Available</del> <del>formats</del> <del>The</del> <del>CSS2</del> <del>specification</del> <del>is</del> <del>available</del>in the <a
@@ -157,11 +157,11 @@ <h2 id=status><ins>Status</ins> <ins>of</ins> <ins>this</ins> <ins>document</ins
 <ins>a</ins> <a rel="disclosure" href="/Style/CSS/Disclosures"><ins>public</ins> <ins>list</ins> <ins>of</ins> <ins>any</ins>
 <ins>patent</ins> <ins>disclosures</ins></a> <ins>made</ins> in  <del>case</del><ins>connection</ins> <ins>with</ins> <ins>the</ins> <ins>deliverables</ins> of <ins>the</ins>
 <ins>group;</ins> <ins>that</ins> <ins>page</ins> <ins>also</ins> <ins>includes</ins> <ins>instructions</ins> <ins>for</ins> <ins>disclosing</ins> a  <del>discrepancy</del> <del>between</del><ins>patent.</ins>
-<ins>An</ins> <ins>individual</ins> <ins>who</ins> <ins>has</ins> <ins>actual</ins> <ins>knowledge</ins> <ins>of</ins> <ins>a</ins> <ins>patent</ins> <ins>which</ins> <ins>the</ins>
-<ins>individual</ins> <ins>believes</ins>
+<ins>An</ins> <ins>individual</ins> <ins>who</ins> <ins>has</ins> <ins>actual</ins> <ins>knowledge</ins> <ins>of</ins> <ins>a</ins> <ins>patent</ins> <ins>which</ins> the
+ <del>various</del> <del>forms</del><ins>individual</ins> <ins>believes</ins>
 <ins>contains</ins> <a
 href="/Consortium/Patent-Policy-20040205/#def-essential"><ins>Essential</ins>
-<ins>Claim(s)</ins></a> <ins>must</ins> <ins>disclose</ins> the  <del>various</del> <del>forms</del><ins>information</ins> <ins>in</ins> <ins>accordance</ins>
+<ins>Claim(s)</ins></a> <ins>must</ins> <ins>disclose</ins> <ins>the</ins> <ins>information</ins> <ins>in</ins> <ins>accordance</ins>
 <ins>with</ins> <a
 href="/Consortium/Patent-Policy-20040205/#sec-Disclosure"><ins>section</ins> <ins>6</ins> of
 the  <del>specification,</del> <del>http://www.w3.org/TR/1998/REC-CSS2-19980512</del><ins>W3C</ins> <ins>Patent</ins> <ins>Policy</ins></a><ins>.</ins></p>
@@ -218,7 +218,7 @@ <h3 class="no-num" id="crec"><ins>Candidate</ins> <ins>Recommendation</ins> <ins
     </dd>
    </dl>
   </li>
-  <li><p><ins>A</ins> <ins>minimum</ins> of  <del>known</del><ins>six</ins> <ins>months</ins> <ins>of</ins> <ins>the</ins> <ins>CR</ins> <ins>period</ins> <ins>must</ins> <ins>have</ins> <ins>elapsed.</ins>
+  <li><p><ins>A</ins> <ins>minimum</ins> <ins>of</ins> <ins>six</ins> <ins>months</ins> of  <del>known</del><ins>the</ins> <ins>CR</ins> <ins>period</ins> <ins>must</ins> <ins>have</ins> <ins>elapsed.</ins>
   <ins>This</ins> <ins>is</ins> <ins>to</ins> <ins>ensure</ins> <ins>that</ins> <ins>enough</ins> <ins>time</ins> <ins>is</ins> <ins>given</ins> <ins>for</ins> <ins>any</ins> <ins>remaining</ins> <ins>major</ins>
   errors <ins>to</ins> <ins>be</ins> <ins>caught.</ins></p></li>
   <li><p><ins>The</ins> <ins>CR</ins> <ins>period</ins> <ins>will</ins> <ins>be</ins> <ins>extended</ins> <ins>if</ins> <ins>implementations</ins> <ins>are</ins> <ins>slow</ins> <ins>to</ins>