mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-14 09:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source 
Conflicts:
	src/wave.cpp
This commit is contained in:
Reece H. Dunn
2013-10-22 15:57:24 +01:00
parent 0b4fa16f1a 4b0fd781cf
commit ccc732f5fe
41 changed files with 2156 additions and 1265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
phsource/ph_aragon
+6
View File
@@ -15,6 +15,12 @@ phoneme E
FMT(vowel/ee_1)
endphoneme
phoneme e#
vowel starttype #e endtype #e
length 200
ChangeIfStressed(e)
ChangePhoneme(NULL)
endphoneme
phoneme O
vowel starttype #o endtype #o
phsource/ph_dutch
+8
View File
@@ -286,3 +286,11 @@ phoneme z
CALL base/z
endphoneme
phoneme l
import_phoneme en/l
endphoneme
phoneme x2
import_phoneme af/x2
endphoneme
phsource/ph_english_us
+7 -5
View File
@@ -359,11 +359,13 @@ phoneme t
Vowelin f1=0 f2=1700 -300 300 f3=-100 80
Vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20
IF nextPhW(isVowel) AND nextPh(isUnstressed) AND NOT next2PhW(n) THEN
IF prevPhW(isVowel) THEN
ChangePhoneme(t#)
ELIF prevPhW(n) THEN
WAV(ustop/t, 60)
IF nextPhW(isVowel) AND nextPh(isUnstressed) THEN
IF NOT next2PhW(n) OR nextPhW(3:) THEN
IF prevPhW(isVowel) AND NOT prevPhW(aI@) THEN
ChangePhoneme(t#)
ELIF prevPhW(n) THEN
WAV(ustop/t, 60)
ENDIF
ENDIF
ENDIF
phsource/ph_malayalam
+41
View File
@@ -277,3 +277,44 @@ phoneme g#
endphoneme
// suggested by Prasenjit Sen, but perhaps not needed?
// ml_rules changes [p], [t], [k] to [b], [d], [g] in non-initial
// positions
phoneme p
import_phoneme consonants/p-
voicingswitch b
IF thisPh(isWordStart) THEN
CALL base/p
ELIF thisPh(isWordEnd) AND NOT thisPh(isFirstVowel) THEN
ChangePhoneme(b)
ENDIF
endphoneme
phoneme t
import_phoneme base/t[
voicingswitch d
IF thisPh(isWordStart) THEN
CALL base/t
ELIF thisPh(isWordEnd) AND NOT thisPh(isFirstVowel) THEN
ChangePhoneme(d)
ENDIF
endphoneme
phoneme k
import_phoneme consonants/k-
voicingswitch g
IF thisPh(isWordStart) THEN
CALL base/k
ELIF thisPh(isWordEnd) AND NOT thisPh(isFirstVowel) THEN
ChangePhoneme(g)
ENDIF
endphoneme
phsource/ph_manipuri
+95
View File
@@ -0,0 +1,95 @@
//====================================================
// Manipuri, inherits from Bengali
//====================================================
phoneme a
vowel starttype #a endtype #a
length 225
IF thisPh(isWordEnd) AND thisPh(isUnstressed) THEN
FMT(vowel/a#_2)
ENDIF
FMT(vowel/a_3)
endphoneme
phoneme i
vowel starttype #i endtype #i
length 210
FMT(vowel/i_6)
endphoneme
phoneme u
vowel starttype #u endtype #u
length 210
FMT(vowel/u)
endphoneme
phoneme e
vowel starttype #e endtype #e
length 210
FMT(vowel/e)
endphoneme
phoneme &
vowel starttype #a endtype #a
length 210
FMT(vowel/&_2)
endphoneme
phoneme o
vowel starttype #o endtype #o
length 210
IF nextPhW(w) THEN
length 170
ENDIF
FMT(vowel/o)
endphoneme
phoneme O
vowel starttype #o endtype #o
length 200
FMT(vowel/oo_5)
endphoneme
phoneme tS
vls pla afr sibilant
voicingswitch dZ
lengthmod 2
Vowelin f1=0 f2=2300 200 400 f3=-100 80
IF nextPh(isPause2) THEN
WAV(ustop/tsh_unasp2)
ENDIF
WAV(ustop/tsh_unasp2)
endphoneme
phoneme tS#
vls pla afr sibilant
voicingswitch dZ
lengthmod 2
Vowelin f1=0 f2=2300 200 400 f3=-100 80
IF nextPh(isPause2) THEN
WAV(ustop/tsh_)
ENDIF
WAV(ustop/tsh)
endphoneme
phoneme ~
virtual
endphoneme
phsource/ph_oriya
+105
View File
@@ -0,0 +1,105 @@
//====================================================
// Oriya, inherits from Bengali
//====================================================
phoneme V // inherent vowel, can be [O] or [o]
vowel flag1 starttype #o endtype #o
length 200
IF thisPh(isWordEnd) AND prevPhW(isNotVowel) THEN
ChangePhoneme(O)
ENDIF
endphoneme
phoneme a
vowel starttype #a endtype #a
length 225
IF thisPh(isWordEnd) AND thisPh(isUnstressed) THEN
FMT(vowel/a#_2)
ENDIF
FMT(vowel/a_3)
endphoneme
phoneme i
vowel starttype #i endtype #i
length 210
FMT(vowel/i_6)
endphoneme
phoneme u
vowel starttype #u endtype #u
length 210
FMT(vowel/u)
endphoneme
phoneme e
vowel starttype #e endtype #e
length 210
FMT(vowel/e)
endphoneme
phoneme &
vowel starttype #a endtype #a
length 210
FMT(vowel/&_2)
endphoneme
phoneme o
vowel starttype #o endtype #o
length 210
IF nextPhW(w) THEN
length 170
ENDIF
FMT(vowel/o)
endphoneme
phoneme O
vowel starttype #o endtype #o
length 200
FMT(vowel/oo_5)
endphoneme
phoneme tS
vls pla afr sibilant
voicingswitch dZ
lengthmod 2
Vowelin f1=0 f2=2300 200 400 f3=-100 80
IF nextPh(isPause2) THEN
WAV(ustop/tsh_unasp2)
ENDIF
WAV(ustop/tsh_unasp2)
endphoneme
phoneme tS#
vls pla afr sibilant
voicingswitch dZ
lengthmod 2
Vowelin f1=0 f2=2300 200 400 f3=-100 80
IF nextPh(isPause2) THEN
WAV(ustop/tsh_)
ENDIF
WAV(ustop/tsh)
endphoneme
phoneme ~
virtual
endphoneme
phsource/ph_vietnam_sgn
+16 -9
View File
@@ -6,44 +6,44 @@
phoneme 1 // ngang tone: level
stress
Tone(32, 34, envelope/p_level, NULL)
Tone(20,35, envelope/i_risefall,NULL) //40,5,envelope/p_level, NULL) //40 45
endphoneme
phoneme 2 // huyền tone: low falling
stress
Tone(35,20 , envelope/p_fall, NULL) //20
Tone(10,20 , envelope/p_fall, NULL) //20
endphoneme
phoneme 3 // sắc Tone(rising
stress
Tone(40,60, envelope/p_rise, NULL) // 25 50
Tone(45,80, envelope/p_rise, NULL) // 30 50
endphoneme
phoneme 4 // hỏi Tone(curve (dipping rising)
stress
Tone(30,50, envelope/p_rise, NULL) //envelope/vi_5amp) // 28,58
Tone(45,50, envelope/p_fallrise,envelope/vi_5amp) // 28,58
endphoneme
phoneme 5 // ngã tone: broken (creaking rising)
stress
Tone(30,50, envelope/p_rise, NULL) //20,80, envelope/p_214, envelope/vi_5amp) // 28,58
Tone(30,75, envelope/p_214, NULL) //20,80, envelope/p_214, envelope/vi_5amp) // 28,58
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(10,5, envelope/p_512,NULL) // envelope/vi_6amp)
Tone(20,25, envelope/p_512,NULL) // envelope/vi_6amp) 10 5
endphoneme
phoneme 7 // Tone(1 (ngang) at end of clause
stress
Tone(40, 20, envelope/p_fall, NULL)
Tone(40,42, envelope/p_fall, NULL) //20, 30, envelope/p_fall, NULL)
endphoneme
// Redefine the length of vowels
@@ -51,11 +51,13 @@ endphoneme
phoneme i
CALL vi/i
length 150
FMT(vowel/i#)
endphoneme
phoneme E
CALL vi/E
length 150
FMT(vowel/ee_1)
endphoneme
phoneme a:
@@ -76,8 +78,8 @@ endphoneme
phoneme O
CALL vi/O
length 150
FMT(vowel/0)
length 80
FMT(vowel/oo_1)
endphoneme
phoneme Oi
@@ -94,4 +96,9 @@ endphoneme
phoneme o
CALL vi/o
FMT(vowel/o_5)
endphoneme
phoneme @:I
CALL vi/@:I
FMT(vdiph/y#y)
endphoneme
phsource/phonemes
+5
View File
@@ -1934,6 +1934,11 @@ include ph_gujarati
phonemetable as bn
include ph_assamese
phonemetable or bn
include ph_oriya
phonemetable mni bn
include ph_manipuri