[css2] Generated. Do not edit!

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

Author: bert-github

css2/box.html

@@ -468,8 +468,7 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
 margins, the maximum of the absolute values of the negative adjoining
 margins is deducted from the maximum of the positive adjoining
 margins.  If there are no positive margins, the maximum of the
-absolute values of the adjoining margins adjoining margins is deducted
-from zero.
+absolute values of the adjoining margins is deducted from zero.
 
 <P ID="collapsed-through">If the top and bottom margins of a box are
 adjoining, then it is possible for margins to <a name="x28"><span

css2/changes.html

@@ -547,6 +547,8 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
       <li class="tocline3"><a href="changes.html#q504" class="tocxref">C.8.10 8.3.1 Collapsing margins</a>
       <li class="tocline3"><a href="changes.html#q505" class="tocxref">C.8.11 10.8 Line height calculations: the 'line-height' and 'vertical-align' properties</a>
       <li class="tocline3"><a href="changes.html#q506" class="tocxref">C.8.12 10.8.1 Leading and half-leading</a>
+      <li class="tocline3"><a href="changes.html#q507" class="tocxref">C.8.13 10.6.1 Inline, non-replaced elements</a>
+      <li class="tocline3"><a href="changes.html#q508" class="tocxref">C.8.14 9.5.1 Positioning the float: the 'float' property</a>
     </ul>
   </ul>
 </div>
@@ -7223,6 +7225,38 @@ <h3 id=u.10.8.1a><a name="q506">C.8.12 </a><a
 </blockquote>
 
 
+
+<h3 id=u.10.6.1a><a name="q507">C.8.13 </a><a
+href="/TR/2010/WD-CSS2-20101207/visudet.html#inline-non-replaced">10.6.1
+Inline, non-replaced elements</a></h3>
+
+<p>Improve language:
+
+<blockquote>
+<p>The vertical padding, border and margin of an inline, non-replaced
+box start at the top and bottom of the content
+area, <del>not</del> <ins>and has nothing to do with</ins> the
+'line-height'. But only the 'line-height' is used when calculating the
+height of the line box.
+</blockquote>
+
+
+
+<h3 id=u.9.5.1><a name="q508">C.8.14 </a><a
+href="/TR/2010/WD-CSS2-20101207/visuren.html#float-position">9.5.1
+Positioning the float: the 'float' property</a></h3>
+
+<p>A left float must not only not overlap a right float, but must also
+not be completely to the right of it.
+
+</blockquote>
+<p>3. The right <a href="box.html#outer-edge">outer edge</a> of a
+left-floating box may not be to the right of the
+left <a href="box.html#outer-edge">outer edge</a> of any
+right-floating box that is <del>to the right of</del> <ins>next
+to</ins> it. Analogous rules hold for right-floating elements.
+
+
 <hr class="navbar">
 
 <div class="navbar">

css2/cover.html

@@ -1276,6 +1276,8 @@ <h2><a name="toc">Full Table of Contents</a></h2>
       <li class="tocline3"><a href="changes.html#q504" class="tocxref">C.8.10 8.3.1 Collapsing margins</a>
       <li class="tocline3"><a href="changes.html#q505" class="tocxref">C.8.11 10.8 Line height calculations: the 'line-height' and 'vertical-align' properties</a>
       <li class="tocline3"><a href="changes.html#q506" class="tocxref">C.8.12 10.8.1 Leading and half-leading</a>
+      <li class="tocline3"><a href="changes.html#q507" class="tocxref">C.8.13 10.6.1 Inline, non-replaced elements</a>
+      <li class="tocline3"><a href="changes.html#q508" class="tocxref">C.8.14 9.5.1 Positioning the float: the 'float' property</a>
     </ul>
   </ul>
   <li class="tocline1"><a href="sample.html" class="tocxref">Appendix D. Default style sheet for HTML 4</a>

css2/css2.html

@@ -1271,6 +1271,8 @@ <h2><a name="toc">Full Table of Contents</a></h2>
       <li class="tocline3"><a href="changes.html#q504" class="tocxref">C.8.10 8.3.1 Collapsing margins</a>
       <li class="tocline3"><a href="changes.html#q505" class="tocxref">C.8.11 10.8 Line height calculations: the 'line-height' and 'vertical-align' properties</a>
       <li class="tocline3"><a href="changes.html#q506" class="tocxref">C.8.12 10.8.1 Leading and half-leading</a>
+      <li class="tocline3"><a href="changes.html#q507" class="tocxref">C.8.13 10.6.1 Inline, non-replaced elements</a>
+      <li class="tocline3"><a href="changes.html#q508" class="tocxref">C.8.14 9.5.1 Positioning the float: the 'float' property</a>
     </ul>
   </ul>
   <li class="tocline1"><a href="sample.html" class="tocxref">Appendix D. Default style sheet for HTML 4</a>
@@ -7003,8 +7005,7 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
 margins, the maximum of the absolute values of the negative adjoining
 margins is deducted from the maximum of the positive adjoining
 margins.  If there are no positive margins, the maximum of the
