Skip to content

Commit 507b0a8

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

File tree

4 files changed

+26
-18
lines changed

4 files changed

+26
-18
lines changed

css2/cascade.html

+4-2
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ <h3>6.1.1 <span class="index-def" title="specified value">
7373

7474
<ol>
7575
<li>If the <a href="#cascade">cascade</a> results in a value, use it.
76+
But if the cascade results in 'inherit', the specified value is as
77+
explained in <a href="#value-def-inherit" >“The 'inherit' value.”</a>
7678
<li>Otherwise, if the property is <a href="#inheritance">inherited</a> and the element is not the root of the <a>document tree</a>, use the computed value of the parent element.
7779
<li>Otherwise use the property's <a name="x1"><span class="index-def" title="initial value">initial value</span></a>. The initial value of each property is indicated in the property's definition.
7880
</ol>
@@ -188,8 +190,8 @@ <h3>6.2.1 The <span class="index-def" title="inherit, definition
188190
value</h3>
189191

190192
<P>Each property may also have a cascaded value of 'inherit', which
191-
means that, for a given element, the property takes the same specified
192-
value as the property for the element's parent. The 'inherit' value
193+
means that, for a given element, the property takes as specified
194+
value the computed value of the element's parent. The 'inherit' value
193195
can be used to enforce inheritance of values, and it can also be used on
194196
properties that are not normally inherited.
195197

css2/css2.html

+4-2
Original file line numberDiff line numberDiff line change
@@ -5827,6 +5827,8 @@ <h3>6.1.1 <span class="index-def" title="specified value">
58275827

58285828
<ol>
58295829
<li>If the <a href="#cascade">cascade</a> results in a value, use it.
5830+
But if the cascade results in 'inherit', the specified value is as
5831+
explained in <a href="#value-def-inherit" >“The 'inherit' value.”</a>
58305832
<li>Otherwise, if the property is <a href="#inheritance">inherited</a> and the element is not the root of the <a>document tree</a>, use the computed value of the parent element.
58315833
<li>Otherwise use the property's <a name="x1"><span class="index-def" title="initial value">initial value</span></a>. The initial value of each property is indicated in the property's definition.
58325834
</ol>
@@ -5942,8 +5944,8 @@ <h3>6.2.1 The <span class="index-def" title="inherit, definition
59425944
value</h3>
59435945

59445946
<P>Each property may also have a cascaded value of 'inherit', which
5945-
means that, for a given element, the property takes the same specified
5946-
value as the property for the element's parent. The 'inherit' value
5947+
means that, for a given element, the property takes as specified
5948+
value the computed value of the element's parent. The 'inherit' value
59475949
can be used to enforce inheritance of values, and it can also be used on
59485950
properties that are not normally inherited.
59495951

css2/diffs-rec/cascade.html

+14-12
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ <h3>6.1.1 <span class="index-def" title="specified value">
7373

7474
<ol>
7575
<li>If the <a href="#cascade">cascade</a> results in a value, use it.
76+
<ins>But if the cascade results in 'inherit', the specified value is as
77+
explained in</ins> <a href="#value-def-inherit" ><ins>“The 'inherit' value.”</ins></a>
7678
<li>Otherwise, if the property is <a href="#inheritance">inherited</a> <ins>and the element is not the root of the</ins> <a><ins>document tree</ins></a>, use the <ins>computed</ins> value of the parent <del>element, generally the computed value.</del><ins>element.</ins>
7779
<li>Otherwise use the property's <a name="x1"><span class="index-def" title="initial value">initial value</span></a>. The initial value of each property is indicated in the property's definition.
7880
</ol>
@@ -97,10 +99,10 @@ <h3> <del>Since it has no parent, the root of the document tree cannot use value
9799
<del>described in</del><ins>'inherit'.</ins>
98100

99101
<p>The <del>property definition. 6.1.3 Actual values A</del>computed value <del>is in principle ready to be used, but a user agent may</del><ins>exists even when the property does</ins> not <del>be able to make use of</del><ins>apply, as
100-
defined by the</ins> <a href="about.html#applies-to"><ins>'Applies To'</ins></a> <ins>line.
102+
defined by</ins> the <a href="about.html#applies-to"><ins>'Applies To'</ins></a> <ins>line.
101103
However, some
102-
properties may define</ins> the <ins>computed</ins> value <del>in</del><ins>of</ins> a <del>given environment.</del><ins>property</ins> for <del>example, a user agent may only be able</del><ins>an element</ins>
103-
to <del>render borders with integer pixel widths and may therefore</del><ins>depend on whether the property applies to that element.</ins>
104+
properties may define the computed</ins> value <del>in</del><ins>of</ins> a <del>given environment.</del><ins>property</ins> for <del>example, a user agent may</del><ins>an element
105+
to depend on whether the property applies to that element.</ins>
104106

105107

106108
<h3><ins>6.1.3</ins> <span class="index-def" title="used value">
@@ -120,8 +122,8 @@ <h3><ins>6.1.4</ins> <span class="index-def" title="actual value">
120122

