8000 [css-*] Replace s/rule ?set/style rule/, except in grammars. · w3c/csswg-drafts@24ffe66 · GitHub
Skip to content

Commit 24ffe66

Browse files
SimonSapinSimonSapin
committed
[css-*] Replace s/rule ?set/style rule/, except in grammars.
Having three names for the same concept is silly. "Rule set" is confusing as it implies multiple rules, while it in fact refers to a single rule. CSS OM and other specs already use "style rule". This changes "rule set" and "ruleset" to "style rule", except when used in a grammar. (The normative definiton of the Core Grammar is in 2.1 which is harder to change.) This is missing a few changes in css-fonts, since its source is not version-controlled in this repository.
1 parent 7d9e9d2 commit 24ffe66

16 files changed

Lines changed: 265 additions & 243 deletions

File tree

‎css-cascade/Overview.html‎

100755100644
Lines changed: 31 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
rel=dcterms.rights>
1010
<meta content="CSS Cascading and Inheritance Level 3" name=dcterms.title>
1111
<meta content=text name=dcterms.type>
12-
<meta content=2013-05-01 name=dcterms.date>
12+
<meta content=2013-06-08 name=dcterms.date>
1313
<meta content="Håkon Wium Lie" name=dcterms.creator>
1414
<meta content="Elika J. Etemad" name=dcterms.creator>
1515
<meta content="Tab Atkins Jr." name=dcterms.creator>
@@ -28,11 +28,11 @@
2828

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

31-
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 1 May 2013</h2>
31+
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 8 June 2013</h2>
3232

3333
<dl><!--
3434
<dt>This version:
35-
<dd><a href="http://dev.w3.org/csswg/css3-cascade/">http://www.w3.org/TR/2013/WD-css3-cascade-20130501/</a>
35+
<dd><a href="http://dev.w3.org/csswg/css3-cascade/">http://www.w3.org/TR/2013/WD-css3-cascade-20130608/</a>
3636
-->
3737

3838
<dt>Latest version:
@@ -260,24 +260,21 @@ <h2 id=introduction><span class=secno>1. </span>Introduction</h2>
260260
rel=biblioentry>[CSS3PAGE]<!--{{CSS3PAGE}}--></a>.
261261

262262
<h2 id=at-import><span class=secno>2. </span> Importing style sheets: the
263-
‘<a href="#lsquoatimportrsquo"><code class=css>@import</code></a>’
264-
rule</h2>
265-
266-
<p> The <dfn id=lsquoatimportrsquo>‘<code
267-
class=css>@import</code>’</dfn> rule allows users to import style rules
268-
from other style sheets. Any ‘<a href="#lsquoatimportrsquo"><code
269-
class=css>@import</code></a>’ rules must follow all ‘<code
270-
class=css>@charset</code>’ rules and precede all other at-rules and rule
271-
sets in a style sheet. The ‘<a href="#lsquoatimportrsquo"><code
272-
class=css>@import</code></a>’ keyword must be followed by the URI of the
273-
style sheet to include. A string is also allowed; it will be interpreted
274-
as if it had url(…) around it.
263+
‘<a href="#atimport"><code class=css>@import</code></a>’ rule</h2>
264+
265+
<p> The <dfn id=atimport>‘<code class=css>@import</code>’</dfn> rule
266+
allows users to import style rules from other style sheets. Any ‘<a
267+
href="#atimport"><code class=css>@import</code></a>’ rules must follow
268+
all ‘<code class=css>@charset</code>’ rules and precede all other
269+
at-rules and style rules in a style sheet. The ‘<a
270+
href="#atimport"><code class=css>@import</code></a>’ keyword must be
271+
followed by the URI of the style sheet to include. A string is also
272+
allowed; it will be interpreted as if it had url(…) around it.
275273

