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

Commit a8a3d92

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

19 files changed

Lines changed: 178 additions & 156 deletions

css2/css2.html

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,7 +1287,9 @@ <H2><a name="q17">1.5 Acknowledgments</a></H2>
12871287
<span class=vcard><span class="fn n"><span class="given-name">Jan</span>
12881288
<span class="additional-name">Eirik</span>
12891289
<span class="family-name">Olufsen</span></span></span>,
1290-
<span class=vcard><span class="fn">Jan Roland Eriksson</span></span>,
1290+
<span class=vcard><span class="fn"><span class="given-name">Jan</span>
1291+
<span class="additional-name">Roland</span>
1292+
<span class="family-name">Eriksson</span></span></span>,
12911293
<span class=vcard><span class="fn">Joris Huizer</span></span>,
12921294
<span class=vcard><span class="fn">Joshua Prowse</span></span>,
12931295
<span class=vcard><span class="fn">Kai Lahmann</span></span>,
@@ -4584,7 +4586,7 @@ <h3>5.11.2 <a name="link-pseudo-classes">The link pseudo-classes</a>: <a name="x
45844586
<P>The two states are mutually exclusive.
45854587

45864588
<p>The document language determines which elements are hyperlink
4587-
source anchors. For example, in HTML&nbsp;4.0, the link pseudo-classes
4589+
source anchors. For example, in HTML4, the link pseudo-classes
45884590
apply to A elements with an "href" attribute. Thus, the following
45894591
two CSS&nbsp;2.1 declarations have similar effect:</p>
45904592

@@ -10106,8 +10108,12 @@ <h2>10.4 <a name="min-max-widths">Minimum and maximum widths</a>: <a href="visud
1010610108
</li>
1010710109
</ol>
1010810110

10109-
<p>However, for replaced elements with an intrinsic ratio and at least
10110-
one value of <a href="visudet.html#propdef-width" class="noxref"><span class="propinst-width">'width'</span></a> or <a href="visudet.html#propdef-height" class="noxref"><span
10111+
<p class="note">These steps do not affect the real computed values of
10112+
the above properties.</p>
10113+
10114+
<p>However, for replaced elements with an intrinsic ratio and both
10115+
<a href="visudet.html#propdef-width" class="noxref"><span
10116+
class="propinst-width">'width'</span></a> and <a href="visudet.html#propdef-height" class="noxref"><span
1011110117
class="propinst-height">'height'</span></a> specified as 'auto', the
1011210118
algorithm is as follows:
1011310119
</p>
@@ -10651,7 +10657,7 @@ <h2>10.7 <a name="min-max-heights">Minimum and maximum heights</a>: <a href="vis
1065110657
</p>
1065210658

1065310659
<p>The following algorithm describes how the two properties influence
10654-
the <a href="cascade.html#computed-value">computed value</a>
10660+
the <a href="cascade.html#computed-value">used value</a>
1065510661
of the <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a> property:</p>
1065610662

1065710663
<ol>
@@ -10678,8 +10684,8 @@ <h2>10.7 <a name="min-max-heights">Minimum and maximum heights</a>: <a href="vis
1067810684
</li>
1067910685
</ol>
1068010686

10681-
<p>However, for replaced elements with an intrinsic ratio and at least
10682-
one of <a href="visudet.html#propdef-width" class="noxref"><span class="propinst-width">'width'</span></a> and <a href="visudet.html#propdef-height" class="noxref"><span
10687+
<p>However, for replaced elements with both <a href="visudet.html#propdef-width" class="noxref"><span
10688+
class="propinst-width">'width'</span></a> and <a href="visudet.html#propdef-height" class="noxref"><span
1068310689
class="propinst-height">'height'</span></a> computed as 'auto', use the
1068410690
algorithm under <a href="#min-max-widths">Minimum and maximum
1068510691
widths</a> above to find the used width and height. Then apply the
@@ -15378,7 +15384,7 @@ <h2><a name="q1">17.1 Introduction to tables</a></h2>
1537815384

1537915385
<h2><a name="q2">17.2 The CSS table model</a></h2>
1538015386

