Skip to content

Commit ea7c37b

Browse files
tabatkinstabatkins
committed
Standardize the terminology for what stylesheets, at-rules, and style rules contain to all be their 'value'.
--HG-- extra : rebase_source : db92be14c1a63aa07f5ba997ec275bee5867d98d
1 parent c80e6a2 commit ea7c37b

2 files changed

Lines changed: 45 additions & 62 deletions

File tree

‎css3-syntax/Overview.html‎

Lines changed: 26 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2043,7 +2043,8 @@ <h3 id=tree-construction><span class=secno>3.6. </span> Tree Construction</h3>
20432043

20442044
<p> The input to the tree construction stage is a sequence of tokens from
20452045
the tokenization stage. The output is a tree of items with a stylesheet at
2046-
the root and all other nodes being at-rules or style rules.
2046+
the root and all other nodes being at-rules, style rules, or declarations.
2047+
20472048

20482049
<p> The construction of this stylesheet does not take into account
20492050
unrecognized items, like unknown properties or at-rules. It simply
@@ -2057,17 +2058,24 @@ <h3 id=tree-construction><span class=secno>3.6. </span> Tree Construction</h3>
20572058
<dl>
20582059
<dt>stylesheet
20592060

2060-
<dd> A stylesheet contains a list of at-rules and style rules.
2061+
<dd> A stylesheet has a value consisting of a list of at-rules and style
2062+
rules.
20612063

20622064
<dt>at-rule
20632065

20642066
<dd> An at-rule has a name, a prelude consisting of a list of primitives,
2065-
and possibly a rule block or declaration block.
2067+
and a value consisting of a list of at-rules, style rules, or
2068+
declarations.
20662069

20672070
<dt>style rule
20682071

20692072
<dd> A style rule has a selector consisting of a list of primitives, and a
2070-
declaration block.
2073+
value consisting of a list of at-rules or declarations.
2074+
2075+
<dt>declaration
2076+
2077+
<dd> A declaration has a name and a value consisting of a list of
2078+
primitives.
20712079

20722080
<dt>primitive
20732081

@@ -2092,19 +2100,7 @@ <h3 id=tree-construction><span class=secno>3.6. </span> Tree Construction</h3>
20922100
<dt>simple block
20932101

