[css2] Generated. Do not edit!

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

Author: bert-github

css2/box.html

@@ -376,6 +376,11 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
   margins collapse with the adjoining margins of following siblings
   but that resulting margin does not collapse with the bottom margin
   of the parent block.
+
+  <LI>If the top margin of a box with non-zero computed
+  'min-height' and 'auto' computed 'height' collapses with the
+  bottom margin of its last in-flow child, then the child's bottom
+  margin does not collapse with the parent's bottom margin.
 </UL>
 
 <P>Horizontal margins never collapse.
@@ -449,12 +454,16 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
   first in-flow block-level child's top margin if the element has no
   top border, no top padding, and the child has no clearance.
 
-  <LI>The bottom margin of an in-flow block box with a <a href="visudet.html#propdef-height" class="noxref"><span
-  class="propinst-height">'height'</span></a> of 'auto' and a <a href="visudet.html#propdef-min-height" class="noxref"><span
-  class="propinst-min-height">'min-height'</span></a> of zero collapses
-  with its last in-flow block-level child's bottom margin if the box
-  has no bottom padding and no bottom border and the child's bottom
-  margin does not collapse with a top margin that has clearance.
+  <LI>The bottom margin of an in-flow block box with a 'height' of
+  'auto' collapses with its last in-flow block-level child's bottom
+  margin, if:
+   <UL>
+      <LI>the box has no bottom padding, and
+      <LI>the box has no bottom border, and
+      <LI>the child's bottom margin neither collapses with a top margin
+           that has clearance, nor (if the box's min-height is non-zero)
+           with the box's top margin.
+   </UL>
 
   <LI>A box's own margins collapse if the <a href="visudet.html#propdef-min-height" class="noxref"><span
   class="propinst-min-height">'min-height'</span></a> property is zero,

css2/cascade.html

@@ -73,8 +73,9 @@ <h3>6.1.1 <span class="index-def" title="specified value">
 
 <ol>
 <li>If the <a href="#cascade">cascade</a> results in a value, use it.
-But if the cascade results in 'inherit', the specified value is as
-explained in <a href="#value-def-inherit" >“The 'inherit' value.”</a>
+Except that, if the value is 'inherit', the specified value is defined
+in <a href="#value-def-inherit" >“The 'inherit' value”</a> below.
+
 <li>Otherwise, if the property is <a href="#inheritance">inherited</a> and the element is not the root of the <a>document tree</a>, use the computed value of the parent element.
 <li>Otherwise use the property's <a name="x1"><span class="index-def" title="initial value">initial value</span></a>. The initial value of each property is indicated in the property's definition. 
 </ol>

css2/css2.html

@@ -5827,8 +5827,9 @@ <h3>6.1.1 <span class="index-def" title="specified value">
 
 <ol>
 <li>If the <a href="#cascade">cascade</a> results in a value, use it.
-But if the cascade results in 'inherit', the specified value is as
-explained in <a href="#value-def-inherit" >“The 'inherit' value.”</a>
+Except that, if the value is 'inherit', the specified value is defined
+in <a href="#value-def-inherit" >“The 'inherit' value”</a> below.
+
 <li>Otherwise, if the property is <a href="#inheritance">inherited</a> and the element is not the root of the <a>document tree</a>, use the computed value of the parent element.
 <li>Otherwise use the property's <a name="x1"><span class="index-def" title="initial value">initial value</span></a>. The initial value of each property is indicated in the property's definition. 
 </ol>
@@ -6937,6 +6938,11 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
   margins collapse with the adjoining margins of following siblings
   but that resulting margin does not collapse with the bottom margin
   of the parent block.
+
+  <LI>If the top margin of a box with non-zero computed
+  'min-height' and 'auto' computed 'height' collapses with the
+  bottom margin of its last in-flow child, then the child's bottom
+  margin does not collapse with the parent's bottom margin.
 </UL>
 
 <P>Horizontal margins never collapse.
@@ -7010,12 +7016,16 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
   first in-flow block-level child's top margin if the element has no
   top border, no top padding, and the child has no clearance.
 
-  <LI>The bottom margin of an in-flow block box with a <a href="visudet.html#propdef-height" class="noxref"><span
-  class="propinst-height">'height'</span></a> of 'auto' and a <a href="visudet.html#propdef-min-height" class="noxref"><span
-  class="propinst-min-height">'min-height'</span></a> of zero collapses
-  with its last in-flow block-level child's bottom margin if the box
-  has no bottom padding and no bottom border and the child's bottom
-  margin does not collapse with a top margin that has clearance.
+  <LI>The bottom margin of an in-flow block box with a 'height' of
+  'auto' collapses with its last in-flow block-level child's bottom
+  margin, if:
+   <UL>
+      <LI>the box has no bottom padding, and
+      <LI>the box has no bottom border, and
+      <LI>the child's bottom margin neither collapses with a top margin
+           that has clearance, nor (if the box's min-height is non-zero)
+           with the box's top margin.
+   </UL>
 
   <LI>A box's own margins collapse if the <a href="visudet.html#propdef-min-height" class="noxref"><span
   class="propinst-min-height">'min-height'</span></a> property is zero,
@@ -11524,14 +11534,10 @@ <h2>10.7 <a name="min-max-heights">Minimum and maximum heights</a>: <a href="vis
 </li>
 </ol>
 
-<p class="note">These steps do not affect the real computed values of
-the above properties. The change of used <a href="visudet.html#propdef-height" class="noxref"><span
-class="propinst-height">'height'</span></a> has no effect on margin
-collapsing except as specifically required by rules for <a href="visudet.html#propdef-min-height" class="noxref"><span
-class="propinst-min-height">'min-height'</span></a> or <a href="visudet.html#propdef-max-height" class="noxref"><span
-class="propinst-max-height">'max-height'</span></a> in <a
-href="box.html#collapsing-margins">"Collapsing margins"
-(8.3.1).</a></p>
+<p class="note">These steps do not affect the real computed value of
+<a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a>. Consequently, for
+example, they do not affect margin collapsing, which depends on the
+computed value.
 
 <p>However, for replaced elements with both <a href="visudet.html#propdef-width" class="noxref"><span
 class="propinst-width">'width'</span></a> and <a href="visudet.html#propdef-height" class="noxref"><span

css2/diffs-rec/box.html

@@ -362,31 +362,36 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
 <P>In  <del>this specification,</del><ins>CSS,</ins> the  <del>expression collapsing margins means that</del>adjoining margins  <del>(no padding or border areas separate them)</del>of two or more boxes (which  <del>may be next to one another</del><ins>might</ins> or
  <del>nested)</del><ins>might not be siblings) can</ins> combine to form a single margin.  <del>In CSS2, horizontal margins never collapse. Vertical</del>Margins
  <del>may</del><ins>that combine this way are said to</ins> <dfn><a name="x26"><span
-class="index-def">collapse</span></a></dfn> <del>between certain boxes: Two or more</del><ins>, and the
-resulting combined margin is called a</ins> <dfn><a name="x27"><span class="index-def"
-title="collapsing margin"><ins>collapsed margin</ins></span></a></dfn><ins>.</ins>
+class="index-def">collapse</span></a></dfn> <del>between certain boxes: Two or more adjoining vertical margins of block boxes in the normal flow collapse.</del><ins>, and</ins> the
+resulting <ins>combined</ins> margin  <del>width</del>is  <del>the maximum of the adjoining</del><ins>called a</ins> <dfn><a name="x27"><span class="index-def"
+title="collapsing margin"><ins>collapsed</ins> margin</span></a></dfn> <del>widths. In the case</del><ins>.</ins>
 
-<P>Adjoining vertical margins <ins>collapse, except:</ins>
+<P><ins>Adjoining vertical margins collapse, except:</ins>
 
 <UL>
-  <LI><ins>Margins</ins> of  <del>block boxes in</del>the  <del>normal flow</del><ins>root element's box do not</ins> collapse.
+  <LI><ins>Margins</ins> of  <del>negative margins,</del>the  <del>absolute maximum</del><ins>root element's box do not collapse.</ins>
 
-  <LI><ins>If</ins> the  <del>resulting margin width is the maximum</del><ins>top and bottom margins</ins> of <ins>an element with</ins> <a
+  <LI><ins>If the top and bottom margins</ins> of <ins>an element with</ins> <a
   href="visuren.html#clearance"><ins>clearance</ins></a> <ins>are adjoining, its
-  margins collapse with</ins> the adjoining  <del>margin widths. In the case</del><ins>margins</ins> of  <del>negative margins,</del><ins>following siblings
-  but that resulting margin does not collapse with</ins> the  <del>absolute maximum</del><ins>bottom margin</ins>
-  of the  <del>negative adjoining</del><ins>parent block.</ins>
+  margins collapse with</ins> the  <del>negative</del>adjoining margins  <del>is deducted from</del><ins>of following siblings
+  but that resulting margin does not collapse with</ins> the  <del>maximum</del><ins>bottom margin</ins>
+  of the  <del>positive adjoining margins.</del><ins>parent block.</ins>
+
+  <LI>If  <del>there are no positive margins,</del>the  <del>absolute maximum</del><ins>top margin</ins> of  <del>the negative adjoining margins is deducted from zero. Vertical margins between</del>a  <del>floated</del>box <ins>with non-zero computed
+  'min-height'</ins> and  <del>any other box do</del><ins>'auto' computed 'height' collapses with the
+  bottom margin of its last in-flow child, then the child's bottom
+  margin does</ins> not <ins>collapse with the parent's bottom margin.</ins>
 </UL>
 
-<P><ins>Horizontal</ins> margins  <del>is deducted from the maximum of the positive</del><ins>never collapse.</ins>
+<P><ins>Horizontal margins never</ins> collapse.
 
-<P ID="what-is-adjoining"><ins>Two margins are</ins> <a name="x28"><span class="index-def"
-title="adjoining margins"><DFN>adjoining</DFN></span></a>  <del>margins.</del>if  <del>there are no positive margins,</del><ins>and only if:</ins>
+<P ID="what-is-adjoining"><ins>Two</ins> margins  <del>of absolutely</del><ins>are</ins> <a name="x28"><span class="index-def"
+title="adjoining margins"><DFN><ins>adjoining</ins></DFN></span></a> <ins>if</ins> and  <del>relatively positioned</del><ins>only if:</ins>
 
 <UL>
   <LI><ins>both belong to in-flow</ins> <a
-  href="visuren.html#block-boxes"><ins>block-level boxes</ins></a> <ins>that
-  participate in</ins> the  <del>absolute maximum</del><ins>same</ins> <a
+  href="visuren.html#block-boxes"><ins>block-level</ins> boxes</a>  <del>do not collapse. Please consult the examples</del><ins>that
+  participate in the same</ins> <a
   href="visuren.html#block-formatting"><ins>block formatting context</ins></a>
 
   <LI><ins>no line boxes, no clearance, no padding and no border separate
@@ -395,19 +400,19 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
   boxes</ins></a> <ins>(see</ins> <a href="visuren.html#inline-formatting"><ins>9.4.2</ins></a><ins>)
   are ignored for this purpose.)</ins></span>
 
