Skip to content

Commit 0dea06e

Browse files
committed
More terminology: define 'selector' as it is used in the rest of the draft; define 'complex selector' and 'selector list' for where we need to be more specific
1 parent fb1ad8c commit 0dea06e

2 files changed

Lines changed: 21 additions & 11 deletions

File tree

selectors4/Overview.html

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ <h2 class="no-num no-toc" id=contents>Table of contents</h2>
155155
<li><a href="#logical-combination"><span class=secno>4. </span> Logical
156156
Combinations</a>
157157
<ul class=toc>
158-
<li><a href="#grouping"><span class=secno>4.1. </span> Selector Groups
158+
<li><a href="#grouping"><span class=secno>4.1. </span> Selector Lists
159159
</a>
160160

161161
<li><a href="#matches"><span class=secno>4.2. </span> The Matches-Any
@@ -801,8 +801,13 @@ <h2 id=syntax><span class=secno>3. </span> Selector Syntax</h2>
801801

802802
<h3 id=structure><span class=secno>3.1. </span> Structure and Terminology</h3>
803803

804-
<p>A <dfn id=selector>selector</dfn> is a chain of one or more <a
805-
href="#compound">compound selectors</a> separated by <a
804+
<p>The term <dfn id=selector>selector</dfn> can refer to a <i>simple
805+
selector</i>, <i>compound selector</i>, <a
806+
href="#complex-selector"><i>complex selector</i></a>, or <a
807+
href="#selector-list"><i>selector list</i></a>.
808+
809+
<p>A <dfn id=complex-selector>complex selector</dfn> is a chain of one or
810+
more <a href="#compound">compound selectors</a> separated by <a
806811
href="#combinators">combinators</a>.
807812

808813
<p>A <dfn id=compound-selector><a name=compound>compound selector</a></dfn>
@@ -924,13 +929,14 @@ <h3 id=invalid><span class=secno>3.5. </span> Invalid Selectors and Error
924929
<h2 id=logical-combination><span class=secno>4. </span> Logical
925930
Combinations</h2>
926931

927-
<h3 id=grouping><span class=secno>4.1. </span> Selector Groups</h3>
932+
<h3 id=grouping><span class=secno>4.1. </span> Selector Lists</h3>
928933

929934
<p>A comma-separated list of selectors represents the union of all elements
930-
selected by each of the individual selectors in the list. (A comma is
931-
U+002C.) For example, in CSS when several selectors share the same
932-
declarations, they may be grouped into a comma-separated list. White space
933-
may appear before and/or after the comma.
935+
selected by each of the individual selectors in the <dfn
936+
id=selector-list>selector list</dfn>. (A comma is U+002C.) For example, in
937+
CSS when several selectors share the same declarations, they may be
938+
grouped into a comma-separated list. White space may appear before and/or
939+
after the comma.
934940

935941
<div class=example>
936942
<p>CSS example:</p>

selectors4/Overview.src.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,10 @@ <h2 id=syntax>
419419
<h3 id=structure>
420420
Structure and Terminology</h2>
421421

422-
<p>A <dfn>selector</dfn> is a chain of one
422+
<p>The term <dfn>selector</dfn> can refer to a <i>simple selector</i>,
423+
<i>compound selector</i>, <i>complex selector</i>, or <i>selector list</i>.
424+
425+
<p>A <dfn>complex selector</dfn> is a chain of one
423426
or more <a href="#compound">compound selectors</a>
424427
separated by <a href="#combinators">combinators</a>.</p>
425428

@@ -535,10 +538,11 @@ <h2 id=logical-combination>
535538
Logical Combinations</h2>
536539

537540
<h3 id=grouping>
538-
Selector Groups</h2>
541+
Selector Lists</h2>
539542

540543
<p>A comma-separated list of selectors represents the union of all
541-
elements selected by each of the individual selectors in the list.
544+
elements selected by each of the individual selectors in the
545+
<dfn>selector list</dfn>.
542546
(A comma is U+002C.) For example, in CSS when several selectors share
543547
the same declarations, they may be grouped into a comma-separated
544548
list. White space may appear before and/or after the comma.</p>

0 commit comments

Comments
 (0)