[css-mediaqueries] Require spaces before and after the 'and' keyword, as well as after 'not' and 'only'

Author: frivoal

mediaqueries/Overview.html

@@ -11,7 +11,7 @@
 
   <meta content="Media Queries Level 4" name=dcterms.title>
   <meta content=text name=dcterms.type>
-  <meta content=2013-06-14 name=dcterms.date>
+  <meta content=2013-07-10 name=dcterms.date>
   <meta content="Florian Rivoal" name=dcterms.creator>
   <meta content=W3C name=dcterms.publisher>
   <meta content="http://dev.w3.org/csswg/mediaqueries4/"
@@ -55,11 +55,11 @@
 
    <h1 id=media-queries>Media Queries Level 4</h1>
 
-   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 14 June 2013</h2>
+   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 10 July 2013</h2>
 
    <dl>
     <dt>This version:
-     <!-- <dd><a href="http://dev.w3.org/csswg/mediaqueries4/">http://www.w3.org/TR/2013/ED-mediaqueries4-20130614/</a> -->
+     <!-- <dd><a href="http://dev.w3.org/csswg/mediaqueries4/">http://www.w3.org/TR/2013/ED-mediaqueries4-20130710/</a> -->
 
     <dd><a
      href="http://dev.w3.org/csswg/mediaqueries4/">http://dev.w3.org/csswg/mediaqueries4/</a>
@@ -597,14 +597,14 @@ <h2 id=syntax><span class=secno>3. </span>Syntax</h2>
  : S* [media_query [ ',' S* media_query ]* ]?
  ;
 media_query
- : [ONLY | NOT]? S* media_type S* [ AND S* expression ]*
- | expression [ AND S* expression ]*
+ : [ONLY | NOT]? S+ media_type [ S+ AND S+ expression ]* S*
+ | expression [ S+ AND S+ expression ]* S*
  ;
 media_type
  : IDENT
  ;
 expression
- : '(' S* media_feature S* [ ':' S* expr ]? ')' S*
+ : '(' S* media_feature S* [ ':' S* expr ]? ')'
  ;
 media_feature
  : IDENT
@@ -1412,6 +1412,9 @@ <h3 id=changes-2012><span class=secno>5.1. </span>Changes Since the Media
    <li>‘<code class=css>or</code>’, ‘<code class=css>and</code>’,
     ‘<code class=css>only</code>’ and ‘<code class=css>not</code>’
     are invalid media types.
+
+   <li>White space is required around the keyword “and” as well as after
+    "not" and "only".
   </ul>
 
   <h2 id=conformance><span class=secno>6. </span> Conformance</h2>

mediaqueries/Overview.src.html

@@ -387,14 +387,14 @@ <h2>Syntax</h2>
  : S* [media_query [ ',' S* media_query ]* ]?
  ;
 media_query
- : [ONLY | NOT]? S* media_type S* [ AND S* expression ]*
- | expression [ AND S* expression ]*
+ : [ONLY | NOT]? S+ media_type [ S+ AND S+ expression ]* S*
+ | expression [ S+ AND S+ expression ]* S*
  ;
 media_type
  : IDENT
  ;
 expression
- : '(' S* media_feature S* [ ':' S* expr ]? ')' S*
+ : '(' S* media_feature S* [ ':' S* expr ]? ')'
  ;
 media_feature
  : IDENT
@@ -1171,6 +1171,7 @@ <h3 id="changes-2012">Changes Since the Media Queries Level 3</h3>
 	<li>The <a href="#hover">''hover'' media feature</a> was added.
 	<li>The <a href="#luminosity">''luminosity'' media feature</a> was added.
 	<li>''or'', ''and'', ''only'' and ''not'' are invalid media types.
+	<li>White space is required around the keyword “and” as well as after "not" and "only".
 </ul>
 
 <h2 id="conformance">