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

compiledata: Generate an error if import phoneme will override settings.

Browse Source
This commit is contained in:
Reece H. Dunn
2017-01-28 13:05:15 +00:00
parent a9030650ba
commit 130a87cbe6
6 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
phsource/ph_bulgarian
+1 -1
View File
@@ -81,8 +81,8 @@ phoneme r
endphoneme
phoneme x
voicingswitch x // [x] doesn't switch to [Q]
import_phoneme base/x
voicingswitch x // [x] doesn't switch to [Q]
endphoneme
phsource/ph_burmese
+3 -3
View File
@@ -470,7 +470,7 @@ phoneme b
endphoneme
phoneme ph //aspirated
vls blb stop
//vls blb stop
import_phoneme base/p
endphoneme
@@ -485,7 +485,7 @@ phoneme d
endphoneme
phoneme th
vls alv stop
//vls alv stop
import_phoneme base/t
endphoneme
@@ -515,7 +515,7 @@ phoneme g
endphoneme
phoneme kh
vls vel stop
//vls vel stop
import_phoneme base/k
endphoneme
phsource/ph_kyrgyz
-1
View File
@@ -448,7 +448,6 @@ endphoneme
phoneme ts
ipa ts
Length 10
import_phoneme consonants/ts
endphoneme
phsource/ph_lithuanian
-1
View File
@@ -228,7 +228,6 @@ endphoneme
phoneme ts
Length 10
import_phoneme consonants/ts
endphoneme
phsource/ph_russian
-1
View File
@@ -148,7 +148,6 @@ endphoneme
phoneme ts
Length 10
import_phoneme consonants/ts
endphoneme
src/libespeak-ng/compiledata.c
+9
View File
@@ -1907,6 +1907,15 @@ static void ImportPhoneme(void)
return;
}
if (phoneme_out->phflags != 0 ||
phoneme_out->type != phINVALID ||
phoneme_out->start_type != 0 ||
phoneme_out->end_type != 0 ||
phoneme_out->std_length != 0 ||
phoneme_out->length_mod != 0) {
error("Phoneme import will override set properties.");
}
ph_mnem = phoneme_out->mnemonic;
ph_code = phoneme_out->code;
memcpy(phoneme_out, ph, sizeof(PHONEME_TAB));