missing voice-family commit

Author: danielweck

css3-speech/Overview.html

@@ -1717,9 +1717,8 @@ <h3 id=voice-props-voice-family><span class=secno>10.1. </span>The
     <tr>
      <td> <em>Value:</em>
 
-     <td> [[&lt;name&gt; | [&lt;age&gt;? &lt;gender&gt; &lt;non-negative
-      number&gt;?]],]* [&lt;name&gt; | [&lt;age&gt;? &lt;gender&gt;
-      &lt;non-negative number&gt;?]] | preserve
+     <td> [[&lt;name&gt; | &lt;generic-voice&gt;],]* [&lt;name&gt; |
+      &lt;generic-voice&gt;] | preserve
 
     <tr>
      <td> <em>Initial:</em>
@@ -1758,7 +1757,10 @@ <h3 id=voice-props-voice-family><span class=secno>10.1. </span>The
    synthesis voices (analogous to &lsquo;<code class=css><a
    href="#font-family-def"><code
    class=property>font-family</code></a></code>&rsquo; in visual style
-   sheets).
+   sheets), where:
+
+  <p> <strong>&lt;generic-voice&gt;</strong> = [&lt;age&gt;? &lt;gender&gt;
+   &lt;integer&gt;?]
 
   <p class=note> Note that the functionality provided by this property is
    related to the <a
@@ -1801,25 +1803,25 @@ <h3 id=voice-props-voice-family><span class=secno>10.1. </span>The
    <dt> <strong>&lt;age&gt;</strong>
 
    <dd>
-    <p> Possible values are <a href="#non-negative-number-def">non-negative
-     numbers</a> restricted to positive integers (i.e. excluding zero),
-     indicating the preferred age in years (since birth) of the voice.</p>
+    <p> An <a href="#integer-def">integer</a> indicating the preferred age in
+     years (since birth) of the voice. Only positive integers (i.e. excluding
+     zero) are allowed.</p>
 
    <dt> <strong>&lt;gender&gt;</strong>
 
    <dd>
-    <p>Values are voice families. Possible values are &lsquo;<code
-     class=property>male</code>&rsquo;, &lsquo;<code
-     class=property>female</code>&rsquo; and &lsquo;<code
-     class=property>neutral</code>&rsquo;.</p>
+    <p> One of the keywords &lsquo;<code class=property>male</code>&rsquo;,
+     &lsquo;<code class=property>female</code>&rsquo;, or &lsquo;<code
+     class=property>neutral</code>&rsquo;, specifying a male, female, or
+     neutral voice, respectively.</p>
 
-   <dt> <strong>&lt;non-negative number&gt;</strong>
+   <dt> <strong>&lt;integer&gt;</strong>
 
    <dd>
-    <p>Indicates a preferred variant (e.g. "the second male child voice").
-     Possible values are <a href="#non-negative-number-def">non-negative
-     numbers</a> restricted to integers, and excluding zero (i.e. starting
-     from 1). The value "1" refers to the first of all matching voices.</p>
+    <p>An <a href="#integer-def">integer</a> indicating the preferred variant
+     (e.g. "the second male child voice"). Only positive integers (i.e.
+     excluding zero) are allowed. The value "1" refers to the first of all
+     matching voices.</p>
 
    <dt> <strong>preserve</strong>
 
@@ -1828,9 +1830,8 @@ <h3 id=voice-props-voice-family><span class=secno>10.1. </span>The
      class=property>voice-family</code></a>&rsquo; value gets inherited and
      used regardless of any potential language change within the content
      markup (see the section below about voice selection and language
-     handling). This property value behaves similarly to &lsquo;<code
-     class=property>inherit</code>&rsquo; when applied to the root content
-     element (defaults to the user or user-agent stylesheet).</p>
+     handling). This value behaves as &lsquo;<code
+     class=property>inherit</code>&rsquo; when applied to the root element.</p>
 
     <p class=note> Note that descendants of the selected element
      automatically inherit the &lsquo;<code
@@ -2867,9 +2868,8 @@ <h2 class=no-num id=property-index>Appendix A &mdash; Property index</h2>
     <tr>
      <td><a class=property href="#voice-family">voice-family</a>
 
-     <td>[[&lt;name&gt; | [&lt;age&gt;? &lt;gender&gt; &lt;non-negative
-      number&gt;?]],]* [&lt;name&gt; | [&lt;age&gt;? &lt;gender&gt;
-      &lt;non-negative number&gt;?]] | preserve
+     <td>[[&lt;name&gt; | &lt;generic-voice&gt;],]* [&lt;name&gt; |
+      &lt;generic-voice&gt;] | preserve
 
      <td>implementation-dependent
 
@@ -3030,6 +3030,11 @@ <h2 class=no-num id=property-index>Appendix A &mdash; Property index</h2>
     &nbsp;&nbsp; <a href="#CSS3VAL"
     rel=biblioentry>[CSS3VAL]<!--{{!CSS3VAL}}--></a>
 