121123
<p><ins>A used value is in principle the value used for rendering, but a
122124
user agent may not be able to make use of the value in a given
123-
environment. For example, a user agent may only be able to render
124-
borders with integer pixel widths and may therefore</ins> have to
125+
environment. For example, a user agent may</ins> only be able to render
126+
borders with integer pixel widths and may therefore have to
125127
approximate the computed <del>width.</del><ins>width, or the user agent may be forced to
126128
use only black and white shades instead of full color.</ins> The actual
127129
value is the <del>computed</del><ins>used</ins> value after any approximations have been applied.
@@ -188,15 +190,15 @@ <h3>6.2.1 The <span class="index-def" title="inherit, definition
188190
value</h3>
189191

190192
<P>Each property may also have a <del>specified</del><ins>cascaded</ins> value of 'inherit', which
191-
means that, for a given element, the property takes the same <del>computed</del><ins>specified</ins>
192-
value as the property for the element's parent. The <del>inherited value, which is normally only used as a fallback value,</del><ins>'inherit' value</ins>
193-
can be <del>strengthened by setting 'inherit' explicitly. Example(s): In</del><ins>used to enforce inheritance of values, and it can also be used on
193+
means that, for a given element, the property takes <ins>as specified
194+
value</ins> the <del>same</del>computed value <del>as the property for</del><ins>of</ins> the element's parent. The <del>inherited value, which is normally only</del><ins>'inherit' value
195+
can be</ins> used <del>as a fallback value,</del><ins>to enforce inheritance of values, and it</ins> can <ins>also</ins> be <del>strengthened by setting</del><ins>used on
194196
properties that are not normally inherited.</ins>
195197

196-
<p><ins>If the 'inherit' value is set on the root element, the property is
198+
<p><ins>If the</ins> 'inherit' <del>explicitly.</del><ins>value is set on the root element, the property is
197199
assigned its initial value.</ins>
198200

199-
<div class="example"><P style="display:none"><ins>Example(s):</ins></P><P><ins>In</ins> the example below, the <a href="colors.html#propdef-color" class="noxref"><span
201+
<div class="example"><P style="display:none">Example(s):</P><P>In the example below, the <a href="colors.html#propdef-color" class="noxref"><span
200202
class="propinst-color">'color'</span></a> and <a href="colors.html#propdef-background" class="noxref"><span
201203
class="propinst-background">'background'</span></a> properties are set on
202204
the BODY element. On all other elements, the 'color' value will be
@@ -514,15 +516,15 @@ <H3>6.4.4 <a name="preshint">Precedence of non-CSS presentational hints</a></H3>
514516
<p><ins>The following user style sheet would override</ins> the <del>introduction</del><ins>font weight</ins> of
515517
<ins>'b' elements in all documents, and</ins> the <del>universal selector, which has a specificity</del><ins>color of 'font'
516518
elements with color attributes in XML documents. It would not affect
517-
the color of any 'font' elements with color attributes in HTML
519+
the color</ins> of <del>0.</del><ins>any 'font' elements with color attributes in HTML
518520
documents:</ins>
519521

520522
<pre>
521523
<ins>b { font-weight: normal; }
522524
font[color] { color: orange; }</ins>
523525
</pre>
524526

525-
<P><ins>The following, however, would override the color</ins> of <del>0.</del><ins>font elements in all documents:</ins>
527+
<P><ins>The following, however, would override the color of font elements in all documents:</ins>
526528

527529
<pre>
528530
<ins>font[color] { color: orange ! important; }</ins>

css2/diffs-wd/cascade.html

+4-2
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ <h3>6.1.1 <span class="index-def" title="specified value">
7373

7474
<ol>
7575
<li>If the <a href="#cascade">cascade</a> results in a value, use it.
76+
<ins>But if the cascade results in 'inherit', the specified value is as
77+
explained in</ins> <a href="#value-def-inherit" ><ins>“The 'inherit' value.”</ins></a>
7678
<li>Otherwise, if the property is <a href="#inheritance">inherited</a> and the element is not the root of the <a>document tree</a>, use the computed value of the parent element.
7779
<li>Otherwise use the property's <a name="x1"><span class="index-def" title="initial value">initial value</span></a>. The initial value of each property is indicated in the property's definition.
7880
</ol>
@@ -188,8 +190,8 @@ <h3>6.2.1 The <span class="index-def" title="inherit, definition
188190
value</h3>
189191

190192
<P>Each property may also have a cascaded value of 'inherit', which
191-
means that, for a given element, the property takes the same specified
192-
value as the property for the element's parent. The 'inherit' value
193+
means that, for a given element, the property takes <del>the same</del><ins>as</ins> specified
194+
value <del>as</del>the <del>property for</del><ins>computed value of</ins> the element's parent. The 'inherit' value
193195
can be used to enforce inheritance of values, and it can also be used on
194196
properties that are not normally inherited.
195197

0 commit comments

Comments
 (0)