Skip to content

Commit 6a6a612

Browse files
committed
Issue 33 (height of block in presence of clearance) Issue 34 (removed redundant if-clauses in 10.6.2) --HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402671
1 parent 82151d2 commit 6a6a612

1 file changed

Lines changed: 9 additions & 18 deletions

File tree

css2/visudet.src

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: visudet.src,v 2.116 2007-03-28 23:34:44 bbos Exp $ -->
3+
<!-- $Id: visudet.src,v 2.117 2007-04-16 12:42:52 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Visual formatting model details</title>
@@ -940,19 +940,9 @@ class="propinst-width">'width'</span> both have computed values of
940940
intrinsic height is the used value of <span
941941
class="propinst-height">'height'</span>.
942942

943-
<p>If <span class="propinst-height">'height'</span> and <span
944-
class="propinst-width">'width'</span> both have computed values of
945-
'auto' and the element has no intrinsic height, but does have an
946-
intrinsic width and intrinsic ratio; or if <span
947-
class="propinst-height">'height'</span> has a computed value of
948-
'auto', and the element does have an intrinsic ratio;
949-
or if <span class="propinst-height">'height'</span>
950-
and <span class="propinst-width">'width'</span> both have computed
951-
values of 'auto' and the element has an intrinsic ratio but no
952-
intrinsic height or width and the containing block's width doesn't
953-
itself depend on the replaced element's width;
954-
then the
955-
used value of <span class="propinst-height">'height'</span> is:
943+
<p>Otherwise, if <span class="propinst-height">'height'</span> has a
944+
computed value of 'auto', and the element has an intrinsic ratio then
945+
the used value of <span class="propinst-height">'height'</span> is:
956946

957947
<blockquote><p>(used width) / (intrinsic ratio)</blockquote>
958948

@@ -1007,9 +997,10 @@ element <a href="box.html#collapsing-margins">collapse</a> with those
1007997
of the topmost and bottommost children, while in the second case the
1008998
presence of the padding/border prevents the top margins from <a
1009999
href="box.html#collapsing-margins">collapsing</a>.) Similarly, if the
1010-
element has a non-zero bottom padding and/or bottom border, then the
1011-
content ends at the bottom <em>margin</em> edge of the bottommost
1012-
child.
1000+
bottom margin of the block does not collapse with the bottom margin of
1001+
its last in-flow child, then the content ends at the bottom margin
1002+
edge of the bottommost child.
1003+
10131004

10141005
<p>Only children in the normal flow are taken into account (i.e.,
10151006
floating boxes and absolutely positioned boxes are ignored, and
@@ -1299,7 +1290,7 @@ box top and the lowermost box bottom.
12991290
</li>
13001291
<li>If the resulting height is smaller than the minimal height of line
13011292
boxes for this block, as specified by the <span
1302-
class=propinst-line-height>line-height</span> property, the height is
1293+
class=propinst-line-height>'line-height'</span> property, the height is
13031294
increased to be that minimal height.</li>
13041295
</ol>
13051296

0 commit comments

Comments
 (0)