mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 05:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[1.30.12] Added new phoneme [J^] voiced palatal fricative.

Browse Source 
git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@124 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2008-01-14 23:50:47 +00:00
parent ee4cb049f5
commit 605ac80e0a
11 changed files with 101 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dictsource/dict_phonemes
+8 -8
View File
@@ -92,9 +92,9 @@ Dictionary es_dict
o oI u
* b B d D f g j
k l l^ m n n^ p Q
r R s t T tS v w
x
J J^ k l l^ m n n^
p Q r R s t T tS
v w x
Dictionary fi_dict
@@ -274,8 +274,8 @@ Dictionary pt_dict
& &/ &U~ &~ @ @- a A
aI aU e E eI EI eU EU
e~ i i/ iU o O oI OI
o~ u U uI u~ y
i i/ iU o O oI OI o~
u U uI u~ y
* : ; b C d dZ f
g h j k l l^ m n
@@ -369,9 +369,9 @@ p s t
Dictionary hbs_dict
& @ @2 a A a: aI aU
E e e: E~ i I i: l-
O o o: oU r* r- u U
u: y
E e e: i I i: l- O
o o: oU r* r- u U u:
y
* b d dZ dZ; f g h
j k l L l^ m n N
dictsource/en_rules
+1 -1
View File
@@ -3643,7 +3643,7 @@
g) on (e 0n
&) on (er_ @n
ph) on (eti @n
h) oney VnI2
_h) oney VnI2
n) on (e 0n
m) one (ta VnI
_) one (r oUn@
dictsource/es_rules
+11 -7
View File
@@ -87,7 +87,7 @@
.group l
_) l (_ Ele
l l
ll jj
ll J^
.group m
@@ -155,15 +155,15 @@
.group v
_) v (_ uve
v v
_) v v
m) v v
n) v v
_) v (_ uBe
v B
_) v b
m) v b
n) v b
.group w
_) w (_ ,uve||d'oBle
_) w (_ ,uBe||d'oBle
w w
@@ -177,6 +177,10 @@
.group y
_) y (_ ,ig@-*'iEQa
y i
_) y J
_m) y J
_n) y J
_l) y J
y (A j
phsource/compile_report
+50 -44
View File
@@ -1,49 +1,49 @@
44 phoneme tables
new total
base 96 96
base2 24 115
en 53 144
en_n 30 144
en_us 37 144
en_sc 39 146
en_rp 34 144
en_wm 30 144
en_wi 30 144
af 38 128
cy 29 122
de 33 123
eo 13 108
jbo 4 109
fi 40 127
fr 35 119
fr_ca 11 119
hi 50 132
ta 13 134
hu 23 112
nl 28 119
pl 15 107
sk 29 125
cs 6 125
hr 20 130
mk 3 131
sr 14 130
ru 38 126
it 17 118
la 21 114
es 7 115
pt 27 131
pt_pt 20 131
ro 36 139
el 8 115
grc 12 120
sv 25 118
no 28 122
is 32 121
vi 42 134
zhy 40 129
zh 61 143
sw 14 105
th 50 139
base 97 97
base2 24 116
en 53 145
en_n 30 145
en_us 37 145
en_sc 39 147
en_rp 34 145
en_wm 30 145
en_wi 30 145
af 38 129
cy 29 123
de 33 124
eo 13 109
jbo 4 110
fi 40 128
fr 35 120
fr_ca 11 120
hi 50 133
ta 13 135
hu 23 113
nl 28 120
pl 15 108
sk 29 126
cs 6 126
hr 20 131
mk 3 132
sr 14 131
ru 38 127
it 17 119
la 21 115
es 9 118
pt 27 132
pt_pt 20 132
ro 36 140
el 8 116
grc 12 121
sv 25 119
no 28 123
is 32 122
vi 42 135
zhy 40 130
zh 61 144
sw 14 106
th 50 140
Data file Used by
b/b [b] base
@@ -515,7 +515,10 @@ r/xr [(@)] base
[(o)] base
[(u)] base
ufric/ch [C] base
[J^] base
[C2] de
[J2] es
[J3] es
ufric/ch_sr [h] sr
[x] sr
ufric/f [f] base
@@ -1025,6 +1028,9 @@ voc/dh [D] base
[D] es
voc/dh_ [D] base
[D] es
voc/j [J^] base
[J3] es
voc/j2 [J2] es
voc/Q [Q] base
[Q^] base
voc/Q_ [Q] base
phsource/ph_spanish
+18 -1
View File
@@ -56,7 +56,7 @@ phoneme s
endphoneme
phoneme v
phoneme v // TEST
vcd lbd frc
vowelin f1=0 f2=1000 -300 -200 f3=-300 100
vowelout f1=0 f2=1000 -500 -300 f3=-300 60 len=50
@@ -64,5 +64,22 @@ phoneme v
formants voc/v2+vocw/v // shorter
endphoneme
phoneme J2 // TEST palatal fricative (Kirshenbaum C<vcd>)
vcd pal frc palatal
vowelin f1=2 f2=2700 400 600 f3=200 70
vowelout f1=2 f2=2700 400 600 f3=200 70 len=100
lengthmod 6
formants voc/j2+ufric/ch%50
endphoneme
phoneme J3 // TEST palatal fricative (Kirshenbaum C<vcd>)
vcd pal frc palatal
vowelin f1=2 f2=2700 400 600 f3=200 70
vowelout f1=2 f2=2700 400 600 f3=200 70 len=100
lengthmod 6
formants voc/j+ufric/ch%5
endphoneme
phsource/phonemes
+9
View File
@@ -848,6 +848,15 @@ phoneme Z;
endphoneme
phoneme J^ // palatal fricative (Kirshenbaum C<vcd>)
vcd pal frc palatal
vowelin f1=2 f2=2700 400 600 f3=200 70
vowelout f1=2 f2=2700 400 600 f3=200 70 len=100
lengthmod 6
formants voc/j+ufric/ch%25
endphoneme
phoneme Q
phsource/voc/j
BIN
View File
Binary file not shown.
phsource/voc/j2
BIN
View File
Binary file not shown.
src/speak.cpp
+1 -1
View File
@@ -313,7 +313,7 @@ static int WavegenFile(void)
if(end_of_sentence)
{
end_of_sentence = 0;
if(samples_total > samples_split)
if((samples_split > 0 ) && (samples_total > samples_split))
{
CloseWaveFile();
samples_total = 0;
src/synthdata.cpp
+1 -1
View File
@@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"
const char *version_string = "1.30.11 13.Jan.08";
const char *version_string = "1.30.12 14.Jan.08";
const int version_phdata = 0x013010;
int option_device_number = -1;
src/synthesize.cpp
+2
View File
@@ -579,6 +579,8 @@ static short vcolouring[N_VCOLOUR][5] = {
else
{
fr = DuplicateLastFrame(seq,n_frames++,len);
if(len > 36)
seq_len_adjust += (len - 36);
if(f2 != 0)
{