[1.45.31]

Don't omit <marker> event for words which are recognized as pairs (such as "of the").

Lang=Spanish, fix missing "y" in numbers such as "21".

Lang=EN-US, Don't add 'intrusive r' between phoneme [i@] and a following vowel.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@268 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2011-06-25 21:40:56 +00:00
parent 1284a5334c
commit 05962fccac
27 changed files with 547 additions and 242 deletions
+4 -3
View File
@@ -478,6 +478,7 @@ void DecodePhonemes(const char *inptr, char *outptr)
PHONEME_TAB *ph;
static const char *stress_chars = "==,,'* ";
sprintf(outptr,"* ");
while((phcode = *inptr++) > 0)
{
if(phcode == 255)
@@ -2464,9 +2465,9 @@ int TranslateRules(Translator *tr, char *p_start, char *phonemes, int ph_size, c
if((option_phonemes == 2) && ((word_flags & FLAG_NO_TRACE)==0))
{
char wordbuf[120];
int ix;
unsigned int ix;
for(ix=0; ((c = p_start[ix]) != ' ') && (c != 0); ix++)
for(ix=0; ((c = p_start[ix]) != ' ') && (c != 0) && (ix < (sizeof(wordbuf)-1)); ix++)
{
wordbuf[ix] = c;
}
@@ -3168,7 +3169,7 @@ static const char *LookupDict2(Translator *tr, const char *word, const char *wor
}
if(dictionary_flags2 & FLAG_NOUN)
{
if(!tr->expect_noun)
if((!tr->expect_noun) || (end_flags & SUFX_V))
{
/* don't use the 'noun' pronunciation unless we are
expecting a noun */