Skip to content

Commit 8d55908

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

7 files changed

Lines changed: 1503 additions & 1503 deletions

File tree

css2/changes.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7504,7 +7504,7 @@ <h3 id=u.9.5.1a><a name="q517">C.8.23 </a><a
75047504
<blockquote>
75057505
<p><ins>But in CSS&nbsp;2.1, if, within the block formatting context,
75067506
there is an in-flow negative vertical margin such that the float's
7507-
position is above the position it would be at were the negative margin
7507+
position is above the position it would be at were all such negative margins
75087508
set to zero, the position of the float is undefined.</ins>
75097509
</blockquote>
75107510

css2/css2.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8919,7 +8919,7 @@ <h3>9.5.1 <a name="float-position">Positioning the float:</a> the
89198919

89208920
<p>But in CSS&nbsp;2.1, if, within the block formatting context, there
89218921
is an in-flow negative vertical margin such that the float's position
8922-
is above the position it would be at were the negative margin
8922+
is above the position it would be at were all such negative margins
89238923
set to zero, the position of the float is undefined.
89248924

89258925
<p>References to other elements in these rules refer only to other elements in the same <a href="#block-formatting">block formatting context</a> as the float.
@@ -27221,7 +27221,7 @@ <h3 id=u.9.5.1a><a name="q517">C.8.23 </a><a
2722127221
<blockquote>
2722227222
<p><ins>But in CSS&nbsp;2.1, if, within the block formatting context,
2722327223
there is an in-flow negative vertical margin such that the float's
27224-
position is above the position it would be at were the negative margin
27224+
position is above the position it would be at were all such negative margins
2722527225
set to zero, the position of the float is undefined.</ins>
2722627226
</blockquote>
2722727227

css2/diffs-rec/changes.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7504,7 +7504,7 @@ <h3 id=u.9.5.1a><a name="q517"><ins>C.8.23</ins> </a><a
75047504
<blockquote>
75057505
<p><ins><ins>But in CSS&nbsp;2.1, if, within the block formatting context,
75067506
there is an in-flow negative vertical margin such that the float's
7507-
position is above the position it would be at were the negative margin
7507+
position is above the position it would be at were all such negative margins
75087508
set to zero, the position of the float is undefined.</ins></ins>
75097509
</blockquote>
75107510

css2/diffs-rec/visuren.html

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,21 +1363,21 @@ <h3> <del>Content flows down</del><ins>9.5.1</ins> <a name="float-position"><ins
13631363
</dd>
13641364
<dt><strong><ins>right</ins></strong></dt>
13651365

1366-
<dd><ins>Similar</ins> to <del>make room for the floated box. Any content in</del><ins>'left', except</ins> the <del>current line before a floated</del>box is <del>reflowed in</del><ins>floated to</ins> the <del>first available line</del><ins>right, and content flows</ins> on the <del>other</del><ins>left</ins> side of the <del>float. Several floats may be adjacent, and this model also applies to adjacent floats in the same line. Example(s):</del><ins>box, starting at</ins> the <del>following rule floats all IMG boxes with class="icon" to</del><ins>top.</ins></dd>
1366+
<dd><ins>Similar</ins> to <del>make room for the floated box. Any content in</del><ins>'left', except</ins> the <del>current line before a floated</del>box is <del>reflowed in</del><ins>floated to</ins> the <del>first available line</del><ins>right, and content flows</ins> on the <del>other</del><ins>left</ins> side of the <del>float. Several floats may be adjacent, and this model also applies to adjacent floats in the same line. Example(s): The following rule floats all IMG boxes with class="icon" to</del><ins>box, starting at</ins> the <del>left (and sets</del><ins>top.</ins></dd>
13671367

13681368
<dt><strong><ins>none</ins></strong></dt>
13691369

1370-
<dd>The <del>left (and sets</del><ins>box is not floated.</ins></dd>
1370+
<dd>The <del>left margin to '0'): IMG.icon { float: left; margin-left: 0; } Consider</del><ins>box is not floated.</ins></dd>
13711371
</dl>
13721372

13731373
<p>
1374-
<ins>User agents may treat float as 'none' on</ins> the <del>left margin to '0'): IMG.icon { float: left; margin-left: 0; } Consider</del><ins>root element.</ins>
1374+
<ins>User agents may treat float as 'none' on</ins> the <del>following HTML source and style sheet: &lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"&gt; &lt;HTML&gt; &lt;HEAD&gt; &lt;TITLE&gt;Float example&lt;/TITLE&gt; &lt;STYLE type="text/css"&gt; IMG { float: left } BODY, P, IMG { margin: 2em } &lt;/STYLE&gt; &lt;/HEAD&gt; &lt;BODY&gt; &lt;P&gt;&lt;IMG src=img.gif alt="This image will illustrate floats"&gt; Some sample text that has no other... &lt;/BODY&gt; &lt;/HTML&gt;</del><ins>root element.</ins>
13751375
</p>
13761376