20942102
<dd> A simple block has an associated token (either a [, (, or { token)
2095-
and a value which is a list of primitives.
2096-
2097-
<dt>rule block
2098-
2099-
<dd> A rule block contains a list of at-rules or style rules.
2100-
2101-
<dt>declaration block
2102-
2103-
<dd> A declaration block contains a list of at-rules or declarations.
2104-
2105-
<dt>declaration
2106-
2107-
<dd> A declaration has a name and a value which is a list of primitives.
2103+
and a value consisting of a list of primitives.
21082104
</dl>
21092105

21102106
<div class=issue>
@@ -2219,9 +2215,8 @@ <h4 id=at-rule-mode><span class=secno>3.6.3. </span> <dfn
22192215

22202216
<dd> Pop the <a href="#current-rule"><i>current rule</i></a> from the <a
22212217
href="#stack-of-open-rules"><i>stack of open rules</i></a> and append it
2222-
to the list of rules for the new <a href="#current-rule"><i>current
2223-
rule</i></a>. <a
2224-
href="#switch-to-the-current-rules-content-mode0"><i>Switch to the
2218+
to the value of the new <a href="#current-rule"><i>current rule</i></a>.
2219+
<a href="#switch-to-the-current-rules-content-mode0"><i>Switch to the
22252220
current rule's content mode.</i></a>
22262221

22272222
<dt>{ token
@@ -2276,9 +2271,8 @@ <h4 id=rule-mode><span class=secno>3.6.4. </span> <dfn id=rule-mode0>Rule
22762271

22772272
<dd> Pop the <a href="#current-rule"><i>current rule</i></a> from the <a
22782273
href="#stack-of-open-rules"><i>stack of open rules</i></a>, and append it
2279-
to the list of rules for the new <a href="#current-rule"><i>current
2280-
rule</i></a>. <a
2281-
href="#switch-to-the-current-rules-content-mode0"><i>Switch to the
2274+
to the value of the new <a href="#current-rule"><i>current rule</i></a>.
2275+
<a href="#switch-to-the-current-rules-content-mode0"><i>Switch to the
22822276
current rule's content mode</i></a>.
22832277

22842278
<dt>at-keyword token
@@ -2290,7 +2284,7 @@ <h4 id=rule-mode><span class=secno>3.6.4. </span> <dfn id=rule-mode0>Rule
22902284

22912285
<dt>anything else
22922286

2293-
<dd> <i>Create a style rule</i> and push it onto the <a
2287+
<dd> Create a style rule and push it onto the <a
22942288
href="#stack-of-open-rules"><i>stack of open rules</i></a>. Switch to the
22952289
<a href="#style-rule-mode0"><i>style-rule mode</i></a>. Reprocess the <a
22962290
href="#current-input-token"><i>current input token</i></a>.
@@ -2440,21 +2434,20 @@ <h4 id=declaration-value-mode><span class=secno>3.6.8. </span> <dfn
24402434
<dt>semicolon token
24412435

24422436
<dd> Append the <a href="#current-declaration"><i>current
2443-
declaration</i></a> to the list of declarations for the <a
2437+
declaration</i></a> to the value of the <a
24442438
href="#current-rule"><i>current rule</i></a>. <a
24452439
href="#switch-to-the-current-rules-content-mode0"><i>Switch to the
24462440
current rule's content mode</i></a>.
24472441

24482442
<dt>} token
24492443

24502444
<dd> Append the <a href="#current-declaration"><i>current
2451-
declaration</i></a> to the list of declarations for the <a
2445+
declaration</i></a> to the value of the <a
24522446
href="#current-rule"><i>current rule</i></a>. Pop the <a
24532447
href="#current-rule"><i>current rule</i></a> from the <a
24542448
href="#stack-of-open-rules"><i>stack of open rules</i></a>, and append it
2455-
to the list of rules for the new <a href="#current-rule"><i>current
2456-
rule</i></a>. <a
2457-
href="#switch-to-the-current-rules-content-mode0"><i>Switch to the
2449+
to the value of the new <a href="#current-rule"><i>current rule</i></a>.
2450+
<a href="#switch-to-the-current-rules-content-mode0"><i>Switch to the
24582451
current rule's content mode</i></a>.
24592452

24602453
<dt>anything else
@@ -2483,21 +2476,20 @@ <h4 id=declaration-end-mode><span class=secno>3.6.9. </span> <dfn
24832476
<dt>semicolon token
24842477

24852478
<dd> Append the <a href="#current-declaration"><i>current
2486-
declaration</i></a> to the list of declarations for the <a
2479+
declaration</i></a> to the value of the <a
24872480
href="#current-rule"><i>current rule</i></a>. <a
24882481
href="#switch-to-the-current-rules-content-mode0"><i>Switch to the
24892482
current rule's content mode</i></a>.
24902483

24912484
<dt>} token
24922485

24932486
<dd> Append the <a href="#current-declaration"><i>current
2494-
declaration</i></a> to the list of declarations for the <a
2487+
declaration</i></a> to the value of the <a
24952488
href="#current-rule"><i>current rule</i></a>. Pop the <a
24962489
href="#current-rule"><i>current rule</i></a> from the <a
24972490
href="#stack-of-open-rules"><i>stack of open rules</i></a>, and append it
2498-
to the list of rules for the new <a href="#current-rule"><i>current
2499-
rule</i></a>. <a
2500-
href="#switch-to-the-current-rules-content-mode0"><i>Switch to the
2491+
to the value of the new <a href="#current-rule"><i>current rule</i></a>.
2492+
<a href="#switch-to-the-current-rules-content-mode0"><i>Switch to the
25012493
current rule's content mode</i></a>.
25022494

25032495
<dt>anything else

‎css3-syntax/Overview.src.html‎

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2040,7 +2040,7 @@ <h3>
20402040
The input to the tree construction stage is a sequence of tokens from the tokenization stage.
20412041
The output is a tree of items
20422042
with a stylesheet at the root
2043-
and all other nodes being at-rules or style rules.
2043+
and all other nodes being at-rules, style rules, or declarations.
20442044

20452045
<p>
20462046
The construction of this stylesheet does not take into account unrecognized items,
@@ -2055,19 +2055,24 @@ <h3>
20552055
<dl>
20562056
<dt>stylesheet
20572057
<dd>
2058-
A stylesheet contains a list of at-rules and style rules.
2058+
A stylesheet has a value consisting of a list of at-rules and style rules.
20592059

20602060
<dt>at-rule
20612061
<dd>
20622062
An at-rule has a name,
20632063
a prelude consisting of a list of primitives,
2064-
and possibly a rule block or declaration block.
2064+
and a value consisting of a list of at-rules, style rules, or declarations.
20652065

20662066
<dt>style rule</dt>
20672067
<dd>
20682068
A style rule has
20692069
a selector consisting of a list of primitives,
2070-
and a declaration block.
2070+
and a value consisting of a list of at-rules or declarations.
2071+
2072+
<dt>declaration
2073+
<dd>
2074+
A declaration has a name
2075+
and a value consisting of a list of primitives.
20712076

20722077
<dt>primitive
20732078
<dd>
@@ -2116,20 +2121,7 @@ <h3>
21162121
<dt>simple block
21172122
<dd>
21182123
A simple block has an associated token (either a [, (, or { token)
2119-
and a value which is a list of primitives.
2120-
2121-
<dt>rule block
2122-
<dd>
2123-
A rule block contains a list of at-rules or style rules.
2124-
2125-
<dt>declaration block
2126-
<dd>
2127-
A declaration block contains a list of at-rules or declarations.
2128-
2129-
<dt>declaration
2130-
<dd>
2131-
A declaration has a name
2132-
and a value which is a list of primitives.
2124+
and a value consisting of a list of primitives.
21332125
</dl>
21342126

21352127
<div class='issue'>
@@ -2245,13 +2237,12 @@ <h4>
22452237
<dt>semicolon token
22462238
<dd>
22472239
Pop the <i>current rule</i> from the <i>stack of open rules</i>
2248-
and append it to the list of rules for the new <i>current rule</i>.
2240+
and append it to the value of the new <i>current rule</i>.
22492241
<i>Switch to the current rule's content mode.</i>
22502242

22512243
<dt>{ token
22522244
<dd>
22532245
If the <i>current rule</i> is <i>rule-filled</i>,
2254-
22552246
switch to the <i>rule mode</i>.
22562247

22572248
<p>
@@ -2299,7 +2290,7 @@ <h4>
22992290
<dt>} token
23002291
<dd>
23012292
Pop the <i>current rule</i> from the <i>stack of open rules</i>,
2302-
and append it to the list of rules for the new <i>current rule</i>.
2293+
and append it to the value of the new <i>current rule</i>.
23032294
<i>Switch to the current rule's content mode</i>.
23042295

23052296
<dt>at-keyword token
@@ -2311,7 +2302,7 @@ <h4>
23112302

23122303
<dt>anything else
23132304
<dd>
2314-
<i>Create a style rule</i>
2305+
Create a style rule
23152306
and push it onto the <i>stack of open rules</i>.
23162307
Switch to the <i>style-rule mode</i>.
23172308
Reprocess the <i>current input token</i>.
@@ -2458,15 +2449,15 @@ <h4>
24582449
<dt>semicolon token
24592450
<dd>
24602451
Append the <i>current declaration</i>
2461-
to the list of declarations for the <i>current rule</i>.
2452+
to the value of the <i>current rule</i>.
24622453
<i>Switch to the current rule's content mode</i>.
24632454

24642455
<dt>} token
24652456
<dd>
24662457
Append the <i>current declaration</i>
2467-
to the list of declarations for the <i>current rule</i>.
2458+
to the value of the <i>current rule</i>.
24682459
Pop the <i>current rule</i> from the <i>stack of open rules</i>,
2469-
and append it to the list of rules for the new <i>current rule</i>.
2460+
and append it to the value of the new <i>current rule</i>.
24702461
<i>Switch to the current rule's content mode</i>.
24712462

24722463
<dt>anything else
@@ -2498,15 +2489,15 @@ <h4>
24982489
<dt>semicolon token
24992490
<dd>
25002491
Append the <i>current declaration</i>
2501-
to the list of declarations for the <i>current rule</i>.
2492+
to the value of the <i>current rule</i>.
25022493
<i>Switch to the current rule's content mode</i>.
25032494

25042495
<dt>} token
25052496
<dd>
25062497
Append the <i>current declaration</i>
2507-
to the list of declarations for the <i>current rule</i>.
2498+
to the value of the <i>current rule</i>.
25082499
Pop the <i>current rule</i> from the <i>stack of open rules</i>,
2509-
and append it to the list of rules for the new <i>current rule</i>.
2500+
and append it to the value of the new <i>current rule</i>.
25102501
<i>Switch to the current rule's content mode</i>.
25112502

25122503
<dt>anything else

0 commit comments

Comments
 (0)