-  <LI><ins>both belong to vertically-adjacent box edges, i.e. form one</ins> of
-  the  <del>negative adjoining margins is deducted from zero. Vertical margins between</del><ins>following pairs:</ins>
+  <LI><ins>both belong to vertically-adjacent box edges, i.e. form one of
+  the following pairs:</ins>
 
   <UL>
-    <LI><ins>top margin of</ins> a  <del>floated</del>box and  <del>any other</del><ins>top margin of its first in-flow child</ins>
+    <LI><ins>top margin of a box and top margin of its first in-flow child</ins>
 
     <LI><ins>bottom margin of box and top margin of its next in-flow
     following sibling</ins>
 
     <LI><ins>bottom margin of a last in-flow child and bottom margin of its
     parent if the parent has 'auto' computed height</ins>
 
-    <LI><ins>top and bottom margins of a box that does not establish a new
+    <LI><ins>top and bottom margins</ins> of <ins>a box that does not establish a new
     block formatting context and that has zero computed</ins> <a href="visudet.html#propdef-min-height" class="noxref"><span
     class="propinst-min-height"><ins>'min-height'</ins></span></a><ins>, zero or 'auto'
     computed</ins> <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height"><ins>'height'</ins></span></a><ins>, and no
@@ -426,35 +431,39 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
 
 <UL>
   <LI><ins>Margins between a</ins> <a href="visuren.html#floats"><ins>floated</ins></a> <ins>box
