Merge branch 'development'

This commit is contained in:
Reece H. Dunn
2013-03-13 18:53:34 +00:00
7 changed files with 26 additions and 45 deletions
-13
View File
@@ -134,19 +134,6 @@ endphoneme
phoneme x // [r] for Portugal
liquid
trill
ipa ʁ
lengthmod 7
Vowelin f1=0 f2=1500 -400 400 f3=-400 80
IF nextPh(isNotVowel) THEN
ChangePhoneme(r/)
ENDIF
FMT(vwl_fr/@R) addWav(r3/rx, 120)
endphoneme
phoneme R // for Portugal this is same the as [r]
import_phoneme pt/r
endphoneme
+3 -19
View File
@@ -189,8 +189,9 @@ phoneme l
endphoneme
phoneme x // (previously [R] from Slovak/Czech)
import_phoneme base/h
phoneme x
CALL base/h
ipa x
endphoneme
@@ -217,20 +218,3 @@ phoneme *
FMT(d/tap2) addWav(x/d, 40)
endphoneme
// testing
phoneme x2
import_phoneme af/x2
endphoneme
phoneme x3
import_phoneme base/x
endphoneme
phoneme R1
import_phoneme base/R
endphoneme