-It selectes the default behaviour and characteristics for the language, and sets default values for +It selects the default behaviour and characteristics for the language, and sets default values for "phonemes", "dictionary" and other attributes. The <language code> should be a two-letter ISO 639-1 language code. One or more language variant codes may be appended, separated by hyphens. (eg. en-uk-north).
The optional <priority> value gives the preference of this voice compared with others for the specified language. A low value indicates a more preferred voice. The default value is 5.
More than one language line may be present. A voice may be selected for other related languages (variants which have the same initial 2 letter language code as the specified language), but it will be less preferred for these. Different language variants may be specified by additional language lines in order to indicate that this is a preferred voice for them also. Eg.
diff --git a/espeak-data/voices/test/om b/espeak-data/voices/test/om
new file mode 100644
index 00000000..44921fbe
--- /dev/null
+++ b/espeak-data/voices/test/om
@@ -0,0 +1,2 @@
+name oromiffa-test
+language om
diff --git a/mkdictlist b/mkdictlist
index e08443e4..e80e62c1 100755
--- a/mkdictlist
+++ b/mkdictlist
@@ -16,6 +16,9 @@ special_voices = {
'zh-yue': 'zhy',
}
+# The 'om' voice file intimitently crashes when compiling on some platforms.
+exclude_voices = ['om']
+
def find_voices(path):
for filename in os.listdir(path):
voice_path = os.path.join(path, filename)
@@ -25,7 +28,7 @@ def find_voices(path):
else:
if filename in special_voices.keys():
voices.add(special_voices[filename])
- else:
+ elif filename not in exclude_voices:
voices.add(filename)
find_voices('espeak-data/voices')
@@ -54,7 +57,7 @@ def write_dictionary_make_rules(f):
f.write('dictsource/%s_extra:\n' % name)
f.write('\ttouch dictsource/%s_extra\n' % name)
f.write('espeak-data/%s_dict: src/espeak espeak-data/phontab %s dictsource/%s_extra\n' % (name, ' '.join(sorted(files)), name))
- f.write('\tcd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=%s && cd ..\n' % name)
+ f.write('\tcd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=%s && cd ..\n' % name)
try:
filename = sys.argv[1]
diff --git a/phsource/mbrola/in1 b/phsource/mbrola/in1
index d2caa089..ee35fa48 100644
--- a/phsource/mbrola/in1
+++ b/phsource/mbrola/in1
@@ -3,7 +3,7 @@
0 r/ NULL 0 r
0 r- NULL 0 r
0 l- NULL 0 l
-0 w/ NULL 0 w
+0 w/ NULL 0 v
0 j/ NULL 0 j
0 ; NULL 0 NULL
0 g- NULL 0 NULL
@@ -40,16 +40,25 @@
0 u~ NULL 60 uu n
0 H NULL 0 h
+0 p# NULL 0 ph
+0 b# NULL 0 bh
+0 t# NULL 0 th
+0 d# NULL 0 dh
0 t. NULL 0 T
-0 t.h NULL 0 Th
+0 t.# NULL 0 Th
0 d. NULL 0 D
-0 d.h NULL 0 Dh
+0 d.# NULL 0 Dh
+0 c# NULL 0 ch
0 J NULL 0 j
-0 Jh NULL 0 jh
+0 J# NULL 0 jh
+0 k# NULL 0 kh
+0 g# NULL 0 gh
0 n. NULL 0 N
0 n^ NULL 0 N
0 j NULL 0 y
0 S NULL 0 sh
0 s. NULL 0 sh
0 l. NULL 0 l
+0 w NULL 0 v
+
diff --git a/phsource/ph_armenian b/phsource/ph_armenian
index dd1300f0..aff1599f 100644
--- a/phsource/ph_armenian
+++ b/phsource/ph_armenian
@@ -94,7 +94,8 @@ endphoneme
phoneme k#
- import_phoneme consonants/kh
+// import_phoneme consonants/kh
+ import_phoneme base/k
endphoneme
diff --git a/phsource/ph_bengali b/phsource/ph_bengali
index ee3d9863..9b3b73a1 100644
--- a/phsource/ph_bengali
+++ b/phsource/ph_bengali
@@ -91,9 +91,9 @@ phoneme tS
Vowelin f1=0 f2=2300 200 400 f3=-100 80
IF nextPh(isPause2) THEN
- WAV(ustop/tsh_)
+ WAV(ustop/tsh_unasp2)
ENDIF
- WAV(ustop/tsh_unasp)
+ WAV(ustop/tsh_unasp2)
endphoneme
diff --git a/phsource/ph_danish b/phsource/ph_danish
index 16791eb1..1a34143a 100644
--- a/phsource/ph_danish
+++ b/phsource/ph_danish
@@ -8,193 +8,405 @@
// AC + @- OR V: Long "pile" [pi:l@-]
// AC[i]: Long "smidig" [smi:Di]
+// Vowel length changed by eSpeak
+// Between two voiced consonants
+// After [l/3]
+// Before [l/3]
+// After an "r" sound
+// Before [N]
+// Before voiced consonant + [i]
+
+// PROCEDURES
+
// Change the length of SHORT vowels (?+vowel)
procedure ShortVowelLength
-// "endelig", "ånder" - Short initial vowel sounds too short TEST
+// "endelig", "ånder", "ynde" - Short initial vowel sounds too short TEST
IF thisPh(isWordStart) AND nextPhW(n) THEN
IF next2PhW(@-) OR next2PhW(V) THEN
- length 160
+ IF next2PhW(isWordEnd) THEN // NOT "ondeste"
+ length 170
+ RETURN
+ ENDIF
+ ENDIF
+ ENDIF
+
+// "blod" "slutte", "løn" l/3 makes the vowel too long
+// NOT "mel'oner"
+ IF prevPhW(l/3) AND thisPh(isFirstVowel) THEN
+ IF thisPh(isStressed) THEN
+ length 100
+ IF nextPhW(N) THEN // [N] makes it even longer - "længden"
+ LengthAdd -20
+ ENDIF
+ // Don't shorten it further if it comes after an "r" sound
+ // Exit the procedure
+ RETURN
+ ENDIF
+ // "transplantation" - the second a - between 2 voiced consonants
+ IF nextPhW(isVoiced) AND nextPhW(isNotVowel) THEN
+ length 100
RETURN
ENDIF
ENDIF
-// "slutte" t/d + @- makes the vowel too long
-// Problem with compounds like "spildedamp"
- IF next2PhW(@-) OR next2PhW(V) THEN
- IF nextPhW(t) OR nextPhW(d) THEN
-// length 100
- LengthAdd -45
- // Don't shorten it further if it comes after an "r" sound
- // Exit the procedure
- RETURN
- ENDIF
- ENDIF
-// "bygget", "byggede" - consonant + [@-D] makes the vowel too long
- IF next2PhW(@-) THEN
- IF next3PhW(t) OR next3PhW(d) OR next3PhW(D) THEN
- IF thisPh(isFirstVowel) THEN // NOT "cellof'anet"
- IF NOT thisPh(?V) THEN // NOT "fjollet"
- LengthAdd -40
- // Don't shorten it further if it comes after an "r" sound ("brygget")
- // Exit the procedure
+
+// "bygge", "bygget", "byggede" - consonant + [@-] makes the vowel too long
+ IF NOT thisPh(?V) THEN // NOT "fjollet"
+ IF prevPhW(isVoiced) AND nextPhW(isVoiced) THEN
+ IF next2PhW(@-) THEN //AND next3PhW(D) THEN
+ IF thisPh(isFirstVowel) THEN // NOT "cellof'anet"
+ length 100
RETURN
ENDIF
ENDIF
ENDIF
ENDIF
-// "bygger" - consonant + [V] makes the vowel too long
- IF nextPhW(isNotVowel) AND next2PhW(V) THEN
- IF NOT thisPh(isWordStart) THEN // NOT "eller"
-// LengthAdd -45
- // Don't shorten it further if it comes after an "r" sound ("brygger")
- // Exit the procedure
+
+// "byttet", "lyttet", "flyttet"
+ IF prevPhW(isVoiced) AND prevPhW(isNotVowel) THEN
+ IF nextPhW(isNotVowel) AND next2PhW(@-) AND next3PhW(D) THEN
+ length 100
+ ENDIF
+ ENDIF
+
+// "firmaet", "politiet - 140 sounds too short
+ IF nextPhW(@-) AND next2PhW(D) AND next2PhW(isWordEnd) THEN
+ length 180
+ ENDIF
+
+// "forsøgte" stressed second vowel too long TEST
+ IF thisPh(isMaxStress) AND thisPh(isSecondVowel) THEN
+ IF nextPhW(isVoiced) AND nextPhW(isNotVowel) THEN // NOT "papirer"
+ // 2 voiced consonants seem to add further length ([gd] in "forsøgte")
+ IF next2PhW(isVoiced) AND next2PhW(isNotVowel) THEN // NOT "moral"
+ length 110
+ RETURN
+ ENDIF
+ ENDIF
+ ENDIF
+
+// "bygge", "forbandelse", "lynlås", "centralen" vowel between 2 voiced consonants - too long
+ IF prevPhW(isVoiced) AND nextPhW(isVoiced) THEN // voiced
+ IF prevPhW(isNotVowel) AND nextPhW(isNotVowel) THEN // consonants
+ IF NOT nextPhW(isWordEnd) THEN // NOT "smil"
+ IF NOT next2PhW(j) AND NOT prevPhW(R) THEN // NOT "vilje", "krympe"
+ IF NOT nextPhW(r) AND NOT nextPhW(3-) THEN // NOT "moderne" - vowel + r/3-
+ IF thisPh(isStressed) THEN // NOT [W] in "f'indelønnen"
+ IF thisPh(isFirstVowel) THEN
+// IF NOT nextPhW(@-) THEN // NOT "væbne"
+ IF NOT nextPhW(isNotVowel) AND NOT next2PhW(isNotVowel) THEN // NOT "væbne"
+ length 110
+ RETURN
+ ENDIF
+ ENDIF
+ ENDIF
+ ENDIF
+ ENDIF
+ IF prevPhW(R) THEN // "krympe" R makes the vowel longer than other voiced consonants
+ // NOT [o] in "rod'eo", NOT [æ] in "trængte"
+ IF thisPh(isMaxStress) AND NOT nextPhW(N) THEN
+ length 90
+ RETURN
+ ENDIF
+ // "trængte" - [N] after the vowel makes it even longer
+ IF thisPh(isMaxStress) AND nextPhW(N) THEN
+ length 75
+ RETURN
+ ENDIF
+ ENDIF
+ ENDIF
+ ENDIF
+ ENDIF
+
+// "buske" - only sg/sk? TEST
+ IF prevPhW(isNotVowel) AND nextPhW(s) AND next2PhW(isNotVowel) AND next3PhW(@-) THEN
+ length 100
+ ENDIF
+
+// "projektet"
+ IF prevPhW(S) AND nextPhW(isVoiced) AND nextPhW(isNotVowel) THEN
+ length 100
+ ENDIF
+
+// "rigtigt", "fred", "frem", "frikvarter" - R makes the vowel too long
+ IF prevPhW(R) OR prevPhW(3-) OR prevPhW(r) THEN
+ IF nextPhW(isNotVowel) THEN // NOT "krigen"
+ IF thisPh(isFirstVowel) THEN // NOT the a in "moral"
+ length 110
+ RETURN
+ ENDIF
+ ENDIF
+
+ // R makes the vowel too long
+ IF thisPh(isWordEnd) THEN // "maleri"
+ length 120
+ RETURN
+ ENDIF
+
+ // "forbrydelse" between 2 voiced consonants
+ IF nextPhW(isVoiced) AND nextPhW(isNotVowel) THEN
+ length 110
RETURN
ENDIF
ENDIF
-// "rigtigt", "fred", "frem", "centralen" - R makes the vowel too long
- IF prevPhW(R) OR prevPhW(3-) OR prevPhW(r) THEN
-// length 100
- LengthAdd -40
- RETURN
+
+// "ring", "ringe", "fængsel", "spinkel", "vindspejl", "enke"
+ IF nextPhW(N) THEN
+ length 100
ENDIF
-// "ring", "ringe", "fængsel", "spinkel", "vindspejl"
- IF nextPhW(isNasal) THEN
-// length 100
- LengthAdd -30
- RETURN
- ENDIF
-// "sigte", "bælte", "henter" t/d + @-/V makes the vowel too long
+
+// "sigte", "henter" t/d + @-/V makes the vowel too long
+// ?? is this just between 2 voiced consonants ??
+// ?? does [h] act as a voiced consonant ??
IF nextPhW(isNotVowel) AND next2PhW(t) OR next2PhW(d) THEN
- IF next3PhW(@-) OR next3PhW(V) THEN
+ IF next3PhW(@-) OR next3PhW(V) OR next3PhW(?V) THEN
IF thisPh(isFirstVowel) THEN // NOT [i] in "forsp'ildte"
-// length 100
- LengthAdd -30
+ length 110
+ RETURN
ENDIF
ENDIF
ENDIF
-// "forbandelse" [n@-] makes the vowel too long?
-// nasal eg: m, n, N
- IF nextPhW(isNasal) AND next2PhW(@-) THEN
- IF NOT thisPh(isFirstVowel) AND thisPh(isStressed) THEN
- // NOT LengthAdd since [R] might have shortend the vowel above
- length 100
- ENDIF
- ENDIF
-// "himlen" l/3 makes the vowel too long
+
+// "himlen", "pøblen" l/3 makes the vowel too long
IF nextPhW(isNotVowel) AND next2PhW(l/3) AND next3PhW(@-) OR next3PhW(V) THEN
- length 100
+ length 110
ENDIF
-// "lænkerne" l/3 makes the vowel too long
- IF prevPh(l/3) AND nextPhW(isNotVowel) AND next3PhW(V) THEN
- length 120
+
+// "filmen" vowel + l/3 makes the vowel too long
+// Probably due to 2 voiced consonants (lm) - Change the condition?
+ IF nextPhW(l/3) AND next3PhW(@-) THEN
+ IF NOT next2PhW(j) THEN // NOT "vilje"
+ IF next2PhW(isVoiced) THEN // NOT [e] in "folkevogn"
+ length 100
+ ENDIF
+ ENDIF
ENDIF
-//"musikken" consonant + [@-n] makes the vowel too long
-// Probably wrong. Only k?
- IF nextPhW(k) AND next2PhW(@-) AND next3PhW(n) THEN
- length 100
+
+//"musikken", "piggen", "trafikken" consonant + [@-] makes the vowel too long
+// Probably wrong. Only k and g? Only [i]?
+// Could this be due to an English word like "physique" [fIz'i:k]?
+ IF nextPhW(k) OR nextPhW(g)AND next2PhW(@-) THEN
+ IF thisPh(?i) THEN
+ length 100
+ RETURN
+ ENDIF
ENDIF
-//"svælge" [svElj@-] vowel + 2 consonants but length 100 is too short
- IF nextPhW(isNotVowel) AND next2PhW(j) THEN
- length 140
+
+// "rodeo", lianen" abnormal stress sounds too short
+ IF thisPh(isMaxStress) AND NOT thisPh(isFirstVowel) THEN
+ IF NOT nextPhW(k) AND NOT nextPhW(g) THEN // NOT "ant'ikt" - Like "physique" above?
+ IF NOT nextPhW(N) AND NOT next2PhW(isNotVowel) THEN // NOT "omkr'ing", "eks'empel"
+ IF NOT nextPhW(isVoiced) AND NOT next2PhW(isVoiced) THEN // NOT "bestemme" TEST
+ length 170
+ ENDIF
+ ENDIF
+ ENDIF
ENDIF
endprocedure
+//--------------------------------------------------------------------
+
// Change the length of NORMAL vowels (without ? in front of them)
procedure LongVowelLength
// "guldmine" [ul/3] makes the vowel extremely short
- IF prevVowel(u) AND prev2PhW(l/3) THEN
+ IF prevVowel(l/3) AND prev2PhW(u) THEN
length 350
RETURN
ENDIF
+
// "guldur" [ul/3] makes the vowel extremely short
- IF prevVowel(u) AND prevPhW(l/3) THEN
+ IF prev2PhW(u) AND prevPhW(l/3) THEN
IF NOT thisPh(isWordEnd) THEN // NOT "umulig"
- length 325
+ IF NOT nextPhW(t) AND NOT nextPhW(d) THEN // NOT "umuligt"
+ IF NOT nextPhW(s) AND NOT nextPhW(S) THEN // NOT Drakulas, spekulationer ???
+ length 325
+ RETURN
+ ENDIF
+ ENDIF
+ ENDIF
+ ENDIF
+
+// "dage", "dagevis", fødselsdage" STRANGE BEHAVIOUR - too short at 240
+ IF prevPhW(d) AND nextPhW(@-) THEN
+ IF NOT next2PhW(D) THEN
+ length 350
RETURN
ENDIF
ENDIF
+
+// "tjeneste" TEST
+ IF prevPhW(tS) AND nextPhW(isVoiced) AND nextPhW(isNotVowel) THEN
+ length 180
+ RETURN
+ ENDIF
+
+// "havet", "lavet"
+ IF nextPhW(isVoiced) AND next2PhW(@-) AND next3PhW(D) THEN
+ length 180
+ RETURN
+ ENDIF
+
+// "videre"
+ IF prevPhW(isVoiced) AND nextPhW(isVoiced) THEN // voiced
+ IF prevPhW(isNotVowel) AND nextPhW(isNotVowel) THEN // consonants
+ IF NOT prevPhW(R) AND NOT prevPhW(r) AND NOT prevPhW(3-) THEN
+ length 180
+ RETURN
+ ELSE // [A] in "begravelse" - "r" adds extra length
+ length 120
+ RETURN
+ ENDIF
+ ENDIF
+ ENDIF
+
// "alene" - Short initial vowel sounds too short at length 140
IF thisPh(isWordStart) THEN
length 160
-// "ønske" The vowel should have been made short becauce og 2 x consonant.
-// Take care of it here
+ // "år? [O] - The word is only 1 vowel: make it long
+ IF thisPh(isWordEnd) THEN
+ length 180
+ ENDIF
+ // "ønske" The vowel should have been made short becauce of 3 x consonant.
+ // Take care of it here
IF nextPhW(isNotVowel) AND next2PhW(isNotVowel) AND next3PhW(isNotVowel) THEN
length 140
ENDIF
-// "ære"
+ // "ære"
IF nextPhW(V) AND nextPhW(isFinalVowel) THEN
length 240
ENDIF
- RETURN
+ // "øge", "øgede"
+ IF nextPhW(isNotVowel) AND next2PhW(@-) THEN
+ length 225
ENDIF
+// RETURN
+ ENDIF
+
+// "døre" vowel + vowel: long
+ IF nextPhW(@-) OR nextPhW(?V) THEN
+ length 225
+ ENDIF
+
+// "pæne" vowel + consonant + [@-]: long
+ IF nextPhW(isNotVowel) AND next2PhW(@-) THEN
+ IF thisPh(isFirstVowel) THEN
+ IF prevPhW(isVoiced) AND nextPhW(isVoiced) THEN // "vide"
+ length 180
+ ELSE // "pæne"
+ length 225
+ ENDIF
+ RETURN
+ ENDIF
+ // Stressed second syllable in words with initial be- and for-
+ IF NOT thisPh(isSecondVowel) AND thisPh(isMaxStress) THEN // "beb'ude", "form'ode"
+ length 140
+ RETURN
+ ENDIF
+ ENDIF
+
+// "vildrede"
+ IF nextPhW(D) AND next2PhW(@-) THEN
+ IF NOT thisPh(isMaxStress) THEN
+ length 225
+ RETURN
+ ENDIF
+ ENDIF
+
+// "guderne", "møde"
+ IF nextPhW(isNotVowel) AND next2PhW(?V) OR next2PhW(V) OR next2PhW(@-) THEN
+ length 225
+ ENDIF
+
+// "mødes", "vred", "møve", "mene", "dele" - vowel too long between 2 voiced consonants
+ IF prevPhW(isVoiced) AND nextPhW(isVoiced) THEN
+ IF prevPhW(isNotVowel) AND nextPhW(isNotVowel) THEN
+ IF NOT prevPhW(R) AND NOT prevPhW(r) AND NOT prevPhW(3-) AND NOT prevPhW(l/3) THEN
+ IF NOT next2PhW(isVoiced) THEN // NOT "bælte", "bomben"
+ length 180 // mødes, dele
+ RETURN
+ ENDIF
+ IF next2PhW(isNotVowel) THEN // bælte, svælge
+ length 120
+ ENDIF
+ ELIF NOT prevPhW(l/3) AND thisPh(isMaxStress) THEN
+ IF NOT prevPhW(R) AND NOT prevPhW(r) AND NOT prevPhW(3-) THEN
+ length 120 // "vred", "vrede"
+ RETURN
+ ENDIF
+ ENDIF
+ IF prevPhW(R) AND prevPhW(isWordStart) THEN // "råderet"
+ length 180
+ RETURN
+ ENDIF
+ ENDIF
+ ENDIF
+
// "huske" - hACC@- vowel too long
+// 2 consonants - should have been short in da_rules
+// 140 too long because of [h]??
IF prevPhW(h) AND nextPhW(isNotVowel) AND next2PhW(isNotVowel) AND next3PhW(@-) THEN
length 110
RETURN
ENDIF
+
// PB long vowel followed by [@-] or [V](vowel+vowel) - "pigen" [p'i@-n]
IF nextPhW(@-) OR nextPhW(V) THEN
- length 225
+ IF thisPh(isFirstVowel) THEN // NOT "best'yrelse", "geb'yrer"
+ length 225
+ ENDIF
ENDIF
+
+ // "lydig"
+ IF prevPhW(l/3) AND nextPhW(isVoiced) AND nextPhW(isNotVowel) THEN
+ length 180
+ RETURN
+ ENDIF
+
// PB "enig", "enige", "evig", "stædig" - vowel+consolant+[i]
IF nextPhW(isNotVowel) AND next2PhW(i) THEN
length 225
- ENDIF
-// "dele", "mene", "møve"
- IF nextPhW(isNotVowel) AND next2PhW(@-) OR next2PhW(3) OR next3PhW(@-) THEN
- length 225
- ENDIF
-// "sveder", "deler"
- IF nextPhW(isNotVowel) AND next2PhW(V) THEN
- length 225
- ENDIF
-// "maskinen" consonant + [@-n]: vowel too long
- IF nextPhW(isNotVowel) AND next2PhW(@-) AND next3PhW(n) THEN
- length 160
- ENDIF
-// "vilje", "nedladende" [n'eDl&D@-n@-], "delte" - short followed by 2 consonants
- IF nextPhW(isNotVowel) AND next2PhW(isNotVowel) THEN
- // Don't make "møve" [m'Ww_!@-_!] short
- IF NOT next2PhW(_!) THEN
- length 140
- ENDIF
- ENDIF
-// "bryde", "bryder", "strålen", "henrivende" R makes the vowel too long
- IF prevPhW(R) OR prevPhW(3-) OR prevPhW(r) THEN
- IF NOT thisPh(V) AND next2PhW(@-) OR next2PhW(V) THEN
- length 140
- ENDIF
- ENDIF
-// "føden"
- IF nextPhW(D) AND next2PhW(@-) AND next3PhW(n) THEN
- length 180
- ENDIF
-// "glimrende", "glemte" [l/3] makes the following vowel too long
-// LengthAdd doesn't work here. The length could be 225 or 140 - 30
- IF prev2PhW(g) AND prevPhW(l/3) AND nextPhW(isNotVowel) AND next2PhW(isNotVowel) THEN
- length 110
RETURN
ENDIF
-// l/3 makes the vowel too long (+ voiced?)
-// isVoiced = b, d, g, v, z
- IF prevPhW(l/3) AND nextPhW(isVoiced) THEN
- // "klub", "klud"
+
+// "føden"
+ IF nextPhW(D) AND next2PhW(@-) AND next3PhW(n) THEN
+ IF thisPh(isFirstVowel) THEN
+ length 180
+ ENDIF
+ ENDIF
+
+// l/3 + vowel makes the vowel too long
+ IF prevPhW(l/3) AND nextPhW(isNotVowel) THEN
+ // "klub", "klud", "slut"
// The vowel should have been short but we fix it here
- IF NOT next2PhW(@-) AND NOT next2PhW(V) THEN
+ IF NOT next2PhW(@-) AND NOT next2PhW(V) AND NOT next2PhW(?V) THEN // NOT "slæde"
length 100
ELSE
- // "slæde", "lader"
+ // "slæde", "lader", "forlader"
length 160
ENDIF
ENDIF
+
+// l/3 + vowel + voiced consonant makes the vowel too long
+ IF prevPhW(l/3) AND nextPhW(isVoiced) AND nextPhW(isNotVowel) THEN
+ length 130
+ ENDIF
+
+// "fryser", "rige"
+ IF prevPhW(r) OR prevPhW(R) OR prevPhW(3-) THEN
+ length 130
+ IF nextPhW(@-) THEN // "rige" [@-] seems to cancel the "r" effect
+ length 240
+ ENDIF
+ ENDIF
+
// "længe" - short - 2 consonants => 1 consonant (ng => [N])
- IF nextPhW(isNasal) THEN
+// Don't use isNasal here!
+ IF nextPhW(N) THEN
IF NOT prevPhW(R) AND NOT prevPhW(r) AND NOT prevPhW(3-) THEN
length 140
- // "omkring", "ring" - both prev. N and next R
- ELIF prevPhW(R) OR prevPhW(r) OR prevPhW(3-) THEN
- length 110
ENDIF
ENDIF
+
// "buskene", "krøbling" The vowel should have been made short becauce og 2 x consonant.
// Take care of it here
IF nextPhW(isNotVowel) AND next2PhW(isNotVowel) THEN
@@ -204,24 +416,17 @@ procedure LongVowelLength
ENDIF
ENDIF
ENDIF
-// "barnet" - consonant + [@-D]: too long vowel
- IF nextPhW(isNotVowel) AND next2PhW(@-) AND next3PhW(D) THEN
- length 160
- ENDIF
-// "trin", "trit", "ring" - vowel too long
-// IF prevPhW(isRhotic) THEN
- IF prevPhW(R) OR prevPhW(r) OR prevPhW(3-) THEN
- IF nextPhW(isNotVowel) AND nextPhW(isWordEnd) THEN
- length 110
- ENDIF
- ENDIF
endprocedure
+//----------------------------------------------------------------------
+
+// PHONEMES
// A bit longer than [@-]
phoneme @
vowel starttype #@ endtype #@
unstressed
length 60
+ IfNextVowelAppend(_!)
FMT(vowel/@_3)
endphoneme
@@ -244,6 +449,9 @@ ENDIF
IF prevPhW(i) AND thisPh(isWordEnd) THEN
length 15
ENDIF
+ IF nextPhW(isVowel) THEN
+ ChangePhoneme(@)
+ ENDIF
FMT(vowel/@-)
endphoneme
@@ -277,7 +485,8 @@ phoneme ?i
vowel starttype #i endtype #i
length 140
CALL ShortVowelLength
- IfNextVowelAppend(;)
+// Don't link with the next vowel with [;] - vowel too short
+// IfNextVowelAppend(;)
FMT(vowel/i_4)
endphoneme
@@ -293,7 +502,6 @@ phoneme e
vowel starttype #e endtype #e
length 140
CALL LongVowelLength
-// CALL ShortVowelLength
FMT(vowel/e)
endphoneme
@@ -347,7 +555,7 @@ phoneme &
// but NOT "hinanden"
IF nextPhW(isNotVowel) AND next2PhW(@-) OR next2PhW(@) THEN
IF NOT next3PhW(n) THEN
- length 225
+ length 225
ENDIF
ENDIF
// ThisPh + V or @-
@@ -376,7 +584,6 @@ phoneme &#
length 140
ipa a
CALL LongVowelLength
-// CALL ShortVowelLength
FMT(vowel/&)
endphoneme
@@ -385,13 +592,14 @@ endphoneme
phoneme ?&#
vowel starttype #e endtype #e
ipa ?a
- length 140
- CALL ShortVowelLength
- FMT(vowel/&)
+ length 140
+ CALL ShortVowelLength
+ FMT(vowel/&)
endphoneme
phoneme A // PB changed to a_8
vowel starttype #a endtype #a
+ ipa ɑ
length 140
CALL LongVowelLength
// "fare" [f'A:A]
@@ -401,10 +609,11 @@ ENDIF
FMT(vowel/a_8)
endphoneme
-// PB short A
+// Short A
// "krabbe" vs. "drabelig"
phoneme ?A
vowel starttype #a endtype #a
+ ipa ?ɑ
length 140
CALL ShortVowelLength
FMT(vowel/a_8)
@@ -417,7 +626,9 @@ phoneme u
IF nextPhW(@-) OR nextPhW(V) OR next2PhW(@-) OR next2PhW(V)THEN
length 225
ENDIF
-CALL LongVowelLength
+IF NOT thisPh(isWordStart) THEN // NOT "undøvendig"
+ CALL LongVowelLength
+ENDIF
FMT(vowel/u_bck)
endphoneme
@@ -433,10 +644,6 @@ endphoneme
phoneme o
vowel starttype #o endtype #o
length 140
-// "bore", "borer" [boV] o + V
-IF nextPhW(V) OR nextPhW(@-) THEN
- length 225
-ENDIF
// "kone", "koner" o + consonant + V or @-
IF next2PhW(V) OR next2PhW(@-) THEN
length 225
@@ -450,6 +657,7 @@ endphoneme
phoneme ?o
vowel starttype #o endtype #o
length 140
+ CALL ShortVowelLength
FMT(vowel/o_2)
endphoneme
@@ -457,14 +665,6 @@ phoneme O
vowel starttype #o endtype #o
length 140
ipa ɒ // changed from ɔ - Den Danske Ordbog: ɒ
-// "sove", "sover" - consonant + @ or V: long
-IF next2PhW(@-) OR next2PhW(V) THEN
-// length 225
-ENDIF
-// PB "gået" - ThisPh + V or @-
-IF nextPhW(V) OR nextPhW(@-) THEN
-// length 225
-ENDIF
// "såre", "sårede" [s'O:?OD@-]
IF nextPhW(O) OR nextPhW(?O) THEN
length 225
@@ -477,6 +677,7 @@ endphoneme
// "toget" vs. "tåget"
phoneme ?O
vowel starttype #o endtype #o
+ ipa ɒ // changed from ɔ - Den Danske Ordbog: ɒ
length 140
CALL ShortVowelLength
FMT(vowel/o_5)
@@ -502,6 +703,7 @@ phoneme 0
vowel starttype #o endtype #o
length 140
ipa ɔ
+ CALL LongVowelLength
FMT(vowel/oo_2)
endphoneme
@@ -533,9 +735,10 @@ endphoneme
phoneme Y
vowel starttype #i endtype #i
length 140
-IF nextPhW(V) OR nextPhW(@-) THEN
- length 225
-ENDIF
+ IF nextPhW(V) OR nextPhW(@-) THEN
+ length 225
+ ENDIF
+ CALL LongVowelLength
FMT(vowel/yy)
endphoneme
@@ -612,6 +815,7 @@ endphoneme
phoneme l/3 // Replacement for [l/]
liquid
lengthmod 7
+ length 80
FMT(l/l_)
endphoneme
@@ -628,9 +832,24 @@ phoneme r // used for 'r' after a vowel (to create a diphthong)
IF nextPhW(isVowel) AND NOT nextPhW(?V) AND NOT nextPhW(V) AND NOT nextPhW(@-) THEN
ChangePhoneme(R)
ENDIF
-// "generer" [Sen'e:Vr], "mysterier" - delete the r
- IF prevPhW(V) AND thisPh(isWordEnd) THEN
- ChangePhoneme(NULL)
+ // "generer" [Sen'e:Vr], "mysterier" - delete the r
+ IF prevPhW(V) OR prevPhW(?V) AND thisPh(isWordEnd) THEN
+ ChangePhoneme(_!)
+ ENDIF
+ // "plamagers" [pl&m'&SVrs] - delete the r
+ IF prevPhW(V) OR prevPhW(?V) AND nextPhW(s) AND nextPhW(isWordEnd) THEN
+ ChangePhoneme(NULL)
+ ENDIF
+ // "plamagerne" [pl&m'&SVrn@-] - delete the r
+ IF prevPhW(V) OR prevPhW(?V) AND nextPhW(n) AND next2PhW(@-) THEN
+ ChangePhoneme(NULL)
+ ENDIF
+ // "kreaturer" [kR,?E?&t'ur?V] - delete the r
+ // Previous vowel stressed by $alt rule
+ IF nextPhW(V) OR nextPhW(?V) AND nextPh(isWordEnd) THEN
+ IF prevPhW(isMaxStress) THEN
+ ChangePhoneme(NULL)
+ ENDIF
ENDIF
FMT(r/a_)
endphoneme
@@ -704,11 +923,11 @@ IF thisPh(isWordEnd) THEN
ENDIF
IF nextPhW(isVowel) THEN
NextVowelStarts
- VowelStart(j/j@,-45) // jøderne
+ VowelStart(j/j@) // jøderne
VowelStart(j/ja)
- VowelStart(j/je,-35)
+ VowelStart(j/je)
VowelStart(j/ji)
- VowelStart(j/jo,-65) // "kjole"
+ VowelStart(j/jo) // "kjole"
VowelStart(j/ju)
EndSwitch
Vowelout len=70
@@ -723,4 +942,3 @@ Vowelout len=70
FMT(j/j_)
ENDIF
endphoneme
-
diff --git a/phsource/ph_english_us b/phsource/ph_english_us
index e1449dce..bd7c6d80 100644
--- a/phsource/ph_english_us
+++ b/phsource/ph_english_us
@@ -143,7 +143,7 @@ endphoneme
phoneme A:
vowel starttype #a endtype #a
length 200
- IF nextPh(r) THEN
+ IF nextPhW(r) THEN
FMT(vwl_en_us/ar)
ENDIF
FMT(vowel/aa_8)
@@ -183,7 +183,7 @@ phoneme O:
vowel starttype #o endtype #o
length 200
ChangeIfDiminished(@)
- IF nextPh(r) THEN
+ IF nextPhW(r) THEN
FMT(vwl_en_us/oor)
ENDIF
FMT(vowel/0_3)
diff --git a/phsource/ph_irish b/phsource/ph_irish
index a7d0eb3c..8cdc4602 100644
--- a/phsource/ph_irish
+++ b/phsource/ph_irish
@@ -1,4 +1,6 @@
-// Version 2.4 January 2013
+// Irish Phonemes
+//Please contact espeak.gaeilge@gmail.com
+// Version 2.7 2013
// short vowels
@@ -19,6 +21,11 @@ phoneme @ // Schwa, but always unstressed
Length 80
FMT(vwl_af/r@)
ENDIF
+ IF prevPh(i:) THEN
+ Length 60
+ FMT(vwl_af/r@)
+ ENDIF
+
FMT(vwl_af/@)
endphoneme
@@ -66,8 +73,10 @@ phoneme I
FMT(vowel/ii_2)
endphoneme
+
phoneme i // non syllabic i for end of words
vowel starttype #i endtype #i
+ unstressed
ipa iU+032F
length 45
FMT(vowel/ii_7)
diff --git a/phsource/ph_malayalam b/phsource/ph_malayalam
index 1aba2c74..0adbc544 100644
--- a/phsource/ph_malayalam
+++ b/phsource/ph_malayalam
@@ -15,7 +15,7 @@ phoneme y // epenthetic vowel
unstressed
ipa ɨ
length 80
- FMT(vowel/u#_4, 80)
+ FMT(vowel/u#_4, 120)
endphoneme
diff --git a/phsource/ph_oromiffa b/phsource/ph_oromiffa
new file mode 100644
index 00000000..3586c24f
--- /dev/null
+++ b/phsource/ph_oromiffa
@@ -0,0 +1,137 @@
+
+//====================================================
+// Oromiffa
+//====================================================
+
+
+phoneme i
+ vowel starttype #i endtype #i
+ length 200
+ IfNextVowelAppend(;)
+ FMT(vowel/ii_5)
+endphoneme
+
+phoneme e
+ vowel starttype #e endtype #e
+ length 220
+ FMT(vowel/e_mid2)
+endphoneme
+
+phoneme y
+ vowel starttype #@ endtype #@
+ ipa ?
+ length 180
+
+ // assume that word-final [y] are not added by am_rules
+ // Only allow [y] in first or last syllables
+// IF thisPh(isFinalVowel) THEN
+// ELIF thisPh(isFirstVowel) THEN
+// ELSE
+// ChangePhoneme(NULL)
+// ENDIF
+ FMT(vowel/ii#_2)
+endphoneme
+
+
+phoneme a
+ vowel starttype #a endtype #a
+ length 220
+ IF nextPhW(isPalatal) THEN
+ FMT(vdiph/ai_5)
+ ENDIF
+ FMT(vowel/a_6)
+endphoneme
+
+
+phoneme @
+ vowel starttype #@ endtype #@
+ length 220
+ IF nextPhW(isPalatal) THEN
+ FMT(vdiph/@i_2)
+ ENDIF
+ FMT(vowel/@_3)
+endphoneme
+
+
+phoneme o
+ vowel starttype #o endtype #o
+ length 220
+ FMT(vowel/o-_4)
+endphoneme
+
+
+phoneme u
+ vowel starttype #u endtype #u
+ length 220
+ FMT(vowel/u_2)
+endphoneme
+
+
+phoneme r
+ import_phoneme base/R2
+endphoneme
+
+
+phoneme p'
+ vls blb stop
+ lengthmod 2
+ voicingswitch b
+ Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 gpaus
+ Vowelout f1=0 f2=1000 -500 -350 f3=-300 80 rms=30
+ WAV(ustop/p_unasp)
+endphoneme
+
+
+phoneme b
+ vcd blb stop
+ IF prevPhW(isVowel) AND nextPhW(isVowel) THEN
+ ChangePhoneme(B)
+ ENDIF
+ CALL base/b
+endphoneme
+
+
+phoneme t`
+ vls alv stop
+ lengthmod 2
+ voicingswitch d
+ Vowelin f1=0 f2=1700 -300 300 f3=-100 80 gpaus
+ Vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20
+ IF nextPh(isPause2) THEN
+ WAV(ustop/t_)
+ ENDIF
+ WAV(ustop/t_hi, 70)
+endphoneme
+
+
+phoneme tS`
+ vls pla afr sibilant
+ voicingswitch dZ
+ lengthmod 2
+ Vowelin f1=0 f2=1800 -200 200 f3=-100 80 gpaus
+
+ IF nextPh(isPause2) THEN
+ WAV(ustop/tsh_unasp, 80)
+ ENDIF
+ WAV(ustop/tsh_unasp, 80)
+endphoneme
+
+
+phoneme k`
+ vls vel stop
+ lengthmod 2
+ Vowelin f1=0 f2=1700 -250 250 f3= -200 80 gpaus f4
+ Vowelout f1=0 f2=2300 300 400 f3=-200 80 rms=20
+ WAV(ustop/k_ejc, 60)
+endphoneme
+
+
+phoneme x
+ vls vel frc
+ lengthmod 3
+ IF prevPhW(#i) THEN
+ ChangePhoneme(C)
+ ELSE
+ CALL base/x
+ ENDIF
+endphoneme
diff --git a/phsource/ph_slovenian b/phsource/ph_slovenian
index e6a9ca22..a34538a5 100644
--- a/phsource/ph_slovenian
+++ b/phsource/ph_slovenian
@@ -82,7 +82,10 @@ phoneme o+ // doesn't reduce to [O]
phoneme O
vowel starttype #o endtype #o
length 170
- FMT(vowel/0_2)
+ IF thisPh(isStressed) THEN
+ FMT(vowel/0_2)
+ ENDIF
+ FMT(vowel/oo_4)
endphoneme
@@ -92,6 +95,47 @@ phoneme v
endphoneme
+phoneme t
+ vls dnt stop
+ lengthmod 2
+ voicingswitch d
+ Vowelin f1=0 f2=1600 -300 300 f3=-100 80
+ Vowelout f1=0 f2=1600 -300 250 f3=-100 80 rms=20
+ IF nextPh(isPause2) AND prevPhW(isVowel) THEN
+ WAV(ustop/t_dnt, 40)
+ ENDIF
+ WAV(ustop/t_dnt, 60)
+endphoneme
+
+
+phoneme k
+ vls vel stop
+ voicingswitch g
+ lengthmod 2
+ Vowelin f1=0 f2=2300 200 300 f3=-200 80
+ Vowelout f1=0 f2=2300 300 400 f3=-200 80 rms=20
+
+ IF KlattSynth THEN
+ Vowelout f1=0 f2=2300 200 300 f3=-200 80 rms=20
+ ENDIF
+
+ IF thisPh(isWordEnd) THEN
+ WAV(ustop/k)
+ ELIF nextPh(isPause2) THEN
+ WAV(ustop/k_)
+ ELIF nextPh(r) OR nextPh(R) OR nextPh(R2) THEN
+ WAV(ustop/kr)
+ ELIF nextPh(#i) OR nextPh(;) THEN
+ WAV(ustop/ki)
+ ELIF nextPh(l) THEN
+ WAV(ustop/kl)
+ ELIF nextPh(@-) THEN
+ WAV(ustop/k_unasp, 70)
+ ENDIF
+ WAV(ustop/k)
+endphoneme
+
+
// for foreign letters
phoneme y
vowel starttype #i endtype #i
diff --git a/phsource/ph_vietnam b/phsource/ph_vietnam
index 95ddc9c6..09e3703c 100644
--- a/phsource/ph_vietnam
+++ b/phsource/ph_vietnam
@@ -6,44 +6,44 @@
phoneme 1 // ngang tone: level
stress
- Tone(28, 32, envelope/p_level, NULL)
+ Tone(34,36, envelope/p_level, NULL) // 28 29
endphoneme
phoneme 2 // huyền tone: low falling
stress
- Tone(20, 8, envelope/p_fall, NULL) //20
+ Tone(30, 8, envelope/p_fall, NULL) //20 8
endphoneme
phoneme 3 // sắc Tone(rising
stress
- Tone(30, 60, envelope/p_rise, NULL) // 25 50
+ Tone(30, 60, envelope/p_rise, NULL) // 30 60
endphoneme
phoneme 4 // hỏi Tone(curve (dipping rising)
stress
- Tone(40, 5, envelope/p_fallrise, NULL) //30
+ Tone(10, 55, envelope/p_fallrise, NULL) //33 31
endphoneme
phoneme 5 // ngã tone: broken (creaking rising)
stress
- Tone(28,58, envelope/p_214, envelope/vi_5amp) // 28,58
+ Tone(28,58,envelope/p_214, envelope/vi_5amp) // 28,58 20 80
endphoneme
phoneme 6 // nặng Tone(drop (constricted)
stress
//length 150 // ignore because it make too short sound 75 // reduce the length of the vowel
- Tone(40, 20, envelope/p_512, envelope/vi_6amp)
+ Tone(25, 60, envelope/p_512, envelope/vi_6amp) //40 20
endphoneme
phoneme 7 // Tone(1 (ngang) at end of clause
stress
- Tone(40, 20, envelope/p_fall, NULL)
+ Tone(40, 35, envelope/p_fall, NULL) //40 20
endphoneme
@@ -55,20 +55,24 @@ endphoneme
phoneme a
vowel starttype #@ endtype #@
length 140
- FMT(vowel/a_6) //a_4)
+ FMT(vowel/a_4) //a_4)
endphoneme
phoneme a:
vowel starttype #a endtype #a
- length 240 //280
+ IF nextPh(n^) OR nextPh(c) THEN
+ length 100
+ ELSE
+ length 140 //280
+ ENDIF
FMT(vowel/a_8)
endphoneme
phoneme E
vowel starttype #e endtype #e
- length 240
- FMT(vowel/ee_3)
+ length 140
+ FMT(vowel/e_e) //ee_3)
endphoneme
phoneme e
@@ -80,14 +84,15 @@ endphoneme
phoneme i
vowel starttype #i endtype #i
- length 240
- IfNextVowelAppend(;)
+ IfNextVowelAppend(;)
IF prevPhW(w) THEN
VowelStart(w/wi)
ENDIF
IF nextPh(n^) OR nextPh(c) THEN
+ length 100
FMT(vnasal/ii_n)
-ELSE
+ ELSE
+ length 140
FMT(vowel/i_4)
ENDIF
endphoneme
@@ -96,11 +101,11 @@ endphoneme
phoneme O
vowel starttype #o endtype #o
IF nextPh(kh) OR nextPh(N) THEN
- length 110
+ length 80
ELSE
- length 200
+ length 140
ENDIF
- FMT(vowel/0_2) //aa_4)
+ FMT(vdiph2/o_oo) //vowel/oo)
endphoneme
phoneme o
@@ -108,7 +113,7 @@ phoneme o
IF nextPh(kh) OR nextPh(N) THEN
length 110
ELSE
- length 200
+ length 140
ENDIF
FMT(vowel/o) // o_2)
endphoneme
@@ -119,9 +124,9 @@ phoneme u
IF nextPh(kh) OR nextPh(N) THEN // hear as ung sound
length 120
ELSE
- length 240
+ length 140
ENDIF
- FMT(vowel/u_5)
+ FMT(vnasal/u_n,60) //vowel/u_5)
endphoneme
phoneme y
@@ -141,7 +146,7 @@ phoneme @
IF nextPh(kh) OR nextPh(N) OR nextPh(n^) OR nextPh(c) THEN
length 120
ELSE
- length 200
+ length 140
ENDIF
FMT(vowel/V) //vowel/@_2)
endphoneme
@@ -149,7 +154,7 @@ endphoneme
phoneme @:
vowel starttype #@ endtype #@
- length 200
+ length 140
FMT(vowel/@_2)
endphoneme
@@ -182,7 +187,7 @@ endphoneme
phoneme @:I
vowel starttype #@ endtype #i
length 200 //250
- FMT(vdiph/@i)
+ FMT(vdiph/y#i)
endphoneme
@@ -203,7 +208,7 @@ endphoneme
phoneme OI
vowel starttype #o endtype #i
length 200
- FMT(vdiph/ooi_3)
+ FMT(vdiph/ooi_4)
endphoneme
@@ -231,28 +236,28 @@ endphoneme
phoneme aU
vowel starttype #a endtype #u
- length 200
+ length 150
FMT(vdiph/aau_4)
endphoneme
phoneme a:U
vowel starttype #a endtype #u
- length 200 //270
+ length 150 //270
FMT(vdiph/au)
endphoneme
phoneme eU
vowel starttype #e endtype #u
- length 200
+ length 150
FMT(vdiph/eu)
endphoneme
phoneme EU
vowel starttype #e endtype #u
- length 200
+ length 150
FMT(vdiph/eeu)
endphoneme
@@ -310,7 +315,7 @@ endphoneme
phoneme o@
- vowel starttype #o endtype #o
+ vowel starttype #o endtype #a
length 140
FMT(vdiph2/oa)
endphoneme
@@ -366,7 +371,7 @@ endphoneme
phoneme l
liquid
- Vowelin f1=0 f2=1700 -300 300 f3=-100 80 len=30
+ Vowelin f1=0 f2=1700 -300 300 f3=-100 80 len=15
//lengthmod 7
//IF nextPh(isNotVowel) THEN
// ChangePhoneme(l/2)
@@ -380,7 +385,7 @@ phoneme t
vls alv stop
//voicingswitch d
lengthmod 2
- Vowelin f1=0 f2=1700 -300 300 f3=-100 80 len=30
+ Vowelin f1=0 f2=1700 -300 300 f3=-100 80 len=15
Vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20
WAV(vietnam/th, 50)
@@ -390,17 +395,17 @@ phoneme cr
vls pla afr sibilant
//voicingswitch dZ
lengthmod 2
- Vowelin f1=0 f2=2300 200 400 f3=-100 80 len=30
+ Vowelin f1=0 f2=2300 200 400 f3=-100 80 len=15
WAV(vietnam/tr,10)
endphoneme
-phoneme d
+phoneme d_
vcd alv stop
// lengthmod 5
-
- Vowelin f1=1 f2=1700 -300 300 f3=-100 80 len=30
+ ipa ɗ
+ Vowelin f1=1 f2=1700 -300 300 f3=-100 80 len=15
Vowelout f1=2 f2=1700 -300 300 f3=-100 80 brk len=30
WAV(vietnam/dd)
endphoneme
@@ -410,8 +415,8 @@ WAV(vietnam/dd)
//voicingswitch J
lengthmod 2
length 2
- Vowelin f1=0 f2=2700 400 600 f3=300 80 len=30 brk
- Vowelout f1=1 f2=2700 400 600 f3=200 70 len=30 colr=1
+ Vowelin f1=0 f2=2700 400 600 f3=300 80 len=15 brk
+ Vowelout f1=1 f2=2700 400 600 f3=200 70 len=15 colr=1
WAV(vietnam/ch,5)
@@ -430,8 +435,8 @@ endphoneme
phoneme n
vcd alv nasal
- Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 amp=11 brk len=30
- Vowelout f1=2 f2=1700 -300 250 f3=-100 80 rms=20 brk len=30
+ Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 amp=11 brk len=15
+ Vowelout f1=2 f2=1700 -300 250 f3=-100 80 rms=20 brk len=15
lengthmod 4
length 75
FMT(n/nr_)
@@ -442,11 +447,12 @@ phoneme t[ // dental variant of /t/
voicingswitch d[
lengthmod 2
length 5
- Vowelin f1=1 f2=1500 -250 250 f3=-100 80 amp=16 len=30
- Vowelout f1=0 f2=1500 -300 250 f3=-100 80 rms=20 len=30
+ Vowelin f1=1 f2=1500 -250 250 f3=-100 80 amp=16 len=15
+ Vowelout f1=0 f2=1500 -300 250 f3=-100 80 rms=20 len=15
IF nextPh(isPause2) THEN
WAV(ustop/t_unasp2, 5)
ENDIF
WAV(ustop/t_hi, 70)
endphoneme
+
diff --git a/phsource/ph_vietnam_hue b/phsource/ph_vietnam_hue
index ee843f33..e1079ea6 100644
--- a/phsource/ph_vietnam_hue
+++ b/phsource/ph_vietnam_hue
@@ -6,7 +6,7 @@
phoneme 1 // ngang tone: level
stress
- Tone(40, 5, envelope/p_level, NULL) // similar Hue dialect tone
+ Tone(10 ,60, envelope/p_level, NULL) // 40 5 similar Hue dialect tone
endphoneme
@@ -76,7 +76,7 @@ endphoneme
phoneme O
CALL vi/O
length 150
- FMT(vowel/0)
+ FMT(vowel/oo_3)
endphoneme
phoneme Oi
@@ -84,3 +84,15 @@ phoneme Oi
length 100
FMT(vdiph/ooi_2)
endphoneme
+
+// Redefine consonants
+
+phoneme n
+import_phoneme vi/n
+Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 rms=5 brk len=15
+endphoneme
+
+phoneme @:I
+ CALL vi/@:I
+ FMT(vdiph/y#y)
+endphoneme
diff --git a/phsource/phonemes b/phsource/phonemes
index a3608cba..162c7c7e 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -1950,3 +1950,8 @@ include ph_korean
phonemetable kl base
include ph_greenlandic
+phonemetable om base
+include ph_oromiffa
+
+//phonemetable en2 en
+//include ph_english_test
diff --git a/phsource/ustop/tsh_unasp2.wav b/phsource/ustop/tsh_unasp2.wav
new file mode 100644
index 00000000..252851a1
Binary files /dev/null and b/phsource/ustop/tsh_unasp2.wav differ
diff --git a/phsource/vdiph/ooi_3 b/phsource/vdiph/ooi_3
index 750eac6b..01df3917 100644
Binary files a/phsource/vdiph/ooi_3 and b/phsource/vdiph/ooi_3 differ
diff --git a/src/Makefile.am b/src/Makefile.am
index cf919be6..5d725e11 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,17 +64,17 @@ endif
endif
endif
-CXXFLAGS = -O2 -Wall -c
-CPPFLAGS = -pedantic -fno-exceptions -D PATH_ESPEAK_DATA=\"$(DATADIR)\"
+CXXFLAGS ?= -O2 -Wall
+CPPFLAGS = -pedantic -fno-exceptions -D PATH_ESPEAK_DATA=\"$(DATADIR)\"
.cpp.o:
- $(CXX) $(CXXFLAGS) $(USE_AUDIO) -I. $(CPPFLAGS) $<
+ $(CXX) -c $(CXXFLAGS) $(USE_AUDIO) -I. $(CPPFLAGS) $<
e_%.o: %.cpp
- $(CXX) $(CXXFLAGS) $(espeakedit_CXXFLAGS) $(USE_AUDIO) $(CPPFLAGS) -I. $< -o e_$*.o
+ $(CXX) -c $(CXXFLAGS) $(espeakedit_CXXFLAGS) $(USE_AUDIO) $(CPPFLAGS) -I. $< -o e_$*.o
x_%.o: %.cpp
- $(CXX) $(CXXFLAGS) $(USE_AUDIO) -fpic -fvisibility=hidden \
+ $(CXX) -c $(CXXFLAGS) $(USE_AUDIO) -fpic -fvisibility=hidden \
-I. -D LIBRARY $(CPPFLAGS) $< -o x_$*.o
all: $(SPEAK) $(LIBESPEAK) $(STATIC_LIBESPEAK) $(ESPEAK) $(ESPEAKEDIT)
diff --git a/src/compiledata.cpp b/src/compiledata.cpp
index b845cbae..50b1f953 100644
--- a/src/compiledata.cpp
+++ b/src/compiledata.cpp
@@ -3672,6 +3672,7 @@ fprintf(f_errors,"\nRefs %d, Reused %d\n",count_references,duplicate_references
LoadVoice(voice_name2,0);
CompileReport();
+ if(gui_flag != 0)
report_dict = CompileAllDictionaries();
#ifdef MAKE_ENVELOPES
DrawEnvelopes();
diff --git a/src/compiledict.cpp b/src/compiledict.cpp
index fe054cc7..337e3aa6 100644
--- a/src/compiledict.cpp
+++ b/src/compiledict.cpp
@@ -1958,6 +1958,7 @@ int CompileDictionary(const char *dsource, const char *dict_name, FILE *log, cha
fseek(f_out,4,SEEK_SET);
Write4Bytes(f_out,offset_rules);
fclose(f_out);
+ fflush(f_log);
LoadDictionary(translator, dict_name, 0);
diff --git a/src/dictionary.cpp b/src/dictionary.cpp
index 2f6359bd..02480dc8 100644
--- a/src/dictionary.cpp
+++ b/src/dictionary.cpp
@@ -530,6 +530,10 @@ unsigned short ipa1[96] = {
0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x7b,0x7c,0x7d,0x303,0x7f
};
+#define N_PHON_OUT 500
+static char *phon_out_buf = NULL;
+static int phon_out_size = 0;
+
char *WritePhMnemonic(char *phon_out, PHONEME_TAB *ph, PHONEME_LIST *plist, int use_ipa, int *flags)
{//===================================================================================================
@@ -633,8 +637,8 @@ char *WritePhMnemonic(char *phon_out, PHONEME_TAB *ph, PHONEME_LIST *plist, int
-void GetTranslatedPhonemeString(char *phon_out, int n_phon_out, int phoneme_mode)
-{//===============================================================================
+const char *GetTranslatedPhonemeString(int phoneme_mode)
+{//=======================================================
/* Called after a clause has been translated into phonemes, in order
to display the clause in phoneme mnemonic form.
@@ -644,7 +648,6 @@ void GetTranslatedPhonemeString(char *phon_out, int n_phon_out, int phoneme_mode
int ix;
unsigned int len;
- unsigned int max_len;
int phon_out_ix=0;
int stress;
int c;
@@ -672,108 +675,107 @@ void GetTranslatedPhonemeString(char *phon_out, int n_phon_out, int phoneme_mode
use_tie = 0;
}
- if(phon_out != NULL)
+ for(ix=1; ix<(n_phoneme_list-2); ix++)
{
- for(ix=1; ix<(n_phoneme_list-2); ix++)
+ buf = phon_buf;
+
+ plist = &phoneme_list[ix];
+
+ WritePhMnemonic(phon_buf2, plist->ph, plist, use_ipa, &flags);
+ if(plist->newword)
+ *buf++ = ' ';
+ else
{
- buf = phon_buf;
-
- plist = &phoneme_list[ix];
-
- WritePhMnemonic(phon_buf2, plist->ph, plist, use_ipa, &flags);
- if(plist->newword)
- *buf++ = ' ';
- else
+ if((separate_phonemes != 0) && (ix > 1))
{
- if((separate_phonemes != 0) && (ix > 1))
+ utf8_in(&c, phon_buf2);
+ if((c < 0x2b0) || (c > 0x36f)) // not if the phoneme starts with a superscript letter
{
- utf8_in(&c, phon_buf2);
- if((c < 0x2b0) || (c > 0x36f)) // not if the phoneme starts with a superscript letter
- {
- *buf++ = separate_phonemes;
- }
+ *buf++ = separate_phonemes;
}
}
-
- if(plist->synthflags & SFLAG_SYLLABLE)
- {
- if((stress = plist->stresslevel) > 1)
- {
- c = 0;
- if(stress > 5) stress = 5;
-
- if(use_ipa)
- {
- c = 0x2cc; // ipa, secondary stress
- if(stress > 3)
- c = 0x02c8; // ipa, primary stress
- }
- else
- {
- c = stress_chars[stress];
- }
-
- if(c != 0)
- {
- buf += utf8_out(c, buf);
-// if(separate_phonemes)
-// *buf++ = separate_phonemes;
- }
- }
- }
-
- flags = 0;
- count = 0;
- for(p=phon_buf2; *p != 0;)
- {
- p += utf8_in(&c, p);
- if(use_tie > 0)
- {
- // look for non-inital alphabetic character, but not diacritic, superscript etc.
- if((count>0) && !(flags & (1 << (count-1))) && ((c < 0x2b0) || (c > 0x36f)) && iswalpha2(c))
- {
- buf += utf8_out(char_tie[use_tie-1], buf);
- }
- }
- buf += utf8_out(c, buf);
- count++;
- }
-
- if(plist->ph->code != phonSWITCH)
- {
- if(plist->synthflags & SFLAG_LENGTHEN)
- {
- buf = WritePhMnemonic(buf, phoneme_tab[phonLENGTHEN], NULL, use_ipa, NULL);
- }
- if((plist->synthflags & SFLAG_SYLLABLE) && (plist->type != phVOWEL))
- {
- // syllablic consonant
- buf = WritePhMnemonic(buf, phoneme_tab[phonSYLLABIC], NULL, use_ipa, NULL);
- }
- if(plist->tone_ph > 0)
- {
- buf = WritePhMnemonic(buf, phoneme_tab[plist->tone_ph], NULL, use_ipa, NULL);
- }
- }
-
- len = buf - phon_buf;
- max_len = (n_phon_out - phon_out_ix - 5); // allow for " ..." and zero byte terminator
- if(len > max_len)
- {
- strcpy(&phon_buf[max_len], " ...");
- len = max_len + 4;
- }
- phon_buf[len] = 0;
- strcpy(&phon_out[phon_out_ix], phon_buf);
- phon_out_ix += len;
-
- if(len > max_len)
- {
- break;
- }
}
- phon_out[phon_out_ix] = 0;
+
+ if(plist->synthflags & SFLAG_SYLLABLE)
+ {
+ if((stress = plist->stresslevel) > 1)
+ {
+ c = 0;
+ if(stress > 5) stress = 5;
+
+ if(use_ipa)
+ {
+ c = 0x2cc; // ipa, secondary stress
+ if(stress > 3)
+ c = 0x02c8; // ipa, primary stress
+ }
+ else
+ {
+ c = stress_chars[stress];
+ }
+
+ if(c != 0)
+ {
+ buf += utf8_out(c, buf);
+// if(separate_phonemes)
+// *buf++ = separate_phonemes;
+ }
+ }
+ }
+
+ flags = 0;
+ count = 0;
+ for(p=phon_buf2; *p != 0;)
+ {
+ p += utf8_in(&c, p);
+ if(use_tie > 0)
+ {
+ // look for non-inital alphabetic character, but not diacritic, superscript etc.
+ if((count>0) && !(flags & (1 << (count-1))) && ((c < 0x2b0) || (c > 0x36f)) && iswalpha2(c))
+ {
+ buf += utf8_out(char_tie[use_tie-1], buf);
+ }
+ }
+ buf += utf8_out(c, buf);
+ count++;
+ }
+
+ if(plist->ph->code != phonSWITCH)
+ {
+ if(plist->synthflags & SFLAG_LENGTHEN)
+ {
+ buf = WritePhMnemonic(buf, phoneme_tab[phonLENGTHEN], NULL, use_ipa, NULL);
+ }
+ if((plist->synthflags & SFLAG_SYLLABLE) && (plist->type != phVOWEL))
+ {
+ // syllablic consonant
+ buf = WritePhMnemonic(buf, phoneme_tab[phonSYLLABIC], NULL, use_ipa, NULL);
+ }
+ if(plist->tone_ph > 0)
+ {
+ buf = WritePhMnemonic(buf, phoneme_tab[plist->tone_ph], NULL, use_ipa, NULL);
+ }
+ }
+
+ len = buf - phon_buf;
+ if((phon_out_ix + len) >= phon_out_size)
+ {
+ // enlarge the phoneme buffer
+ phon_out_size = phon_out_ix + len + N_PHON_OUT;
+ if((phon_out_buf = (char *)realloc(phon_out_buf, phon_out_size)) == NULL)
+ {
+ phon_out_size = 0;
+ return("");
+ }
+ }
+
+ phon_buf[len] = 0;
+ strcpy(&phon_out_buf[phon_out_ix], phon_buf);
+ phon_out_ix += len;
}
+ phon_out_buf[phon_out_ix] = 0;
+
+ return(phon_out_buf);
} // end of GetTranslatedPhonemeString
diff --git a/src/espeakedit.cpp b/src/espeakedit.cpp
index 73445913..f70a4a87 100644
--- a/src/espeakedit.cpp
+++ b/src/espeakedit.cpp
@@ -144,7 +144,6 @@ if(argc > 1)
if(strcmp(param,"--compile")==0)
{
- LoadPhData(NULL);
samplerate_native = samplerate = 22050;
CompilePhonemeData();
CompileIntonation();
diff --git a/src/intonation.cpp b/src/intonation.cpp
index 891c3901..b6dfa71e 100644
--- a/src/intonation.cpp
+++ b/src/intonation.cpp
@@ -1246,10 +1246,24 @@ void CalcPitches(Translator *tr, int clause_type)
}
count_pitch_vowels(st_start, ix, n_st);
+ if((ix < n_st) || (clause_type == 0))
+ {
+ calc_pitches(option, st_start, ix, group_tone); // split into > 1 tone groups
+
+ if((clause_type==1) || (clause_type==2))
+ group_tone = tr->langopts.tunes[1]; // , or ? remainder has comma-tone
+ else
+ group_tone = tr->langopts.tunes[0]; // . or ! remainder has statement tone
+ }
+ else
+ calc_pitches(option, st_start, ix, group_tone);
+
+#ifdef deleted
if((ix < n_st) || (clause_type == 0))
calc_pitches(option, st_start, ix, group_tone_emph); // split into > 1 tone groups, use emphatic tone
else
calc_pitches(option, st_start, ix, group_tone);
+#endif
st_start = ix;
}
diff --git a/src/klatt.cpp b/src/klatt.cpp
index 5c7da273..b15f77c2 100644
--- a/src/klatt.cpp
+++ b/src/klatt.cpp
@@ -1090,7 +1090,7 @@ int Wavegen_Klatt(int resume)
}
for(ix=1; ix < 7; ix++)
{
- kt_frame.Ap[ix] = 0;
+ kt_frame.Ap[ix] = peaks[ix].ap;
}
kt_frame.AVdb = klattp[KLATT_AV];
@@ -1333,12 +1333,12 @@ if(option_log_frames)
{
peaks[ix].bp1 = fr1->klatt_bp[ix] * 4; // parallel bandwidth
peaks[ix].bp = (int)peaks[ix].bp1;
- next = fr2->klatt_bp[ix] * 2;
+ next = fr2->klatt_bp[ix] * 4;
peaks[ix].bp_inc = ((next - peaks[ix].bp1) * STEPSIZE) / length;
peaks[ix].ap1 = fr1->klatt_ap[ix]; // parallal amplitude
peaks[ix].ap = (int)peaks[ix].ap1;
- next = fr2->klatt_ap[ix] * 2;
+ next = fr2->klatt_ap[ix];
peaks[ix].ap_inc = ((next - peaks[ix].ap1) * STEPSIZE) / length;
}
}
diff --git a/src/numbers.cpp b/src/numbers.cpp
index ba99ca82..8967f997 100644
--- a/src/numbers.cpp
+++ b/src/numbers.cpp
@@ -1418,6 +1418,7 @@ static int LookupNum2(Translator *tr, int value, const int control, char *ph_out
// control bit 4: speak zero tens
// control bit 5: variant of ordinal number (lang=hu)
// bit 8 followed by decimal fraction
+// bit 9: use #f form for both tens and units (lang=ml)
int found;
int ix;
@@ -1462,9 +1463,13 @@ static int LookupNum2(Translator *tr, int value, const int control, char *ph_out
// is there a special pronunciation for this 2-digit number
if(control & 8)
{
- // is there a feminine form?
- sprintf(string,"_%df",value);
- found = Lookup(tr, string, ph_digits);
+ // is there a feminine or thousands-variant form?
+ sprintf(string,"_%dfx",value);
+ if((found = Lookup(tr, string, ph_digits)) == 0)
+ {
+ sprintf(string,"_%df",value);
+ found = Lookup(tr, string, ph_digits);
+ }
}
else if(is_ordinal)
{
@@ -1553,7 +1558,10 @@ static int LookupNum2(Translator *tr, int value, const int control, char *ph_out
}
if(found_ordinal == 0)
{
- sprintf(string,"_%dX", tens);
+ if(control & 0x200)
+ sprintf(string, "_%dXf", tens);
+ else
+ sprintf(string,"_%dX", tens);
Lookup(tr, string, ph_tens);
}
@@ -1708,6 +1716,7 @@ static int LookupNum3(Translator *tr, int value, char *ph_out, int suppress_null
int ordinal;
int tplex;
int say_zero_hundred=0;
+ int say_one_hundred;
char string[12]; // for looking up entries in **_list
char buf1[100];
char buf2[100];
@@ -1776,6 +1785,8 @@ static int LookupNum3(Translator *tr, int value, char *ph_out, int suppress_null
x = 0;
if(tr->langopts.numbers2 & (1 << tplex))
x = 8; // use variant (feminine) for before thousands and millions
+ if(tr->translator_name == L('m','l'))
+ x = 0x208;
LookupNum2(tr, hundreds/10, x, ph_digits);
}
@@ -1788,6 +1799,7 @@ static int LookupNum3(Translator *tr, int value, char *ph_out, int suppress_null
if((hundreds == 0) && (say_zero_hundred == 0))
ph_100[0] = 0;
suppress_null = 1;
+ control |= 1;
}
ph_digits[0] = 0;
@@ -1823,17 +1835,24 @@ static int LookupNum3(Translator *tr, int value, char *ph_out, int suppress_null
}
else
{
- if((!found) && (tensunits == 0))
+ if((hundreds==1) && (tr->langopts.numbers2 & NUM2_OMIT_1_HUNDRED_ONLY) && ((control & 1)==0))
{
- // is there a special pronunciation for exactly n00 ?
- sprintf(string,"_%dC0",hundreds);
- found = Lookup(tr, string, ph_digits);
+ // only look for special 100 if there are previous thousands
}
-
- if(!found)
+ else
{
- sprintf(string,"_%dC",hundreds);
- found = Lookup(tr, string, ph_digits); // is there a specific pronunciation for n-hundred ?
+ if((!found) && (tensunits == 0))
+ {
+ // is there a special pronunciation for exactly n00 ?
+ sprintf(string,"_%dC0",hundreds);
+ found = Lookup(tr, string, ph_digits);
+ }
+
+ if(!found)
+ {
+ sprintf(string,"_%dC",hundreds);
+ found = Lookup(tr, string, ph_digits); // is there a specific pronunciation for n-hundred ?
+ }
}
if(found)
@@ -1842,7 +1861,14 @@ static int LookupNum3(Translator *tr, int value, char *ph_out, int suppress_null
}
else
{
- if((hundreds > 1) || ((tr->langopts.numbers & NUM_OMIT_1_HUNDRED) == 0))
+ say_one_hundred = 1;
+ if(hundreds == 1)
+ {
+ if((tr->langopts.numbers & NUM_OMIT_1_HUNDRED) != 0)
+ say_one_hundred = 0;
+ }
+
+ if(say_one_hundred != 0)
{
LookupNum2(tr, hundreds, 0, ph_digits);
}
@@ -1898,6 +1924,11 @@ static int LookupNum3(Translator *tr, int value, char *ph_out, int suppress_null
x = 8; // use variant (feminine) for before thousands and millions
}
+ if((tr->translator_name == L('m','l')) && (thousandplex == 1))
+ {
+ x |= 0x208; // use #f form for both tens and units
+ }
+
if(LookupNum2(tr, tensunits, x | (control & 0x100), buf2) != 0)
{
if(tr->langopts.numbers & NUM_SINGLE_AND)
diff --git a/src/phonemelist.cpp b/src/phonemelist.cpp
index b514ddd2..80bf9f29 100644
--- a/src/phonemelist.cpp
+++ b/src/phonemelist.cpp
@@ -509,9 +509,10 @@ void MakePhonemeList(Translator *tr, int post_pause, int start_sentence)
if((plist3+1)->synthflags & SFLAG_LENGTHEN)
{
static char types_double[] = {phFRICATIVE,phVFRICATIVE,phNASAL,phLIQUID,0};
- if(strchr(types_double,next->type))
+ if((j > 0) && (strchr(types_double,next->type)))
{
// lengthen this consonant by doubling it
+ // BUT, can't insert a phoneme at position plist3[0] because it crashes PrevPh()
insert_ph = next->code;
(plist3+1)->synthflags ^= SFLAG_LENGTHEN;
}
diff --git a/src/readclause.cpp b/src/readclause.cpp
index 90ef076c..b228f7c0 100644
--- a/src/readclause.cpp
+++ b/src/readclause.cpp
@@ -1601,6 +1601,7 @@ static int GetVoiceAttributes(wchar_t *pw, int tag_type)
wchar_t *name;
wchar_t *age;
wchar_t *variant;
+ int value;
const char *new_voice_id;
SSML_STACK *ssml_sp;
@@ -1646,7 +1647,9 @@ static int GetVoiceAttributes(wchar_t *pw, int tag_type)
attrcopy_utf8(ssml_sp->language,lang,sizeof(ssml_sp->language));
attrcopy_utf8(ssml_sp->voice_name,name,sizeof(ssml_sp->voice_name));
- ssml_sp->voice_variant_number = attrnumber(variant,1,0)-1;
+ if((value = attrnumber(variant,1,0)) > 0)
+ value--; // variant='0' and variant='1' the same
+ ssml_sp->voice_variant_number = value;
ssml_sp->voice_age = attrnumber(age,0,0);
ssml_sp->voice_gender = attrlookup(gender,mnem_gender);
ssml_sp->tag_type = tag_type;
@@ -2293,7 +2296,7 @@ f_input = f_in; // for GetC etc
return(CLAUSE_EOF);
}
- if((skip_characters > 0) && (count_characters > skip_characters))
+ if((skip_characters > 0) && (count_characters >= skip_characters))
{
// reached the specified start position
// don't break a word
diff --git a/src/speak_lib.cpp b/src/speak_lib.cpp
index c0d197c5..dfbbd687 100644
--- a/src/speak_lib.cpp
+++ b/src/speak_lib.cpp
@@ -1164,14 +1164,15 @@ ESPEAK_API void espeak_SetPhonemeTrace(int value, FILE *stream)
} // end of espeak_SetPhonemes
-ESPEAK_API void espeak_TextToPhonemes(const void *text, char *buffer, int size, int textmode, int phonememode)
-{//==============================================================================================================
+ESPEAK_API const char *espeak_TextToPhonemes(const void **textptr, int textmode, int phonememode)
+{//=================================================================================================
/* phoneme_mode bits 0-3: 0=only phoneme names, 1=ties, 2=ZWJ, 3=underscore separator
bits 4-7: 0=eSpeak phoneme names, 1=IPA
*/
+
option_multibyte = textmode & 7;
- TranslateClause(translator, NULL, text, NULL, NULL);
- GetTranslatedPhonemeString(buffer, size, phonememode);
+ *textptr = TranslateClause(translator, NULL, *textptr, NULL, NULL);
+ return(GetTranslatedPhonemeString(phonememode));
}
diff --git a/src/speak_lib.h b/src/speak_lib.h
index d39dba8c..65d153c1 100644
--- a/src/speak_lib.h
+++ b/src/speak_lib.h
@@ -34,7 +34,7 @@
#define ESPEAK_API
#endif
-#define ESPEAK_API_REVISION 7
+#define ESPEAK_API_REVISION 9
/*
Revision 2
Added parameter "options" to eSpeakInitialize()
@@ -58,6 +58,9 @@ Revision 7 24.Dec.2011
Revision 8 26.Apr.2013
Added function espeak_TextToPhonemes().
+Revision 9 30.May.2013
+ Changed function espeak_TextToPhonemes().
+
*/
/********************/
/* Initialization */
@@ -481,13 +484,15 @@ ESPEAK_API void espeak_SetPhonemeTrace(int value, FILE *stream);
#ifdef __cplusplus
extern "C"
#endif
-ESPEAK_API void espeak_TextToPhonemes(const void *text, char *buffer, int size, int textmode, int phonememode);
+ESPEAK_API const char *espeak_TextToPhonemes(const void **textptr, int textmode, int phonememode);
/* Translates text into phonemes. Call espeak_SetVoiceByName() first, to select a language.
- text: The text to translate, terminated by a zero character.
- buffer: Output buffer for the phoneme translation.
+ It returns a pointer to a character string which contains the phonemes for the text up to
+ end of a sentence, or comma, semicolon, colon, or similar punctuation.
- size: Size of the output buffer in bytes.
+ textptr: The address of a pointer to the input text which is terminated by a zero character.
+ On return, the pointer has been advanced past the text which has been translated, or else set
+ to NULL to indicate that the end of the text has been reached.
textmode: Type of character codes, one of:
espeakCHARS_UTF8 UTF8 encoding
diff --git a/src/spectseq.cpp b/src/spectseq.cpp
index 3c4c14b9..c74fdcba 100644
--- a/src/spectseq.cpp
+++ b/src/spectseq.cpp
@@ -773,7 +773,7 @@ void SpectSeq::InterpolateAdjacent(void)
p->pkfreq = p1->pkfreq + int((p2->pkfreq - p1->pkfreq)*ratio);
p->pkheight=p1->pkheight+int((p2->pkheight-p1->pkheight)*ratio);
p->pkwidth = p1->pkwidth + int((p2->pkwidth - p1->pkwidth)*ratio);
- p->pkright =p1->pkright + int((p2->pkright - p2->pkright)*ratio);
+ p->pkright =p1->pkright + int((p2->pkright - p1->pkright)*ratio);
}
frames[select]->keyframe = 1;
formantdlg->ShowFrame(this,select,1,0xff);
diff --git a/src/speech.h b/src/speech.h
index 23fc7242..02886ed6 100644
--- a/src/speech.h
+++ b/src/speech.h
@@ -51,7 +51,6 @@
#endif
#ifdef _ESPEAKEDIT
-#define USE_PORTAUDIO
#define USE_ASYNC
#define LOG_FRAMES // write keyframe info to log-espeakedit
#endif
diff --git a/src/synthdata.cpp b/src/synthdata.cpp
index 29be00ae..81f654b0 100644
--- a/src/synthdata.cpp
+++ b/src/synthdata.cpp
@@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"
-const char *version_string = "1.47.11 03.May.13";
+const char *version_string = "1.47.11d 11.Jun.13";
const int version_phdata = 0x014709;
int option_device_number = -1;
diff --git a/src/synthesize.cpp b/src/synthesize.cpp
index 7fec4d84..a2444fc1 100644
--- a/src/synthesize.cpp
+++ b/src/synthesize.cpp
@@ -1865,6 +1865,7 @@ int SpeakNextClause(FILE *f_in, const void *text_in, int control)
char *voice_change;
static FILE *f_text=NULL;
static const void *p_text=NULL;
+ const char *phon_out;
if(control == 4)
{
@@ -1957,14 +1958,14 @@ int SpeakNextClause(FILE *f_in, const void *text_in, int control)
if(option_phonemes >= 3)
phoneme_mode = 0x10 + option_phonemes-3; // 0x10=ipa, 0x11=ipa with tie, 0x12=ipa with ZWJ, 0x13=ipa with separators
- GetTranslatedPhonemeString(translator->phon_out, sizeof(translator->phon_out), phoneme_mode);
+ phon_out = GetTranslatedPhonemeString(phoneme_mode);
if(option_phonemes > 0)
{
- fprintf(f_trans,"%s\n",translator->phon_out);
+ fprintf(f_trans,"%s\n",phon_out);
}
if(phoneme_callback != NULL)
{
- phoneme_callback(translator->phon_out);
+ phoneme_callback(phon_out);
}
}
diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp
index f9ad27e4..3a718796 100644
--- a/src/tr_languages.cpp
+++ b/src/tr_languages.cpp
@@ -237,6 +237,7 @@ static const char transpose_map_latin[] = {
tr->charset_a0 = charsets[1]; // ISO-8859-1, this is for when the input is not utf8
dictionary_name[0] = 0;
+ tr->dictionary_name[0] = 0;
tr->dict_condition=0;
tr->dict_min_size = 0;
tr->data_dictrules = NULL; // language_1 translation rules file
@@ -471,12 +472,13 @@ Translator *SelectTranslator(const char *name)
static const short stress_lengths_ta2[8] = {230, 230, 240, 240, 0, 0, 260, 260};
static const unsigned char stress_amps_ta[8] = {18,18, 18,18, 20,20, 22,22 };
+ tr = NewTranslator();
+ strcpy(tr->dictionary_name, name);
+
// convert name string into a word of up to 4 characters, for the switch()
while(*name != 0)
name2 = (name2 << 8) + *name++;
- tr = NewTranslator();
-
switch(name2)
{
case L('a','f'):
@@ -898,6 +900,8 @@ SetupTranslator(tr,stress_lengths_equal,stress_amps_equal);
static const short stress_lengths_hr[8] = {180,160, 200,200, 0,0, 220,230};
static const short stress_lengths_sr[8] = {160,150, 200,200, 0,0, 250,260};
+ strcpy(tr->dictionary_name, "hbs");
+
if(name2 == L('s','r'))
SetupTranslator(tr,stress_lengths_sr,stress_amps_hr);
else
@@ -961,7 +965,8 @@ SetLengthMods(tr,3); // all equal
static const short stress_lengths_hy[8] = {250, 200, 250, 250, 0, 0, 250, 250};
static const char hy_vowels[] = {0x31, 0x35, 0x37, 0x38, 0x3b, 0x48, 0x55, 0};
static const char hy_consonants[] = {0x32,0x33,0x34,0x36,0x39,0x3a,0x3c,0x3d,0x3e,0x3f,
- 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x51,0x52,0x53,0x54,0x56,0};
+ 0x40,0x41,0x42,0x43,0x44, 0x46,0x47,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x51,0x52,0x53,0x54,0x56,0};
+ static const char hy_consonants2[] = {0x45,0};
SetupTranslator(tr,stress_lengths_hy,NULL);
tr->langopts.stress_rule = STRESSPOSN_1R; // default stress on final syllable
@@ -970,7 +975,9 @@ SetLengthMods(tr,3); // all equal
memset(tr->letter_bits,0,sizeof(tr->letter_bits));
SetLetterBits(tr,LETTERGP_A,hy_vowels);
SetLetterBits(tr,LETTERGP_VOWEL2,hy_vowels);
+ SetLetterBits(tr,LETTERGP_B,hy_consonants); // not including 'j'
SetLetterBits(tr,LETTERGP_C,hy_consonants);
+ SetLetterBits(tr,LETTERGP_C,hy_consonants2); // add 'j'
tr->langopts.max_initial_consonants = 6;
tr->langopts.numbers = NUM_DECIMAL_COMMA | NUM_ALLOW_SPACE | NUM_OMIT_1_HUNDRED;
// tr->langopts.param[LOPT_UNPRONOUNCABLE] = 1; // disable check for unpronouncable words
@@ -1395,6 +1402,7 @@ SetLengthMods(tr,3); // all equal
tr->langopts.numbers = NUM_DECIMAL_COMMA | NUM_ALLOW_SPACE | NUM_SWAP_TENS | NUM_OMIT_1_HUNDRED | NUM_DFRACTION_2 | NUM_ORDINAL_DOT | NUM_ROMAN;
tr->langopts.numbers2 = 0x100; // plural forms of millions etc
tr->langopts.thousands_sep = ' '; // don't allow dot as thousands separator
+ tr->langopts.replace_chars = replace_cyrillic_latin;
break;
case L('s','q'): // Albanian
@@ -1476,7 +1484,8 @@ SetLengthMods(tr,3); // all equal
if(name2 == L('m','l'))
{
tr->letter_bits_offset = OFFSET_MALAYALAM;
- tr->langopts.numbers = NUM_OMIT_1_THOUSAND;
+ tr->langopts.numbers = NUM_OMIT_1_THOUSAND | NUM_OMIT_1_HUNDRED;
+ tr->langopts.numbers2 = NUM2_OMIT_1_HUNDRED_ONLY;
}
else
if(name2 == L('k','n'))
diff --git a/src/translate.cpp b/src/translate.cpp
index 74fcb829..39a14591 100644
--- a/src/translate.cpp
+++ b/src/translate.cpp
@@ -1739,7 +1739,8 @@ int SetTranslator2(const char *new_language)
translator2->phoneme_tab_ix = new_phoneme_tab;
}
}
- translator2->phonemes_repeat[0] = 0;
+ if(translator2 != NULL)
+ translator2->phonemes_repeat[0] = 0;
return(new_phoneme_tab);
} // end of SetTranslator2
@@ -2562,6 +2563,7 @@ void *TranslateClause(Translator *tr, FILE *f_text, const void *vp_input, int *t
int dict_flags = 0; // returned from dictionary lookup
int word_flags; // set here
int next_word_flags;
+ int new_sentence2;
int embedded_count = 0;
int letter_count = 0;
int space_inserted = 0;
@@ -2642,16 +2644,19 @@ void *TranslateClause(Translator *tr, FILE *f_text, const void *vp_input, int *t
if(clause_pause < 0)
clause_pause = 0;
- terminator &= ~CLAUSE_BIT_SENTENCE; // clear sentence bit
+ if(new_sentence)
+ terminator |= CLAUSE_BIT_SENTENCE; // carry forward an end-of-sentence indicator
max_clause_pause += clause_pause;
+ new_sentence2 = 0;
}
else
{
max_clause_pause = clause_pause;
+ new_sentence2 = new_sentence;
}
tr->clause_terminator = terminator;
- if(new_sentence)
+ if(new_sentence2)
{
count_sentences++;
if(skip_sentences > 0)
@@ -3040,7 +3045,7 @@ if((c == '/') && (tr->langopts.testing & 2) && IsDigit09(next_in) && IsAlpha(pre
c = ' ';
pre_pause_add = 4;
}
- else if((prev_out == ' ') && IsAlpha(sbuf[ix-2]) && !IsAlpha(prev_in))
+ else if((prev_out == ' ') && IsAlpha(prev_out2) && !IsAlpha(prev_in))
{
// insert extra space between a word + space + hyphen, to distinguish 'a -2' from 'a-2'
sbuf[ix++] = ' ';
@@ -3138,7 +3143,7 @@ if((c == '/') && (tr->langopts.testing & 2) && IsDigit09(next_in) && IsAlpha(pre
decimal_sep_count = 1;
}
}
- else if((prev_out == ' ') && IsAlpha(sbuf[ix-2]) && !IsAlpha(prev_in))
+ else if((prev_out == ' ') && IsAlpha(prev_out2) && !IsAlpha(prev_in))
{
// insert extra space between a word and a number, to distinguish 'a 2' from 'a2'
sbuf[ix++] = ' ';
@@ -3462,7 +3467,7 @@ if((c == '/') && (tr->langopts.testing & 2) && IsDigit09(next_in) && IsAlpha(pre
clause_pause = 10;
}
- MakePhonemeList(tr, clause_pause, new_sentence);
+ MakePhonemeList(tr, clause_pause, new_sentence2);
phoneme_list[N_PHONEME_LIST].ph = NULL; // recognize end of phoneme_list array, in Generate()
phoneme_list[N_PHONEME_LIST].sourceix = 1;
diff --git a/src/translate.h b/src/translate.h
index 212f06ef..6172440d 100644
--- a/src/translate.h
+++ b/src/translate.h
@@ -510,6 +510,7 @@ typedef struct {
#define NUM2_MYRIADS 0x4000
#define NUM2_ENGLISH_NUMERALS 0x8000
#define NUM2_PERCENT_BEFORE 0x10000
+#define NUM2_OMIT_1_HUNDRED_ONLY 0x20000
// bits 1-4 use variant form of numbers before thousands,millions,etc.
// bits 6-8 use different forms of thousand, million, etc (M MA MB)
// bit9=(LANG=rw) say "thousand" and "million" before its number, not after
@@ -519,6 +520,7 @@ typedef struct {
// bit14=(LANG=ko) use myriads (groups of 4 digits) not thousands (groups of 3)
// bit15=(LANG=ne) speak (non-replaced) English numerals in English
// bit16=(LANG=si) say "%" before the number
+ // bit17=(LANG=ml) omit "one" before hundred only if there are no previous digits
int numbers2;
#define BREAK_THOUSANDS 0x49249248
@@ -579,7 +581,6 @@ typedef struct
const char *transpose_map;
char dictionary_name[40];
- char phon_out[500];
char phonemes_repeat[20];
int phonemes_repeat_count;
int phoneme_tab_ix;
@@ -721,7 +722,7 @@ int iswlower2(int c);
int iswupper2(int c);
int towlower2(unsigned int c);
int towupper2(unsigned int c);
-void GetTranslatedPhonemeString(char *phon_out, int n_phon_out, int phoneme_mode);
+const char *GetTranslatedPhonemeString(int phoneme_mode);
const char *WordToString2(unsigned int word);
ALPHABET *AlphabetFromChar(int c);
ALPHABET *AlphabetFromName(const char *name);
diff --git a/src/transldlg.cpp b/src/transldlg.cpp
index c75eda58..58c7507b 100644
--- a/src/transldlg.cpp
+++ b/src/transldlg.cpp
@@ -406,6 +406,7 @@ void TranslDlg::OnCommand(wxCommandEvent& event)
int translate_text = 0;
char buf[1000];
char phon_out[N_PH_LIST*2];
+ const char *phon_out2;
int clause_tone;
int clause_count;
int use_ipa = 0;
@@ -495,11 +496,11 @@ void TranslDlg::OnCommand(wxCommandEvent& event)
CalcPitches(translator,clause_tone);
CalcLengths(translator);
- GetTranslatedPhonemeString(translator->phon_out, sizeof(translator->phon_out), use_ipa);
+ phon_out2 = GetTranslatedPhonemeString(use_ipa);
if(clause_count++ > 0)
strcat(phon_out," ||");
- strcat(phon_out,translator->phon_out);
- t_phonetic->SetValue(wxString(translator->phon_out,wxConvUTF8));
+ strcat(phon_out, phon_out2);
+ t_phonetic->SetValue(wxString(phon_out2, wxConvUTF8));
if((n_ph_list + n_phoneme_list) >= N_PH_LIST)
{
diff --git a/src/voices.cpp b/src/voices.cpp
index c8888480..c78b0afb 100644
--- a/src/voices.cpp
+++ b/src/voices.cpp
@@ -178,7 +178,7 @@ static MNEM_TAB keyword_tab[] = {
#define N_VOICE_VARIANTS 12
const char variants_either[N_VOICE_VARIANTS] = {1,2,12,3,13,4,14,5,11,0};
-const char variants_male[N_VOICE_VARIANTS] = {1,2,3,4,5,0};
+const char variants_male[N_VOICE_VARIANTS] = {1,2,3,4,5,6,7,0};
const char variants_female[N_VOICE_VARIANTS] = {11,12,13,14,0};
const char *variant_lists[3] = {variants_either, variants_male, variants_female};
@@ -301,7 +301,7 @@ static espeak_VOICE *ReadVoiceFile(FILE *f_in, const char *fname, const char*lea
espeak_VOICE *voice_data;
int priority;
int age;
- int n_variants = 3; // default, number of variants of this voice before using another voice
+ int n_variants = 4; // default, number of variants of this voice before using another voice
int gender;
#ifdef PLATFORM_WINDOWS
@@ -1068,6 +1068,7 @@ voice_t *LoadVoice(const char *vname, int control)
if((ix = SelectPhonemeTableName(phonemes_name)) < 0)
{
fprintf(stderr,"Unknown phoneme table: '%s'\n",phonemes_name);
+ ix = 0;
}
voice->phoneme_tab_ix = ix;
new_translator->phoneme_tab_ix = ix;