Mercurial > drafts / file diff

     1.1 --- a/css3-animations/Overview.src.html	Thu Jul 12 13:26:09 2012 -0700
     1.2 +++ b/css3-animations/Overview.src.html	Thu Jul 12 14:00:51 2012 -0700
     1.3 @@ -437,7 +437,7 @@
     1.4  			<td><dfn>animation-name</dfn>
     1.5  		<tr>
     1.6  			<th><a href="#values">Value</a>:
     1.7 -			<td>[ none | &lt;user-ident> ]#
     1.8 +			<td>[ none | IDENT ] [, [ none | IDENT ] ]*
     1.9  		<tr>
    1.10  			<th>Initial:
    1.11  			<td>''none''
    1.12 @@ -521,7 +521,7 @@
    1.13  			<td><dfn>animation-duration</dfn>
    1.14  		<tr>
    1.15  			<th><a href="#values">Value</a>:
    1.16 -			<td>&lt;time>#
    1.17 +			<td> &lt;time&gt; [, &lt;time&gt;]*
    1.18  		<tr>
    1.19  			<th>Initial:
    1.20  			<td>''0s''
    1.21 @@ -570,12 +570,23 @@
    1.22  			<td><dfn>animation-timing-function</dfn>
    1.23  		<tr>
    1.24  			<th><a href="#values">Value</a>:
    1.25 -			<td>[ 
    1.26 -				  ease | linear | ease-in | ease-out | ease-in-out | 
    1.27 -				  step-start | step-end |
    1.28 -				  steps(&lt;number> [, [ start | end ] ]) |
    1.29 -				  cubic-bezier(&lt;number>, &lt;number>, &lt;number>, &lt;number>)
    1.30 -				]#
    1.31 +			<td>
    1.32 +					[ 
    1.33 +						ease | linear | ease-in | ease-out | ease-in-out | 
    1.34 +						step-start | step-end | 
    1.35 +						steps(&lt;number&gt; [, [ start | end ] ]?) |
    1.36 +		  				cubic-bezier(&lt;number&gt;, &lt;number&gt;, &lt;number&gt;,
    1.37 +		  				&lt;number&gt;) 
    1.38 +	      			] 
    1.39 +      			[, 
    1.40 +      				[ 
    1.41 +	      				ease | linear | ease-in | ease-out | ease-in-out | 
    1.42 +						step-start | step-end | 
    1.43 +						steps(&lt;number&gt; [, [ start | end ] ]?) |
    1.44 +		  				cubic-bezier(&lt;number&gt;, &lt;number&gt;, &lt;number&gt;,
    1.45 +		  				&lt;number&gt;) 
    1.46 +		  			] 		  			
    1.47 +      			]*
    1.48  		<tr>
    1.49  			<th>Initial:
    1.50  			<td>''ease''
    1.51 @@ -630,7 +641,8 @@
    1.52  			<td><dfn>animation-iteration-count</dfn>
    1.53  		<tr>
    1.54  			<th><a href="#values">Value</a>:
    1.55 -			<td>[ infinite | &lt;number> ]#
    1.56 +			<td>   [ infinite | &lt;number&gt; ] 
    1.57 +				[, [ infinite | &lt;number&gt; ] ]*
    1.58  		<tr>
    1.59  			<th>Initial:
    1.60  			<td>''1''
    1.61 @@ -669,7 +681,8 @@
    1.62  			<td><dfn>animation-direction</dfn>
    1.63  		<tr>
    1.64  			<th><a href="#values">Value</a>:
    1.65 -			<td>[ normal | reverse | alternate | alternate-reverse ]#
    1.66 +			<td>   [ normal | reverse | alternate | alternate-reverse ] 
    1.67 +				[, [ normal | reverse | alternate | alternate-reverse ] ]*
    1.68  		<tr>
    1.69  			<th>Initial:
    1.70  			<td>''normal''
    1.71 @@ -737,7 +750,8 @@
    1.72  			<td><dfn>animation-play-state</dfn>
    1.73  		<tr>
    1.74  			<th><a href="#values">Value</a>:
    1.75 -			<td>[ running | paused ]#
    1.76 +			<td>   [ running | paused ] 
    1.77 +				[, [ running | paused ] ]*
    1.78  		<tr>
    1.79  			<th>Initial:
    1.80  			<td>''running''
    1.81 @@ -786,7 +800,7 @@
    1.82  			<td><dfn>foo</dfn>
    1.83  		<tr>
    1.84  			<th><a href="#values">animation-delay</a>:
    1.85 -			<td>&lt;time>#
    1.86 +			<td> &lt;time&gt; [, &lt;time&gt;]*
    1.87  		<tr>
    1.88  			<th>Initial:
    1.89  			<td>''0s''
    1.90 @@ -862,7 +876,8 @@
    1.91  			<td><dfn>animation-fill-mode</dfn>
    1.92  		<tr>
    1.93  			<th><a href="#values">Value</a>:
    1.94 -			<td>[ none | forwards | backwards | both ]#
    1.95 +			<td>   [ none | forwards | backwards | both ] 
    1.96 +				[, [ none | forwards | backwards | both ] ]*
    1.97  		<tr>
    1.98  			<th>Initial:
    1.99  			<td>''none''
   1.100 @@ -909,13 +924,22 @@
   1.101  			<td><dfn>animation</dfn>
   1.102  		<tr>
   1.103  			<th><a href="#values">Value</a>:
   1.104 -			<td>[ &lt;'animation-name'> || 
   1.105 -				&lt;'animation-duration'> ||
   1.106 -				&lt;'animation-timing-function'> ||
   1.107 -				&lt;'animation-delay'> ||
   1.108 -				&lt;'animation-iteration-count'> ||
   1.109 -				&lt;'animation-direction'> ||
   1.110 -				&lt;'animation-fill-mode'> ]#
   1.111 +			<td>
   1.112 +					[
   1.113 +						&lt;animation-name&gt; || &lt;animation-duration&gt; ||
   1.114 +	      			 	&lt;animation-timing-function&gt; || &lt;animation-delay&gt; ||
   1.115 +	      			 	&lt;animation-iteration-count&gt; || &lt;animation-direction&gt; ||
   1.116 +	      			 	&lt;animation-fill-mode&gt;
   1.117 +	      			] 
   1.118 +      			[, 
   1.119 +      				[
   1.120 +      					&lt;animation-name&gt; || &lt;animation-duration&gt; || 
   1.121 +      					&lt;animation-timing-function&gt; || &lt;animation-delay&gt; || 
   1.122 +      					&lt;animation-iteration-count&gt; || &lt;animation-direction&gt; || 
   1.123 +      					&lt;animation-fill-mode&gt;
   1.124 +  					] 
   1.125 +				]*
   1.126 +
   1.127  		<tr>
   1.128  			<th>Initial:
   1.129  			<td>see individual properties