8000 [css2] Generated. Do not edit! · w3c/csswg-drafts@8d9511d · GitHub
Skip to content

Commit 8d9511d

Browse files
bert-githubbert-github
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%403131
1 parent df63cf2 commit 8d9511d

25 files changed

Lines changed: 3256 additions & 2632 deletions

‎css2/box.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,10 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
388388
href="visuren.html#block-formatting">block formatting context</a>
389389

390390
<LI>no line boxes, no clearance, no padding and no border separate
391-
them
391+
them <span class="note">(Note that <a
392+
href="visuren.html#phantom-line-box">certain zero-height line
393+
boxes</a> (see <a href="visuren.html#inline-formatting">9.4.2</a>)
394+
are ignored for this purpose.)</span>
392395

393396
<LI>both belong to vertically-adjacent box edges, i.e. form one of
394397
the following pairs:

‎css2/changes.html‎

Lines changed: 180 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,12 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
541541
<li class="tocline3"><a href="changes.html#q498" class="tocxref">C.8.4 14.3 Gamma correction</a>
542542
<li class="tocline3"><a href="changes.html#q499" class="tocxref">C.8.5 11.1.2 Clipping: the 'clip' property</a>
543543
<li class="tocline3"><a href="changes.html#q500" class="tocxref">C.8.6 9.4.2 Inline formatting contexts</a>
544+
<li class="tocline3"><a href="changes.html#q501" class="tocxref">C.8.7 10.3.2 Inline, replaced elements</a>
545+
<li class="tocline3"><a href="changes.html#q502" class="tocxref">C.8.8 10.1 Definition of "containing block"</a>
546+
<li class="tocline3"><a href="changes.html#q503" class="tocxref">C.8.9 13.2.2 Page selectors: selecting left, right, and first pages</a>
547+
<li class="tocline3"><a href="changes.html#q504" class="tocxref">C.8.10 8.3.1 Collapsing margins</a>
548+
<li class="tocline3"><a href="changes.html#q505" class="tocxref">C.8.11 10.8 Line height calculations: the 'line-height' and 'vertical-align' properties</a>
549+
<li class="tocline3"><a href="changes.html#q506" class="tocxref">C.8.12 10.8.1 Leading and half-leading</a>
544550
</ul>
545551
</ul>
546552
</div>
@@ -6995,10 +7001,10 @@ <h3 id=u.10.3><a name="q497">C.8.3 </a><a
69957001
value, still to be compared to 'min-width' and 'max-width'
69967002

69977003
<blockquote>
6998-
<p><p class=note><em><strong>Note.</strong> The used value of 'width'
6999-
calculated below is a tentative value, and may have to be calculated
7000-
multiple times, depending on 'min-width' and 'max-width', see the
7001-
section Minimum and maximum widths below.</em>
7004+
<p><p class=note><ins><em><strong>Note.</strong> The used value of
7005+
'width' calculated below is a tentative value, and may have to be
7006+
calculated multiple times, depending on 'min-width' and 'max-width',
7007+
see the section Minimum and maximum widths below.</em></ins>
70027008
</blockquote>
70037009

70047010
<p>A similar note is added to section&nbsp;10.6 about calculating
@@ -7034,6 +7040,176 @@ <h3 id=u.9.4.2><a name="q500">C.8.6 </a><a
70347040

70357041

70367042

