From b629cec68c40873a06661e3e6518019dddfaf56e Mon Sep 17 00:00:00 2001 From: jonsd Date: Tue, 3 May 2011 12:34:04 +0000 Subject: [PATCH] Update 'voices' to match eSpeak 1.45.04 git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@265 d46cf337-b52f-0410-862d-fd96e6ae7743 --- espeak-data/voices/!v/f2 | 5 ++++- espeak-data/voices/!v/f5 | 23 +++++++++++++++++++++++ espeak-data/voices/!v/klatt | 4 ++++ espeak-data/voices/!v/klatt2 | 4 ++++ espeak-data/voices/!v/klatt3 | 4 ++++ espeak-data/voices/!v/m1 | 17 +++++++++-------- espeak-data/voices/!v/m7 | 17 +++++++++++++++++ espeak-data/voices/!v/whisperf | 24 ++++++++++++++++++++++++ espeak-data/voices/af | 2 +- espeak-data/voices/da | 7 +++++++ espeak-data/voices/default | 2 -- espeak-data/voices/en/en | 6 +++--- espeak-data/voices/en/en-n | 2 +- espeak-data/voices/en/en-rp | 6 +++--- espeak-data/voices/en/en-sc | 2 +- espeak-data/voices/en/en-us | 8 ++++---- espeak-data/voices/en/en-wi | 6 +++--- espeak-data/voices/en/en-wm | 2 +- espeak-data/voices/es-la | 2 +- espeak-data/voices/fr | 3 +-- espeak-data/voices/fr-be | 3 ++- espeak-data/voices/hu | 4 ++++ espeak-data/voices/ka | 2 ++ espeak-data/voices/kn | 5 +++++ espeak-data/voices/mb/mb-br4 | 9 +++++++++ espeak-data/voices/mb/mb-ic1 | 6 ++++++ espeak-data/voices/mb/mb-pt1 | 9 +++++++++ espeak-data/voices/mb/mb-tr1 | 7 +++++++ espeak-data/voices/mb/mb-tr2 | 8 ++++++++ espeak-data/voices/mb/mb-us1 | 2 +- espeak-data/voices/mb/mb-us2 | 2 +- espeak-data/voices/mb/mb-us3 | 2 +- espeak-data/voices/ml | 6 ++++++ espeak-data/voices/no | 2 +- espeak-data/voices/pt-pt | 2 +- espeak-data/voices/test/grc | 8 ++++++++ espeak-data/voices/test/jbo | 4 ++++ espeak-data/voices/test/nci | 7 +++++++ espeak-data/voices/test/pap | 5 +++++ espeak-data/voices/vi | 2 +- espeak-data/voices/zh-yue | 2 +- 41 files changed, 204 insertions(+), 39 deletions(-) create mode 100644 espeak-data/voices/!v/f5 create mode 100644 espeak-data/voices/!v/klatt create mode 100644 espeak-data/voices/!v/klatt2 create mode 100644 espeak-data/voices/!v/klatt3 create mode 100755 espeak-data/voices/!v/m7 create mode 100644 espeak-data/voices/!v/whisperf create mode 100755 espeak-data/voices/da create mode 100644 espeak-data/voices/ka create mode 100755 espeak-data/voices/kn create mode 100644 espeak-data/voices/mb/mb-br4 create mode 100644 espeak-data/voices/mb/mb-ic1 create mode 100644 espeak-data/voices/mb/mb-pt1 create mode 100755 espeak-data/voices/mb/mb-tr1 create mode 100644 espeak-data/voices/mb/mb-tr2 create mode 100755 espeak-data/voices/ml create mode 100755 espeak-data/voices/test/grc create mode 100644 espeak-data/voices/test/jbo create mode 100644 espeak-data/voices/test/nci create mode 100644 espeak-data/voices/test/pap diff --git a/espeak-data/voices/!v/f2 b/espeak-data/voices/!v/f2 index fcdf309e..4122d96b 100755 --- a/espeak-data/voices/!v/f2 +++ b/espeak-data/voices/!v/f2 @@ -3,6 +3,8 @@ name female2 gender female pitch 142 220 +roughness 3 + formant 0 105 80 150 formant 1 110 80 160 formant 2 110 70 150 @@ -15,4 +17,5 @@ formant 8 110 70 150 stressAdd 0 0 -10 -10 0 0 10 40 breath 0 2 3 3 3 3 3 2 -echo 140 12 +echo 140 10 +consonants 125 125 diff --git a/espeak-data/voices/!v/f5 b/espeak-data/voices/!v/f5 new file mode 100644 index 00000000..14116088 --- /dev/null +++ b/espeak-data/voices/!v/f5 @@ -0,0 +1,23 @@ +language variant +name female2 +gender female + +pitch 160 228 +roughness 0 + +formant 0 105 80 150 +formant 1 110 80 160 +formant 2 110 70 150 +formant 3 110 70 150 +formant 4 115 80 200 +formant 5 115 80 100 +formant 6 110 70 150 +formant 7 110 70 100 +formant 8 110 70 150 + +stressAdd 0 0 -10 -10 0 0 10 40 +breath 0 4 6 6 6 6 0 10 +echo 140 10 +voicing 75 +consonants 150 150 +breathw 150 150 200 200 400 400 diff --git a/espeak-data/voices/!v/klatt b/espeak-data/voices/!v/klatt new file mode 100644 index 00000000..b739a86e --- /dev/null +++ b/espeak-data/voices/!v/klatt @@ -0,0 +1,4 @@ +language variant +name klatt +klatt 1 + diff --git a/espeak-data/voices/!v/klatt2 b/espeak-data/voices/!v/klatt2 new file mode 100644 index 00000000..01477be5 --- /dev/null +++ b/espeak-data/voices/!v/klatt2 @@ -0,0 +1,4 @@ +language variant +name klatt2 +klatt 2 + diff --git a/espeak-data/voices/!v/klatt3 b/espeak-data/voices/!v/klatt3 new file mode 100644 index 00000000..b1a874be --- /dev/null +++ b/espeak-data/voices/!v/klatt3 @@ -0,0 +1,4 @@ +language variant +name klatt3 +klatt 3 + diff --git a/espeak-data/voices/!v/m1 b/espeak-data/voices/!v/m1 index 57603a88..ee3bd233 100755 --- a/espeak-data/voices/!v/m1 +++ b/espeak-data/voices/!v/m1 @@ -2,18 +2,19 @@ language variant name male1 gender male 70 -pitch 74 109 +pitch 75 109 flutter 4 roughness 4 +consonants 80 100 -formant 0 98 95 100 -formant 1 97 95 100 +formant 0 98 100 100 +formant 1 97 100 100 formant 2 97 95 100 -formant 3 97 100 100 -formant 4 97 100 100 -formant 5 105 100 100 -formant 6 95 100 100 +formant 3 97 95 100 +formant 4 97 85 100 +formant 5 105 80 100 +formant 6 95 80 100 formant 7 100 100 100 formant 8 100 100 100 -stressAdd -10 -10 -20 -20 0 0 40 70 +//stressAdd -10 -10 -20 -20 0 0 40 70 diff --git a/espeak-data/voices/!v/m7 b/espeak-data/voices/!v/m7 new file mode 100755 index 00000000..84ccc3a6 --- /dev/null +++ b/espeak-data/voices/!v/m7 @@ -0,0 +1,17 @@ +language variant +name Test + +pitch 75 125 + +formant 0 100 125 100 +formant 1 100 90 80 +formant 2 100 70 90 +formant 3 100 60 90 +formant 4 100 60 90 +formant 5 75 50 90 +formant 6 90 50 100 +formant 7 100 50 100 +formant 8 100 50 100 +voicing 155 +fast_test 0 45 75 + diff --git a/espeak-data/voices/!v/whisperf b/espeak-data/voices/!v/whisperf new file mode 100644 index 00000000..3102c9a1 --- /dev/null +++ b/espeak-data/voices/!v/whisperf @@ -0,0 +1,24 @@ +language variant +name female whisper +gender female + +pitch 160 220 +roughness 3 + +formant 0 105 0 150 +formant 1 110 40 160 +formant 2 110 70 150 +formant 3 110 70 150 +formant 4 115 80 150 +formant 5 115 80 150 +formant 6 110 70 150 +formant 7 110 70 150 +formant 8 110 70 150 + +stressAdd 0 0 -10 -10 0 0 10 40 + +// whisper +voicing 20 +breath 75 75 50 40 15 10 +breathw 150 150 200 200 400 400 + diff --git a/espeak-data/voices/af b/espeak-data/voices/af index be22ac78..bcbb2a00 100755 --- a/espeak-data/voices/af +++ b/espeak-data/voices/af @@ -2,7 +2,7 @@ name afrikaans language af gender male roughness 0 -pitch 60 122 +pitch 63 120 diff --git a/espeak-data/voices/da b/espeak-data/voices/da new file mode 100755 index 00000000..12ce1096 --- /dev/null +++ b/espeak-data/voices/da @@ -0,0 +1,7 @@ +name danish +language da +gender male + +tunes s2 c2 q2 e2 + + diff --git a/espeak-data/voices/default b/espeak-data/voices/default index 7accc8b2..b2fd9d08 100755 --- a/espeak-data/voices/default +++ b/espeak-data/voices/default @@ -2,5 +2,3 @@ name default language en gender male -formant 0 100 100 110 - diff --git a/espeak-data/voices/en/en b/espeak-data/voices/en/en index dc6a60cf..255fe35c 100755 --- a/espeak-data/voices/en/en +++ b/espeak-data/voices/en/en @@ -3,9 +3,9 @@ language en-uk 2 language en 2 gender male -//pitch 80 117 - replace 03 I i replace 03 I2 i -formant 0 100 100 105 +//pitch 80 118 + +tunes s1 c1 q1 e1 diff --git a/espeak-data/voices/en/en-n b/espeak-data/voices/en/en-n index 933311da..3e520ec5 100755 --- a/espeak-data/voices/en/en-n +++ b/espeak-data/voices/en/en-n @@ -3,7 +3,7 @@ language en-uk-north language en-uk 3 gender male -phonemes en_n +phonemes en-n stressLength 160 150 180 180 220 220 290 290 diff --git a/espeak-data/voices/en/en-rp b/espeak-data/voices/en/en-rp index 3489f28a..118095eb 100755 --- a/espeak-data/voices/en/en-rp +++ b/espeak-data/voices/en/en-rp @@ -3,10 +3,10 @@ language en-uk-rp language en-uk 4 gender male -phonemes en_rp +phonemes en-rp replace 00 o@ O@ replace 00 i@3 i@ replace 03 I i replace 03 I2 i -replace 03 @ a2 -replace 03 3 a2 +replace 03 @ a# +replace 03 3 a# diff --git a/espeak-data/voices/en/en-sc b/espeak-data/voices/en/en-sc index e16ae25a..e0783ec3 100755 --- a/espeak-data/voices/en/en-sc +++ b/espeak-data/voices/en/en-sc @@ -3,7 +3,7 @@ language en-sc language en 4 gender male -phonemes en_sc +phonemes en-sc dictrules 5 6 7 stressLength 180 130 200 200 0 0 250 270 diff --git a/espeak-data/voices/en/en-us b/espeak-data/voices/en/en-us index c2656b28..e0ea6d63 100755 --- a/espeak-data/voices/en/en-us +++ b/espeak-data/voices/en/en-us @@ -5,12 +5,12 @@ language en-r language en 3 gender male -phonemes en_us +phonemes en-us dictrules 3 6 -option 12 1 // reduce [t] +option reduce_t 1 -stressLength 145 125 170 170 0 0 265 290 -stressAmp 17 16 20 20 20 22 22 20 +stressLength 145 125 190 170 0 0 260 290 +stressAmp 17 16 19 19 19 19 21 19 replace 03 I i replace 03 I2 i diff --git a/espeak-data/voices/en/en-wi b/espeak-data/voices/en/en-wi index 28a42a56..89e6c829 100755 --- a/espeak-data/voices/en/en-wi +++ b/espeak-data/voices/en/en-wi @@ -3,7 +3,7 @@ language en-wi language en-uk 4 gender male -phonemes en_wi +phonemes en-wi dictrules 8 stressLength 175 175 175 175 220 220 250 290 @@ -11,8 +11,8 @@ replace 00 D d replace 00 T t[ replace 00 U@ o@ replace 00 i@3 i@ -replace 03 @ a2 -replace 03 3 a2 +replace 03 @ a# +replace 03 3 a# replace 03 N n formant 1 98 100 100 diff --git a/espeak-data/voices/en/en-wm b/espeak-data/voices/en/en-wm index aa82f88f..8298f987 100755 --- a/espeak-data/voices/en/en-wm +++ b/espeak-data/voices/en/en-wm @@ -2,7 +2,7 @@ name english_wmids language en-uk-wmids gender male -phonemes en_wm +phonemes en-wm replace 00 h NULL replace 00 o@ O@ diff --git a/espeak-data/voices/es-la b/espeak-data/voices/es-la index c326c46f..daef5160 100755 --- a/espeak-data/voices/es-la +++ b/espeak-data/voices/es-la @@ -3,7 +3,7 @@ language es-la language es-mx 6 gender male -phonemes es_la +phonemes es-la dictrules 2 intonation 2 stressLength 170 200 180 180 0 0 250 280 diff --git a/espeak-data/voices/fr b/espeak-data/voices/fr index 97307316..a372fb17 100755 --- a/espeak-data/voices/fr +++ b/espeak-data/voices/fr @@ -3,5 +3,4 @@ name french gender male dictrules 1 -intonation 3 - +tunes s3 c3 q3 e3 diff --git a/espeak-data/voices/fr-be b/espeak-data/voices/fr-be index cba9b275..a656d2c7 100755 --- a/espeak-data/voices/fr-be +++ b/espeak-data/voices/fr-be @@ -3,5 +3,6 @@ name french (Belgium) gender male dictrules 2 -intonation 3 +tunes s3 c3 q3 e3 + diff --git a/espeak-data/voices/hu b/espeak-data/voices/hu index ba2bdde4..25d78c05 100755 --- a/espeak-data/voices/hu +++ b/espeak-data/voices/hu @@ -1,3 +1,7 @@ name hungarian language hu gender male +option bracket 0 0 +pitch 81 117 + + diff --git a/espeak-data/voices/ka b/espeak-data/voices/ka new file mode 100644 index 00000000..bc2def28 --- /dev/null +++ b/espeak-data/voices/ka @@ -0,0 +1,2 @@ +name georgian-test +language ka diff --git a/espeak-data/voices/kn b/espeak-data/voices/kn new file mode 100755 index 00000000..ced1b1fa --- /dev/null +++ b/espeak-data/voices/kn @@ -0,0 +1,5 @@ +name kannada +language kn + +intonation 2 +//consonants 80 diff --git a/espeak-data/voices/mb/mb-br4 b/espeak-data/voices/mb/mb-br4 new file mode 100644 index 00000000..d3d77200 --- /dev/null +++ b/espeak-data/voices/mb/mb-br4 @@ -0,0 +1,9 @@ +language pt 7 +name brazil-mbrola-4 +gender female +pitch 140 220 + +dictrules 2 3 4 + +mbrola br4 ptbr4_phtrans + diff --git a/espeak-data/voices/mb/mb-ic1 b/espeak-data/voices/mb/mb-ic1 new file mode 100644 index 00000000..19fd69d3 --- /dev/null +++ b/espeak-data/voices/mb/mb-ic1 @@ -0,0 +1,6 @@ +name mbrola-icelandic +language is 6 +gender male + +mbrola ic1 ic1_phtrans + diff --git a/espeak-data/voices/mb/mb-pt1 b/espeak-data/voices/mb/mb-pt1 new file mode 100644 index 00000000..ebd92ffb --- /dev/null +++ b/espeak-data/voices/mb/mb-pt1 @@ -0,0 +1,9 @@ +language pt 7 +name portugal-mbrola-1 +gender female +pitch 140 220 + +dictrules 1 + +mbrola pt1 pt1_phtrans + diff --git a/espeak-data/voices/mb/mb-tr1 b/espeak-data/voices/mb/mb-tr1 new file mode 100755 index 00000000..97a337d3 --- /dev/null +++ b/espeak-data/voices/mb/mb-tr1 @@ -0,0 +1,7 @@ +name turkish-mbrola-1 +language tr 7 +gender male + +mbrola tr1 tr1_phtrans +dictrules 1 + diff --git a/espeak-data/voices/mb/mb-tr2 b/espeak-data/voices/mb/mb-tr2 new file mode 100644 index 00000000..9b06e0bd --- /dev/null +++ b/espeak-data/voices/mb/mb-tr2 @@ -0,0 +1,8 @@ +name turkish-mbrola-1 +language tr 7 +gender female + +pitch 140 220 +mbrola tr2 tr1_phtrans +dictrules 1 + diff --git a/espeak-data/voices/mb/mb-us1 b/espeak-data/voices/mb/mb-us1 index c62589be..3dd75260 100755 --- a/espeak-data/voices/mb/mb-us1 +++ b/espeak-data/voices/mb/mb-us1 @@ -3,7 +3,7 @@ language en-us language en 8 gender female -phonemes en_us +phonemes en-us dictrules 3 6 stressLength 170 135 205 205 0 0 245 275 diff --git a/espeak-data/voices/mb/mb-us2 b/espeak-data/voices/mb/mb-us2 index d94fce5a..f9624b31 100755 --- a/espeak-data/voices/mb/mb-us2 +++ b/espeak-data/voices/mb/mb-us2 @@ -3,7 +3,7 @@ language en-us language en 7 gender male -phonemes en_us +phonemes en-us dictrules 3 6 stressLength 170 135 205 205 0 0 245 275 diff --git a/espeak-data/voices/mb/mb-us3 b/espeak-data/voices/mb/mb-us3 index 645e1b7d..740601d1 100755 --- a/espeak-data/voices/mb/mb-us3 +++ b/espeak-data/voices/mb/mb-us3 @@ -3,7 +3,7 @@ language en-us language en 8 gender male -phonemes en_us +phonemes en-us dictrules 3 6 stressLength 170 135 205 205 0 0 245 275 diff --git a/espeak-data/voices/ml b/espeak-data/voices/ml new file mode 100755 index 00000000..45bdf852 --- /dev/null +++ b/espeak-data/voices/ml @@ -0,0 +1,6 @@ +name malayalam +language ml +gender male + +intonation 2 +//consonants 80 diff --git a/espeak-data/voices/no b/espeak-data/voices/no index 77b60b96..a90c7b72 100755 --- a/espeak-data/voices/no +++ b/espeak-data/voices/no @@ -1,4 +1,4 @@ -name norwegian-test +name norwegian language no language nb gender male diff --git a/espeak-data/voices/pt-pt b/espeak-data/voices/pt-pt index e23915f3..d506e7f9 100755 --- a/espeak-data/voices/pt-pt +++ b/espeak-data/voices/pt-pt @@ -1,7 +1,7 @@ name portugal language pt-pt gender male -phonemes pt_pt +phonemes pt-pt dictrules 1 intonation 2 diff --git a/espeak-data/voices/test/grc b/espeak-data/voices/test/grc new file mode 100755 index 00000000..ffa94206 --- /dev/null +++ b/espeak-data/voices/test/grc @@ -0,0 +1,8 @@ +name greek-ancient +language grc +gender male + +stressLength 170 170 190 190 0 0 230 240 +dictrules 1 +words 3 + diff --git a/espeak-data/voices/test/jbo b/espeak-data/voices/test/jbo new file mode 100644 index 00000000..f43ef84f --- /dev/null +++ b/espeak-data/voices/test/jbo @@ -0,0 +1,4 @@ +name lojban +language jbo + +speed 80 // speed adjustment, percentage diff --git a/espeak-data/voices/test/nci b/espeak-data/voices/test/nci new file mode 100644 index 00000000..d0864f3d --- /dev/null +++ b/espeak-data/voices/test/nci @@ -0,0 +1,7 @@ +name nahuatl - classical +language nci +gender male + +intonation 3 +stressrule 2 +stressLength 190 190 200 200 0 0 220 240 diff --git a/espeak-data/voices/test/pap b/espeak-data/voices/test/pap new file mode 100644 index 00000000..3b105a7f --- /dev/null +++ b/espeak-data/voices/test/pap @@ -0,0 +1,5 @@ +name papiamento-test +language pap + +phonemes base2 + diff --git a/espeak-data/voices/vi b/espeak-data/voices/vi index 1596e3c7..dbd23b56 100755 --- a/espeak-data/voices/vi +++ b/espeak-data/voices/vi @@ -1,4 +1,4 @@ -name vietnam-test +name vietnam language vi gender male diff --git a/espeak-data/voices/zh-yue b/espeak-data/voices/zh-yue index ba872326..0269a98a 100755 --- a/espeak-data/voices/zh-yue +++ b/espeak-data/voices/zh-yue @@ -1,4 +1,4 @@ -name cantonese-test +name cantonese language zh-yue language yue language zhy