[1.47.16]

Added rule attribute $noprefix for *_rules files.  The rule is not used if a prefix has been removed from the word.

Language changes: en, or, pt, ta.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@369 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2014-01-21 16:30:18 +00:00
parent 3d49b74315
commit 5048e535ba
25 changed files with 1054 additions and 157 deletions
+11 -8
View File
@@ -4,13 +4,13 @@
base 109 109
consonants 11 119
base2 26 125
en 55 157
en-n 33 157
en-us 39 157
en-sc 41 159
en-rp 34 157
en-wm 31 157
en-wi 30 157
en 56 158
en-n 33 158
en-us 40 158
en-sc 42 160
en-rp 34 158
en-wm 32 158
en-wi 30 158
af 39 138
cy 29 134
ga 30 134
@@ -83,7 +83,7 @@ consonants 11 119
dv 14 149
te 18 149
si 24 155
gu 5 151
gu 7 151
as 12 152
or 12 152
mni 11 152
@@ -2267,6 +2267,7 @@ vowel/o [o] base2
[o:] wo
[o] te
[o:] te
[o:] gu
[o] as
[o] or
[o] mni
@@ -2558,6 +2559,7 @@ vowel/V_2 [V] en
[V] ru
[V#] ru
[V] ku
[V] gu
vowel/V_3 [V] en-rp
[@] hi
[V] hi
@@ -2569,6 +2571,7 @@ vowel/V_4 [V] en-sc
[V] hi
[V] da
[?V] da
[V] gu
vowel/V_6 [V] en-us
[a#] lv
vowel/y [y] base2
+7
View File
@@ -287,6 +287,13 @@ phoneme 0# // [@] in unstressed syllables
endphoneme
phoneme 02 // becomes V in en-us
vowel starttype #o endtype #o
length 140
ChangePhoneme(0)
endphoneme
phoneme V
vowel starttype #a endtype #@
length 140
+7
View File
@@ -135,6 +135,13 @@ phoneme 0
endphoneme
phoneme 02 // becomes V in en-us
vowel starttype #o endtype #o
length 140
ChangePhoneme(V)
endphoneme
phoneme V
vowel starttype #a endtype #@
length 140
+8 -1
View File
@@ -8,7 +8,7 @@ phoneme 3 // Schwa, used for rhotic schwa in American
vowel starttype #@ endtype #@
ipa ɚ
unstressed
length 200
length 210
IfNextVowelAppend(r-)
FMT(vwl_en_us/3_us)
endphoneme
@@ -125,6 +125,13 @@ phoneme 0
endphoneme
phoneme 02 // becomes V in en-us
vowel starttype #o endtype #o
length 140
ChangePhoneme(V)
endphoneme
phoneme V
vowel starttype #a endtype #@
length 170
+7
View File
@@ -65,6 +65,13 @@ phoneme 0
endphoneme
phoneme 02 // becomes V in en-us
vowel starttype #o endtype #o
length 140
ChangePhoneme(V)
endphoneme
phoneme V
vowel starttype #o endtype #o
ipa ʊ
+46
View File
@@ -32,3 +32,49 @@ phoneme aU~
endphoneme
phoneme V
vowel flag1 starttype #@ endtype #@
length 140
IF thisPh(isWordStart) THEN
FMT(vowel/V_2)
RETURN
ENDIF
IF thisPh(isNotStressed) THEN
length 130
IF thisPh(isWordEnd) AND NOT thisPh(isFirstVowel) THEN
ChangePhoneme(NULL)
ENDIF
IF prev2PhW(isVowel) AND NOT nextVowel(isFlag1) THEN
IF nextPhW(isNotVowel) AND nextPh(isWordEnd) THEN
// don't delete schwa before a word-final consonant
ELSE
ChangePhoneme(NULL)
ENDIF
ENDIF
IF prevPh(isPalatal) AND NOT nextPh(H) THEN
ChangePhoneme(@3)
ELSEIF prevPh(r) THEN
ChangePhoneme(@2)
ELSE
ChangePhoneme(@)
ENDIF
ENDIF
IF prevPh(w) THEN
FMT(vowel/V_4)
ENDIF
FMT(vowel/V_2)
endphoneme
phoneme o:
vowel long starttype #o endtype #o
length 227
FMT(vowel/o)
endphoneme