Skip to content

Commit 775174c

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

6 files changed

Lines changed: 68 additions & 29 deletions

File tree

css2/about.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ <H3><a name="q5">1.4.1 </a><a href="conform.html#doclanguage">Document language<
170170
and attributes</H3>
171171

172172
<ul>
173-
<li>CSS property, descriptor, and pseudo-class names are delimited
173+
<li>CSS property and pseudo-class names are delimited
174174
by single quotes.
175175
<li>CSS values are delimited by single quotes.
176176
<li>Document language element names are in uppercase letters.

css2/colors.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
194194
<tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>no
195195
<tr valign=baseline><td><em>Percentages:</em>&nbsp;&nbsp;<td>N/A
196196
<tr valign=baseline><td><em>Media:</em>&nbsp;&nbsp;<td><a href="media.html#visual-media-group" class="noxref">visual</a>
197-
<tr valign=baseline><td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;<td>absolute URI
197+
<tr valign=baseline><td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;<td>absolute URI or none
198198
</table>
199199
</dl>
200200
</div>

css2/generate.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ <h2>12.2 <a name="content">The</a> <a href="generate.html#propdef-content" class
188188
<span class="index-def" title="'content'"><a name="propdef-content" class="propdef-title"><strong>'content'</strong></a></span>
189189
<dd>
190190
<table class="propinfo" cellspacing=0 cellpadding=0>
191-
<tr valign=baseline><td><em>Value:</em>&nbsp;&nbsp;<td>normal | [ <a href="syndata.html#value-def-string" class="noxref"><span class="value-inst-string">&lt;string&gt;</span></a> | <a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> | <a href="syndata.html#value-def-counter" class="noxref"><span class="value-inst-counter">&lt;counter&gt;</span></a> | attr(<a href="syndata.html#value-def-identifier" class="noxref"><span class="value-inst-identifier">&lt;identifier&gt;</span></a>) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
191+
<tr valign=baseline><td><em>Value:</em>&nbsp;&nbsp;<td>normal | none | [ <a href="syndata.html#value-def-string" class="noxref"><span class="value-inst-string">&lt;string&gt;</span></a> | <a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> | <a href="syndata.html#value-def-counter" class="noxref"><span class="value-inst-counter">&lt;counter&gt;</span></a> | attr(<a href="syndata.html#value-def-identifier" class="noxref"><span class="value-inst-identifier">&lt;identifier&gt;</span></a>) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
192192
<tr valign=baseline><td><em>Initial:</em>&nbsp;&nbsp;<td>normal
193193
<tr valign=baseline><td><em>Applies to:</em>&nbsp;&nbsp;<td>:before and :after pseudo-elements
194194
<tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>no

css2/propidx.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ <H1><a name="q0">Appendix F. Full property table</a></H1>
218218
<td><a href="media.html#visual-media-group">visual</a>
219219

220220
<tr><td><a href="generate.html#propdef-content"><span class="propinst-content xref">'content'</span></a>
221-
<td>normal | [ <a href="syndata.html#value-def-string" class="noxref"><span class="value-inst-string">&lt;string&gt;</span></a> | <a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> | <a href="syndata.html#value-def-counter" class="noxref"><span class="value-inst-counter">&lt;counter&gt;</span></a> | attr(<a href="syndata.html#value-def-identifier" class="noxref"><span class="value-inst-identifier">&lt;identifier&gt;</span></a>) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
221+
<td>normal | none | [ <a href="syndata.html#value-def-string" class="noxref"><span class="value-inst-string">&lt;string&gt;</span></a> | <a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> | <a href="syndata.html#value-def-counter" class="noxref"><span class="value-inst-counter">&lt;counter&gt;</span></a> | attr(<a href="syndata.html#value-def-identifier" class="noxref"><span class="value-inst-identifier">&lt;identifier&gt;</span></a>) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
222222
<td>normal
223223
<td>:before and :after pseudo-elements
224224
<td>no

css2/tables.html

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,10 +1030,18 @@ <h3>17.5.3 <a name="height-layout">Table height algorithms</a></h3>
10301030
baseline instead.
10311031
</dl>
10321032

1033-
<p>The baseline of a cell is the baseline of the first <a
1034-
href="visuren.html#line-box">line box</a> in the cell. If there is no
1035-
text, the baseline is the baseline of whatever object is displayed in
1036-
the cell, or, if it has none, the bottom of the cell box. The maximum
1033+
<p>The baseline of a cell is the baseline of the first in-flow <a
1034+
href="visuren.html#line-box">line box</a> in the cell, or the first
1035+
in-flow table-row in the cell, whichever comes first. If there is no
1036+
such line box or table-row, the baseline is the bottom of content edge
1037+
of the cell box. For the purposes of finding a baseline, in-flow boxes
1038+
with a scrolling mechanisms (see the <a href="visufx.html#propdef-overflow" class="noxref"><span
1039+
class="propinst-overflow">'overflow'</span></a> property) must be
1040+
considered as if scrolled to their origin position. Note that the
1041+
baseline of a cell may end up below its bottom border, see the <a
1042+
href="#baseline-below">example</a> below.
1043+
1044+
<p>The maximum
10371045
distance between the top of the cell box and the baseline over all
10381046
cells that have 'vertical-align: baseline' is used to set the baseline
10391047
of the row. Here is an example:
@@ -1049,8 +1057,10 @@ <h3>17.5.3 <a name="height-layout">Table height algorithms</a></h3>
10491057

10501058
<p>Cell boxes 1 and 2 are aligned at their baselines. Cell box 2 has
10511059
the largest height above the baseline, so that determines the baseline
1052-
of the row. Note that if there is no cell box aligned at its baseline,
1053-
the row will not have (nor need) a baseline.
1060+
of the row.
1061+
1062+
<p>If a row has no cell box aligned to its baseline, the baseline of
1063+
that row is the bottom content edge of the lowest cell in the row.
10541064

10551065
<p>To avoid ambiguous situations, the alignment of cells proceeds in
10561066
the following order:
@@ -1076,6 +1086,24 @@ <h3>17.5.3 <a name="height-layout">Table height algorithms</a></h3>
10761086
<p>Cell boxes that are smaller than the height of the row receive
10771087
extra top or bottom padding.
10781088

1089+
<div class=example id=baseline-below>
1090+
<p>The cell in this example has a baseline below its bottom border,
1091+
which leaves an empty space below the cell in its table row:
1092+
1093+
<pre>
1094+
div { height: 0; overflow: hidden; }
1095+
1096+
&lt;table>
1097+
&lt;tr>
1098+
&lt;td>
1099+
&lt;div> Test &lt;/div>
1100+
&lt;/td>
1101+
&lt;/tr>
1102+
&lt;/table>
1103+
</pre>
1104+
</div>
1105+
1106+
10791107
<h3>17.5.4 <a name="column-alignment">Horizontal alignment in a column</a></h3>
10801108

10811109
<p>The horizontal alignment of a cell's content within a cell box is
@@ -1379,8 +1407,8 @@ <h4> <a name="border-conflict-resolution">Border conflict resolution</a></h4>
13791407
border: 5px solid yellow; }
13801408
*#col1 { border: 3px solid black; }
13811409
td { border: 1px solid red; padding: 1em; }
1382-
td.solid-blue { border: 5px dashed blue; }
1383-
td.solid-green { border: 5px solid green; }
1410+
td.cell5 { border: 5px dashed blue; }
1411+
td.cell6 { border: 5px solid green; }
13841412
</pre>
13851413

13861414
<p>with this HTML source:
@@ -1396,8 +1424,8 @@ <h4> <a name="border-conflict-resolution">Border conflict resolution</a></h4>
13961424
&lt;/TR&gt;
13971425
&lt;TR id=&quot;row2&quot;&gt;
13981426
&lt;TD&gt; 4
1399-
&lt;TD class="solid-blue"&gt; 5
1400-
&lt;TD class="solid-green"&gt; 6
1427+
&lt;TD class="cell5"&gt; 5
1428+
&lt;TD class="cell6"&gt; 6
14011429
&lt;/TR&gt;
14021430
&lt;TR id=&quot;row3&quot;&gt;
14031431
&lt;TD&gt; 7

css2/visudet.html

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,14 @@ <h2>10.1 <a name="containing-block-details">Definition of "containing
8282

8383
<ol>
8484
<li>The containing block in which the <a href="conform.html#root">root
85-
element</a> lives is the <a href="visuren.html#viewport">viewport</a>
85+
element</a> lives is a rectangle with the dimensions of the <a
86+
href="visuren.html#viewport">viewport</a>, anchored at the canvas
87+
origin
8688
for continuous media, and the page area for paged media. This
8789
containing block is called the <dfn><a name="x1"><span class="index-def"
8890
title="initial containing block|containing block::initial">initial
89-
containing block</span></a></dfn>.
91+
containing block</span></a></dfn>. The 'direction' property of the initial
92+
containing block is the same as for the root element.
9093
</li>
9194
<li>For other elements, if the element's position is 'relative' or 'static',
9295
the containing block is formed by the content edge of the nearest
@@ -419,7 +422,8 @@ <h3>10.3.3 <a name="blockwidth">Block-level, non-replaced elements in normal
419422
are said to be "over-constrained" and one of the used values will
420423
have to be different from its computed value. If the <a href="visuren.html#propdef-direction" class="noxref"><span
421424
class="propinst-direction">'direction'</span></a>
422-
property has the value 'ltr', the specified value of <a href="box.html#propdef-margin-right" class="noxref"><span
425+
property of the containing block has the value 'ltr', the specified
426+
value of <a href="box.html#propdef-margin-right" class="noxref"><span
423427
class="propinst-margin-right">'margin-right'</span></a> is ignored and the
424428
value is calculated so as to make the equality true. If the value of
425429
<a href="visuren.html#propdef-direction" class="noxref"><span class="propinst-direction">'direction'</span></a> is 'rtl', this
@@ -523,7 +527,8 @@ <h3>10.3.7 <a name="abs-non-replaced-width">Absolutely positioned, non-replaced
523527

524528
<p>If all three of 'left', 'width', and 'right' are 'auto': First set
525529
any 'auto' values for 'margin-left' and 'margin-right' to 0. Then, if
526-
'direction' is 'ltr' set 'left' to the <a
530+
the 'direction' property of the containing block is 'ltr' set 'left'
531+
to the <a
527532
href="#static-position">static position</a> and apply rule number
528533
three below; otherwise, set 'right' to the <a
529534
href="#static-position">static position</a> and apply rule number
@@ -533,11 +538,13 @@ <h3>10.3.7 <a name="abs-non-replaced-width">Absolutely positioned, non-replaced
533538
'margin-right' are 'auto', solve the
534539
equation under the extra constraint that the two margins get equal
535540
values, unless this would make them negative, in which case when
536-
direction is 'ltr' ('rtl'), set 'margin-left' ('margin-right') to zero
541+
direction of the containing block is 'ltr' ('rtl'), set 'margin-left'
542+
('margin-right') to zero
537543
and solve for 'margin-right' ('margin-left'). If one of
538544
'margin-left' or 'margin-right' is 'auto', solve the equation for that
539545
value. If the values are over-constrained, ignore the value for 'left'
540-
(in case 'direction' is 'rtl') or 'right' (in case 'direction' is
546+
(in case the 'direction' property of the containing block is 'rtl') or
547+
'right' (in case 'direction' is
541548
'ltr') and solve for that value.</p>
542549

543550
<p>Otherwise, set 'auto' values for 'margin-left' and 'margin-right'
@@ -549,7 +556,8 @@ <h3>10.3.7 <a name="abs-non-replaced-width">Absolutely positioned, non-replaced
549556
width is shrink-to-fit. Then solve for 'left'</li>
550557

551558
<li>'left' and 'right' are 'auto' and 'width' is not 'auto', then if
552-
'direction' is 'ltr' set 'left' to the <a
559+
the 'direction' property of the containing block is 'ltr' set 'left'
560+
to the <a
553561
href="#static-position">static position</a>, otherwise set 'right'
554562
to the <a href="#static-position">static position</a>. Then solve
555563
for 'left' (if 'direction is 'rtl') or 'right' (if 'direction' is
@@ -594,7 +602,8 @@ <h3>10.3.8 <a name="abs-replaced-width">Absolutely positioned, replaced elements
594602
</li>
595603
<li>If both <a href="visuren.html#propdef-left" class="noxref"><span class="propinst-left">'left'</span></a> and <a href="visuren.html#propdef-right" class="noxref"><span
596604
class="propinst-right">'right'</span></a> have the value 'auto', then if
597-
'direction' is 'ltr', set <a href="visuren.html#propdef-left" class="noxref"><span class="propinst-left">'left'</span></a> to
605+
'direction' of the containing block is 'ltr', set <a href="visuren.html#propdef-left" class="noxref"><span
606+
class="propinst-left">'left'</span></a> to
598607
the static position; else if 'direction' is 'rtl', set <a href="visuren.html#propdef-right" class="noxref"><span
599608
class="propinst-right">'right'</span></a> to the static position.
600609
</li>
@@ -608,7 +617,8 @@ <h3>10.3.8 <a name="abs-replaced-width">Absolutely positioned, replaced elements
608617
class="propinst-margin-right">'margin-right'</span></a> are still 'auto',
609618
solve the equation under the extra constraint that the two margins
610619
must get equal values, unless this would make them negative, in which
611-
case when direction is 'ltr' ('rtl'), set <a href="box.html#propdef-margin-left" class="noxref"><span
620+
case when the direction of the containing block is 'ltr' ('rtl'), set
621+
<a href="box.html#propdef-margin-left" class="noxref"><span
612622
class="propinst-margin-left">'margin-left'</span></a> (<a href="box.html#propdef-margin-right" class="noxref"><span
613623
class="propinst-margin-right">'margin-right'</span></a>) to zero and solve
614624
for <a href="box.html#propdef-margin-right" class="noxref"><span class="propinst-margin-right">'margin-right'</span></a> (<a href="box.html#propdef-margin-left" class="noxref"><span
@@ -618,8 +628,9 @@ <h3>10.3.8 <a name="abs-replaced-width">Absolutely positioned, replaced elements
618628
for that value.
619629
</li>
620630
<li>If at this point the values are over-constrained, ignore the value
621-
for either <a href="visuren.html#propdef-left" class="noxref"><span class="propinst-left">'left'</span></a> (in case <a href="visuren.html#propdef-direction" class="noxref"><span
622-
class="propinst-direction">'direction'</span></a> is 'rtl') or <a href="visuren.html#propdef-right" class="noxref"><span
631+
for either <a href="visuren.html#propdef-left" class="noxref"><span class="propinst-left">'left'</span></a> (in case the
632+
<a href="visuren.html#propdef-direction" class="noxref"><span class="propinst-direction">'direction'</span></a> property of the
633+
containing block is 'rtl') or <a href="visuren.html#propdef-right" class="noxref"><span
623634
class="propinst-right">'right'</span></a> (in case <a href="visuren.html#propdef-direction" class="noxref"><span
624635
class="propinst-direction">'direction'</span></a> is 'ltr') and solve for
625636
that value.
@@ -1372,21 +1383,21 @@ <h3><a name="q26">10.8.1 Leading and half-leading</a></h3>
13721383
</div>
13731384

13741385

1375-
<p>If the property is set on a <a
1386+
<p>On a <a
13761387
href="visuren.html#block-level">block-level</a>, <a name="x20"><span
13771388
class="index-inst">table-cell</span></a>, <a name="x21"><span
13781389
class="index-inst">table-caption</span></a> or <a name="x22"><span
13791390
class="index-inst">inline-block</span></a> element whose content
13801391
is composed of <a href="visuren.html#inline-level">inline-level</a>
1381-
elements, it specifies the <em>minimal</em> height of line boxes
1392+
elements, 'line-height' specifies the <em>minimal</em> height of line boxes
13821393
within the element. The minimum height consists of a minimum height above
13831394
the block's baseline and a minimum depth below it, exactly as if each
13841395
line box starts with a <a name="strut">zero-width inline box with the
13851396
block's font and line height properties (what T<sub>E</sub>X calls a
13861397
"strut").</a>
13871398
</p>
1388-
<p>If the property is set on an <a
1389-
href="visuren.html#inline-level">inline-level</a> element, it
1399+
<p>On an <a
1400+
href="visuren.html#inline-level">inline-level</a> element, 'line-height'
13901401
specifies the height that is used in the calculation of the line box
13911402
height (except for inline <a
13921403
href="conform.html#replaced-element">replaced</a> elements, where the

0 commit comments

Comments
 (0)