276274
<div class=example>
277275
<p> The following lines are equivalent in meaning and illustrate both
278-
‘<a href="#lsquoatimportrsquo"><code class=css>@import</code></a>’
279-
syntaxes (one with ‘<code class=css>url()</code>’ and one with a bare
280-
string):
276+
‘<a href="#atimport"><code class=css>@import</code></a>’ syntaxes
277+
(one with ‘<code class=css>url()</code>’ and one with a bare string):
281278

282279
<pre><!--
283280
-->@import "mystyle.css";
@@ -287,18 +284,17 @@ <h2 id=at-import><span class=secno>2. </span> Importing style sheets: the
287284

288285
<p> So that user agents can avoid retrieving resources for unsupported
289286
media types, authors may specify media-dependent ‘<a
290-
href="#lsquoatimportrsquo"><code class=css>@import</code></a>’ rules.
291-
Such media-dependent imports include a comma-separated list of “media
287+
href="#atimport"><code class=css>@import</code></a>’ rules. Such
288+
media-dependent imports include a comma-separated list of “media
292289
queries” after the URI. In the absence of any media query, the import is
293290
unconditional. (Specifying ‘<a href="#all"><code
294291
class=css>all</code></a>’ for the medium has the same effect.) The UA
295292
must import the style sheet if (and only if) the media condition evaluates
296293
to true.
297294

298295
<div class=example>
299-
<p> The following rules illustrate how ‘<a
300-
href="#lsquoatimportrsquo"><code class=css>@import</code></a>’ rules
301-
can be made media-dependent:
296+
<p> The following rules illustrate how ‘<a href="#atimport"><code
297+
class=css>@import</code></a>’ rules can be made media-dependent:
302298

303299
<pre><!--
304300
-->@import url("fineprint.css") print;
@@ -485,7 +481,7 @@ <h3 id=filter-declarations><span class=secno>4.1. </span> Filtering
485481
rel=biblioentry>[CSS3-CONDITIONAL]<!--{{!CSS3-CONDITIONAL}}--></a> with a
486482
false condition.
487483

488-
<li> It belongs to a ruleset whose selector matches the element. <a
484+
<li> It belongs to a style rule whose selector matches the element. <a
489485
href="#SELECT" rel=biblioentry>[SELECT]<!--{{!SELECT}}--></a> (Taking <a
490486
href="http://www.w3.org/TR/selectors4/#scoping">scoping</a> into account,
491487
if necessary.)
@@ -590,22 +586,22 @@ <h3 id=cascade><span class=secno>4.2. </span> Cascading Declarations</h3>
590586
<dd> The <a href="http://www.w3.org/TR/selectors/#specificity">Selectors
591587
module</a> <a href="#SELECT"
592588
rel=biblioentry>[SELECT]<!--{{!SELECT}}--></a> describes how to compute
593-
the specificity of a selector. For the purpose of this step, a ruleset
589+
the specificity of a selector. For the purpose of this step, a style rule
594590
without a selector (such as the <a
595591
href="http://www.w3.org/TR/css-style-attr/#interpret">contents of a style
596592
attribute</a>) is considered to have a specificity higher than any
597-
selector. The declaration belonging to a ruleset whose selector has the
598-
highest specificity wins.
593+
selector. The declaration belonging to a style rule whose selector has
594+
the highest specificity wins.
599595

600596
<dt id=cascade-order>Order of appearance.
601597

602598
<dd> Rules from imported style sheets are treated as if their stylesheets
603-
were substituted in place of the ‘<a href="#lsquoatimportrsquo"><code
599+
were substituted in place of the ‘<a href="#atimport"><code
604600
class=css>@import</code></a>’ rule. Stylesheets independently linked by
605601
the originating document are treated as if they were concatenated in
606602
linking order, as determined by the host document language. Style
607-
attributes are treated as if their rulesets were concatenated in document
608-
order, after any stylesheets. The last declaration wins.
603+
attributes are treated as if their style rules were concatenated in
604+
document order, after any stylesheets. The last declaration wins.
609605
</dl>
610606

