Skip to content

Commit 168f58f

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

3 files changed

Lines changed: 21 additions & 15 deletions

File tree

css2/changes.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7085,7 +7085,7 @@ <h3 id=u.10.1><a name="q502">C.8.8 </a><a
70857085
is inline and split over multiple lines:
70867086

70877087
<blockquote>
7088-
4. If the element has 'position: absolute', the containing block is
7088+
<p>4. If the element has 'position: absolute', the containing block is
70897089
<del>established by</del> <ins>the padding edge of</ins> the nearest
70907090
ancestor with a 'position' of 'absolute', 'relative' or 'fixed'<del>,
70917091
in the following way:</del><ins>.</ins>
@@ -7135,7 +7135,7 @@ <h3 id=u.13.2.2><a name="q503">C.8.9 </a><a
71357135

71367136

71377137

7138-
<h3 id=u.8.3.1><a name="q504">C.8.10 </a><a
7138+
<h3 id=u.8.3.1a><a name="q504">C.8.10 </a><a
71397139
href="/TR/2010/WD-CSS2-20101207/box.html#collapsing-margins">8.3.1
71407140
Collapsing margins</a></h3>
71417141

@@ -7149,6 +7149,7 @@ <h3 id=u.8.3.1><a name="q504">C.8.10 </a><a
71497149
href="visuren.html#phantom-line-box">certain zero-height line
71507150
boxes</a> (see <a href="visuren.html#inline-formatting">9.4.2</a>) are
71517151
ignored for this purpose.)</span></ins>
7152+
</ul>
71527153
</blockquote>
71537154

71547155

@@ -7173,6 +7174,7 @@ <h3 id=u.10.8><a name="q505">C.8.11 </a><a
71737174
<ins><a href="visudet.html#inline-box-height">height of inline
71747175
boxes</a> in <a href="visudet.html#leading">"Leading and
71757176
half-leading"</a></ins>.)
7177+
</ol>
71767178
</blockquote>
71777179

71787180
<p>The part of the definition that was in <a
@@ -7185,9 +7187,9 @@ <h3 id=u.10.8><a name="q505">C.8.11 </a><a
71857187

71867188

71877189

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>
7190+
<h3 id=u.10.8.1a><a name="q506">C.8.12 </a><a
7191+
href="/TR/2010/WD-CSS2-20101207/visudet.html#leading">10.8.1
7192+
Leading and half-leading</a></h3>
71917193

71927194
<p>Inserted the following before the definitions of the keywords of
71937195
'vertical-align' to define precisely which box is aligned:

css2/diffs-rec/changes.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7085,7 +7085,7 @@ <h3 id=u.10.1><a name="q502"><ins>C.8.8</ins> </a><a
70857085
is inline and split over multiple lines:</ins>
70867086

70877087
<blockquote>
7088-
<ins>4. If the element has 'position: absolute', the containing block is</ins>
7088+
<p><ins>4. If the element has 'position: absolute', the containing block is</ins>
70897089
<del><ins>established by</ins></del> <ins><ins>the padding edge of</ins> the nearest
70907090
ancestor with a 'position' of 'absolute', 'relative' or 'fixed'</ins><del><ins>,
70917091
in the following way:</ins></del><ins><ins>.</ins></ins>
@@ -7135,7 +7135,7 @@ <h3 id=u.13.2.2><a name="q503"><ins>C.8.9</ins> </a><a
71357135

71367136

71377137

7138-
<h3 id=u.8.3.1><a name="q504"><ins>C.8.10</ins> </a><a
7138+
<h3 id=u.8.3.1a><a name="q504"><ins>C.8.10</ins> </a><a
71397139
href="/TR/2010/WD-CSS2-20101207/box.html#collapsing-margins"><ins>8.3.1
71407140
Collapsing margins</ins></a></h3>
71417141

@@ -7149,6 +7149,7 @@ <h3 id=u.8.3.1><a name="q504"><ins>C.8.10</ins> </a><a
71497149
href="visuren.html#phantom-line-box"><ins>certain zero-height line
71507150
boxes</ins></a> <ins>(see</ins> <a href="visuren.html#inline-formatting"><ins>9.4.2</ins></a><ins>) are
71517151
ignored for</ins> this <del>specification reflects this by introducing</del><ins>purpose.)</ins></span></ins>
7152+
</ul>
71527153
</blockquote>
71537154

71547155

@@ -7173,6 +7174,7 @@ <h3 id=u.10.8><a name="q505"><ins>C.8.11</ins> </a><a
71737174
<ins><a href="visudet.html#inline-box-height"> <del>only applies to block-level elements in CSS2.</del><ins>height of inline
71747175
boxes</ins></a> in <a href="visudet.html#leading"> <del>CSS1, ':link' , ':visited'</del><ins>"Leading</ins> and
71757176
<del>':active' were mutually exclusive; in CSS2, ':active' can occur together with ':link' or ':visited' . The suggested scaling factor between adjacent 'font-size' indexes in</del><ins>half-leading"</ins></a>.)</ins>
7177+
</ol>
71767178
</blockquote>
71777179

