Skip to content

Commit f8bf99c

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

13 files changed

Lines changed: 634 additions & 190 deletions

File tree

css2/box.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
414414
position of the element's top border edge is the same as it would have
415415
been if the element had a non-zero bottom border.</li></ul>
416416

417-
<p>An element that has had <a
417+
<p>An element that has <a
418418
href="visuren.html#clearance">clearance</a> never
419419
collapses its top margin with its parent block's bottom margin.</p>
420420

css2/changes.html

Lines changed: 119 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -430,13 +430,20 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
430430
<ul class="toc">
431431
<li class="tocline3"><a href="changes.html#q390" class="tocxref">C.7.1 Section&nbsp;3.1 Definitions</a>
432432
<li class="tocline3"><a href="changes.html#q391" class="tocxref">C.7.2 Section&nbsp;4.1.2.2 Informative Historical Notes</a>
433-
<li class="tocline3"><a href="changes.html#q392" class="tocxref">C.7.3 Section&nbsp;4.3.2 Lengths</a>
434-
<li class="tocline3"><a href="changes.html#q393" class="tocxref">C.7.4 Section&nbsp;4.3.4 URLs and URIs</a>
435-
<li class="tocline3"><a href="changes.html#q394" class="tocxref">C.7.5 Section&nbsp;9.2.3 Run-in boxes</a>
436-
<li class="tocline3"><a href="changes.html#q395" class="tocxref">C.7.6 Section&nbsp;9.6.1 Fixed positioning</a>
437-
<li class="tocline3"><a href="changes.html#q396" class="tocxref">C.7.7 Section&nbsp;15.6 Font boldness: the 'font-weight' property</a>
438-
<li class="tocline3"><a href="changes.html#q397" class="tocxref">C.7.8 Section&nbsp;16.4 Letter and word spacing: the 'letter-spacing' and 'word-spacing' properties</a>
439-
<li class="tocline3"><a href="changes.html#q398" class="tocxref">C.7.9 Section&nbsp;17.4 Tables in the visual formatting model</a>
433+
<li class="tocline3"><a href="changes.html#q392" class="tocxref">C.7.3 Section&nbsp;4.1.8 Declarations and properties</a>
434+
<li class="tocline3"><a href="changes.html#q393" class="tocxref">C.7.4 Section&nbsp;4.3.2 Lengths</a>
435+
<li class="tocline3"><a href="changes.html#q394" class="tocxref">C.7.5 Section&nbsp;4.3.4 URLs and URIs</a>
436+
<li class="tocline3"><a href="changes.html#q395" class="tocxref">C.7.6 Section&nbsp;4.3.4 URLs and URIs</a>
437+
<li class="tocline3"><a href="changes.html#q396" class="tocxref">C.7.7 Section&nbsp;8.3.1 Collapsing margins</a>
438+
<li class="tocline3"><a href="changes.html#q397" class="tocxref">C.7.8 Section&nbsp;9.2 Controlling box generation</a>
439+
<li class="tocline3"><a href="changes.html#q398" class="tocxref">C.7.9 Section&nbsp;9.2.3 Run-in boxes</a>
440+
<li class="tocline3"><a href="changes.html#q399" class="tocxref">C.7.10 Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear' property</a>
441+
<li class="tocline3"><a href="changes.html#q400" class="tocxref">C.7.11 Section&nbsp;9.6.1 Fixed positioning</a>
442+
<li class="tocline3"><a href="changes.html#q401" class="tocxref">C.7.12 Section&nbsp;10.2 Content width: the 'width' property</a>
443+
<li class="tocline3"><a href="changes.html#q402" class="tocxref">C.7.13 Section&nbsp;10.5 Content height: the 'height' property</a>
444+
<li class="tocline3"><a href="changes.html#q403" class="tocxref">C.7.14 Section&nbsp;15.6 Font boldness: the 'font-weight' property</a>
445+
<li class="tocline3"><a href="changes.html#q404" class="tocxref">C.7.15 Section&nbsp;16.4 Letter and word spacing: the 'letter-spacing' and 'word-spacing' properties</a>
446+
<li class="tocline3"><a href="changes.html#q405" class="tocxref">C.7.16 Section&nbsp;17.4 Tables in the visual formatting model</a>
440447
</ul>
441448
</ul>
442449
</div>
@@ -1663,9 +1670,6 @@ <h3 id="c17.5.3"><a name="q125">C.2.118 </a><a href="tables.html#height-layout">
16631670
height; the UA no longer has the option of using 'height' to
16641671
constrain the size of the table to be smaller than its contents.</p>
16651672

