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

[1.48.11]

Browse Source 
Command-line: added options --sep --tie.

API, changed the meaning of the "phonememode" parameter in espeak_SetPhonemeTrace() and espeak_TextToPhonemes().

Language changes to:  en, eu, pt.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@385 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2014-08-31 15:50:07 +00:00
parent 2315736555
commit b27f69bb5a
33 changed files with 1151 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/synthdata.cpp
+8 -2
View File
@@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"
const char *version_string = "1.48.10 09.Aug.14";
const char *version_string = "1.48.11 31.Aug.14";
const int version_phdata = 0x014801;
int option_device_number = -1;
@@ -620,6 +620,7 @@ static bool InterpretCondition(Translator *tr, int control, PHONEME_LIST *plist,
int instn;
int instn2;
int count;
int check_endtype = 0;
PHONEME_TAB *ph;
PHONEME_LIST *plist_this;
@@ -672,6 +673,7 @@ static bool InterpretCondition(Translator *tr, int control, PHONEME_LIST *plist,
case 0: // prevPh
case 5: // prevPhW
plist--;
check_endtype = 1;
break;
case 1: // thisPh
@@ -705,6 +707,7 @@ static bool InterpretCondition(Translator *tr, int control, PHONEME_LIST *plist,
if((worddata==NULL) || (worddata->prev_vowel.ph == NULL))
return(false); // no previous vowel
plist = &(worddata->prev_vowel);
check_endtype = 1;
break;
case 9: // next3PhW
@@ -720,6 +723,7 @@ static bool InterpretCondition(Translator *tr, int control, PHONEME_LIST *plist,
if((plist[0].sourceix) || (plist[-1].sourceix))
return(false);
plist-=2;
check_endtype = 1;
break;
}
@@ -744,7 +748,9 @@ static bool InterpretCondition(Translator *tr, int control, PHONEME_LIST *plist,
// 'data' is a phoneme number
if((phoneme_tab[data]->mnemonic == ph->mnemonic) == true)
return(true);
if((which == 0) && (ph->type == phVOWEL))
// not an exact match, check for a vowel type (eg. #i )
if((check_endtype) && (ph->type == phVOWEL))
return(data == ph->end_type); // prevPh() match on end_type
return(data == ph->start_type); // thisPh() or nextPh(), match on start_type
}