[1.41.18]

*_list: Changed name to $combine (from $alt2) for the attribute which indicates that a word should combine with the next word.

Voices files: Added attribute "speed", which specified a percentage change to the speaking speeds which are used for this voice.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@229 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2009-10-19 11:10:05 +00:00
parent 7fc0ab97e1
commit 075bfe9006
27 changed files with 216 additions and 151 deletions
+4 -2
View File
@@ -1448,7 +1448,7 @@ static int TranslateWord2(Translator *tr, char *word, WORD_TAB *wtab, int pre_pa
return(flags);
}
if((flags & FLAG_ALT2_TRANS) && ((sylimit = tr->langopts.param[LOPT_COMBINE_WORDS]) > 0))
if(flags & FLAG_COMBINE)
{
char *p2;
int ok = 1;
@@ -1456,6 +1456,8 @@ static int TranslateWord2(Translator *tr, char *word, WORD_TAB *wtab, int pre_pa
int c_word2;
char ph_buf[N_WORD_PHONEMES];
sylimit = tr->langopts.param[LOPT_COMBINE_WORDS];
// LANG=cs,sk
// combine a preposition with the following word
p2 = word;
@@ -1492,7 +1494,7 @@ static int TranslateWord2(Translator *tr, char *word, WORD_TAB *wtab, int pre_pa
{
*p2 = '-'; // replace next space by hyphen
flags = TranslateWord(translator, word, next_pause, wtab); // translate the combined word
if(CountSyllables(p) > (sylimit & 0xf))
if((sylimit > 0) && (CountSyllables(p) > (sylimit & 0x1f)))
{
// revert to separate words
*p2 = ' ';