Reworded explanation of current phase, reworded setting hold phase from resolved to unset, fixed some formatting errors

Author: Jordan Taylor

web-animations-1/Overview.bs

@@ -817,10 +817,12 @@ which is used to fix the animation's output <a>time value</a>, called its
 <a>current time</a>, in circumstances such as pausing.
 The <a>hold time</a> is initially <a>unresolved</a>.
 
-An <a>animation</a> also maintains a <dfn>hold phase</dfn> [=timeline phase=]
-which is used to fix the animation's output [=timeline phase=], called its
-<a>current phase</a>, in circumstances such as pausing.
-The <a>hold phase</a> is initially <a>unresolved</a>.
+In a addition to <a>hold time</a>, an <a>animation</a> maintains a
+<dfn>hold phase</dfn> which is set along with the <a>hold time</a> to determine
+the <a>current phase</a> of an <a>animation</a> with a fixed
+<a>current time</a>. The <a>hold phase</a> has the same range of values as the
+[=timeline phase=] and can be set or unset. The <a>hold phase</a> is initially
+unset.
 
 In order to establish the relative ordering of conflicting <a>animations</a>,
 animations are appended to a <dfn>global animation list</dfn> in the order
@@ -841,7 +843,7 @@ follows:
 1.  Let the <a>timeline</a> of <var>animation</var> be <var>new timeline</var>.
 1.  If the [=start time=] of <var>animation</var> is <a
     lt=unresolved>resolved</a>, make <var>animation</var>'s <a>hold time</a>
-    and <a>hold phase</a> <a>unresolved</a>.
+    <a>unresolved</a> and make <a>hold phase</a> unset.
 
     Note: This step ensures that the <a>finished play state</a> of
     <var>animation</var> is not &ldquo;sticky&rdquo; but is re-evaluated
@@ -932,22 +934,22 @@ matching condition from below:
 
 ### The current phase of an animation ### {#the-current-phase-of-an-animation}
 
-<a>Animations</a> provide a <a>timeline phase</a> to their <a>associated
-effect</a> called the animation's <dfn>current phase</dfn>.
+In addition to their <a>current time</a>, an <a>animation</a> also provides
+their <a>associated effect</a> with a <dfn>current phase</dfn>. This is used in
+determining the animations effect's phase in certain boundary conditions.
+
+An <a>animation</a>'s <a>current phase</a> has the same range of values as the
+[=timeline phase=].
 
 The <a>current phase</a> is calculated from the first matching condition from
 below:
 
 <div class="switch">
 
-:   If the animation's <a>hold phase</a> is <a lt="unresolved">resolved</a>,
+:   If the animation's <a>hold phase</a> is set,
 ::  The <a>current phase</a> is the animation's <a>hold phase</a>.
 
-:   If <em>either</em> of the following are true:
-
-    1.  the animation has no associated <a>timeline</a>, or
-    2.  the animation's [=start time=] is <a>unresolved</a>.
-
+:   If the animation has no associated <a>timeline</a>:
 ::  The <a>current phase</a> is [=timeline inactive phase|inactive=].
 
 :   Otherwise,
@@ -991,7 +993,7 @@ an animation, <var>animation</var>, to <var>seek time</var> is as follows:
 
     ::  Set <var>animation</var>'s <a>hold time</a> to <var>seek time</var>
     ::  Set <var>animation</var>'s <a>hold phase</a> to
-        [=timeline active phase=].
+        [=timeline active phase|active=].
 
     :   Otherwise,
     ::  Set <var>animation</var>'s [=start time=] to the result of evaluating
@@ -1022,7 +1024,7 @@ The procedure to <dfn>set the current time</dfn> of an animation,
     complete the pause operation by performing the following steps:
     1.  Set <var>animation</var>'s <a>hold time</a> to <var>seek time</var>.
     1.  Set <var>animation</var>'s <a>hold phase</a> to
-        [=timeline active phase=].
+        [=timeline active phase|active=].
     1.  [=Apply any pending playback rate=] to |animation|.
     1.  Make <var>animation</var>'s [=start time=] <a>unresolved</a>.
     1.  Cancel the <a>pending pause task</a>.
@@ -1046,7 +1048,7 @@ is as follows:
 
 1.  If <var>timeline time</var> is <a>unresolved</a> and <var>new start
     time</var> is <a lt="unresolved">resolved</a>, make <var>animation</var>'s
-    <a>hold time</a> and <a>hold phase</a> both <a>unresolved</a>.
+    <a>hold time</a> <a>unresolved</a> and make <a>hold phase</a> unset.
 
     <p class=note>
       This preserves the invariant that when we don't have an active timeline it
@@ -1075,8 +1077,8 @@ is as follows:
 
     :   If <var>new start time</var> is <a lt="unresolved">resolved</a>,
     ::  If <var>animation</var>'s [=playback rate=] is not zero,
-        make <var>animation</var>'s <a>hold time</a> and <a>hold phase</a> both
-        <a>unresolved</a>.
+        make <var>animation</var>'s <a>hold time</a> <a>unresolved</a> and make
+        <a>hold phase</a> unset.
 
     :   Otherwise (<var>new start time</var> is <a>unresolved</a>),
     ::  Set <var>animation</var>'s <a>hold time</a> to <var>previous current
