Merge branch 'master' into build

This commit is contained in:
Reece Dunn
2011-03-16 21:19:50 +00:00
24 changed files with 1109 additions and 53 deletions
+6 -6
View File
@@ -360,7 +360,7 @@ l/l_ [l] base
[l/] fr
l/l_@ [l/3] base
[l/] fr
l/l@ [h¶p] base
l/l@ [h–x] base
[l#] base
[l] fr
[l/2] fr
@@ -394,7 +394,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¶p] base
l/la [h–x] base
[l#] base
[l] fr
[l/2] fr
@@ -402,7 +402,7 @@ l/la [h
[K] tn
l/l_a [l/3] base
[l/] fr
l/le [h¶p] base
l/le [h–x] base
[l#] base
[l] fr
[l/2] fr
@@ -414,7 +414,7 @@ l/L_eL_af [&] af
[&:] af
l/l_front [L] sq
l/l_front_ [l/4] sq
l/li [h¶p] base
l/li [h–x] base
[l#] base
[l] fr
[l/2] fr
@@ -428,7 +428,7 @@ ll/ll [L] bg
ll/_ll [L] bg
l/l_long [l] base
[l] fr
l/lo [h¶p] base
l/lo [h–x] base
[l#] base
[l/2] fr
[K] nso
@@ -438,7 +438,7 @@ l/l_o [l/3] base
l^/l_rfx [l.] base
[l] ru
[l^] ru
l/lu [h¶p] base
l/lu [h–x] base
[l#] base
[l] fr
[l/2] fr
+3 -1
View File
@@ -41,7 +41,6 @@
0 Y: NULL 0 2:
0 OI NULL 0 OY
0 3 NULL 0 6
0 _| NULL 0 ?
0 pF NULL 0 pf
0 r NULL 0 R
@@ -51,6 +50,9 @@
0 A~ NULL 0 a~
0 O~ NULL 0 o~
16 _| VWL 0 ?
16 _! VWL 0 ?
// phonemes for English words
0 @L NULL 0 L
0 @2 NULL 0 @
+6 -3
View File
@@ -16,7 +16,7 @@
0 d; NULL 0 dj
0 J NULL 0 dj
0 n^ NULL 0 nj
0 v2 NULL 0 v
0 v# NULL 0 w
0 s; NULL 0 S
0 C NULL 0 x
0 Q NULL 0 G
@@ -33,6 +33,8 @@
0 Wy NULL 0 9y
0 VU NULL 0 Au
0 eU NULL 70 e W
0 yU NULL 70 y W
0 E2 NULL 0 E
// phonemes for English words
@@ -48,7 +50,7 @@
0 a# NULL 0 @
0 I2 NULL 0 I
0 aa NULL 0 a
0 V NULL 0 @
0 V NULL 0 2
0 U NULL 0 u
0 0 NULL 0 O
0 3: NULL 0 2
@@ -67,7 +69,8 @@
0 aI@ NULL 70 a @
0 aU@ NULL 70 Au @
0 dZ NULL 0 dj
0 dZ VWL 0 dj
0 dZ NULL 0 tj
0 tS NULL 0 tj
0 T NULL 0 t
0 D NULL 0 z
+1 -1
View File
@@ -98,7 +98,7 @@ phoneme s
ELIF nextPh(p) OR nextPh(t) OR nextPh(k) THEN
WAV(ufric/s!)
ENDIF
WAV(ufric/s)
WAV(ufric/s, 80)
endphoneme
Binary file not shown.