W3C home > Mailing lists > Public > public-svg-wg@w3.org > April to June 2014

svg2: More wsp/comma-wsp cleanups.

From: SVG Working Group repository <cam+svgwgrepo@mcc.id.au>
Date: Mon, 26 May 2014 03:57:55 -0700
Message-Id: <hg.81c26c8c2608.1401101875.3034738116371802840@ps58493.dreamhostps.com>
To: public-svg-wg@w3.org
details:   https://svgwg.org/hg/svg2/rev/81c26c8c2608
branches:  
changeset: 680:81c26c8c2608
user:      Erik Dahlstrom <ed@opera.com>
date:      Mon May 26 12:55:02 2014 +0200
description:
More wsp/comma-wsp cleanups.

diffstat:

 master/changes.html |   2 +-
 master/color.html   |  23 ++++++++---------------
 master/shapes.html  |  14 ++++----------
 3 files changed, 13 insertions(+), 26 deletions(-)

diffs (173 lines):

diff --git a/master/changes.html b/master/changes.html
--- a/master/changes.html
+++ b/master/changes.html
@@ -31,17 +31,17 @@ Changes made since the last <a href="htt
 <p>A number of stylistic changes have been made to the specification to make it more readable. These include the following:</p>
 
 <ul>
   <li>A change towards using styling similar to contemporary CSS specifications.</li>
 
   <li>Annotations have been added to the specification to reflect features that the Working Group
   has resolved on including and for which a member of the group has committed to drive that feature.</li>
 
-  <li>The path data grammar now references <a>comma-wsp</a> and <a>wsp</a> from the types chapter.</li>
+  <li>Define <a>comma-wsp</a> and <a>wsp</a> in the types chapter and reference these from all other grammars that need it.</li>
 
 </ul>
 
 <h2 id="substantial">Substantial changes</h2>
 
 <p>In additional to the editorial changes listed above, the following substantial additions, changes and removals
 have been made.</p>
 
diff --git a/master/color.html b/master/color.html
--- a/master/color.html
+++ b/master/color.html
@@ -698,26 +698,26 @@ or when all rendering-intents are provid
 
 <div class="ready-for-wider-review">
 <h2 id="syntax">Color syntax</h2>
 
 <p>The EBNF grammar syntax is as described in <a href="types.html#syntax">Syntax</a>.</p>
 
 <pre>
 <span id="icccolor">icccolor</span> ::= 
-  ~"icc-color(" <a href="#name">name</a> (<a href="#comma-wsp">comma-wsp</a> <a href="#number">number</a>)+ ")" 
+  ~"icc-color(" <a href="#name">name</a> (<a>comma-wsp</a> <a href="#number">number</a>)+ ")" 
   
 <span id="iccnamedcolor">iccnamedcolor</span> ::= 
-  ~"icc-named-color(" <a href="#name">name</a> <a href="#comma-wsp">comma-wsp</a> <a href="#namedColor">namedColor</a> ")" 
+  ~"icc-named-color(" <a href="#name">name</a> <a>comma-wsp</a> <a href="#namedColor">namedColor</a> ")" 
   
 <span id="cielabcolor">cielabcolor</span> ::=
-  ~"cielab(" <a href="#lightness">lightness</a> <a href="#comma-wsp">comma-wsp</a> <a href="#a-value">a-value</a> <a href="#comma-wsp">comma-wsp</a> <a href="#b-value">b-value</a> ")" 
+  ~"cielab(" <a href="#lightness">lightness</a> <a>comma-wsp</a> <a href="#a-value">a-value</a> <a>comma-wsp</a> <a href="#b-value">b-value</a> ")" 
   
 <span id="cielchabcolor">cielchabcolor</span> ::=
-  ~"cielchab(" <a href="#lightness">lightness</a> <a href="#comma-wsp">comma-wsp</a> <a href="#chroma">chroma</a> <a href="#comma-wsp">comma-wsp</a> <a href="#hue">hue</a> ")" 
+  ~"cielchab(" <a href="#lightness">lightness</a> <a>comma-wsp</a> <a href="#chroma">chroma</a> <a>comma-wsp</a> <a href="#hue">hue</a> ")" 
   
 <span id="devicecolor">devicecolor</span> ::=
   <a href="#devicegray">device-gray</a> | <a href="#devicergb">devicergb</a> | <a href="#devicecmyk">devicecmyk</a> | <a href="#devicenchannel">devicenchannel</a>
   
 <span id="devicegray">devicegray</span> ::=
   ~"device-gray(" <a href="#gray">gray</a> ")"
   
 <span id="devicergb">devicergb</span> ::=
@@ -775,20 +775,20 @@ or when all rendering-intents are provid
 <span id="namedColor">namedColor</span> ::=
   <a href="#name">name</a>
   
 <span id="fallback">fallback</span> ::=
   <a href="#color">color</a>
   
 <span id="color">color</span>  ::= 
   "#" <a href="#hexdigit">hexdigit</a> <a href="#hexdigit">hexdigit</a> <a href="#hexdigit">hexdigit</a> (<a href="#hexdigit">hexdigit</a> <a href="#hexdigit">hexdigit</a> <a href="#hexdigit">hexdigit</a>)?
