mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-01 13:54:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[1.31.19}

Browse Source 
Fix: Events callback, fix word length information for words with multibyte characters.
Fix: Re-translating a word in a different language after the first langauge has started speaking individual letters, gave silence.
Announce punctuation.  If character name is not defined, use English.
Announce punctuation.  Fix pitch of the voice which announces punctuation characters.
[[Phonemes]] text input.  Allow the language-switch phoneme eg. [[_^_EN hEloU _^_FR]] in the input.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@152 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2008-02-28 20:54:03 +00:00
parent 16fba5a1c1
commit 417395b033
36 changed files with 630 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dictionary.cpp
+28 -9
View File
@@ -434,11 +434,18 @@ char *EncodePhonemes(char *p, char *outptr, unsigned char *bad_phoneme)
while(!isspace(c = *p++) && (c != 0))
*outptr++ = tolower(c);
*outptr = 0;
if(strcmp(p_lang,"en")==0)
if(c == 0)
{
*p_lang = 0; // don't need "en", it's assumed by default
if(strcmp(p_lang,"en")==0)
{
*p_lang = 0; // don't need "en", it's assumed by default
return(p);
}
}
else
{
*outptr++ = '|'; // more phonemes follow, terminate language string with separator
}
return(p);
}
break;
}
@@ -2302,10 +2309,10 @@ int Translator::TranslateRules(char *p_start, char *phonemes, int ph_size, char
while(((c = *p) != ' ') && (c != 0))
{
if(IsAlpha(wc))
any_alpha++;
wc_prev = wc;
wc_bytes = utf8_in(&wc,p,0);
if(IsAlpha(wc))
any_alpha++;
n = groups2_count[c];
if(IsDigit(wc) && ((langopts.tone_numbers == 0) || !any_alpha))
@@ -2424,11 +2431,23 @@ int Translator::TranslateRules(char *p_start, char *phonemes, int ph_size, char
if(match1.points == 0)
{
static const char str_unknown[4] = {phonCAPITAL,phonCAPITAL,phonCAPITAL,0};
if(((any_alpha > 0) || (p[wc_bytes-1] > ' ')) && !iswpunct(wc))
if(iswalpha(wc))
{
// an unrecognised character in a word, indicate with clicks
match1.phonemes = str_unknown;
match1.points = 1;
if((any_alpha > 1) || (p[wc_bytes-1] > ' '))
{
// an unrecognised character in a word, indicate with clicks
match1.phonemes = str_unknown;
match1.points = 1;
}
}
else
{
LookupLetter(wc, -1, ph_buf);
if(ph_buf[0])
{
match1.phonemes = ph_buf;
match1.points = 1;
}
}
p += (wc_bytes-1);
}