--- a/master/color.html	Tue Aug 21 14:11:36 2012 +1000
+++ b/master/color.html	Tue Aug 21 14:16:48 2012 +1000
@@ -782,161 +782,161 @@
 <a>'color-profile element'</a> element.</p>
   
   
-  <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>
+<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>)+ ")" 
+  
+<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> ")" 
+  
+<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> ")" 
+  
+<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> ")" 
+  
+<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> ::=
+  ~"device-rgb(" <a href="#red">red</a> <a href="#green">green</a> <a href="#blue">blue</a> ")"
+  
+<span id="devicecmyk">devicecmyk</span> ::=
+  ~"device-cmyk(" <a href="#cyan">cyan</a> <a href="#magenta">magenta</a> <a href="#yellow">yellow</a> <a href="#black">black</a> ")"
+  
+<span id="devicenchannel">devicenchannel</span> ::=
+  ~"device-nchannel(" <a href="#number">number</a>+ ")"
+  
+<span id="name">name</span> ::=
+  <a href="#namestartchar">namestartchar</a> (<a href="#namechar">namechar</a>)*
+  
+<span id="lightness">lightness</span> ::=
+  <a href="#number">number</a>
+  
+<span id="a-value">a-value</span> ::=
+  <a href="#number">number</a>
+  
+<span id="b-value">b-value</span> ::=
+  <a href="#number">number</a>
+  
+<span id="chroma">chroma</span> ::=
+  <a href="#number">number</a>
+  
+<span id="hue">hue</span> ::=
+  <a href="#number">number</a>
   
   
-  <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>)+ ")" 
-    
-    <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> ")" 
-    
-    <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>  ")" 
-    
-    <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>  ")" 
-    
-    <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> ::=
-    ~"device-rgb(" <a href="#red">red</a> <a href="#green">green</a> <a href="#blue">blue</a> ")"
-    
-    <span id="devicecmyk">devicecmyk</span> ::=
-    ~"device-cmyk(" <a href="#cyan">cyan</a> <a href="#magenta">magenta</a> <a href="#yellow">yellow</a> ><a href="#black">black</a> ")"
-    
-    <span id="devicenchannel">devicenchannel</span> ::=
-    ~"device-nchannel(" <a href="#number">number</a>+ ")"
-    
-    <span id="name">name</span> ::=
-    <a href="#namestartchar">namestartchar</a> (<a href="#namechar">namechar</a>)*
-    
-    <span id="lightness">lightness</span> ::=
-    <a href="#number">number</a>
-    
-    <span id="a-value">a-value</span> ::=
-    <a href="#number">number</a>
-    
-    <span id="b-value">b-value</span> ::=
-    <a href="#number">number</a>
-    
-    <span id="chroma">chroma</span> ::=
-    <a href="#number">number</a>
-    
-    <span id="hue">hue</span> ::=
-    <a href="#number">number</a>
-    
-    
-    <span id="gray">gray</span> ::=
-    <a href="#number">number</a>
-    
-    <span id="red">red</span> ::=
-    <a href="#number">number</a>
-    
-    <span id="green">green</span> ::=
-    <a href="#number">number</a>
-    
-    <span id="blue">blue</span> ::=
-    <a href="#number">number</a>
-    
-    <span id="cyan">cyan</span> ::=
-    <a href="#number">number</a>
-    
-    <span id="magenta">magenta</span> ::=
-    <a href="#number">number</a>
-    
-    <span id="yellow">yellow</span> ::=
-    <a href="#number">number</a>
-    
-    <span id="black">black</span> ::=
-    <a href="#number">number</a>
-    
-    <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>* ")"
-    | <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>
-    
-    <span id="sign">sign</span>::=
-    "+" | "-"
-    
-    <span id="integer">integer</span> ::=
-    <a href="#digit-sequence">digit-sequence</a>
-    
-    <span id="digit-sequence">digit-sequence</span> ::=
-    [0-9]+
-    
-    <span id="namestartchar">namestartchar</span> ::=   	
-    ":" | [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="gray">gray</span> ::=
+  <a href="#number">number</a>
   
-    
-    <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" | 
-    ~"dimgray" | ~"dimgrey" | ~"dodgerblue" | ~"firebrick" | ~"floralwhite" | ~"forestgreen" | 
-    ~"fuchsia" | ~"gainsboro" | ~"ghostwhite" | ~"gold" | ~"goldenrod" | ~"gray" | 
-    ~"grey" | ~"green" | ~"greenyellow" | ~"honeydew" | ~"hotpink" | ~"indianred" | 
-    ~"indigo" | ~"ivory" | ~"khaki" | ~"lavender" | ~"lavenderblush" | ~"lawngreen" | 
-    ~"lemonchiffon" | ~"lightblue" | ~"lightcoral" | ~"lightcyan" | ~"lightgoldenrodyellow" | ~"lightgray" | 
-    ~"lightgreen" | ~"lightgrey" | ~"lightpink" | ~"lightsalmon" | ~"lightseagreen" | ~"lightskyblue" | 
-    ~"lightslategray" | ~"lightslategrey" | ~"lightsteelblue" | ~"lightyellow" | ~"lime" | 
-    ~"limegreen" | ~"linen" | ~"magenta" | ~"maroon" | ~"mediumaquamarine" | ~"mediumblue" | 
-    ~"mediumorchid" | ~"mediumpurple" | ~"mediumseagreen" | ~"mediumslateblue" | ~"mediumspringgreen" | ~"mediumturquoise" |
-    ~"mediumvioletred" | ~"midnightblue" | ~"mintcream" | ~"mistyrose" | ~"moccasin" | ~"navajowhite" | 
-    ~"navy" | ~"oldlace" | ~"olive" | ~"olivedrab" | ~"orange" | ~"orangered" | 
-    ~"orchid" | ~"palegoldenrod" | ~"palegreen" | ~"paleturquoise" | ~"palevioletred" | ~"papayawhip" | 
-    ~"peachpuff" | ~"peru" | ~"pink" | ~"plum" | ~"powderblue" | ~"purple" | 
-    ~"red" | ~"rosybrown" | ~"royalblue" | ~"saddlebrown" | ~"salmon" | ~"sandybrown" | 
-    ~"seagreen" | ~"seashell" | ~"sienna" | ~"silver" | ~"skyblue" | ~"slateblue" | 
-    ~"slategray" | ~"slategrey" | ~"snow" | ~"springgreen" | ~"steelblue" | ~"tan" | 
-    ~"teal" | ~"thistle" | ~"tomato" | ~"turquoise" | ~"violet" | ~"wheat" | 
-    ~"white" | ~"whitesmoke" | ~"yellow" | ~"yellowgreen" 
-  </pre>
+<span id="red">red</span> ::=
+  <a href="#number">number</a>
   
+<span id="green">green</span> ::=
+  <a href="#number">number</a>
   
- </div>
+<span id="blue">blue</span> ::=
+  <a href="#number">number</a>
+  
+<span id="cyan">cyan</span> ::=
+  <a href="#number">number</a>
+  
+<span id="magenta">magenta</span> ::=
+  <a href="#number">number</a>
+  
+<span id="yellow">yellow</span> ::=
+  <a href="#number">number</a>
+  
+<span id="black">black</span> ::=
+  <a href="#number">number</a>
+  
+<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>* ")"
+  | <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>
+  
+<span id="sign">sign</span>::=
+  "+" | "-"
+  
+<span id="integer">integer</span> ::=
+  <a href="#digit-sequence">digit-sequence</a>
+  
+<span id="digit-sequence">digit-sequence</span> ::=
+  [0-9]+
+  
+<span id="namestartchar">namestartchar</span> ::=   	
+  ":" | [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" | 
+  ~"dimgray" | ~"dimgrey" | ~"dodgerblue" | ~"firebrick" | ~"floralwhite" | ~"forestgreen" | 
+  ~"fuchsia" | ~"gainsboro" | ~"ghostwhite" | ~"gold" | ~"goldenrod" | ~"gray" | 
+  ~"grey" | ~"green" | ~"greenyellow" | ~"honeydew" | ~"hotpink" | ~"indianred" | 
+  ~"indigo" | ~"ivory" | ~"khaki" | ~"lavender" | ~"lavenderblush" | ~"lawngreen" | 
+  ~"lemonchiffon" | ~"lightblue" | ~"lightcoral" | ~"lightcyan" | ~"lightgoldenrodyellow" | ~"lightgray" | 
+  ~"lightgreen" | ~"lightgrey" | ~"lightpink" | ~"lightsalmon" | ~"lightseagreen" | ~"lightskyblue" | 
+  ~"lightslategray" | ~"lightslategrey" | ~"lightsteelblue" | ~"lightyellow" | ~"lime" | 
+  ~"limegreen" | ~"linen" | ~"magenta" | ~"maroon" | ~"mediumaquamarine" | ~"mediumblue" | 
+  ~"mediumorchid" | ~"mediumpurple" | ~"mediumseagreen" | ~"mediumslateblue" | ~"mediumspringgreen" |
+  ~"mediumturquoise" | ~"mediumvioletred" | ~"midnightblue" | ~"mintcream" | ~"mistyrose" |
+  ~"moccasin" | ~"navajowhite" | ~"navy" | ~"oldlace" | ~"olive" | ~"olivedrab" | ~"orange" | ~"orangered" | 
+  ~"orchid" | ~"palegoldenrod" | ~"palegreen" | ~"paleturquoise" | ~"palevioletred" | ~"papayawhip" | 
+  ~"peachpuff" | ~"peru" | ~"pink" | ~"plum" | ~"powderblue" | ~"purple" | 
+  ~"red" | ~"rosybrown" | ~"royalblue" | ~"saddlebrown" | ~"salmon" | ~"sandybrown" | 
+  ~"seagreen" | ~"seashell" | ~"sienna" | ~"silver" | ~"skyblue" | ~"slateblue" | 
+  ~"slategray" | ~"slategrey" | ~"snow" | ~"springgreen" | ~"steelblue" | ~"tan" | 
+  ~"teal" | ~"thistle" | ~"tomato" | ~"turquoise" | ~"violet" | ~"wheat" | 
+  ~"white" | ~"whitesmoke" | ~"yellow" | ~"yellowgreen" 
+</pre>
+
+
+</div>
  
 
 <h2 id="DOMInterfaces">DOM interfaces</h2>