1.1 --- a/css3-conditional/Overview.src.html Tue Oct 09 14:22:00 2012 -0700 1.2 +++ b/css3-conditional/Overview.src.html Tue Oct 09 14:28:35 2012 -0700 1.3 @@ -368,7 +368,10 @@ 1.4 <p>This extends the lexical scanner in the 1.5 <a href="http://www.w3.org/TR/CSS21/grammar.html">Grammar of CSS 2.1</a> 1.6 ([[!CSS21]], Appendix G) by adding: 1.7 -<pre>@{S}{U}{P}{P}{O}{R}{T}{S} {return SUPPORTS_SYM;}</pre> 1.8 +<pre> 1.9 +@{S}{U}{P}{P}{O}{R}{T}{S} {return SUPPORTS_SYM;} 1.10 +{O}{R} {return OR;} 1.11 +</pre> 1.12 <p>and the grammar by adding</p> 1.13 <pre><dfn>supports_rule</dfn> 1.14 : SUPPORTS_SYM S* supports_condition group_rule_body 1.15 @@ -384,15 +387,15 @@ 1.16 ; 1.17 1.18 <dfn>supports_negation</dfn> 1.19 - : 'not' S* supports_condition_in_parens 1.20 + : NOT S* supports_condition_in_parens 1.21 ; 1.22 1.23 <dfn>supports_conjunction</dfn> 1.24 - : supports_condition_in_parens ( 'and' S* supports_condition_in_parens )+ 1.25 + : supports_condition_in_parens ( AND S* supports_condition_in_parens )+ 1.26 ; 1.27 1.28 <dfn>supports_disjunction</dfn> 1.29 - : supports_condition_in_parens ( 'or' S* supports_condition_in_parens )+ 1.30 + : supports_condition_in_parens ( OR S* supports_condition_in_parens )+ 1.31 ; 1.32 1.33 <dfn>supports_declaration_condition</dfn> 1.34 @@ -401,7 +404,9 @@ 1.35 <p>in which <code>core_declaration</code> is the production 1.36 <code>declaration</code> in the core syntax of CSS defined in <a 1.37 href="http://www.w3.org/TR/CSS21/syndata.html#tokenization">section 1.38 -4.1.1 (Tokenization)</a> of [[!CSS21]].</p> 1.39 +4.1.1 (Tokenization)</a> of [[!CSS21]], 1.40 +and the <code>AND</code> and <code>NOT</code> tokens are defined in 1.41 +the Media Queries specification [[!MEDIAQ]].</p> 1.42 1.43 <p>Any ''@supports'' rule that does not parse according to the grammar 1.44 above is invalid. Style sheets <strong>must not</strong> use such a