-absolute values of the adjoining margins adjoining margins is deducted
-from zero.
+absolute values of the adjoining margins is deducted from zero.
 
 <P ID="collapsed-through">If the top and bottom margins of a box are
 adjoining, then it is possible for margins to <a name="x28"><span
@@ -9026,7 +9027,7 @@ <h3>9.5.1 <a name="float-position">Positioning the float:</a> the
 <li>The right <a href="box.html#outer-edge">outer edge</a> of a
 left-floating box may not be to the right of the left <a
 href="box.html#outer-edge">outer edge</a> of any right-floating
-box that is to the right of it. Analogous rules hold for
+box that is next to it. Analogous rules hold for
 right-floating elements.
 </li>
 <li>A floating box's <a href="box.html#outer-edge">outer top</a>
@@ -9794,7 +9795,7 @@ <h3>9.9.1 <a name="z-index">Specifying the stack level</a>: the <a href="visuren
   <dt><strong>auto</strong>
 
   <dd>The stack level of the generated box in the current stacking
-  context is '0'. The box does not establish a new stacking context
+  context is 0. The box does not establish a new stacking context
   unless it is the root element.
 </dl>
 
@@ -9838,7 +9839,7 @@ <h3>9.9.1 <a name="z-index">Specifying the stack level</a>: the <a href="visuren
 </p>
 
 <p>Within each stacking context, the following layers are painted in
-back-to-front order.
+back-to-front order:
 
 <ol>
   <li>the background and borders of the element forming the stacking
@@ -9849,23 +9850,24 @@ <h3>9.9.1 <a name="z-index">Specifying the stack level</a>: the <a href="visuren
 
   <li>the in-flow, non-inline-level, non-positioned descendants.
 
-  <li>the floating descendants.
+  <li>the non-positioned floats.
 
   <li>the in-flow, inline-level, non-positioned descendants, including
   inline tables and inline blocks.
 
-  <li>the child stacking contexts with stack level 0, and the positioned
-  descendants with 'z-index: auto'.
+  <li>the child stacking contexts with stack level 0 and the
+  positioned descendants with stack level 0.
 
   <li>the child stacking contexts with positive stack levels (least
   positive first).
 </ol>
 
-<p>Positioned elements with 'z-index: auto' (in layer&nbsp;6), floats
-(layer&nbsp;4), inline blocks (layer&nbsp;5), and inline tables
-(layer&nbsp;5), are painted as if those elements generated new
-stacking contexts, except that their positioned descendants and any
-child stacking contexts take part in the current stacking context.
+<p>Within each stacking context, positioned elements with stack level
+0 (in layer&nbsp;6), non-positioned floats (layer&nbsp;4), inline
+blocks (layer&nbsp;5), and inline tables (layer&nbsp;5), are painted
+as if those elements themselves generated new stacking contexts,
+except that their positioned descendants and any would-be child
+stacking contexts take part in the current stacking context.
 
 <p>This painting order is applied recursively to each stacking
 context. This description of stacking context painting order
@@ -20366,6 +20368,8 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
       <li class="tocline3"><a href="changes.html#q504" class="tocxref">C.8.10 8.3.1 Collapsing margins</a>
       <li class="tocline3"><a href="changes.html#q505" class="tocxref">C.8.11 10.8 Line height calculations: the 'line-height' and 'vertical-align' properties</a>
       <li class="tocline3"><a href="changes.html#q506" class="tocxref">C.8.12 10.8.1 Leading and half-leading</a>
+      <li class="tocline3"><a href="changes.html#q507" class="tocxref">C.8.13 10.6.1 Inline, non-replaced elements</a>
+      <li class="tocline3"><a href="changes.html#q508" class="tocxref">C.8.14 9.5.1 Positioning the float: the 'float' property</a>
     </ul>
   </ul>
 </div>
@@ -26904,7 +26908,7 @@ <h3 id=u.10.1><a name="q502">C.8.8 </a><a
 is inline and split over multiple lines:
 
 <blockquote>
-4. If the element has 'position: absolute', the containing block is
+<p>4. If the element has 'position: absolute', the containing block is
 <del>established by</del> <ins>the padding edge of</ins> the nearest
 ancestor with a 'position' of 'absolute', 'relative' or 'fixed'<del>,
 in the following way:</del><ins>.</ins>
@@ -26954,7 +26958,7 @@ <h3 id=u.13.2.2><a name="q503">C.8.9 </a><a
 
 
 
-<h3 id=u.8.3.1><a name="q504">C.8.10 </a><a
+<h3 id=u.8.3.1a><a name="q504">C.8.10 </a><a
 href="/TR/2010/WD-CSS2-20101207/box.html#collapsing-margins">8.3.1
 Collapsing margins</a></h3>
 
@@ -26968,6 +26972,7 @@ <h3 id=u.8.3.1><a name="q504">C.8.10 </a><a
 href="visuren.html#phantom-line-box">certain zero-height line
 boxes</a> (see <a href="visuren.html#inline-formatting">9.4.2</a>) are
 ignored for this purpose.)</span></ins>
