Skip to content

Commit 09b08c7

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

3 files changed

Lines changed: 50 additions & 47 deletions

File tree

css2/diffs-rec/visuren.html

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,17 +1434,17 @@ <h3><ins>9.5.1</ins> <a name="float-position"><ins>Positioning</ins> the <del>l
14341434
<dt><strong><ins>left</ins></strong></dt>
14351435

14361436
<dd><ins>The element generates a</ins> <a href="#block-boxes">block</a> box <ins>that is
1437-
floated</ins> to <del>which</del>the <del>compact or run-in</del><ins>left. Content flows on the right side of the box,
1438-
starting at the top (subject to the</ins> <a href="visuren.html#propdef-clear" class="noxref"><span
1437+
floated</ins> to <del>which</del>the <del>compact or run-in box belongs. Values have</del><ins>left. Content flows on</ins> the <del>following meanings when applied to non-floating block boxes: left</del><ins>right side of the box,
1438+
starting at</ins> the top <del>margin</del><ins>(subject to the</ins> <a href="visuren.html#propdef-clear" class="noxref"><span
14391439
class="propinst-clear"><ins>'clear'</ins></span></a> <ins>property).</ins>
14401440
</dd>
14411441
<dt><strong><ins>right</ins></strong></dt>
14421442

1443-
<dd><ins>Similar to 'left', except the</ins> box <del>belongs. Values have</del><ins>is floated to</ins> the <del>following meanings when applied</del><ins>right, and content flows on the left side of the box, starting at the top.</ins></dd>
1443+
<dd><ins>Similar to 'left', except the box is floated to the right, and content flows on the left side</ins> of the <del>generated</del><ins>box, starting at the top.</ins></dd>
14441444

14451445
<dt><strong><ins>none</ins></strong></dt>
14461446

1447-
<dd><ins>The box is not floated.</ins></dd>
1447+
<dd><ins>The</ins> box is <del>increased enough</del><ins>not floated.</ins></dd>
14481448
</dl>
14491449

14501450
<p>
@@ -1453,12 +1453,12 @@ <h3><ins>9.5.1</ins> <a name="float-position"><ins>Positioning</ins> the <del>l
14531453

14541454

14551455
<p><span class="index-def" title="float rules"><a
1456-
name="float-rules"><ins>Here are the precise rules</ins></a></span> <ins>that
1457-
govern the behavior of floats:</ins></p>
1456+
name="float-rules"><ins>Here are the precise rules</ins></a></span> that
1457+
<ins>govern the behavior of floats:</ins></p>
14581458

14591459
<ol>
14601460
<li> <ins>The left</ins> <a href="box.html#outer-edge"><ins>outer edge</ins></a> <ins>of a
1461-
left-floating box may not be</ins> to <del>non-floating block boxes:</del><ins>the</ins> left <ins>of</ins> the <del>top margin</del><ins>left edge</ins> of <ins>its</ins> <a
1461+
left-floating box may not be to the left of the left edge of its</ins> <a
14621462
href="#containing-block"><ins>containing block</ins></a><ins>. An
14631463
analogous rule holds for right-floating elements.</ins>
14641464
</li>
@@ -1708,7 +1708,7 @@ <h3><ins>9.5.2</ins> <a name="flow-control"><ins>Controlling flow next to floats
17081708
Last paragraph.</ins>
17091709
</pre>
17101710

1711-
<p><ins>Explanation: Without</ins> the <del>generated box is increased enough that</del><ins>'clear', the first and last paragraphs'
1711+
<p><ins>Explanation: Without the 'clear', the first and last paragraphs'
17121712
margins would collapse and</ins> the <ins>last paragraph's</ins> top border edge <del>is below the bottom outer edge of any left-floating boxes that resulted from elements earlier in the source document. right</del><ins>would
17131713
be flush with</ins> the top <del>margin</del>of the <del>generated box is increased enough that</del><ins>floating paragraph. But the 'clear'
17141714
requires</ins> the top border edge <del>is</del><ins>to be</ins> <em>below</em> the <del>bottom outer edge of any right-floating boxes</del><ins>float, i.e., 2em
@@ -2191,8 +2191,8 @@ <h3>9.8.4 <a name="comp-abspos">Absolute positioning</a></h3>
21912191
left edge of the containing block (thus, a right margin of '10px' has
21922192
been reserved in anticipation of the offset). The two hyphens acting
21932193
as change bars are taken out of the flow and positioned at the current
2194-
line (due to 'top: auto'), '-1em' from the left edge of its containing
2195-
block (established by the P in <del>its final position).</del><ins>its final position). The result is
2194+
line (due to 'top: auto'), '-1em' from the left edge of <del>its containing block (established by</del><ins>its containing
2195+
block (established by the P in its final position). The result is
21962196
that the change bars seem to "float" to the left of the current
21972197
line.</ins></p>
21982198
</div>
@@ -2240,8 +2240,8 @@ <h3><ins>9.9.1</ins> <a name="z-index"><ins>Specifying the stack level</ins></a>
22402240

22412241
<dt><strong><ins>auto</ins></strong>
22422242

2243-
<dd><ins>The stack level of the generated box in</ins> the <del>result</del><ins>current stacking
2244-
context</ins> is <del>that the change bars seem to "float" to</del><ins>'0'.</ins> The <del>left of</del><ins>box does not establish a new stacking context
2243+
<dd><ins>The stack level of</ins> the <del>P</del><ins>generated box</ins> in <del>its final position).</del>the <del>result</del><ins>current stacking
2244+
context</ins> is <del>that the change bars seem to "float" to</del><ins>0.</ins> The <del>left of</del><ins>box does not establish a new stacking context
22452245
unless it is</ins> the <del>current line. 9.9 Layered presentation</del><ins>root element.</ins>
22462246
</dl>
22472247

