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

Merge branch 'development'

Browse Source 
Conflicts:
	src/wave.cpp
This commit is contained in:
Reece H. Dunn
2013-10-22 15:57:24 +01:00
parent 0b4fa16f1a 4b0fd781cf
commit ccc732f5fe
41 changed files with 2156 additions and 1265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiledata.cpp
+7
View File
@@ -990,6 +990,10 @@ static wxString CompileAllDictionaries()
sprintf(fname_log,"%s%s",path_dsource,"dict_log");
log = fopen(fname_log,"w");
if(log != 0)
{
fprintf(log, "%s", utf8_bom);
}
sprintf(fname_log,"%s%s",path_dsource,"dict_phonemes");
f_phused = fopen(fname_log,"w");
@@ -2407,6 +2411,9 @@ int CompileIf(int elif)
else
{
error("Unexpected keyword '%s'",item_string);
if((strcmp(item_string, "phoneme") == 0) || (strcmp(item_string, "endphoneme") == 0))
return(-1);
}
// output the word