Skip to content

Commit cd40f16

Browse files
fantasaifantasai
committed
[css3-cascade] Fix editorial issues found by Simon Sapin <http://www.w3.org/mid/50CB32D8.20402@kozea.fr>
1 parent a52667d commit cd40f16

2 files changed

Lines changed: 36 additions & 38 deletions

File tree

‎css3-cascade/Overview.html‎

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
<meta content="CSS Cascading and Inheritance Level 3" name=dcterms.title>
1313
<meta content=text name=dcterms.type>
14-
<meta content=2012-12-13 name=dcterms.issued>
14+
<meta content=2012-12-17 name=dcterms.issued>
1515
<meta content="http://dev.w3.org/csswg/css3-cascade/" name=dcterms.creator>
1616
<meta content=W3C name=dcterms.publisher>
17-
<meta content="http://www.w3.org/TR/2012/ED-css3-cascade-20121213/"
17+
<meta content="http://www.w3.org/TR/2012/ED-css3-cascade-20121217/"
1818
name=dcterms.identifier>
1919
<link href="../default.css" rel=stylesheet type="text/css">
2020
<link href="http://www.w3.org/StyleSheets/TR/W3C-ED.css" rel=stylesheet
@@ -27,14 +27,14 @@
2727

2828
<h1>CSS Cascading and Inheritance Level 3</h1>
2929

30-
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 13 December
30+
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 17 December
3131
2012</h2>
3232

3333
<dl>
3434
<dt>This version:
3535

3636
<dd><a
37-
href="http://www.w3.org/TR/2012/ED-css3-cascade-20121213/">http://www.w3.org/TR/2012/ED-css3-cascade-20121213/</a>
37+
href="http://www.w3.org/TR/2012/ED-css3-cascade-20121217/">http://www.w3.org/TR/2012/ED-css3-cascade-20121217/</a>
3838

3939
<dt>Latest version:
4040

@@ -273,10 +273,10 @@ <h2 id=at-import><span class=secno>2. </span> Importing style sheets: the
273273

274274
<p> So that user agents can avoid retrieving resources for unsupported
275275
media types, authors may specify media-dependent ‘<a
276-
href="#atimport"><code class=css>@import</code></a>’ rules. These <dfn
277-
id=conditional-imports
278-
title="conditional import|media-dependent import">conditional
279-
imports</dfn> specify comma-separated “media queries” after the URI.
276+
href="#atimport"><code class=css>@import</code></a>’ rules. Such
277+
media-dependent imports include a comma-separated list of “media
278+
queries” after the URI. The UA must import the style sheet only if the
279+
media query evaluates to true.
280280

281281
<div class=example>
282282
<p> The following rules illustrate how ‘<a href="#atimport"><code
@@ -332,8 +332,8 @@ <h2 id=shorthand><span class=secno>3. </span> Shorthand Properties</h2>
332332
class=property>font-weight</code>’, ‘<code
333333
class=property>font-size</code>’, ‘<code
334334
class=property>line-height</code>’, and ‘<code
335-
class=property>font-family</code>’ all at once. The multiple style
336-
rules of this example:
335+
class=property>font-family</code>’ all at once. The multiple
336+
declarations of this example:
337337

338338
<pre>
339339
h1 {
@@ -473,9 +473,9 @@ <h3 id=filter-declarations><span class=secno>4.1. </span> Filtering
473473
if necessary.)
474474
</ul>
475475

476-
<p> The remaining declarations form, for each property on each element, an
477-
unordered list of values. The next section, the cascade process, orders
478-
these lists.
476+
<p> The declarations that apply form, for each property on each element, a
477+
list of potential values. The next section, the cascade, prioritizes these
478+
lists.
479479

480480
<h3 id=cascade><span class=secno>4.2. </span> Cascading Declarations</h3>
481481

@@ -484,7 +484,7 @@ <h3 id=cascade><span class=secno>4.2. </span> Cascading Declarations</h3>
484484
below.
485485

486486
<p> User agents must sort declarations according to the following criteria,
487-
in descending order of importance:
487+
in descending order of priority:
488488

489489
<dl>
490490
<dt id=cascade-origin>Origin
@@ -791,11 +791,12 @@ <h2 id=value-stages><span class=secno>5. </span> Stages of Value
791791
Computation</h2>
792792

793793
<p> Once a user agent has parsed a document and constructed a document
794-
tree, it must assign, for every element in the tree, a value to every
795-
property that applies to the target media type.
794+
tree, it must assign, to every element in the tree, and correspondingly to
795+
every box in the formatting structure, a value to every property that
796+
applies to the target media type.
796797

797-
<p> The final value of a CSS3 property for a given element is the result of
798-
a four-step calculation:
798+
<p> The final value of a CSS3 property for a given element or box is the
799+
result of a four-step calculation:
799800

800801
<ul>
801802
<li> First, cascading and inheritance yields the <a
@@ -1104,8 +1105,8 @@ <h3 id=changes-2012><span class=secno>7.1. </span> Changes since the 15
11041105
<li>Resync'd spec against <a
11051106
href="http://www.w3.org/TR/CSS21/">CSS2.1</a>.
11061107

