[css-images] <shape> => <ending-shape> to avoid conflicts.

Author: tabatkins

css-images/Overview.html

@@ -12,7 +12,7 @@
   <meta content="CSS Image Values and Replaced Content Module Level 4"
    name=dc.title>
   <meta content=text name=dc.type>
-  <meta content=2013-04-09 name=dc.date>
+  <meta content=2013-04-11 name=dc.date>
   <meta content="Elika J. Etemad" name=dc.creator>
   <meta content="Tab Atkins Jr." name=dc.creator>
   <meta content=W3C name=dc.publisher>
@@ -29,14 +29,14 @@
 
    <h1>CSS Image Values and Replaced Content Module Level 4</h1>
 
-   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 9 April 2013</h2>
+   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 11 April 2013</h2>
 
    <dl>
     <dt>This Version:
 
     <dd><a
      href="http://dev.w3.org/csswg/css4-images/">http://dev.w3.org/csswg/css4-images/</a>
-     <!-- <dd><a href="http://dev.w3.org/csswg/css4-images/">http://www.w3.org/TR/2013/WD-css4-images-20130409/</a>-->
+     <!-- <dd><a href="http://dev.w3.org/csswg/css4-images/">http://www.w3.org/TR/2013/WD-css4-images-20130411/</a>-->
 
     <dt>Latest Version:
 