@@ -2268,7 +2268,7 @@ <h3><ins>9.9.1</ins> <a name="z-index"><ins>Specifying the stack level</ins></a>
22682268
level</dfn></a></span>, which is its position on the z-axis relative
22692269
<del>to</del>other <del>boxes in</del><ins>stack levels within</ins> the same stacking context. Boxes with
22702270
greater stack levels are always formatted
2271-
in front <del>of boxes with lower stack levels. Boxes may have negative stack levels. Boxes with the same stack level in a stacking context are stacked bottom-to-top according to document tree order. The root element creates a root stacking context , but other elements may establish local stacking contexts . Stacking contexts are inherited. A local stacking context is atomic; boxes in other stacking contexts may not come between any of its boxes. An element that establishes a local stacking context generates a box that has two stack levels: one for the stacking context it creates (always '0') and one for the stacking context to which it belongs (given by the 'z-index' property). An element's box has the same stack level as its parent's box unless given a different stack level with the 'z-index' property. 9.9.1 Specifying the stack level : the 'z-index' property 'z-index' Value: &nbsp;&nbsp; auto | &lt;integer&gt; | inherit Initial: &nbsp;&nbsp; auto Applies to: &nbsp;&nbsp; positioned elements Inherited: &nbsp;&nbsp; no Percentages: &nbsp;&nbsp; N/A Media: &nbsp;&nbsp; visual For a positioned box, the 'z-index' property specifies:</del><ins>of boxes with lower stack levels. Boxes may have negative
2271+
in front of boxes with lower stack levels. Boxes <del>may have negative stack levels. Boxes with the same stack level in a stacking context are stacked bottom-to-top according to document tree order. The root element creates a root stacking context , but other elements may establish local stacking contexts . Stacking contexts are inherited. A local stacking context is atomic; boxes in other stacking contexts may not come between any of its boxes. An element that establishes a local stacking context generates a box that has two stack levels: one for the stacking context it creates (always '0') and one for the stacking context to which it belongs (given by the 'z-index' property). An element's box has the same stack level as its parent's box unless given a different stack level with the 'z-index' property. 9.9.1 Specifying the stack level : the 'z-index' property 'z-index' Value: &nbsp;&nbsp; auto | &lt;integer&gt; | inherit Initial: &nbsp;&nbsp; auto Applies to: &nbsp;&nbsp; positioned elements Inherited: &nbsp;&nbsp; no Percentages: &nbsp;&nbsp; N/A Media: &nbsp;&nbsp; visual For a positioned box, the 'z-index' property specifies:</del><ins>may have negative
22722272
stack levels. Boxes with</ins> the <ins>same</ins> stack level <del>of the box</del>in <ins>a stacking context
22732273
are stacked back-to-front according to document tree order.</ins>
22742274
</p>
@@ -2285,34 +2285,35 @@ <h3><ins>9.9.1</ins> <a name="z-index"><ins>Specifying the stack level</ins></a>
22852285
</p>
22862286

22872287
<p><ins>Within each stacking context,</ins> the following <del>meanings: &lt;integer&gt; This integer is</del><ins>layers are painted in
2288-
back-to-front order.</ins>
2288+
back-to-front order:</ins>
22892289

22902290
<ol>
22912291
<li>the <del>stack level</del><ins>background and borders</ins> of the <del>generated box in</del><ins>element forming</ins> the <del>current</del>stacking
22922292
context.
22932293

