Merge branch 'master' into android

This commit is contained in:
Reece H. Dunn
2013-01-30 16:39:52 +00:00
18 changed files with 1422 additions and 422 deletions
+12 -4
View File
@@ -1280,14 +1280,22 @@ void SetWordStress(Translator *tr, char *output, unsigned int *dictionary_flags,
mnem = phoneme_tab[final_ph]->mnemonic;
mnem2 = phoneme_tab[final_ph2]->mnemonic;
if((mnem == 's') && (phoneme_tab[final_ph2]->type == phNASAL))
if(tr->translator_name == L('a','n'))
{
// -ns stress remains on penultimate syllable
if(((mnem != 's') && (mnem !='n')) || phoneme_tab[final_ph2]->type != phVOWEL)
stressed_syllable = vowel_count - 1; // stress on last syllable
}
else
if(((phoneme_tab[final_ph]->type != phNASAL) && (mnem != 's')) || (phoneme_tab[final_ph2]->type != phVOWEL))
{
stressed_syllable = vowel_count - 1;
if((mnem == 's') && (phoneme_tab[final_ph2]->type == phNASAL))
{
// -ns stress remains on penultimate syllable
}
else
if(((phoneme_tab[final_ph]->type != phNASAL) && (mnem != 's')) || (phoneme_tab[final_ph2]->type != phVOWEL))
{
stressed_syllable = vowel_count - 1;
}
}
}
}