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
+53 -28
View File
@@ -1,4 +1,4 @@
65 phoneme tables
66 phoneme tables
new total
base 107 107
consonants 9 115
@@ -12,7 +12,7 @@ consonants 9 115
en-wi 30 148
af 39 136
cy 29 132
de 38 139
de 37 138
eo 13 114
jbo 2 114
nci 3 123
@@ -23,13 +23,13 @@ consonants 9 115
ta 21 153
hu 24 121
lv 29 125
nl 24 125
pl 20 118
sk 28 133
cs 6 133
hr 25 138
mk 3 139
sr 14 138
nl 25 126
pl 22 120
sk 28 135
cs 6 135
hr 25 140
mk 3 141
sr 14 140
it 18 126
la 21 124
es 10 123
@@ -38,7 +38,7 @@ consonants 9 115
pt 29 138
pt-pt 20 138
ro 36 146
el 8 123
el 9 123
grc 12 127
sv 22 127
no 28 132
@@ -53,18 +53,19 @@ consonants 9 115
id 15 125
sq 33 126
hy 23 117
da 24 120
da 27 120
rw 15 130
ml 13 151
ne 18 157
pa 14 151
prs 8 111
sl 7 133
sl 10 135
gd 6 107
bg 10 119
nso 8 107
bg 10 121
nso 12 111
ht 11 140
az 10 127
ak 8 109
Data file Used by
b/b [b] base
@@ -342,10 +343,11 @@ l/l_ [l/] base
[l/] fr
l/l_@ [l/3] base
[l/] fr
l/l@ [h&w] base
l/l@ [hæy] base
[l#] base
[l] fr
[l/2] fr
[K] nso
l/L1_aL [l/] base
[l/] de
l/L1_eL [l/] base
@@ -368,27 +370,30 @@ 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&w] base
l/la [hæy] base
[l#] base
[l] fr
[l/2] fr
[K] nso
l/l_a [l/3] base
[l/] fr
l/le [h&w] base
l/le [hæy] base
[l#] base
[l] fr
[l/2] fr
[K] nso
l/l_e [l/3] base
[l/] fr
l/L_eL_af [&] af
[&:] af
l/l_front [L] sq
l/l_front_ [l/4] sq
l/li [h&w] base
l/li [hæy] base
[l#] base
[l] fr
[l/2] fr
[l] zh
[K] nso
l/l_i [l/3] base
[l/] fr
[i] sq
@@ -396,17 +401,19 @@ ll/ll [L] bg
ll/_ll [L] bg
l/l_long [l] base
[l] fr
l/lo [h&w] base
l/lo [hæy] base
[l#] base
[l] fr
[l/2] fr
[K] nso
l/l_o [l/3] base
[l/] fr
l^/l_rfx [l.] base
l/lu [h&w] base
l/lu [hæy] base
[l#] base
[l] fr
[l/2] fr
[K] nso
l/l_u [l/3] base
[l/] fr
l/l_vi [l] vi
@@ -422,6 +429,7 @@ l/xl [l] base
[l] fr
[l] hu
[ll] sq
[K] nso
m/_m [m] base
m/m_ [m] base
m/m@ [m] base
@@ -504,7 +512,6 @@ n/nu [n] base
[n#] is
[n] zh
r/@_ [V#] de
[V3#] de
r2/r2@ [r-] en
r2/r2a [r-] en
r2/r2e [r-] en
@@ -600,9 +607,7 @@ r/trr [r/] base
[r] ro
[r] ru
r/V_ [V#] de
[V1#] de
r/V_2_ [V#] de
[V2#] de
r/xr [r] base
[R3] base
[r-] en
@@ -629,6 +634,7 @@ ufric/s [s] base
[z2] fr
[s] es
[z] sq
[s] da
ufric/s_ [s] base
[z] base
[s2] consonants
@@ -640,6 +646,7 @@ ufric/s_ [s] base
ufric/s! [s] base
[s] fr
[s] es
[s] da
ufric/s_continue [s2] consonants
[s2] lv
ufric/sh [S] base
@@ -668,6 +675,7 @@ ufric/sx_sv [sx] sv
ufric/th [T] base
ufric/th_ [T] base
ufric/tl# [tl#] is
ufric/tlh [K] nso
ufric/x [x] base
[kh] vi
ufric/x2 [x2] af
@@ -725,6 +733,7 @@ ustop/null [?] base
ustop/p [p] base
[p2] fr
[p] zhy
[p] da
ustop/p_ [p] base
[ph] consonants
[p] fr
@@ -742,10 +751,12 @@ ustop/pl [p] base
[p] lv
[p] sk
[p] sq
[p] da
ustop/pr [p] base
[p-] consonants
[ph] consonants
[p] base2
[p] da
ustop/p_unasp [p] base
[p-] consonants
[p] base2
@@ -754,6 +765,7 @@ ustop/p_unasp [p] base
[p] sk
[p] zh
[p] sq
[p] da
ustop/p_unasp_ [p-] consonants
[p] base2
[p] fr
@@ -766,12 +778,12 @@ ustop/t [t] base
[dh.] hi
[th.] hi
[t] zhy
[t] da
ustop/t_ [t] base
[t] en-us
[t] fr
[t] lv
[t] sk
[t] el
[th] zh
ustop/t_dnt [t] base
[t[] base
@@ -788,6 +800,7 @@ ustop/t_pzd [c] base
[t;] pl
ustop/tr [t] base
[t] en-us
[t] da
ustop/ts [ts] consonants
[dz] consonants
[ts] hu
@@ -809,7 +822,6 @@ ustop/t_short [t] fr
[t.] hi
[t] lv
[t] sk
[t] el
ustop/t_short_ [t] fr
ustop/tsh_pzd [tS;] zh
ustop/tsh_pzd_unasp [tS;] zh
@@ -829,7 +841,8 @@ ustop/ts_rfx_unasp [ts.] zh
ustop/ts_sr [tS;] sr
[dZ;] sr
ustop/ts_unasp [ts] zh
ustop/t_unasp2 [t] zh
ustop/t_unasp2 [t] el
[t] zh
vdiph/0i [OI] pt
[OI] grc
[OI] vi
@@ -913,7 +926,6 @@ vdiph/aau_2 [aU] en-wi
[aU] la
[aau] zhy
vdiph/aau_3 [aU] hi
[aU] ta
[aU] ne
vdiph/aau_4 [aU] vi
vdiph/aau_6 [aU] de
@@ -947,6 +959,7 @@ vdiph/ai_8 [aI] ta
vdiph/aoo [aU] en-us
vdiph/au [aU] en
[aU] af
[aU] ta
[a:U] vi
[aU] prs
vdiph/au# [aU] en-sc
@@ -1109,6 +1122,7 @@ vnasal/o_n2 [o~] af
[O~] fr
vnasal/oo_n2 [O~] en
[O~] hi
[O~] nl
[o] zh
vnasal/oo_n3 [O~] pl
vnasal/u_n [U~] hi
@@ -1269,6 +1283,7 @@ vowel/a [a] base
[a] it
[a] zh
[a] id
[a] sl
[a] bg
vowel/a# [a] base2
[a/] base2
@@ -1286,6 +1301,7 @@ vowel/a_2 [a] base2
[A] pt
[a] pt-pt
[a] ro
[a] el
[a] da
[a] rw
vowel/a#_2 [A] nl
@@ -1326,7 +1342,7 @@ vowel/a#_3 [a#] en
[a/] sq
[3] da
[a] ml
vowel/a_4 [a/] el
vowel/a_4 [a] el
[a] vi
vowel/a#_4 [a:] nl
[a] tr
@@ -1375,6 +1391,7 @@ vowel/aa_9 [a] fi
[a:] hi
[a] ne
[a] pa
[a] ak
vowel/@_bck [@] hi
[@/] hi
[@] zh
@@ -1425,6 +1442,7 @@ vowel/e_3 [i] en-n
[e] ku
vowel/e_5 [i] en-sc
vowel/e_6 [e] ht
[e] ak
vowel/e_8 [E:] de
[e] fr
vowel/ee [E] en-n
@@ -1455,6 +1473,7 @@ vowel/ee_3 [&] af
[E] vi
vowel/ee_4 [E] sq
vowel/ee_5 [E] en
[E] ak
vowel/ee_6 [&] sk
[E3] sv
[E] ku
@@ -1533,6 +1552,7 @@ vowel/i [i] base
[i] ne
[i] prs
[i] nso
[i] ak
vowel/i# [y:] cy
vowel/i_2 [i2] de
[i:] de
@@ -1603,6 +1623,7 @@ vowel/ii_3 [I] cy
[I] no
[I] tr
[I] pa
[i] sl
vowel/ii#_3 [I2] en-us
vowel/ii_4 [I2] en
[I] en-us
@@ -1663,6 +1684,7 @@ vowel/o [o] base2
[o:] ml
[o:] pa
[o] sl
[o] ak
vowel/o_2 [o:] cy
[o:] hi
[o:] hu
@@ -1731,6 +1753,7 @@ vowel/oo_2 [0] en-sc
[O] cy
[o] cs
[0] da
[O] ak
vowel/oo_3 [O] af
vowel/oo_4 [O] base2
[0] en-wm
@@ -1774,6 +1797,7 @@ vowel/u [u] base
[u] ml
[u:] ml
[u] prs
[u] ak
vowel/u# [u:] en-sc
[Y] tr
vowel/u_2 [u1] fi
@@ -1782,6 +1806,7 @@ vowel/u_2 [u1] fi
[u] ro
[u] is
[u] tr
[u] sl
[u] bg
vowel/u#_2 [u-] sv
vowel/u#_3 [U] ta
+53
View File
@@ -154,3 +154,56 @@ phoneme R
endphoneme
// don't weaken consonants at end of word or before a stop
phoneme s
vls alv frc sibilant
voicingswitch z
lengthmod 3
Vowelin f1=0 f2=1700 -300 300 f3=-100 80
Vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20
IF nextPh(p) OR nextPh(t) OR nextPh(k) THEN
WAV(ufric/s!)
ENDIF
WAV(ufric/s)
endphoneme
phoneme p
vls blb stop
voicingswitch b
lengthmod 2
Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 amp=11
Vowelout f1=0 f2=1000 -500 -350 f3=-300 80 rms=22
IF nextPh(isPause2) THEN
WAV(ustop/p_unasp)
ELIF nextPh(r) THEN
WAV(ustop/pr, 70)
ELIF nextPh(R) OR nextPh(R2) THEN
WAV(ustop/pr)
ELIF nextPh(@-) THEN
WAV(ustop/p_unasp)
ELIF nextPh(l) THEN
WAV(ustop/pl)
ENDIF
WAV(ustop/p)
endphoneme
phoneme t
vls alv stop
voicingswitch d
lengthmod 2
Vowelin f1=0 f2=1700 -300 300 f3=-100 80
Vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20
IF nextPh(r) OR nextPh(R) OR nextPh(R2) THEN
WAV(ustop/tr)
ENDIF
WAV(ustop/t, 90)
endphoneme
+6
View File
@@ -96,6 +96,12 @@ phoneme A~
import_phoneme fr/A~
endphoneme
phoneme O~
vowel starttype #o endtype #o
length 190
FMT(vnasal/oo_n2)
endphoneme
// Diphthongs
//===========
+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:
+19 -5
View File
@@ -4,12 +4,21 @@
//====================================================
phoneme a/
vowel starttype #@ endtype #@
phoneme a
vowel starttype #a endtype #a
length 180
FMT(vowel/a_4)
IF thisPh(isWordEnd) AND thisPh(isNotStressed) AND nextPh(a) THEN
ChangePhoneme(NULL)
ENDIF
IF thisPh(isDiminished) THEN
FMT(vowel/a_4)
ENDIF
FMT(vowel/a_2)
endphoneme
phoneme e
vowel starttype #e endtype #e
length 180
@@ -40,9 +49,9 @@ phoneme t // revert to alveolar /t/
Vowelin f1=1 f2=1600 -300 300 f3=-100 80 amp=11
Vowelout f1=0 f2=1600 -300 250 f3=-100 80 rms=20
IF nextPh(isPause2) THEN
WAV(ustop/t_)
WAV(ustop/t_unasp2)
ENDIF
WAV(ustop/t_short, 80)
WAV(ustop/t_unasp2)
endphoneme
@@ -69,3 +78,8 @@ phoneme k
WAV(ustop/k_unasp, 70)
endphoneme
phoneme r
import_phoneme base/R2
endphoneme
+14 -1
View File
@@ -170,8 +170,21 @@ endphoneme
phoneme dz
import_phoneme consonants/dz
CALL consonants/dz
voicingswitch ts
ipa dʑ
endphoneme
phoneme ts;
CALL base/tS;
voicingswitch dz;
ipa tɕ
endphoneme
phoneme dz;
import_phoneme base/dZ;
voicingswitch ts;
endphoneme
+3
View File
@@ -132,6 +132,9 @@ endphoneme
phoneme U
vowel starttype #u endtype #u
length 140
IF thisPh(isWordEnd) AND nextPh(isVowel) THEN
ChangePhoneme(w)
ENDIF
FMT(vowel/uu_bck)
endphoneme
+3 -3
View File
@@ -118,14 +118,14 @@ endphoneme
phoneme aI
vowel starttype #a endtype #i
length 230
length 280
FMT(vdiph/ai_8)
endphoneme
phoneme aU
vowel starttype #a endtype #u
length 200
FMT(vdiph/aau_3)
length 260
FMT(vdiph/au)
endphoneme
+7 -2
View File
@@ -475,6 +475,8 @@ phoneme l/2 // 'dark' [l] after a vowel
ChangePhoneme(l)
ENDIF
CALL vowelstart_l
PrevVowelEndings
VowelEnding(l/L2_@L, -60)
VowelEnding(l/L2_aL, -50)
@@ -1125,9 +1127,9 @@ phoneme z
ENDIF
IF nextPh(isPause2) THEN
FMT(voc/z_) addWav(ufric/s_, 85)
FMT(voc/z_) addWav(ufric/s_, 70)
ENDIF
FMT(voc/z) addWav(ufric/s_)
FMT(voc/z) addWav(ufric/s_, 85)
endphoneme
@@ -1817,3 +1819,6 @@ include ph_haitian
phonemetable az tr
include ph_azerbaijani
phonemetable ak base
include ph_akan