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

[1.27.09] Fix for --punct option when used with <say-as>.

Browse Source 
lang=hu, shorten "ll". Test: remove differences in vowel lengths depending on the following phoneme.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@64 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2007-07-12 21:39:42 +00:00
parent 3546b19965
commit 0def252307
28 changed files with 5228 additions and 5150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dictionary.cpp
+4 -4
View File
@@ -779,7 +779,7 @@ static int GetVowelStress(Translator *tr, unsigned char *phonemes, unsigned char
continue;
}
if((ph->type == phVOWEL) && (ph->code != phonSCHWA_SHORT))
if((ph->type == phVOWEL) && !(ph->phflags & phNONSYLLABIC))
{
vowel_stress[count] = (char)stress;
if((stress >= 4) && (stress >= max_stress))
@@ -892,7 +892,7 @@ void ChangeWordStress(Translator *tr, char *word, int new_stress)
p = phonetic;
while(*p != 0)
{
if((phoneme_tab[*p]->type == phVOWEL) && (*p != phonSCHWA_SHORT))
if((phoneme_tab[*p]->type == phVOWEL) && !(phoneme_tab[*p]->phflags & phNONSYLLABIC))
{
if(vowel_stress[ix] != 0)
*word++ = stress_phonemes[vowel_stress[ix]];
@@ -982,7 +982,7 @@ void Translator::SetWordStress(char *output, unsigned int dictionary_flags, int
ix = 1;
for(p = phonetic; *p != 0; p++)
{
if((phoneme_tab[p[0]]->type == phVOWEL) && (p[0] != phonSCHWA_SHORT))
if((phoneme_tab[p[0]]->type == phVOWEL) && !(phoneme_tab[p[0]]->phflags & phNONSYLLABIC))
{
int weight = 0;
int lengthened = 0;
@@ -1314,7 +1314,7 @@ void Translator::SetWordStress(char *output, unsigned int dictionary_flags, int
prev_last_stress = 0;
}
else
if(((ph->type == phVOWEL) && (ph->code != phonSCHWA_SHORT)) || (*p == phonSYLLABIC))
if(((ph->type == phVOWEL) && !(ph->phflags & phNONSYLLABIC)) || (*p == phonSYLLABIC))
{
// a vowel, or a consonant followed by a syllabic consonant marker