-  and any other</ins> box do not  <del>collapse.</del><ins>collapse (not even between a float and its
+  and any other box do not collapse (not even between a float and its
   in-flow children).</ins>
 
-  <LI>Margins of  <del>absolutely</del><ins>elements that establish new block formatting contexts
-  (such as floats</ins> and  <del>relatively</del><ins>elements with</ins> <a href="visufx.html#propdef-overflow" class="noxref"><span
+  <LI><ins>Margins of elements that establish new block formatting contexts
+  (such as floats and elements with</ins> <a href="visufx.html#propdef-overflow" class="noxref"><span
   class="propinst-overflow"><ins>'overflow'</ins></span></a> <ins>other than 'visible') do
   not collapse with their in-flow children.</ins>
 
   <LI><ins>Margins of</ins> <a
-  href="visuren.html#absolutely-positioned"><ins>absolutely</ins> positioned</a>
-  boxes do not  <del>collapse. Please consult</del><ins>collapse (not even with their in-flow children).</ins>
+  href="visuren.html#absolutely-positioned"><ins>absolutely positioned</ins></a>
+  <ins>boxes do not collapse (not even with their in-flow children).</ins>
 
   <LI><ins>Margins of inline-block boxes do not collapse (not even with
   their in-flow children).</ins>
 
-  <LI>The  <del>examples</del><ins>bottom margin</ins> of  <del>margin,</del><ins>an in-flow block-level element always
+  <LI><ins>The bottom margin of an in-flow block-level element always
   collapses with the top margin of its next in-flow block-level
   sibling, unless that sibling has clearance.</ins>
 
   <LI><ins>The top margin of an in-flow block element collapses with its
   first in-flow block-level child's top margin if the element has no
-  top border, no top</ins> padding, and <ins>the child has no clearance.</ins>
-
-  <LI><ins>The bottom margin of an in-flow block box with a</ins> <a href="visudet.html#propdef-height" class="noxref"><span
-  class="propinst-height"><ins>'height'</ins></span></a> <ins>of 'auto' and a</ins> <a href="visudet.html#propdef-min-height" class="noxref"><span
-  class="propinst-min-height"><ins>'min-height'</ins></span></a> <ins>of zero collapses
-  with its last in-flow block-level child's bottom margin if the box
-  has no bottom padding and no bottom border and the child's bottom
-  margin does not collapse with a top margin that has clearance.</ins>
+  top border, no top padding, and the child has no clearance.</ins>
+
+  <LI><ins>The bottom margin of an in-flow block box with a 'height' of
+  'auto' collapses with its last in-flow block-level child's bottom</ins>
+  margin, <ins>if:</ins>
+   <UL>
+      <LI><ins>the box has no bottom</ins> padding, and
+      <LI><ins>the box has no bottom border, and</ins>
+      <LI><ins>the child's bottom margin neither collapses with a top margin
+           that has clearance, nor (if the box's min-height is non-zero)
+           with the box's top margin.</ins>
+   </UL>
 
   <LI><ins>A box's own margins collapse if the</ins> <a href="visudet.html#propdef-min-height" class="noxref"><span
   class="propinst-min-height"><ins>'min-height'</ins></span></a> <ins>property is zero,