-  | ~"rgb(" <a href="#wsp">wsp</a>* <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a href="#wsp">wsp</a>* ")"
-  | ~"rgb(" <a href="#wsp">wsp</a>* <a href="#integer">integer</a> "%" <a href="#comma">comma</a> <a href="#integer">integer</a> "%" <a href="#comma">comma</a> <a href="#integer">integer</a> "%" <a href="#wsp">wsp</a>* ")"
-  | ~"hsl(" <a href="#wsp">wsp</a>* <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a href="#wsp">wsp</a>* ")"
-  | ~"hsla(" <a href="#wsp">wsp</a>* <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a href="#wsp">wsp</a>* ")"
+  | ~"rgb(" <a>wsp</a>* <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a>wsp</a>* ")"
+  | ~"rgb(" <a>wsp</a>* <a href="#integer">integer</a> "%" <a href="#comma">comma</a> <a href="#integer">integer</a> "%" <a href="#comma">comma</a> <a href="#integer">integer</a> "%" <a>wsp</a>* ")"
+  | ~"hsl(" <a>wsp</a>* <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a>wsp</a>* ")"
+  | ~"hsla(" <a>wsp</a>* <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a>wsp</a>* ")"
   | <a href="#color-keyword">color-keyword</a>
   
 <span id="hexdigit">hexdigit</span> ::= 
   [0-9A-Fa-f]
   
 <span id="number">number</span> ::= 
   <a href="#sign">sign</a>? <a href="#digit-sequence">digit-sequence</a>? "." <a href="#digit-sequence">digit-sequence</a>
   
@@ -805,27 +805,20 @@ or when all rendering-intents are provid
   ":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [
   #xF8-#x2FF] | [#x370-#x37D] | [#x37F-#x1FFF] | [#x200C-#x200D] |
   [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] |
   [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF]
    
 <span id="namechar">namechar</span> ::=
   <a href="#namestartchar">namestartchar</a> | "-" | "." | [0-9] | #xB7 | [#x0300-#x036F] |
   [#x203F-#x2040]
-
-  
-<span id="comma-wsp">comma-wsp</span> ::=
-  (<a href="#wsp">wsp</a>+ <a href="#comma">comma</a>? <a href="#wsp">wsp</a>*) | (<a href="#comma">comma</a> <a href="#wsp">wsp</a>*)
   
 <span id="comma">comma</span> ::=
   ","
   
-<span id="wsp">wsp</span> ::=
-  (#x20 | #x9 | #xD | #xA)
-  
 <span id="color-keyword">color-keyword</span> ::=
   ~"aliceblue" | ~"antiquewhite" | ~"aqua" | ~"aquamarine" | ~"azure" | ~"beige" | 
   ~"bisque" | ~"black" | ~"blanchedalmond" | ~"blue" | ~"blueviolet" | ~"brown" | 
   ~"burlywood" |~"cadetblue" | ~"chartreuse" | ~"chocolate" | ~"coral" | ~"cornflowerblue" |
   ~"cornsilk" | ~"crimson" | ~"cyan" | ~"darkblue" | ~"darkcyan" | ~"darkgoldenrod" | 
   ~"darkgray" | ~"darkgreen" | ~"darkgrey" | ~"darkkhaki" | ~"darkmagenta" | ~"darkolivegreen" | 
   ~"darkorange" | ~"darkorchid" | ~"darkred" | ~"darksalmon" | ~"darkseagreen" | ~"darkslateblue" | 
   ~"darkslategray" | ~"darkslategrey" | ~"darkturquoise" | ~"darkviolet" | ~"deeppink" | ~"deepskyblue" | 
diff --git a/master/shapes.html b/master/shapes.html
--- a/master/shapes.html
+++ b/master/shapes.html
@@ -632,37 +632,33 @@ notation is used:</p>
   <li>*: 0 or more</li>
   <li>+: 1 or more</li>
   <li>?: 0 or 1</li>
   <li>(): grouping</li>
   <li>|: separates alternatives</li>
   <li>double quotes surround literals</li>
 </ul>
 
-<pre>
+<pre class='grammar'>
 list-of-points:
-    wsp* coordinate-pairs? wsp*
+    <a>wsp</a>* coordinate-pairs? <a>wsp</a>*
 coordinate-pairs:
     coordinate-pair
-    | coordinate-pair comma-wsp coordinate-pairs
+    | coordinate-pair <a>comma-wsp</a> coordinate-pairs
 coordinate-pair:
-    coordinate comma-wsp coordinate
+    coordinate <a>comma-wsp</a> coordinate
     | coordinate negative-coordinate
 coordinate:
     number
 number:
     sign? integer-constant
     | sign? floating-point-constant
 negative-coordinate:
     "-" integer-constant
     | "-" floating-point-constant
-comma-wsp:
-    (wsp+ comma? wsp*) | (comma wsp*)
-comma:
-    ","
 integer-constant:
     digit-sequence
 floating-point-constant:
     fractional-constant exponent?
     | digit-sequence exponent
 fractional-constant:
     digit-sequence? "." digit-sequence
     | digit-sequence "."
@@ -670,18 +666,16 @@ exponent:
     ( "e" | "E" ) sign? digit-sequence
 sign:
     "+" | "-"
 digit-sequence:
     digit
     | digit digit-sequence
 digit:
     "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"
-wsp:
-    (#x20 | #x9 | #xD | #xA)+
 </pre>
 
 <p class="ready-for-wg-review">
 If data not matching the grammar is encountered, then the points specification is in error
 (see <a href="implnote.html#ErrorProcessing">Error Processing</a>).
 </p>
 
 <h2 id="DOMInterfaces">DOM interfaces</h2>
Received on Monday, 26 May 2014 10:58:22 UTC

This archive was generated by hypermail 2.3.1 : Tuesday, 6 January 2015 21:20:19 UTC