Merge branch 'master' into build

This commit is contained in:
Reece Dunn
2011-05-24 21:59:13 +01:00
67 changed files with 432 additions and 242 deletions
+13 -13
View File
@@ -12,7 +12,7 @@ consonants 10 116
en-wi 30 150
af 39 136
cy 29 132
de 37 138
de 41 139
eo 13 114
jbo 2 114
nci 3 123
@@ -368,8 +368,8 @@ l/l_ [l] base
[l/] fr
l/l_@ [l/3] base
[l/] fr
l/l@ [h†s] base
[l#] base
l/l@ [l#] base
[”¦] base
[l] fr
[l/2] fr
[K] nso
@@ -402,16 +402,16 @@ 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†s] base
[l#] base
l/la [l#] base
[”¦] base
[l] fr
[l/2] fr
[K] nso
[K] tn
l/l_a [l/3] base
[l/] fr
l/le [h†s] base
[l#] base
l/le [l#] base
[”¦] base
[l] fr
[l/2] fr
[K] nso
@@ -422,8 +422,8 @@ l/L_eL_af [&] af
[&:] af
l/l_front [L] sq
l/l_front_ [l/4] sq
l/li [h†s] base
[l#] base
l/li [l#] base
[”¦] base
[l] fr
[l/2] fr
[l] zh
@@ -436,8 +436,8 @@ ll/ll [L] bg
ll/_ll [L] bg
l/l_long [l] base
[l] fr
l/lo [h†s] base
[l#] base
l/lo [l#] base
[”¦] base
[l/2] fr
[K] nso
[K] tn
@@ -446,8 +446,8 @@ l/l_o [l/3] base
l^/l_rfx [l.] base
[l] ru
[l^] ru
l/lu [h†s] base
[l#] base
l/lu [l#] base
[”¦] base
[l] fr
[l/2] fr
[K] nso
+2
View File
@@ -1,3 +1,5 @@
volume 16
0 l/2 NULL 0 l
0 l/ NULL 0 l
0 r/ NULL 0 r
-1
View File
@@ -1,4 +1,3 @@
volume 16
0 l/2 NULL 0 l
0 l/ NULL 0 l
+1 -1
View File
@@ -51,7 +51,7 @@
0 O~ NULL 0 o~
16 _| VWL 0 ?
16 _! VWL 0 ?
//16 _! VWL 0 ?
// phonemes for English words
0 @L NULL 0 L
+1 -1
View File
@@ -1,4 +1,4 @@
//volume 29
0 oU NULL 0 @U
0 a# NULL 0 @
0 @2 NULL 0 @
+1 -1
View File
@@ -1,4 +1,4 @@
volume 15
0 l/2 NULL 0 l
0 l/ NULL 0 l
0 l2 NULL 0 l
+1 -1
View File
@@ -1,4 +1,4 @@
volume 16
volume 15
0 l/2 NULL 0 l
0 l/ NULL 0 l
-1
View File
@@ -1,4 +1,3 @@
volume 32
0 l/2 NULL 0 l
0 l/ NULL 0 l
-1
View File
@@ -1,4 +1,3 @@
volume 32
// CR1 doesn't like same phonemes twice
0 e E 5 e _
+1
View File
@@ -1,4 +1,5 @@
// for voices "it3" "it4"
volume 15
0 r/ NULL 0 r
0 w/ NULL 0 w
+2
View File
@@ -1,3 +1,5 @@
volume 15
0 l/ NULL 0 w
0 l/2 w 0 l
0 l/2 j 0 l
+2
View File
@@ -1,3 +1,5 @@
volume 15
0 l/ NULL 0 w
0 l/2 w 0 l
0 l/2 j 0 l
+1 -1
View File
@@ -67,7 +67,7 @@
0 aU@ NULL 70 A: u0
0 T VWL 0 th
0 T NULL 0 t
0 D NULL 0 z
0 D NULL 0 d
0 w NULL 0 v
0 z NULL 0 s
0 tS NULL 50 t rs
+1 -1
View File
@@ -63,7 +63,7 @@
0 aU@ NULL 70 A: u0
0 T VWL 0 th
0 T NULL 0 t
0 D NULL 0 z
0 D NULL 0 d
0 w NULL 0 v
0 z NULL 0 s
0 tS NULL 50 t s
+31
View File
@@ -400,6 +400,37 @@ phoneme A~
FMT(vnasal/aa_n4)
endphoneme
phoneme l2 // as [l] but devoice previous phoneme
liquid lengthmod 7
ChangePhoneme (l)
endphoneme
phoneme b
vcd alv frc sibilant
IF nextPh(l2) THEN
ChangePhoneme(p)
ENDIF
CALL base/b
endphoneme
phoneme d
vcd alv stop
IF nextPh(l2) THEN
ChangePhoneme(t)
ENDIF
CALL base/d
endphoneme
phoneme g
vcd vel stop
IF nextPh(l2) THEN
ChangePhoneme(k)
ENDIF
CALL base/g
endphoneme
// translate from English to German phonemes
equivalents NULL // disable this table
0 O
+1 -1
View File
@@ -54,7 +54,7 @@ endphoneme
phoneme || // End Word
pause
lengthmod 1
lengthmod 9 // no effect
endphoneme
phoneme _ // Short pause