Skip to content

Commit 1901580

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

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

css2/diffs-rec/visudet.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ <h2>10.1 <a name="containing-block-details">Definition of "containing
9191
</li>
9292
<li>For other elements, <del>unless</del><ins>if</ins> the <del>element</del><ins>element's position</ins> is <del>absolutely positioned ,</del><ins>'relative' or 'static',</ins>
9393
the containing block is formed by the content edge of the nearest
94-
<a href="visuren.html#block-boxes"> <del>block-level ancestor box.</del><ins>block container.</ins></a>
94+
<a href="visuren.html#block-boxes"> <del>block-level</del><ins>block container</ins></a> ancestor box.
9595
</li>
9696
<li>If the element has 'position: fixed', the containing block is
9797
established by the <a href="visuren.html#viewport">viewport</a>
@@ -139,7 +139,7 @@ <h2>10.1 <a name="containing-block-details">Definition of "containing
139139
several pages.</ins>
140140
</p>
141141

142-
<p>For <del>box generated by C.B. is established</del><ins>absolutely positioned content that resolves to a position on a
142+
<p>For <del>box generated by C.B. is established by body</del><ins>absolutely positioned content that resolves to a position on a
143143
page other than the page being laid out (the current page), or
144144
resolves to a position on the current page which has already been
145145
rendered for printing, printers may place the content</ins>
@@ -177,8 +177,8 @@ <h2>10.1 <a name="containing-block-details">Definition of "containing
177177
<p><ins>are established as follows:</ins></p>
178178

179179
<table border="1">
180-
<tr><th><ins>For box generated</ins> by </th>
181-
<td><strong> <del>body</del><ins>C.B. is established by</ins></strong></td></tr>
180+
<tr><th><ins>For box generated by</ins> </th>
181+
<td><strong><ins>C.B. is established by</ins></strong></td></tr>
182182
<tr><td><ins>html</ins></td><td>initial C.B. (UA-dependent)</td></tr>
183183
<tr><td><ins>body</ins></td><td><ins>html</ins></td></tr>
184184
<tr><td>div1</td><td>body</td></tr>

css2/diffs-wd/visudet.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ <h2>10.1 <a name="containing-block-details">Definition of "containing
9191
</li>
9292
<li>For other elements, if the element's position is 'relative' or 'static',
9393
the containing block is formed by the content edge of the nearest
94-
<a href="visuren.html#block-boxes"> <del>block-level , table cell or inline-block ancestor box.</del><ins>block container.</ins></a>
94+
<a href="visuren.html#block-boxes"> <del>block-level , table cell or inline-block</del><ins>block container</ins></a> ancestor box.
9595
</li>
9696
<li>If the element has 'position: fixed', the containing block is
9797
established by the <a href="visuren.html#viewport">viewport</a>
@@ -1425,9 +1425,9 @@ <h3>10.8.1 <a name="leading">Leading and half-leading</a></h3>
14251425
<p> <del>Since the value of 'line-height' for an inline box may be different from the</del><ins>CSS assumes that every font has font metrics that specify a
14261426
characteristic</ins> height <del>of its content area there may be space</del>above <ins>the baseline</ins> and <ins>a depth</ins> below <del>rendered glyphs. The difference between the content</del><ins>it. In this
14271427
section we use</ins> <var><ins>A</ins></var> <ins>to mean that</ins> height <ins>(for a given font at a
1428-
given size)</ins> and <var><ins>D</ins></var> the <del>used value of 'line-height' is called</del><ins>depth. We also define</ins> <var><ins>AD</ins></var> <ins>=</ins>
1429-
<var><ins>A</ins></var> <ins>+</ins> <var><ins>D</ins></var><ins>,</ins> the <del>leading . Half</del><ins>distance from</ins> the <del>leading is called</del><ins>top to</ins> the
1430-
<del>half-leading . User agents center glyphs vertically in an inline box, adding half-leading on the top and</del>bottom. <ins>(See the note below</ins> for <a href="#sTypoAscender"> <del>example, if</del><ins>how to find</ins>
1428+
given size)</ins> and <var><ins>D</ins></var> the <del>used value of 'line-height' is called the leading . Half the leading is called</del><ins>depth. We also define</ins> <var><ins>AD</ins></var> <ins>=</ins>
1429+
<var><ins>A</ins></var> <ins>+</ins> <var><ins>D</ins></var><ins>,</ins> the <del>half-leading . User agents center glyphs vertically in an inline box, adding half-leading on</del><ins>distance from</ins> the top <del>and</del><ins>to the</ins>
1430+
bottom. <ins>(See the note below</ins> for <a href="#sTypoAscender"> <del>example, if</del><ins>how to find</ins>
14311431
<var>A</var> <del>piece</del><ins>and</ins> <var><ins>D</ins></var> <ins>for TrueType and OpenType fonts.</ins></a><ins>)
14321432
Note that these are metrics</ins> of <del>text is '12px' high</del><ins>the font as a whole</ins> and <ins>need not
14331433
correspond to</ins> the <del>'line-height' value is '14px', 2pxs of extra space should be added: 1px above</del><ins>ascender</ins> and <del>1px below</del><ins>descender of any individual glyph.</ins>

css2/visudet.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ <h2>10.1 <a name="containing-block-details">Definition of "containing
9191
</li>
9292
<li>For other elements, if the element's position is 'relative' or 'static',
9393
the containing block is formed by the content edge of the nearest
94-
<a href="visuren.html#block-boxes">block container.</a>
94+
<a href="visuren.html#block-boxes">block container</a> ancestor box.
9595
</li>
9696
<li>If the element has 'position: fixed', the containing block is
9797
established by the <a href="visuren.html#viewport">viewport</a>

0 commit comments

Comments
 (0)