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

Merge branch 'master' into android

Browse Source
This commit is contained in:
Reece H. Dunn
2013-07-27 11:16:46 +01:00
parent 3815c54cbb 9fe782ae66
commit b1c06da202
65 changed files with 5928 additions and 3744 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/readclause.cpp
+5 -2
View File
@@ -1601,6 +1601,7 @@ static int GetVoiceAttributes(wchar_t *pw, int tag_type)
wchar_t *name;
wchar_t *age;
wchar_t *variant;
int value;
const char *new_voice_id;
SSML_STACK *ssml_sp;
@@ -1646,7 +1647,9 @@ static int GetVoiceAttributes(wchar_t *pw, int tag_type)
attrcopy_utf8(ssml_sp->language,lang,sizeof(ssml_sp->language));
attrcopy_utf8(ssml_sp->voice_name,name,sizeof(ssml_sp->voice_name));
ssml_sp->voice_variant_number = attrnumber(variant,1,0)-1;
if((value = attrnumber(variant,1,0)) > 0)
value--; // variant='0' and variant='1' the same
ssml_sp->voice_variant_number = value;
ssml_sp->voice_age = attrnumber(age,0,0);
ssml_sp->voice_gender = attrlookup(gender,mnem_gender);
ssml_sp->tag_type = tag_type;
@@ -2293,7 +2296,7 @@ f_input = f_in; // for GetC etc
return(CLAUSE_EOF);
}
if((skip_characters > 0) && (count_characters > skip_characters))
if((skip_characters > 0) && (count_characters >= skip_characters))
{
// reached the specified start position
// don't break a word