[1.47.03]

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@329 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2013-03-21 13:47:36 +00:00
parent 8cba4d3b96
commit 2f2eee48a2
27 changed files with 240 additions and 142 deletions
+3 -8
View File
@@ -13,7 +13,7 @@ consonants 11 119
en-wi 30 156
af 39 138
cy 29 134
ga 29 133
ga 30 134
de 40 140
eo 13 116
jbo 2 116
@@ -1090,7 +1090,7 @@ vdiph2/i@ [i@] en-n
[i@] ga
[i@] hy
vdiph2/i@_2 [i@] en-wm
[iR] de
vdiph2/i@_3 [iR] de
vdiph2/ie [i@] en-wi
[ie] fi
[ie] mt
@@ -1506,8 +1506,6 @@ voc/z_pzd_ [Z;] base
[z;] base
vowel/@ [@] base
[@] en
[@2] en
[@5] en
[@] en-rp
[V] cy
[@/] ga
@@ -1558,8 +1556,6 @@ vowel/@_2 [@:] vi
vowel/@_3 [@#] en
[@] en-sc
[I] en-sc
[@2] en-sc
[@5] en-sc
[@3] hi
[@3] ne
[@3] ur
@@ -2072,8 +2068,7 @@ vowel/ii_3 [I] cy
[I] no
[i] sl
vowel/ii#_3 [I2] en-us
vowel/ii_4 [@2] en
[I2] en
vowel/ii_4 [I2] en
[I] en-us
[I2] tn
vowel/ii_5 [i] ta
+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
+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
Binary file not shown.