fixed pitch and range syntax to allow combining keyword and relative change (consistent with voice-volume and voice-rate)

Author: danielweck

css3-speech/Overview.html

@@ -90,13 +90,13 @@
 
    <h1 id=top>CSS Speech Module</h1>
 
-   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 13 July 2011</h2>
+   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 14 July 2011</h2>
 
    <dl>
     <dt>This version:
 
     <dd>
-     <!--<a href="http://www.w3.org/TR/2011/WD-css3-speech-20110713">http://www.w3.org/TR/2011/ED-css3-speech-20110713/</a>-->
+     <!--<a href="http://www.w3.org/TR/2011/WD-css3-speech-20110714">http://www.w3.org/TR/2011/ED-css3-speech-20110714/</a>-->
      <a
      href="http://dev.w3.org/csswg/css3-speech">http://dev.w3.org/csswg/css3-speech</a>
 
@@ -2166,8 +2166,9 @@ <h3 id=voice-props-voice-pitch><span class=secno>10.3. </span>The &lsquo;<a
     <tr>
      <td> <em>Value:</em>
 
-     <td>&lt;frequency&gt; &amp;&amp; absolute? | &lt;semitones&gt; |
-      &lt;percentage&gt; | x-low | low | medium | high | x-high
+     <td>&lt;frequency&gt; &amp;&amp; absolute | [[x-low | low | medium |
+      high | x-high] || [&lt;frequency&gt; | &lt;semitones&gt; |
+      &lt;percentage&gt;]]
 
     <tr>
      <td> <em>Initial:</em>
@@ -2308,8 +2309,9 @@ <h3 id=voice-props-voice-range><span class=secno>10.4. </span>The &lsquo;<a
     <tr>
      <td> <em>Value:</em>
 
-     <td>&lt;frequency&gt; &amp;&amp; absolute? | &lt;semitones&gt; |
-      &lt;percentage&gt; | x-low | low | medium | high | x-high
+     <td>&lt;frequency&gt; &amp;&amp; absolute | [[x-low | low | medium |
+      high | x-high] || [&lt;frequency&gt; | &lt;semitones&gt; |
+      &lt;percentage&gt;]]
 
     <tr>
      <td> <em>Initial:</em>
@@ -3113,8 +3115,9 @@ <h2 class=no-num id=property-index>Appendix A &mdash; Property index</h2>
     <tr>
      <td><a class=property href="#voice-pitch">voice-pitch</a>
 
-     <td>&lt;frequency&gt; &amp;&amp; absolute? | &lt;semitones&gt; |
-      &lt;percentage&gt; | x-low | low | medium | high | x-high
+     <td>&lt;frequency&gt; &amp;&amp; absolute | [[x-low | low | medium |
+      high | x-high] || [&lt;frequency&gt; | &lt;semitones&gt; |
+      &lt;percentage&gt;]]
 
      <td>medium
 
@@ -3129,8 +3132,9 @@ <h2 class=no-num id=property-index>Appendix A &mdash; Property index</h2>
     <tr>
      <td><a class=property href="#voice-range">voice-range</a>
 
-     <td>&lt;frequency&gt; &amp;&amp; absolute? | &lt;semitones&gt; |
-      &lt;percentage&gt; | x-low | low | medium | high | x-high
+     <td>&lt;frequency&gt; &amp;&amp; absolute | [[x-low | low | medium |
+      high | x-high] || [&lt;frequency&gt; | &lt;semitones&gt; |
+      &lt;percentage&gt;]]
 
      <td>medium
 
@@ -3627,7 +3631,8 @@ <h2 class=no-num id=changes>Appendix D &mdash; Changes from previous draft</h2>
    <li>Fixed "computed value" for &lsquo;<a href="#voice-pitch"><code
     class=property>voice-pitch</code></a>&rsquo; and &lsquo;<a
     href="#voice-range"><code class=property>voice-range</code></a>&rsquo;
-    properties.
+    properties, and added the possibility to combine a keyword with a
+    relative change.
 
    <li>Removed the "phonemes" property (and its associated "@alphabet"
     at-rule).
@@ -3679,6 +3684,9 @@ <h2 class=no-num id=changes>Appendix D &mdash; Changes from previous draft</h2>
     between stereo left-right sound axis and three-dimensional sound stage
     (azimuth support in future versions of CSS-Speech).
 
+   <li>Fixed the "computed value" for &lsquo;<a href="#voice-balance"><code
+    class=property>voice-balance</code></a>&rsquo;.
+
    <li>Added the &lsquo;<code class=property>normal</code>&rsquo; value for
     voice-rate ("default" in SSML 1.1).
 

css3-speech/Overview.src.html

@@ -1712,8 +1712,8 @@ <h3 id="voice-props-voice-pitch">The 'voice-pitch' property</h3>
           <td>
             <em>Value:</em>
           </td>
-          <td>&lt;frequency&gt; &amp;&amp; absolute? | &lt;semitones&gt; | &lt;percentage&gt; |
-            x-low | low | medium | high | x-high </td>
+          <td>&lt;frequency&gt; &amp;&amp; absolute | [[x-low | low | medium | high | x-high] ||
+            [&lt;frequency&gt; | &lt;semitones&gt; | &lt;percentage&gt;]] </td>
         </tr>
         <tr>
           <td>
@@ -1847,8 +1847,8 @@ <h3 id="voice-props-voice-range">The 'voice-range' property</h3>
           <td>
             <em>Value:</em>
           </td>
-          <td>&lt;frequency&gt; &amp;&amp; absolute? | &lt;semitones&gt; | &lt;percentage&gt; |
-            x-low | low | medium | high | x-high </td>
+          <td>&lt;frequency&gt; &amp;&amp; absolute | [[x-low | low | medium | high | x-high] ||
+            [&lt;frequency&gt; | &lt;semitones&gt; | &lt;percentage&gt;]] </td>
         </tr>
         <tr>
           <td>
@@ -2592,7 +2592,8 @@ <h2 class="no-num" id="changes">Appendix D &mdash; Changes from previous draft</
       <li>Renamed 'voice-pitch-range' to 'voice-range', which is compatible with SSML's notation,
         and removes the possibility to interpret this property as being a subset of
         'voice-pitch'.</li>
-      <li>Fixed "computed value" for 'voice-pitch' and 'voice-range' properties.</li>
+      <li>Fixed "computed value" for 'voice-pitch' and 'voice-range' properties, and added the
+        possibility to combine a keyword with a relative change.</li>
       <li>Removed the "phonemes" property (and its associated "@alphabet" at-rule).</li>
       <li>Renamed 'speakability' to 'speak', and 'speak' to 'speak-as'. Reorganized the 'speak-as'
         values to allow mixing different types.</li>
@@ -2613,6 +2614,7 @@ <h2 class="no-num" id="changes">Appendix D &mdash; Changes from previous draft</
       <li>Added prose for 'voice-balance' to describe the mapping between stereo left-right sound
         axis and three-dimensional sound stage (azimuth support in future versions of
         CSS-Speech).</li>
+      <li>Fixed the "computed value" for 'voice-balance'.</li>
       <li>Added the 'normal' value for voice-rate ("default" in SSML 1.1).</li>
       <li>Fixed the "computed value" for voice-rate, and added the possibility to combine keywords
         and percentages (to be consistent with 'voice-volume'). Added an example to illustrate