@@ -1231,11 +1233,13 @@ as CSS Animations [[CSS-ANIMATIONS-1]].
 
         :   If |has finite timeline| is true,
         ::  1.  Set <var>animation</var>'s <a>start time</a> to <var>seek time</var>.
-            1.  Let |animation|'s [=hold time=] and [=hold phase=] be <a>unresolved</a>.
+            1.  Let |animation|'s [=hold time=] be <a>unresolved</a> and
+                <a>hold phase</a> be unset.
             1.  [=Apply any pending playback rate=] on |animation|.
         :   Otherwise,
         ::  1.  Set <var>animation</var>'s <a>hold time</a> to <var>seek time</var>.
-            1.  Set <var>animation</var>'s <a>hold phase</a> to [=timeline active phase=]
+            1.  Set <var>animation</var>'s <a>hold phase</a> to
+                [=timeline active phase|active=]
 
         </div>
 
@@ -1289,7 +1293,7 @@ as CSS Animations [[CSS-ANIMATIONS-1]].
             1.  Set the [=start time=] of |animation| to |new start time|.
 
             1.  If |animation|'s [=playback rate=] is not 0, make |animation|'s
-                [=hold time=] and [=hold phase=] [=unresolved=].
+                [=hold time=] [=unresolved=] and make [=hold phase=] unset.
 
         :   If |animation|'s [=start time=] is resolved and |animation| has
             a [=pending playback rate=],
@@ -1415,10 +1419,10 @@ follows:
         :   If |has finite timeline| is true,
         ::  Set <var>animation</var>'s <a>start time</a> to <var>seek time</var>.
         :   Otherwise,
-        ::  1. Set <var>animation</var>'s <a>hold time</a> to 
-            <var>seek time</var>.
-            1. Set <var>animation</var>'s <a>hold phase</a> to
-            [=timeline active phase=]
+        ::  1.  Set <var>animation</var>'s <a>hold time</a> to 
+                <var>seek time</var>.
+            1.  Set <var>animation</var>'s <a>hold phase</a> to
+                [=timeline active phase|active=]
 
         </div>
 
@@ -1611,7 +1615,7 @@ follows:
         <a>associated effect end</a>,
     ::  If <var>did seek</var> is true, let the <a>hold time</a>
         be the value of <var>unconstrained current time</var> and let 
-        <a>hold phase</a> be [=timeline active phase=].
+        <a>hold phase</a> be [=timeline active phase|active=].
 
         If <var>did seek</var> is false, let the <a>hold time</a> be the maximum
         value of <a>previous current time</a> and <a>associated effect end</a>
@@ -1623,7 +1627,7 @@ follows:
         <var>unconstrained current time</var> is less than or equal to 0,
     ::  If <var>did seek</var> is true, let the <a>hold time</a>
         be the value of <var>unconstrained current time</var> and let 
-        <a>hold phase</a> be [=timeline active phase=].
+        <a>hold phase</a> be [=timeline active phase|active=].
 
         If <var>did seek</var> is false, let the <a>hold time</a> be the
         minimum value of <a>previous current time</a> and zero and let
@@ -1643,7 +1647,7 @@ follows:
             of <a>timeline</a> associated with <var>animation</var>.
 
         1.  Let the <a>hold time</a> be <a>unresolved</a>.
-        1.  Let the <a>hold phase</a> be <a>unresolved</a>.
+        1.  Let the <a>hold phase</a> be unset.
 
     </div>
 
@@ -1791,7 +1795,7 @@ for <var>animation</var> defined below:
         unresolved except in the case when the animation was previously <a
         lt="idle play state">idle</a>.</div>
 
-    1.  Let the <a>hold phase</a> be <a>unresolved</a>.
+    1.  Let the <a>hold phase</a> be unset.
 
     1.  Cancel the <a>pending pause task</a>.
 
@@ -1858,7 +1862,7 @@ as follows:
         source=].
 
 1.  Make <var>animation</var>'s <a>hold time</a> <a>unresolved</a>.
-1.  Make <var>animation</var>'s <a>hold phase</a> <a>unresolved</a>.
+1.  Make <var>animation</var>'s <a>hold phase</a> unset.
 1.  Make <var>animation</var>'s [=start time=] <a>unresolved</a>.
 
 ### Speed control ### {#speed-control}
@@ -2421,7 +2425,7 @@ animation effect's <a>local time</a> is not <a>unresolved</a> and
 1.  the effect is <a>associated with an animation</a> <em>and</em> the
     associated <a>animation</a>'s <a>current phase</a> is
     [=timeline after phase|after=] <em>and</em> the <a>local time</a> is equal
-    to the <a>active-after boundary time</a>, <em>or</em>
+    to the <a>active-after boundary time</a>, <em>or</em>uirecjkeiucfjseuejdjijauzsuwqaiuaizjjsujzisaijreuwnghweww
 1.  the <a>animation direction</a> is &lsquo;forwards&rsquo; and the <a>local
     time</a> is equal to the <a>active-after boundary time</a>.