15381-
<p>The CSS table model is based on the HTML&nbsp;4.0 table model, in
15387+
<p>The CSS table model is based on the HTML4 table model, in
1538215388
which the structure of a table closely parallels the visual layout of
1538315389
the table. In this model, a table consists of an optional caption and
1538415390
any number of rows of cells. The table model is said to be "row
@@ -15490,8 +15496,8 @@ <h2><a name="q2">17.2 The CSS table model</a></h2>
1549015496
have attributes which induce a certain style for the columns they
1549115497
represent.
1549215498

15493-
<p>The <a href="sample.html">default style sheet for HTML&nbsp;4.0</a>
15494-
in the appendix illustrates the use of these values for HTML&nbsp;4.0:
15499+
<p>The <a href="sample.html">default style sheet for HTML4</a>
15500+
in the appendix illustrates the use of these values for HTML4:
1549515501

1549615502
<pre class="example">
1549715503
table { display: table }
@@ -17056,7 +17062,7 @@ <h2>18.4 <a name="dynamic-outlines">Dynamic outlines:</a> the <a name="x2"><span
1705617062
<tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>no
1705717063
<tr valign=baseline><td><em>Percentages:</em>&nbsp;&nbsp;<td>N/A
1705817064
<tr valign=baseline><td><em>Media:</em>&nbsp;&nbsp;<td><a href="media.html#visual-media-group" class="noxref">visual</a>, <a href="media.html#interactive-media-group" class="noxref">interactive</a>
17059-
<tr valign=baseline><td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;<td>absolute length; '0' if the outline style is 'none' or 'hidden'
17065+
<tr valign=baseline><td><em&g 6D41 t;Computed&nbsp;value:</em>&nbsp;&nbsp;<td>absolute length; '0' if the outline style is 'none'
1706017066
</table>
1706117067
</dl>
1706217068
</div>
@@ -19985,7 +19991,7 @@ <h2><a name="q1">E.1 Definitions</a></h2>
1998519991

1998619992
<dt>Element</dt>
1998719993

19988-
<dd>In this description, "element" refers to both actual elements,
19994+
<dd>In this description, "element" refers to actual elements,
1998919995
pseudo-elements, and anonymous boxes. Pseudo-elements and anonymous
1999019996
boxes are treated as descendants in the appropriate places. For
1999119997
example, an outside list marker comes before an adjoining ':before'

css2/diffs-rec/about.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,9 @@ <H2><a name="q17"> <del>1.4</del><ins>1.5</ins> Acknowledgments</a></H2>
447447
<span class=vcard><span class="fn n"><span class="given-name"><ins>Jan</ins></span>
448448
<span class="additional-name"><ins>Eirik</ins></span>
449449
<span class="family-name"><ins>Olufsen</ins></span></span></span><ins>,</ins>
450-
<span class=vcard><span class="fn"><ins>Jan</ins> <ins>Roland</ins> <ins>Eriksson</ins></span></span><ins>,</ins>
450+
<span class=vcard><span class="fn"><span class="given-name"><ins>Jan</ins></span>
451+
<span class="additional-name"><ins>Roland</ins></span>
452+
<span class="family-name"><ins>Eriksson</ins></span></span></span><ins>,</ins>
451453
<span class=vcard><span class="fn"><ins>Joris</ins> <ins>Huizer</ins></span></span><ins>,</ins>
452454
<span class=vcard><span class="fn"><ins>Joshua</ins> <ins>Prowse</ins></span></span><ins>,</ins>
453455
<span class=vcard><span class="fn"><ins>Kai</ins> <ins>Lahmann</ins></span></span><ins>,</ins>

css2/diffs-rec/selector.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ <h3>5.11.2 <a name="link-pseudo-classes">The link pseudo-classes</a>: <a name="x
866866
<P>The two states are mutually exclusive.
867867

868868
<p>The document language determines which elements are hyperlink
869-
source anchors. For example, in HTML&nbsp;4.0, the link pseudo-classes
869+
source anchors. For example, in <del>HTML&nbsp;4.0,</del><ins>HTML4,</ins> the link pseudo-classes
870870
apply to A elements with an "href" attribute. Thus, the following
871871
two <del>CSS2</del><ins>CSS&nbsp;2.1</ins> declarations have similar effect:</p>
872872

