Renamed 'style rule' to 'selector rule' to be more generic and avoid confusion with CSSStyleRule (since things like CSSKeyframeRule are also 'selector rules').

--HG--
extra : rebase_source : 19f9f7ce9aa98c76f1b3d89d63ad7707e57760a0

Author: tabatkins

css3-syntax/Overview.html

@@ -2043,8 +2043,8 @@ <h3 id=tree-construction><span class=secno>3.6. </span> Tree Construction</h3>
 
   <p> The input to the tree construction stage is a sequence of tokens from
    the tokenization stage. The output is a tree of items with a stylesheet at
-   the root and all other nodes being at-rules, style rules, or declarations.
-   
+   the root and all other nodes being at-rules, selector rules, or
+   declarations.
 
   <p> The construction of this stylesheet does not take into account
    unrecognized items, like unknown properties or at-rules. It simply
@@ -2058,19 +2058,19 @@ <h3 id=tree-construction><span class=secno>3.6. </span> Tree Construction</h3>
   <dl>
    <dt>stylesheet
 
-   <dd> A stylesheet has a value consisting of a list of at-rules and style
-    rules.
+   <dd> A stylesheet has a value consisting of a list of at-rules and
+    selector rules.
 
    <dt>at-rule
 
    <dd> An at-rule has a name, a prelude consisting of a list of primitives,
-    and a value consisting of a list of at-rules, style rules, or
+    and a value consisting of a list of at-rules, selector rules, or
     declarations.
 
-   <dt>style rule
+   <dt>selector rule
 
-   <dd> A style rule has a selector consisting of a list of primitives, and a
-    value consisting of a list of at-rules or declarations.
+   <dd> A selector rule has a selector consisting of a list of primitives,
+    and a value consisting of a list of at-rules or declarations.
 
    <dt>declaration
 
@@ -2111,7 +2111,7 @@ <h3 id=tree-construction><span class=secno>3.6. </span> Tree Construction</h3>
 
     <li> Make sure that I properly handle the case where the top element in
      the stack isn't a stylesheet, such as when parsing the