@@ -1669,7 +1669,7 @@ <h4 class=no-toc id=radial-gradient-syntax><span class=secno>4.2.1. </span>
    id=radial-gradient-type>&lt;radial-gradient></dfn> = radial-gradient(
 <!--
 		-->  [ [ <a
-   href="#shape"><var>&lt;shape></var></a> || <a
+   href="#shape"><var>&lt;ending-shape></var></a> || <a
    href="#size"><var>&lt;size></var></a> ] [ at <a
    href="#position"><var>&lt;position></var></a> ]? , |
 <!--
@@ -1712,14 +1712,14 @@ <h4 class=no-toc id=radial-gradient-syntax><span class=secno>4.2.1. </span>
     this argument is omitted, it defaults to ‘<code
     class=css>center</code>’.
 
-   <dt id=radial-shape><dfn id=shape>&lt;shape></dfn>
+   <dt id=radial-shape><dfn id=shape>&lt;ending-shape></dfn>
 
    <dd> Can be either ‘<code class=css>circle</code>’ or ‘<code
     class=css>ellipse</code>’; determines whether the gradient's <a
     href="#ending-shape"><i>ending shape</i></a> is a circle or an ellipse,
-    respectively. If <a href="#shape"><var>&lt;shape></var></a> is omitted,
-    the <a href="#ending-shape"><i>ending shape</i></a> defaults to a circle
-    if the <a href="#size"><var>&lt;size></var></a> is a single <a
+    respectively. If <a href="#shape"><var>&lt;ending-shape></var></a> is
+    omitted, the <a href="#ending-shape"><i>ending shape</i></a> defaults to
+    a circle if the <a href="#size"><var>&lt;size></var></a> is a single <a
     href="#radial-size-circle"><var>&lt;length></var></a>, and to an ellipse
     otherwise.
 
@@ -1782,7 +1782,7 @@ <h4 class=no-toc id=radial-gradient-syntax><span class=secno>4.2.1. </span>
       class=css>farthest-side</code></a>’ were specified.
     </dl>
 
-    <p> If <a href="#shape"><var>&lt;shape></var></a> is specified as
+    <p> If <a href="#shape"><var>&lt;ending-shape></var></a> is specified as
      ‘<code class=css>circle</code>’ or is omitted, the <a
      href="#size"><var>&lt;size></var></a> may be given explicitly as:
 
@@ -1802,7 +1802,7 @@ <h4 class=no-toc id=radial-gradient-syntax><span class=secno>4.2.1. </span>
        controls over which dimension is used.
     </dl>
 
-    <p> If <a href="#shape"><var>&lt;shape></var></a> is specified as
+    <p> If <a href="#shape"><var>&lt;ending-shape></var></a> is specified as
      ‘<code class=css>ellipse</code>’ or is omitted, <a
      href="#size"><var>&lt;size></var></a> may instead be given explicitly
      as:
@@ -3729,8 +3729,8 @@ <h3 id=interpolating-gradients><span class=secno>7.3. </span> Interpolating
        <li> Otherwise, the size must be changed to a pair of <a
         href="#radial-size-circle"><var>&lt;length></var></a>s that would
         produce an equivalent ending-shape. If the <a
-        href="#shape"><var>&lt;shape></var></a> was specified as ‘<code
-        class=css>circle</code>’, change it to ‘<code
+        href="#shape"><var>&lt;ending-shape></var></a> was specified as
+        ‘<code class=css>circle</code>’, change it to ‘<code
         class=css>ellipse</code>’.
       </ul>
     </dl>
@@ -4320,6 +4320,9 @@ <h2 class=no-num id=index>Index</h2>
    <li>ending point, <a href="#ending-point"
     title="section 4.5."><strong>4.5.</strong></a>
 
+   <li>&lt;ending-shape>, <a href="#shape"
+    title="section 4.2.1."><strong>4.2.1.</strong></a>
+
    <li>ending shape, <a href="#ending-shape"
     title="section 4.2."><strong>4.2.</strong></a>
 
@@ -4444,9 +4447,6 @@ <h2 class=no-num id=index>Index</h2>
     href="#repeating-radial-gradient-type"
     title="section 4.4."><strong>4.4.</strong></a>
 
-   <li>&lt;shape>, <a href="#shape"
-    title="section 4.2.1."><strong>4.2.1.</strong></a>
-
    <li>&lt;side-or-corner>, <a href="#side-or-corner"
     title="section 4.1.1."><strong>4.1.1.</strong></a>
 

css-images/Overview.src.html

@@ -1318,7 +1318,7 @@ <h4 class='no-toc' id='radial-gradient-syntax'>
 
 	<pre><!--
 		--><dfn id='radial-gradient-type'>&lt;radial-gradient></dfn> = radial-gradient(&#xa;<!--
-		-->  [ [ <var>&lt;shape></var> || <var>&lt;size></var> ] [ at <var>&lt;position></var> ]? , |&#xa;<!--
+		-->  [ [ <var>&lt;ending-shape></var> || <var>&lt;size></var> ] [ at <var>&lt;position></var> ]? , |&#xa;<!--
 		-->    at <var>&lt;position></var>, &#xa;<!--
 		-->  ]?&#xa;<!--
 		-->  <var>&lt;color-stop-list></var>&#xa;<!--
@@ -1354,11 +1354,11 @@ <h4 class='no-toc' id='radial-gradient-syntax'>
 			If this argument is omitted, 
 			it defaults to ''center''.
 
-		<dt id='radial-shape'><dfn id='shape'>&lt;shape></dfn>
+		<dt id='radial-shape'><dfn id='shape'>&lt;ending-shape></dfn>
 		<dd>
 			Can be either ''circle'' or ''ellipse''; 
 			determines whether the gradient's <i>ending shape</i> is a circle or an ellipse, respectively. 
-			If <var>&lt;shape></var> is omitted, 
+			If <var>&lt;ending-shape></var> is omitted, 
 			the <i>ending shape</i> defaults to a circle 
 			if the <var>&lt;size></var> is a single <var>&lt;length></var>, 
 			and to an ellipse otherwise.
@@ -1409,7 +1409,7 @@ <h4 class='no-toc' id='radial-gradient-syntax'>
 			</dl>
 
 			<p>
-				If <var>&lt;shape></var> is specified as ''circle'' or is omitted, 
+				If <var>&lt;ending-shape></var> is specified as ''circle'' or is omitted, 
 				the <var>&lt;size></var> may be given explicitly as:
 
 			<dl>
@@ -1430,7 +1430,7 @@ <h4 class='no-toc' id='radial-gradient-syntax'>
 			</dl>
 
 			<p>
-				If <var>&lt;shape></var> is specified as ''ellipse'' or is omitted, 
+				If <var>&lt;ending-shape></var> is specified as ''ellipse'' or is omitted, 
 				<var>&lt;size></var> may instead be given explicitly as:
 
 			<dl>
@@ -3137,7 +3137,7 @@ <h3 id='interpolating-gradients'>
 						<li>
 							Otherwise, the size must be changed to a pair of <var>&lt;length></var>s 
 							that would produce an equivalent ending-shape.
-							If the <var>&lt;shape></var> was specified as ''circle'',
+							If the <var>&lt;ending-shape></var> was specified as ''circle'',
 							change it to ''ellipse''.
 					</ul>
 			</dl>