css2/diffs-rec/tables.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ <h2><a name="q1"> <del>17.7</del> <del>Audio</del> <del>rendering</del> <del>of<
182182

183183
<h2><a name="q2">17.2 The CSS table model</a></h2>
184184

185-
<p>The CSS table model is based on the <del>HTML</del> <del>4.0</del><ins>HTML&nbsp;4.0</ins> table model, in
185+
<p>The CSS table model is based on the <del>HTML</del> <del>4.0</del><ins>HTML4</ins> table model, in
186186
which the structure of a table closely parallels the visual layout of
187187
the table. In this model, a table consists of an optional caption and
188188
any number of rows of cells. The table model is said to be "row
@@ -294,8 +294,8 @@ <h2><a name="q2">17.2 The CSS table model</a></h2>
294294
have attributes which induce a certain style for the columns they
295295
represent.
296296

297-
<p>The <a href="sample.html">default style sheet for <del>HTML</del> <del>4.0</del><ins>HTML&nbsp;4.0</ins></a>
298-
in the appendix illustrates the use of these values for <del>HTML</del> <del>4.0:</del><ins>HTML&nbsp;4.0:</ins>
297+
<p>The <a href="sample.html">default style sheet for <del>HTML</del> <del>4.0</del><ins>HTML4</ins></a>
298+
in the appendix illustrates the use of these values for <del>HTML</del> <del>4.0:</del><ins>HTML4:</ins>
299299

300300
<pre class="example">
301301
table { display: table }

css2/diffs-rec/ui.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@ <h2>18.1 <a name="cursor-props">Cursors:</a> the <a href="ui.html#propdef-cursor
141141

142142

143143

144-
<h2><ins>18.2</ins> <a name="system-colors"><ins>System</ins> Colors</a></h2>
144+
<h2><ins>18.2</ins> <a name="system-colors"><ins>System</ins> <ins>Colors</ins></a></h2>
145145

146146
<div class="note"><p><em><strong><ins>Note.</ins></strong>
147-
<ins>The</ins> <ins>System</ins> <ins>Colors</ins> <ins>are</ins>
147+
<ins>The</ins> <ins>System</ins> Colors <ins>are</ins>
148148
<a href="http://www.w3.org/TR/2003/CR-css3-color-20030514/#css2-system"><ins>deprecated</ins> <ins>in</ins> <ins>the</ins> <ins>CSS3</ins> <ins>Color</ins> <ins>Module</ins></a><ins>.</ins>
149149
</em></p>
150150
</div>
@@ -284,7 +284,7 @@ <h2>18.4 <a name="dynamic-outlines">Dynamic outlines:</a> the <a name="x2"><span
284284
<tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>no
285285
<tr valign=baseline><td><em>Percentages:</em>&nbsp;&nbsp;<td>N/A
286286
<tr valign=baseline><td><em>Media:</em>&nbsp;&nbsp;<td><a href="media.html#visual-media-group" class="noxref">visual</a>, <a href="media.html#interactive-media-group" class="noxref">interactive</a>
287-
<tr valign=baseline><td><em><ins>Computed&nbsp;value:</ins></em><ins>&nbsp;&nbsp;</ins><td><ins>absolute</ins> <ins>length;</ins> <ins>'0'</ins> <ins>if</ins> <ins>the</ins> <ins>outline</ins> <ins>style</ins> <ins>is</ins> <ins>'none'</ins> <ins>or</ins> <ins>'hidden'</ins>
287+
<tr valign=baseline><td><em><ins>Computed&nbsp;value:</ins></em><ins>&nbsp;&nbsp;</ins><td><ins>absolute</ins> <ins>length;</ins> <ins>'0'</ins> <ins>if</ins> <ins>the</ins> <ins>outline</ins> <ins>style</ins> <ins>is</ins> <ins>'none'</ins>
288288
</table>
289289
</dl>
290290
</div>

0 commit comments

Comments
 (0)