Skip to content

Commit ea43cbf

Browse files
committed
[various][editorial] Update to the new parsing algo names and block production names.
1 parent 10d1cea commit ea43cbf

File tree

11 files changed

+26
-27
lines changed

11 files changed

+26
-27
lines changed

css-animations-1/Overview.bs

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ Declaring Keyframes</h2>
206206
defined as follows:
207207

208208
<pre>
209-
@keyframes = @keyframes <<keyframes-name>> { <<rule-list>> }
209+
@keyframes = @keyframes <<keyframes-name>> { <<qualified-rule-list>> }
210210

211211
<dfn>&lt;keyframes-name></dfn> = <<custom-ident>> | <<string>>
212212

css-cascade-5/Overview.bs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1612,7 +1612,7 @@ Assigning Styles Inline: the ''@layer'' block at-rule</h5>
16121612

16131613
<pre class='prod'>
16141614
@layer <<layer-name>>? {
1615-
<<stylesheet>>
1615+
<<rule-list>>
16161616
}
16171617
</pre>
16181618

css-cascade-6/Overview.bs

+3-3
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ Effects of ''@scope''</h4>
299299
The ''@scope'' [=at-rule=] has three primary effects
300300
on the [=style rules=] it contains:
301301

302-
* The [=style rules=] in an ''@scope'' <<stylesheet>>
302+
* The [=style rules=] in an ''@scope'' <<rule-list>>
303303
are [=scoped style rules=].
304304

305305
* The '':scope'' selector is defined to match
@@ -431,7 +431,7 @@ Syntax of ''@scope''</h4>
431431

432432
<pre class="prod def">
433433
@scope [(<<scope-start>>)]? [to (<<scope-end>>)]? {
434-
<<stylesheet>>
434+
<<rule-list>>
435435
}
436436
</pre>
437437

@@ -441,7 +441,7 @@ Syntax of ''@scope''</h4>
441441
used to identify the [=scoping root=](s).
442442
* <dfn><<scope-end>></dfn> is a <<forgiving-selector-list>> [=selector=]
443443
used to identify any [=scoping limits=].
444-
* the <<stylesheet>> represents the [=scoped style rules=].
444+
* the <<rule-list>> represents the [=scoped style rules=].
445445

446446
[=Pseudo-elements=] cannot be [=scoping roots=] or [=scoping limits=];
447447
they are invalid both within <<scope-start>> and <<scope-end>>.

css-conditional-3/Overview.bs

+5-5
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ at-media-dynamic-001.html
172172
<h2 id="contents-of">
173173
Contents of conditional group rules</h2>
174174

175-
All [=conditional group rules=] are defined to take a <<stylesheet>> in their block,
176-
which means they can accept any rule that is normally allowed at the top-level of a stylesheet,
175+
All [=conditional group rules=] are defined to take a <<rule-list>> in their block,
176+
and accept any rule that is normally allowed at the top-level of a stylesheet,
177177
and not otherwise restricted.
178178
(For example, an ''@import'' rule must appear at the actual beginning of a stylesheet,
179179
and so is not valid inside of another rule.)
@@ -187,7 +187,7 @@ at-media-content-003.html
187187
at-media-content-004.html
188188
</wpt>
189189

190-
Invalid or unknown rules inside the <<stylesheet>> must be considered invalid and ignored,
190+
Invalid or unknown rules inside the <<rule-list>> must be considered invalid and ignored,
191191
but do not invalidate the [=conditional group rule=].
192192

193193
<wpt title="Invalid rules do not invalidate conditional group rule.">
@@ -263,7 +263,7 @@ Its syntax is:
263263

264264
<pre class="prod def" nohighlight>
265265
@media <<media-query-list>> {
266-
<<stylesheet>>
266+
<<rule-list>>
267267
}
268268
</pre>
269269

@@ -346,7 +346,7 @@ The syntax of the ''@supports'' rule is:
346346

