--- a/master/color.html	Sat May 26 19:59:28 2012 -0700
+++ b/master/color.html	Sun May 27 13:02:30 2012 +1000
@@ -188,7 +188,7 @@
         href="animate.html#Animatable">Animatable</a>:
         no.</span></dd>
         <dt id="ColorProfileElementNameAttribute"><span class="adef">name</span> = "<span
-        class="attr-value">&lt;name&gt;</span>"</dt>
+        class="attr-value">&lt;author-ident&gt;</span>"</dt>
         <dd>The name which is used as the first parameter for <span
         class="prop-value">icc-color</span> specifications within
         <a>'fill'</a>, <a>'stroke'</a>, <a>'stop-color'</a>,
@@ -196,10 +196,10 @@
         values to identify the color profile to use for the ICC
         color specification and the name which can be the value of
         the <a>'color-profile element'</a> property. Note
-        that if &lt;name&gt; is not provided, it will be impossible
+        that if 'name' is not provided, it will be impossible
         to reference the given color profile description. The name
         "sRGB" is predefined; any color profile descriptions with
-        <span class="attr-value">&lt;name&gt;</span> set to "sRGB"
+        <span class="attr-value">&lt;author-ident&gt;</span> set to "sRGB"
         will be ignored. For consistency with <a
         href="http://www.w3.org/TR/2008/REC-CSS2-20080411/grammar.html#q2">CSS
         lexical scanning and parsing rules</a>
@@ -373,7 +373,7 @@
           class="propinfo" cellspacing="0" cellpadding="0">
             <tr>
               <td><em>Values:</em></td>
-              <td>&lt;name&gt;</td>
+              <td><a>&lt;author-ident&gt;</a></td>
             </tr>
             <tr>
               <td><em>Initial:</em></td>
@@ -389,9 +389,9 @@
     </div>
 
 <dl>
-  <dt><span class='prop-value'>&lt;name&gt;</span></dt>
+  <dt><span class='prop-value'><a>&lt;author-ident&gt;</a></span></dt>
   <dd>See the description for the <a>'color-profile/name'</a> attribute on the
-  <a>'color-profile element'</a> element. Note that if &lt;name&gt; is not
+  <a>'color-profile element'</a> element. Note that if 'name' is not
   provided, it will be impossible to reference the given @color-profile
   definition.</dd>
 </dl>
@@ -431,51 +431,44 @@
 
 <h3 id="ColorProfileProperty">The <span class="property">'color-profile'</span> property</h3>
 
