Merge branch 'master' into android

Conflicts:
	platforms/windows/make_espeakedit.iss
This commit is contained in:
Reece H. Dunn
2013-03-26 02:59:43 +00:00
95 changed files with 2765 additions and 5014 deletions
+40 -2
View File
@@ -1,6 +1,5 @@
// CR1 doesn't like same phonemes twice
0 e E 5 e _
// ID1 and MS1 don't like same phonemes twice
0 s s 5 s _
0 ? k 5 k _
0 t t 5 t _
@@ -8,6 +7,10 @@
0 n n 5 n _
0 p p 5 p _
0 l/ l 5 l _
0 h h 5 h _
0 k k 5 k _
0 z z 5 z _
0 D D 5 z _
0 l/2 NULL 0 l
0 l/ NULL 0 l
@@ -28,10 +31,13 @@
0 a NULL 0 V
0 E NULL 0 e
0 E2 NULL 0 e
0 i NULL 0 I
0 o NULL 0 Q
0 O NULL 0 Q
0 u NULL 0 U
// 'id1' has phonemes OI aI aU
0 n^ NULL 0 nY
0 ? NULL 0 k
@@ -40,3 +46,35 @@
0 R NULL 0 r
0 x NULL 0 h
// some English phonemes
0 A: NULL 60 V r
0 A@ NULL 60 V r
0 eI NULL 0 e
0 oU NULL 60 Q U
0 u: NULL 0 U
0 i: NULL 0 I
0 I2 NULL 0 I
0 I# NULL 0 I
0 3 NULL 0 @
0 3: NULL 0 @
0 e@ NULL 0 e
0 i@ NULL 60 I @
0 i@3 NULL 60 I r
0 o@ NULL 60 Q @
0 O@ NULL 60 Q @
0 O: NULL 80 Q @
0 U@ NULL 60 U @
0 0 NULL 0 Q
0 a# NULL 0 @
0 aa NULL 0 V
0 @L NULL 50 @ l
0 aI @ 5 aI _
0 aI 3 5 aI _
0 aU @ 5 aU _
0 aI@ NULL 75 V @
0 aI3 NULL 75 V r
0 aU@ NULL 75 V @
0 Z NULL 60 z j
0 T NULL 0 t
0 D NULL 0 z
+78 -21
View File
@@ -3,35 +3,92 @@
// Bengali, inherits from Hindi
//====================================================
phoneme @
vowel flag1 starttype #@ endtype #@
length 65
ChangeIfDiminished(@-)
IF nextPh(H) THEN
FMT(vowel/@_low)
phoneme V // inherent vowel, can be [O] or [o]
vowel flag1 starttype #o endtype #o
length 200
IF thisPh(isWordEnd) AND prevPhW(isNotVowel) AND prev2PhW(isVowel) THEN
ChangePhoneme(NULL)
ENDIF
FMT(vowel/@_bck)
IF thisPh(isFirstVowel) THEN
IF nextVowel(i) OR nextVowel(u) THEN
ChangePhoneme(o)
ENDIF
IF prevPhW(r) THEN
ChangePhoneme(o)
ENDIF
ENDIF
ChangePhoneme(O)
endphoneme
phoneme V
vowel flag1 starttype #@ endtype #@
length 180
CALL hi/V
endphoneme
phoneme a:
vowel long starttype #a endtype #a
length 230
phoneme a
vowel starttype #a endtype #a
length 225
FMT(vowel/aa_9)
endphoneme
phoneme o:
vowel long starttype #o endtype #o
length 220
FMT(vowel/o_2)
phoneme i
vowel starttype #i endtype #i
length 200
FMT(vowel/i_6)
endphoneme
phoneme u
vowel starttype #u endtype #u
length 200
FMT(vowel/u)
endphoneme
phoneme e
vowel starttype #e endtype #e
length 200
FMT(vowel/e)
endphoneme
phoneme &
vowel starttype #a endtype #a
length 200
FMT(vowel/&_2)
endphoneme
phoneme o
vowel starttype #o endtype #o
length 200
IF nextPhW(w) THEN
length 160
ENDIF
FMT(vowel/o)
endphoneme
phoneme O
vowel starttype #o endtype #o
length 200
FMT(vowel/oo_5)
endphoneme
phoneme tS
import_phoneme base/tS
endphoneme
phoneme tS#
import_phoneme base/tS
endphoneme
phoneme ~
virtual
endphoneme
+2 -5
View File
@@ -145,10 +145,7 @@ phoneme @2 // Schwa, changes to I before a vowel
IF nextPh(isVowel) THEN
ChangePhoneme(I2)
ENDIF
IF nextPh(isVowel) THEN
FMT(vowel/ii_4)
ENDIF
FMT(vowel/@)
ChangePhoneme(@)
endphoneme
@@ -159,7 +156,7 @@ phoneme @5 // Schwa, changes to U before a vowel
IF nextPh(isVowel) OR nextPh(isPause) THEN
ChangePhoneme(U)
ENDIF
FMT(vowel/@)
ChangePhoneme(@)
endphoneme
+2 -2
View File
@@ -36,7 +36,7 @@ phoneme @2 // Schwa, changes to I before a vowel
IF nextPh(isVowel) THEN
ChangePhoneme(I2)
ENDIF
FMT(vowel/@_3)
ChangePhoneme(@)
endphoneme
@@ -47,7 +47,7 @@ phoneme @5 // Schwa, changes to U before a vowel
IF nextPh(isVowel) OR nextPh(isPause) THEN
ChangePhoneme(U)
ENDIF
FMT(vowel/@_3)
ChangePhoneme(@)
endphoneme
+3 -3
View File
@@ -342,12 +342,12 @@ endphoneme
phoneme iR
phoneme iR // TEST "vier" = [f'iR] not successful
vowel starttype #i endtype #@
ipa iɐ
flag1
length 180
FMT(vdiph2/i@_2)
length 230
FMT(vdiph2/i@_3)
endphoneme
+51 -1
View File
@@ -3,6 +3,9 @@ phoneme @
vowel starttype #@ endtype #@
unstressed
length 140
IF prevPh(@) THEN
InsertPhoneme(_|)
ENDIF
FMT(vowel/@_low)
endphoneme
@@ -11,6 +14,9 @@ endphoneme
phoneme a
vowel starttype #a endtype #a
length 180
IF prevPh(a) THEN
InsertPhoneme(_|)
ENDIF
ChangeIfUnstressed(a/)
FMT(vowel/a)
endphoneme
@@ -19,6 +25,9 @@ endphoneme
phoneme E
vowel starttype #e endtype #e
length 180
IF prevPh(#e) THEN
InsertPhoneme(_|)
ENDIF
ChangeIfUnstressed(@)
FMT(vowel/e_mid)
endphoneme
@@ -26,6 +35,9 @@ endphoneme
phoneme E2 // as [E] but don't reduce to [@]
vowel starttype #e endtype #e
length 180
IF prevPh(#e) THEN
InsertPhoneme(_|)
ENDIF
FMT(vowel/e_mid)
endphoneme
@@ -33,6 +45,9 @@ endphoneme
phoneme e
vowel starttype #e endtype #e
length 180
IF prevPh(#e) THEN
InsertPhoneme(_|)
ENDIF
FMT(vowel/e)
endphoneme
@@ -40,7 +55,9 @@ endphoneme
phoneme i
vowel starttype #i endtype #i
length 180
IfNextVowelAppend(;)
IF prevPh(i) THEN
InsertPhoneme(_|)
ENDIF
FMT(vowel/i_6)
endphoneme
@@ -48,6 +65,9 @@ endphoneme
phoneme O
vowel starttype #o endtype #o
length 180
IF prevPh(#o) THEN
InsertPhoneme(_|)
ENDIF
FMT(vowel/oo)
endphoneme
@@ -55,6 +75,9 @@ endphoneme
phoneme o
vowel starttype #o endtype #o
length 180
IF prevPh(#o) THEN
InsertPhoneme(_|)
ENDIF
FMT(vowel/o)
endphoneme
@@ -62,6 +85,9 @@ endphoneme
phoneme u
vowel starttype #u endtype #u
length 180
IF prevPh(u) THEN
InsertPhoneme(_|)
ENDIF
FMT(vowel/u)
endphoneme
@@ -69,6 +95,12 @@ endphoneme
phoneme aI
vowel starttype #a endtype #i
length 240
IF prevPh(isVowel) THEN
InsertPhoneme(_|)
ENDIF
IF nextPh(isVowel) THEN
AppendPhoneme(_|)
ENDIF
FMT(vdiph/ai)
endphoneme
@@ -78,9 +110,27 @@ phoneme eI
FMT(vdiph/eei_2)
endphoneme
phoneme OI
vowel starttype #o endtype #i
length 240
IF prevPh(isVowel) THEN
InsertPhoneme(_|)
ENDIF
IF nextPh(isVowel) THEN
AppendPhoneme(_|)
ENDIF
FMT(vdiph/ooi)
endphoneme
phoneme aU
vowel starttype #a endtype #u
length 240
IF prevPh(isVowel) THEN
InsertPhoneme(_|)
ENDIF
IF nextPh(isVowel) THEN
AppendPhoneme(_|)
ENDIF
FMT(vdiph/au_4)
endphoneme
+34 -30
View File
@@ -6,17 +6,17 @@
phoneme @ // Schwa, but always unstressed
vowel starttype #@ endtype #@
unstressed
length 100
length 110
IF nextPh(i:) THEN
Length 70
Length 80
FMT(vwl_af/r@)
ENDIF
IF nextPh(I) THEN
Length 70
Length 80
FMT(vwl_af/r@)
ENDIF
IF nextPh(e:) THEN
Length 70
Length 80
FMT(vwl_af/r@)
ENDIF
FMT(vwl_af/@)
@@ -25,14 +25,14 @@ endphoneme
phoneme @/
vowel starttype #@ endtype #@
length 120
length 130
FMT(vowel/@)
endphoneme
phoneme a
vowel starttype #a endtype #a
length 150
length 165
FMT(vowel/a_4)
endphoneme
@@ -40,7 +40,7 @@ endphoneme
phoneme a#
vowel starttype #@ endtype #@
ipa ɐ
length 120
length 130
ChangeIfStressed(a)
FMT(vowel/a#_3)
endphoneme
@@ -48,13 +48,13 @@ endphoneme
phoneme E
vowel starttype #e endtype #e
length 140
length 155
FMT(vowel/e_mid)
endphoneme
phoneme E#
vowel starttype #@ endtype #@
length 120
length 130
ChangeIfStressed(E)
ChangePhoneme(@/)
endphoneme
@@ -62,27 +62,27 @@ endphoneme
phoneme I
vowel starttype #i endtype #i
length 120
length 130
FMT(vowel/ii_2)
endphoneme
phoneme i // non syllabic i for end of words
vowel starttype #i endtype #i
ipa iU+032F
length 40
length 45
FMT(vowel/ii_7)
endphoneme
phoneme O
vowel starttype #a endtype #@
length 140
length 155
FMT(vowel/V_4)
endphoneme
phoneme O#
vowel starttype #@ endtype #@
length 120
length 130
ChangeIfStressed(O)
ChangePhoneme(a#)
endphoneme
@@ -90,13 +90,13 @@ endphoneme
phoneme U
vowel starttype #u endtype #u
length 140
length 155
FMT(vowel/uu)
endphoneme
phoneme U#
vowel starttype #@ endtype #@
length 120
length 130
ChangeIfStressed(U)
ChangePhoneme(@/)
endphoneme
@@ -104,20 +104,20 @@ endphoneme
phoneme u1
vowel starttype #u endtype #u
ipa uU+0306
length 50
length 55
FMT(vowel/u)
endphoneme
phoneme 0
vowel starttype #a endtype #a
length 180
length 195
ipa A
FMT(vowel/aa_8)
endphoneme
phoneme 0#
vowel starttype #@ endtype #@
length 120
length 130
ChangeIfStressed(0)
ChangePhoneme(a#)
endphoneme
@@ -125,7 +125,7 @@ endphoneme
phoneme o:
vowel starttype #o endtype #o
length 190
length 210
FMT(vowel/o)
endphoneme
@@ -134,21 +134,21 @@ endphoneme
phoneme A:
vowel starttype #a endtype #a
length 200
length 220
FMT(vowel/aa_2)
endphoneme
phoneme e:
vowel starttype #e endtype #e
length 210
length 230
FMT(vowel/e)
endphoneme
phoneme i:
vowel starttype #i endtype #i
length 210
length 230
FMT(vowel/i)
endphoneme
@@ -157,7 +157,7 @@ endphoneme
phoneme u:
vowel starttype #u endtype #u
length 210
length 230
FMT(vowel/u_bck)
endphoneme
@@ -167,44 +167,44 @@ endphoneme
phoneme @U
vowel starttype #@ endtype #u
length 240
length 260
FMT(vdiph/@u_3)
endphoneme
phoneme i@
vowel starttype #i endtype #@
length 240
length 260
FMT(vdiph2/i@)
endphoneme
phoneme u@
vowel starttype #u endtype #@
length 240
length 260
FMT(vdiph2/u@)
endphoneme
phoneme aI
vowel starttype #a endtype #i
length 250
length 275
FMT(vdiph/ai)
endphoneme
phoneme aI#
vowel starttype #@ endtype #@
length 120
length 130
ChangeIfStressed(aI)
ChangePhoneme(a#)
endphoneme
phoneme aU
vowel starttype #a endtype #u
length 270
length 300
FMT(vdiph/au_4)
endphoneme
phoneme aU#
vowel starttype #@ endtype #@
length 120
length 130
ChangeIfStressed(aU)
FMT(vdiph/au_4)
endphoneme
@@ -237,3 +237,7 @@ phoneme ; // linking j, used between (i) vowels and a following vowel
ENDIF
endphoneme
phoneme eI
import_phoneme en/eI
endphoneme
+12
View File
@@ -133,6 +133,18 @@ phoneme w
endphoneme
phoneme x // [r] for Portugal
liquid
trill
ipa ʁ
lengthmod 7
Vowelin f1=0 f2=1500 -400 400 f3=-400 80
IF nextPh(isNotVowel) THEN
ChangePhoneme(r/)
ENDIF
FMT(vwl_fr/@R) addWav(r3/rx, 120)
endphoneme
phoneme R // for Portugal this is same the as [r]
import_phoneme pt/r
+23 -18
View File
@@ -6,7 +6,7 @@
phoneme @
vowel starttype #a endtype #a
length 130
length 150
FMT(vowel/@_low)
endphoneme
@@ -14,7 +14,7 @@ endphoneme
phoneme a
vowel long starttype #a endtype #a
ipa ɐ
length 130
length 150
ChangeIfNotStressed(@)
FMT(vowel/a#_2)
endphoneme
@@ -29,42 +29,42 @@ endphoneme
phoneme &
vowel starttype #e endtype #e
length 130
length 150
FMT(vowel/ee_6)
endphoneme
phoneme &:
vowel starttype #e endtype #e
length 270
length 300
FMT(vowel/ee_6)
endphoneme
phoneme e
vowel starttype #e endtype #e
length 130
length 150
FMT(vowel/e_mid)
endphoneme
phoneme e:
vowel starttype #e endtype #e
length 270
length 300
FMT(vowel/e_mid2)
endphoneme
phoneme i
vowel starttype #i endtype #i
length 130
length 150
FMT(vowel/i_6)
endphoneme
phoneme i:
vowel starttype #i endtype #i
length 270
length 300
FMT(vowel/i)
endphoneme
@@ -72,7 +72,7 @@ endphoneme
phoneme o
vowel starttype #o endtype #o
length 130
length 150
FMT(vowel/oo_1)
endphoneme
@@ -86,13 +86,13 @@ endphoneme
phoneme u
vowel starttype #u endtype #u
length 110
length 130
FMT(vowel/u_6)
endphoneme
phoneme u:
vowel starttype #u endtype #u
length 280
length 300
FMT(vowel/u_6)
endphoneme
@@ -100,13 +100,13 @@ endphoneme
phoneme aI
vowel long starttype #a endtype #i
length 280
length 300
FMT(vdiph/ai_8)
endphoneme
phoneme aU
vowel long starttype #a endtype #u
length 270
length 300
FMT(vdiph/au)
endphoneme
@@ -130,21 +130,26 @@ endphoneme
// temporary, map [n#] etc. to [n] etc.
phoneme m#
import_phoneme base/m
ipa U+1D50
CALL base/m
endphoneme
phoneme n#
import_phoneme base/n
ipa U+207F
CALL base/n
endphoneme
phoneme n.#
import_phoneme base/n.
ipa U+1DAF
CALL base/n.
endphoneme
phoneme n^#
import_phoneme base/n^
ipa U+1DAE
CALL base/n^
endphoneme
phoneme N#
import_phoneme base/N
ipa U+1D51
CALL base/N
endphoneme
+42 -40
View File
@@ -1864,6 +1864,20 @@ include ph_georgian
phonemetable fa base
include ph_farsi
// experimental
phonemetable ko base
include ph_korean
phonemetable kl base
include ph_greenlandic
phonemetable am base
include ph_amhari
phonemetable si hi
include ph_sinhala
//**************************************************************************************
// The following lines are experimental, for future additions.
@@ -1882,61 +1896,49 @@ include ph_kinyarwanda
//phonemetable mn base
//include ph_mongolian
phonemetable prs base
include ph_dari
//phonemetable prs base
//include ph_dari
phonemetable sl sk
include ph_slovenian
phonemetable gd base
include ph_s_gaelic
//phonemetable gd base
//include ph_s_gaelic
phonemetable nso base
include ph_northern-sotho
//phonemetable nso base
//include ph_northern-sotho
phonemetable ht fr
include ph_haitian
//phonemetable ht fr
//include ph_haitian
phonemetable az tr
include ph_azerbaijani
//phonemetable az tr
//include ph_azerbaijani
phonemetable ak base
include ph_akan
//phonemetable ak base
//include ph_akan
phonemetable am base
include ph_amhari
//phonemetable wo base
//include ph_wolof
phonemetable wo base
include ph_wolof
//phonemetable dv hi
//include ph_divehi
phonemetable dv hi
include ph_divehi
//phonemetable te hi
//include ph_telugu
phonemetable te hi
include ph_telugu
phonemetable si hi
include ph_sinhala
phonemetable tn base
include ph_setswana
//phonemetable tn base
//include ph_setswana
phonemetable mt base
include ph_maltese
//phonemetable mt base
//include ph_maltese
phonemetable bo hi
include ph_tibetan
//phonemetable bo hi
//include ph_tibetan
phonemetable kk base
include ph_kazakh
//phonemetable kk base
//include ph_kazakh
phonemetable tt base
include ph_tatar
phonemetable ko base
include ph_korean
phonemetable kl base
include ph_greenlandic
//phonemetable tt base
//include ph_tatar
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.