Mercurial > drafts / changeset

     1.1 --- a/css3-animations/Overview.html	Tue Apr 10 15:33:53 2012 +0200
     1.2 +++ b/css3-animations/Overview.html	Tue Apr 10 13:30:22 2012 -0700
     1.3 @@ -16,14 +16,14 @@
     1.4  
     1.5     <h1>CSS Animations</h1>
     1.6  
     1.7 -   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 4 April 2012</h2>
     1.8 +   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 10 April 2012</h2>
     1.9  
    1.10     <dl>
    1.11      <dt>This version:
    1.12  
    1.13      <dd><a
    1.14 -     href="http://www.w3.org/TR/2012/ED-css3-animations-20120404/">http://dev.w3.org/csswg/css3-animations/</a>
    1.15 -     <!--http://www.w3.org/TR/2012/WD-css3-animations-20120404/-->
    1.16 +     href="http://www.w3.org/TR/2012/ED-css3-animations-20120410/">http://dev.w3.org/csswg/css3-animations/</a>
    1.17 +     <!--http://www.w3.org/TR/2012/WD-css3-animations-20120410/-->
    1.18  
    1.19      <dt>Latest version:
    1.20  
    1.21 @@ -243,9 +243,11 @@
    1.22     animation. This overrides the value specified in the normal styling
    1.23     system.
    1.24  
    1.25 -  <p> In the case of multiple animations specifying behavior for the same
    1.26 -   property, the animation defined last will override the previously defined
    1.27 -   animations.
    1.28 +  <p> If at one point in time there are multiple animations specifying
    1.29 +   behavior for the same property, the animation whose name occurs last in
    1.30 +   the value of &lsquo;<a href="#animation-name"><code
    1.31 +   class=property>animation-name</code></a>&rsquo; will override the other
    1.32 +   animations at that point.
    1.33  
    1.34    <p> An animation does not affect the computed value before the application
    1.35     of the animation, before the animation delay has expired, and after the
    1.36 @@ -539,7 +541,7 @@
    1.37      <tr>
    1.38       <td> <em>Value:</em>
    1.39  
    1.40 -     <td> [ none | IDENT ] [, [ none | IDENT ] ]*
    1.41 +     <td> [ none | &lt;IDENT&gt; ] [, [ none | &lt;IDENT&gt; ] ]*
    1.42  
    1.43      <tr>
    1.44       <td> <em>Initial:</em>
    1.45 @@ -1142,13 +1144,34 @@
    1.46      <tr>
    1.47       <td> <em>Value:</em>
    1.48  
    1.49 -     <td> [&lt;animation-name&gt; || &lt;animation-duration&gt; ||
    1.50 -      &lt;animation-timing-function&gt; || &lt;animation-delay&gt; ||
    1.51 -      &lt;animation-iteration-count&gt; || &lt;animation-direction&gt; ||
    1.52 -      &lt;animation-fill-mode&gt;] [, [&lt;animation-name&gt; ||
    1.53 -      &lt;animation-duration&gt; || &lt;animation-timing-function&gt; ||
    1.54 -      &lt;animation-delay&gt; || &lt;animation-iteration-count&gt; ||
    1.55 -      &lt;animation-direction&gt; || &lt;animation-fill-mode&gt;] ]*
    1.56 +     <td> [&lt;&lsquo;<a href="#animation-name"><code
    1.57 +      class=property>animation-name</code></a>&rsquo;&gt; || &lt;&lsquo;<a
    1.58 +      href="#animation-duration"><code
    1.59 +      class=property>animation-duration</code></a>&rsquo;&gt; ||
    1.60 +      &lt;&lsquo;<a href="#animation-timing-function"><code
    1.61 +      class=property>animation-timing-function</code></a>&rsquo;&gt; ||
    1.62 +      &lt;&lsquo;<a href="#animation-delay"><code
    1.63 +      class=property>animation-delay</code></a>&rsquo;&gt; || &lt;&lsquo;<a
    1.64 +      href="#animation-iteration-count"><code
    1.65 +      class=property>animation-iteration-count</code></a>&rsquo;&gt; ||
    1.66 +      &lt;&lsquo;<a href="#animation-direction"><code
    1.67 +      class=property>animation-direction</code></a>&rsquo;&gt; ||
    1.68 +      &lt;&lsquo;<a href="#animation-fill-mode"><code
    1.69 +      class=property>animation-fill-mode</code></a>&rsquo;&gt;] [,
    1.70 +      [&lt;&lsquo;<a href="#animation-name"><code
    1.71 +      class=property>animation-name</code></a>&rsquo;&gt; || &lt;&lsquo;<a
    1.72 +      href="#animation-duration"><code
    1.73 +      class=property>animation-duration</code></a>&rsquo;&gt; ||
    1.74 +      &lt;&lsquo;<a href="#animation-timing-function"><code
    1.75 +      class=property>animation-timing-function</code></a>&rsquo;&gt; ||
    1.76 +      &lt;&lsquo;<a href="#animation-delay"><code
    1.77 +      class=property>animation-delay</code></a>&rsquo;&gt; || &lt;&lsquo;<a
    1.78 +      href="#animation-iteration-count"><code
    1.79 +      class=property>animation-iteration-count</code></a>&rsquo;&gt; ||
    1.80 +      &lt;&lsquo;<a href="#animation-direction"><code
    1.81 +      class=property>animation-direction</code></a>&rsquo;&gt; ||
    1.82 +      &lt;&lsquo;<a href="#animation-fill-mode"><code
    1.83 +      class=property>animation-fill-mode</code></a>&rsquo;&gt;] ]*
    1.84  
    1.85      <tr>
    1.86       <td> <em>Initial:</em>
    1.87 @@ -1659,13 +1682,20 @@
    1.88      <tr>
    1.89       <th><a class=property href="#animation">animation</a>
    1.90  
    1.91 -     <td>[&lt;animation-name&gt; || &lt;animation-duration&gt; ||
    1.92 -      &lt;animation-timing-function&gt; || &lt;animation-delay&gt; ||
    1.93 -      &lt;animation-iteration-count&gt; || &lt;animation-direction&gt; ||
    1.94 -      &lt;animation-fill-mode&gt;] [, [&lt;animation-name&gt; ||
    1.95 -      &lt;animation-duration&gt; || &lt;animation-timing-function&gt; ||
    1.96 -      &lt;animation-delay&gt; || &lt;animation-iteration-count&gt; ||
    1.97 -      &lt;animation-direction&gt; || &lt;animation-fill-mode&gt;] ]*
    1.98 +     <td>[&lt;&lsquo;animation-name&rsquo;&gt; ||
    1.99 +      &lt;&lsquo;animation-duration&rsquo;&gt; ||
   1.100 +      &lt;&lsquo;animation-timing-function&rsquo;&gt; ||
   1.101 +      &lt;&lsquo;animation-delay&rsquo;&gt; ||
   1.102 +      &lt;&lsquo;animation-iteration-count&rsquo;&gt; ||
   1.103 +      &lt;&lsquo;animation-direction&rsquo;&gt; ||
   1.104 +      &lt;&lsquo;animation-fill-mode&rsquo;&gt;] [,
   1.105 +      [&lt;&lsquo;animation-name&rsquo;&gt; ||
   1.106 +      &lt;&lsquo;animation-duration&rsquo;&gt; ||
   1.107 +      &lt;&lsquo;animation-timing-function&rsquo;&gt; ||
   1.108 +      &lt;&lsquo;animation-delay&rsquo;&gt; ||
   1.109 +      &lt;&lsquo;animation-iteration-count&rsquo;&gt; ||
   1.110 +      &lt;&lsquo;animation-direction&rsquo;&gt; ||
   1.111 +      &lt;&lsquo;animation-fill-mode&rsquo;&gt;] ]*
   1.112  
   1.113       <td>see individual properties
   1.114  
   1.115 @@ -1760,7 +1790,7 @@
   1.116      <tr>
   1.117       <th><a class=property href="#animation-name">animation-name</a>
   1.118  
   1.119 -     <td>[ none | IDENT ] [, [ none | IDENT ] ]*
   1.120 +     <td>[ none | &lt;IDENT&gt; ] [, [ none | &lt;IDENT&gt; ] ]*
   1.121  
   1.122       <td>none
   1.123  

     2.1 --- a/css3-animations/Overview.src.html	Tue Apr 10 15:33:53 2012 +0200
     2.2 +++ b/css3-animations/Overview.src.html	Tue Apr 10 13:30:22 2012 -0700
     2.3 @@ -105,8 +105,9 @@
     2.4      </p>
     2.5  
     2.6      <p>
     2.7 -      In the case of multiple animations specifying behavior for the same property, the animation
     2.8 -      defined last will override the previously defined animations.
     2.9 +      If at one point in time there are multiple animations specifying behavior  
    2.10 +      for the same property, the animation whose name occurs last in the value  
    2.11 +      of 'animation-name' will override the other animations at that point.
    2.12      </p>
    2.13  
    2.14      <p>
    2.15 @@ -391,7 +392,7 @@
    2.16                <em>Value:</em>
    2.17              </td>
    2.18              <td>
    2.19 -              [ none | IDENT ] [, [ none | IDENT ] ]*
    2.20 +              [ none | &lt;IDENT&gt; ] [, [ none | &lt;IDENT&gt; ] ]*
    2.21              </td>
    2.22            </tr>
    2.23            <tr>
    2.24 @@ -1129,20 +1130,20 @@
    2.25                <em>Value:</em>
    2.26              </td>
    2.27              <td>
    2.28 -              [&lt;animation-name&gt; || 
    2.29 -              &lt;animation-duration&gt; ||
    2.30 -              &lt;animation-timing-function&gt; ||
    2.31 -              &lt;animation-delay&gt; ||
    2.32 -              &lt;animation-iteration-count&gt; ||
    2.33 -              &lt;animation-direction&gt; ||
    2.34 -              &lt;animation-fill-mode&gt;]
    2.35 -              [, [&lt;animation-name&gt; ||
    2.36 -              &lt;animation-duration&gt; ||
    2.37 -              &lt;animation-timing-function&gt; ||
    2.38 -              &lt;animation-delay&gt; ||
    2.39 -              &lt;animation-iteration-count&gt; ||
    2.40 -              &lt;animation-direction&gt; ||
    2.41 -              &lt;animation-fill-mode&gt;] ]*
    2.42 +              [&lt;'animation-name'&gt; || 
    2.43 +              &lt;'animation-duration'&gt; ||
    2.44 +              &lt;'animation-timing-function'&gt; ||
    2.45 +              &lt;'animation-delay'&gt; ||
    2.46 +              &lt;'animation-iteration-count'&gt; ||
    2.47 +              &lt;'animation-direction'&gt; ||
    2.48 +              &lt;'animation-fill-mode'&gt;]
    2.49 +              [, [&lt;'animation-name'&gt; ||
    2.50 +              &lt;'animation-duration'&gt; ||
    2.51 +              &lt;'animation-timing-function'&gt; ||
    2.52 +              &lt;'animation-delay'&gt; ||
    2.53 +              &lt;'animation-iteration-count'&gt; ||
    2.54 +              &lt;'animation-direction'&gt; ||
    2.55 +              &lt;'animation-fill-mode'&gt;] ]*
    2.56              </td>
    2.57            </tr>
    2.58            <tr>