Merge branch 'master' into development

This commit is contained in:
Reece Dunn
2011-10-29 10:34:21 +01:00
25 changed files with 1723 additions and 197 deletions
+14 -13
View File
@@ -3,13 +3,13 @@
base 107 107
consonants 10 116
base2 26 123
en 52 152
en-n 32 152
en-us 38 153
en-sc 39 154
en-rp 33 152
en-wm 30 152
en-wi 30 152
en 53 153
en-n 33 153
en-us 39 154
en-sc 40 155
en-rp 34 153
en-wm 31 153
en-wi 30 153
af 39 136
cy 29 132
de 41 139
@@ -394,7 +394,7 @@ l/l_ [l] base
[l/] fr
l/l_@ [l/3] base
[l/] fr
l/l@ [hæx] base
l/l@ [haþ] base
[l#] base
[l] fr
[l/2] fr
@@ -428,7 +428,7 @@ l/L2_oL [l/2] base
l/L2_uL [l/2] base
l/l_3 [l/] de
l/l_4 [ll] sq
l/la [hæx] base
l/la [haþ] base
[l#] base
[l] fr
[l/2] fr
@@ -436,7 +436,7 @@ l/la [h
[K] tn
l/l_a [l/3] base
[l/] fr
l/le [hæx] base
l/le [haþ] base
[l#] base
[l] fr
[l/2] fr
@@ -448,7 +448,7 @@ l/L_eL_af [&] af
[&:] af
l/l_front [L] sq
l/l_front_ [l/4] sq
l/li [hæx] base
l/li [haþ] base
[l#] base
[l] fr
[l/2] fr
@@ -462,7 +462,7 @@ ll/ll [L] bg
ll/_ll [L] bg
l/l_long [l] base
[l] fr
l/lo [hæx] base
l/lo [haþ] base
[l#] base
[l/2] fr
[K] nso
@@ -472,7 +472,7 @@ l/l_o [l/3] base
l^/l_rfx [l.] base
[l] ru
[l^] ru
l/lu [hæx] base
l/lu [haþ] base
[l#] base
[l] fr
[l/2] fr
@@ -2279,6 +2279,7 @@ vwl_en_us/3_us [3] en-us
vwl_en_us/3_us2 [3:] en-us
vwl_en_us/a [a] en-us
vwl_en_us/ai@ [aI@] en-us
vwl_en_us/ai3 [aI3] en-us
vwl_en_us/ar [A:] en-us
[A@] en-us
vwl_en_us/aU@ [aU@] en-us
+2 -1
View File
@@ -15,7 +15,8 @@
0 g- NULL 0 NULL
0 x NULL 0 k_h
0 @- NULL 0 NULL
0 aI@ NULL 60 AI r
0 aI@ NULL 60 AI @
0 aI3 NULL 60 AI r=
0 aU@ NULL 75 aU r
+2 -1
View File
@@ -15,7 +15,8 @@
0 g- NULL 0 NULL
0 x NULL 0 k
0 @- NULL 0 NULL
0 aI@ NULL 60 AI r
0 aI@ NULL 60 AI @
0 aI3 NULL 60 AI r=
0 aU@ NULL 75 aU r
+7
View File
@@ -429,6 +429,13 @@ phoneme aI@
endphoneme
phoneme aI3
vowel starttype #a endtype #@
length 280
ChangePhoneme(aI@)
endphoneme
phoneme aU@
vowel starttype #a endtype #@
length 280
+7
View File
@@ -255,6 +255,13 @@ phoneme aI@
endphoneme
phoneme aI3
vowel starttype #a endtype #@
length 280
ChangePhoneme(aI@)
endphoneme
phoneme aU@
vowel starttype #a endtype #@
length 280
+7
View File
@@ -269,6 +269,13 @@ phoneme aI@
endphoneme
phoneme aI3
vowel starttype #a endtype #@
length 280
ChangePhoneme(aI@)
endphoneme
phoneme aU@
vowel starttype #a endtype #@
length 270
+7
View File
@@ -344,6 +344,13 @@ phoneme aI@
endphoneme
phoneme aI3
vowel starttype #a endtype #@
length 280
ChangePhoneme(aI@)
endphoneme
phoneme @L
vowel starttype #@ endtype l
ipa əl
+10 -4
View File
@@ -313,15 +313,21 @@ endphoneme
phoneme aI@
vowel starttype #a endtype #@
length 300
ipa aɪəɹ
IF nextPhW(r-) THEN
ipa aɪə
ENDIF
ipa aɪə
IfNextVowelAppend(r-)
FMT(vwl_en_us/ai@)
endphoneme
phoneme aI3
vowel starttype #a endtype #@
length 300
ipa aɪɚ
IfNextVowelAppend(r-)
FMT(vwl_en_us/ai3)
endphoneme
phoneme aU@
vowel starttype #a endtype #@
length 300
+8
View File
@@ -241,6 +241,14 @@ phoneme aI@
endphoneme
phoneme aI3
vowel starttype #a endtype #@
length 280
ChangePhoneme(aI@)
endphoneme
phoneme aU@
vowel starttype #a endtype #@
length 280
+3
View File
@@ -408,6 +408,7 @@ endphoneme
phoneme b
vcd alv frc sibilant
voicingswitch p
IF nextPh(l2) THEN
ChangePhoneme(p)
ENDIF
@@ -416,6 +417,7 @@ endphoneme
phoneme d
vcd alv stop
voicingswitch t
IF nextPh(l2) THEN
ChangePhoneme(t)
ENDIF
@@ -424,6 +426,7 @@ endphoneme
phoneme g
vcd vel stop
voicingswitch k
IF nextPh(l2) THEN
ChangePhoneme(k)
ENDIF
Binary file not shown.