- From: Tab Atkins Jr.. via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 28 Sep 2011 22:51:34 +0000
- To: public-css-commits@w3.org
Update of /sources/public/csswg/css-variables
In directory hutz:/tmp/cvs-serv1860
Modified Files:
Overview.html Overview.src.html
Log Message:
Use 'nested_statement' from Conditionals, add <ins> markers.
Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css-variables/Overview.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Overview.html 24 Sep 2011 01:25:29 -0000 1.1
+++ Overview.html 28 Sep 2011 22:51:32 -0000 1.2
@@ -36,14 +36,14 @@
<h1>CSS Variables Module Level 1</h1>
- <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 24 September
+ <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 28 September
2011</h2>
<dl>
<dt>This version:
<dd><a
- href="http://www.w3.org/TR/2011/ED-css-variables-20110924/">http://dev.w3.org/csswg/css-variables/</a>
+ href="http://www.w3.org/TR/2011/ED-css-variables-20110928/">http://dev.w3.org/csswg/css-variables/</a>
<!--<dt>Latest version:
<dd><a href="http://www.w3.org/TR/css-variables/">http://www.w3.org/TR/css-variables/</a>-->
@@ -538,7 +538,7 @@
<p>and the grammar by adding:
<pre>
-variable_declaration
+variable_rule
: VARIABLE_SYM S+ variable_name S+ expr ':';
;</pre>
@@ -548,21 +548,22 @@
stylesheet
: [ CHARSET_SYM STRING ';' ]?
[S|CDO|CDC]* [ import [ CDO S* | CDC S* ]* ]*
- [ [ ruleset | media | page | variable_declaration ] [ CDO S* | CDC S* ]* ]*
+ [ [ ruleset | media | page <ins>| variable_rule</ins> ] [ CDO S* | CDC S* ]* ]*
;
-media
- : MEDIA_SYM S* media_list '{' S* [ ruleset | variable_declaration ]* '}' S*
+nested_statement
+ : ruleset | media | page | font_face_rule | keyframes-rule |
+ supports_rule | document_rule <ins>| variable_rule</ins>
;
term
: unary_operator?
[ NUMBER S* | PERCENTAGE S* | LENGTH S* | EMS S* | EXS S* | ANGLE S* |
TIME S* | FREQ S* ]
- | STRING S* | IDENT S* | URI S* | hexcolor | function | VARIABLE S*
+ | STRING S* | IDENT S* | URI S* | hexcolor | function <ins>| VARIABLE S*</ins>
;</pre>
- <p class=issue>This should instead amend the "nested_statement" production
- in the Conditionals spec. Should I do so and reference Conditionals, or
- are we going to move that to a Syntax module?
+ <p class=issue>This uses the ‘<code
+ class=css>nested_statement</code>’ production from Conditionals.
+ That should make its way to a proper draft, like a new release of Syntax.
<p class=issue>Should variables be usable elsewhere, like in the value of a
MQ?
Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css-variables/Overview.src.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Overview.src.html 24 Sep 2011 01:25:29 -0000 1.1
+++ Overview.src.html 28 Sep 2011 22:51:32 -0000 1.2
@@ -281,7 +281,7 @@
<p>and the grammar by adding:</p>
<pre>
-variable_declaration
+variable_rule
: VARIABLE_SYM S+ variable_name S+ expr ':';
;</pre>
@@ -291,19 +291,20 @@
stylesheet
: [ CHARSET_SYM STRING ';' ]?
[S|CDO|CDC]* [ import [ CDO S* | CDC S* ]* ]*
- [ [ ruleset | media | page | variable_declaration ] [ CDO S* | CDC S* ]* ]*
+ [ [ ruleset | media | page <ins>| variable_rule</ins> ] [ CDO S* | CDC S* ]* ]*
;
-media
- : MEDIA_SYM S* media_list '{' S* [ ruleset | variable_declaration ]* '}' S*
+nested_statement
+ : ruleset | media | page | font_face_rule | keyframes-rule |
+ supports_rule | document_rule <ins>| variable_rule</ins>
;
term
: unary_operator?
[ NUMBER S* | PERCENTAGE S* | LENGTH S* | EMS S* | EXS S* | ANGLE S* |
TIME S* | FREQ S* ]
- | STRING S* | IDENT S* | URI S* | hexcolor | function | VARIABLE S*
+ | STRING S* | IDENT S* | URI S* | hexcolor | function <ins>| VARIABLE S*</ins>
;</pre>
- <p class='issue'>This should instead amend the "nested_statement" production in the Conditionals spec. Should I do so and reference Conditionals, or are we going to move that to a Syntax module?</p>
+ <p class='issue'>This uses the 'nested_statement' production from Conditionals. That should make its way to a proper draft, like a new release of Syntax.</p>
<p class='issue'>Should variables be usable elsewhere, like in the value of a MQ?</p>
Received on Wednesday, 28 September 2011 22:51:36 UTC