-    <div class="propdef">
-      <dl>
-        <dt><span class="propdef-title property">'color-profile'</span></dt>
-        <dd>
-          <table summary="color-profile property" class="propinfo"
-          cellspacing="0" cellpadding="0">
-            <tr valign="baseline">
-              <td><em>Value:</em>&nbsp;&nbsp;</td>
-              <td>auto | sRGB | &lt;name&gt; | <a
-              href="types.html#DataTypeIRI">&lt;iri&gt;</a> | <a
-              class="noxref"
-              href="http://www.w3.org/TR/2008/REC-CSS2-20080411/cascade.html#value-def-inherit">
-              <span
-              class="value-inst-inherit noxref">inherit</span></a></td>
-            </tr>
-            <tr valign="baseline">
-              <td><em>Initial:</em>&nbsp;&nbsp;</td>
-              <td>auto</td>
-            </tr>
-            <tr valign="baseline">
-              <td><em>Applies to:</em>&nbsp;&nbsp;</td>
-              <td><a>'image'</a> elements that
-              refer to raster images</td>
-            </tr>
-            <tr valign="baseline">
-              <td><em>Inherited:</em>&nbsp;&nbsp;</td>
-              <td>yes</td>
-            </tr>
-            <tr valign="baseline">
-              <td><em>Percentages:</em>&nbsp;&nbsp;</td>
-              <td>N/A</td>
-            </tr>
-            <tr valign="baseline">
-              <td><em>Media:</em>&nbsp;&nbsp;</td>
-              <td>visual</td>
-            </tr>
-            <tr valign="baseline">
-              <td><em><a
-              href="animate.html#Animatable">Animatable</a>:</em>&nbsp;&nbsp;</td>
-              <td>yes</td>
-            </tr>
-          </table>
-        </dd>
-      </dl>
-    </div>
+<table class="propdef">
+  <tr>
+    <th>Name:</th>
+    <td><dfn id="ColorProfileProperty">color-profile</dfn></td>
+  </tr>
+  <tr>
+    <th>Value:</th>
+    <td>auto | sRGB | <a>&lt;author-ident&gt;</a> | <a>&lt;funciri&gt;</a></td>
+  </tr>
+  <tr>
+    <th>Initial:</th>
+    <td>none</td>
+  </tr>
+  <tr>
+    <th>Applies to:</th>
+    <td><a>'image'</a> elements that refer to raster images</td>
+  </tr>
+  <tr>
+    <th>Inherited:</th>
+    <td>yes</td>
+  </tr>
+  <tr>
+    <th>Percentages:</th>
+    <td>N/A</td>
+  </tr>
+  <tr>
+    <th>Media:</th>
+    <td>visual</td>
+  </tr>
+  <tr>
+    <th>Computed&#160;value:</th>
+    <td>as specified, but with <a>&lt;funciri&gt;</a> values made absolute</td>
+  </tr>
+  <tr>
+    <th><a href="animate.html#Animatable">Animatable</a>:</th>
+    <td>yes</td>
+  </tr>
+</table>
 
 <dl>
   <dt><span class='prop-value'>auto</span></dt>
@@ -499,13 +492,13 @@
     industry practice.</p>
   </dd>
 
-  <dt><span class='prop-value'>&lt;name&gt;</span></dt>
+  <dt><span class='prop-value'><a>&lt;author-ident&gt;</a></span></dt>
   <dd>A name corresponding to a defined color profile that is
   in the user agent's color profile description database. The
   user agent searches the color profile description database
   for a <a href="color.html#ColorProfileDescriptions">color
   profile description</a> entry whose name descriptor matches
-  &lt;name&gt; and uses the last matching entry that is found.
+  &lt;author-ident&gt; and uses the last matching entry that is found.
   If a match is found, the corresponding profile overrides an
   embedded profile inside an image. If no match is found, then
   the embedded profile inside the image is used.</dd>

--- a/master/definitions.xml	Sat May 26 19:59:28 2012 -0700
+++ b/master/definitions.xml	Sun May 27 13:02:30 2012 +1000
@@ -1508,6 +1508,7 @@
   <!-- ... grammar symbols ................................................ -->
   <symbol name='angle' href='types.html#DataTypeAngle'/>
   <symbol name='anything' href='types.html#DataTypeAnything'/>
+  <symbol name='author-ident' href='http://dev.w3.org/csswg/css3-values/#identifiers'/>
   <symbol name='color' href='types.html#DataTypeColor'/>
   <symbol name='coordinate' href='types.html#DataTypeCoordinate'/>
   <symbol name='dasharray' href='painting.html#DataTypeDasharray'/>

--- a/master/fonts.html	Sat May 26 19:59:28 2012 -0700
+++ b/master/fonts.html	Sun May 27 13:02:30 2012 +1000
@@ -359,7 +359,7 @@
         no.</span></dd>
         <dt id="GlyphElementGlyphNameAttribute"><span
         class="adef">glyph-name</span> = "<span
-        class="attr-value">&lt;name&gt; [, &lt;name&gt; ]*</span>
+        class="attr-value">&lt;author-ident&gt; [, &lt;author-ident&gt; ]*</span>
         "</dt>
         <dd>A name for the glyph. It is recommended that glyph
         names be unique within a font. The glyph names can be used
@@ -684,7 +684,7 @@
         no.</span></dd>
         <dt id="HKernElementG1Attribute"><span
         class="adef">g1</span> = "<span
