csswg/css3-images Overview.html,1.193,1.194 Overview.src.html,1.201,1.202

Update of /sources/public/csswg/css3-images
In directory hutz:/tmp/cvs-serv5248

Modified Files:
	Overview.html Overview.src.html 
Log Message:
Check in Brian's expanded grammar.

Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-images/Overview.html,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- Overview.html	9 Nov 2011 00:13:08 -0000	1.193
+++ Overview.html	9 Nov 2011 00:33:30 -0000	1.194
@@ -879,8 +879,9 @@
    <dd>Can be either &lsquo;<code class=css>circle</code>&rsquo; or
     &lsquo;<code class=css>ellipse</code>&rsquo;; determines whether the
     gradient's <a href="#ending-shape"><i>ending shape</i></a> is a circle or
-    an ellipse, respectively. If the &lt;shape&gt; is omitted it defaults to
-    &lsquo;<code class=css>ellipse</code>&rsquo;.
+    an ellipse, respectively. If the <a
+    href="#ltshapegt"><i>&lt;shape&gt;</i></a> is omitted the <a
+    href="#ending-shape"><i>ending shape</i></a> defaults to an ellipse.
 
    <dt id=radial-position><dfn id=ltpositiongt>&lt;position&gt;</dfn>
 
@@ -945,7 +946,7 @@
       class=css>farthest-side</code>&rsquo; were specified.
     </dl>
 
-    <p>If the <a href="#ending-shape"><i>ending shape</i></a> is declared as
+    <p>If <a href="#ltshapegt"><i>&lt;shape&gt;</i></a> is specified as
      &lsquo;<code class=css>circle</code>&rsquo; or is omitted, <a
      href="#ltextentgt"><i>&lt;extent&gt;</i></a> may be given explicitly as:
      
@@ -957,15 +958,11 @@
       allowed.
     </dl>
 
-    <p>If the <a href="#ending-shape"><i>ending shape</i></a> is declared as
+    <p>If <a href="#ltshapegt"><i>&lt;shape&gt;</i></a> is specified as
      &lsquo;<code class=css>ellipse</code>&rsquo; or is omitted, <a
      href="#ltextentgt"><i>&lt;extent&gt;</i></a> may instead be given
      explicitly as:
 
-    <p>For &lsquo;<code class=css>ellipse</code>&rsquo; gradients, <a
-     href="#ltextentgt"><i>&lt;extent&gt;</i></a> may instead be given
-     explicitly as:
-
     <dl>
      <dt><dfn id=radial-size-circle>[&lt;length&gt; |
       &lt;percentage&gt;]{2}</dfn>
@@ -977,6 +974,19 @@
     </dl>
   </dl>
 
+  <p>The expanded grammar for &lsquo;<code
+   class=css>radial-gradient()</code>&rsquo; is thus:
+
+  <pre>&lt;radial-gradient> = radial-gradient(
+  [ [ [ circle | ellipse ]  , ] |
+    [ [ circle | ellipse ]? [ at &lt;position> || to &lt;extent-keyword> ] , ] |
+    [ circle? &lt;length>, ] |
+    [ ellipse? [&lt;length> | &lt;percentage>]{2} ]
+  ]?
+  &lt;color-stop> [ , &lt;color-stop> ]+
+)
+&lt;extent-keyword> = closest-corner | closest-side | farthest-corner | farthest-side</pre>
+
   <h4 class=no-toc id=radial-color-stops><span class=secno>5.2.2. </span>
    Placing Color Stops</h4>
 

Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-images/Overview.src.html,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- Overview.src.html	9 Nov 2011 00:13:08 -0000	1.201
+++ Overview.src.html	9 Nov 2011 00:33:30 -0000	1.202
@@ -561,7 +561,8 @@
 		<dt id='radial-shape'><dfn>&lt;shape&gt;</dfn></dt>
 		<dd>Can be either ''circle'' or ''ellipse''; determines whether the
 		gradient's <i>ending shape</i> is a circle or an ellipse, respectively.
-		If the &lt;shape&gt; is omitted it defaults to ''ellipse''.
+		If the <i>&lt;shape&gt;</i> is omitted the <i>ending shape</i> defaults
+		to an ellipse.
 
 		<dt id='radial-position'><dfn>&lt;position&gt;</dfn></dt>
 		<dd>Determines the center of the gradient. The <i>&lt;position&gt;</i> notation
@@ -605,7 +606,7 @@
 				have if ''farthest-side'' were specified.
 			</dl>
 
-			<p>If the <i>ending shape</i> is declared as ''circle'' or is omitted,
+			<p>If <i>&lt;shape&gt;</i> is specified as ''circle'' or is omitted,
 			<i>&lt;extent&gt;</i> may be given explicitly as:
 
 			<dl>
@@ -614,12 +615,9 @@
 				not allowed.
 			</dl>
 
-			<p>If the <i>ending shape</i> is declared as ''ellipse'' or is omitted,
+			<p>If <i>&lt;shape&gt;</i> is specified as ''ellipse'' or is omitted,
 			<i>&lt;extent&gt;</i> may instead be given explicitly as:
 
-			<p>For ''ellipse'' gradients, <i>&lt;extent&gt;</i> may instead be given
-			explicitly as:
-
 			<dl>
 				<dt><dfn id='radial-size-circle'>[&lt;length&gt; | &lt;percentage&gt;]{2}</dfn></dt>
 				<dd>Gives the size of the ellipse explicitly. The first value represents
@@ -630,6 +628,17 @@
 		</dd>
 	</dl>
 
+  <p>The expanded grammar for ''radial-gradient()'' is thus:
+<pre>&lt;radial-gradient> = radial-gradient(
+  [ [ [ circle | ellipse ]  , ] |
+    [ [ circle | ellipse ]? [ at &lt;position> || to &lt;extent-keyword> ] , ] |
+    [ circle? &lt;length>, ] |
+    [ ellipse? [&lt;length> | &lt;percentage>]{2} ]
+  ]?
+  &lt;color-stop> [ , &lt;color-stop> ]+
+)
+&lt;extent-keyword> = closest-corner | closest-side | farthest-corner | farthest-side</pre>
+
 <h4 class="no-toc" id="radial-color-stops">
 Placing Color Stops</h4>

Received on Wednesday, 9 November 2011 00:33:39 UTC