mirror of
https://github.com/rhasspy/espeak-ng.git
synced 2026-11-18 18:50:25 +00:00
Merge branch 'development'
Conflicts: src/klatt.cpp
This commit is contained in:
+13
-2
@@ -123,10 +123,21 @@ phoneme ts
|
||||
endphoneme
|
||||
|
||||
|
||||
phoneme c
|
||||
import_phoneme consonants/c2
|
||||
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_unasp, 60)
|
||||
ENDIF
|
||||
WAV(ustop/tsh_unasp)
|
||||
endphoneme
|
||||
|
||||
phoneme tS#
|
||||
import_phoneme base/tS
|
||||
endphoneme
|
||||
|
||||
phoneme k
|
||||
import_phoneme consonants/k-
|
||||
|
||||
+5
-4
@@ -396,13 +396,13 @@ phoneme t.#
|
||||
lengthmod 2
|
||||
ipa ʈU+02B0
|
||||
voicingswitch d.#
|
||||
Vowelin f1=0 f2=1800 -300 300 f3=-400 80
|
||||
Vowelin f1=0 f2=1800 -300 300 f3=-200 80
|
||||
Vowelout f1=0 f2=1800 -300 250 f3=-400 80 rms=20 colr=2
|
||||
|
||||
IF nextPhW(t.#) THEN
|
||||
ChangePhoneme(t.)
|
||||
ENDIF
|
||||
WAV(ustop/th_rfx)
|
||||
WAV(ustop/th_rfx2, 80)
|
||||
endphoneme
|
||||
|
||||
phoneme d.
|
||||
@@ -430,14 +430,15 @@ phoneme d.#
|
||||
lengthmod 5
|
||||
ipa ɖU+02B0
|
||||
voicingswitch t.#
|
||||
Vowelin f1=1 f2=1800 -300 300 f3=-150 80
|
||||
Vowelin f1=1 f2=1800 -300 300 f3=-400 80
|
||||
Vowelout f1=1 f2=1800 -300 300 f3=-400 80 colr=2
|
||||
|
||||
IF PreVoicing THEN
|
||||
FMT(d/xdr)
|
||||
ENDIF
|
||||
|
||||
FMT(d/dr2, 50) addWav(ustop/th_rfx2, 80)
|
||||
FMT(d/dr) addWav(ustop/t)
|
||||
// FMT(d/dr) addWav(ustop/th_rfx)
|
||||
endphoneme
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -201,7 +201,7 @@ endphoneme
|
||||
|
||||
|
||||
phoneme R
|
||||
liquid trill rhotic
|
||||
liquid trill
|
||||
lengthmod 6
|
||||
IF prevPhW(isVowel) AND nextPhW(isVowel) THEN
|
||||
ChangePhoneme(*)
|
||||
|
||||
+4
-4
@@ -344,7 +344,7 @@ endphoneme
|
||||
|
||||
|
||||
phoneme R
|
||||
liquid rhotic
|
||||
liquid
|
||||
trill
|
||||
lengthmod 6
|
||||
ipa r
|
||||
@@ -357,7 +357,7 @@ phoneme R
|
||||
endphoneme
|
||||
|
||||
phoneme R2 // this is [R] from Slovak/Czech
|
||||
liquid rhotic
|
||||
liquid
|
||||
trill
|
||||
lengthmod 6
|
||||
ipa r
|
||||
@@ -367,7 +367,7 @@ phoneme R2 // this is [R] from Slovak/Czech
|
||||
endphoneme
|
||||
|
||||
phoneme R3 // Afrikaans
|
||||
liquid rhotic
|
||||
liquid
|
||||
trill
|
||||
lengthmod 6
|
||||
length 60
|
||||
@@ -394,7 +394,7 @@ endphoneme
|
||||
|
||||
|
||||
phoneme r" // uvular trill
|
||||
vcd uvl frc rhotic
|
||||
vcd uvl frc
|
||||
ipa ʀ
|
||||
lengthmod 6
|
||||
IF nextPh(isNotVowel) THEN
|
||||
|
||||
Reference in New Issue
Block a user