[css-cascade] Reword 'default' definition to be clearer. Remove dbaron's issue about origin merging, as we just merged Animations and Override into 'author-level'.

--HG--
extra : rebase_source : 70040ff21d6af418955d48d9c1c76dcc27f1e8bb

Author: tabatkins

css-cascade/Overview.html

@@ -10,7 +10,7 @@
    rel=dcterms.rights>
   <meta content="CSS Cascading and Inheritance Level 3" name=dcterms.title>
   <meta content=text name=dcterms.type>
-  <meta content=2013-06-26 name=dcterms.date>
+  <meta content=2013-07-01 name=dcterms.date>
   <meta content="Håkon Wium Lie" name=dcterms.creator>
   <meta content="Elika J. Etemad" name=dcterms.creator>
   <meta content="Tab Atkins Jr." name=dcterms.creator>
@@ -29,11 +29,11 @@
 
    <h1>CSS Cascading and Inheritance Level 3</h1>
 
-   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 26 June 2013</h2>
+   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 1 July 2013</h2>
 
    <dl><!--
 		<dt>This version:
-		<dd><a href="http://dev.w3.org/csswg/css3-cascade/">http://www.w3.org/TR/2013/WD-css3-cascade-20130626/</a>
+		<dd><a href="http://dev.w3.org/csswg/css3-cascade/">http://www.w3.org/TR/2013/WD-css3-cascade-20130701/</a>
 -->
 
     <dt>Latest version:
@@ -855,21 +855,32 @@ <h4 id=default><span class=secno>4.3.3. </span> Rolling back the cascade:
 
   <p> If the <a href="#cascaded-value0"><i>cascaded value</i></a> is the
    ‘<a href="#default-keyword"><code class=css>default</code></a>’
-   keyword, then all declarations in the <a href="#origin"><i>origin</i></a>
-   level to which it belongs are discarded from the cascade, resulting in a
-   new <a href="#cascaded-value0"><i>cascaded value</i></a>. For this
-   purpose, all author-originating styles (author and override, both normal
-   and important) are treated as belonging to the same <a
-   href="#origin"><i>origin</i></a> level. This repeats until the <a
-   href="#cascaded-value0"><i>cascaded value</i></a> is not ‘<a
-   href="#default-keyword"><code class=css>default</code></a>’ or until the
-   <a href="#output-of-the-cascade"><i>output of the cascade</i></a> is
-   empty.
-
-  <p class=issue> This definition might need tweaking to sensibly handle
-   animations. See <a
-   href="http://lists.w3.org/Archives/Public/www-style/2012Dec/0270.html">dbaron's
-   message</a>.
+   keyword, the behavior depends on the origin to which the declaration
+   belongs:
+
+  <dl>
+   <dt>user-agent origin
+
+   <dd> Equivalent to ‘<a href="#inherit-keyword"><code
+    class=css>inherit</code></a>’ or ‘<a href="#initial-keyword"><code
+    class=css>initial</code></a>’, depending on whether the property is
+    <i>inherited</i> or not.
+
+   <dt>user origin
+
+   <dd> Rolls back the cascade to the user-agent level, so that the <a
+    href="#specified-value"><i>specified value</i></a> is calculated as if no
+    author-level or user-level rules were specified for this property.
+
+   <dt>author origin
+
+   <dd> Rolls back the cascade to the user level, so that the <a
+    href="#specified-value"><i>specified value</i></a> is calculated as if no
+    author-level rules were specified for this property. For the purpose of
+    ‘<a href="#default-keyword"><code class=css>default</code></a>’, this
+    origin includes the Override and Animation <a
+    href="#origin"><i>origins</i></a>.
+  </dl>
 
   <h4 id=no-value><span class=secno>4.3.4. </span> When There Is No Cascaded
    Value</h4>

css-cascade/Overview.src.html

@@ -611,17 +611,24 @@ <h4 id="default">
 
 	<p>
 		If the <i>cascaded value</i> is the ''default'' keyword,
-		then all declarations in the <i>origin</i> level to which it belongs are discarded from the cascade,
-		resulting in a new <i>cascaded value</i>.
-		For this purpose, all author-originating styles
-		(author and override, both normal and important)
-		are treated as belonging to the same <i>origin</i> level.
-		This repeats until the <i>cascaded value</i> is not ''default''
-		or until the <i>output of the cascade</i> is empty.
-
-	<p class="issue">
-		This definition might need tweaking to sensibly handle animations.
-		See <a href="http://lists.w3.org/Archives/Public/www-style/2012Dec/0270.html">dbaron's message</a>.
+		the behavior depends on the origin to which the declaration belongs:
+
+	<dl>
+		<dt>user-agent origin
+		<dd>
+			Equivalent to ''inherit'' or ''initial'', depending on whether the property is <i>inherited</i> or not.
+
+		<dt>user origin
+		<dd>
+			Rolls back the cascade to the user-agent level, 
+			so that the <i>specified value</i> is calculated as if no author-level or user-level rules were specified for this property.
+
+		<dt>author origin
+		<dd>
+			Rolls back the cascade to the user level, 
+			so that the <i>specified value</i> is calculated as if no author-level rules were specified for this property.
+			For the purpose of ''default'', this origin includes the Override and Animation <i>origins</i>.
+	</dl>
 
 <h4 id='no-value'>
 When There Is No Cascaded Value</h4>