2294-
<li>the <del>box also establishes a local</del><ins>child</ins> stacking <del>context in which its</del><ins>contexts with negative</ins> stack <del>level is '0'. auto</del><ins>levels (most
2294+
<li>the <del>box also establishes a local</del><ins>child</ins> stacking <del>context in which its</del><ins>contexts with negative stack levels (most
22952295
negative first).</ins>
22962296

22972297
<li><ins>the in-flow, non-inline-level, non-positioned descendants.</ins>
22982298

2299-
<li><ins>the floating descendants.</ins>
2299+
<li><ins>the non-positioned floats.</ins>
23002300

23012301
<li><ins>the in-flow, inline-level, non-positioned descendants, including
23022302
inline tables and inline blocks.</ins>
23032303

2304-
<li>the <ins>child stacking contexts with</ins> stack level <del>of</del><ins>0, and</ins> the <ins>positioned
2305-
descendants with 'z-index: auto'.</ins>
2304+
<li><ins>the child stacking contexts with</ins> stack level <del>is '0'. auto</del><ins>0 and</ins> the
2305+
<ins>positioned descendants with</ins> stack level <del>of</del><ins>0.</ins>
23062306

2307-
<li><ins>the child stacking contexts with positive stack levels (least
2307+
<li>the <ins>child stacking contexts with positive stack levels (least
23082308
positive first).</ins>
23092309
</ol>
23102310

2311-
<p><ins>Positioned elements with 'z-index: auto' (in layer&nbsp;6), floats
2312-
(layer&nbsp;4), inline blocks (layer&nbsp;5), and inline tables
2313-
(layer&nbsp;5), are painted as if those elements</ins> generated <del>box</del><ins>new
2314-
stacking contexts, except that their positioned descendants and any
2315-
child stacking contexts take part</ins> in the current stacking <del>context</del><ins>context.</ins>
2311+
<p><ins>Within each stacking context, positioned elements with stack level
2312+
0 (in layer&nbsp;6), non-positioned floats (layer&nbsp;4), inline
2313+
blocks (layer&nbsp;5), and inline tables (layer&nbsp;5), are painted
2314+
as if those elements themselves</ins> generated <del>box</del><ins>new stacking contexts,
2315+
except that their positioned descendants and any would-be child
2316+
stacking contexts take part</ins> in the current stacking <del>context</del><ins>context.</ins>
23162317

23172318
<p><ins>This painting order</ins> is <del>the same as its parent's box. The box does not establish a new local</del><ins>applied recursively to each</ins> stacking
23182319
context. <ins>This description of stacking context painting order

css2/diffs-wd/visuren.html

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2241,7 +2241,7 @@ <h3>9.9.1 <a name="z-index">Specifying the stack level</a>: the <a href="visuren
22412241
<dt><strong>auto</strong>
22422242

22432243
<dd>The stack level of the generated box in the current stacking
2244-
context is <del>the same as its parent's box.</del><ins>'0'.</ins> The box does not establish a new <del>local</del>stacking <del>context.</del><ins>context
2244+
context is <del>the same as its parent's box.</del><ins>0.</ins> The box does not establish a new <del>local</del>stacking <del>context.</del><ins>context
22452245
unless it is the root element.</ins>
22462246
</dl>
22472247

@@ -2285,7 +2285,7 @@ <h3>9.9.1 <a name="z-index">Specifying the stack level</a>: the <a href="visuren
22852285
</p>
22862286

22872287
<p><ins>Within</ins> each stacking <del>context consists of</del><ins>context,</ins> the following <del>stacking levels (from back to front):</del><ins>layers are painted in
2288-
back-to-front order.</ins>
2288+
back-to-front order:</ins>
22892289

22902290
<ol>
22912291
<li>the background and borders of the element forming the stacking
@@ -2296,23 +2296,24 @@ <h3>9.9.1 <a name="z-index">Specifying the stack level</a>: the <a href="visuren
22962296

22972297
<li><ins>the in-flow, non-inline-level,</ins> non-positioned descendants.
22982298

2299-
<li> <del>a stacking level for</del><ins>the floating descendants.</ins>
2299+
<li> <del>a stacking level for</del><ins>the</ins> non-positioned <del>floats and their contents. a stacking level for in-flow inline-level</del><ins>floats.</ins>
23002300

2301-
<li><ins>the in-flow, inline-level,</ins> non-positioned <del>floats</del><ins>descendants, including
2302-
inline tables</ins> and <del>their contents. a stacking level for in-flow inline-level non-positioned descendants. a</del><ins>inline blocks.</ins>
2301+
<li><ins>the in-flow, inline-level,</ins> non-positioned <del>descendants. a</del><ins>descendants, including
2302+
inline tables and inline blocks.</ins>
23032303

2304-
<li><ins>the child</ins> stacking <ins>contexts with stack</ins> level <del>for</del><ins>0, and the</ins> positioned
2305-
descendants with 'z-index: <del>auto', and any descendant stacking contexts with 'z-index: 0'.</del><ins>auto'.</ins>
2304+
<li><ins>the child</ins> stacking <ins>contexts with stack</ins> level <del>for</del><ins>0 and the</ins>
2305+
positioned descendants with <del>'z-index: auto', and any descendant stacking contexts with 'z-index: 0'.</del><ins>stack level 0.</ins>
23062306

2307-
<li>the <ins>child</ins> stacking contexts <del>of descendants</del>with positive stack <del>levels. For a more thorough explanation of the stacking order, please see Appendix E . The contents of</del><ins>levels (least
2307+
<li>the <ins>child</ins> stacking contexts <del>of descendants</del>with positive stack <del>levels. For a more thorough explanation of the</del><ins>levels (least
23082308
positive first).</ins>
23092309
</ol>
23102310

2311-
<p><ins>Positioned elements with 'z-index: auto' (in layer&nbsp;6), floats
2312-
(layer&nbsp;4),</ins> inline blocks <ins>(layer&nbsp;5),</ins> and inline tables
2313-
<ins>(layer&nbsp;5),</ins> are <del>stacked</del><ins>painted</ins> as if <del>they</del><ins>those elements</ins> generated new
2314-
stacking contexts, except that <del>any</del><ins>their</ins> positioned <del>elements</del><ins>descendants</ins> and any
2315-
<del>elements that actually create new</del><ins>child</ins> stacking contexts take part in the <del>parent</del><ins>current</ins> stacking context.
2311+
<p><ins>Within each</ins> stacking <del>order, please see Appendix E . The contents of</del><ins>context, positioned elements with stack level
2312+
0 (in layer&nbsp;6), non-positioned floats (layer&nbsp;4),</ins> inline
2313+
blocks <ins>(layer&nbsp;5),</ins> and inline tables <ins>(layer&nbsp;5),</ins> are <del>stacked</del><ins>painted</ins>
2314+
as if <del>they</del><ins>those elements themselves</ins> generated new stacking contexts,
2315+
except that <del>any</del><ins>their</ins> positioned <del>elements</del><ins>descendants</ins> and any <del>elements that actually create new</del><ins>would-be child</ins>
2316+
stacking contexts take part in the <del>parent</del><ins>current</ins> stacking context.
23162317

23172318
<p> <del>They are then painted atomically in the inline</del><ins>This painting order is applied recursively to each stacking
23182319
context. This description of</ins> stacking <del>level.</del><ins>context painting order

css2/visuren.html

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2241,7 +2241,7 @@ <h3>9.9.1 <a name="z-index">Specifying the stack level</a>: the <a href="visuren
22412241
<dt><strong>auto</strong>
22422242

22432243
<dd>The stack level of the generated box in the current stacking
2244-
context is '0'. The box does not establish a new stacking context
2244+
context is 0. The box does not establish a new stacking context
22452245
unless it is the root element.
22462246
</dl>
22472247

@@ -2285,7 +2285,7 @@ <h3>9.9.1 <a name="z-index">Specifying the stack level</a>: the <a href="visuren
22852285
</p>
22862286

22872287
<p>Within each stacking context, the following layers are painted in
2288-
back-to-front order.
2288+
back-to-front order:
22892289

22902290
<ol>
22912291
<li>the background and borders of the element forming the stacking
@@ -2296,23 +2296,24 @@ <h3>9.9.1 <a name="z-index">Specifying the stack level</a>: the <a href="visuren
22962296

22972297
<li>the in-flow, non-inline-level, non-positioned descendants.
22982298

2299-
<li>the floating descendants.
2299+
<li>the non-positioned floats.
23002300

23012301
<li>the in-flow, inline-level, non-positioned descendants, including
23022302
inline tables and inline blocks.
23032303

2304-
<li>the child stacking contexts with stack level 0, and the positioned
2305-
descendants with 'z-index: auto'.
2304+
<li>the child stacking contexts with stack level 0 and the
2305+
positioned descendants with stack level 0.
23062306

23072307
<li>the child stacking contexts with positive stack levels (least
23082308
positive first).
23092309
</ol>
23102310

2311-
<p>Positioned elements with 'z-index: auto' (in layer&nbsp;6), floats
2312-
(layer&nbsp;4), inline blocks (layer&nbsp;5), and inline tables
2313-
(layer&nbsp;5), are painted as if those elements generated new
2314-
stacking contexts, except that their positioned descendants and any
2315-
child stacking contexts take part in the current stacking context.
2311+
<p>Within each stacking context, positioned elements with stack level
2312+
0 (in layer&nbsp;6), non-positioned floats (layer&nbsp;4), inline
2313+
blocks (layer&nbsp;5), and inline tables (layer&nbsp;5), are painted
2314+
as if those elements themselves generated new stacking contexts,
2315+
except that their positioned descendants and any would-be child
2316+
stacking contexts take part in the current stacking context.
23162317

23172318
<p>This painting order is applied recursively to each stacking
23182319
context. This description of stacking context painting order

0 commit comments

Comments
 (0)