Skip to content

Commit 2b07eb4

Browse files
bert-githubbert-github
committed
[css2] Issues 27, 28, 29, 30, 33 from http://csswg.inkedblade.net/spec/css2.1
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402820
1 parent 2537e28 commit 2b07eb4

3 files changed

Lines changed: 19 additions & 33 deletions

File tree

‎css2/generate.src‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ and 'none'.
670670
<pre>
671671
H1:before { content: counter(chno, upper-latin) ". " }
672672
H2:before { content: counter(section, upper-roman) " - " }
673-
BLOCKQUOTE:after { content: " [" counter(bq, hebrew) "]" }
673+
BLOCKQUOTE:after { content: " [" counter(bq, lower-greek) "]" }
674674
DIV.note:before { content: counter(notecntr, disc) " " }
675675
P:before { content: counter(p, none) }
676676
</pre>

‎css2/visudet.src‎

Lines changed: 11 additions & 26 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.123 2007-11-13 14:53:28 bbos Exp $ -->
3+
<!-- $Id: visudet.src,v 2.124 2008-02-26 16:52:51 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Visual formatting model details</title>
@@ -330,9 +330,8 @@ device instead.
330330

331331
<p>Percentage intrinsic widths are first evaluated with respect to the
332332
containing block's width, if that width doesn't itself depend on the
333-
replaced element's width. If it does, then a percentage intrinsic
334-
width on that element can't be resolved and the element is assumed to
335-
have no intrinsic width.
333+
replaced element's width. If it does, then the resulting layout is
334+
undefined in CSS2.1.
336335

337336

338337
<h3><a name="blockwidth">Block-level, non-replaced elements in normal
@@ -347,14 +346,12 @@ class="propinst-padding-left">'padding-left'</span> + <span
347346
class="propinst-width">'width'</span> + <span
348347
class="propinst-padding-right">'padding-right'</span> + <span
349348
class="propinst-border-right-width">'border-right-width'</span> +
350-
<span class="propinst-margin-right">'margin-right'</span> + scrollbar
351-
width (if any) = width of <a
349+
<span class="propinst-margin-right">'margin-right'</span> = width of <a
352350
href="#containing-block-details">containing block</a>
353351
</p>
354352
</blockquote>
355353
<p>If 'width' is not 'auto' and 'border-left-width' + 'padding-left' +
356-
'width' + 'padding-right' + 'border-right-width' + scrollbar
357-
width (if any) (plus any of
354+
'width' + 'padding-right' + 'border-right-width' (plus any of
358355
'margin-left' or 'margin-right' that are not 'auto') is larger than
359356
the width of the containing block, then any 'auto' values for
360357
'margin-left' or 'margin-right' are, for the following rules, treated
@@ -385,10 +382,6 @@ equality.
385382
their used values are equal. This horizontally centers the element
386383
with respect to the edges of the containing block.
387384
</p>
388-
<p>The "scrollbar width" value is only relevant if the user agent uses
389-
a scrollbar as its scrolling mechanism. See the definition of the
390-
<span class="propinst-overflow">'overflow'</span> property.
391-
</p>
392385

393386
<h3><a name="block-replaced-width">Block-level, replaced elements in normal flow</a></h3>
394387

@@ -471,8 +464,7 @@ elements is:</p>
471464

472465
<blockquote>
473466
<p>'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width'
474-
+ 'padding-right' + 'border-right-width' + 'margin-right' + 'right' +
475-
scrollbar width (if any) = width
467+
+ 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width
476468
of containing block </p>
477469
</blockquote>
478470

@@ -540,15 +532,12 @@ is found by solving for 'width' after setting 'left' (in case 1) or
540532
<p>Then the shrink-to-fit width is: min(max(preferred minimum width, available
541533
width), preferred width).</p>
542534

543-
<p>The "scrollbar width" value is only relevant if the user agent uses
544-
a scrollbar as its scrolling mechanism. See the definition of the
545-
<span class="propinst-overflow">'overflow'</span> property.</p>
546-
547535
<h3><a name="abs-replaced-width">Absolutely positioned, replaced elements</a></h3>
548536

549-
<p>This situation is similar to the previous one, except that the
550-
element has an <a href="conform.html#intrinsic">intrinsic</a> width. The
551-
sequence of substitutions is now:</p>
537+
<p>In this case, <a href="#abs-non-replaced-width">section 10.3.7</a>
538+
applies up through and including the constraint equation, but the rest
539+
of <a href="#abs-non-replaced-width">section 10.3.7</a> is replaced by
540+
the following rules:
552541

553542
<ol>
554543
<li>The used value of <span class="propinst-width">'width'</span> is
@@ -1028,7 +1017,7 @@ dimensions must satisfy this constraint:</p>
10281017
<blockquote>
10291018
<p>'top' + 'margin-top' + 'border-top-width' + 'padding-top' + 'height'
10301019
+ 'padding-bottom' + 'border-bottom-width' + 'margin-bottom' + 'bottom'
1031-
+ scrollbar height (if any) = height of containing block </p>
1020+
= height of containing block </p>
10321021
</blockquote>
10331022

10341023
<p>If all three of 'top', 'height', and 'bottom' are auto, set 'top'
@@ -1071,10 +1060,6 @@ values for 'margin-top' and 'margin-bottom' are set to 0 and solve for
10711060
'bottom'</li>
10721061
</ol>
10731062

1074-
<p>The "scrollbar height" value is only relevant if the user agent
1075-
uses a scrollbar as its scrolling mechanism. See the definition of the
1076-
<span class="propinst-overflow">'overflow'</span> property.
1077-
10781063
<h3><a name="abs-replaced-height">Absolutely positioned, replaced elements</a></h3>
10791064

10801065
<p>This situation is similar to the previous one, except that the

‎css2/visufx.src‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,11 @@ propagated must have a used value for 'overflow' of 'visible'.
117117
</p>
118118

119119
<p>
120-
In the case of a scrollbar being placed on an edge of the
121-
element's box, it should be inserted between the inner border edge and
122-
the outer padding edge.
123-
The space taken up by the scrollbars affects the computation of the
124-
dimensions in the rendering model.
120+
In the case of a scrollbar being placed on an edge of the element's
121+
box, it should be inserted between the inner border edge and the outer
122+
padding edge. Any space taken up by the scrollbars should be taken out
123+
of(subtracted from the dimensions of) the containing block formed by
124+
the element with the scrollbars.
125125
</p>
126126

127127
<div class="example"><p>
@@ -261,7 +261,8 @@ class="value-inst-left">&lt;left&gt;</span> specify offsets from the
261261
left border edge of the box in left-to-right text and from the right
262262
border edge of the box in right-to-left text. Authors should separate
263263
offset values with commas. User agents must support separation with
264-
commas, but may also support separation without commas, because a
264+
commas, but may also support separation without commas (but not a
265+
combination), because a
265266
previous revision of this specification was ambiguous in this respect.
266267

267268
<p><span class="index-def" title="&lt;top&gt;::definition of"><a

0 commit comments

Comments
 (0)