Numbers: Support "myriad" (10^4) based number systems (lang=ko).

Lang=pt: fix ordinal numbers 11-19.
Lang=en-us: minor vowel changes.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@291 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2012-09-17 21:04:16 +00:00
parent cd145d0251
commit 736e6deb28
19 changed files with 196 additions and 142 deletions
+3 -28
View File
@@ -525,42 +525,17 @@ static void FindVowelFmt(int prog_start, int length)
prog_end = prog_start + length;
n_vowelfmt_addr = 0;
for(prog = &phoneme_index[prog_start]; prog < &phoneme_index[prog_end]; prog++)
for(prog = &phoneme_index[prog_start]; prog < &phoneme_index[prog_end]; prog += NumInstnWords(prog))
{
instn = *prog;
switch(instn >> 12)
if((instn >> 12) == 11)
{
case 2:
case 3:
// conditions
while((instn & 0xe000) == 0x2000)
{
instn = *(++prog);
}
prog--;
break;
case 10: // Vowelin, Vowelout
prog += 3;
break;
case 9:
case 12: // WAV
case 13: // VowelStart
case 14: // VowelEnd
case 15: // addWav
prog++;
break;
case 11: // FMT
// FMT instruction
if(n_vowelfmt_addr < N_VOWELFMT_ADDR)
{
vowelfmt_addr[n_vowelfmt_addr++] = ((instn & 0xf) << 18) + (prog[1] << 2);
}
prog++;
break;
}
}
} // end of FindVowelFmt