[1.45.43]

Added runtime detection of pulseaudio, with fallback to portaudio if pulse is not running.  Use build option "AUDIO=runtime" in the makefile.

Phoneme programs. Added condition "isTranslationGiven" to test whether a phoneme has been specified explicitly for a word in *_list.

*_rules files.  Suffix rules are now considered only if there is a previous vowel in the word.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@274 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2011-09-16 20:21:50 +00:00
parent d928de911d
commit 9e73010621
18 changed files with 361 additions and 138 deletions
+13 -13
View File
@@ -394,8 +394,8 @@ l/l_ [l] base
[l/] fr
l/l_@ [l/3] base
[l/] fr
l/l@ [l#] base
[”¦] base
l/l@ [hÖq] base
[l#] base
[l] fr
[l/2] fr
[K] nso
@@ -428,16 +428,16 @@ l/L2_oL [l/2] base
l/L2_uL [l/2] base
l/l_3 [l/] de
l/l_4 [ll] sq
l/la [l#] base
[”¦] base
l/la [hÖq] base
[l#] base
[l] fr
[l/2] fr
[K] nso
[K] tn
l/l_a [l/3] base
[l/] fr
l/le [l#] base
[”¦] base
l/le [hÖq] base
[l#] base
[l] fr
[l/2] fr
[K] nso
@@ -448,8 +448,8 @@ l/L_eL_af [&] af
[&:] af
l/l_front [L] sq
l/l_front_ [l/4] sq
l/li [l#] base
[”¦] base
l/li [hÖq] base
[l#] base
[l] fr
[l/2] fr
[l] zh
@@ -462,8 +462,8 @@ ll/ll [L] bg
ll/_ll [L] bg
l/l_long [l] base
[l] fr
l/lo [l#] base
[”¦] base
l/lo [hÖq] base
[l#] base
[l/2] fr
[K] nso
[K] tn
@@ -472,8 +472,8 @@ l/l_o [l/3] base
l^/l_rfx [l.] base
[l] ru
[l^] ru
l/lu [l#] base
[”¦] base
l/lu [hÖq] base
[l#] base
[l] fr
[l/2] fr
[K] nso
@@ -1870,7 +1870,6 @@ vowel/ii_3 [I] cy
[I] hr
[I] sv
[I] no
[I] tr
[I] pa
[i] sl
vowel/ii#_3 [I2] en-us
@@ -1882,6 +1881,7 @@ vowel/ii_5 [i1] et
[i] bg
[I] la
[i] zh
[I] tr
[i] az
[i] am
vowel/ii_6 [I] en-wm
+48 -28
View File
@@ -3,11 +3,15 @@
phoneme i
vowel starttype #i endtype #i
length 150
IF thisPh(isFinalVowel) THEN
ChangePhoneme(I)
ENDIF
IF nextPh(isNotVowel) AND next2Ph(isNotVowel) THEN
ChangePhoneme(I)
IF thisPh(isTranslationGiven) THEN
// don't reduce the vowel if phonemes are explicitly given
ELSE
IF thisPh(isFinalVowel) THEN
ChangePhoneme(I)
ENDIF
IF nextPh(isNotVowel) AND next2Ph(isNotVowel) THEN
ChangePhoneme(I)
ENDIF
ENDIF
FMT(vowel/i_6)
endphoneme
@@ -15,17 +19,22 @@ endphoneme
phoneme I
vowel starttype #i endtype #i
length 150
FMT(vowel/ii_3)
FMT(vowel/ii_5)
endphoneme
phoneme y
vowel starttype #u endtype #u
length 155
IF thisPh(isFinalVowel) THEN
ChangePhoneme(Y)
ENDIF
IF nextPh(isNotVowel) AND next2Ph(isNotVowel) THEN
ChangePhoneme(Y)
IF thisPh(isTranslationGiven) THEN
// don't reduce the vowel if phonemes are explicitly given
ELSE
IF thisPh(isFinalVowel) THEN
ChangePhoneme(Y)
ENDIF
IF nextPh(isNotVowel) AND next2Ph(isNotVowel) THEN
ChangePhoneme(Y)
ENDIF
ENDIF
FMT(vowel/y_5)
endphoneme
@@ -41,11 +50,15 @@ endphoneme
phoneme e
vowel starttype #e endtype #e
length 180
IF thisPh(isFinalVowel) THEN
ChangePhoneme(E)
ENDIF
IF nextPh(isNotVowel) AND next2Ph(isNotVowel) THEN
ChangePhoneme(E)
IF thisPh(isTranslationGiven) THEN
// don't reduce the vowel if phonemes are explicitly given
ELSE
IF thisPh(isFinalVowel) THEN
ChangePhoneme(E)
ENDIF
IF nextPh(isNotVowel) AND next2Ph(isNotVowel) THEN
ChangePhoneme(E)
ENDIF
ENDIF
FMT(vowel/e_mid2)
endphoneme
@@ -56,6 +69,7 @@ phoneme E
FMT(vowel/e_mid)
endphoneme
phoneme W
vowel starttype #@ endtype #@
length 180
@@ -63,7 +77,6 @@ phoneme W
endphoneme
phoneme a
vowel starttype #a endtype #a
length 190
@@ -75,16 +88,19 @@ endphoneme
phoneme u
vowel starttype #u endtype #u
length 150
IF thisPh(isFinalVowel) THEN
ChangePhoneme(U)
ENDIF
IF nextPh(isNotVowel) AND next2Ph(isNotVowel) THEN
ChangePhoneme(U)
IF thisPh(isTranslationGiven) THEN
// don't reduce the vowel if phonemes are explicitly given
ELSE
IF thisPh(isFinalVowel) THEN
ChangePhoneme(U)
ENDIF
IF nextPh(isNotVowel) AND next2Ph(isNotVowel) THEN
ChangePhoneme(U)
ENDIF
ENDIF
FMT(vowel/u_2)
endphoneme
phoneme U
vowel starttype #u endtype #u
length 150
@@ -104,11 +120,15 @@ endphoneme
phoneme o
vowel starttype #o endtype #o
length 190
IF thisPh(isFinalVowel) THEN
ChangePhoneme(O)
ENDIF
IF nextPh(isNotVowel) AND next2Ph(isNotVowel) THEN
ChangePhoneme(O)
IF thisPh(isTranslationGiven) THEN
// don't reduce the vowel if phonemes are explicitly given
ELSE
IF thisPh(isFinalVowel) THEN
ChangePhoneme(O)
ENDIF
IF nextPh(isNotVowel) AND next2Ph(isNotVowel) THEN
ChangePhoneme(O)
ENDIF
ENDIF
FMT(vowel/o_mid)
endphoneme