611607
<p> The <dfn id=output-of-the-cascade>output of the cascade</dfn> is a
@@ -1202,10 +1198,10 @@ <h3 class=no-num id=normative-references>Normative references</h3>
12021198
<dt id=CSS3-CONDITIONAL>[CSS3-CONDITIONAL]
12031199

12041200
<dd>L. David Baron. <a
1205-
href="http://www.w3.org/TR/2012/WD-css3-conditional-20121213/"><cite>CSS
1206-
Conditional Rules Module Level 3.</cite></a> 13 December 2012. W3C
1207-
Working Draft. (Work in progress.) URL: <a
1208-
href="http://www.w3.org/TR/2012/WD-css3-conditional-20121213/">http://www.w3.org/TR/2012/WD-css3-conditional-20121213/</a>
1201+
href="http://www.w3.org/TR/2013/CR-css3-conditional-20130404/"><cite>CSS
1202+
Conditional Rules Module Level 3.</cite></a> 4 April 2013. W3C Candidate
1203+
Recommendation. (Work in progress.) URL: <a
1204+
href="http://www.w3.org/TR/2013/CR-css3-conditional-20130404/">http://www.w3.org/TR/2013/CR-css3-conditional-20130404/</a>
12091205
</dd>
12101206
<!---->
12111207

@@ -1327,7 +1323,7 @@ <h2 class=no-num id=index>Index</h2>
13271323
<li>‘<code class=css>default</code>’, <a href="#default-keyword"
13281324
title="section 4.3.3."><strong>4.3.3.</strong></a>
13291325

1330-
<li>‘<code class=css>@import</code>’, <a href="#lsquoatimportrsquo"
1326+
<li>‘<code class=css>@import</code>’, <a href="#atimport"
13311327
title="section 2."><strong>2.</strong></a>
13321328

13331329
<li>‘<code class=css>inherit</code>’, <a href="#inherit-keyword"

‎css-cascade/Overview.src.html‎

100755100644
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ <h2 id="at-import">
9696
<p>
9797
The <dfn>''@import''</dfn> rule allows users to import style rules from other style sheets.
9898
Any ''@import'' rules must follow all ''@charset'' rules
99-
and precede all other at-rules and rule sets in a style sheet.
99+
and precede all other at-rules and style rules in a style sheet.
100100
The ''@import'' keyword must be followed by the URI of the style sheet to include.
101101
A string is also allowed;
102102
it will be interpreted as if it had url(&hellip;) around it.
@@ -288,7 +288,7 @@ <h3 id='filter-declarations'>
288288
It is not qualified by a conditional rule [[!CSS3-CONDITIONAL]] with a false condition.
289289

290290
<li>
291-
It belongs to a ruleset whose selector matches the element. [[!SELECT]]
291+
It belongs to a style rule whose selector matches the element. [[!SELECT]]
292292
(Taking <a href="http://www.w3.org/TR/selectors4/#scoping">scoping</a> into account, if necessary.)
293293
</ul>
294294

@@ -378,18 +378,18 @@ <h3 id='cascade'>
378378
<dd>
379379
The <a href="http://www.w3.org/TR/selectors/#specificity">Selectors module</a> [[!SELECT]] describes how to compute the specificity of a selector.
380380
For the purpose of this step,
381-
a ruleset without a selector
381+
a style rule without a selector
382382
(such as the <a href="http://www.w3.org/TR/css-style-attr/#interpret">contents of a style attribute</a>)
383383
is considered to have a specificity higher than any selector.
384-
The declaration belonging to a ruleset whose selector has the highest specificity wins.
384+
The declaration belonging to a style rule whose selector has the highest specificity wins.
385385

386386

387387
<dt id='cascade-order'>Order of appearance.
388388
<dd>
389389
Rules from imported style sheets are treated as if their stylesheets were substituted in place of the ''@import'' rule.
390390
Stylesheets independently linked by the originating document are treated as if they were concatenated in linking order,
391391
as determined by the host document language.
392-
Style attributes are treated as if their rulesets were concatenated in document order, after any stylesheets.
392+
Style attributes are treated as if their style rules were concatenated in document order, after any stylesheets.
393393
The last declaration wins.
394394
</dl>
395395

