# HG changeset patch
# User L. David Baron <dbaron@dbaron.org>
# Date 1360183230 25200
# Node ID 34b185ae3bac4c1314d473b0818699fc3f0a9713
# Parent  ab8be4484fdb681e77adac16b3b2f0bd118e4dba
[css3-conditional] Require whitespace around 'and' and 'or' and after 'not'.

Resolves last call issue 2.

As resolved in http://lists.w3.org/Archives/Public/www-style/2012Dec/0330.html

diff -r ab8be4484fdb -r 34b185ae3bac css3-conditional/Overview.html
--- a/css3-conditional/Overview.html	Wed Feb 06 13:15:40 2013 -0700
+++ b/css3-conditional/Overview.html	Wed Feb 06 13:40:30 2013 -0700
@@ -575,7 +575,7 @@
 
   <pre><dfn id="supports_rule">supports_rule</dfn>
   : SUPPORTS_SYM S* <a
-   href="#supports_condition"><i>supports_condition</i></a> <a
+   href="#supports_condition"><i>supports_condition</i></a> S* <a
    href="#group_rule_body"><i>group_rule_body</i></a>
   ;
 
@@ -592,7 +592,7 @@
 <dfn
    id="supports_condition_in_parens">supports_condition_in_parens</dfn>
   : ( '(' S* <a
-   href="#supports_condition"><i>supports_condition</i></a> ')' S* ) | <a
+   href="#supports_condition"><i>supports_condition</i></a> S* ')' ) | <a
    href="#supports_declaration_condition"><i>supports_declaration_condition</i></a> |
     <a
    href="#general_enclosed"><i>general_enclosed</i></a>
@@ -600,32 +600,32 @@
 
 <dfn
    id="supports_negation">supports_negation</dfn>
-  : NOT S* <a
+  : NOT S+ <a
    href="#supports_condition_in_parens"><i>supports_condition_in_parens</i></a>
   ;
 
 <dfn
    id="supports_conjunction">supports_conjunction</dfn>
   : <a
-   href="#supports_condition_in_parens"><i>supports_condition_in_parens</i></a> ( AND S* <a
+   href="#supports_condition_in_parens"><i>supports_condition_in_parens</i></a> ( S+ AND S+ <a
    href="#supports_condition_in_parens"><i>supports_condition_in_parens</i></a> )+
   ;
 
 <dfn
    id="supports_disjunction">supports_disjunction</dfn>
   : <a
-   href="#supports_condition_in_parens"><i>supports_condition_in_parens</i></a> ( OR S* <a
+   href="#supports_condition_in_parens"><i>supports_condition_in_parens</i></a> ( S+ OR S+ <a
    href="#supports_condition_in_parens"><i>supports_condition_in_parens</i></a> )+
   ;
 
 <dfn
    id="supports_declaration_condition">supports_declaration_condition</dfn>
-  : '(' S* declaration ')' S*
+  : '(' S* declaration ')'
   ;
 
 <dfn
    id="general_enclosed">general_enclosed</dfn>
-  : ( FUNCTION | '(' ) ( any | unused )* ')' S*
+  : ( FUNCTION | '(' ) ( any | unused )* ')'
   ;
 </pre>
 
@@ -795,6 +795,10 @@
 }</pre>
   </div>
 
+  <p>Furthermore, whitespace is required after a ‘<code
+   class=css>not</code>’ and on both sides of an ‘<code
+   class=css>and</code>’ or ‘<code class=css>or</code>’.
+
   <p>The declaration being tested must always occur within parentheses, when
    it is the only thing in the expression.
 
diff -r ab8be4484fdb -r 34b185ae3bac css3-conditional/Overview.src.html
--- a/css3-conditional/Overview.src.html	Wed Feb 06 13:15:40 2013 -0700
+++ b/css3-conditional/Overview.src.html	Wed Feb 06 13:40:30 2013 -0700
@@ -371,7 +371,7 @@
 <p>and the grammar by adding</p>
 
 <pre><dfn>supports_rule</dfn>
-  : SUPPORTS_SYM S* <i>supports_condition</i> <i>group_rule_body</i>
+  : SUPPORTS_SYM S* <i>supports_condition</i> S* <i>group_rule_body</i>
   ;
 
 <dfn>supports_condition</dfn>
@@ -380,28 +380,28 @@
   ;
 
 <dfn>supports_condition_in_parens</dfn>
-  : ( '(' S* <i>supports_condition</i> ')' S* ) | <i>supports_declaration_condition</i> |
+  : ( '(' S* <i>supports_condition</i> S* ')' ) | <i>supports_declaration_condition</i> |
     <i>general_enclosed</i>
   ;
 
 <dfn>supports_negation</dfn>
-  : NOT S* <i>supports_condition_in_parens</i>
+  : NOT S+ <i>supports_condition_in_parens</i>
   ;
 
 <dfn>supports_conjunction</dfn>
-  : <i>supports_condition_in_parens</i> ( AND S* <i>supports_condition_in_parens</i> )+
+  : <i>supports_condition_in_parens</i> ( S+ AND S+ <i>supports_condition_in_parens</i> )+
   ;
 
 <dfn>supports_disjunction</dfn>
-  : <i>supports_condition_in_parens</i> ( OR S* <i>supports_condition_in_parens</i> )+
+  : <i>supports_condition_in_parens</i> ( S+ OR S+ <i>supports_condition_in_parens</i> )+
   ;
 
 <dfn>supports_declaration_condition</dfn>
-  : '(' S* declaration ')' S*
+  : '(' S* declaration ')'
   ;
 
 <dfn>general_enclosed</dfn>
-  : ( FUNCTION | '(' ) ( any | unused )* ')' S*
+  : ( FUNCTION | '(' ) ( any | unused )* ')'
   ;
 </pre>
 
@@ -560,6 +560,9 @@
 }</pre>
 </div>
 
+<p>Furthermore, whitespace is required after a ''not'' and on both
+sides of an ''and'' or ''or''.</p>
+
 <p>The declaration being tested must always occur within parentheses,
 when it is the only thing in the expression.<p>