diff --git a/Makefile.am b/Makefile.am index 6f20a259..3c920750 100644 --- a/Makefile.am +++ b/Makefile.am @@ -834,7 +834,7 @@ mbrola: \ espeak-ng-data/mbrola_ph/af1_phtrans \ espeak-ng-data/mbrola_ph/ar1_phtrans \ espeak-ng-data/mbrola_ph/ar2_phtrans \ - espeak-ng-data/mbrola_ph/zh_phtrans \ + espeak-ng-data/mbrola_ph/ca_phtrans \ espeak-ng-data/mbrola_ph/cr1_phtrans \ espeak-ng-data/mbrola_ph/cs_phtrans \ espeak-ng-data/mbrola_ph/de2_phtrans \ @@ -843,7 +843,7 @@ mbrola: \ espeak-ng-data/mbrola_ph/ee1_phtrans \ espeak-ng-data/mbrola_ph/en1_phtrans \ espeak-ng-data/mbrola_ph/es_phtrans \ - espeak-ng-data/mbrola_ph/fr1_phtrans \ + espeak-ng-data/mbrola_ph/fr_phtrans \ espeak-ng-data/mbrola_ph/gr2_phtrans \ espeak-ng-data/mbrola_ph/grc-de6_phtrans \ espeak-ng-data/mbrola_ph/hn1_phtrans \ @@ -852,6 +852,7 @@ mbrola: \ espeak-ng-data/mbrola_ph/id1_phtrans \ espeak-ng-data/mbrola_ph/in1_phtrans \ espeak-ng-data/mbrola_ph/ir1_phtrans \ + espeak-ng-data/mbrola_ph/it1_phtrans \ espeak-ng-data/mbrola_ph/it3_phtrans \ espeak-ng-data/mbrola_ph/la1_phtrans \ espeak-ng-data/mbrola_ph/lt_phtrans \ @@ -868,7 +869,8 @@ mbrola: \ espeak-ng-data/mbrola_ph/tr1_phtrans \ espeak-ng-data/mbrola_ph/us_phtrans \ espeak-ng-data/mbrola_ph/us3_phtrans \ - espeak-ng-data/mbrola_ph/vz_phtrans + espeak-ng-data/mbrola_ph/vz_phtrans \ + espeak-ng-data/mbrola_ph/zh_phtrans espeak-ng-data/mbrola_ph/af1_phtrans: phsource/mbrola/af1 src/espeak-ng mkdir -p espeak-ng-data/mbrola_ph @@ -882,9 +884,9 @@ espeak-ng-data/mbrola_ph/ar2_phtrans: phsource/mbrola/ar2 src/espeak-ng mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/ar2 -espeak-ng-data/mbrola_ph/zh_phtrans: phsource/mbrola/zh src/espeak-ng +espeak-ng-data/mbrola_ph/ca_phtrans: phsource/mbrola/ca src/espeak-ng mkdir -p espeak-ng-data/mbrola_ph - ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/zh + ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/ca espeak-ng-data/mbrola_ph/cr1_phtrans: phsource/mbrola/cr1 src/espeak-ng mkdir -p espeak-ng-data/mbrola_ph @@ -918,9 +920,9 @@ espeak-ng-data/mbrola_ph/es_phtrans: phsource/mbrola/es src/espeak-ng mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/es -espeak-ng-data/mbrola_ph/fr1_phtrans: phsource/mbrola/fr1 src/espeak-ng +espeak-ng-data/mbrola_ph/fr_phtrans: phsource/mbrola/fr src/espeak-ng mkdir -p espeak-ng-data/mbrola_ph - ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/fr1 + ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/fr espeak-ng-data/mbrola_ph/gr2_phtrans: phsource/mbrola/gr2 src/espeak-ng mkdir -p espeak-ng-data/mbrola_ph @@ -954,6 +956,10 @@ espeak-ng-data/mbrola_ph/ir1_phtrans: phsource/mbrola/ir1 src/espeak-ng mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/ir1 +espeak-ng-data/mbrola_ph/it1_phtrans: phsource/mbrola/it1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph + ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/it1 + espeak-ng-data/mbrola_ph/it3_phtrans: phsource/mbrola/it3 src/espeak-ng mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/it3 @@ -1021,3 +1027,7 @@ espeak-ng-data/mbrola_ph/us3_phtrans: phsource/mbrola/us3 src/espeak-ng espeak-ng-data/mbrola_ph/vz_phtrans: phsource/mbrola/vz src/espeak-ng mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/vz + +espeak-ng-data/mbrola_ph/zh_phtrans: phsource/mbrola/zh src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph + ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/zh diff --git a/docs/mbrola.md b/docs/mbrola.md index 33333544..6a65f5c4 100644 --- a/docs/mbrola.md +++ b/docs/mbrola.md @@ -59,8 +59,8 @@ The following MBROLA voices are available. Not all are supported by eSpeak NG. | `br3` | Brazillian Portugues | male | `mb-br3` | `mbrola-br3` | | `br4` | Brazillian Portugues | female | `mb-br4` | `mbrola-br4` | | `bz1` | Breton | female | | | -| `ca1` | Canadian French | male | | | -| `ca2` | Canadian French | male | | | +| `ca1` | Canadian French | male | `mb-ca1` | | +| `ca2` | Canadian French | male | `mb-ca2` | | | `cn1` | Mandarin Chinese | female | `mb-cn1` | | | `cr1` | Croatian | male | `mb-cr1` | `mbrola-cr1` | | `cz1` | Czech | female | `mb-cz1` | | @@ -73,19 +73,19 @@ The following MBROLA voices are available. Not all are supported by eSpeak NG. | `de6` | German | male | `mb-de6` | `mbrola-de6` | | `de7` | German | female | `mb-de7` | `mbrola-de7` | | `de8` | German-Bavarian | male | | | -| `ee1` | Estonian | male | | `mbrola-ee1` | +| `ee1` | Estonian | male | `mb-ee1` | `mbrola-ee1` | | `en1` | British English | female | `mb-en1` | `mbrola-en1` | | `es1` | Spanish | male | `mb-es1` | `mbrola-es1` | | `es2` | Spanish | male | `mb-es2` | `mbrola-es2` | | `es3` | Spanish | female | | | | `es4` | Spanish | male | | | | `fr1` | French | male | `mb-fr1` | `mbrola-fr1` | -| `fr2` | French | female | | | -| `fr3` | French | male | | | +| `fr2` | French | female | `mb-fr2` | | +| `fr3` | French | male | `mb-fr3` | | | `fr4` | French | female | `mb-fr4` | `mbrola-fr4` | -| `fr5` | Belgian French | male | | | -| `fr6` | French | male | | | -| `fr7` | Belgian French | male | | | +| `fr5` | Belgian French | male | `mb-fr5` | | +| `fr6` | French | male | `mb-fr6` | | +| `fr7` | Belgian French | male | `mb-fr7` | | | `gr1` | Greek | male | | `mbrola-gr1` | | `gr2` | Greek | male | `mb-gr2` | `mbrola-gr2` | | `hb1` | Hebrew | male | | | @@ -99,8 +99,8 @@ The following MBROLA voices are available. Not all are supported by eSpeak NG. | `ir1` | Iranian Persian | male | `mb-ir1` | `mbrola-ir1` | | `it1` | Italian | male | `mb-it1` | | | `it2` | Italian | female | `mb-it2` | | -| `it3` | Italian | male | | `mbrola-it3` | -| `it4` | Italian | female | | `mbrola-it4` | +| `it3` | Italian | male | `mb-it3` | `mbrola-it3` | +| `it4` | Italian | female | `mb-it4` | `mbrola-it4` | | `jp1` | Japanese | male | | | | `jp2` | Japanese | female | | | | `jp3` | Japanese | female | | | @@ -127,6 +127,9 @@ The following MBROLA voices are available. Not all are supported by eSpeak NG. | `us3` | American English | male | `mb-us3` | `mbrola-us3` | | `vz1` | Venezuelan Spanish | male | `mb-vz1` | `mbrola-vz1` | +* If some MBROLA voice is not available as Debian package, you can download data files + from [here](https://github.com/mbrola/mbrola-voices). + ## Windows Installation The SAPI5 version of eSpeak NG uses the `mbrola.dll`. diff --git a/espeak-ng-data/voices/mb/mb-ca1 b/espeak-ng-data/voices/mb/mb-ca1 new file mode 100644 index 00000000..9b10d3df --- /dev/null +++ b/espeak-ng-data/voices/mb/mb-ca1 @@ -0,0 +1,5 @@ +language fr 10 +name fr-canadian-mbrola-1 +gender male +pitch 82 117 +mbrola ca1 ca_phtrans diff --git a/espeak-ng-data/voices/mb/mb-ca2 b/espeak-ng-data/voices/mb/mb-ca2 new file mode 100644 index 00000000..ad44194f --- /dev/null +++ b/espeak-ng-data/voices/mb/mb-ca2 @@ -0,0 +1,5 @@ +language fr 10 +name fr-canadian-mbrola-2 +gender male +pitch 82 117 +mbrola ca2 ca_phtrans diff --git a/espeak-ng-data/voices/mb/mb-fr1 b/espeak-ng-data/voices/mb/mb-fr1 index 04651527..29cc988c 100644 --- a/espeak-ng-data/voices/mb/mb-fr1 +++ b/espeak-ng-data/voices/mb/mb-fr1 @@ -7,5 +7,5 @@ stressLength 180 180 180 180 0 0 220 220 pitch 82 117 voicing 70 -mbrola fr1 fr1_phtrans +mbrola fr1 fr_phtrans diff --git a/espeak-ng-data/voices/mb/mb-fr1-en b/espeak-ng-data/voices/mb/mb-fr1-en index 47cb1825..b39db344 100644 --- a/espeak-ng-data/voices/mb/mb-fr1-en +++ b/espeak-ng-data/voices/mb/mb-fr1-en @@ -5,5 +5,5 @@ gender male dictrules 1 pitch 82 117 voicing 70 -mbrola fr1 fr1_phtrans +mbrola fr1 fr_phtrans diff --git a/espeak-ng-data/voices/mb/mb-fr2 b/espeak-ng-data/voices/mb/mb-fr2 new file mode 100644 index 00000000..b8460334 --- /dev/null +++ b/espeak-ng-data/voices/mb/mb-fr2 @@ -0,0 +1,6 @@ +language fr 8 +name french-mbrola-2 +gender female +pitch 140 220 +mbrola fr2 fr_phtrans + diff --git a/espeak-ng-data/voices/mb/mb-fr3 b/espeak-ng-data/voices/mb/mb-fr3 new file mode 100644 index 00000000..af062ac5 --- /dev/null +++ b/espeak-ng-data/voices/mb/mb-fr3 @@ -0,0 +1,6 @@ +language fr 8 +name french-mbrola-3 +gender male +pitch 82 117 +mbrola fr3 fr_phtrans + diff --git a/espeak-ng-data/voices/mb/mb-fr4 b/espeak-ng-data/voices/mb/mb-fr4 index 8e3c3921..26fb5759 100644 --- a/espeak-ng-data/voices/mb/mb-fr4 +++ b/espeak-ng-data/voices/mb/mb-fr4 @@ -5,5 +5,5 @@ gender female dictrules 1 pitch 140 220 voicing 90 -mbrola fr1 fr1_phtrans +mbrola fr4 fr_phtrans diff --git a/espeak-ng-data/voices/mb/mb-fr4-en b/espeak-ng-data/voices/mb/mb-fr4-en index 8126770b..60753f0e 100644 --- a/espeak-ng-data/voices/mb/mb-fr4-en +++ b/espeak-ng-data/voices/mb/mb-fr4-en @@ -5,5 +5,5 @@ gender female dictrules 1 pitch 140 220 voicing 90 -mbrola fr1 fr1_phtrans +mbrola fr4 fr_phtrans diff --git a/espeak-ng-data/voices/mb/mb-fr5 b/espeak-ng-data/voices/mb/mb-fr5 new file mode 100644 index 00000000..95ae2bb9 --- /dev/null +++ b/espeak-ng-data/voices/mb/mb-fr5 @@ -0,0 +1,6 @@ +language fr 8 +name french-mbrola-5 +gender male +pitch 82 117 +mbrola fr5 fr_phtrans + diff --git a/espeak-ng-data/voices/mb/mb-fr6 b/espeak-ng-data/voices/mb/mb-fr6 new file mode 100644 index 00000000..4ba37642 --- /dev/null +++ b/espeak-ng-data/voices/mb/mb-fr6 @@ -0,0 +1,6 @@ +language fr 8 +name french-mbrola-6 +gender male +pitch 82 117 +mbrola fr6 fr_phtrans + diff --git a/espeak-ng-data/voices/mb/mb-fr7 b/espeak-ng-data/voices/mb/mb-fr7 new file mode 100644 index 00000000..95ae2bb9 --- /dev/null +++ b/espeak-ng-data/voices/mb/mb-fr7 @@ -0,0 +1,6 @@ +language fr 8 +name french-mbrola-5 +gender male +pitch 82 117 +mbrola fr5 fr_phtrans + diff --git a/espeak-ng-data/voices/mb/mb-it1 b/espeak-ng-data/voices/mb/mb-it1 new file mode 100644 index 00000000..a106b19e --- /dev/null +++ b/espeak-ng-data/voices/mb/mb-it1 @@ -0,0 +1,5 @@ +name italian-mbrola-1 +language it 8 +gender male +pitch 82 117 +mbrola it1 it1_phtrans diff --git a/espeak-ng-data/voices/mb/mb-it2 b/espeak-ng-data/voices/mb/mb-it2 new file mode 100644 index 00000000..e2c17421 --- /dev/null +++ b/espeak-ng-data/voices/mb/mb-it2 @@ -0,0 +1,5 @@ +name italian-mbrola-2 +language it 8 +gender female +pitch 140 220 +mbrola it2 it1_phtrans diff --git a/phsource/mbrola/ca b/phsource/mbrola/ca new file mode 100644 index 00000000..6293a26b --- /dev/null +++ b/phsource/mbrola/ca @@ -0,0 +1,88 @@ +volume 17 + +0 l/2 NULL 0 l +0 l/ NULL 0 l +0 l2 NULL 0 l +0 r/ NULL 0 R +0 r/2 NULL 0 R +0 r- NULL 0 R +0 l- NULL 0 l +0 w/ NULL 0 w +0 j/ NULL 0 j +0 ; NULL 0 NULL +0 g- NULL 0 NULL +0 @3 NULL 0 NULL +0 * NULL 0 R +0 : NULL 0 NULL + +0 Y NULL 0 2 +0 W NULL 0 9 +0 W2 NULL 0 9 +0 E2 NULL 0 E +0 o2 NULL 0 o +0 A~ NULL 0 a~ +0 E~ NULL 0 e~ +0 O~ NULL 0 o~ +0 W~ NULL 0 9~ +0 w^i NULL 50 H i +0 wA NULL 50 w a +0 r NULL 0 R +0 n^ NULL 75 n j +0 c NULL 0 k + +0 I NULL 0 i +0 U NULL 0 u +0 y" NULL 0 y +0 E NULL 0 e +0 E: NULL 0 E +0 h NULL 0 NULL +0 n2 NULL 0 n +0 p2 NULL 0 p +0 r2 NULL 0 R +0 t2 NULL 0 t +0 t3 NULL 0 t +0 z2 NULL 0 z +0 z3 NULL 0 z + +0 @- NULL 0 @ +0 a- NULL 0 a +0 e- NULL 0 e +0 y- NULL 0 y +0 i: NULL 0 i +0 i- NULL 0 i +0 u: NULL 0 u +0 eI NULL 60 E j +0 aU NULL 60 a w +0 oU NULL 0 o +0 o3 NULL 0 o +0 o- NULL 0 o +0 @L NULL 40 @ l +0 @2 NULL 0 @ +0 @5 NULL 0 @ +0 3 NULL 0 @ +0 a# NULL 0 a +0 I2 NULL 0 i +0 aa NULL 0 a +0 V NULL 0 @ +0 0 NULL 0 O +0 3: NULL 0 9 +0 aI NULL 60 a j +0 OI NULL 60 O j +0 e@ NULL 0 E +0 i@ NULL 60 i @ +0 i@3 NULL 60 i @ +0 e@ NULL 60 E @ +0 o@ NULL 70 o @ +0 O@ NULL 70 O @ +0 O: NULL 0 O +0 O2 NULL 0 O +0 A: NULL 0 a +0 A@ NULL 70 a @ +0 U@ NULL 60 u @ +0 aI@ NULL 70 a @ +0 aU@ NULL 0 a + +0 dZ NULL 40 d Z +0 tS NULL 40 t S +0 T NULL 0 t +0 D NULL 0 z diff --git a/phsource/mbrola/fr1 b/phsource/mbrola/fr similarity index 100% rename from phsource/mbrola/fr1 rename to phsource/mbrola/fr diff --git a/phsource/mbrola/it1 b/phsource/mbrola/it1 new file mode 100644 index 00000000..15be980d --- /dev/null +++ b/phsource/mbrola/it1 @@ -0,0 +1,58 @@ +// for voices "it1" "it2" +volume 20 + +0 aI NULL 60 A I +0 a NULL 0 A +0 a/ NULL 0 A2 +0 aU NULL 60 A U +0 b : 50 B B +0 b NULL 0 B +0 c NULL 0 ts +0 d : 50 D D +0 d NULL 0 D +0 e NULL 0 E +0 E NULL 0 E1 +0 e/ NULL 0 E2 +0 f NULL 0 F +0 g : 50 G G +0 g NULL 0 G +0 h NULL 0 H +0 i NULL 0 I +0 i/ NULL 0 I +0 I NULL 0 I2 +0 j/ NULL 0 I +0 k : 50 K K +0 k NULL 0 K +0 l NULL 0 L +0 l NULL 0 L +0 l/ NULL 0 L +0 l^ NULL 0 L +0 m NULL 0 M +0 n^ NULL 0 J +0 n NULL 0 N +0 N NULL 0 ng +0 _| NULL 0 _ +0 ; NULL 0 NULL +0 [ NULL 0 NULL +0 @- NULL 0 NULL +0 * NULL 0 R +0 oI NULL 60 O I +0 O NULL 0 O1 +0 o NULL 0 O1 +0 o/ NULL 0 O2 +0 p : 50 P P +0 p NULL 0 P +0 r NULL 0 R +0 R NULL 0 RR +0 s NULL 0 S +0 t : 50 T T +0 t NULL 0 T +0 U NULL 0 U +0 u NULL 0 U1 +0 v NULL 0 V +0 w2 NULL 0 VV +0 w/ NULL 0 V +0 w NULL 0 W +0 z NULL 0 Z +1 d z 0 dz +