Skip to content

Commit dcbd938

Browse files
committed
[css-syntax-3][editorial] Consistently switch to referring to "identifiers", not "names".
1 parent fa7a1d5 commit dcbd938

File tree

1 file changed

+22
-20
lines changed

1 file changed

+22
-20
lines changed

css-syntax-3/Overview.bs

+22-20
Original file line numberDiff line numberDiff line change
@@ -788,13 +788,13 @@ Definitions</h3>
788788
<dd>
789789
A <a>code point</a> with a value equal to or greater than U+0080 &lt;control>.
790790

791-
<dt><dfn export>name-start code point</dfn>
791+
<dt><dfn export lt="identifier-start code point | name-start code point" oldids="name-start-code-point">identifier-start code point</dfn>
792792
<dd>
793793
A <a>letter</a>,
794794
a <a>non-ASCII code point</a>,
795795
or U+005F LOW LINE (_).
796796

797-
<dt><dfn export>name code point</dfn>
797+
<dt><dfn export lt="identifier code point | name code point" oldids="name-code-point">identifier code point</dfn>
798798
<dd>
799799
A <a>name-start code point</a>,
800800
a <a>digit</a>,
@@ -821,13 +821,15 @@ Definitions</h3>
821821
<dt><dfn export>maximum allowed code point</dfn>
822822
<dd>The greatest <a>code point</a> defined by Unicode: U+10FFFF.
823823

824-
<dt><dfn export>identifier</dfn>
824+
<dt><dfn export lt="identifier | ident | CSS identifier | CSS ident" oldids="css-identifier">identifier</dfn>
825825
<dd>
826-
A portion of the CSS source that has the same syntax as an <<ident-token>>.
827-
Also appears in <<at-keyword-token>>,
828-
<<function-token>>,
829-
<<hash-token>> with the "id" type flag,
830-
and the unit of <<dimension-token>>.
826+
A sequence of [=code points=] that has the same syntax as an <<ident-token>>.
827+
828+
Note: The part of an <<at-keyword-token>> after the "@",
829+
the part of a <<hash-token>> (with the "id" type flag) after the "#",
830+
the part of a <<function-token>> before the "(",
831+
and the unit of a <<dimension-token>>
832+
are all [=identifiers=].
831833

832834
<dt><dfn>representation</dfn>
833835
<dd>
@@ -896,7 +898,7 @@ Consume a token</h4>
896898

897899
<dt>U+0023 NUMBER SIGN (#)
898900
<dd>
899-
If the <a>next input code point</a> is a <a>name code point</a>
901+
If the <a>next input code point</a> is an <a>identifier code point</a>
900902
or the <a lt="next input code point">next two input code points</a>
901903
<a>are a valid escape</a>,
902904
then:
@@ -910,7 +912,7 @@ Consume a token</h4>
910912
set the <<hash-token>>’s type flag to "id".
911913

912914
<li>
913-
<a>Consume a name</a>,
915+
<a>Consume an identifier</a>,
914916
and set the <<hash-token>>’s value to the returned string.
915917

916918
<li>
@@ -1011,7 +1013,7 @@ Consume a token</h4>
10111013
<dd>
10121014
If the <a lt="next input code point">next 3 input code points</a>
10131015
<a>would start an identifier</a>,
1014-
<a>consume a name</a>,
1016+
<a>consume an identifier</a>,
10151017
create an <<at-keyword-token>> with its value set to the returned value,
10161018
and return it.
10171019

@@ -1053,7 +1055,7 @@ Consume a token</h4>
10531055
<a>consume a numeric token</a>,
10541056
and return it.
10551057

1056-
<dt><a>name-start code point</a>
1058+
<dt><a>identifier-start code point</a>
10571059
<dd>
10581060
<a>Reconsume the current input code point</a>,
10591061
<a>consume an ident-like token</a>,
@@ -1105,7 +1107,7 @@ Consume a numeric token</h4>
11051107
<li>Create a <<dimension-token>> with the same value and type flag as |number|,
11061108
and a unit set initially to the empty string.
11071109

1108-
<li><a>Consume a name</a>.
1110+
<li><a>Consume an identifier</a>.
11091111
Set the <<dimension-token>>’s unit to the returned value.
11101112

11111113
<li>Return the <<dimension-token>>.
@@ -1128,7 +1130,7 @@ Consume an ident-like token</h4>
11281130
This section describes how to <dfn>consume an ident-like token</dfn> from a stream of <a>code points</a>.
11291131
It returns an <<ident-token>>, <<function-token>>, <<url-token>>, or <<bad-url-token>>.
11301132

1131-
<a>Consume a name</a>, and let |string| be the result.
1133+
<a>Consume an identifier</a>, and let |string| be the result.
11321134

11331135
If |string|’s value is an <a>ASCII case-insensitive</a> match for "url",
11341136
and the <a>next input code point</a> is U+0028 LEFT PARENTHESIS ((),
@@ -1362,13 +1364,13 @@ Check if three code points would start an identifier</dfn></h4>
13621364
<dl>
13631365
<dt>U+002D HYPHEN-MINUS
13641366
<dd>
1365-
If the second <a>code point</a> is a <a>name-start code point</a>
1367+
If the second <a>code point</a> is an <a>identifier-start code point</a>
13661368
or a U+002D HYPHEN-MINUS,
13671369
or the second and third <a>code points</a> <a>are a valid escape</a>,
13681370
return true.
13691371
Otherwise, return false.
13701372

1371-
<dt><a>name-start code point</a>
1373+
<dt><a>identifier-start code point</a>
13721374
<dd>
13731375
Return true.
13741376

@@ -1433,9 +1435,9 @@ Check if three code points would start a number</h4>
14331435

14341436

14351437
<h4 id="consume-name">
1436-
Consume a name</h4>
1438+
Consume an identifier</h4>
14371439

1438-
This section describes how to <dfn>consume a name</dfn> from a stream of <a>code points</a>.
1440+
This section describes how to <dfn>consume an identifier</dfn> from a stream of <a>code points</a>.
14391441
It returns a string containing
14401442
the largest name that can be formed from adjacent <a>code points</a> in the stream, starting from the first.
14411443

@@ -1450,7 +1452,7 @@ Consume a name</h4>
14501452
Repeatedly consume the <a>next input code point</a> from the stream:
14511453

14521454
<dl>
1453-
<dt><a>name code point</a>
1455+
<dt><a>identifier code point</a>
14541456
<dd>
14551457
Append the <a>code point</a> to <var>result</var>.
14561458

@@ -3695,7 +3697,7 @@ Changes from CSS 2.1 and Selectors Level 3</h3>
36953697
The definition of <a>non-ASCII code point</a> was changed
36963698
to be consistent with every definition of ASCII.
36973699
This affects <a>code points</a> U+0080 to U+009F,
3698-
which are now <a>name code points</a> rather than <<delim-token>>s,
3700+
which are now <a>identifier code points</a> rather than <<delim-token>>s,
36993701
like the rest of <a>non-ASCII code points</a>.
37003702

37013703
<li>

0 commit comments

Comments
 (0)