mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-07 15:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream' into development

Browse Source 
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
This commit is contained in:
Reece H. Dunn
2013-03-03 21:17:42 +00:00
parent c229b34ae2 1a0f4af8c5
commit ea65fda835
22 changed files with 484 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
phsource/ph_english
+1 -1
View File
@@ -162,7 +162,7 @@ endphoneme
phoneme @L
vowel starttype #@ endtype l
ipa əl
ipa ə|l
unstressed
length 160
CALL vowelstart_l
phsource/ph_english_sc
+16 -6
View File
@@ -168,7 +168,9 @@ phoneme A@ // Used for [A:] when followed by 'r', becomes [A:]+[r] in Ameri
vowel starttype #a endtype #@
length 250
ipa aː
AppendPhoneme(r)
IF NOT nextPhW(r) THEN
AppendPhoneme(r)
ENDIF
FMT(vowelr/aa_r)
endphoneme
@@ -211,7 +213,9 @@ phoneme O@
vowel starttype #o endtype #@
length 230
ipa ɔ
AppendPhoneme(r)
IF NOT nextPhW(r) THEN
AppendPhoneme(r)
ENDIF
FMT(vowelr/oo_r)
endphoneme
@@ -219,7 +223,9 @@ phoneme o@
vowel starttype #o endtype #@
length 230
ipa o
AppendPhoneme(r)
IF NOT nextPhW(r) THEN
AppendPhoneme(r)
ENDIF
FMT(vowelr/oo_r)
endphoneme
@@ -305,7 +311,9 @@ phoneme e@
vowel starttype #e endtype #@
length 220
ipa e
AppendPhoneme(r)
IF NOT nextPhW(r) THEN
AppendPhoneme(r)
ENDIF
FMT(vdiph2/e@)
endphoneme
@@ -314,7 +322,9 @@ phoneme i@3
vowel starttype #i endtype #@
ipa ɪ
length 240
AppendPhoneme(r)
IF NOT nextPhW(r) THEN
AppendPhoneme(r)
ENDIF
FMT(vowelr/i_r)
endphoneme
@@ -380,11 +390,11 @@ phoneme r
liquid rhotic
lengthmod 7
trill
IF nextPh(isNotVowel) THEN
ChangePhoneme(r/)
ENDIF
CALL base/r
ipa r
endphoneme
phsource/ph_english_us
+6 -6
View File
@@ -151,7 +151,7 @@ endphoneme
phoneme A@ // Used for [A:] when followed by 'r', becomes [A:]+[r] in American
vowel starttype #a endtype #a
ipa ɑːɹ
ipa ɑː|ɹ
IF nextPh(r-) THEN
ipa ɑː
ENDIF
@@ -192,7 +192,7 @@ endphoneme
phoneme O@
vowel starttype #o endtype #@
length 250
ipa ɔːɹ
ipa ɔː|ɹ
IF nextPhW(r) THEN
ipa ɔː
ENDIF
@@ -204,7 +204,7 @@ endphoneme
phoneme o@
vowel starttype #o endtype #@
length 250
ipa oːɹ
ipa oː|ɹ
IF nextPhW(r) THEN
ipa oː
ENDIF
@@ -269,7 +269,7 @@ endphoneme
phoneme e@
vowel starttype #e endtype #@
length 280
ipa ɛɹ
ipa ɛ|ɹ
IF nextPhW(r) THEN
ipa ɛ
ENDIF
@@ -288,7 +288,7 @@ endphoneme
phoneme i@3
vowel starttype #i endtype #@
length 280
ipa ɪɹ
ipa ɪ|ɹ
IF nextPhW(r) THEN
ipa ɪ
ENDIF
@@ -300,7 +300,7 @@ endphoneme
phoneme U@
vowel starttype #@ endtype #@
length 250
ipa ʊɹ
ipa ʊ|ɹ
IF nextPhW(r-) THEN
ipa ʊ
ENDIF