‎css-conditional/Overview.html‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
rel=dcterms.rights>
1313
<meta content="CSS Conditional Rules Module Level 3" name=dcterms.title>
1414
<meta content=text name=dcterms.type>
15-
<meta content=2013-06-03 name=dcterms.date>
15+
<meta content=2013-06-08 name=dcterms.date>
1616
<meta content="L. David Baron" name=dcterms.creator>
1717
<meta content=W3C name=dcterms.publisher>
1818
<meta content="http://dev.w3.org/csswg/css3-conditional/"
@@ -33,14 +33,14 @@
3333
<h1 class=p-name>CSS Conditional Rules Module Level 3</h1>
3434

3535
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft <span
36-
class=dt-updated><span class=value-title title=20130603>3 June
36+
class=dt-updated><span class=value-title title=20130608> 8 June
3737
2013</span></span></h2>
3838

3939
<dl>
4040
<dt>This version:
4141

4242
<dd><a class=u-url href="http://dev.w3.org/csswg/css3-conditional/">
43-
http://www.w3.org/TR/2013/ED-css3-conditional-20130603/</a>
43+
http://www.w3.org/TR/2013/ED-css3-conditional-20130608/</a>
4444

4545
<dt>Latest version:
4646

@@ -300,7 +300,7 @@ <h3 id=context><span class=secno>1.1. </span>Background</h3>
300300