1666-
<p>Percentage heights on table cells, rows, and row groups now
1667-
compute to 'auto'.</p>
1668-
16691673
<p>The baseline of a cell is now defined much more precisely.</p>
16701674

16711675
<p>Defined the baseline of a row with no baseline-aligned cells.</p>
@@ -4636,7 +4640,18 @@ <h3 id="t.4.1.2.2"><a name="q391">C.7.2 </a><a
46364640

46374641

46384642

4639-
<h3 id="t.4.3.2"><a name="q392">C.7.3 </a><a
4643+
<h3 id="t.4.1.8"><a name="q392">C.7.3 </a><a
4644+
href="/TR/2009/CR-CSS2-20090908/syndata.html#declaration">
4645+
Section&nbsp;4.1.8 Declarations and properties</a></h3>
4646+
4647+
<p><span class=date>[2010-05-12]</span> Remove ~2.1~ from
4648+
4649+
<blockquote><p>Every CSS <del>2.1</del> property has its own syntactic
4650+
and semantic restrictions</blockquote>
4651+
4652+
4653+
4654+
<h3 id="t.4.3.2"><a name="q393">C.7.4 </a><a
46404655
href="/TR/2009/CR-CSS2-20090908/syndata.html#length-units">
46414656
Section&nbsp;4.3.2 Lengths</a></h3>
46424657

@@ -4647,15 +4662,31 @@ <h3 id="t.4.3.2"><a name="q392">C.7.3 </a><a
46474662

46484663

46494664

