[1.31.12]

Fix: reset phoneme table if speech is cancelled while switched to a second language.
"speak": add -z options (same as for "espeak").
Numbers: Add option to speak "and" before hundreds.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@143 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2008-02-16 17:02:26 +00:00
parent 6a8b112743
commit 35a7f05eb1
25 changed files with 390 additions and 149 deletions
+8 -1
View File
@@ -454,6 +454,7 @@ int Translator::LookupNum3(int value, char *ph_out, int suppress_null, int thous
char ph_digits[50];
char ph_thousands[50];
char ph_hundred_and[12];
char ph_thousand_and[12];
hundreds = value / 100;
buf1[0] = 0;
@@ -461,6 +462,7 @@ int Translator::LookupNum3(int value, char *ph_out, int suppress_null, int thous
if(hundreds > 0)
{
ph_thousands[0] = 0;
ph_thousand_and[0] = 0;
Lookup("_0C",ph_100);
@@ -486,6 +488,11 @@ int Translator::LookupNum3(int value, char *ph_out, int suppress_null, int thous
ph_digits[0] = 0;
if(hundreds > 0)
{
if((langopts.numbers & 0x100000) && (prev_thousands || (ph_thousands[0] != 0)))
{
Lookup("_0and",ph_thousand_and);
}
suppress_null = 1;
found = 0;
@@ -513,7 +520,7 @@ int Translator::LookupNum3(int value, char *ph_out, int suppress_null, int thous
}
}
sprintf(buf1,"%s%s%s",ph_thousands,ph_digits,ph_100);
sprintf(buf1,"%s%s%s%s",ph_thousands,ph_thousand_and,ph_digits,ph_100);
}
ph_hundred_and[0] = 0;