[css-conditional] use standard whitespace convention for grammar terms again

This reverts the remainder of
https://hg.csswg.org/drafts/rev/34b185ae3bac
which was partially reverted in
https://hg.csswg.org/drafts/rev/3091bbbdc67a

This revert restores this grammar to follow the standard convention that
all terms consume the whitespace at their end.  When there was mandatory
whitespace around 'and', 'or', and 'not' in supports conditions, we
couldn't follow that convention because the mandatory whitespace might
be consumed as part of a term in which the whitespace was optional.  But
now that there is no more mandatory whitespace, we should follow the
usual convention.

I made the edits manually, and then checked that it matched the state of
the grammar before the initial change (which it does).

Author: dbaron

css-conditional/Overview.bs

@@ -312,7 +312,7 @@ by adding:</p>
 
 <pre>
 <dfn>supports_rule</dfn>
-  : <a>SUPPORTS_SYM</a> <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>supports_condition</a> <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>group_rule_body</a>
+  : <a>SUPPORTS_SYM</a> <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>supports_condition</a> <a>group_rule_body</a>
   ;
 
 <dfn>supports_condition</dfn>
@@ -321,7 +321,7 @@ by adding:</p>
   ;
 
 <dfn>supports_condition_in_parens</dfn>
-  : ( '(' <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>supports_condition</a> <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* ')' ) | <a>supports_declaration_condition</a> |
+  : ( '(' <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>supports_condition</a> ')' <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* ) | <a>supports_declaration_condition</a> |
     <a>general_enclosed</a>
   ;
 
@@ -330,19 +330,19 @@ by adding:</p>
   ;
 
 <dfn>supports_conjunction</dfn>
-  : <a>supports_condition_in_parens</a> ( <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a href="https://www.w3.org/TR/css3-mediaqueries/#syntax">AND</a> <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>supports_condition_in_parens</a> )+
+  : <a>supports_condition_in_parens</a> ( <a href="https://www.w3.org/TR/css3-mediaqueries/#syntax">AND</a> <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>supports_condition_in_parens</a> )+
   ;
 
 <dfn>supports_disjunction</dfn>
-  : <a>supports_condition_in_parens</a> ( <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>OR</a> <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>supports_condition_in_parens</a> )+
+  : <a>supports_condition_in_parens</a> ( <a>OR</a> <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>supports_condition_in_parens</a> )+
   ;
 
 <dfn>supports_declaration_condition</dfn>
-  : '(' <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a href="https://www.w3.org/TR/CSS21/syndata.html#tokenization">declaration</a> ')'
+  : '(' <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a href="https://www.w3.org/TR/CSS21/syndata.html#tokenization">declaration</a> ')' <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>*
   ;
 
 <dfn>general_enclosed</dfn>
-  : ( <a href="https://www.w3.org/TR/CSS21/syndata.html#tokenization">FUNCTION</a> | '(' ) ( <a href="https://www.w3.org/TR/CSS21/syndata.html#tokenization">any</a> | <a href="https://www.w3.org/TR/CSS21/syndata.html#tokenization">unused</a> )* ')'
+  : ( <a href="https://www.w3.org/TR/CSS21/syndata.html#tokenization">FUNCTION</a> | '(' ) ( <a href="https://www.w3.org/TR/CSS21/syndata.html#tokenization">any</a> | <a href="https://www.w3.org/TR/CSS21/syndata.html#tokenization">unused</a> )* ')' <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>*
   ;
 </pre>