+</ul>
 </blockquote>
 
 
@@ -26992,6 +26997,7 @@ <h3 id=u.10.8><a name="q505">C.8.11 </a><a
 <ins><a href="visudet.html#inline-box-height">height of inline
 boxes</a> in <a href="visudet.html#leading">"Leading and
 half-leading"</a></ins>.)
+</ol>
 </blockquote>
 
 <p>The part of the definition that was in <a
@@ -27004,9 +27010,9 @@ <h3 id=u.10.8><a name="q505">C.8.11 </a><a
 
 
 
-<h3 id=u.10.8.1><a name="q506">C.8.12 </a><a
-href="/TR/2010/WD-CSS2-20101207/visudet.html#leading"</a>10.8.1
-Leading and half-leading</h3>
+<h3 id=u.10.8.1a><a name="q506">C.8.12 </a><a
+href="/TR/2010/WD-CSS2-20101207/visudet.html#leading">10.8.1
+Leading and half-leading</a></h3>
 
 <p>Inserted the following before the definitions of the keywords of
 'vertical-align' to define precisely which box is aligned:
@@ -27021,14 +27027,57 @@ <h3 id=u.10.8.1><a name="q506">C.8.12 </a><a
 </blockquote>
 
 <p>Also, to make sure there always is a box whose height is
-'line-height', removed a phrase earlier in the same section:
+'line-height', a phrase earlier in the same section was removed:
 
 <blockquote>
 <p>User agent must align the glyphs in a non-replaced inline box to
 each other by their relevant baselines<del>, and to nested inline
 boxes according to 'vertical-align'</del>.
 </blockquote>
 
+<p>And another modified:
+
+<blockquote>
+<p>The height of the inline box <del>is then the smallest such that it
+encloses all glyphs and their leading, as well as all nested inline
+boxes.</del> <ins>encloses all glyphs and their leading and is thus
+exactly 'line-height'. Boxes of child elements do not influence this
+height.</ins>
+</blockquote>
+
+
+
+<h3 id=u.10.6.1a><a name="q507">C.8.13 </a><a
+href="/TR/2010/WD-CSS2-20101207/visudet.html#inline-non-replaced">10.6.1
+Inline, non-replaced elements</a></h3>
+
+<p>Improve language:
+
+<blockquote>
+<p>The vertical padding, border and margin of an inline, non-replaced
+box start at the top and bottom of the content
+area, <del>not</del> <ins>and has nothing to do with</ins> the
+'line-height'. But only the 'line-height' is used when calculating the
+height of the line box.
+</blockquote>
+
+
+
+<h3 id=u.9.5.1><a name="q508">C.8.14 </a><a
+href="/TR/2010/WD-CSS2-20101207/visuren.html#float-position">9.5.1
+Positioning the float: the 'float' property</a></h3>
+
+<p>A left float must not only not overlap a right float, but must also
+not be completely to the right of it.
+
+</blockquote>
+<p>3. The right <a href="box.html#outer-edge">outer edge</a> of a
+left-floating box may not be to the right of the
+left <a href="box.html#outer-edge">outer edge</a> of any
+right-floating box that is <del>to the right of</del> <ins>next
+to</ins> it. Analogous rules hold for right-floating elements.
+
+
 <hr class="navbar">
 
 

css2/diffs-rec/box.html

@@ -468,18 +468,17 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
 margins, the maximum of the absolute values of the negative adjoining
 margins is deducted from the maximum of the positive adjoining
 margins.  If there are no positive margins, the maximum of the
-absolute values of the adjoining margins adjoining margins is deducted
-from zero.</ins>
+absolute values of the adjoining margins is deducted from zero.</ins>
 
 <P ID="collapsed-through"><ins>If the top and bottom margins of a box are
 adjoining, then it is possible</ins> for  <del>an illustration</del><ins>margins to</ins> <a name="x28"><span
 class="index-def"><DFN><ins>collapse through</ins></DFN></span></a> <ins>it. In this case,
-the position of the element depends on its relationship with the other
+the position</ins> of <ins>the element depends on its relationship with the other
 elements whose margins are being collapsed.</ins>
 
 <UL>
-  <LI><ins>If the element's margins are collapsed with its parent's top
-  margin, the top border edge</ins> of <ins>the box is defined to be the same as
+  <LI><ins>If the element's margins are</ins> collapsed  <del>margins.</del><ins>with its parent's top
+  margin, the top border edge of the box is defined to be the same as
   the parent's.</ins>
 
   <LI><ins>Otherwise, either the element's parent is not taking part in the
@@ -488,8 +487,8 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
   as it would have been if the element had a non-zero bottom border.</ins>
 </UL>
 
-<P><ins>Note that the positions of elements that have been</ins> collapsed
- <del>margins.</del><ins>through have no effect on the positions of the other elements with
+<P><ins>Note that the positions of elements that have been collapsed
+through have no effect on the positions of the other elements with
 whose margins they are being collapsed; the top border edge position
 is only required for laying out descendants of these elements.</ins>