From 605ac80e0ac9f5db8b76dc0bd1edf0ab2adc5b80 Mon Sep 17 00:00:00 2001 From: jonsd Date: Mon, 14 Jan 2008 23:50:47 +0000 Subject: [PATCH] [1.30.12] Added new phoneme [J^] voiced palatal fricative. git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@124 d46cf337-b52f-0410-862d-fd96e6ae7743 --- dictsource/dict_phonemes | 16 +++---- dictsource/en_rules | 2 +- dictsource/es_rules | 18 +++++--- phsource/compile_report | 94 +++++++++++++++++++++------------------ phsource/ph_spanish | 19 +++++++- phsource/phonemes | 9 ++++ phsource/voc/j | Bin 0 -> 5806 bytes phsource/voc/j2 | Bin 0 -> 5805 bytes src/speak.cpp | 2 +- src/synthdata.cpp | 2 +- src/synthesize.cpp | 2 + 11 files changed, 101 insertions(+), 63 deletions(-) create mode 100644 phsource/voc/j create mode 100644 phsource/voc/j2 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 0000000000000000000000000000000000000000..fb7ed39ce06285ecca9f00170cfa69256fcf8ef9 GIT binary patch literal 5806 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 Ms{8dyi-ZCA--uelV*mgE literal 0 HcmV?d00001 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) {