Merge branch 'master' into build

This commit is contained in:
Reece Dunn
2010-10-30 14:32:15 +01:00
65 changed files with 2749 additions and 691 deletions
+19 -31
View File
@@ -339,35 +339,6 @@ phoneme V# // used for 'r' after a vowel (to create a diphthong)
endphoneme
// TESTING
phoneme V1#
liquid
lengthmod 7
IF nextPhW(isVowel) THEN
ChangePhoneme(r")
ENDIF
FMT(r/V_)
endphoneme
phoneme V2# // used for 'r' after a vowel (to create a diphthong)
liquid
lengthmod 7
IF nextPhW(isVowel) THEN
ChangePhoneme(r")
ENDIF
FMT(r/V_2_)
endphoneme
phoneme V3#
liquid
lengthmod 7
IF nextPhW(isVowel) THEN
ChangePhoneme(r")
ENDIF
FMT(r/@_)
endphoneme
phoneme UR
vowel starttype #u endtype #@
ipa ʊɐ
@@ -377,6 +348,23 @@ phoneme UR
endphoneme
phoneme r2
vcd alv flp
IF prevPhW(isVowel) THEN
ChangePhoneme(*)
ENDIF
InsertPhoneme(@-)
ChangePhoneme(*)
endphoneme
phoneme oU // for English words
import_phoneme en-us/oU
endphoneme
// translate from English to German phonemes
@@ -402,7 +390,7 @@ A~ O n
E E
e: e:
e@ E: r
eI e:
eI e j
i I
I I
I2 I
@@ -415,7 +403,7 @@ o: o:
O@ O : r
o@ O : r
OI OY
oU o:
oU oU
O~ O n
U U
u: u: