Skip to content

Commit c90a9ce

Browse files
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%403201
1 parent ee43ceb commit c90a9ce

10 files changed

Lines changed: 1684 additions & 1528 deletions

File tree

css2/changes.html

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -587,6 +587,8 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
587587
<li class="tocline3"><a href="changes.html#q544" class="tocxref">C.8.50 10.3.2 Inline, replaced elements</a>
588588
<li class="tocline3"><a href="changes.html#q545" class="tocxref">C.8.51 Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear' property</a>
589589
<li class="tocline3"><a href="changes.html#q546" class="tocxref">C.8.52 G.2 Lexical scanner</a>
590+
<li class="tocline3"><a href="changes.html#q547" class="tocxref">C.8.53 Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear' property</a>
591+
<li class="tocline3"><a href="changes.html#q548" class="tocxref">C.8.54 9.5 Floats</a>
590592
</ul>
591593
</ul>
592594
</div>
@@ -8210,6 +8212,42 @@ <h3 id="t.G.2"><a name="q546">C.8.52 </a><a
82108212
</blockquote>
82118213

82128214

8215+
8216+
<h3 id="t.9.5.2c"><a name="q547">C.8.53 </a><a
8217+
href="/TR/2009/CR-CSS2-20090908/visuren.html#flow-control">
8218+
Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear'
8219+
property</a></h3>
8220+
8221+
<p>The top border edge is now well-defined in the section on
8222+
collapsing margins. That is the hypothetical position to use for
8223+
clearance:
8224+
8225+
<blockquote>
8226+
<p>This position is where the actual top border edge would have been
8227+
if the element <del>had a non-zero bottom border and its</del>
8228+
<ins>'s</ins> 'clear' property had been 'none'.
8229+
</blockquote>
8230+
8231+
8232+
8233+
<h3 id="t.9.5"><a name="q548">C.8.54 </a><a
8234+
href="/TR/2009/CR-CSS2-20090908//visuren.html#floats">9.5
8235+
Floats</a></h3>
8236+
8237+
<p>Remove ambiguities:
8238+
8239+
<blockquote>
8240+
<p>If a shortened line box is too small to contain any content
8241+
<del>after the float</del>, then <del>that content</del> <ins>the line
8242+
box</ins> is shifted downward <ins>(and its width recomputed)</ins>
8243+
until either <del>it</del> <ins>some content</ins> fits or there are
8244+
no more floats present. Any content in the current line before a
8245+
floated box is reflowed in the <del>first available</del>
8246+
<ins>same</ins> line on the other side of the float.
8247+
</blockquote>
8248+
8249+
8250+
82138251
<hr class="navbar">
82148252

82158253
<div class="navbar">

css2/cover.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,6 +1301,8 @@ <h2><a name="toc">Full Table of Contents</a></h2>
13011301
<li class="tocline3"><a href="changes.html#q544" class="tocxref">C.8.50 10.3.2 Inline, replaced elements</a>
13021302
<li class="tocline3"><a href="changes.html#q545" class="tocxref">C.8.51 Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear' property</a>
13031303
<li class="tocline3"><a href="changes.html#q546" class="tocxref">C.8.52 G.2 Lexical scanner</a>
1304+
<li class="tocline3"><a href="changes.html#q547" class="tocxref">C.8.53 Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear' property</a>
1305+
<li class="tocline3"><a href="changes.html#q548" class="tocxref">C.8.54 9.5 Floats</a>
13041306
</ul>
13051307
</ul>
13061308
<li class="tocline1"><a href="sample.html" class="tocxref">Appendix D. Default style sheet for HTML 4</a>

css2/css2.html

Lines changed: 46 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1296,6 +1296,8 @@ <h2><a name="toc">Full Table of Contents</a></h2>
12961296
<li class="tocline3"><a href="changes.html#q544" class="tocxref">C.8.50 10.3.2 Inline, replaced elements</a>
12971297
<li class="tocline3"><a href="changes.html#q545" class="tocxref">C.8.51 Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear' property</a>
12981298
<li class="tocline3"><a href="changes.html#q546" class="tocxref">C.8.52 G.2 Lexical scanner</a>
1299+
<li class="tocline3"><a href="changes.html#q547" class="tocxref">C.8.53 Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear' property</a>
1300+
<li class="tocline3"><a href="changes.html#q548" class="tocxref">C.8.54 9.5 Floats</a>
12991301
</ul>
13001302
</ul>
13011303
<li class="tocline1"><a href="sample.html" class="tocxref">Appendix D. Default style sheet for HTML 4</a>
@@ -8732,12 +8734,11 @@ <h2>9.5 <a name="floats">Floats</a></h2>
87328734
<p class=note>Note: this means that floats with zero outer height or
87338735
negative outer height do not shorten line boxes.
87348736

8735-
<p>If a shortened line box
8736-
is too small to contain any content after the float, then that content
8737-
is shifted downward until
8738-
either it fits or there are no more floats present.
8737+
<p>If a shortened line box is too small to contain any content, then
8738+
the line box is shifted downward (and its width recomputed) until
8739+
either some content fits or there are no more floats present.
87398740
Any content in the current line before a floated box is reflowed
8740-
in the first available line on the other side of the float.
8741+
in the same line on the other side of the float.
87418742
In other words, if inline-level boxes are placed
87428743
on the line before a left float is encountered that fits in the remaining line box space,
87438744
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.
@@ -9112,8 +9113,8 @@ <h3>9.5.2 <a name="flow-control">Controlling flow next to floats:</a>
91129113
<p>Computing the clearance of an element on which 'clear' is set is
91139114
done by first determining the hypothetical position of the element's
91149115
top border edge. This position is
9115-
where the actual top border edge would have been if the element
9116-
had a non-zero bottom border and its 'clear' property had been 'none'.
9116+
where the actual top border edge would have been if the element's
9117+
'clear' property had been 'none'.
91179118

91189119
<p>If this hypothetical position of the element's top border edge is
91199120
not past the relevant floats, then clearance is introduced, and
@@ -20410,6 +20411,8 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
2041020411
<li class="tocline3"><a href="changes.html#q544" class="tocxref">C.8.50 10.3.2 Inline, replaced elements</a>
2041120412
<li class="tocline3"><a href="changes.html#q545" class="tocxref">C.8.51 Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear' property</a>
2041220413
<li class="tocline3"><a href="changes.html#q546" class="tocxref">C.8.52 G.2 Lexical scanner</a>
20414+
<li class="tocline3"><a href="changes.html#q547" class="tocxref">C.8.53 Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear' property</a>
20415+
<li class="tocline3"><a href="changes.html#q548" class="tocxref">C.8.54 9.5 Floats</a>
2041320416
</ul>
2041420417
</ul>
2041520418
</div>
@@ -28033,6 +28036,42 @@ <h3 id="t.G.2"><a name="q546">C.8.52 </a><a
2803328036
</blockquote>
2803428037

2803528038

28039+
28040+
<h3 id="t.9.5.2c"><a name="q547">C.8.53 </a><a
28041+
href="/TR/2009/CR-CSS2-20090908/visuren.html#flow-control">
28042+
Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear'
28043+
property</a></h3>
28044+
28045+
<p>The top border edge is now well-defined in the section on
28046+
collapsing margins. That is the hypothetical position to use for
28047+
clearance:
28048+
28049+
<blockquote>
28050+
<p>This position is where the actual top border edge would have been
28051+
if the element <del>had a non-zero bottom border and its</del>
28052+
<ins>'s</ins> 'clear' property had been 'none'.
28053+
</blockquote>
28054+
28055+
28056+
28057+
<h3 id="t.9.5"><a name="q548">C.8.54 </a><a
28058+
href="/TR/2009/CR-CSS2-20090908//visuren.html#floats">9.5
28059+
Floats</a></h3>
28060+
28061+
<p>Remove ambiguities:
28062+
28063+
<blockquote>
28064+
<p>If a shortened line box is too small to contain any content
28065+
<del>after the float</del>, then <del>that content</del> <ins>the line
28066+
box</ins> is shifted downward <ins>(and its width recomputed)</ins>
28067+
until either <del>it</del> <ins>some content</ins> fits or there are
28068+
no more floats present. Any content in the current line before a
28069+
floated box is reflowed in the <del>first available</del>
28070+
<ins>same</ins> line on the other side of the float.
28071+
</blockquote>
28072+
28073+
28074+
2803628075
<hr class="navbar">
2803728076

2803828077

0 commit comments

Comments
 (0)