- From: Daniel Weck via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 06 Jul 2011 19:03:47 +0000
- To: public-css-commits@w3.org
Update of /sources/public/csswg/css3-speech
In directory hutz:/tmp/cvs-serv469
Modified Files:
Overview.html Overview.src.html
Log Message:
missing voice-family commit
Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-speech/Overview.html,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- Overview.html 6 Jul 2011 16:12:49 -0000 1.60
+++ Overview.html 6 Jul 2011 19:03:45 -0000 1.61
@@ -1717,9 +1717,8 @@
<tr>
<td> <em>Value:</em>
- <td> [[<name> | [<age>? <gender> <non-negative
- number>?]],]* [<name> | [<age>? <gender>
- <non-negative number>?]] | preserve
+ <td> [[<name> | <generic-voice>],]* [<name> |
+ <generic-voice>] | preserve
<tr>
<td> <em>Initial:</em>
@@ -1758,7 +1757,10 @@
synthesis voices (analogous to ‘<code class=css><a
href="#font-family-def"><code
class=property>font-family</code></a></code>’ in visual style
- sheets).
+ sheets), where:
+
+ <p> <strong><generic-voice></strong> = [<age>? <gender>
+ <integer>?]
<p class=note> Note that the functionality provided by this property is
related to the <a
@@ -1801,25 +1803,25 @@
<dt> <strong><age></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><gender></strong>
<dd>
- <p>Values are voice families. Possible values are ‘<code
- class=property>male</code>’, ‘<code
- class=property>female</code>’ and ‘<code
- class=property>neutral</code>’.</p>
+ <p> One of the keywords ‘<code class=property>male</code>’,
+ ‘<code class=property>female</code>’, or ‘<code
+ class=property>neutral</code>’, specifying a male, female, or
+ neutral voice, respectively.</p>
- <dt> <strong><non-negative number></strong>
+ <dt> <strong><integer></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 @@
class=property>voice-family</code></a>’ 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 ‘<code
- class=property>inherit</code>’ when applied to the root content
- element (defaults to the user or user-agent stylesheet).</p>
+ handling). This value behaves as ‘<code
+ class=property>inherit</code>’ when applied to the root element.</p>
<p class=note> Note that descendants of the selected element
automatically inherit the ‘<code
@@ -2867,9 +2868,8 @@
<tr>
<td><a class=property href="#voice-family">voice-family</a>
- <td>[[<name> | [<age>? <gender> <non-negative
- number>?]],]* [<name> | [<age>? <gender>
- <non-negative number>?]] | preserve
+ <td>[[<name> | <generic-voice>],]* [<name> |
+ <generic-voice>] | preserve
<td>implementation-dependent
@@ -3030,6 +3030,11 @@
<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>
+ <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> <a href="#CSS3VAL"
@@ -3090,6 +3095,8 @@
<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>
Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-speech/Overview.src.html,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- Overview.src.html 6 Jul 2011 16:12:49 -0000 1.61
+++ Overview.src.html 6 Jul 2011 19:03:45 -0000 1.62
@@ -1342,9 +1342,8 @@
<td>
<em>Value:</em>
</td>
- <td> [[<name> | [<age>? <gender> <non-negative number>?]],]*
- [<name> | [<age>? <gender> <non-negative number>?]] | preserve
- </td>
+ <td> [[<name> | <generic-voice>],]* [<name> | <generic-voice>] |
+ preserve </td>
</tr>
<tr>
<td>
@@ -1386,7 +1385,9 @@
</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><generic-voice></strong> = [<age>? <gender> <integer>?] </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,24 +1414,23 @@
<strong><age></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><gender></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><non-negative number></strong>
+ <strong><integer></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>
@@ -1438,8 +1438,8 @@
<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>
@@ -2209,6 +2209,10 @@
<a href="http://www.w3.org/TR/css3-values/#ltnumbergt"> number </a></dfn>
[[!CSS3VAL]] </li>
<li>
+ <dfn id="integer-def">
+ <a href="http://www.w3.org/TR/css3-values/#ltintegergt"> integer </a></dfn>
+ [[!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>
[[!CSS3VAL]] </li>
Received on Wednesday, 6 July 2011 19:03:49 UTC