Merge branch 'upstream' into development

This commit is contained in:
Reece Dunn
2011-12-22 11:44:06 +00:00
16 changed files with 1747 additions and 1604 deletions
+15 -13
View File
@@ -77,7 +77,7 @@ consonants 10 116
tn 27 119
mt 32 127
bo 10 152
kk 17 116
kk 20 117
fa 9 110
Data file Used by
@@ -402,8 +402,8 @@ l/l_ [l] base
[l/] fr
l/l_@ [l/3] base
[l/] fr
l/l@ [háÿ] base
[l#] base
l/l@ [l#] base
[”¦] base
[l] fr
[l/2] fr
[K] nso
@@ -436,16 +436,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áÿ] 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áÿ] base
[l#] base
l/le [l#] base
[”¦] base
[l] fr
[l/2] fr
[K] nso
@@ -456,8 +456,8 @@ l/L_eL_af [&] af
[&:] af
l/l_front [L] sq
l/l_front_ [l/4] sq
l/li [háÿ] base
[l#] base
l/li [l#] base
[”¦] base
[l] fr
[l/2] fr
[l] zh
@@ -470,8 +470,8 @@ ll/ll [L] bg
ll/_ll [L] bg
l/l_long [l] base
[l] fr
l/lo [háÿ] base
[l#] base
l/lo [l#] base
[”¦] base
[l/2] fr
[K] nso
[K] tn
@@ -480,8 +480,8 @@ l/l_o [l/3] base
l^/l_rfx [l.] base
[l] ru
[l^] ru
l/lu [háÿ] base
[l#] base
l/lu [l#] base
[”¦] base
[l] fr
[l/2] fr
[K] nso
@@ -1459,6 +1459,7 @@ vowel/@_6 [@] en
[W] fr
[W2] fr
vowel/8 [o-] zh
[8] kk
vowel/8_2 [U] en-us
[8] sv
vowel/8_3 [eo] zhy
@@ -1563,6 +1564,7 @@ vowel/a_4 [a] es
[a] vi
vowel/a#_4 [a:] nl
[a] bg
[a/] it
[a] tr
vowel/a_5 [a:] ta
[a:] ml
+3 -3
View File
@@ -288,7 +288,7 @@ phoneme a
length 170
ENDIF
FMT(vowel/a_7, 80)
FMT(vowel/a_7)
endphoneme
@@ -297,7 +297,7 @@ phoneme a-
unstressed
length 130
FMT(vowel/a_7, 80)
FMT(vowel/a_7, 85)
endphoneme
@@ -984,7 +984,7 @@ endphoneme
// translate from English to French phonemes
equivalents en
remove_stress
//remove_stress
0 O
3 W r
3: W : r
+3
View File
@@ -20,6 +20,9 @@ endphoneme
phoneme a/
vowel starttype #@ endtype #@
length 180
IF thisPh(isWordEnd) THEN
FMT(vowel/a#_4)
ENDIF
FMT(vowel/a_5)
endphoneme
Binary file not shown.
Binary file not shown.