4650-
<h3 id="t.4.3.4"><a name="q393">C.7.4 </a><a
4665+
<h3 id="t.4.3.4a"><a name="q394">C.7.5 </a><a
4666+
href="/TR/2009/CR-CSS2-20090908/syndata.html#uri">
4667+
Section&nbsp;4.3.4 URLs and URIs</a></h3>
4668+
4669+
<p><span class=date>[2010-05-12]</span> Commas do not have to be
4670+
escaped in &lt;uri&gt; tokens:
4671+
4672+
<blockquote>
4673+
<p>Some characters appearing in an unquoted URI, such as parentheses,
4674+
<del>commas,</del> white space characters, single quotes (') and
4675+
double quotes ("), must be escaped
4676+
</blockquote>
4677+
4678+
4679+
4680+
<h3 id="t.4.3.4"><a name="q395">C.7.6 </a><a
46514681
href="/TR/2009/CR-CSS2-20090908/syndata.html#uri">
46524682
Section&nbsp;4.3.4 URLs and URIs</a></h3>
46534683

46544684
<p><span class=date>[2010-04-21]</span> Describe in English what was
46554685
only expressed through the grammar:
46564686

46574687
<blockquote>
4658-
<p><ins>Since URIs may contain characters that would otherwise be used
4688+
<p><ins>Note. Since URIs may contain characters that would otherwise
4689+
be used
46594690
as delimiters in CSS, the entire URI value must be treated as a single
46604691
unit by the tokenizer and normal tokenization behavior does not apply
46614692
within a URI value. Therefore comments are not allowed within a URI
@@ -4664,7 +4695,37 @@ <h3 id="t.4.3.4"><a name="q393">C.7.4 </a><a
46644695

46654696

46664697

4667-
<h3 id="t.9.2.3a"><a name="q394">C.7.5 </a><a
4698+
<h3 id="t.8.3.1"><a name="q396">C.7.7 </a><a
4699+
href="/TR/2009/CR-CSS2-20090908/box.html#collapsing-margins">
4700+
Section&nbsp;8.3.1 Collapsing margins</a></h3>
4701+
4702+
<p><span class=date>[2010-05-12]</span> Simplify/clarify text:
4703+
4704+
<blockquote>
4705+
<p>An element that has <del>had</del> clearance <del>applied to
4706+
it</del> never
4707+
collapses
4708+
</blockquote>
4709+
4710+
<p>and:
4711+
4712+
<blockquote>
4713+
<p>When an element's own margins collapse, and that element has
4714+
<del>had</del> clearance <del>applied to it</del>
4715+
</blockquote>
4716+
4717+
4718+
4719+
<h3 id="t.9.2"><a name="q397">C.7.8 </a><a
4720+
href="/TR/2009/CR-CSS2-20090908/visuren.html#anonymous-block-level">
4721+
Section&nbsp;9.2 Controlling box generation</a></h3>
4722+
4723+
<p><span class=date>[2010-05-12]</span> The example has invalid HTML
4724+
mark-up. Change it to use P and SPAN elements instead of BODY and P.
4725+
4726+
4727+
4728+
<h3 id="t.9.2.3a"><a name="q398">C.7.9 </a><a
46684729
href="/TR/2009/CR-CSS2-20090908/visuren.html#run-in">
46694730
Section&nbsp;9.2.3 Run-in boxes</a></h3>
46704731

@@ -4735,7 +4796,18 @@ <h3 id="t.9.2.3a"><a name="q394">C.7.5 </a><a
47354796

47364797

47374798

4738-
<h3 id="t.9.6.1"><a name="q395">C.7.6 </a><a
4799+
<h3 id="t.9.5.2"><a name="q399">C.7.10 </a><a
4800+
href="/TR/2009/CR-CSS2-20090908/visuren.html#flow-control">
4801+
Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear'
4802+
property</a></h3>
4803+
4804+
<p><span class=date>[2010-05-12]</span> Clarify that 'clear' only
4805+
introduces clearance above an element if necessary; and that clearance
4806+
may have zero height.
4807+
4808+
4809+
4810+
<h3 id="t.9.6.1"><a name="q400">C.7.11 </a><a
47394811
href="/TR/2009/CR-CSS2-20090908/visuren.html#fixed-positioning">
47404812
Section&nbsp;9.6.1 Fixed positioning</a></h3>
47414813

@@ -4746,7 +4818,36 @@ <h3 id="t.9.6.1"><a name="q395">C.7.6 </a><a
47464818

47474819

47484820

4749-
<h3 id="t.15.6"><a name="q396">C.7.7 </a><a
4821+
<h3 id="t.10.2"><a name="q401">C.7.12 </a><a
4822+
href="/TR/2009/CR-CSS2-20090908/visudet.html#the-width-property">
4823+
Section&nbsp;10.2 Content width: the 'width' property</a></h3>
4824+
4825+
<p><span class=date>[2010-05-12]</span> The computed value of 'width'
4826+
doesn't depend on whether the property applies or not:
4827+
4828+
<blockquote>
4829+
<p>Computed value: the percentage or 'auto' as specified or the
4830+
absolute length; <del>'auto' if the property does not apply</del>
4831+
</blockquote>
4832+
4833+
4834+
4835+
<h3 id="t.10.5"><a name="q402">C.7.13 </a><a
4836+
href="/TR/2009/CR-CSS2-20090908/visudet.html#the-height-property">
4837+
Section&nbsp;10.5 Content height: the 'height' property</a></h3>
4838+
4839+
<p><span class=date>[2010-05-12]</span> The computed value of 'height'
4840+
doesn't depend on whether the property applies or not:
4841+
4842+
<blockquote>
4843+
<p>Computed value: the percentage or 'auto' (see prose under
4844+
&lt;percentage>) or the absolute length; <del>'auto' if the property
4845+
does not apply</del>
4846+
</blockquote>
4847+
4848+
4849+
4850+
<h3 id="t.15.6"><a name="q403">C.7.14 </a><a
47504851
href="/TR/2009/CR-CSS2-20090908/fonts.html#font-boldness">
47514852
Section&nbsp;15.6 Font boldness: the 'font-weight' property</a></h3>
47524853

@@ -4756,7 +4857,7 @@ <h3 id="t.15.6"><a name="q396">C.7.7 </a><a
47564857

47574858

47584859

4759-
<h3 id="t.16.4"><a name="q397">C.7.8 </a><a
4860+
<h3 id="t.16.4"><a name="q404">C.7.15 </a><a
47604861
href="/TR/2009/CR-CSS2-20090908/text.html#spacing-props">
47614862
Section&nbsp;16.4 Letter and word spacing: the 'letter-spacing' and
47624863
'word-spacing' properties</a></h3>
@@ -4777,7 +4878,7 @@ <h3 id="t.16.4"><a name="q397">C.7.8 </a><a
47774878

47784879

47794880

4780-
<h3 id="t.17.4"><a name="q398">C.7.9 </a><a
4881+
<h3 id="t.17.4"><a name="q405">C.7.16 </a><a
47814882
href="/TR/2009/CR-CSS2-20090908/tables.html#model">
47824883
Section&nbsp;17.4 Tables in the visual formatting model</a></h3>
47834884

css2/cover.html

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,13 +1155,20 @@ <h2><a name="toc">Full Table of Contents</a></h2>
11551155
<ul class="toc">
11561156
<li class="tocline3"><a href="changes.html#q390" class="tocxref">C.7.1 Section&nbsp;3.1 Definitions</a>
11571157
<li class="tocline3"><a href="changes.html#q391" class="tocxref">C.7.2 Section&nbsp;4.1.2.2 Informative Historical Notes</a>
1158-
<li class="tocline3"><a href="changes.html#q392" class="tocxref">C.7.3 Section&nbsp;4.3.2 Lengths</a>
1159-
<li class="tocline3"><a href="changes.html#q393" class="tocxref">C.7.4 Section&nbsp;4.3.4 URLs and URIs</a>
1160-
<li class="tocline3"><a href="changes.html#q394" class="tocxref">C.7.5 Section&nbsp;9.2.3 Run-in boxes</a>
1161-
<li class="tocline3"><a href="changes.html#q395" class="tocxref">C.7.6 Section&nbsp;9.6.1 Fixed positioning</a>
1162-
<li class="tocline3"><a href="changes.html#q396" class="tocxref">C.7.7 Section&nbsp;15.6 Font boldness: the 'font-weight' property</a>
1163-
<li class="tocline3"><a href="changes.html#q397" class="tocxref">C.7.8 Section&nbsp;16.4 Letter and word spacing: the 'letter-spacing' and 'word-spacing' properties</a>
1164-
<li class="tocline3"><a href="changes.html#q398" class="tocxref">C.7.9 Section&nbsp;17.4 Tables in the visual formatting model</a>
1158+
<li class="tocline3"><a href="changes.html#q392" class="tocxref">C.7.3 Section&nbsp;4.1.8 Declarations and properties</a>
1159+
<li class="tocline3"><a href="changes.html#q393" class="tocxref">C.7.4 Section&nbsp;4.3.2 Lengths</a>
1160+
<li class="tocline3"><a href="changes.html#q394" class="tocxref">C.7.5 Section&nbsp;4.3.4 URLs and URIs</a>
1161+
<li class="tocline3"><a href="changes.html#q395" class="tocxref">C.7.6 Section&nbsp;4.3.4 URLs and URIs</a>
1162+
<li class="tocline3"><a href="changes.html#q396" class="tocxref">C.7.7 Section&nbsp;8.3.1 Collapsing margins</a>
1163+
<li class="tocline3"><a href="changes.html#q397" class="tocxref">C.7.8 Section&nbsp;9.2 Controlling box generation</a>
1164+
<li class="tocline3"><a href="changes.html#q398" class="tocxref">C.7.9 Section&nbsp;9.2.3 Run-in boxes</a>
1165+
<li class="tocline3"><a href="changes.html#q399" class="tocxref">C.7.10 Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear' property</a>
1166+
<li class="tocline3"><a href="changes.html#q400" class="tocxref">C.7.11 Section&nbsp;9.6.1 Fixed positioning</a>
1167+
<li class="tocline3"><a href="changes.html#q401" class="tocxref">C.7.12 Section&nbsp;10.2 Content width: the 'width' property</a>
1168+
<li class="tocline3"><a href="changes.html#q402" class="tocxref">C.7.13 Section&nbsp;10.5 Content height: the 'height' property</a>
1169+
<li class="tocline3"><a href="changes.html#q403" class="tocxref">C.7.14 Section&nbsp;15.6 Font boldness: the 'font-weight' property</a>
1170+
<li class="tocline3"><a href="changes.html#q404" class="tocxref">C.7.15 Section&nbsp;16.4 Letter and word spacing: the 'letter-spacing' and 'word-spacing' properties</a>
1171+
<li class="tocline3"><a href="changes.html#q405" class="tocxref">C.7.16 Section&nbsp;17.4 Tables in the visual formatting model</a>
11651172
</ul>
11661173
</ul>
11671174
<li class="tocline1"><a href="sample.html" class="tocxref">Appendix D. Default style sheet for HTML 4</a>

0 commit comments

Comments
 (0)