1107-
<li>Imported <a href="#value-stages">Stages of Value Computation</a>
1108-
section from old drafts of <a
1108+
<li>Imported and updated <a href="#value-stages">Stages of Value
1109+
Computation</a> section from old drafts of <a
11091110
href="http://www.w3.org/TR/css3-values/">CSS Values and Units</a>.
11101111

11111112
<li>Introduced <a href="#cascade-scope">scoping</a> per <a
@@ -1264,9 +1265,6 @@ <h2 class=no-num id=index>Index</h2>
12641265
<li>computed value, <a href="#computed-value"
12651266
title="section 5.2."><strong>5.2.</strong></a>
12661267

1267-
<li>conditional import, <a href="#conditional-imports"
1268-
title="section 2."><strong>2.</strong></a>
1269-
12701268
<li>‘<a href="#default-keyword"><code class=css>default</code></a>’,
12711269
<a href="#default-keyword"
12721270
title="section 4.3.3."><strong>4.3.3.</strong></a>
@@ -1297,9 +1295,6 @@ <h2 class=no-num id=index>Index</h2>
12971295
<li>initial value, <a href="#initial-value"
12981296
title="section 4.3.1."><strong>4.3.1.</strong></a>
12991297

1300-
<li>media-dependent import, <a href="#conditional-imports"
1301-
title="section 2."><strong>2.</strong></a>
1302-
13031298
<li>output of the cascade, <a href="#output-of-the-cascade"
13041299
title="section 4.2."><strong>4.2.</strong></a>
13051300

‎css3-cascade/Overview.src.html‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,9 @@ <h2 id="at-import">
108108

109109
<p>
110110
So that user agents can avoid retrieving resources for unsupported media types,
111-
authors may specify media-dependent ''@import'' rules.
112-
These <dfn title="conditional import|media-dependent import">conditional imports</dfn> specify comma-separated &ldquo;media queries&rdquo; after the URI.
111+
authors may specify media-dependent ''@import'' rules.
112+
Such media-dependent imports include a comma-separated list of &ldquo;media queries&rdquo; after the URI.
113+
The UA must import the style sheet only if the media query evaluates to true.
113114

114115
<div class=example>
115116
<p>
@@ -159,7 +160,8 @@ <h2 id='shorthand'>
159160
<div class='example'>
160161
<p>
161162
For example, the CSS 2.1 'font' property
162-
is a shorthand property for setting 'font-style', 'font-variant', 'font-weight', 'font-size', 'line-height', and 'font-family' all at once. The multiple style rules of this example:
163+
is a shorthand property for setting 'font-style', 'font-variant', 'font-weight', 'font-size', 'line-height', and 'font-family' all at once.
164+
The multiple declarations of this example:
163165

164166
<pre>
165167
h1 {
@@ -283,13 +285,12 @@ <h3 id='filter-declarations'>
283285
</ul>
284286

285287
<p>
286-
The remaining declarations form,
288+
The declarations that apply form,
287289
for each property on each element,
288-
an unordered list of values.
290+
a list of potential values.
289291
The next section,
290-
the cascade process,
291-
orders these lists.
292-
292+
the cascade,
293+
prioritizes these lists.
293294

294295
<h3 id='cascade'>
295296
Cascading Declarations</h3>
@@ -301,7 +302,7 @@ <h3 id='cascade'>
301302

302303
<p>
303304
User agents must sort declarations according to the following criteria,
304-
in descending order of importance:
305+
in descending order of priority:
305306

306307
<dl>
307308
<dt id='cascade-origin'>Origin
@@ -571,11 +572,13 @@ <h2 id="value-stages">
571572
<p>
572573
Once a user agent has parsed a document and constructed a document tree,
573574
it must assign,
574-
for every element in the tree,
575+
to every element in the tree,
576+
and correspondingly to every box in the formatting structure,
575577
a value to every property that applies to the target media type.
576578

577579
<p>
578-
The final value of a CSS3 property for a given element is the result of a four-step calculation:
580+
The final value of a CSS3 property for a given element or box
581+
is the result of a four-step calculation:
579582

580583
<ul>
581584
<li>
@@ -804,7 +807,7 @@ <h3 id="changes-2012">
804807
<ul>
805808
<li>Dropped alternate style sheets feature.
806809
<li>Resync'd spec against <a href="http://www.w3.org/TR/CSS21/">CSS2.1</a>.
807-
<li>Imported <a href="#value-stages">Stages of Value Computation</a> section
810+
<li>Imported and updated <a href="#value-stages">Stages of Value Computation</a> section
808811
from old drafts of <a href="http://www.w3.org/TR/css3-values/">CSS Values and Units</a>.
809812
<li>Introduced <a href="#cascade-scope">scoping</a> per <a href="http://www.w3.org/mid/4F570227.8060707@mit.edu">Boris Zbarsky's suggestion</a>.
810813
<li>Introduced ''default'' keyword.

0 commit comments

Comments
 (0)