Skip to content

Commit 6745252

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

10 files changed

Lines changed: 618 additions & 446 deletions

File tree

css2/changes.html

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,7 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
590590
<li class="tocline3"><a href="changes.html#q546" class="tocxref">C.8.52 G.2 Lexical scanner</a>
591591
<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>
592592
<li class="tocline3"><a href="changes.html#q548" class="tocxref">C.8.54 9.5 Floats</a>
593+
<li class="tocline3"><a href="changes.html#q549" class="tocxref">C.8.55 10.6.3 Block-level non-replaced elements in normal flow when 'overflow' computes to 'visible'</a>
593594
</ul>
594595
</ul>
595596
</div>
@@ -8249,6 +8250,52 @@ <h3 id="t.9.5b"><a name="q548">C.8.54 </a><a
82498250

82508251

82518252

8253+
<h3 id="t.10.6.3"><a name="q549">C.8.55 </a><a
8254+
href="/TR/2009/CR-CSS2-20090908//visudet.html#normal-block">10.6.3
8255+
Block-level non-replaced elements in normal flow when 'overflow'
8256+
computes to 'visible'</a></h3>
8257+
8258+
<p>Removed redundancy (the top edge was already defined elsewhere) and
8259+
made the implied cases for the bottom edge explicit:
8260+
8261+
<blockquote>
8262+
<p><del>If it only has inline-level children, the height is the
8263+
distance between the top of the topmost line box and the bottom of the
8264+
bottommost line box.</del>
8265+
8266+
<p><del>If it has block-level children, the height is the distance
8267+
between the top border-edge of the topmost block-level child box that
8268+
does not have margins collapsed through it and the bottom border-edge
8269+
of the bottommost block-level child box that does not have margins
8270+
collapsed through it. However, if the element has a non-zero top
8271+
padding and/or top border, or is the root element, then the content
8272+
starts at the top margin edge of the topmost child. (The first case
8273+
expresses the fact that the top and bottom margins of the element
8274+
collapse with those of the topmost and bottommost children, while in
8275+
the second case the presence of the padding/border prevents the top
8276+
margins from collapsing.) Similarly, if the bottom margin of the
8277+
block does not collapse with the bottom margin of its last in-flow
8278+
child, then the content ends at the bottom margin edge of the
8279+
bottommost child.</del>
8280+
8281+
<p><ins>The element's height is the distance from its top content edge
8282+
to the first applicable of the following:</ins>
8283+
8284+
<ol>
8285+
<li><ins>the bottom edge of the last line box, if the box
8286+
establishes a inline formatting context with one or more lines</ins>
8287+
8288+
<li><ins>the bottom edge of the bottom (possibly collapsed) margin
8289+
of its last in-flow child, if the child's bottom margin does not
8290+
collapse with the element's bottom margin</ins>
8291+
8292+
<li><ins>the bottom border edge of the last in-flow child whose top
8293+
margin doesn't collapse with the element's bottom margin</ins>
8294+
8295+
<li><ins>zero, otherwise</ins>
8296+
</ol>
8297+
</blockquote>
8298+
82528299
<hr class="navbar">
82538300

82548301
<div class="navbar">

css2/cover.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,6 +1205,7 @@ <h2><a name="toc">Full Table of Contents</a></h2>
12051205
<li class="tocline3"><a href="changes.html#q546" class="tocxref">C.8.52 G.2 Lexical scanner</a>
12061206
<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>
12071207
<li class="tocline3"><a href="changes.html#q548" class="tocxref">C.8.54 9.5 Floats</a>
1208+
<li class="tocline3"><a href="changes.html#q549" class="tocxref">C.8.55 10.6.3 Block-level non-replaced elements in normal flow when 'overflow' computes to 'visible'</a>
12081209
</ul>
12091210
</ul>
12101211
<li class="tocline1"><a href="sample.html" class="tocxref">Appendix D. Default style sheet for HTML 4</a>

css2/css2.html

