[1.41.18]

*_list: Changed name to $combine (from $alt2) for the attribute which indicates that a word should combine with the next word.

Voices files: Added attribute "speed", which specified a percentage change to the speaking speeds which are used for this voice.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@229 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2009-10-19 11:10:05 +00:00
parent 7fc0ab97e1
commit 075bfe9006
27 changed files with 216 additions and 151 deletions
+14 -1
View File
@@ -116,6 +116,11 @@ void SetSpeed(int control)
wpm = embedded_value[EMBED_S];
if(control == 2)
wpm = embedded_value[EMBED_S2];
if(voice->speed_percent > 0)
{
wpm = (wpm * voice->speed_percent)/100;
}
wpm2 = wpm;
if(wpm > 369) wpm = 369;
@@ -561,7 +566,7 @@ void CalcLengths(Translator *tr)
if((len = tr->stress_lengths[stress]) == 0)
len = tr->stress_lengths[6];
length_mod = (length_mod * len)/128;
length_mod = length_mod * len;
if(p->tone_ph != 0)
{
@@ -581,6 +586,14 @@ void CalcLengths(Translator *tr)
length_mod = length_mod * (256 + (280 - len)/3)/256;
}
if(length_mod > tr->langopts.max_lengthmod*speed1)
{
//limit the vowel length adjustment for some languages
length_mod = (tr->langopts.max_lengthmod*speed1);
}
length_mod = length_mod / 128;
if(p->type != phVOWEL)
{
length_mod = 256; // syllabic consonant