Mercurial > drafts / changeset

     1.1 --- a/css3-conditional/Overview.html	Tue Nov 13 14:58:23 2012 -0800
     1.2 +++ b/css3-conditional/Overview.html	Tue Nov 13 15:02:47 2012 -0800
     1.3 @@ -424,27 +424,32 @@
     1.4    <p>In terms of the grammar, this specification defines the following
     1.5     productions for use in the grammar of conditional group rules:
     1.6  
     1.7 -  <pre>nested_statement
     1.8 -  : ruleset | media | page | font_face_rule | keyframes_rule |
     1.9 -    supports_rule
    1.10 +  <pre><dfn id="nested_statement">nested_statement</dfn>
    1.11 +  : ruleset | <a
    1.12 +   href="#media"><i>media</i></a> | page | font_face_rule | keyframes_rule |
    1.13 +    <a
    1.14 +   href="#supports_rule"><i>supports_rule</i></a>
    1.15    ;
    1.16  
    1.17 -group_rule_body
    1.18 -  : '{' S* nested_statement* '}' S*
    1.19 +<dfn
    1.20 +   id="group_rule_body">group_rule_body</dfn>
    1.21 +  : '{' S* <a
    1.22 +   href="#nested_statement"><i>nested_statement</i></a>* '}' S*
    1.23    ;</pre>
    1.24  
    1.25    <p> in which all the productions are defined in that grammar with the
    1.26     exception of <code>font_face_rule</code> defined in <a href="#CSS3-FONTS"
    1.27     rel=biblioentry>[CSS3-FONTS]<!--{{!CSS3-FONTS}}--></a>,
    1.28     <code>keyframes_rule</code> defined in <a href="#CSS3-ANIMATIONS"
    1.29 -   rel=biblioentry>[CSS3-ANIMATIONS]<!--{{!CSS3-ANIMATIONS}}--></a>, and
    1.30 -   <code>media</code> and <a
    1.31 +   rel=biblioentry>[CSS3-ANIMATIONS]<!--{{!CSS3-ANIMATIONS}}--></a>, and <a
    1.32 +   href="#media"><code>media</code></a> and <a
    1.33     href="#supports_rule"><code>supports_rule</code></a> defined in this
    1.34     specification.
    1.35  
    1.36    <p>In general, future CSS specifications that add new @-rules that are not
    1.37 -   forbidden to occur after some other types of rules should modify this
    1.38 -   <code>nested_statement</code> production to keep the grammar accurate.
    1.39 +   forbidden to occur after some other types of rules should modify this <a
    1.40 +   href="#nested_statement"><code>nested_statement</code></a> production to
    1.41 +   keep the grammar accurate.
    1.42  
    1.43    <p>Style sheets <strong>must not</strong> use rules other than the allowed
    1.44     ones inside conditional group rules.
    1.45 @@ -498,22 +503,24 @@
    1.46      display: none }</code>’ is applied.
    1.47    </div>
    1.48  
    1.49 -  <p>In terms of the grammar, this specification extends the
    1.50 -   <code>media</code> production in the <a
    1.51 +  <p>In terms of the grammar, this specification extends the <a
    1.52 +   href="#media"><code>media</code></a> production in the <a
    1.53     href="http://www.w3.org/TR/CSS21/grammar.html">Grammar of CSS 2.1</a> (<a
    1.54     href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>, Appendix G)
    1.55     into:
    1.56  
    1.57 -  <pre>media
    1.58 -  : MEDIA_SYM S* media_query_list group_rule_body
    1.59 +  <pre><dfn id=media>media</dfn>
    1.60 +  : MEDIA_SYM S* media_query_list <a
    1.61 +   href="#group_rule_body"><i>group_rule_body</i></a>
    1.62    ;</pre>
    1.63  
    1.64 -  <p>where the <code>group_rule_body</code> production is defined in this
    1.65 -   specification, the <code>media_query_list</code> production is defined in
    1.66 -   <a href="#MEDIAQ" rel=biblioentry>[MEDIAQ]<!--{{!MEDIAQ}}--></a>, and the
    1.67 -   others are defined in the <a
    1.68 -   href="http://www.w3.org/TR/CSS21/grammar.html">Grammar of CSS 2.1</a> (<a
    1.69 -   href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>, Appendix G).
    1.70 +  <p>where the <a href="#group_rule_body"><code>group_rule_body</code></a>
    1.71 +   production is defined in this specification, the
    1.72 +   <code>media_query_list</code> production is defined in <a href="#MEDIAQ"
    1.73 +   rel=biblioentry>[MEDIAQ]<!--{{!MEDIAQ}}--></a>, and the others are defined
    1.74 +   in the <a href="http://www.w3.org/TR/CSS21/grammar.html">Grammar of CSS
    1.75 +   2.1</a> (<a href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>,
    1.76 +   Appendix G).
    1.77  
    1.78    <h2 id=at-supports><span class=secno>6. </span>Feature queries: the
    1.79     ‘<code class=css>@supports</code>’ rule</h2>
    1.80 @@ -564,34 +571,47 @@
    1.81  
    1.82    <pre><dfn id="supports_rule">supports_rule</dfn>
    1.83    : SUPPORTS_SYM S* <a
    1.84 -   href="#supports_condition"><i>supports_condition</i></a> group_rule_body
    1.85 +   href="#supports_condition"><i>supports_condition</i></a> <a
    1.86 +   href="#group_rule_body"><i>group_rule_body</i></a>
    1.87    ;
    1.88  
    1.89  <dfn
    1.90     id="supports_condition">supports_condition</dfn>
    1.91 -  : supports_negation | supports_conjunction | supports_disjunction |
    1.92 -    supports_condition_in_parens
    1.93 +  : <a
    1.94 +   href="#supports_negation"><i>supports_negation</i></a> | <a
    1.95 +   href="#supports_conjunction"><i>supports_conjunction</i></a> | <a
    1.96 +   href="#supports_disjunction"><i>supports_disjunction</i></a> |
    1.97 +    <a
    1.98 +   href="#supports_condition_in_parens"><i>supports_condition_in_parens</i></a>
    1.99    ;
   1.100  
   1.101  <dfn
   1.102     id="supports_condition_in_parens">supports_condition_in_parens</dfn>
   1.103 -  : ( '(' S* supports_condition ')' S* ) | supports_declaration_condition |
   1.104 -    general_enclosed
   1.105 +  : ( '(' S* <a
   1.106 +   href="#supports_condition"><i>supports_condition</i></a> ')' S* ) | <a
   1.107 +   href="#supports_declaration_condition"><i>supports_declaration_condition</i></a> |
   1.108 +    <a
   1.109 +   href="#general_enclosed"><i>general_enclosed</i></a>
   1.110    ;
   1.111  
   1.112  <dfn
   1.113     id="supports_negation">supports_negation</dfn>
   1.114 -  : NOT S* supports_condition_in_parens
   1.115 +  : NOT S* <a
   1.116 +   href="#supports_condition_in_parens"><i>supports_condition_in_parens</i></a>
   1.117    ;
   1.118  
   1.119  <dfn
   1.120     id="supports_conjunction">supports_conjunction</dfn>
   1.121 -  : supports_condition_in_parens ( AND S* supports_condition_in_parens )+
   1.122 +  : <a
   1.123 +   href="#supports_condition_in_parens"><i>supports_condition_in_parens</i></a> ( AND S* <a
   1.124 +   href="#supports_condition_in_parens"><i>supports_condition_in_parens</i></a> )+
   1.125    ;
   1.126  
   1.127  <dfn
   1.128     id="supports_disjunction">supports_disjunction</dfn>
   1.129 -  : supports_condition_in_parens ( OR S* supports_condition_in_parens )+
   1.130 +  : <a
   1.131 +   href="#supports_condition_in_parens"><i>supports_condition_in_parens</i></a> ( OR S* <a
   1.132 +   href="#supports_condition_in_parens"><i>supports_condition_in_parens</i></a> )+
   1.133    ;
   1.134  
   1.135  <dfn
   1.136 @@ -1027,11 +1047,11 @@
   1.137  ([[!CSS21]], Appendix G) by adding:
   1.138  <pre>@{D}{O}{C}{U}{M}{E}{N}{T}	{return DOCUMENT_SYM;}</pre>
   1.139  <p>and the grammar by adding</p>
   1.140 -<pre>document_rule
   1.141 -  : DOCUMENT_SYM S+ url_match_fn ( "," S* url_match_fn )* group_rule_body
   1.142 +<pre><dfn>document_rule</dfn>
   1.143 +  : DOCUMENT_SYM S+ <i>url_match_fn</i> ( "," S* <i>url_match_fn</i> )* <i>group_rule_body</i>
   1.144    ;
   1.145  
   1.146 -url_match_fn
   1.147 +<dfn>url_match_fn</dfn>
   1.148    : (URI | FUNCTION S* STRING S* ')' ) S*
   1.149    ;</pre>
   1.150  -->
   1.151 @@ -1137,11 +1157,12 @@
   1.152  }</pre>
   1.153  
   1.154    <dl class=idl-attributes>
   1.155 -   <dt><code>media</code> of type <code>MediaList</code>, readonly
   1.156 +   <dt><a href="#media"><code>media</code></a> of type
   1.157 +    <code>MediaList</code>, readonly
   1.158  
   1.159 -   <dd>The <code>media</code> attribute must return a <code>MediaList</code>
   1.160 -    object for the list of media queries specified with the ‘<code
   1.161 -    class=css>@media</code>’ rule.
   1.162 +   <dd>The <a href="#media"><code>media</code></a> attribute must return a
   1.163 +    <code>MediaList</code> object for the list of media queries specified
   1.164 +    with the ‘<code class=css>@media</code>’ rule.
   1.165  
   1.166     <dt><code>conditionText</code> of type <code>DOMString</code>
   1.167  
   1.168 @@ -1209,10 +1230,11 @@
   1.169     specification modifies the <code>stylesheet</code> production in the <a
   1.170     href="http://www.w3.org/TR/CSS21/grammar.html">Appendix G</a> grammar of
   1.171     <a href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a> by replacing
   1.172 -   the <code>media</code> production defined in <a href="#CSS21"
   1.173 -   rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a> with the <code>media</code>
   1.174 -   production defined in this one, and additionally inserting <code>|
   1.175 -   supports_rule</code> alongside <code>ruleset | media | page</code>.
   1.176 +   the <a href="#media"><code>media</code></a> production defined in <a
   1.177 +   href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a> with the <a
   1.178 +   href="#media"><code>media</code></a> production defined in this one, and
   1.179 +   additionally inserting <code>| supports_rule</code> alongside
   1.180 +   <code>ruleset | media | page</code>.
   1.181  
   1.182    <h2 id=conformance><span class=secno>8. </span>Conformance</h2>
   1.183  
   1.184 @@ -1544,9 +1566,17 @@
   1.185     <li>group rule body, <a href="#group-rule-body"
   1.186      title="group rule body"><strong>3.</strong></a>
   1.187  
   1.188 +   <li>group_rule_body, <a href="#group_rule_body"
   1.189 +    title="group_rule_body"><strong>3.</strong></a>
   1.190 +
   1.191 +   <li>media, <a href="#media" title=media><strong>5.</strong></a>
   1.192 +
   1.193     <li>‘<code class=css>@media</code>’ rule, <a href="#atmedia-rule"
   1.194      title="'@media' rule"><strong>5.</strong></a>
   1.195  
   1.196 +   <li>nested_statement, <a href="#nested_statement"
   1.197 +    title="nested_statement"><strong>3.</strong></a>
   1.198 +
   1.199     <li>support, <a href="#dfn-support"
   1.200      title=support><strong>6.1.</strong></a>
   1.201  

     2.1 --- a/css3-conditional/Overview.src.html	Tue Nov 13 14:58:23 2012 -0800
     2.2 +++ b/css3-conditional/Overview.src.html	Tue Nov 13 15:02:47 2012 -0800
     2.3 @@ -247,13 +247,13 @@
     2.4  <p>In terms of the grammar, this specification defines the following
     2.5  productions for use in the grammar of conditional group rules:</p>
     2.6  
     2.7 -<pre>nested_statement
     2.8 -  : ruleset | media | page | font_face_rule | keyframes_rule |
     2.9 -    supports_rule
    2.10 +<pre><dfn>nested_statement</dfn>
    2.11 +  : ruleset | <i>media</i> | page | font_face_rule | keyframes_rule |
    2.12 +    <i>supports_rule</i>
    2.13    ;
    2.14  
    2.15 -group_rule_body
    2.16 -  : '{' S* nested_statement* '}' S*
    2.17 +<dfn>group_rule_body</dfn>
    2.18 +  : '{' S* <i>nested_statement</i>* '}' S*
    2.19    ;</pre>
    2.20  <p>
    2.21  in which all the productions are defined in that grammar with the
    2.22 @@ -316,8 +316,8 @@
    2.23  <code>media</code> production in the
    2.24  <a href="http://www.w3.org/TR/CSS21/grammar.html">Grammar of CSS 2.1</a>
    2.25  ([[!CSS21]], Appendix G) into:
    2.26 -<pre>media
    2.27 -  : MEDIA_SYM S* media_query_list group_rule_body
    2.28 +<pre><dfn>media</dfn>
    2.29 +  : MEDIA_SYM S* media_query_list <i>group_rule_body</i>
    2.30    ;</pre>
    2.31  <p>where the <code>group_rule_body</code> production is defined in this
    2.32  specification, the <code>media_query_list</code> production is defined
    2.33 @@ -366,29 +366,29 @@
    2.34  <p>and the grammar by adding</p>
    2.35  
    2.36  <pre><dfn>supports_rule</dfn>
    2.37 -  : SUPPORTS_SYM S* <i>supports_condition</i> group_rule_body
    2.38 +  : SUPPORTS_SYM S* <i>supports_condition</i> <i>group_rule_body</i>
    2.39    ;
    2.40  
    2.41  <dfn>supports_condition</dfn>
    2.42 -  : supports_negation | supports_conjunction | supports_disjunction |
    2.43 -    supports_condition_in_parens
    2.44 +  : <i>supports_negation</i> | <i>supports_conjunction</i> | <i>supports_disjunction</i> |
    2.45 +    <i>supports_condition_in_parens</i>
    2.46    ;
    2.47  
    2.48  <dfn>supports_condition_in_parens</dfn>
    2.49 -  : ( '(' S* supports_condition ')' S* ) | supports_declaration_condition |
    2.50 -    general_enclosed
    2.51 +  : ( '(' S* <i>supports_condition</i> ')' S* ) | <i>supports_declaration_condition</i> |
    2.52 +    <i>general_enclosed</i>
    2.53    ;
    2.54  
    2.55  <dfn>supports_negation</dfn>
    2.56 -  : NOT S* supports_condition_in_parens
    2.57 +  : NOT S* <i>supports_condition_in_parens</i>
    2.58    ;
    2.59  
    2.60  <dfn>supports_conjunction</dfn>
    2.61 -  : supports_condition_in_parens ( AND S* supports_condition_in_parens )+
    2.62 +  : <i>supports_condition_in_parens</i> ( AND S* <i>supports_condition_in_parens</i> )+
    2.63    ;
    2.64  
    2.65  <dfn>supports_disjunction</dfn>
    2.66 -  : supports_condition_in_parens ( OR S* supports_condition_in_parens )+
    2.67 +  : <i>supports_condition_in_parens</i> ( OR S* <i>supports_condition_in_parens</i> )+
    2.68    ;
    2.69  
    2.70  <dfn>supports_declaration_condition</dfn>
    2.71 @@ -799,11 +799,11 @@
    2.72  ([[!CSS21]], Appendix G) by adding:
    2.73  <pre>@{D}{O}{C}{U}{M}{E}{N}{T}	{return DOCUMENT_SYM;}</pre>
    2.74  <p>and the grammar by adding</p>
    2.75 -<pre>document_rule
    2.76 -  : DOCUMENT_SYM S+ url_match_fn ( "," S* url_match_fn )* group_rule_body
    2.77 +<pre><dfn>document_rule</dfn>
    2.78 +  : DOCUMENT_SYM S+ <i>url_match_fn</i> ( "," S* <i>url_match_fn</i> )* <i>group_rule_body</i>
    2.79    ;
    2.80  
    2.81 -url_match_fn
    2.82 +<dfn>url_match_fn</dfn>
    2.83    : (URI | FUNCTION S* STRING S* ')' ) S*
    2.84    ;</pre>
    2.85  -->