Skip to content

Commit 4ae8661

Browse files
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%403264
1 parent 570d192 commit 4ae8661

19 files changed

Lines changed: 147 additions & 115 deletions

css2/cascade.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ <h3>6.1.1 <span class="index-def" title="specified value">
7474
<ol>
7575
<li>If the <a href="#cascade">cascade</a> results in a value, use it.
7676
Except that, if the value is 'inherit', the specified value is defined
77-
in <a href="#value-def-inherit" >The 'inherit' value</a> below.
77+
in <a href="#value-def-inherit" >&ldquo;The 'inherit' value&rdquo;</a> below.
7878

7979
<li>Otherwise, if the property is <a href="#inheritance">inherited</a> and the element is not the root of the <a>document tree</a>, use the computed value of the parent element.
8080
<li>Otherwise use the property's <a name="x1"><span class="index-def" title="initial value">initial value</span></a>. The initial value of each property is indicated in the property's definition.

css2/css2.html

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5828,7 +5828,7 @@ <h3>6.1.1 <span class="index-def" title="specified value">
58285828
<ol>
58295829
<li>If the <a href="#cascade">cascade</a> results in a value, use it.
58305830
Except that, if the value is 'inherit', the specified value is defined
5831-
in <a href="#value-def-inherit" >The 'inherit' value</a> below.
5831+
in <a href="#value-def-inherit" >&ldquo;The 'inherit' value&rdquo;</a> below.
58325832

58335833
<li>Otherwise, if the property is <a href="#inheritance">inherited</a> and the element is not the root of the <a>document tree</a>, use the computed value of the parent element.
58345834
<li>Otherwise use the property's <a name="x1"><span class="index-def" title="initial value">initial value</span></a>. The initial value of each property is indicated in the property's definition.
@@ -8409,12 +8409,15 @@ <h3>9.3.2 <a name="position-props">Box offsets</a>: <a href="visuren.html#propde
84098409
<h2>9.4 <a name="normal-flow">Normal flow</a></h2>
84108410

84118411
<p>Boxes in the normal flow belong to a <a name="x32"><span class="index-def"
8412-
title="formatting context">formatting context</span></a>, which may be
8413-
block or inline, but not both simultaneously. <a
8412+
title="formatting context">formatting context</span></a>, which in CSS 2.1
8413+
may be table, block or inline. In future levels of CSS, other types of
8414+
formatting context will be introduced. <a
84148415
href="#block-level">Block-level</a> boxes participate in a <a
84158416
href="#block-formatting">block formatting</a> context. <a
84168417
href="#inline-level">Inline-level boxes</a> participate in an <a
8417-
href="#inline-formatting">inline formatting</a> context.
8418+
href="#inline-formatting">inline formatting</a> context. Table
8419+
formatting contexts are described in the <a href="tables.html"
8420+
>chapter on tables.</a>
84188421
</p>
84198422
<h3>9.4.1 <a name="block-formatting">Block formatting contexts</a></h3>
84208423

@@ -8449,7 +8452,9 @@ <h3>9.4.1 <a name="block-formatting">Block formatting contexts</a></h3>
84498452

84508453
<h3>9.4.2 <a name="inline-formatting">Inline formatting contexts</a></h3>
84518454

8452-
<p>In an inline formatting context, boxes are laid out horizontally,
8455+
<p>An inline formatting context is established by a block container
8456+
box that contains no block-level boxes.
8457+
In an inline formatting context, boxes are laid out horizontally,
84538458
one after the other, beginning at the top of a containing
84548459
block. Horizontal margins, borders, and padding are respected between
84558460
these boxes. The boxes may be aligned vertically in different ways: their
@@ -10268,7 +10273,8 @@ <h2>10.1 <a name="containing-block-details">Definition of "containing
1026810273
</li>
1026910274
<li>For other elements, if the element's position is 'relative' or 'static',
1027010275
the containing block is formed by the content edge of the nearest
10271-
<a href="visuren.html#block-boxes">block container</a> ancestor box.
10276+
ancestor box that is a <a href="visuren.html#block-boxes">block
10277+
container</a> or which establishes a formatting context.
1027210278
</li>
1027310279
<li>If the element has 'position: fixed', the containing block is
1027410280
established by the <a href="visuren.html#viewport">viewport</a>
@@ -11921,7 +11927,7 @@ <h3>11.1.1 <a name="overflow">Overflow</a>: the <a href="visufx.html#propdef-ove
1192111927
<table class="propinfo" cellspacing=0 cellpadding=0>
1192211928
<tr valign=baseline><td><em>Value:</em>&nbsp;&nbsp;<td>visible | hidden | scroll | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
1192311929
<tr valign=baseline><td><em>Initial:</em>&nbsp;&nbsp;<td>visible
11924-
<tr valign=baseline><td><em>Applies to:</em>&nbsp;&nbsp;<td>block containers
11930+
<tr valign=baseline><td><em>Applies to:</em>&nbsp;&nbsp;<td>block containers and boxes that establish a formatting context
1192511931
<tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>no
1192611932
<tr valign=baseline><td><em>Percentages:</em>&nbsp;&nbsp;<td>N/A
1192711933
<tr valign=baseline><td><em>Media:</em>&nbsp;&nbsp;<td><a href="media.html#visual-media-group" class="noxref">visual</a>
@@ -16782,7 +16788,8 @@ <h2>17.4 <a name="model">Tables in the visual formatting model</a></h2>
1678216788

