Skip to content

Commit 47ee36a

Browse files
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402821
1 parent 2b07eb4 commit 47ee36a

3 files changed

Lines changed: 18 additions & 32 deletions

File tree

css2/generate.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ <h3>12.4.2 <a name="counter-styles">Counter styles</a></h3>
772772
<pre>
773773
H1:before { content: counter(chno, upper-latin) ". " }
774774
H2:before { content: counter(section, upper-roman) " - " }
775-
BLOCKQUOTE:after { content: " [" counter(bq, hebrew) "]" }
775+
BLOCKQUOTE:after { content: " [" counter(bq, lower-greek) "]" }
776776
DIV.note:before { content: counter(notecntr, disc) " " }
777777
P:before { content: counter(p, none) }
778778
</pre>

css2/visudet.html

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -399,9 +399,8 @@ <h3>10.3.2 <a name="inline-replaced-width">Inline, replaced elements</a></h3>
399399

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

406405

407406
<h3>10.3.3 <a name="blockwidth">Block-level, non-replaced elements in normal
@@ -416,14 +415,12 @@ <h3>10.3.3 <a name="blockwidth">Block-level, non-replaced elements in normal
416415
class="propinst-width">'width'</span></a> + <a href="box.html#propdef-padding-right" class="noxref"><span
417416
class="propinst-padding-right">'padding-right'</span></a> + <a href="box.html#propdef-border-right-width" class="noxref"><span
418417
class="propinst-border-right-width">'border-right-width'</span></a> +
419-
<a href="box.html#propdef-margin-right" class="noxref"><span class="propinst-margin-right">'margin-right'</span></a> + scrollbar
420-
width (if any) = width of <a
418+
<a href="box.html#propdef-margin-right" class="noxref"><span class="propinst-margin-right">'margin-right'</span></a> = width of <a
421419
href="#containing-block-details">containing block</a>
422420
</p>
423421
</blockquote>
424422
<p>If 'width' is not 'auto' and 'border-left-width' + 'padding-left' +
425-
'width' + 'padding-right' + 'border-right-width' + scrollbar
426-
width (if any) (plus any of
423+
'width' + 'padding-right' + 'border-right-width' (plus any of
427424
'margin-left' or 'margin-right' that are not 'auto') is larger than
428425
the width of the containing block, then any 'auto' values for
429426
'margin-left' or 'margin-right' are, for the following rules, treated
@@ -454,10 +451,6 @@ <h3>10.3.3 <a name="blockwidth">Block-level, non-replaced elements in normal
454451
their used values are equal. This horizontally centers the element
455452
with respect to the edges of the containing block.
456453
</p>
457-
<p>The "scrollbar width" value is only relevant if the user agent uses
458-
a scrollbar as its scrolling mechanism. See the definition of the
459-
<a href="visufx.html#propdef-overflow" class="noxref"><span class="propinst-overflow">'overflow'</span></a> property.
460-
</p>
461454

462455
<h3>10.3.4 <a name="block-replaced-width">Block-level, replaced elements in normal flow</a></h3>
463456

@@ -540,8 +533,7 @@ <h3>10.3.7 <a name="abs-non-replaced-width">Absolutely positioned, non-replaced
540533

541534
<blockquote>
542535
<p>'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width'
543-
+ 'padding-right' + 'border-right-width' + 'margin-right' + 'right' +
544-
scrollbar width (if any) = width
536+
+ 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width
545537
of containing block </p>
546538
</blockquote>
547539

@@ -609,15 +601,12 @@ <h3>10.3.7 <a name="abs-non-replaced-width">Absolutely positioned, non-replaced
609601
<p>Then the shrink-to-fit width is: min(max(preferred minimum width, available
610602
width), preferred width).</p>
611603

612-
<p>The "scrollbar width" value is only relevant if the user agent uses
613-
a scrollbar as its scrolling mechanism. See the definition of the
614-
<a href="visufx.html#propdef-overflow" class="noxref"><span class="propinst-overflow">'overflow'</span></a> property.</p>
615-
616604
<h3>10.3.8 <a name="abs-replaced-width">Absolutely positioned, replaced elements</a></h3>
617605

618-
<p>This situation is similar to the previous one, except that the
619-
element has an <a href="conform.html#intrinsic">intrinsic</a> width. The
620-
sequence of substitutions is now:</p>
606+
<p>In this case, <a href="#abs-non-replaced-width">section 10.3.7</a>
607+
applies up through and including the constraint equation, but the rest
608+
of <a href="#abs-non-replaced-width">section 10.3.7</a> is replaced by
609+
the following rules:
621610

622611
<ol>
623612
<li>The used value of <a href="visudet.html#propdef-width" class="noxref"><span class="propinst-width">'width'</span></a> is
@@ -1116,7 +1105,7 @@ <h3>10.6.4 <a name="abs-non-replaced-height">Absolutely positioned, non-replaced
11161105
<blockquote>
11171106
<p>'top' + 'margin-top' + 'border-top-width' + 'padding-top' + 'height'
11181107
+ 'padding-bottom' + 'border-bottom-width' + 'margin-bottom' + 'bottom'
1119-
+ scrollbar height (if any) = height of containing block </p>
1108+
= height of containing block </p>
11201109
</blockquote>
11211110

11221111
<p>If all three of 'top', 'height', and 'bottom' are auto, set 'top'
@@ -1159,10 +1148,6 @@ <h3>10.6.4 <a name="abs-non-replaced-height">Absolutely positioned, non-replaced
11591148
'bottom'</li>
11601149
</ol>
11611150

1162-
<p>The "scrollbar height" value is only relevant if the user agent
1163-
uses a scrollbar as its scrolling mechanism. See the definition of the
1164-
<a href="visufx.html#propdef-overflow" class="noxref"><span class="propinst-overflow">'overflow'</span></a> property.
1165-
11661151
<h3>10.6.5 <a name="abs-replaced-height">Absolutely positioned, replaced elements</a></h3>
11671152

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

css2/visufx.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,11 @@ <h3>11.1.1 <a name="overflow">Overflow</a>: the <a href="visufx.html#propdef-ove
160160
</p>
161161

162162
<p>
163-
In the case of a scrollbar being placed on an edge of the
164-
element's box, it should be inserted between the inner border edge and
165-
the outer padding edge.
166-
The space taken up by the scrollbars affects the computation of the
167-
dimensions in the rendering model.
163+
In the case of a scrollbar being placed on an edge of the element's
164+
box, it should be inserted between the inner border edge and the outer
165+
padding edge. Any space taken up by the scrollbars should be taken out
166+
of(subtracted from the dimensions of) the containing block formed by
167+
the element with the scrollbars.
168168
</p>
169169

170170
<div class="example"><P style="display:none">Example(s):</P><p>
@@ -313,7 +313,8 @@ <h3>11.1.2 <a name="clipping">Clipping</a>: the <a href="visufx.html#propdef-cli
313313
left border edge of the box in left-to-right text and from the right
314314
border edge of the box in right-to-left text. Authors should separate
315315
offset values with commas. User agents must support separation with
316-
commas, but may also support separation without commas, because a
316+
commas, but may also support separation without commas (but not a
317+
combination), because a
317318
previous revision of this specification was ambiguous in this respect.
318319

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

0 commit comments

Comments
 (0)