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

Merge tag '1.48.15' into android

Browse Source 
espeak 1.48.15
This commit is contained in:
Reece H. Dunn
2015-07-25 09:51:12 +01:00
parent 135f852598 c48bb4cd34
commit 586c911d67
77 changed files with 6916 additions and 3702 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dictionary.cpp
+4 -2
View File
@@ -1200,6 +1200,7 @@ void SetWordStress(Translator *tr, char *output, unsigned int *dictionary_flags,
If 'tonic' is set (>= 0), replace highest stress by this value.
control: bit 0 This is an individual symbol, not a word
bit 1 Suffix phonemes are still to be added
*/
unsigned char phcode;
@@ -1586,11 +1587,12 @@ void SetWordStress(Translator *tr, char *output, unsigned int *dictionary_flags,
break;
}
if((stressflags & S_FINAL_VOWEL_UNSTRESSED) && (vowel_count > 2) && (max_stress_input < 3) && (vowel_stress[vowel_count - 1] == 4))
if((stressflags & S_FINAL_VOWEL_UNSTRESSED) && ((control & 2) == 0) && (vowel_count > 2) && (max_stress_input < 3) && (vowel_stress[vowel_count - 1] == 4))
{
// Don't allow stress on a word-final vowel
// Only do this if there is no suffix phonemes to be added, and if a stress position was not given explicitly
if(phoneme_tab[final_ph]->type == phVOWEL)
{
// don't allow stress on a word-final vowel
vowel_stress[vowel_count - 1] = 1;
vowel_stress[vowel_count - 2] = 4;
}