1678316789
<p>The table wrapper box is a 'block' box if the table is block-level, and
1678416790
an 'inline-block' box if the table is inline-level. The table wrapper box
16785-
establishes a block formatting context. The table box (not the
16791+
establishes a block formatting context, and the table box establishes
16792+
a table formatting context. The table box (not the
1678616793
table wrapper box) is used when doing baseline
1678716794
vertical alignment for an 'inline-table'. The width of the table wrapper
1678816795
box is the border-edge width of the table box inside it, as described
@@ -16860,9 +16867,10 @@ <h3>17.4.1 <a name="caption-position">Caption position and alignment</a></h3>
1686016867
<h2>17.5 <a name="table-layout">Visual layout of table contents</a></h2>
1686116868

1686216869
<p>Internal table elements generate rectangular <a
16863-
href="box.html#box-dimensions">boxes</a> with content and borders.
16864-
Cells have padding as well. Internal table elements do not have
16865-
margins.
16870+
href="box.html#box-dimensions">boxes</a> which participate in the
16871+
table formatting context established by the table box. These boxes
16872+
have content and borders and cells have padding as well. Internal
16873+
table elements do not have margins.
1686616874

1686716875
<p>The visual layout of these boxes is governed by a rectangular,
1686816876
irregular grid of rows and columns. Each box occupies a whole number
@@ -29007,7 +29015,7 @@ <H1><a name="q0">Appendix F. Full property table</a></H1>
2900729015
<tr><td><a href="visufx.html#propdef-overflow"><span class="propinst-overflow xref">'overflow'</span></a>
2900829016
<td>visible | hidden | scroll | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
2900929017
<td>visible
29010-
<td>block containers
29018+
<td>block containers and boxes that establish a formatting context
2901129019
<td>no
2901229020
<td>&nbsp;
2901329021
<td><a href="media.html#visual-media-group">visual</a>

css2/diffs-rec/cascade.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ <h3>6.1.1 <span class="index-def" title="specified value">
7474
<ol>
7575
<li>If the <a href="#cascade">cascade</a> results in a value, use it.
7676
<ins>Except that, if the value is 'inherit', the specified value is defined
77-
in</ins> <a href="#value-def-inherit" ><ins>The 'inherit' value</ins></a> <ins>below.</ins>
77+
in</ins> <a href="#value-def-inherit" ><ins>&ldquo;The 'inherit' value&rdquo;</ins></a> <ins>below.</ins>
7878

7979
<li>Otherwise, if the property is <a href="#inheritance">inherited</a> <ins>and the element is not the root of the</ins> <a><ins>document tree</ins></a>, use the <ins>computed</ins> value of the parent <del>element, generally the computed value.</del><ins>element.</ins>
8080
<li>Otherwise use the property's <a name="x1"><span class="index-def" title="initial value">initial value</span></a>. The initial value of each property is indicated in the property's definition.

css2/diffs-rec/propidx.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ <H1><a name="q0">Appendix F. <ins>Full</ins> property <del>index</del><ins>tabl
526526
<tr><td><a href="visufx.html#propdef-overflow"><span class="propinst-overflow xref">'overflow'</span></a>
527527
<td>visible | hidden | scroll | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
528528
<td>visible
529-
<td> <del>block-level and replaced elements</del><ins>block containers</ins>
529+
<td> <del>block-level</del><ins>block containers</ins> and <del>replaced elements</del><ins>boxes that establish a formatting context</ins>
530530
<td>no
531531
<td>&nbsp;
532532
<td><a href="media.html#visual-media-group">visual</a>

0 commit comments

Comments
 (0)