Merge branch 'development'

espeak-data/voices/test/ko

@@ -0,0 +1,8 @@
+name Korean
+language ko
+gender male
+pitch 80 118
+intonation 2
+
+tunes q1 q1 q1 q1
+

espeak-data/voices/test/tt

@@ -0,0 +1,3 @@
+name tatar-test
+language tt
+ 

phsource/ph_irish

@@ -1,63 +1,88 @@
-// Irish Phonemes
-// written by Ronan McGuirk
-// April-June  2012 version 1.0
 
-//====================================================
-//====================================================
+// short vowels
+
+
+phoneme @
+  vowel starttype #@ endtype #@
+  length 120
+  FMT(vowel/@)
+endphoneme
 
 
 phoneme a
   vowel starttype #a endtype #a
-  length 180
+  length 200
   FMT(vowel/a_4)
 endphoneme
 
+phoneme a#
+  vowel starttype #@ endtype #@
+  length 120
+  ChangeIfStressed(a)
+  FMT(vowel/a#_3)
+endphoneme
+
+
 phoneme E
   vowel  starttype #e  endtype #e
   length 140
-  FMT(vowel/ee_5)
+  FMT(vowel/e_mid)
 endphoneme
 
+phoneme E#
+  vowel  starttype #@  endtype #@
+  length 120
+  ChangeIfStressed(E)
+  FMT(vowel/@)
+endphoneme
+
+
 phoneme I
   vowel  starttype #i  endtype #i
-  length 110
+  length 120
   IfNextVowelAppend(;)
   FMT(vowel/ii_2)
 endphoneme
-phoneme i   //  optional variant of [I] for end of words
-  vowel  starttype #i  endtype #i
-  ipa ?
-  length 50
-  FMT(vowel/ii_7)
+
+phoneme I#
+  vowel  starttype #@  endtype #@
+  length 120
+  ChangeIfStressed(I)
+  IfNextVowelAppend(;)
+  FMT(vowel/@)
 endphoneme
 
 
 
 phoneme O
   vowel starttype #o endtype #o
-  length 190
-  FMT(vowel/oo)
+  length 140
+  FMT(vowel/oo_4)
 endphoneme
 
+phoneme O#
+  vowel starttype #@ endtype #@
+  length 120
+  ChangeIfStressed(O)
+  FMT(vowel/@)
+endphoneme
+
+
 phoneme U
   vowel starttype #u endtype #u
-  length 180
-  FMT(vowel/u_bck2)
+  length 140
+  FMT(vowel/uu)
 endphoneme
-phoneme u1
-  vowel starttype #u endtype #u
-  length 50
-  FMT(vowel/u)
+
+phoneme U#
+  vowel starttype #@ endtype #@
+  length 120
+  ChangeIfStressed(U)
+  FMT(vowel/@)
 endphoneme
 
 
-phoneme 0
-  vowel  starttype #a   endtype #a
-  length 180
-  ipa ??
-  ChangeIfDiminished(@)
-  FMT(vowel/aa_8)
-endphoneme
+// long vowels
 
 phoneme A:
   vowel  starttype #a  endtype #a
@@ -65,34 +90,14 @@ phoneme A:
   FMT(vowel/aa_2)
 endphoneme
 
-phoneme A1:
-  vowel  starttype #a  endtype #@
-  length 200
-  FMT(vowel/aa_2)
-endphoneme
-
-phoneme A0:
-  vowel  starttype #a  endtype #o
-  length 200
-  FMT(vowel/aa_2)
-endphoneme
-phoneme 0A:
-  vowel  starttype #o  endtype #a
-  length 200
-  FMT(vowel/aa_2)
-endphoneme
-phoneme A9:
-  vowel  starttype #@  endtype #a
-  length 200
-  FMT(vowel/aa_2)
-endphoneme
-
 
 phoneme e:
   vowel  starttype #e  endtype #e
   length 210
   FMT(vowel/e)
 endphoneme
+
+
 phoneme i:
   vowel  starttype #i  endtype #i
   length 210
@@ -100,105 +105,44 @@ phoneme i:
 endphoneme
 
 
-
 phoneme o:
   vowel  starttype #o  endtype #o
   length 190
   FMT(vowel/o)
 endphoneme
 
-phoneme o2
-  vowel  starttype #o  endtype #@
-  length 190
-  FMT(vowel/o)
-endphoneme
-phoneme o3
-  vowel  starttype #o  endtype #a
-  length 190
-  FMT(vowel/o)
-endphoneme
 
 phoneme u:
   vowel  starttype #u  endtype #u
   length 210
-  FMT(vowel/u)
-endphoneme
-
-phoneme @    //  Schwa, but always unstressed
-  vowel   starttype #@  endtype #@
-  unstressed
-  length 100
-  IF nextPh(i:) THEN
-    Length 50
-    FMT(vwl_af/r@)
-  ENDIF
-  IF nextPh(e:) THEN
-    Length 50
-    FMT(vwl_af/r@)
-  ENDIF
-    FMT(vwl_af/@)
-endphoneme
-
-phoneme V
-  vowel  starttype #a  endtype #@
-  length 140
-  ChangeIfDiminished(@)
-  FMT(vowel/V_4)
+  FMT(vowel/u_bck)
 endphoneme
 
-phoneme d[
-  vcd dnt stop
-  voicingswitch t[
-  lengthmod 5
-  Vowelin f1=2  f2=1500 -300 300  f3=-150 80
-  Vowelout f1=2 f2=1500 -300 300  f3=-150 80
 
-  IF PreVoicing THEN
-    FMT(d/xd)
-  ENDIF
+// Diphthongs
 
-  IF nextPh(isPause2) THEN
-    FMT(d/d_)  addWav(x/d_)
-  ELIF nextPh(r) THEN
-    FMT(d/dr) addWav(x/d_dnt, 100)
-  ENDIF
-
-  FMT(d/d) addWav(x/d_dnt, 100)
+phoneme @I
+  vowel starttype #@ endtype #i
+  length 240
+  FMT(vdiph/@i)
 endphoneme
 
-
-
-
-phoneme t[        // dental variant of /t/
-  vls dnt stop
-  voicingswitch d[
-  lengthmod 2
-  Vowelin f1=1  f2=1500 -250 250  f3=-100 80  amp=16
-  Vowelout f1=0 f2=1500 -300 250  f3=-100 80  rms=20
-
-  IF nextPh(isPause2) THEN
-    WAV(ustop/t_dnt, 35)
-  ENDIF
-  WAV(ustop/t_hi, 70)
+phoneme @U
+  vowel starttype #@ endtype #u
+  length 240
+  FMT(vdiph/@u_3)
 endphoneme
-phoneme x
-  vls vel frc
-  voicingswitch Q
-  lengthmod 1
-  Vowelin f1=0  f2=2300 200 400  f3=-100 80
-  Vowelout f1=0 f2=2300 300 400  f3=-100 80  rms=20
 
-  IF nextPh(isPause) THEN
-    WAV(ufric/x, 120)
-  ENDIF
-  WAV(ufric/x_hr, 25)
+phoneme i@
+  vowel starttype #i endtype #@
+  length 240
+  FMT(vdiph2/i@)
 endphoneme
 
-
-
-
-
-
-
+phoneme u@
+  vowel starttype #u endtype #@
+  length 240
+  FMT(vdiph2/u@)
+endphoneme
 
 

phsource/ph_nepal

@@ -1 +0,0 @@
- 

phsource/vowelcharts/af

@@ -1,7 +1,7 @@
 @	 1 536 1416 2320   584 1400 2000
 @	 0 536 1420 2420   536 1420 2420
 @-	 0 525 1441 2340   525 1441 2340
-a	 0 -32132 -27904 -7256   -11523 -18012 -27772
+a	 0 -27598 -14028 13533   666 -14224 -23000
 i	 0 272 2247 3100   288 2247 3100
 u	 0 352 1000 2240   352 1000 2200
 E	 0 504 1900 2544   496 1920 2552

phsource/vowelcharts/ca

@@ -8,5 +8,5 @@ E	 0 584 1820 2560   584 1820 2560
 O	 0 552  860 2660   552  880 2660
 U	 0 388  940 2420   394  980 2360
 aI	 0 912 1320 2740   360 2200 2820
-a#	 0 394    0  396   350    0  352
+a#	 0 514  514  514   514  514  514
 E2	 0 584 1820 2560   584 1820 2560

phsource/vowelcharts/en

@@ -9,7 +9,7 @@ I2	 0 408 1920 2580   416 1900 2580
 @5	 0 525 1441 2340   525 1441 2340
 U	 0 445  902 2620   445  902 2620
 @L	 0 485  891 2780   450  792 2980
-a#	 0 514  514  514   257  257  257
+a#	 0  -1   -1  257   257  257  257
 aa	 0 904 1320 2700   896 1340 2660
 E	 0 646 1780 2500   646 1780 2500
 I	 0 408 1940 2600   408 1940 2600

phsource/vowelcharts/en-n

@@ -25,7 +25,7 @@ O@	 0 575  891 2640   580 1023 2480
 o@	 0 575  891 2640   580 1023 2480
 u:	 0 332 1527 2256   290 1023 2220
 aU	 0 660 1562 2360   340  990 2360
-oU	 0 -6405 26212 29798   -19970 -9211 6917
+oU	 0 20480    0  256   768  578  140
 aI	 0 860 1360 2660   488 1840 2440
 OI	 0 545  780 2720   310 2002 2500
 e@	 0 647 1778 2530   593 1553 2370

phsource/vowelcharts/en-rp

@@ -6,7 +6,7 @@ i	 0 368 2100 2660   344 2146 2700
 I2	 0 384 2030 2610   384 2030 2610
 @2	 0 584 1440 2460   600 1440 2460
 @5	 0 584 1440 2460   600 1440 2460
-U	 0 456 1000 2460   456 1000 2460
+U	 0 448 1000 2520   448 1000 2520
 @L	 0 485  891 2780   450  792 2980
 a#	 0 584 1440 2460   600 1440 2460
 aa	 0 648 1108 2840   632 1140 2840

phsource/vowelcharts/en-us

@@ -9,7 +9,7 @@ I2	 0 416 1800 2560   416 1800 2560
 @5	 0 525 1441 2340   525 1441 2340
 U	 0 496 1040 2560   496 1040 2560
 @L	 0 485  891 2780   450  792 2980
-a#	 0  78    0   80    34    0   36
+a#	 0 -256  255    0   257  257  257
 aa	 1 670 1719 2556   710 1672 2671
 aa	 0 700 1680 2506   652 1488 2470
 E	 0 544 1760 2580   608 1600 2580

phsource/vowelcharts/en-wm

@@ -9,7 +9,7 @@ I2	 0 312 2213 2775   312 2213 2775
 @5	 0 525 1441 2340   525 1441 2340
 U	 0 445  902 2620   445  902 2620
 @L	 0 485  891 2780   450  792 2980
-a#	 0 257  257  257   257   -1  257
+a#	 0 511   -1  257   257  257   -1
 aa	 0 904 1320 2700   896 1340 2660
 E	 0 456 1980 2540   440 1980 2540
 I	 1 384 2030 2610   384 2030 2610

phsource/vowelcharts/es

@@ -1,9 +1,10 @@
+@	 0 525 1441 2340   525 1441 2340
 a	 0 841 1409 2550   841 1409 2550
 e	 0 504 1900 2544   496 1920 2552
 i	 0 280 2280 2840   240 2339 2840
-o	 0 454  812 2559   432  824 2520
+o	 0 552  860 2660   552  880 2660
 u	 0 320  820 2360   320  820 2360
-E	 0 584 1820 2560   584 1820 2560
+E	 0 504 1900 2544   496 1920 2552
 O	 0 552  860 2660   552  880 2660
 aU	 0 847 1383 2510   360  800 2360
 eU	 0 460 1929 2512   327  947 2367

phsource/vowelcharts/es-la

@@ -1,9 +1,10 @@
+@	 0 525 1441 2340   525 1441 2340
 a	 0 841 1409 2550   841 1409 2550
 e	 0 504 1900 2544   496 1920 2552
 i	 0 280 2280 2840   240 2339 2840
-o	 0 454  812 2559   432  824 2520
+o	 0 552  860 2660   552  880 2660
 u	 0 320  820 2360   320  820 2360
-E	 0 584 1820 2560   584 1820 2560
+E	 0 504 1900 2544   496 1920 2552
 O	 0 552  860 2660   552  880 2660
 aU	 0 847 1383 2510   360  800 2360
 eU	 0 460 1929 2512   327  947 2367

phsource/vowelcharts/fr

@@ -17,7 +17,7 @@ O~	 0 344  700 2620   344  700 2620
 W	 0 552 1441 2400   552 1441 2400
 j/	 0 355 2222 2720   355 2222 2720
 a-	 0 856 1320 2700   856 1320 2700
-a#	 0 514  514  514   257  257  257
+a#	 0  -1   -1  257   257  257  257
 e-	 0 488 1990 2540   488 1990 2540
 E-	 0 584 1820 2560   584 1820 2560
 I	 0 408 1940 2600   408 1940 2600

phsource/vowelcharts/fr-ca

@@ -21,7 +21,7 @@ O~	 0 344  700 2620   344  700 2620
 W	 0 552 1441 2400   552 1441 2400
 j/	 0 355 2222 2720   355 2222 2720
 a-	 0 856 1320 2700   856 1320 2700
-a#	 0 514  514  514   257  257  257
+a#	 0  -1   -1  257   257  257  257
 e-	 0 488 1990 2540   488 1990 2540
 E-	 0 584 1820 2560   584 1820 2560
 I	 0 384 2030 2610   384 2030 2610

phsource/vowelcharts/ga

@@ -1,26 +1,20 @@
-@	 1 536 1416 2320   584 1400 2000
-@	 1 536 1416 2320   584 1400 2000
-@	 0 536 1420 2420   536 1420 2420
+@	 0 525 1441 2340   525 1441 2340
 a	 0 841 1409 2550   841 1409 2550
-e	 0 456 1980 2540   440 1980 2540
-i	 0 376 1970 2585   376 1970 2585
-o	 0 552  860 2660   552  880 2660
-u	 0 320  860 2360   320  860 2460
-E	 0 646 1780 2500   646 1780 2500
+a#	 0 658 1408 2460   658 1408 2460
+E	 0 584 1820 2560   584 1820 2560
+E#	 0 525 1441 2340   525 1441 2340
 I	 0 408 1940 2600   408 1940 2600
-O	 0 552  860 2660   552  880 2660
-U	 0 320  820 2360   320  820 2360
-u1	 0 320  860 2360   320  860 2460
-0	 0 728 1200 2660   712 1200 2660
+I#	 0 525 1441 2340   525 1441 2340
+O	 0 584  940 2580   584  940 2580
+O#	 0 525 1441 2340   525 1441 2340
+U	 0 445  902 2620   445  902 2620
+U#	 0 525 1441 2340   525 1441 2340
 A:	 0 775 1067 2800   795 1122 2580
-A1:	 0 775 1067 2800   795 1122 2580
-A0:	 0 775 1067 2800   795 1122 2580
-0A:	 0 775 1067 2800   795 1122 2580
-A9:	 0 775 1067 2800   795 1122 2580
 e:	 0 456 1980 2540   440 1980 2540
 i:	 0 280 2280 2840   240 2339 2840
 o:	 0 454  812 2559   432  824 2520
-o2	 0 454  812 2559   432  824 2520
-o3	 0 454  812 2559   432  824 2520
-u:	 0 320  860 2360   320  860 2460
-V	 0 672 1180 2595   672 1180 2595
+u:	 0 320  740 2400   320  740 2400
+@I	 0 536 1420 2420   355 2222 2720
+@U	 0 584 1400 2460   348  800 2294
+i@	 0 320 2220 2800   528 1520 2360
+u@	 0 320  860 2360   520 1382 2342

phsource/vowelcharts/ne

@@ -9,10 +9,17 @@ V	 1 584 1440 2460   600 1440 2460
 V	 0 544 1220 2520   544 1260 2520
 @3	 0 528 1500 2380   528 1500 2380
 @2	 0 584 1440 2460   600 1440 2460
+i:	 0 304 2440 3020   304 2440 3020
 I	 0 360 2120 2680   360 2120 2660
+e:	 0 416 2140 2660   416 2140 2660
+E:	 0 656 1740 2500   504 1900 2620
 E	 0 584 1820 2560   584 1820 2560
+a:	 0 712 1160 2780   696 1160 2780
 o:	 0 424  800 2580   408  780 2600
+O:	 0 584  940 2580   584  940 2580
 O	 0 670  946 2620   630  902 2700
+U	 0 368  880 2440   368  900 2440
+u:	 0 320  740 2400   320  740 2400
 i~	 0 312 2240 2844   312 2240 2844
 e~	 0 456 1960 2520   456 1960 2520
 E~	 0 670 1719 2556   710 1672 2671

phsource/vowelcharts/pt-pt

@@ -21,7 +21,7 @@ o~	 0 448  840 2598   448  840 2598
 u~	 0 328  900 2360   328  900 2360
 &~	 0 670 1719 2556   710 1672 2671
 &U~	 0 658 1408 2460   392  520 2580
-&	 0 514  514  514   257 -255  257
+&	 0 257   -1  257   257  257  257
 &/	 0 658 1408 2460   658 1408 2460
 A	 0 896 1440 2710   896 1440 2710
 i/	 0 376 1515 2460   376 1515 2460

phsource/vowelcharts/tt

@@ -0,0 +1,11 @@
+a	 0 872 1440 2720   840 1440 2690
+e	 0 448 1660 2528   448 1660 2528
+i	 0 280 2280 2840   240 2339 2840
+o	 0 488  900 2520   488  920 2520
+u	 0 320  860 2360   320  860 2460
+y	 0 280 1720 2340   280 1720 2340
+W	 0 525 1320 2200   525 1320 2200
+V	 0 448 1000 2520   448 1000 2520
+A	 0 688 1064 2806   672 1100 2806
+0	 0 656 1000 2620   630  960 2700
+I	 0 384 2030 2610   384 2030 2610

platforms/windows/espeakedit/src/speech.h

@@ -28,7 +28,6 @@
 //#define SPECT_EDITOR
 #define INCLUDE_KLATT
 #define INCLUDE_MBROLA
-#define INCLUDE_SONIC
 
 #include <windows.h>
 #define PLATFORM_WINDOWS

platforms/windows/espeakedit/src_copy/speech.h

@@ -28,7 +28,6 @@
 //#define SPECT_EDITOR
 #define INCLUDE_KLATT
 #define INCLUDE_MBROLA
-#define INCLUDE_SONIC
 
 #include <windows.h>
 #define PLATFORM_WINDOWS

platforms/windows/windows_cmd/src/speech.h

@@ -36,8 +36,6 @@
 #define NO_VARIADIC_MACROS
 #define INCLUDE_KLATT
 #define INCLUDE_MBROLA
-#define INCLUDE_SONIC
-
 
 // will look for espeak_data directory here, and also in user's home directory
 #define PATH_ESPEAK_DATA  "/usr/share/espeak-data"

platforms/windows/windows_dll/src/speech.h

@@ -39,8 +39,6 @@
 #define LIBRARY
 #define INCLUDE_KLATT
 #define INCLUDE_MBROLA
-#define INCLUDE_SONIC
-
 
 // will look for espeak_data directory here, and also in user's home directory
 #define PATH_ESPEAK_DATA  "/usr/share/espeak-data"

platforms/windows/windows_sapi/src/speech.h

@@ -41,8 +41,6 @@
 //#define USE_NANOSLEEP
 #define INCLUDE_KLATT
 #define INCLUDE_MBROLA
-#define INCLUDE_SONIC
-
 
 // will look for espeak_data directory here, and also in user's home directory
 #define PATH_ESPEAK_DATA  "/usr/share/espeak-data"