+   <li> <dfn id=integer-def> <a
+    href="http://www.w3.org/TR/css3-values/#ltintegergt"> integer </a></dfn>
+    &nbsp;&nbsp; <a href="#CSS3VAL"
+    rel=biblioentry>[CSS3VAL]<!--{{!CSS3VAL}}--></a>
+
    <li> <dfn id=non-negative-number-def> <a
     href="http://www.w3.org/TR/css3-values/#non-negative">
     non-negative-number </a></dfn> &nbsp;&nbsp; <a href="#CSS3VAL"
@@ -3090,6 +3095,8 @@ <h2 class=no-num id=index>Appendix B &mdash; Index</h2>
    <li>identifier, <a href="#identifier-def"
     title=identifier><strong>#</strong></a>
 
+   <li>integer, <a href="#integer-def" title=integer><strong>#</strong></a>
+
    <li>list-style-image, <a href="#list-style-image-def"
     title=list-style-image><strong>#</strong></a>
 

css3-speech/Overview.src.html

@@ -1342,9 +1342,8 @@ <h3 id="voice-props-voice-family">The 'voice-family' property</h3>
           <td>
             <em>Value:</em>
           </td>
-          <td> [[&lt;name&gt; | [&lt;age&gt;? &lt;gender&gt; &lt;non-negative number&gt;?]],]*
-            [&lt;name&gt; | [&lt;age&gt;? &lt;gender&gt; &lt;non-negative number&gt;?]] | preserve
-          </td>
+          <td> [[&lt;name&gt; | &lt;generic-voice&gt;],]* [&lt;name&gt; | &lt;generic-voice&gt;] |
+            preserve </td>
         </tr>
         <tr>
           <td>
@@ -1386,7 +1385,9 @@ <h3 id="voice-props-voice-family">The 'voice-family' property</h3>
     </table>
     <p>The 'voice-family' property specifies a comma-separated, prioritized list of values that
       designate speech synthesis voices (analogous to '<a href="#font-family-def"><code
-          class="property">font-family</code></a>' in visual style sheets).</p>
+          class="property">font-family</code></a>' in visual style sheets), where: </p>
+    <p>
+      <strong>&lt;generic-voice&gt;</strong> = [&lt;age&gt;? &lt;gender&gt; &lt;integer&gt;?] </p>
     <p class="note"> Note that the functionality provided by this property is related to the <a
         href="http://www.w3.org/TR/speech-synthesis11/#edef_voice"><code>voice</code> element</a>
       from the SSML markup language [[!SSML]]. </p>
@@ -1413,33 +1414,32 @@ <h3 id="voice-props-voice-family">The 'voice-family' property</h3>
         <strong>&lt;age&gt;</strong>
       </dt>
       <dd>
-        <p> Possible values are <a href="#non-negative-number-def">non-negative numbers</a>
-          restricted to positive integers (i.e. excluding zero), indicating the preferred age in
-          years (since birth) of the voice.</p>
+        <p> An <a href="#integer-def">integer</a> indicating the preferred age in years (since
+          birth) of the voice. Only positive integers (i.e. excluding zero) are allowed. </p>
       </dd>
       <dt>
         <strong>&lt;gender&gt;</strong>
       </dt>
       <dd>
-        <p>Values are voice families. Possible values are 'male', 'female' and 'neutral'.</p>
+        <p> One of the keywords 'male', 'female', or 'neutral', specifying a male, female, or
+          neutral voice, respectively. </p>
       </dd>
       <dt>
-        <strong>&lt;non-negative number&gt;</strong>
+        <strong>&lt;integer&gt;</strong>
       </dt>
       <dd>
-        <p>Indicates a preferred variant (e.g. "the second male child voice"). Possible values are
-            <a href="#non-negative-number-def">non-negative numbers</a> restricted to integers, and
-          excluding zero (i.e. starting from 1). The value "1" refers to the first of all matching
-          voices. </p>
+        <p>An <a href="#integer-def">integer</a> indicating the preferred variant (e.g. "the second
+          male child voice"). Only positive integers (i.e. excluding zero) are allowed. The value
+          "1" refers to the first of all matching voices. </p>
       </dd>
       <dt>
         <strong>preserve</strong>
       </dt>
       <dd>
         <p>Indicates that the 'voice-family' value gets inherited and used regardless of any
           potential language change within the content markup (see the section below about voice
-          selection and language handling). This property value behaves similarly to 'inherit' when
-          applied to the root content element (defaults to the user or user-agent stylesheet). </p>
+          selection and language handling). This value behaves as 'inherit' when applied to the root
+          element. </p>
         <p class="note"> Note that descendants of the selected element automatically inherit the
           'preserve' value, unless it is explicitly overridden by other 'voice-family' values (e.g.
           name, gender, age). </p>
@@ -2208,6 +2208,10 @@ <h2 class="no-num" id="property-index">Appendix A &mdash; Property index</h2>
         <dfn id="number-def">
           <a href="http://www.w3.org/TR/css3-values/#ltnumbergt"> number </a></dfn> &nbsp;&nbsp;
         [[!CSS3VAL]] </li>
+      <li>
+        <dfn id="integer-def">
+          <a href="http://www.w3.org/TR/css3-values/#ltintegergt"> integer </a></dfn> &nbsp;&nbsp;
+        [[!CSS3VAL]] </li>
       <li>
         <dfn id="non-negative-number-def">
           <a href="http://www.w3.org/TR/css3-values/#non-negative"> non-negative-number </a></dfn>