7043+
<h3 id=u.10.3.2><a name="q501">C.8.7 </a><a
7044+
href="/TR/2010/WD-CSS2-20101207/visudet.html#inline-replaced-width">10.3.2
7045+
Inline, replaced elements</a></h3>
7046+
7047+
<p>No image formats were found that allow an intrinsic size to be
7048+
expressed as a percentage. The relevant definitions are removed:
7049+
7050+
<blockquote>
7051+
<p><del>Percentage intrinsic widths are first evaluated with respect
7052+
to the containing block's width, if that width does not itself depend
7053+
on the replaced element's width. If it does, then the resulting layout
7054+
is undefined in CSS 2.1.</del>
7055+
</blockquote>
7056+
7057+
<p>Similarly in <a
7058+
href="/TR/2010/WD-CSS2-20101207/visudet.html#inline-replaced-height">10.6.2</a>:
7059+
7060+
<blockquote>
7061+
<p><del>Percentage intrinsic heights are evaluated with respect to the
7062+
containing block's height, if that height is specified explicitly, or
7063+
if the replaced element is absolutely positioned. If neither of these
7064+
conditions is met, then percentage values on such replaced elements
7065+
cannot be resolved and such elements are assumed to have no intrinsic
7066+
height.</del>
7067+
</blockquote>
7068+
7069+
<p>And in <a
7070+
href="/TR/2010/WD-CSS2-20101207/generate.html#list-style">12.5.1</a>:
7071+
7072+
<blockquote>
7073+
<p><del>2. If the image's intrinsic width or height is given as a
7074+
percentage, then that percentage is resolved against 1em.</del>
7075+
</blockquote>
7076+
7077+
7078+
7079+
<h3 id=u.10.1><a name="q502">C.8.8 </a><a
7080+
href="/TR/2010/WD-CSS2-20101207/visudet.html#containing-block-details">10.1
7081+
Definition of "containing block"</a></h3>
7082+
7083+
<p>In CSS&nbsp;2.1, it is undefined what the containing block of an
7084+
absolutely positioned element is, if its nearest positioned ancestor
7085+
is inline and split over multiple lines:
7086+
7087+
<blockquote>
7088+
4. If the element has 'position: absolute', the containing block is
7089+
<del>established by</del> <ins>the padding edge of</ins> the nearest
7090+
ancestor with a 'position' of 'absolute', 'relative' or 'fixed'<del>,
7091+
in the following way:</del><ins>.</ins>
7092+
<ol>
7093+
<li><del>In the case that the ancestor is an inline box, the
7094+
containing block depends on the 'direction' property of the
7095+
ancestor:</del>
7096+
<ol>
7097+
<li><del>If the 'direction' is 'ltr', the top and left of the
7098+
containing block are the top and left padding edges of the first
7099+
box generated by the ancestor, and the bottom and right are the
7100+
bottom and right padding edges of the last box of the
7101+
ancestor.</del>
7102+
7103+
<li><del>If the 'direction' is 'rtl', the top and right are the
7104+
top and right padding edges of the first box generated by the
7105+
ancestor, and the bottom and left are the bottom and left padding
7106+
edges of the last box of the ancestor.</del>
7107+
</ol>
7108+
<p><del>Note: This may cause the containing block's width to be
7109+
negative.</del>
7110+
7111+
<li><del>Otherwise, the containing block is formed by the padding edge of
7112+
the ancestor.</del>
7113+
</ol>
7114+
7115+
<p>If there is no such ancestor, the containing block is the initial
7116+
containing block. <ins>In CSS&nbsp;2.1, if that nearest ancestor is
7117+
an inline-level element that splits across multiple lines, the
7118+
containing block is undefined.</ins>
7119+
</blockquote>
7120+
7121+
7122+
7123+
<h3 id=u.13.2.2><a name="q503">C.8.9 </a><a
7124+
href="/TR/2010/WD-CSS2-20101207/page.html#page-selectors">13.2.2 Page
7125+
selectors: selecting left, right, and first pages</a></h3>
7126+
7127+
<p>CSS&nbsp;2.1 does not define if ':first' applies to the first page or
7128+
the first non-blank page:
7129+
7130+
<blockquote>
7131+
<p><ins>If a forced break occurs before the first generated box, it is
7132+
undefined in CSS&nbsp;2.1 whether ':first' applies to the blank page
7133+
before the break or to the page after it.</ins>
7134+
</blockquote>
7135+
7136+
7137+
7138+
<h3 id=u.8.3.1><a name="q504">C.8.10 </a><a
7139+
href="/TR/2010/WD-CSS2-20101207/box.html#collapsing-margins">8.3.1
7140+
Collapsing margins</a></h3>
7141+
7142+
<p>Added a note with a link to 9.4.2, which defines types of line boxes
7143+
that exist but do not interfere with collapsing margins.
7144+
7145+
<blockquote>
7146+
<ul>
7147+
<li>no line boxes, no clearance, no padding and no border separate
7148+
them <ins><span class="note">(Note that <a
7149+
href="visuren.html#phantom-line-box">certain zero-height line
7150+
boxes</a> (see <a href="visuren.html#inline-formatting">9.4.2</a>) are
7151+
ignored for this purpose.)</span></ins>
7152+
</blockquote>
7153+
7154+
7155+
7156+
<h3 id=u.10.8><a name="q505">C.8.11 </a><a
7157+
href="/TR/2010/WD-CSS2-20101207/visudet.html#line-height">10.8 Line
7158+
height calculations: the 'line-height' and 'vertical-align'
7159+
properties</a></h3>
7160+
7161+
<p>The definition of which height is used for the different kinds of
7162+
inline-level boxes is made explicit, rather than linked:
7163+
7164+
<blockquote>
7165+
<ol>
7166+
<li>The height of each inline-level box in the line box is calculated.
7167+
<ins>For replaced elements, inline-block elements, and inline-table
7168+
elements, this is the height of their margin box; for inline boxes,
7169+
this is their 'line-height'.</ins>
7170+
(See <a href="visudet.html#Computing_heights_and_margins">"Calculating
7171+
heights and margins"</a> and the
7172+
<del>'line-height' property</del>
7173+
<ins><a href="visudet.html#inline-box-height">height of inline
7174+
boxes</a> in <a href="visudet.html#leading">"Leading and
7175+
half-leading"</a></ins>.)
7176+
</blockquote>
7177+
7178+
<p>The part of the definition that was in <a
7179+
href="visudet.html#inline-replaced-height">10.6.2</a> is removed:
7180+
7181+
<blockquote>
7182+
<p><del>For 'inline' and 'inline-block' elements, the margin box is
7183+
used when calculating the height of the line box.</del>
7184+
</blockquote>
7185+
7186+
7187+
7188+
<h3 id=u.10.8.1><a name="q506">C.8.12 </a><a
7189+
href="/TR/2010/WD-CSS2-20101207/visudet.html#leading"</a>10.8.1
7190+
Leading and half-leading</h3>
7191+
7192+
<p>Inserted the following before the definitions of the keywords of
7193+
'vertical-align' to define precisely which box is aligned:
7194+
7195+
<blockquote>
7196+
<p><ins>In the following definitions, for inline non-replaced
7197+
elements, the box used for alignment is the box whose height is the
7198+
'line-height' (containing the box's glyphs and the half-leading on
7199+
each side, see <a
7200+
href="visudet.html#inline-box-height">above</a>). For all other
7201+
elements, the box used for alignment is the margin box.</ins>
7202+
</blockquote>
7203+
7204+
<p>Also, to make sure there always is a box whose height is
7205+
'line-height', removed a phrase earlier in the same section:
7206+
7207+
<blockquote>
7208+
<p>User agent must align the glyphs in a non-replaced inline box to
7209+
each other by their relevant baselines<del>, and to nested inline
7210+
boxes according to 'vertical-align'</del>.
7211+
</blockquote>
7212+
70377213
<hr class="navbar">
70387214

70397215
<div class="navbar">

‎css2/cover.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,6 +1270,12 @@ <h2><a name="toc">Full Table of Contents</a></h2>
12701270
<li class="tocline3"><a href="changes.html#q498" class="tocxref">C.8.4 14.3 Gamma correction</a>
12711271
<li class="tocline3"><a href="changes.html#q499" class="tocxref">C.8.5 11.1.2 Clipping: the 'clip' property</a>
12721272
<li class="tocline3"><a href="changes.html#q500" class="tocxref">C.8.6 9.4.2 Inline formatting contexts</a>
1273+
<li class="tocline3"><a href="changes.html#q501" class="tocxref">C.8.7 10.3.2 Inline, replaced elements</a>
1274+
<li class="tocline3"><a href="changes.html#q502" class="tocxref">C.8.8 10.1 Definition of "containing block"</a>
1275+
<li class="tocline3"><a href="changes.html#q503" class="tocxref">C.8.9 13.2.2 Page selectors: selecting left, right, and first pages</a>
1276+
<li class="tocline3"><a href="changes.html#q504" class="tocxref">C.8.10 8.3.1 Collapsing margins</a>
1277+
<li class="tocline3"><a href="changes.html#q505" class="tocxref">C.8.11 10.8 Line height calculations: the 'line-height' and 'vertical-align' properties</a>
1278+
<li class="tocline3"><a href="changes.html#q506" class="tocxref">C.8.12 10.8.1 Leading and half-leading</a>
12731279
</ul>
12741280
</ul>
12751281
<li class="tocline1"><a href="sample.html" class="tocxref">Appendix D. Default style sheet for HTML 4</a>

0 commit comments

Comments
 (0)