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

@@ -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

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 

espeak-data/voices/!v/klatt

@@ -0,0 +1,4 @@
+language variant
+name klatt
+klatt 1
+ 

espeak-data/voices/!v/klatt2

@@ -0,0 +1,4 @@
+language variant
+name klatt2
+klatt 2
+

espeak-data/voices/!v/klatt3

@@ -0,0 +1,4 @@
+language variant
+name klatt3
+klatt 3
+ 

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

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
+

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
+ 

espeak-data/voices/af

@@ -2,7 +2,7 @@ name afrikaans
 language af
 gender male
 roughness 0
-pitch 60 122
+pitch 63 120
 
 
 

espeak-data/voices/da

@@ -0,0 +1,7 @@
+name danish
+language da
+gender male
+
+tunes s2 c2 q2 e2
+
+

espeak-data/voices/default

@@ -2,5 +2,3 @@ name default
 language en
 gender male
 
-formant 0 100 100 110
-

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

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
 

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#

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
 

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

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

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@

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

espeak-data/voices/fr

@@ -3,5 +3,4 @@ name french
 gender male
 
 dictrules 1
-intonation 3
-
+tunes s3 c3 q3 e3

espeak-data/voices/fr-be

@@ -3,5 +3,6 @@ name french (Belgium)
 gender male
 
 dictrules 2
-intonation 3
+tunes s3 c3 q3 e3
+
 

espeak-data/voices/hu

@@ -1,3 +1,7 @@
 name hungarian
 language hu
 gender male
+option bracket 0 0
+pitch 81 117
+
+

espeak-data/voices/ka

@@ -0,0 +1,2 @@
+name georgian-test
+language ka

espeak-data/voices/kn

@@ -0,0 +1,5 @@
+name kannada
+language kn
+
+intonation 2
+//consonants 80

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
+

espeak-data/voices/mb/mb-ic1

@@ -0,0 +1,6 @@
+name mbrola-icelandic
+language is 6
+gender male
+
+mbrola ic1 ic1_phtrans
+ 

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
+

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
+

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
+

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

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

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

espeak-data/voices/ml

@@ -0,0 +1,6 @@
+name malayalam
+language ml
+gender male
+
+intonation 2
+//consonants 80

espeak-data/voices/no

@@ -1,4 +1,4 @@
-name norwegian-test
+name norwegian
 language no
 language nb
 gender male

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

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
+

espeak-data/voices/test/jbo

@@ -0,0 +1,4 @@
+name lojban
+language jbo
+
+speed 80   // speed adjustment, percentage

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

espeak-data/voices/test/pap

@@ -0,0 +1,5 @@
+name papiamento-test
+language pap
+
+phonemes base2
+

espeak-data/voices/vi

@@ -1,4 +1,4 @@
-name vietnam-test
+name vietnam
 language vi
 gender male
 

espeak-data/voices/zh-yue

@@ -1,4 +1,4 @@
-name cantonese-test
+name cantonese
 language zh-yue
 language yue
 language zhy