[1.45.27]

Lang=hi, Suppress some [@] vowels.
Include batch of changes from Jerouris.
Fix crash with large number of nbsp characters.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@266 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2011-05-19 14:56:50 +00:00
parent b629cec68c
commit d892e39be5
41 changed files with 1977 additions and 711 deletions
+33 -32
View File
@@ -3,32 +3,32 @@
base 107 107
consonants 10 116
base2 26 123
en 48 148
en-n 32 148
en-us 37 149
en-sc 39 150
en-rp 33 148
en-wm 30 148
en-wi 30 148
en 50 150
en-n 32 150
en-us 37 151
en-sc 39 152
en-rp 33 150
en-wm 30 150
en-wi 30 150
af 39 136
cy 29 132
de 38 139
de 37 138
eo 13 114
jbo 2 114
nci 3 123
fi 40 133
fr 59 140
fr-ca 11 140
hi 59 150
ta 22 153
kn 17 150
ml 21 153
hi 57 148
ta 22 151
kn 17 148
ml 21 151
hu 25 122
lv 29 125
nl 34 128
nl 35 128
pl 22 120
sk 28 135
cs 6 135
cs 7 135
hr 25 140
mk 3 141
sr 14 140
@@ -36,13 +36,13 @@ consonants 10 116
bg 14 123
it 19 127
la 21 124
es 10 123
es 11 123
es-la 1 123
ca 11 125
pt 29 138
pt-pt 20 138
ro 36 146
el 9 123
el 10 123
grc 12 127
sv 22 127
no 28 132
@@ -59,8 +59,8 @@ consonants 10 116
da 27 120
ka 19 112
rw 15 130
ne 18 157
pa 14 151
ne 18 156
pa 14 149
prs 8 111
sl 10 135
gd 6 107
@@ -70,9 +70,9 @@ consonants 10 116
ak 8 109
am 8 123
wo 18 118
dv 14 150
te 16 150
si 24 156
dv 14 148
te 16 148
si 24 154
tn 27 119
Data file Used by
@@ -368,7 +368,7 @@ l/l_ [l] base
[l/] fr
l/l_@ [l/3] base
[l/] fr
l/l@ [h‘ø] base
l/l@ [h†s] base
[l#] base
[l] fr
[l/2] fr
@@ -402,7 +402,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‘ø] base
l/la [h†s] base
[l#] base
[l] fr
[l/2] fr
@@ -410,7 +410,7 @@ l/la [h
[K] tn
l/l_a [l/3] base
[l/] fr
l/le [h‘ø] base
l/le [h†s] base
[l#] base
[l] fr
[l/2] fr
@@ -422,7 +422,7 @@ l/L_eL_af [&] af
[&:] af
l/l_front [L] sq
l/l_front_ [l/4] sq
l/li [h‘ø] base
l/li [h†s] base
[l#] base
[l] fr
[l/2] fr
@@ -436,7 +436,7 @@ ll/ll [L] bg
ll/_ll [L] bg
l/l_long [l] base
[l] fr
l/lo [h‘ø] base
l/lo [h†s] base
[l#] base
[l/2] fr
[K] nso
@@ -446,7 +446,7 @@ l/l_o [l/3] base
l^/l_rfx [l.] base
[l] ru
[l^] ru
l/lu [h‘ø] base
l/lu [h†s] base
[l#] base
[l] fr
[l/2] fr
@@ -1305,7 +1305,6 @@ vowel/@ [@] base
[@5] en
[@] en-rp
[V] cy
[@4] hi
[@] kn
[@] hy
[@] ka
@@ -1397,6 +1396,7 @@ vowel/a# [a] base2
[a#] en-sc
[a#] en-wi
[&] sr
[a] es
[a#] rw
[a/] rw
[a] wo
@@ -1408,6 +1408,8 @@ vowel/a_2 [a] base2
[A@] en-wi
[aa] en-wi
[a] eo
[a] nl
[a] es
[A] pt
[a] pt-pt
[a] ro
@@ -1445,7 +1447,6 @@ vowel/a#_3 [a#] en
[a#] en-us
[a#] en-wm
[3] de
[3:] de
[a] hi
[a] ml
[a] ru
@@ -1505,9 +1506,9 @@ vowel/aa_5 [A:] en-n
[A@] en-wm
vowel/aa_6 [A] de
[A:] de
vowel/aa_7 [A] nl
vowel/aa_8 [0] en-us
[A:] en-us
[A] nl
[a:] is
vowel/aa_9 [a] fi
[a:] hi
@@ -1515,7 +1516,6 @@ vowel/aa_9 [a] fi
[a] pa
[a] ak
vowel/@_bck [@] hi
[@/] hi
[@] bg
[@] zh
[V] ne
@@ -1958,6 +1958,7 @@ vowelr/o_r [o@] en-sc
vowelr/r-voc [r-] base
[r-] sk
[r:] sk
[r-] cs
vowelr/V3_r [VR] en
[3] en-sc
[@r] zh
@@ -2031,6 +2032,7 @@ vowel/u_bck [u] base2
[u] it
[u] ca
[u] pt
[u] el
[u:] sv
[u:] no
[u:] is
@@ -2309,7 +2311,6 @@ w/wi2 [i:] en
[i:] en-rp
[i2] de
[i:] de
[i] nl
[i:] sv
[i:] no
w/wo [w] base
+1
View File
@@ -92,6 +92,7 @@ endphoneme
phoneme @L // syllabic L
vowel starttype #@ endtype l
ipa əl
unstressed
length 160
FMT(vwl_en/@L)
+7
View File
@@ -30,5 +30,12 @@ phoneme oU
FMT(vdiph/oou)
endphoneme
phoneme r- // syllabic r
vowel starttype #@ endtype #@
ipa rU+0329
length 120
FMT(vowelr/r-voc)
endphoneme
+14 -9
View File
@@ -18,10 +18,7 @@ endphoneme
phoneme i
vowel starttype #i endtype #i
length 160
IF prevPh(w) THEN
VowelStart(w/wi2)
ENDIF
length 130
FMT(vowel/i_2)
endphoneme
@@ -87,13 +84,21 @@ phoneme a:
FMT(vowel/a)
endphoneme
phoneme a // ?? suggested by aegis, but seems too short
vowel starttype #a endtype #a
length 140
FMT(vowel/a_2)
endphoneme
phoneme A
vowel starttype #a endtype #a
length 160
length 140
IF thisPh(isUnstressed) THEN
FMT(vowel/a#_2)
ENDIF
FMT(vowel/aa_7)
FMT(vowel/aa_8)
endphoneme
phoneme A~
@@ -131,7 +136,7 @@ endphoneme
phoneme o:
vowel starttype #o endtype #u
length 200
length 150
FMT(vdiph/ou_4)
endphoneme
@@ -265,7 +270,7 @@ phoneme s
ChangePhoneme(!)
ENDIF
ENDIF
CALL base/s // unaspirated
CALL base/s
endphoneme
phoneme z
@@ -278,6 +283,6 @@ phoneme z
IF prevPh(!) THEN // previous was [s] or [z], now assimilated
ChangePhoneme(s)
ENDIF
CALL base/s
CALL base/z
endphoneme
+22
View File
@@ -25,6 +25,27 @@ phoneme t# // reduced [t] as in "city"
endphoneme
phoneme d# // change to [d] or [t] depending on whether previous phoneme is voiced
vls alv stop
IF prevPh(isVoiced) THEN
ChangePhoneme(d)
ELSE
ChangePhoneme(t)
ENDIF
endphoneme
phoneme z# // change to [z] or [s] depending on whether previous phoneme is voiced
vls alv frc sibilant
IF prevPh(isVoiced) THEN
ChangePhoneme(z)
ELSE
ChangePhoneme(s)
ENDIF
endphoneme
phoneme l // use dark [l/2] before not-vowel
liquid
lengthmod 7
@@ -142,6 +163,7 @@ endphoneme
phoneme @L
vowel starttype #@ endtype l
ipa əl
unstressed
length 160
CALL vowelstart_l
+1
View File
@@ -346,6 +346,7 @@ endphoneme
phoneme @L
vowel starttype #@ endtype l
ipa əl
unstressed
length 160
CALL vowelstart_l
+1
View File
@@ -43,6 +43,7 @@ endphoneme
phoneme @L
vowel starttype #@ endtype l
ipa əl
unstressed
length 160
FMT(vwl_en/@L)
+4 -8
View File
@@ -24,16 +24,12 @@ phoneme 3 // open Schwa+r
vowel starttype #@ endtype #@
unstressed flag1
length 160
IF thisPh(isFinalVowel) THEN
Length 210
ENDIF
FMT(vowel/a#_3) // in eSpeak 1.44, this used vowel/V_3 at end-of-word
endphoneme
phoneme 3: // open Schwa+r
vowel starttype #@ endtype #@
unstressed flag1
length 210
FMT(vowel/a#_3)
endphoneme
phoneme a
vowel starttype #a endtype #a
@@ -224,7 +220,7 @@ endphoneme
phoneme Y:
vowel starttype #@ endtype #@
length 220
length 180
FMT(vowel/y#)
endphoneme
+9 -4
View File
@@ -6,7 +6,7 @@
phoneme a
vowel starttype #a endtype #a
length 180
length 140
IF thisPh(isWordEnd) AND thisPh(isNotStressed) AND nextPh(a) THEN
ChangePhoneme(NULL)
@@ -21,7 +21,7 @@ endphoneme
phoneme e
vowel starttype #e endtype #e
length 180
length 140
FMT(vowel/e_mid2)
endphoneme
@@ -34,10 +34,15 @@ endphoneme
phoneme o
vowel starttype #o endtype #o
length 180
length 150
FMT(vowel/oo)
endphoneme
phoneme u
vowel starttype #u endtype #u
length 160
FMT(vowel/u_bck)
endphoneme
// CONSONANTS
@@ -80,6 +85,6 @@ endphoneme
phoneme r
import_phoneme base/R2
import_phoneme base/R3
endphoneme
+44 -18
View File
@@ -9,8 +9,9 @@ phoneme : // Lengthen the previous vowel by "length"
endphoneme
phoneme @
vowel starttype #@ endtype #@
vowel flag1 starttype #@ endtype #@
length 130
ChangeIfDiminished(@-)
IF nextPh(H) THEN
FMT(vowel/@_low)
@@ -18,41 +19,66 @@ phoneme @
FMT(vowel/@_bck)
endphoneme
phoneme @/
vowel starttype #@ endtype #@
length 130
FMT(vowel/@_bck)
endphoneme
phoneme V
vowel starttype #@ endtype #@
vowel flag1 starttype #@ endtype #@
length 130
ChangeIfNotStressed(@)
IF nextPh(H) THEN
FMT(vowel/@_low)
IF thisPh(isNotStressed) THEN
IF prevPh(H) THEN
ChangePhoneme(@)
ENDIF
IF thisPh(isWordEnd) THEN
ChangePhoneme(NULL)
ENDIF
IF nextVowel(isFlag1) THEN
ELSE
IF thisPh(isSeqFlag1) THEN
// delete the last inherent vowel of a sequence
ChangePhoneme(NULL)
ELSE
IF thisPh(isFirstVowel) THEN
ELSE
// delete if not the first vowel, and is an isolated 'a'
ChangePhoneme(NULL)
ENDIF
ENDIF
ENDIF
ENDIF
IF prevPh(isPalatal) THEN
ChangePhoneme(@3)
ELSEIF prevPh(r) THEN
ChangePhoneme(@2)
ELSE
IF thisPh(isNotStressed) THEN
ChangePhoneme(@)
ENDIF
IF nextPh(H) THEN
FMT(vowel/@_low)
ENDIF
ENDIF
FMT(vowel/V_3)
endphoneme
phoneme @2
vowel starttype #@ endtype #@
vowel flag1 starttype #@ endtype #@
length 130
FMT(vowel/@_low)
endphoneme
phoneme @3
vowel starttype #@ endtype #@
vowel flag1 starttype #@ endtype #@
length 130
ChangeIfDiminished(@-)
FMT(vowel/@_3)
endphoneme
phoneme @4
vowel starttype #@ endtype #@
length 130
FMT(vowel/@)
endphoneme
+2 -2
View File
@@ -1,7 +1,7 @@
phoneme i
vowel starttype #i endtype #i
length 110
length 100
IfNextVowelAppend(;)
FMT(vowel/ii_3)
endphoneme
@@ -105,7 +105,7 @@ endphoneme
phoneme r- // syllabic r
vowel starttype #@ endtype #@
ipa rU+0329
length 220
length 200
FMT(vowelr/r-voc)
endphoneme
+10
View File
@@ -3,6 +3,16 @@
// Spanish - based on Base2
//====================================================
phoneme a
vowel starttype #a endtype #a
length 160
IF thisPh(isDiminished) THEN
FMT(vowel/a#)
ENDIF
FMT(vowel/a_2)
endphoneme
phoneme e
vowel starttype #e endtype #e
length 170
+60 -1
View File
@@ -1020,7 +1020,7 @@ endphoneme
phoneme J
vcd pal afr sibilant
vcd pal afr sibilant palatal
voicingswitch c
lengthmod 5
Vowelin f1=2 f2=2700 400 600 f3=300 80 rate len=70
@@ -1815,3 +1815,62 @@ include ph_georgian
// These langauges are not in a usable state.
// These lines can be deleted.
phonemetable rw base2
include ph_kinyarwanda
//phonemetable bn hi
//include ph_bengali
phonemetable ne hi
include ph_nepali
//phonemetable mr hi
//include ph_marathi
//phonemetable eu base2
//include ph_basque
//phonemetable mn base
//include ph_mongolian
phonemetable pa hi
include ph_punjabi
phonemetable prs base
include ph_dari
phonemetable sl sk
include ph_slovenian
phonemetable gd base
include ph_s_gaelic
phonemetable nso base
include ph_northern-sotho
phonemetable ht fr
include ph_haitian
phonemetable az tr
include ph_azerbaijani
phonemetable ak base
include ph_akan
phonemetable am base2
include ph_amhari
phonemetable wo base
include ph_wolof
phonemetable dv hi
include ph_divehi
phonemetable te hi
include ph_telugu
phonemetable si hi
include ph_sinhala
phonemetable tn base
include ph_setswana