13771377

13781378
<p><span class="index-def" title="float rules"><a
1379-
name="float-rules"><ins>Here are</ins> the <del>following HTML source and style sheet: &lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"&gt; &lt;HTML&gt; &lt;HEAD&gt; &lt;TITLE&gt;Float example&lt;/TITLE&gt; &lt;STYLE type="text/css"&gt; IMG { float: left } BODY, P, IMG { margin: 2em } &lt;/STYLE&gt; &lt;/HEAD&gt; &lt;BODY&gt; &lt;P&gt;&lt;IMG src=img.gif alt="This image will illustrate floats"&gt; Some sample text that has no other... &lt;/BODY&gt; &lt;/HTML&gt;</del><ins>precise rules</ins></a></span> <ins>that
1380-
govern</ins> the <del>IMG</del><ins>behavior of floats:</ins></p>
1379+
name="float-rules"><ins>Here are</ins> the <del>IMG</del><ins>precise rules</ins></a></span> <ins>that
1380+
govern the behavior of floats:</ins></p>
13811381

13821382
<ol>
13831383
<li> <ins>The left</ins> <a href="box.html#outer-edge"><ins>outer edge</ins></a> <ins>of a
@@ -1421,35 +1421,35 @@ <h3> <del>Content flows down</del><ins>9.5.1</ins> <a name="float-position"><ins
14211421
href="#line-box"><ins>line-box</ins></a></span> <ins>containing</ins> a <del>float can overlap other boxes</del><ins>box
14221422
generated by an element earlier</ins> in the <del>normal flow (e.g., when</del><ins>source document.</ins>
14231423
</li>
1424-
<li>A <del>normal flow</del><ins>left-floating</ins> box <del>next to a float</del><ins>that</ins> has <del>negative margins). When an inline</del><ins>another left-floating</ins> box <del>overlaps with a float,</del><ins>to its left
1425-
may not have its right outer edge to</ins> the <del>content, background, and borders</del><ins>right</ins> of <ins>its containing
1426-
block's right edge. (Loosely: a left float may not stick out at</ins> the
1427-
<del>inline box are rendered in front of</del><ins>right edge, unless it is already as far to</ins> the <del>float. When</del><ins>left as possible.) An
1428-
analogous rule holds for right-floating elements.</ins>
1424+
<li>A <del>normal flow</del><ins>left-floating</ins> box <del>next</del><ins>that has another left-floating box to its left
1425+
may not have its right outer edge</ins> to <ins>the right of its containing
1426+
block's right edge. (Loosely:</ins> a <ins>left</ins> float <del>has negative margins). When</del><ins>may not stick out at the
1427+
right edge, unless it is already as far to the left as possible.)</ins> An
1428+
<del>inline</del><ins>analogous rule holds for right-floating elements.</ins>
14291429
</li>
1430-
<li> A <del>block</del><ins>floating</ins> box <del>overlaps, the background and borders of the block</del><ins>must be placed as high as possible.</ins>
1430+
<li> <ins>A floating</ins> box <del>overlaps with</del><ins>must be placed as high as possible.</ins>
14311431
</li>
1432-
<li> <ins>A left-floating</ins> box <del>are rendered behind the float and are only</del><ins>must</ins> be <del>visible where</del><ins>put as far to</ins> the <ins>left as
1433-
possible, a right-floating</ins> box <ins>as far to the right as possible. A
1434-
higher position</ins> is <del>transparent.</del><ins>preferred over one that is further to</ins> the
1435-
<del>content of</del><ins>left/right.</ins>
1432+
<li> A <del>float, the content, background, and borders of the inline</del><ins>left-floating</ins> box <del>are rendered in front of</del><ins>must be put as far to</ins> the <del>float. When</del><ins>left as
1433+
possible,</ins> a <del>block</del><ins>right-floating</ins> box <del>overlaps,</del><ins>as far to</ins> the <del>background and borders of</del><ins>right as possible. A
1434+
higher position is preferred over one that is further to</ins> the
1435+
<del>block box are rendered behind</del><ins>left/right.</ins>
14361436
</li>
14371437
</ol>
14381438