71787180
<p>The <del>table</del><ins>part</ins> of <del>font sizes has been reduced from 1.5 to 1.2.</del>the <del>computed value, not</del><ins>definition that was in</ins> <a
@@ -7185,9 +7187,9 @@ <h3 id=u.10.8><a name="q505"><ins>C.8.11</ins> </a><a
71857187

71867188

71877189

7188-
<h3 id=u.10.8.1><a name="q506"><ins>C.8.12</ins> </a><a
7189-
href="/TR/2010/WD-CSS2-20101207/visudet.html#leading"</a><ins>10.8.1
7190-
Leading and half-leading</ins></h3>
7190+
<h3 id=u.10.8.1a><a name="q506"><ins>C.8.12</ins> </a><a
7191+
href="/TR/2010/WD-CSS2-20101207/visudet.html#leading"><ins>10.8.1
7192+
Leading and half-leading</ins></a></h3>
71917193

71927194
<p><ins>Inserted</ins> the <del>text was affected, rather than</del><ins>following before</ins> the <del>position</del><ins>definitions</ins> of the <del>bullet.</del><ins>keywords of
71937195
'vertical-align' to define precisely which box is aligned:</ins>

css2/diffs-wd/changes.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7085,7 +7085,7 @@ <h3 id=u.10.1><a name="q502"><ins>C.8.8</ins> </a><a
70857085
is inline</ins> and <del>including</del><ins>split over multiple lines:</ins>
70867086

70877087
<blockquote>
7088-
<ins>4. If</ins> the <del>next semicolon (;), or up to and including</del><ins>element has 'position: absolute',</ins> the <del>next</del><ins>containing</ins> block <del>({...}), or</del><ins>is</ins>
7088+
<p><ins>4. If</ins> the <del>next semicolon (;), or up to and including</del><ins>element has 'position: absolute',</ins> the <del>next</del><ins>containing</ins> block <del>({...}), or</del><ins>is</ins>
70897089
<del><ins>established by</ins></del> <ins>the <del>end</del><ins>padding edge</ins> of</ins> the <del>block (})</del><ins>nearest
70907090
ancestor with a 'position' of 'absolute', 'relative' or 'fixed'</ins><del><ins>,
70917091
in the following way:</ins></del><ins><ins>.</ins></ins>
@@ -7135,7 +7135,7 @@ <h3 id=u.13.2.2><a name="q503"><ins>C.8.9</ins> </a><a
71357135

71367136

71377137

7138-
<h3 id=u.8.3.1><a name="q504"><ins>C.8.10</ins> </a><a
7138+
<h3 id=u.8.3.1a><a name="q504"><ins>C.8.10</ins> </a><a
71397139
href="/TR/2010/WD-CSS2-20101207/box.html#collapsing-margins"><ins>8.3.1
71407140
Collapsing margins</ins></a></h3>
71417141

@@ -7149,6 +7149,7 @@ <h3 id=u.8.3.1><a name="q504"><ins>C.8.10</ins> </a><a
71497149
href="visuren.html#phantom-line-box"><ins>certain zero-height line
71507150
boxes</ins></a> <ins>(see</ins> <a href="visuren.html#inline-formatting"><ins>9.4.2</ins></a><ins>) are
71517151
ignored</ins> for <ins>this purpose.)</ins></span></ins>
7152+
</ul>
71527153
</blockquote>
71537154

71547155

@@ -7173,6 +7174,7 @@ <h3 id=u.10.8><a name="q505"><ins>C.8.11</ins> </a><a
71737174
<ins><a href="visudet.html#inline-box-height"><ins>height</ins> of <del>a 'fixed' table layout.</del><ins>inline
71747175
boxes</ins></a> in <a href="visudet.html#leading"> <del>that case,</del><ins>"Leading and
71757176
half-leading"</ins></a>.)</ins>
7177+
</ol>
71767178
</blockquote>
71777179

71787180
<p>The <del>width</del><ins>part</ins> of the <del>columns</del><ins>definition that was in</ins> <a
@@ -7185,9 +7187,9 @@ <h3 id=u.10.8><a name="q505"><ins>C.8.11</ins> </a><a
71857187

71867188

71877189

7188-
<h3 id=u.10.8.1><a name="q506"><ins>C.8.12</ins> </a><a
7189-
href="/TR/2010/WD-CSS2-20101207/visudet.html#leading"</a><ins>10.8.1
7190-
Leading</ins> and <del>table row groups compute</del><ins>half-leading</ins></h3>
7190+
<h3 id=u.10.8.1a><a name="q506"><ins>C.8.12</ins> </a><a
7191+
href="/TR/2010/WD-CSS2-20101207/visudet.html#leading"><ins>10.8.1
7192+
Leading</ins> and <del>table row groups compute</del><ins>half-leading</ins></a></h3>
71917193

71927194
<p><ins>Inserted the following before the definitions of the keywords of
71937195
'vertical-align'</ins> to <del>'auto' by CSS&nbsp;2.1 does not</del>define <del>how</del><ins>precisely which box is aligned:</ins>

0 commit comments

Comments
 (0)