Merge branch 'development'

This commit is contained in:
Reece H. Dunn
2015-04-16 13:58:29 +01:00
27 changed files with 1472 additions and 1172 deletions
+5 -1
View File
@@ -210,7 +210,11 @@ endphoneme
phoneme E
vowel starttype #e endtype #e
length 140
ChangeIfDiminished(I2)
IF nextPhW(n) THEN
ChangeIfDiminished(@)
ELSE
ChangeIfDiminished(I2)
ENDIF
FMT(vowel/ee_5)
endphoneme
+5 -1
View File
@@ -33,7 +33,11 @@ endphoneme
phoneme E
vowel starttype #a endtype #a
length 150
ChangeIfDiminished(I2)
IF nextPhW(n) THEN
ChangeIfDiminished(@)
ELSE
ChangeIfDiminished(I2)
ENDIF
FMT(vowel/ee)
endphoneme
+5 -1
View File
@@ -56,7 +56,11 @@ endphoneme
phoneme E
vowel starttype #e endtype #e
length 140
ChangeIfDiminished(I2)
IF nextPhW(n) THEN
ChangeIfDiminished(@)
ELSE
ChangeIfDiminished(I2)
ENDIF
FMT(vowel/e_mid)
endphoneme
+5 -1
View File
@@ -90,7 +90,11 @@ endphoneme
phoneme E
vowel starttype #e endtype #e
length 170
ChangeIfDiminished(I2)
IF nextPhW(n) THEN
ChangeIfDiminished(@)
ELSE
ChangeIfDiminished(I2)
ENDIF
FMT(vowel/e_e)
endphoneme
+5 -1
View File
@@ -82,7 +82,11 @@ endphoneme
phoneme E
vowel starttype #e endtype #e
length 190
ChangeIfDiminished(I2)
IF nextPhW(n) THEN
ChangeIfDiminished(@)
ELSE
ChangeIfDiminished(I2)
ENDIF
FMT(vwl_en_us/ee)
endphoneme
+5 -1
View File
@@ -34,7 +34,11 @@ endphoneme
phoneme E
vowel starttype #e endtype #e
length 170
ChangeIfDiminished(I2)
IF nextPhW(n) THEN
ChangeIfDiminished(@)
ELSE
ChangeIfDiminished(I2)
ENDIF
FMT(vowel/e)
endphoneme
+5 -1
View File
@@ -27,7 +27,11 @@ endphoneme
phoneme E
vowel starttype #e endtype #e
length 150
ChangeIfDiminished(I2)
IF nextPhW(n) THEN
ChangeIfDiminished(@)
ELSE
ChangeIfDiminished(I2)
ENDIF
FMT(vowel/e)
endphoneme
+2 -2
View File
@@ -1209,13 +1209,13 @@ phoneme Z
IF KlattSynth THEN
IF nextPh(isPause2) THEN
FMT(klatt/zh_) addWav(vocw/zh)
FMT(klatt/zh_, 60) addWav(vocw/zh, 70)
ENDIF
FMT(klatt/zh) addWav(vocw/zh, 130)
ENDIF
IF nextPh(isPause2) THEN
FMT(voc/zh_) addWav(vocw/zh)
FMT(voc/zh_, 60) addWav(vocw/zh, 70)
ENDIF
FMT(voc/zh) addWav(vocw/zh, 130)
endphoneme