mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 13:38:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[1.47.09]

Browse Source 
Fix: lookup in *_list occasionally find the wrong word.
Languages changes: hi, ne, sl.

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@351 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2013-04-29 22:59:27 +00:00
parent 6f58bb4d5b
commit adcb83fcf9
24 changed files with 285 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
phsource/compile_report
+15 -5
View File
@@ -72,7 +72,7 @@ consonants 11 119
fa 9 112
rw 15 132
prs 8 113
sl 10 137
sl 11 137
gd 6 109
nso 12 113
ht 11 146
@@ -741,6 +741,7 @@ r3/@tap [**] base
r3/@tap2 [**] base
[*] ko
r3/@tap_rfx [r.] base
r3/@tap_rfx_ [r.] base
r/a_ [r] da
[3-] da
r/aa [R] da
@@ -987,7 +988,6 @@ ustop/q_u [q] base
ustop/t [t] base
[t] en-us
[d.#] hi
[t.#] hi
[d.#] ml
[t] zhy
[t] da
@@ -1018,6 +1018,7 @@ ustop/t_hi [t[] base
[t^] et
[t[] vi
[t`] am
ustop/th_rfx [t.#] hi
ustop/t_pzd [c] base
[t^] et
[t;] lt
@@ -1048,10 +1049,13 @@ ustop/tsh [tS] base
[c] zhy
[tS] tn
ustop/tsh_ [tS] base
[c] hi
[tS] bn
[c] zhy
[tS] tn
ustop/tsh2 [tS] hr
[dZ] hr
ustop/tsh_asp [tS#] bn
ustop/t_short [t-] consonants
[t] fr
[t2] fr
@@ -1062,7 +1066,8 @@ ustop/t_short_ [t] fr
ustop/tsh_pzd [tS;h] zh
ustop/tsh_pzd_unasp [tS;] zh
ustop/tsh_sr [tS] sr
ustop/tsh_unasp [tS`] am
ustop/tsh_unasp [c] hi
[tS`] am
ustop/ts_pzd [tS;] base
[J#] hi
[J#] ml
@@ -1669,6 +1674,7 @@ vowel/a_2 [a] base2
[a] rw
vowel/a#_2 [A] nl
[a:] nl
[a] bn
[a] kn
[a#] pl
[&] hr
@@ -1828,6 +1834,7 @@ vowel/e [e] base
[?e] da
[e] rw
[e#] rw
[e:] sl
[e] wo
[e:] wo
[e] dv
@@ -2033,8 +2040,7 @@ vowel/i_5 [i:] en-sc
vowel/i#_5 [y] pt-pt
[i/] pt-pt
[y] ro
vowel/i_6 [i] hi
[i] bn
vowel/i_6 [i] bn
[i] ta
[i] kn
[i] ml
@@ -2119,12 +2125,14 @@ vowel/ii_5 [i] ta
vowel/ii_6 [I] en-wm
[I] en-wi
[I2] en-wi
[i] hi
[I] sr
[I] pt
[y] pt
[i/] pt
[i] is
[I] sq
[i] sl
[i] wo
vowel/ii_7 [i] en
[i] ga
@@ -2466,12 +2474,14 @@ vowel/V_2 [V] en
[V#] ru
[V] ku
vowel/V_3 [V] en-rp
[@] hi
[V] hi
[V] pa
[V] ta
[a] bg
vowel/V_4 [V] en-sc
[O] ga
[V] hi
[V] da
[?V] da
vowel/V_6 [V] en-us
phsource/ph_bengali
+25 -2
View File
@@ -32,6 +32,9 @@ endphoneme
phoneme a
vowel starttype #a endtype #a
length 225
IF thisPh(isWordEnd) AND thisPh(isUnstressed) THEN
FMT(vowel/a#_2)
ENDIF
FMT(vowel/a_3)
endphoneme
@@ -82,15 +85,35 @@ endphoneme
phoneme tS
import_phoneme base/tS
vls pla afr sibilant
voicingswitch dZ
lengthmod 2
Vowelin f1=0 f2=2300 200 400 f3=-100 80
IF nextPh(isPause2) THEN
WAV(ustop/tsh_)
ENDIF
WAV(ustop/tsh_)
endphoneme
phoneme tS#
import_phoneme base/tS
vls pla afr sibilant
voicingswitch dZ
lengthmod 2
Vowelin f1=0 f2=2300 200 400 f3=-100 80
IF nextPh(isPause2) THEN
WAV(ustop/tsh_asp)
ENDIF
WAV(ustop/tsh_asp, 120)
endphoneme
phoneme ~
virtual
endphoneme
phsource/ph_german
+3 -3
View File
@@ -126,9 +126,9 @@ phoneme i:
VowelStart(w/wi2)
ENDIF
IF nextPh(r) AND next2Ph(isNotVowel) THEN
// IF nextPh(r) AND next2Ph(isNotVowel) THEN
// ChangePhoneme(iR)
ENDIF
// ENDIF
FMT(vowel/i_2)
endphoneme
@@ -346,7 +346,7 @@ phoneme iR // TEST "vier" = [f'iR] not successful
vowel starttype #i endtype #@
ipa iɐ
flag1
length 230
length 240
FMT(vdiph2/i@_3)
endphoneme
phsource/ph_hindi
+48 -26
View File
@@ -16,13 +16,16 @@ phoneme @
IF nextPh(H) OR prevPh(H) THEN
FMT(vowel/@_low)
ENDIF
IF nextPh(j) THEN
FMT(vowel/V_3)
ENDIF
FMT(vowel/@_bck)
endphoneme
phoneme V
vowel flag1 starttype #@ endtype #@
length 130
length 140
IF thisPh(isWordStart) THEN
FMT(vowel/V_3)
@@ -30,12 +33,14 @@ phoneme V
ENDIF
IF thisPh(isNotStressed) THEN
IF prevPh(H) THEN
ChangePhoneme(@)
length 130
IF thisPh(isWordEnd) AND NOT thisPh(isFirstVowel) THEN
ChangePhoneme(NULL)
ENDIF
IF thisPh(isWordEnd) THEN
ChangePhoneme(NULL)
IF prevPh(H) THEN
ChangePhoneme(@)
ENDIF
IF prev2PhW(isVowel) AND NOT nextVowel(isFlag1) THEN
@@ -45,20 +50,22 @@ phoneme V
ChangePhoneme(NULL)
ENDIF
ENDIF
ENDIF
IF prevPh(isPalatal) THEN
ChangePhoneme(@3)
ELSEIF prevPh(r) THEN
ChangePhoneme(@2)
ELSE
IF thisPh(isNotStressed) THEN
IF prevPh(isPalatal) AND NOT nextPh(H) THEN
ChangePhoneme(@3)
ELSEIF prevPh(r) THEN
ChangePhoneme(@2)
ELSE
ChangePhoneme(@)
ENDIF
ENDIF
IF nextPh(H) OR prevPh(H) THEN
FMT(vowel/@_low)
ENDIF
IF nextPh(H) OR prevPh(H) THEN
FMT(vowel/@_low)
ENDIF
IF prevPh(w) THEN
FMT(vowel/V_4)
ENDIF
FMT(vowel/V_3)
@@ -84,6 +91,9 @@ endphoneme
phoneme i:
vowel long starttype #i endtype #i
length 230
IF thisPh(isUnstressed) THEN
ChangePhoneme(i)
ENDIF
IfNextVowelAppend(;)
FMT(vowel/i_fnt)
endphoneme
@@ -92,7 +102,7 @@ phoneme i // as [i:] but not marked as 'long'
vowel starttype #i endtype #i
length 230
IfNextVowelAppend(;)
FMT(vowel/i_6)
FMT(vowel/ii_6)
endphoneme
phoneme I
@@ -110,7 +120,7 @@ endphoneme
phoneme e
vowel starttype #e endtype #e
length 130
length 140
FMT(vowel/e_2)
endphoneme
@@ -122,7 +132,7 @@ endphoneme
phoneme E
vowel starttype #e endtype #e
length 130
length 140
FMT(vowel/e_mid)
endphoneme
@@ -135,7 +145,7 @@ endphoneme
phoneme a:
vowel long starttype #a endtype #a
length 190
length 200
IF nextPhW(j) THEN
FMT(vowel/a_5)
ENDIF
@@ -144,7 +154,7 @@ endphoneme
phoneme a
vowel long starttype #a endtype #a
length 130
length 140
FMT(vowel/a#_3)
endphoneme
@@ -157,7 +167,7 @@ endphoneme
phoneme o
vowel starttype #o endtype #o
length 130
length 140
FMT(vowel/o)
endphoneme
@@ -170,14 +180,14 @@ endphoneme
phoneme O
vowel starttype #o endtype #o
length 130
length 140
FMT(vowel/0)
endphoneme
phoneme U
vowel starttype #u endtype #u
length 120
length 140
FMT(vowel/uu_bck)
endphoneme
@@ -388,8 +398,11 @@ phoneme t.#
voicingswitch d.#
Vowelin f1=0 f2=1800 -300 300 f3=-400 80
Vowelout f1=0 f2=1800 -300 250 f3=-400 80 rms=20 colr=2
// WAV(ustop/th_rfx)
WAV(ustop/t)
IF nextPhW(t.#) THEN
ChangePhoneme(t.)
ENDIF
WAV(ustop/th_rfx)
endphoneme
phoneme d.
@@ -437,10 +450,19 @@ endphoneme
// also try [tS] and [dZ]
phoneme c
import_phoneme base/c
vls pla afr sibilant
voicingswitch dZ
lengthmod 2
Vowelin f1=0 f2=2300 200 400 f3=-100 80
IF nextPh(isPause2) THEN
WAV(ustop/tsh_)
ENDIF
WAV(ustop/tsh_unasp)
endphoneme
phoneme c#
CALL base/tS;
ipa cU+02B0
phsource/ph_slovenian
+9
View File
@@ -9,6 +9,9 @@ phoneme i
vowel starttype #i endtype #i
length 140
IfNextVowelAppend(;)
IF thisPh(isStressed) AND NOT nextPhW(isRhotic) THEN
FMT(vowel/ii_6)
ENDIF
FMT(vowel/ii_3)
endphoneme
@@ -33,6 +36,12 @@ phoneme e
FMT(vowel/e_2)
endphoneme
phoneme e:
vowel starttype #e endtype #e
length 240
FMT(vowel/e)
endphoneme
phoneme E
vowel starttype #e endtype #e
phsource/phonemes
+4
View File
@@ -907,6 +907,10 @@ phoneme r. // retroflex
lengthmod 3
Vowelout f1=3 f2=1400 -400 300 f3=-400 80 rms=35 len=15 colr=2
Vowelin f1=2 f2=1400 -400 300 f3=-400 80 len=20
IF nextPh(isNotVowel) THEN
FMT(r3/@tap_rfx_)
ENDIF
FMT(r3/@tap_rfx)
endphoneme