-     <code>style</code> attribute (there, the top element is a style rule,
+     <code>style</code> attribute (there, the top element is a selector rule,
      and we start by entering the declaration mode).
 
     <li> Handle the an+b production somehow. Maybe just define it in property
@@ -2154,9 +2154,10 @@ <h4 id=definitions0><span class=secno>3.6.1. </span> Definitions</h4>
    <dt><dfn id=rule-filled>rule-filled</dfn>
 
    <dd> An at-rule that takes a block, and within that block accepts at-rules
-    and/or style rules (or a close variant of style rules, like a keyframe
-    rule), is called <a href="#rule-filled"><i>rule-filled</i></a>. Examples
-    of <a href="#rule-filled"><i>rule-filled</i></a> at-rules are ‘<code
+    and/or selector rules (which encompasses more than just style rules, such
+    as keyframe rules), is called <a
+    href="#rule-filled"><i>rule-filled</i></a>. Examples of <a
+    href="#rule-filled"><i>rule-filled</i></a> at-rules are ‘<code
     class=css>@media</code>’ and ‘<code class=css>@keyframes</code>’.
 
    <dt><dfn id=declaration-filled>declaration-filled</dfn>
@@ -2199,7 +2200,7 @@ <h4 id=top-level-mode-><span class=secno>3.6.2. </span> <dfn
 
    <dt>anything else
 
-   <dd> <i>Create a style rule</i> and push it onto the <a
+   <dd> Create a selector rule and push it onto the <a
     href="#stack-of-open-rules"><i>stack of open rules</i></a>. Switch to the
     <a href="#selector-mode0"><i>selector mode</i></a>. Reprocess the <a
     href="#current-input-token"><i>current input token</i></a>.
@@ -2284,7 +2285,7 @@ <h4 id=rule-mode><span class=secno>3.6.4. </span> <dfn id=rule-mode0>Rule
 
    <dt>anything else
 
-   <dd> Create a style rule and push it onto the <a
+   <dd> Create a selector rule and push it onto the <a
     href="#stack-of-open-rules"><i>stack of open rules</i></a>. Switch to the
     <a href="#selector-mode0"><i>selector mode</i></a>. Reprocess the <a
     href="#current-input-token"><i>current input token</i></a>.
@@ -2718,9 +2719,10 @@ <h4 id=switch-to-the-current-rules-content-mode><span class=secno>3.6.15.
    rule's content mode</i></a>. It is invoked whenever a declaration or rule
    has been successfully completed, or when an error has finished recovery.
 
-  <p> If the <a href="#current-rule"><i>current rule</i></a> is a style rule
-   or a <a href="#declaration-filled"><i>declaration-filled</i></a> at-rule,
-   switch to the <a href="#declaration-mode0"><i>declaration mode</i></a>.
+  <p> If the <a href="#current-rule"><i>current rule</i></a> is a selector
+   rule or a <a href="#declaration-filled"><i>declaration-filled</i></a>
+   at-rule, switch to the <a href="#declaration-mode0"><i>declaration
+   mode</i></a>.
 
   <p> If the <a href="#current-rule"><i>current rule</i></a> is a <a
    href="#rule-filled"><i>rule-filled</i></a> at-rule, switch to the <a

css3-syntax/Overview.src.html

@@ -2040,7 +2040,7 @@ <h3>
 		The input to the tree construction stage is a sequence of tokens from the tokenization stage.
 		The output is a tree of items
 		with a stylesheet at the root
-		and all other nodes being at-rules, style rules, or declarations.
+		and all other nodes being at-rules, selector rules, or declarations.
 
 	<p>
 		The construction of this stylesheet does not take into account unrecognized items,
@@ -2055,17 +2055,17 @@ <h3>
 	<dl>
 		<dt>stylesheet
 		<dd>
-			A stylesheet has a value consisting of a list of at-rules and style rules.
+			A stylesheet has a value consisting of a list of at-rules and selector rules.
 
 		<dt>at-rule
 		<dd>
 			An at-rule has a name,
 			a prelude consisting of a list of primitives,
-			and a value consisting of a list of at-rules, style rules, or declarations.
+			and a value consisting of a list of at-rules, selector rules, or declarations.
 
-		<dt>style rule</dt>
+		<dt>selector rule</dt>
 		<dd>
-			A style rule has 
+			A selector rule has 
 			a selector consisting of a list of primitives,
 			and a value consisting of a list of at-rules or declarations.
 
@@ -2135,7 +2135,7 @@ <h3>
 			<li>
 				Make sure that I properly handle the case where the top element in the stack isn't a stylesheet,
 				such as when parsing the <code>style</code> attribute
-				(there, the top element is a style rule,
+				(there, the top element is a selector rule,
 				and we start by entering the declaration mode).
 
 			<li>
@@ -2178,8 +2178,8 @@ <h4>
 		<dt><dfn>rule-filled</dfn>
 		<dd>
 			An at-rule that takes a block,
-			and within that block accepts at-rules and/or style rules 
-			(or a close variant of style rules, like a keyframe rule),
+			and within that block accepts at-rules and/or selector rules 
+			(which encompasses more than just style rules, such as keyframe rules),
 			is called <i>rule-filled</i>.
 			Examples of <i>rule-filled</i> at-rules are ''@media'' and ''@keyframes''.
 
@@ -2221,7 +2221,7 @@ <h4>
 
 		<dt>anything else
 		<dd>
-			<i>Create a style rule</i>
+			Create a selector rule
 			and push it onto the <i>stack of open rules</i>.
 			Switch to the <i>selector mode</i>.
 			Reprocess the <i>current input token</i>.
@@ -2302,7 +2302,7 @@ <h4>
 
 		<dt>anything else
 		<dd>
-			Create a style rule
+			Create a selector rule
 			and push it onto the <i>stack of open rules</i>.
 			Switch to the <i>selector mode</i>.
 			Reprocess the <i>current input token</i>.
@@ -2724,7 +2724,7 @@ <h4>
 		or when an error has finished recovery.
 
 	<p>
-		If the <i>current rule</i> is a style rule or a <i>declaration-filled</i> at-rule,
+		If the <i>current rule</i> is a selector rule or a <i>declaration-filled</i> at-rule,
 		switch to the <i>declaration mode</i>.
 
 	<p>