Lines changed: 64 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,6 +1200,7 @@ <h2><a name="toc">Full Table of Contents</a></h2>
12001200
<li class="tocline3"><a href="changes.html#q546" class="tocxref">C.8.52 G.2 Lexical scanner</a>
12011201
<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>
12021202
<li class="tocline3"><a href="changes.html#q548" class="tocxref">C.8.54 9.5 Floats</a>
1203+
<li class="tocline3"><a href="changes.html#q549" class="tocxref">C.8.55 10.6.3 Block-level non-replaced elements in normal flow when 'overflow' computes to 'visible'</a>
12031204
</ul>
12041205
</ul>
12051206
<li class="tocline1"><a href="sample.html" class="tocxref">Appendix D. Default style sheet for HTML 4</a>
@@ -11136,28 +11137,23 @@ <h3>10.6.3 <a name="normal-block">Block-level non-replaced elements in normal
1113611137
on whether the element has any block-level children and whether it has
1113711138
padding or borders:
1113811139
</p>
11139-
<p>If it only has inline-level children, the height is the distance
11140-
between the top of the topmost line box and the bottom of the
11141-
bottommost line box.
11142-
</p>
11143-
<p>If
11144-
it has block-level children, the height is the distance between the
11145-
top border-edge of the topmost block-level child box that does not have
11146-
<a href="box.html#collapsed-through">margins collapsed through it</a>
11147-
and the bottom border-edge of the bottommost block-level child box
11148-
that does not have margins collapsed through it. However, if the
11149-
element has a non-zero top padding and/or top border, or is the root
11150-
element, then the content
11151-
starts at the top <em>margin</em> edge of the topmost child. (The
11152-
first case expresses the fact that the top and bottom margins of the
11153-
element <a href="box.html#collapsing-margins">collapse</a> with those
11154-
of the topmost and bottommost children, while in the second case the
11155-
presence of the padding/border prevents the top margins from <a
11156-
href="box.html#collapsing-margins">collapsing</a>.) Similarly, if the
11157-
bottom margin of the block does not collapse with the bottom margin of
11158-
its last in-flow child, then the content ends at the bottom margin
11159-
edge of the bottommost child.
1116011140

11141+
<p>The element's height is the distance from its top content edge to
11142+
the first applicable of the following:
11143+
11144+
<ol>
11145+
<li>the bottom edge of the last line box, if the box establishes a
11146+
inline formatting context with one or more lines
11147+
11148+
<li>the bottom edge of the bottom (possibly collapsed) margin of its
11149+
last in-flow child, if the child's bottom margin does not collapse
11150+
with the element's bottom margin
11151+
11152+
<li>the bottom border edge of the last in-flow child whose top
11153+
margin doesn't collapse with the element's bottom margin
11154+
11155+
<li>zero, otherwise
11156+
</ol>
1116111157

1116211158
<p>Only children in the normal flow are taken into account (i.e.,
1116311159
floating boxes and absolutely positioned boxes are ignored, and
@@ -20314,6 +20310,7 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
2031420310
<li class="tocline3"><a href="changes.html#q546" class="tocxref">C.8.52 G.2 Lexical scanner</a>
2031520311
<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>
2031620312
<li class="tocline3"><a href="changes.html#q548" class="tocxref">C.8.54 9.5 Floats</a>
20313+
<li class="tocline3"><a href="changes.html#q549" class="tocxref">C.8.55 10.6.3 Block-level non-replaced elements in normal flow when 'overflow' computes to 'visible'</a>
2031720314
</ul>
2031820315
</ul>
2031920316
</div>
@@ -27973,6 +27970,52 @@ <h3 id="t.9.5b"><a name="q548">C.8.54 </a><a
2797327970

2797427971

2797527972

27973+
<h3 id="t.10.6.3"><a name="q549">C.8.55 </a><a
27974+
href="/TR/2009/CR-CSS2-20090908//visudet.html#normal-block">10.6.3
27975+
Block-level non-replaced elements in normal flow when 'overflow'
27976+
computes to 'visible'</a></h3>
27977+
27978+
<p>Removed redundancy (the top edge was already defined elsewhere) and
27979+
made the implied cases for the bottom edge explicit:
27980+
27981+
<blockquote>
27982+
<p><del>If it only has inline-level children, the height is the
27983+
distance between the top of the topmost line box and the bottom of the
27984+
bottommost line box.</del>
27985+
27986+
<p><del>If it has block-level children, the height is the distance
27987+
between the top border-edge of the topmost block-level child box that
27988+
does not have margins collapsed through it and the bottom border-edge
27989+
of the bottommost block-level child box that does not have margins
27990+
collapsed through it. However, if the element has a non-zero top
27991+
padding and/or top border, or is the root element, then the content
27992+
starts at the top margin edge of the topmost child. (The first case
27993+
expresses the fact that the top and bottom margins of the element
27994+
collapse with those of the topmost and bottommost children, while in
27995+
the second case the presence of the padding/border prevents the top
27996+
margins from collapsing.) Similarly, if the bottom margin of the
27997+
block does not collapse with the bottom margin of its last in-flow
27998+
child, then the content ends at the bottom margin edge of the
27999+
bottommost child.</del>
28000+
28001+
<p><ins>The element's height is the distance from its top content edge
28002+
to the first applicable of the following:</ins>
28003+
28004+
<ol>
28005+
<li><ins>the bottom edge of the last line box, if the box
28006+
establishes a inline formatting context with one or more lines</ins>
28007+
28008+
<li><ins>the bottom edge of the bottom (possibly collapsed) margin
28009+
of its last in-flow child, if the child's bottom margin does not
28010+
collapse with the element's bottom margin</ins>
28011+
28012+
<li><ins>the bottom border edge of the last in-flow child whose top
28013+
margin doesn't collapse with the element's bottom margin</ins>
28014+
28015+
<li><ins>zero, otherwise</ins>
28016+
</ol>
28017+
</blockquote>
28018+
2797628019
<hr class="navbar">
2797728020

2797828021

0 commit comments

Comments
 (0)