[css2] Issues 203 and 192.

bert-github · bert-github · commit ee43ceb60e18 · 2011-03-30T17:49:31.000Z
--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%403200
diff --git a/css2/changes.src b/css2/changes.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: changes.src,v 2.157 2011-03-26 15:16:34 bbos Exp $ -->
+<!-- $Id: changes.src,v 2.158 2011-03-30 17:48:50 bbos Exp $ -->
 <HEAD>
 <TITLE>Changes</TITLE>
 </HEAD>
@@ -7694,6 +7694,42 @@ recovery token {baduri}:
 </pre>
 </blockquote>
 
+<!--========================== issue 203 ==========================-->
+
+<h3 id="t.9.5.2c"><a
+href="/TR/2009/CR-CSS2-20090908/visuren.html#flow-control">
+Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear'
+property</a></h3>
+
+<p>The top border edge is now well-defined in the section on
+collapsing margins. That is the hypothetical position to use for
+clearance:
+
+<blockquote>
+<p>This position is where the actual top border edge would have been
+if the element <del>had a non-zero bottom border and its</del>
+<ins>'s</ins> 'clear' property had been 'none'.
+</blockquote>
+
+<!--========================== issue 192 ==========================-->
+
+<h3 id="t.9.5"><a
+href="/TR/2009/CR-CSS2-20090908//visuren.html#floats">9.5
+Floats</a></h3>
+
+<p>Remove ambiguities:
+
+<blockquote>
+<p>If a shortened line box is too small to contain any content
+<del>after the float</del>, then <del>that content</del> <ins>the line
+box</ins> is shifted downward <ins>(and its width recomputed)</ins>
+until either <del>it</del> <ins>some content</ins> fits or there are
+no more floats present. Any content in the current line before a
+floated box is reflowed in the <del>first available</del>
+<ins>same</ins> line on the other side of the float.
+</blockquote>
+
+
 
 </BODY>
 </HTML>
diff --git a/css2/visuren.src b/css2/visuren.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: visuren.src,v 2.190 2011-03-26 03:08:17 bbos Exp $ -->
+<!-- $Id: visuren.src,v 2.191 2011-03-30 17:49:31 bbos Exp $ -->
 <head>
 <title>Visual formatting model</title>
 <meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
@@ -973,12 +973,11 @@ of the float.
 <p class=note>Note: this means that floats with zero outer height or
 negative outer height do not shorten line boxes.
 
-<p>If a shortened line box 
-is too small to contain any content after the float, then that content
-is shifted downward until
-either it fits or there are no more floats present.
+<p>If a shortened line box is too small to contain any content, then
+the line box is shifted downward (and its width recomputed) until
+either some content fits or there are no more floats present.
 Any content in the current line before a floated box is reflowed 
-in the first available line on the other side of the float.
+in the same line on the other side of the float.
 In other words, if inline-level boxes are placed 
 on the line before a left float is encountered that fits in the remaining line box space, 
 the left float is placed on that line, aligned with the top of the line box, and then the inline-level boxes already on the line are moved accordingly to the right of the float (the right being the other side of the left float) and vice versa for rtl and right floats.
@@ -1321,8 +1320,8 @@ push the element vertically past the float.
 <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. 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'.
+where the actual top border edge would have been if the element's
+'clear' property had been 'none'.
 
 <p>If this hypothetical position of the element's top border edge is
 not past the relevant floats, then clearance is introduced, and