347347
<pre class="prod def" nohighlight>
348348
@supports <<supports-condition>> {
349-
<<stylesheet>>
349+
<<rule-list>>
350350
}
351351
</pre>
352352

css-conditional-5/Overview.bs

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Generalized Conditional Rules: the ''@when'' rule</h2>
128128

129129
<pre class=prod>
130130
@when <<boolean-condition>> {
131-
<<stylesheet>>
131+
<<rule-list>>
132132
}
133133
</pre>
134134

@@ -176,7 +176,7 @@ Chained Conditionals: the ''@else'' rule</h2>
176176

177177
<pre class=prod>
178178
@else <<boolean-condition>>? {
179-
<<stylesheet>>
179+
<<rule-list>>
180180
}
181181
</pre>
182182

css-contain-3/Overview.bs

+2-2
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ Container Queries: the ''@container'' rule</h3>
571571
is a [=conditional group rule=] whose condition contains
572572
a <dfn export>container query</dfn>,
573573
which is a boolean combination of [=container size queries=] and/or [=container style queries=].
574-
Style declarations within the <<stylesheet>> block of an ''@container'' rule
574+
Style declarations within the <<block-contents>> block of an ''@container'' rule
575575
are [[css-cascade-4#filtering|filtered]] by its condition
576576
to only match when the [=container query=]
577577
is true for their element’s [=query container=].
@@ -580,7 +580,7 @@ Container Queries: the ''@container'' rule</h3>
580580

581581
<pre class="prod def">
582582
@container <<container-condition>> {
583-
<<stylesheet>>
583+
<<block-contents>>
584584
}
585585
</pre>
586586

css-fonts-4/Overview.bs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5494,7 +5494,7 @@ mapping author-chosen human-friendly names
54945494
to feature indexes for the associated feature.
54955495

54965496
<pre class=prod>
5497-
@font-feature-values <<family-name>># { <<declaration-list>> }
5497+
@font-feature-values <<family-name>># { <<declaration-rule-list>> }
54985498
54995499
<<feature-value-block>> = <<font-feature-value-type>> { <<declaration-list>> }
55005500
@@ -5518,7 +5518,7 @@ If syntax errors occur within the <<family-name>> list,
55185518
the entire rule ''@font-feature-values'' rule is invalid
55195519
and must be ignored.
55205520

5521-
The ''@font-feature-values'' block accepts <<declaration-list>> as its contents;
5521+
The ''@font-feature-values'' block accepts <<declaration-rule-list>> as its contents;
55225522
these list items are either:
55235523

55245524
[=at-rules=] named by one of the <<font-feature-value-type>> at-keyword tokens,

css-nesting-1/Overview.bs

+3-2
Original file line numberDiff line numberDiff line change
@@ -622,8 +622,9 @@ Nesting Other At-Rules {#conditionals}
622622
can be nested inside of a [=style rule=] as well.
623623

624624
When nested in this way,
625-
the contents of a [=nested group rule=] are parsed as <<style-block>>
626-
rather than <<stylesheet>>:
625+
the contents of a [=nested group rule=]'s block
626+
are parsed as <<block-contents>>
627+
rather than <<rule-list>>:
627628

628629
* [=Style rules=] are [=nested style rules=],
629630
with their [=nesting selector=] taking its definition

css-page-3/Overview.bs

+1-1
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ pseudo-classes.</em>
637637
plus the additional rules noted below:
638638

639639
<pre class=prod>
640-
@page = @page <<page-selector-list>>? { <<declaration-list>> }
640+
@page = @page <<page-selector-list>>? { <<declaration-rule-list>> }
641641
<dfn><<page-selector-list>></dfn> = <<page-selector>>#
642642
<dfn><<page-selector>></dfn> = [ <<ident-token>>? <<pseudo-page>>* ]!
643643
<dfn><<pseudo-page>></dfn> = ':' [ left | right | first | blank ]

css-scoping-1/deferred-to-level-4.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ CSS Syntax for Scoping: the ''@scope'' rule</h4>
7575

7676
<pre class='prod'>
7777
@scope <<selector-list>> {
78-
<<stylesheet>>
78+
<<rule-list>>
7979
}
8080
</pre>
8181

8282
where the elements matched by the <<selector-list>>
83-
are <a>scoping roots</a> for the style rules in <<stylesheet>>,
83+
are <a>scoping roots</a> for the style rules in <<rule-list>>,
8484
and selectors of style rules scoped by ''@scope'' are
8585
<a>scope-contained</a> to their <a>scoping root</a>.
8686

@@ -89,7 +89,7 @@ CSS Syntax for Scoping: the ''@scope'' rule</h4>
8989
which could affect the optimization strategies for implementing scoped styles.
9090

9191
If multiple elements match the <<selector-list>>,
92-
the <<stylesheet>> is effectively duplicated
92+
the <<rule-list>> is effectively duplicated
9393
and scoped independently to each one.
9494
Authors should avoid using overly-generic selectors
9595
as it can have confusing interactions with the cascade.

cssom-1/Overview.bs

+3-5
Original file line numberDiff line numberDiff line change
@@ -1056,8 +1056,7 @@ The <dfn method for=CSSStyleSheet>replace(<a for=CSSRule>text</a>)</dfn> method
10561056
<li>Set the <a>disallow modification flag</a>.
10571057
<li><a>In parallel</a>, do these steps:
10581058
<ol>
1059-
<li>Let <var>rules</var> be the result of running <a>parse a list of rules</a> from <var>text</var>. If <var>rules</var> is
1060-
not a list of rules (i.e. an error occurred during parsing), set <var>rules</var> to an empty list.
1059+
<li>Let <var>rules</var> be the result of running <a>parse a stylesheet's contents</a> from <var>text</var>.
10611060
<li>If <var>rules</var> contains one or more <a>@import</a> rules, <a lt="remove a CSS rule">remove those rules</a> from <var>rules</var>.
10621061
<li>Set <var>sheet</var>'s <a>CSS rules</a> to <var>rules</var>.
10631062
<li>Unset <var>sheet</var>'s <a>disallow modification flag</a>.
@@ -1073,8 +1072,7 @@ To <dfn export>synchronously replace the rules of a CSSStyleSheet</dfn> on <var>
10731072
<ol>
10741073
<li>If the <a>constructed flag</a> is not set, or the <a>disallow modification flag</a> is set, throw a {{NotAllowedError}}
10751074
{{DOMException}}.
1076-
<li>Let <var>rules</var> be the result of running <a>parse a list of rules</a> from <var>text</var>. If <var>rules</var> is
1077-
not a list of rules (i.e. an error occurred during parsing), set <var>rules</var> to an empty list.
1075+
<li>Let <var>rules</var> be the result of running <a>parse a stylesheet's contents</a> from <var>text</var>.
10781076
<li>If <var>rules</var> contains one or more <a>@import</a> rules, <a lt="remove a CSS rule">remove those rules</a> from <var>rules</var>.
10791077
<li>Set <var>sheet</var>'s <a>CSS rules</a> to <var>rules</var>.
10801078
</ol>
@@ -2239,7 +2237,7 @@ the DOM a <a>CSS declaration block</a> is a
22392237
To <dfn export>parse a CSS declaration block</dfn> from a string <var>string</var>, follow these steps:
22402238

22412239
<ol>
2242-
<li>Let <var>declarations</var> be the return value of invoking <a>parse a list of declarations</a> with <var>string</var>.
2240+
<li>Let <var>declarations</var> be the returned declarations from invoking <a>parse a block's contents</a> with <var>string</var>.
22432241
<li>Let <var>parsed declarations</var> be a new empty list.
22442242
<li>For each item <var>declaration</var> in <var>declarations</var>, follow these substeps:
22452243
<ol>

0 commit comments

Comments
 (0)