1439-
<p><ins>But in CSS&nbsp;2.1, if, within</ins> the block <del>box</del><ins>formatting context, there</ins>
1440-
is <del>rendered in front of</del><ins>an in-flow negative vertical margin such that</ins> the <del>float. Example(s): Here</del><ins>float's position</ins>
1441-
is <del>another illustration, showing what happens when a float overlaps borders of elements in the normal flow. &nbsp;&nbsp;&nbsp; [D] A floating image obscures borders of block boxes</del><ins>above the position</ins> it <del>overlaps.</del><ins>would be at were</ins> the <del>following example illustrates</del><ins>negative margin
1442-
set to zero,</ins> the <del>use</del><ins>position</ins> of the <del>'clear' property</del><ins>float is undefined.</ins>
1439+
<p><ins>But in CSS&nbsp;2.1, if, within</ins> the <del>float and are only be visible where</del><ins>block formatting context, there
1440+
is an in-flow negative vertical margin such that</ins> the <del>box</del><ins>float's position</ins>
1441+
is <del>transparent.</del><ins>above</ins> the <del>content</del><ins>position it would be at were all such negative margins
1442+
set to zero, the position</ins> of the <del>block box</del><ins>float</ins> is <del>rendered</del><ins>undefined.</ins>
14431443

1444-
<p><ins>References</ins> to <del>prevent content from flowing next</del><ins>other elements in these rules refer only</ins> to <del>a</del><ins>other elements in the same</ins> <a href="#block-formatting"><ins>block formatting context</ins></a> <ins>as the</ins> float.
1444+
<p><ins>References to other elements in these rules refer only to other elements</ins> in <del>front of</del><ins>the same</ins> <a href="#block-formatting"><ins>block formatting context</ins></a> <ins>as</ins> the float.
14451445
</p>
14461446

14471447
<div class=example><P style="display:none">Example(s):</P>
1448-
<p> <del>Assuming a rule such as this:</del><ins>This HTML fragment results in the b floating to the right.</ins>
1448+
<p> <del>Here is another illustration, showing what happens when a float overlaps borders of elements</del><ins>This HTML fragment results</ins> in the <del>normal flow. &nbsp;&nbsp;&nbsp; [D] A</del><ins>b</ins> floating <del>image obscures borders of block boxes it overlaps.</del><ins>to</ins> the <del>following example illustrates</del><ins>right.</ins>
14491449

14501450
<pre><ins>&lt;P>a&lt;SPAN style="float: right">b&lt;/SPAN>&lt;/P></ins></pre>
14511451

1452-
<p><ins>If the</ins> P <del>{ clear: left } formatting</del><ins>element's width is enough, the a and the b will be side by
1452+
<p><ins>If</ins> the <del>use of</del><ins>P element's width is enough,</ins> the <del>'clear' property to prevent content from flowing next to a float. Example(s): Assuming</del>a <del>rule such as this: P { clear: left } formatting</del><ins>and the b will be side by
14531453
side. It</ins> might look like this:
14541454

14551455
<div class=figure>

0 commit comments

Comments
 (0)