[selectors-nonelement] Break up the grammar a bit more, for readability.

--HG--
extra : rebase_source : 1dae61e27d756c7e303302f9f66eab255ddb1b69

Author: tabatkins

selectors-nonelement/Overview.bs

@@ -41,7 +41,9 @@ Attribute node selector</h3>
 
 	<pre class='prod'>
 		<dfn selector>::attr()</dfn> = ::attr( <<namespace-attr>>? )
-		<dfn>&lt;namespace-attr></dfn> = [ [ <<ident>> | '*' ]? '|' ]? [ <<ident>> | '*' ]
+		<dfn>&lt;namespace-attr></dfn> = [ <<na-prefix>>? '|' ]? <<na-name>>
+		<dfn>&lt;na-prefix></dfn> = <<ident>> | '*'
+		<dfn>&lt;na-name></dfn> = <<ident>> | '*'
 	</pre>
 
 	No whitespace is allowed between the tokens of <<namespace-attr>>.
@@ -50,19 +52,19 @@ Attribute node selector</h3>
 	an optional prefix preceding a '|' character,
 	and an attribute name following it.
 
-	If the prefix is provided as an <<ident>>,
+	If the <<na-prefix>> is provided as an <<ident>>,
 	it must match a declared <a>namespace prefix</a>,
 	in which case the selector only matches attributes in that namespace;
 	if it doesn't match a declared <a>namespace prefix</a>,
 	the selector is invalid.
-	If the prefix is provided as a '*' character,
+	If the <<na-prefix>> is provided as a '*' character,
 	the selector matches attributes in any namespace.
-	If the prefix is omitted,
+	If the <<na-prefix>> is omitted,
 	the selector only matches attributes in no namespace.
 
-	If the attribute name is an <<ident>>,
+	If the <<na-name>> is an <<ident>>,
 	the selector matches attributes with that name.
-	If the attribute name is a '*' character,
+	If the <<na-name>> is a '*' character,
 	the selector matches any attribute.
 
 	If the <<namespace-attr>> is omitted entirely,

selectors-nonelement/Overview.html

@@ -154,27 +154,29 @@ <h3 class="heading settled heading" data-level=2.1 id=attribute-node-selector><s
 	Its syntax is:
 
 	<pre class=prod>  <dfn class=css-code data-dfn-type=selector data-export="" id=selectordef-attr>::attr()<a class=self-link href=#selectordef-attr></a></dfn> = ::attr( <a class="production css-code" data-link-type=type href=#typedef-namespace-attr title="<namespace-attr>">&lt;namespace-attr&gt;</a>? )
-  <dfn class=css-code data-dfn-type=type data-export="" id=typedef-namespace-attr>&lt;namespace-attr&gt;<a class=self-link href=#typedef-namespace-attr></a></dfn> = [ [ <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#ltident title="<ident>">&lt;ident&gt;</a> | '*' ]? '|' ]? [ <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#ltident title="<ident>">&lt;ident&gt;</a> | '*' ]
+  <dfn class=css-code data-dfn-type=type data-export="" id=typedef-namespace-attr>&lt;namespace-attr&gt;<a class=self-link href=#typedef-namespace-attr></a></dfn> = [ <a class="production css-code" data-link-type=type href=#typedef-na-prefix title="<na-prefix>">&lt;na-prefix&gt;</a>? '|' ]? <a class="production css-code" data-link-type=type href=#typedef-na-name title="<na-name>">&lt;na-name&gt;</a>
+  <dfn class=css-code data-dfn-type=type data-export="" id=typedef-na-prefix>&lt;na-prefix&gt;<a class=self-link href=#typedef-na-prefix></a></dfn> = <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#ltident title="<ident>">&lt;ident&gt;</a> | '*'
+  <dfn class=css-code data-dfn-type=type data-export="" id=typedef-na-name>&lt;na-name&gt;<a class=self-link href=#typedef-na-name></a></dfn> = <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#ltident title="<ident>">&lt;ident&gt;</a> | '*'
 </pre>
 <p>	No whitespace is allowed between the tokens of <a class="production css-code" data-link-type=type href=#typedef-namespace-attr title="<namespace-attr>">&lt;namespace-attr&gt;</a>.
 
 <p>	<a class="production css-code" data-link-type=type href=#typedef-namespace-attr title="<namespace-attr>">&lt;namespace-attr&gt;</a> is divided into two halves:
 	an optional prefix preceding a '|' character,
 	and an attribute name following it.
 
-<p>	If the prefix is provided as an <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#ltident title="<ident>">&lt;ident&gt;</a>,
+<p>	If the <a class="production css-code" data-link-type=type href=#typedef-na-prefix title="<na-prefix>">&lt;na-prefix&gt;</a> is provided as an <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#ltident title="<ident>">&lt;ident&gt;</a>,
 	it must match a declared <a data-link-type=dfn href=http://dev.w3.org/csswg/css-namespaces-1/#namespace-prefix title="namespace prefix">namespace prefix</a>,
 	in which case the selector only matches attributes in that namespace;
 	if it doesn’t match a declared <a data-link-type=dfn href=http://dev.w3.org/csswg/css-namespaces-1/#namespace-prefix title="namespace prefix">namespace prefix</a>,
 	the selector is invalid.
-	If the prefix is provided as a <a class=property data-link-type=propdesc title=*>*</a> character,
+	If the <a class="production css-code" data-link-type=type href=#typedef-na-prefix title="<na-prefix>">&lt;na-prefix&gt;</a> is provided as a <a class=property data-link-type=propdesc title=*>*</a> character,
 	the selector matches attributes in any namespace.
-	If the prefix is omitted,
+	If the <a class="production css-code" data-link-type=type href=#typedef-na-prefix title="<na-prefix>">&lt;na-prefix&gt;</a> is omitted,
 	the selector only matches attributes in no namespace.
 
-<p>	If the attribute name is an <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#ltident title="<ident>">&lt;ident&gt;</a>,
+<p>	If the <a class="production css-code" data-link-type=type href=#typedef-na-name title="<na-name>">&lt;na-name&gt;</a> is an <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#ltident title="<ident>">&lt;ident&gt;</a>,
 	the selector matches attributes with that name.
-	If the attribute name is a <a class=property data-link-type=propdesc title=*>*</a> character,
+	If the <a class="production css-code" data-link-type=type href=#typedef-na-name title="<na-name>">&lt;na-name&gt;</a> is a <a class=property data-link-type=propdesc title=*>*</a> character,
 	the selector matches any attribute.
 
 <p>	If the <a class="production css-code" data-link-type=type href=#typedef-namespace-attr title="<namespace-attr>">&lt;namespace-attr&gt;</a> is omitted entirely,
@@ -336,6 +338,8 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
 <li>::attr(), <a href=#selectordef-attr title="section 2.1">2.1</a>
 <li>attribute node selector, <a href=#attribute-node-selector0 title="section 2.1">2.1</a>
 <li>&lt;namespace-attr&gt;, <a href=#typedef-namespace-attr title="section 2.1">2.1</a>
+<li>&lt;na-name&gt;, <a href=#typedef-na-name title="section 2.1">2.1</a>
+<li>&lt;na-prefix&gt;, <a href=#typedef-na-prefix title="section 2.1">2.1</a>
 </ul></div>
 
 <h2 class="no-num no-ref heading settled heading" id=property-index><span class=content>