diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes index d3bca88d..24e049e4 100644 --- a/dictsource/dict_phonemes +++ b/dictsource/dict_phonemes @@ -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 diff --git a/dictsource/en_rules b/dictsource/en_rules index a9a81941..de046c1d 100644 --- a/dictsource/en_rules +++ b/dictsource/en_rules @@ -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@ diff --git a/dictsource/es_rules b/dictsource/es_rules index 82272aff..13cdf822 100644 --- a/dictsource/es_rules +++ b/dictsource/es_rules @@ -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 diff --git a/phsource/compile_report b/phsource/compile_report index 059d2376..23439021 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -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 diff --git a/phsource/ph_spanish b/phsource/ph_spanish index 166874fa..bd9226df 100644 --- a/phsource/ph_spanish +++ b/phsource/ph_spanish @@ -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 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 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 + + diff --git a/phsource/phonemes b/phsource/phonemes index 96f6ab95..ae0b3b21 100644 --- a/phsource/phonemes +++ b/phsource/phonemes @@ -848,6 +848,15 @@ phoneme Z; endphoneme +phoneme J^ // palatal fricative (Kirshenbaum C) + 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 diff --git a/phsource/voc/j b/phsource/voc/j new file mode 100644 index 00000000..fb7ed39c Binary files /dev/null and b/phsource/voc/j differ diff --git a/phsource/voc/j2 b/phsource/voc/j2 new file mode 100644 index 00000000..a122e1a3 Binary files /dev/null and b/phsource/voc/j2 differ diff --git a/src/speak.cpp b/src/speak.cpp index cc23eb96..e77fb790 100755 --- a/src/speak.cpp +++ b/src/speak.cpp @@ -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; diff --git a/src/synthdata.cpp b/src/synthdata.cpp index 8bba1af3..77b915e4 100755 --- a/src/synthdata.cpp +++ b/src/synthdata.cpp @@ -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; diff --git a/src/synthesize.cpp b/src/synthesize.cpp index 319fadf8..48801e6a 100755 --- a/src/synthesize.cpp +++ b/src/synthesize.cpp @@ -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) {