-        class="attr-value">&lt;name&gt; [, &lt;name&gt; ]*</span>
+        class="attr-value">&lt;author-ident&gt; [, &lt;author-ident&gt; ]*</span>
         "</dt>
         <dd>A sequence (comma-separated) of glyph names (i.e.,
         values that match <a>'glyph/glyph-name'</a> attributes
@@ -708,7 +708,7 @@
         no.</span></dd>
         <dt id="HKernElementG2Attribute"><span
         class="adef">g2</span> = "<span
-        class="attr-value">&lt;name&gt; [, &lt;name&gt; ]*</span>
+        class="attr-value">&lt;author-ident&gt; [, &lt;author-ident&gt; ]*</span>
         "</dt>
         <dd>Same as the <a>'g1'</a> attribute, except that <a>'g2'</a>
         specifies possible second

--- a/master/painting.html	Sat May 26 19:59:28 2012 -0700
+++ b/master/painting.html	Sun May 27 13:02:30 2012 +1000
@@ -93,7 +93,7 @@
   description database for a <a
   href="color.html#ColorProfileDescriptions">color profile
   description</a> entry whose name descriptor matches
-  the &lt;name&gt; part of the <a href="types.html#DataTypeICCColor">&lt;icccolor&gt;</a>
+  the &lt;author-ident&gt; part of the <a href="types.html#DataTypeICCColor">&lt;icccolor&gt;</a>
   and uses the last matching entry that is found.
   (If no match is found, then the ICC color specification is
   ignored.) The comma and/or whitespace separated list

--- a/master/propidx.html	Sat May 26 19:59:28 2012 -0700
+++ b/master/propidx.html	Sun May 27 13:02:30 2012 +1000
@@ -182,7 +182,7 @@
         </tr>
         <tr>
           <td><a>'color-profile property'</a></td>
-          <td>auto | sRGB | &lt;name&gt; | <a
+          <td>auto | sRGB | &lt;author-ident&gt; | <a
           href="types.html#DataTypeFuncIRI">&lt;funciri&gt;</a> | <a
           class="noxref"
           href="http://www.w3.org/TR/2008/REC-CSS2-20080411/cascade.html#value-def-inherit">

--- a/master/types.html	Sat May 26 19:59:28 2012 -0700
+++ b/master/types.html	Sun May 27 13:02:30 2012 +1000
@@ -393,8 +393,7 @@
     a <a>'color-profile element'</a> element, and one or more color component
     values.  The grammar is as follows:</p>
 
-    <pre class='grammar'><span id='ICCColor'>icccolor</span> ::= "icc-color(" <a href='#Name'>name</a> (<a href='#CommaWSP'>comma-wsp</a> <a href='#Number'>number</a>)+ ")"
-name     ::= [^,()#x20#x9#xD#xA] /* any char except ",", "(", ")" or wsp */</pre>
+    <pre class='grammar'><span id='ICCColor'>icccolor</span> ::= "icc-color(" author-ident (<a href='#CommaWSP'>comma-wsp</a> <a href='#Number'>number</a>)+ ")"</pre>
 
     <p>The corresponding SVG DOM interface for &lt;icccolor&gt; is
     <a>SVGICCColor</a>.</p>
@@ -553,13 +552,6 @@
     or <a>SVGAnimatedLengthList</a> object.</p>
   </dd>
   
-  <dt id="DataTypeName">&lt;name&gt;</dt>
-  <dd>
-    <p>A name, which is a string where a few characters of syntactic significance are disallowed.</p>
-
-    <pre class="grammar"><span id="Name">name</span>  ::= [^,()#x20#x9#xD#xA] /* any char except ",", "(", ")" or wsp */</pre>
-  </dd>
-  
   <dt id='DataTypeNumber'>&lt;number&gt;</dt>
   <dd>
     <p>Real numbers are specified in one of two ways.  When used in a style sheet,