[1.48.11]

Command-line: added options --sep --tie.

API, changed the meaning of the "phonememode" parameter in espeak_SetPhonemeTrace() and espeak_TextToPhonemes().

Language changes to:  en, eu, pt.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@385 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2014-08-31 15:50:07 +00:00
parent 2315736555
commit b27f69bb5a
33 changed files with 1151 additions and 769 deletions
+5 -8
View File
@@ -49,7 +49,7 @@ consonants 11 119
es-la 2 125
ca 11 127
an 5 126
eu 18 127
eu 21 129
pt 29 140
pt-pt 20 140
ro 36 148
@@ -875,7 +875,6 @@ ufric/s [s] base
[z2] fr
[s] ru
[s] es
[z] eu
[z] sq
[s] da
[s] ar
@@ -885,7 +884,6 @@ ufric/s_ [s] base
[s] fr
[z] fr
[s] es
[z] eu
[z;] ro
[s] sw
[z] sq
@@ -914,7 +912,6 @@ ufric/sh_pzd2 [S] sr
[dZ] sr
[S;] zh
ufric/sh_rfx [s.] base
[s] eu
[s.] zh
ufric/s_pal [s^] et
ufric/s_pzd [s;] base
@@ -932,6 +929,8 @@ ufric/tl# [tl#] is
[tl#] kl
ufric/tlh [K] nso
[K] tn
ufric/ts_eu [ts] eu
ufric/tz_eu [tz] eu
ufric/x_ [x] base
ufric/x2 [x2] af
[x] ku
@@ -945,6 +944,7 @@ ufric/x_sr [h#] sr
ufric/xx [X] base
[Q"] base
[Q] ka
ufric/z_eu [z] eu
ustop/c [c] base
ustop/k [k] base
[k] fr
@@ -1123,8 +1123,6 @@ ustop/tr [t] base
ustop/ts [ts] consonants
[dz] consonants
[ts] hu
[ts] eu
[tz] eu
[z] zhy
[tsh] zh
[ts] tn
@@ -1133,8 +1131,6 @@ ustop/ts [ts] consonants
ustop/ts_ [ts] consonants
[dz] consonants
[ts] lv
[ts] eu
[tz] eu
[ts] tn
[ts#] bo
[dz#] bo
@@ -1865,6 +1861,7 @@ vowel/a#_3 [a#] en
vowel/a_4 [a] ga
[a] es
[a] eu
[a2] eu
[a] el
[a] vi
vowel/a#_4 [a:] nl
+167 -186
View File
@@ -1,186 +1,167 @@
//====================================================
// Basque - based on Base2
//====================================================
phoneme a
vowel starttype #a endtype #a
length 200
FMT(vowel/a_4)
endphoneme
phoneme a2 // delete if the next vowel is 'a'. Used for numbers.
vowel starttype #a endtype #a
length 200
IF nextPh(#a) THEN
ChangePhoneme(NULL) // merge consecutive 'a'
ELSE
ChangePhoneme(a)
ENDIF
endphoneme
phoneme e
vowel starttype #e endtype #e
length 200
FMT(vowel/e_mid2)
endphoneme
phoneme i
vowel starttype #i endtype #i
length 190
IfNextVowelAppend(;)
FMT(vowel/i)
endphoneme
phoneme o
vowel starttype #o endtype #o
length 200
FMT(vowel/oo)
endphoneme
phoneme u
vowel starttype #u endtype #u
length 200
FMT(vowel/u_bck2)
endphoneme
phoneme Y
vowel starttype #@ endtype #@
length 200
FMT(vowel/y#)
endphoneme
// Note: I have made [s] and [z] the same, and similarly [ts] and [tz]
// These should be changed to the correct "s", "z", "ts" and "tz" sounds fo Basque.
phoneme s
vls alv frc sibilant
ipa ʂ
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(isPause) THEN
WAV(ufric/sh_rfx, 60)
ENDIF
WAV(ufric/sh_rfx, 90) // different from s but probably not correct
endphoneme
phoneme z
vls alv frc sibilant
ipa s
lengthmod 3
Vowelin f1=0 f2=1700 -300 300 f3=-100 80
Vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20
// z+z=tz, z+g=zk, z+g=zt, z+b=zp
IF nextPh(z) THEN
ChangeNextPhoneme(tz)
ChangePhoneme(NULL)
ELSEIF nextPh(g) THEN
ChangeNextPhoneme(k)
ELSEIF nextPh(d) THEN
ChangeNextPhoneme(t)
ELSEIF nextPh(b) THEN
ChangeNextPhoneme(p)
ENDIF
IF nextPh(isPause) THEN
WAV(ufric/s_, 60)
ENDIF
WAV(ufric/s, 80)
endphoneme
phoneme ts
vls alv afr sibilant
ipa tʂ
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(isPause2) THEN
WAV(ustop/ts_)
ENDIF
WAV(ustop/ts)
endphoneme
phoneme tz
vls alv afr sibilant
ipa ts
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(isPause2) THEN
WAV(ustop/ts_)
ENDIF
WAV(ustop/ts)
endphoneme
phoneme t
vls dnt stop
lengthmod 2
// t+g=k, t+d=t, t+z=tz
IF nextPh(g) THEN
ChangeNextPhoneme(k)
ChangePhoneme(NULL)
ELSEIF nextPh(d) THEN
ChangeNextPhoneme(t)
ChangePhoneme(NULL)
ELSEIF nextPh(z) THEN
ChangeNextPhoneme(tz)
ChangePhoneme(NULL)
ENDIF
CALL base2/t
endphoneme
phoneme r
vcd alv flp rhotic
brkafter
ipa ɾ
lengthmod 3
IF nextPhW(isVowel) THEN
ChangePhoneme(**)
ENDIF
CALL base/*
endphoneme
phoneme b
import_phoneme es/b
endphoneme
phoneme d
import_phoneme es/d
endphoneme
phoneme g
import_phoneme es/g
endphoneme
phoneme n
vcd alv nasal
lengthmod 4
IF prevPhW(i) AND nextPhW(isVowel) THEN
ChangePhoneme(n^)
ENDIF
CALL base/n
endphoneme
//====================================================
// Basque - based on Base2
//====================================================
phoneme a
vowel starttype #a endtype #a
length 200
FMT(vowel/a_4)
endphoneme
phoneme a2 // delete if the next vowel is 'a'. Used for numbers.
vowel starttype #a endtype #a
length 200
IF nextPh(#a) THEN
ChangePhoneme(NULL) // merge consecutive 'a'
ENDIF
FMT(vowel/a_4)
endphoneme
phoneme e
vowel starttype #e endtype #e
length 200
FMT(vowel/e_mid2)
endphoneme
phoneme i
vowel starttype #i endtype #i
length 190
IfNextVowelAppend(;)
FMT(vowel/i)
endphoneme
phoneme o
vowel starttype #o endtype #o
length 200
FMT(vowel/oo)
endphoneme
phoneme u
vowel starttype #u endtype #u
length 200
FMT(vowel/u_bck2)
endphoneme
phoneme Y
vowel starttype #@ endtype #@
length 200
FMT(vowel/y#)
endphoneme
phoneme s
import_phoneme es/s
endphoneme
phoneme z
vls alv frc sibilant
ipa s
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(isPause) THEN
WAV(ufric/z_eu, 60)
ENDIF
WAV(ufric/z_eu, 90)
endphoneme
phoneme ts
vls alv afr sibilant
ipa t?
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(isPause2) THEN
WAV(ufric/ts_eu, 60)
ENDIF
WAV(ufric/ts_eu, 90)
endphoneme
phoneme tz
vls alv afr sibilant
ipa ts
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(isPause2) THEN
WAV(ufric/tz_eu, 90)
ENDIF
WAV(ufric/tz_eu, 60)
endphoneme
phoneme t
vls dnt stop
lengthmod 2
CALL base2/t
endphoneme
phoneme r
vcd alv flp rhotic
brkafter
ipa ?
lengthmod 3
IF nextPhW(isVowel) THEN
ChangePhoneme(**)
ENDIF
CALL base/*
endphoneme
phoneme b
import_phoneme es/b
endphoneme
phoneme d
import_phoneme es/d
endphoneme
phoneme g
import_phoneme es/g
endphoneme
phoneme n
vcd alv nasal
lengthmod 4
IF prevPhW(#i) AND nextPhW(isVowel) THEN
ChangePhoneme(n^)
ENDIF
CALL base/n
endphoneme
phoneme n2 // doesn't palatalise, used for exceptions
vcd alv nasal
lengthmod 4
CALL base/n
endphoneme
phoneme l
liquid
IF prevPhW(#i) AND nextPhW(isVowel) THEN
ChangePhoneme(l^)
ENDIF
CALL base/l
endphoneme
phoneme l2 // same as l2
liquid
CALL base/l
endphoneme
+4 -3
View File
@@ -279,13 +279,14 @@ endphoneme
phoneme i // optional variant of [I] for end of words
vowel starttype #i endtype #i
unstressed
ipa i
length 150
IfNextVowelAppend(;)
IF NOT thisPh(isFinalVowel) THEN
ChangePhoneme(I)
ENDIF
// IF NOT thisPh(isFinalVowel) THEN
// ChangePhoneme(I)
// ENDIF
FMT(vowel/ii_7)
endphoneme
+2 -2
View File
@@ -48,8 +48,8 @@ phoneme a
IF nextPh(isNasal) THEN
FMT(vnasal/ee_n2)
ELSEIF nextPh(r) THEN
length 230
ELSEIF nextPh(r) AND thisPh(isStressed) THEN
length 190
FMT(vwl_en_us/ar)
ENDIF
FMT(vwl_en_us/a)
-1
View File
@@ -168,4 +168,3 @@ phoneme r
import_phoneme base/r
endphoneme
+2 -1
View File
@@ -1978,5 +1978,6 @@ phonemetable kl base
include ph_greenlandic
//phonemetable en2 en
//phonemetable en-test base
//include ph_english_test
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.