301301
<p><a href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a> defines
302302
one type of conditional group rule, the ‘<code
303-
class=css>@media</code>’ rule, and allows only rulesets (not other
303+
class=css>@media</code>’ rule, and allows only style rules (not other
304304
@-rules) inside of it. The ‘<code class=css>@media</code>’ rule
305305
provides the ability to have media-specific style sheets, which is also
306306
provided by style sheet linking features such as ‘<code
@@ -441,17 +441,20 @@ <h2 id=contents-of><span class=secno>3. </span>Contents of conditional
441441
rule body</dfn>, which is a block (pair of braces) containing a sequence
442442
of rules.
443443

444-
<p>A group rule body is allowed to contain rulesets and any @-rules that
445-
are allowed at the top level of a style sheet before and after a ruleset.
446-
This means that @-rules that must occur at the beginning of the style
447-
sheet (such as ‘<code class=css>@charset</code>’, ‘<code
444+
<p>A group rule body is allowed to contain style rules and any @-rules that
445+
are allowed at the top level of a style sheet before and after a style
446+
rule. This means that @-rules that must occur at the beginning of the
447+
style sheet (such as ‘<code class=css>@charset</code>’, ‘<code
448448
class=css>@import</code>’, and ‘<code class=css>@namespace</code>’
449449
rules) are not allowed inside of conditional group rules. Conditional
450450
group rules can be nested.
451451

452452
<p>In terms of the grammar, this specification defines the following
453453
498A productions for use in the grammar of conditional group rules:
454454

455+
<p class=note>Note: Style rules are defined in grammars by the
456+
<code>ruleset</code> production.
457+
455458
<pre><dfn id="nested_statement">nested_statement</dfn>
456459
: ruleset | <a
457460
href="#media"><i>media</i></a> | page | font_face_rule | keyframes_rule |
@@ -500,7 +503,7 @@ <h2 id=use><span class=secno>4. </span>Placement of conditional group rules</h2>
500503
<strong>must</strong> process such rules as <a
501504
href="#processing">described above</a>.
502505

503-
<p>Any rules that are not allowed after a ruleset (e.g., ‘<code
506+
<p>Any rules that are not allowed after a style rule (e.g., ‘<code
504507
class=css>@charset</code>’, ‘<code class=css>@import</code>’, or
505508
‘<code class=css>@namespace</code>’ rules) are also not allowed after
506509
a conditional group rule. Therefore, style sheets <strong>must
@@ -950,9 +953,9 @@ <h3 id=support-definition><span class=secno>6.1. </span>Definition of
950953
the ‘<code class=css>@supports</code>’ rule in this specification)
951954
that works correctly for the features implemented. This applies especially
952955
to compound values; implementations must implement all parts of the value
953-
in order to consider the declaration supported, either inside a ruleset or
954-
in the declaration condition of an ‘<code class=css>@supports</code>’
955-
rule.</p>
956+
in order to consider the declaration supported, either inside a style rule
957+
or in the declaration condition of an ‘<code
958+
class=css>@supports</code>’ rule.</p>
956959
<!--
957960
<h2 id="at-document">Document queries: the '@document' rule</h2>
958961

‎css-conditional/Overview.src.html‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<link href="../csslogo.ico" rel="shortcut icon" type="image/x-icon">
99
<link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/W3C-[STATUS].css">
1010
<script src="http://test.csswg.org/harness/annotate.js#CSS3-CONDITIONAL_DEV"
11-
type="text/javascript" defer></script
11+
type="text/javascript" defer></script>
1212
</head>
1313
<body class="h-entry">
1414

@@ -131,7 +131,7 @@ <h3 id="context">Background</h3>
131131
<p><em>This section is not normative.</em>
132132

133133
<p>[[!CSS21]] defines one type of conditional group rule, the
134-
'@media' rule, and allows only rulesets (not other @-rules)
134+
'@media' rule, and allows only style rules (not other @-rules)
135135
inside of it. The '@media' rule provides the ability to
136136
have media-specific style sheets, which is also provided by style
137137
sheet linking features such as '@import' and
@@ -258,16 +258,19 @@ <h2 id="contents-of">Contents of conditional group rules</h2>
258258
specific to the type of rule followed by a <dfn>group rule body</dfn>,
259259
which is a block (pair of braces) containing a sequence of rules.</p>
260260

261-
<p>A group rule body is allowed to contain rulesets and any @-rules that
261+
<p>A group rule body is allowed to contain style rules and any @-rules that
262262
are allowed at the top level of a style sheet before and after a
263-
ruleset. This means that @-rules that must occur at the beginning of
263+
style rule. This means that @-rules that must occur at the beginning of
264264
the style sheet (such as '@charset', '@import',
265265
and '@namespace' rules) are not allowed inside of conditional group
266266
rules. Conditional group rules can be nested.</p>
267267

268268
<p>In terms of the grammar, this specification defines the following
269269
productions for use in the grammar of conditional group rules:</p>
270270

271+
<p class=note>Note: Style rules are defined in grammars
272+
by the <code>ruleset</code> production.</p>
273+
271274
<pre><dfn>nested_statement</dfn>
272275
: ruleset | <i>media</i> | page | font_face_rule | keyframes_rule |
273276
<i>supports_rule</i>
@@ -308,7 +311,7 @@ <h2 id="use">Placement of conditional group rules</h2>
308311
<strong>must</strong> process such rules as <a
309312
href="#processing">described above</a>.</p>
310313

311-
<p>Any rules that are not allowed after a ruleset (e.g., ''@charset'',
314+
<p>Any rules that are not allowed after a style rule (e.g., ''@charset'',
312315
''@import'', or ''@namespace'' rules) are also not allowed after a
313316
conditional group rule. Therefore, style sheets <strong>must
314317
not</strong> place such rules after a conditional group rules, and CSS
@@ -676,7 +679,7 @@ <h3 id="support-definition">Definition of support</h3>
676679
provided by the ''@supports'' rule in this specification) that works
677680
correctly for the features implemented. This applies especially to
678681
compound values; implementations must implement all parts of the value
679-
in order to consider the declaration supported, either inside a ruleset
682+
in order to consider the declaration supported, either inside a style rule
680683
or in the declaration condition of an ''@supports'' rule.</p>
681684

682685
<!--

0 commit comments

Comments
 (0)