Changes to voice: en-r

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@97 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2007-11-06 09:33:54 +00:00
parent 74e4e9b09e
commit bd79fee87d
41 changed files with 110 additions and 68 deletions
+5 -2
View File
@@ -490,7 +490,7 @@ void Translator::GetTranslatedPhonemeString(char *phon_out, int n_phon_out)
int stress;
PHONEME_LIST *plist;
static const char *stress_chars = "==,,'*";
static const char *stress_chars = "==,,''";
if(phon_out != NULL)
{
@@ -2199,6 +2199,7 @@ int Translator::TranslateRules(char *p_start, char *phonemes, int ph_size, char
int g1; /* first group for this letter */
int n;
int letter;
int any_alpha=0;
int ix;
int digit_count=0;
char *p;
@@ -2245,11 +2246,13 @@ int Translator::TranslateRules(char *p_start, char *phonemes, int ph_size, char
while(((c = *p) != ' ') && (c != 0))
{
if(IsAlpha(wc))
any_alpha = wc;
wc_prev = wc;
wc_bytes = utf8_in(&wc,p,0);
n = groups2_count[c];
if(IsDigit(wc) && ((langopts.tone_numbers == 0) || !IsAlpha(wc_prev)))
if(IsDigit(wc) && ((langopts.tone_numbers == 0) || !any_alpha))
{
// lookup the number in *_list not *_rules
char string[8];