Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
This commit is contained in:
Reece H. Dunn
2013-05-31 20:53:54 +01:00
18 changed files with 211 additions and 160 deletions
+3 -1
View File
@@ -119,7 +119,9 @@ phoneme k
Vowelout f1=0 f2=2300 200 300 f3=-200 80 rms=20
ENDIF
IF nextPh(isPause2) AND prevPhW(isVowel) THEN
IF thisPh(isWordEnd) THEN
WAV(ustop/k)
ELIF nextPh(isPause2) THEN
WAV(ustop/k_)
ELIF nextPh(r) OR nextPh(R) OR nextPh(R2) THEN
WAV(ustop/kr)