[css2] Inserted proposed text that talsk about "clearance" that stops

bert-github · bert-github · commit 6422f8bea26a · 2003-08-27T19:17:03.000Z
collapsing margins.

--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402157
diff --git a/css2/box.src b/css2/box.src
@@ -2,7 +2,7 @@
   'http://www.w3.org/TR/html4/strict.dtd'>
 
 <html lang="en">
-<!-- $Id: box.src,v 1.42 2003-08-27 15:59:13 bbos Exp $ -->
+<!-- $Id: box.src,v 1.43 2003-08-27 19:17:03 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Box model</TITLE>
@@ -270,7 +270,7 @@ body {
 <P>In this specification, the expression <span class="index-def"
 title="collapsing margin"><dfn>collapsing margins</dfn></span> means
 that adjoining margins (no non-empty content, padding or border areas
-separate them) of
+<ins>or clearance</ins> separate them) of
 two or more boxes (which may be next to one another or nested) combine
 to form a single margin.
 
@@ -331,11 +331,11 @@ elements.</p>
 
 <p>The bottom margin of an in-flow block-level element is always
 adjoining to the top margin of its next in-flow block-level
-sibling.</p>
+sibling<ins>, unless that sibling has clearance</ins>.</p>
 
 <p>The top margin of an in-flow block-level element is adjoining to its
 first in-flow block-level child's top margin if the element has no top
-border and no top padding.</p>
+border <del>and no top padding</del><ins>, no top padding, and no clearance</ins>.</p>
 
 <p>The bottom margin of an in-flow block-level element with a <span
 class="propinst-height">'height'</span> of 'auto' and <span
