From c6e7a698be1910e71787629e98c61a857774b023 Mon Sep 17 00:00:00 2001 From: jonsd Date: Sun, 13 Apr 2008 22:59:16 +0000 Subject: [PATCH] [1.36.13] Added phoneme translations for mbrola Spanish voices: es1 es2. git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@174 d46cf337-b52f-0410-862d-fd96e6ae7743 --- dictsource/dict_phonemes | 16 +++---- dictsource/en_list | 3 +- dictsource/en_rules | 4 +- dictsource/hbs_rules | 2 +- dictsource/it_list | 50 ++++++++++++++++---- dictsource/it_rules | 26 ----------- dictsource/ku_list | 7 ++- dictsource/ku_rules | 3 ++ espeak-data/voices/mb/mb-es1 | 7 +++ espeak-data/voices/mb/mb-es1-en | 8 ++++ espeak-data/voices/mb/mb-es2 | 7 +++ espeak-data/voices/mb/mb-es2-en | 8 ++++ phsource/compile_report | 10 ++-- phsource/mbrola/es | 78 ++++++++++++++++++++++++++++++++ phsource/ph_kurdish | 27 +++++++---- phsource/vowel/8_5 | Bin 0 -> 3353 bytes phsource/vowel/ii# | Bin 1319 -> 1319 bytes src/synthdata.cpp | 2 +- src/synthesize.cpp | 2 +- 19 files changed, 197 insertions(+), 63 deletions(-) create mode 100755 espeak-data/voices/mb/mb-es1 create mode 100644 espeak-data/voices/mb/mb-es1-en create mode 100644 espeak-data/voices/mb/mb-es2 create mode 100644 espeak-data/voices/mb/mb-es2-en create mode 100644 phsource/mbrola/es create mode 100644 phsource/vowel/8_5 diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes index 6de5e0ff..4733a3ce 100644 --- a/dictsource/dict_phonemes +++ b/dictsource/dict_phonemes @@ -377,8 +377,8 @@ o o: oU r* r- u U u: * ; b d dZ dZ; f g h j k l L l^ m n -N n^ p r R s S t -tS ts tS; v x z Z +N n^ p r R R2 s S +t tS ts tS; v x z Z Dictionary id_dict @@ -414,10 +414,10 @@ R s S t tS v z Z Dictionary ku_dict -a e E E# eI eU i I -o u U y +8 a e E E# eI eU i +I o u U y -: b c d dZ f g h -j J k l m n p q -r R s S t tS v w -x z Z +* : b c d dZ f g +h j J k l m n p +q r R s S t tS v +w x z Z diff --git a/dictsource/en_list b/dictsource/en_list index aa3669ce..1f864f13 100644 --- a/dictsource/en_list +++ b/dictsource/en_list @@ -2155,7 +2155,7 @@ Bengal b,Eng'O:l Benin bEnIn Berlin b3:l'In Bhutan bu:t'an -Bogata b0ga2t'A: +Bogota b0g@t'A: Bucharest bu:k@r'Est Budapest bu:d@p'Est Buenos bweIn0s @@ -2261,6 +2261,7 @@ Prague prA:g Pyrenees pIr@n'i:z Qatar katA@ Quebec kwI2bEk +Sahel sA:h'El Saigon saIg'0n Santiago santI'A:goU Savannah $2 diff --git a/dictsource/en_rules b/dictsource/en_rules index 414eafee..33bb5da0 100644 --- a/dictsource/en_rules +++ b/dictsource/en_rules @@ -3072,7 +3072,7 @@ wr) it (er aIt ithe_ aID l) ithe aID - _sl) ith ID + l) ith (er ID it (i_ 'i:t itius (_ 'IS@s itis (_ 'aItIs @@ -4863,7 +4863,7 @@ wr r C) we (_ =wI were (w wi@3 - th) west w'Est + C) west w'Est we (w wi: where we@ what w0t diff --git a/dictsource/hbs_rules b/dictsource/hbs_rules index 2b7ac52b..23a0789b 100755 --- a/dictsource/hbs_rules +++ b/dictsource/hbs_rules @@ -99,7 +99,7 @@ rr R r (_ R - K) r (K R // ?? + K) r (K R2 .group s diff --git a/dictsource/it_list b/dictsource/it_list index 7cf80f87..2a583580 100644 --- a/dictsource/it_list +++ b/dictsource/it_list @@ -8,17 +8,54 @@ _cap k'apital _?? s'imbolo _?A let:'e:Ra +_a a: +b bi +c tSi +d di +_e e: +f effe +g dZi +h ak:a +_i i: +j dZe:j +k kap:a +l Elle +m Emme +n Enne +_o O: +p pi +q ku +r ER*e +s esse +t ti +_u u: +v vu +w d'op:jav'u +x 'iks +y 'ipsilon +z dze:ta + +_à $accent +_é $accent +_è $accent +_ì $accent +_ó $accent +_ò $accent +_ù $accent + + // accent names _lig l,egat'u:Ra -_acu atS:'ento_|ak'u:to -_ac2 d'op:i;o_|atS:'ento_|ak'u:to +_acu ak'u:to +_ac2 d'op:i;o_|ak'u:to _brv b@-*'e:ve _ced tSed'il^a _cir tSi;@-*konfl'esso _dia djeR'e:zI _dot p'unto||s,ov@-*ask@-*'it:o -_grv atS:'entog@-*'a:ve +_grv g@-*'a:ve +//_grv atS:'entog@-*'a:ve _hac h'atSek _mcn m'ak@-*on _ogo og'o:nek @@ -366,15 +403,10 @@ facevano $u+ // Letters // If a letter has a "word" pronunciation which is different from its -// "letter" name, then include the letter name here, with the letter -// prefixed by a _ character. -_a a: +// "letter" name, then include the letter name here a a: $atend -_e e: e e: $atend -_i i: i i: $atend -_o O: o O: $atend diff --git a/dictsource/it_rules b/dictsource/it_rules index 8eb82da8..ae0c80c3 100644 --- a/dictsource/it_rules +++ b/dictsource/it_rules @@ -3,7 +3,6 @@ .group a - _) a(_ a a a: a (CK a ai aI (K @@ -23,14 +22,12 @@ a (tterA_ 'a .group b - _) b(_ bi b b bb b: li) be =be .group c - _) c(_ tSi c k cc k: c (' tS @@ -61,13 +58,11 @@ @) co (lA_ =ko .group d - _) d(_ di d d dd d: n) dere =deRe .group e - _) e(_ e e e: e (CK e ei ej (K @@ -88,7 +83,6 @@ .group f - _) f(_ effe f f @A) f (ico_ =f @@ -97,7 +91,6 @@ @A) f (ero_ =f .group g - _) g(_ dZi g g gg g: gh g @@ -136,12 +129,10 @@ .group h - _) h(_ ak:a h ha h'a .group i - _) i(_ i i i: i (CK i i (A j @@ -175,28 +166,23 @@ .group j - _) j(_ dZe:j j j .group k - _) k(_ kap:a k k kk k: .group l - _) l(_ Elle l l ll (C l_ ll (_ l .group m - _) m(_ Emme m m A) mi (a m'i: @) mi (co_ m'i: .group n - _) n(_ Enne n n n (g N n (ge n @@ -206,7 +192,6 @@ n (k N .group o - _) o(_ o o o: o (CK o oi oI (K @@ -226,7 +211,6 @@ .group p - _) p(_ pi p p pp p: _) pn (@@ n @@ -234,12 +218,10 @@ @m) p (ere_ =p .group q - _) q(_ ku q kw2 qu kw2 .group r - _) r(_ ER*e C) r @-* r @-* _) r @-* @@ -247,7 +229,6 @@ A) r (A R .group s - _) s(_ esse s s _) s s A) s (A z @@ -283,12 +264,10 @@ @) sia s'ia .group t - _) t(_ ti t t tt t: .group u - _) u(_ u u u: u (CK u u (A w2 @@ -299,25 +278,20 @@ @) u (colo_ 'u .group v - _) v(_ vu v v .group w - _) w(_ d'op:jav'u w w2 .group x - _) x(_ 'iks x ks .group y - _) y(_ 'ipsilon y j y (K i // foreign words .group z - _) z(_ dze:ta z ts A) zz ts: diff --git a/dictsource/ku_list b/dictsource/ku_list index 9b88238d..aa833c56 100644 --- a/dictsource/ku_list +++ b/dictsource/ku_list @@ -95,6 +95,8 @@ _! banES'an a $u+ ê $u+ + + // pronouns ez $u+ te $u+ @@ -115,7 +117,7 @@ yên $u ji $u bi $u re $u -di $u +di $u $brk de $u kir $u got $u @@ -125,3 +127,6 @@ got $u hwd hEr||wEki||dIn // pronunciation exceptions + +lê $u+ +nebû $1 diff --git a/dictsource/ku_rules b/dictsource/ku_rules index b256c179..5a291f32 100644 --- a/dictsource/ku_rules +++ b/dictsource/ku_rules @@ -78,6 +78,8 @@ .group r r R + rr R + A) r (A * .group s s s @@ -99,6 +101,7 @@ .group w w w + x) we 8 .group x x x diff --git a/espeak-data/voices/mb/mb-es1 b/espeak-data/voices/mb/mb-es1 new file mode 100755 index 00000000..d59fe795 --- /dev/null +++ b/espeak-data/voices/mb/mb-es1 @@ -0,0 +1,7 @@ +language es 7 +name spanish-mbrola-1 +gender male +pitch 82 117 + +mbrola es1 es_phtrans + diff --git a/espeak-data/voices/mb/mb-es1-en b/espeak-data/voices/mb/mb-es1-en new file mode 100644 index 00000000..e5b9d084 --- /dev/null +++ b/espeak-data/voices/mb/mb-es1-en @@ -0,0 +1,8 @@ +name en-spanish1 +language en 10 +gender male + +dictrules 1 +pitch 82 117 +mbrola es1 es_phtrans + diff --git a/espeak-data/voices/mb/mb-es2 b/espeak-data/voices/mb/mb-es2 new file mode 100644 index 00000000..42de5888 --- /dev/null +++ b/espeak-data/voices/mb/mb-es2 @@ -0,0 +1,7 @@ +language es 7 +name spanish-mbrola-2 +gender male +pitch 82 117 + +mbrola es2 es_phtrans + diff --git a/espeak-data/voices/mb/mb-es2-en b/espeak-data/voices/mb/mb-es2-en new file mode 100644 index 00000000..45f21402 --- /dev/null +++ b/espeak-data/voices/mb/mb-es2-en @@ -0,0 +1,8 @@ +name en-spanish2 +language en 10 +gender male + +dictrules 1 +pitch 82 117 +mbrola es2 es_phtrans + diff --git a/phsource/compile_report b/phsource/compile_report index 16e45ca8..e10a050a 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -45,7 +45,7 @@ zh 65 148 sw 14 107 tr 18 122 - ku 17 121 + ku 18 122 id 15 119 rw 15 124 ko 18 145 @@ -1177,7 +1177,6 @@ vowel/& [a] en_rp [&] fi [&:] hi [&] sv - [E] ku vowel/0 [0] en [O] hi [O] pt @@ -1207,6 +1206,7 @@ vowel/8 [o-] zh vowel/8_2 [U] en_us [8] sv vowel/8_3 [eo] zhy +vowel/8_5 [8] ku vowel/a [a] en_n [aa] en_n [a] en_wm @@ -1342,13 +1342,13 @@ vowel/e_2 [eI] en_sc [e:] sv [e:] no vowel/e_3 [e:] hu + [e] ku vowel/e_5 [i] en_sc vowel/ee [E] fr [E] pl [E] sv vowel/e_e [E] en_sc [e] is -vowel/ee# [E#] ku vowel/ee_1 [E] base2 [e@] en [e@] en_n @@ -1362,6 +1362,7 @@ vowel/ee_2 [E] en [E] cy [E2] nl [E] zh + [E#] ku vowel/ee#_2 [E-] sv vowel/ee_3 [&] af [&:] af @@ -1370,6 +1371,7 @@ vowel/ee_3 [&] af vowel/ee_6 [E] en_n [&] sk [E3] sv + [E] ku vowel/e_mid [E] en_rp [e] jbo [E] fr_ca @@ -1470,7 +1472,7 @@ vowel/ii [I] en_rp [I] nl [I] is [i] zhy - [e] ku + [I] ku vowel/ii# [Y] cy [y] pl [Y] ru diff --git a/phsource/mbrola/es b/phsource/mbrola/es new file mode 100644 index 00000000..1595840b --- /dev/null +++ b/phsource/mbrola/es @@ -0,0 +1,78 @@ + +0 l/2 NULL 0 l +0 l/ NULL 0 l +0 r/ NULL 0 r +0 r- NULL 0 r +0 l- NULL 0 l +0 w/ NULL 0 w +0 j/ NULL 0 i +0 ; NULL 0 NULL +0 g- NULL 0 NULL +0 @- NULL 0 NULL +0 * NULL 0 r +0 : NULL 0 NULL + +0 ** NULL 0 r +0 R NULL 0 rr +0 v# NULL 0 b +0 v NULL 0 b +0 j NULL 0 i +0 J NULL 0 L +0 J^ NULL 0 L +0 n^ NULL 0 J +0 N NULL 0 n +0 B NULL 0 b +0 D NULL 0 d +0 Q NULL 0 g +0 z NULL 0 s +2 T s 0 s +0 T s 0 s + +0 a/ NULL 0 a +0 E NULL 0 e +0 O NULL 0 o +0 aI NULL 60 a i +0 eI NULL 60 e i +0 oI NULL 60 o i +0 aU NULL 60 a u +0 eU NULL 60 e u + +0 dZ NULL 0 tS +0 S NULL 60 s jj +0 Z NULL 60 s jj + +0 @ NULL 0 e +0 @2 NULL 0 e +0 @5 NULL 0 u +0 0 NULL 0 o +0 V NULL 0 a +0 U NULL 0 u +0 I NULL 0 i +0 I2 NULL 0 i +0 A: NULL 0 a +0 A@ NULL 60 a r +0 o: NULL 0 o +0 O: NULL 0 o +0 O@ NULL 60 o r +0 o@ NULL 60 o r +0 i: NULL 0 i +0 i@ NULL 60 i a +0 i@3 NULL 60 i r +0 u: NULL 0 u +0 U@ NULL 60 u r +0 3 NULL 60 e r +0 3: NULL 60 e r +0 @L NULL 40 e l +0 a2 NULL 0 a +0 aa NULL 0 a +0 e@ NULL 0 e r +0 oU NULL 0 o +0 OI NULL 60 o i +0 aI@ NULL 60 a e +0 aU@ NULL 0 a +0 t2 NULL 0 t +0 h NULL 0 NULL + + + + diff --git a/phsource/ph_kurdish b/phsource/ph_kurdish index 97d067e8..60bef0ea 100644 --- a/phsource/ph_kurdish +++ b/phsource/ph_kurdish @@ -2,35 +2,37 @@ phoneme i vowel starttype (i) endtype (i) - length 170 + length 190 formants vowel/i_6 endphoneme phoneme I - vowel starttype (i) endtype (i) - length 125 + vowel starttype (@) endtype (@) + length 110 formants vowel/ii# + before j vowel/ii endphoneme + phoneme e vowel starttype (e) endtype (e) length 220 - formants vowel/ii + formants vowel/e_3 endphoneme phoneme E vowel starttype (a) endtype (a) - length 160 - formants vowel/& + length 150 + formants vowel/ee_6 endphoneme phoneme E# - vowel starttype (@) endtype (@) - length 150 - formants vowel/ee# + vowel starttype (e) endtype (e) + length 140 + formants vowel/ee_2 endphoneme @@ -41,6 +43,13 @@ phoneme a endphoneme +phoneme 8 + vowel starttype (@) endtype (@) + length 160 + formants vowel/8_5 +endphoneme + + phoneme o vowel starttype (o) endtype (o) length 220 diff --git a/phsource/vowel/8_5 b/phsource/vowel/8_5 new file mode 100644 index 0000000000000000000000000000000000000000..40cba529cedad5e4b8710626e1eadd9aea340ab3 GIT binary patch literal 3353 zcmai$2~-qE8pmg<>Z|HwdZq_v7!^5WhGQ6RLAgOe1`xqJvKooXQ%S%W7mZ2OH5$(t zB|!|{M$}+7-WXjqiAO}Et1-F;PdpcmAzm0oMYH7r>U()_`+L>%@9OGr`n~$~|NDA% z?~>BHSC<}GqtQg?MS&)tiQH^%6riRbn(caNE zk}aA>qS5#vKO_jl`FO6CCas`oH2qLNG(nBwL!;S&cAzIo@3eWL$9lfd0oG^Q5dA~+ z%-FJc_rxy~or&`k$`Y<7zR@WpbyC_X=UwN~w6fIMoxBrQ#}4Z_Dsp#tR;U=<6lk-L z^MBx5Vry?b*KVozM_ylf`g;nV*`7B%YrM{T|I}`f&p@A5?P9$XJg>Tc)VinTL$kX{ zaJ9MQ7$>MZ3|@wv`U?FPeXahno*HiIztz8^H|m!wHla1c(wMW}~HpwvvQG?=#M;h^pm(F^=tCqX*sp@w`- z=8zA`2jpE+MEa62(ug-w zkx1j(4YfrolxwCFjY&o_s$&IcnWT}=YtL)*l?=2)m!W&2XQ~aTUSA?U(N7W$ai0dw zdaS1(YSsbPXL@%;ar@+`Q62lld=%RzZeyG|VQJFs&N*p9#+R8lGHWtsItQixoSdE@ z#CmjmFVYxsEz}fJ8r0vB9hha03o!ZD`Tk^UuohT@t#)e{>p1Iq>u8&&?_%FgzVW^t zY};4Bv<(EGSGp@cUub>WWLj$-~mRs zL#oMC5=oBZ5!e-d)YqUmTdnu6w_W$0h%B+qZheeq=ezlZTpv6Q;C~87VB%Hj}wdS)y$wGgno~3o^S2FUXAS@>gVf zh3^j^++K}h9nM9aj`WC3kGdJHO>|4?>2zlP)U~1OmCT0pL1}p@e<~UZ zWKGZn$NIpB_HcVemDH;{XOkH0(&}scQiWsI{vf^0SkQ_d{VsEd!)O& zwGOn*Grw*c>AKDZx%4;gR8!SQhIx`jU%yJ( zsM{@{kZy{y7$UsIPSL3}kEYRfv<^P!U;IU~imV`)Ne&!=T>4)+nhC-Zp`& zMe=@GqciJ7-37Tq?k-=G#z+sufACz(gm~dB`;Z0ljC1KAo-uxH|2zLeWoVsM%UAskr_$OKT_LuUYs~3wnK-gh{lkuLH!&v0`J)i?0W+A0fqjp z{ImTd0yfx79OHxiLQ}#Phk1t8g!~zFF>rUlHoslAgFa`xC9gscsqM)&2V0+Lg;;Hy4>IT~E4bU3`p*YOZ0tzDm(4CAw6dhfb$^ zB-hD1@b*OLn>N>o5?$gmDG)n zhd;<_Qbig`S19EbxPf;8HX1{F(PFxQ{y?u&3yWt1csDSEyZ1`&zTdHZ>;OM6VS|~# zN~o3&g~KF+T;hzrjWe(nKS0O1^PNUU{2J%_IBvo!aV0XL#6%LwL~@ujnGcI#2W*ED z&f8Y*wC`aN%Qz43#_lAaEGB!&S^iy~<^+CC=8`F7GMPo@lM1quEFmRi05lS zO0#Zu?UFgpIW6VA#FfztBZ7ky?MePS{m%K_^ZVA%>KE(V-Zt18Z8h5-`c4k;cZ>

+vc?!?YY+d-PT7f^V~i)SDG%l=DVi5&T^Ga^G&YiVdgpJ zPt0$cL(NxAb4`(^J+2*HXSwV!{-}Oq_(Y$lbkg;ZE2XZIuVj$w#jnIPai7pxIK~#T z3SPfWLN{T&ut9h%j2GjiaM`IFqKwq%8SLthYP@l>ajEe$;}D~paf2GCZZX&mbM=pu z;mT>Y T6oVYd%10V{6V2xSUXA_-KPF{7 literal 0 HcmV?d00001 diff --git a/phsource/vowel/ii# b/phsource/vowel/ii# index f3ec882b47b8b8d91180526f8d3d0afbe29320b5..d6238899b9163d91a268ec4efa8bd2f433cecb2d 100644 GIT binary patch delta 207 zcmZ3^wVX>RIKb68B-k~OnSp^JGgFy`Az`ABr5Xcw4-*FyP>A6GBZKG~#x;x}b`2YY rkQmbgF#854gW$$O4n`uCPJYPrYH}x&5s}I_KV*_2!Dxrc$t*_zD-R|2 delta 207 zcmZ3^wVX>RIKb68B-k~OnSp^JGgFy`A%3EerJ4g*4-*FyP>A6GBZK%IMh8X^djcDS skQmbgFnbQ?8KI4Z9E?ONo&1pL)#OelBO;Y=e#j(4g3%6>lUa@c01W>qo&W#< diff --git a/src/synthdata.cpp b/src/synthdata.cpp index 9d56f2bd..b03a8f4e 100755 --- a/src/synthdata.cpp +++ b/src/synthdata.cpp @@ -35,7 +35,7 @@ #include "translate.h" #include "wave.h" -const char *version_string = "1.36.12 10.Apr.08"; +const char *version_string = "1.36.13 13.Apr.08"; const int version_phdata = 0x013400; int option_device_number = -1; diff --git a/src/synthesize.cpp b/src/synthesize.cpp index 8b2c8de3..c132c594 100755 --- a/src/synthesize.cpp +++ b/src/synthesize.cpp @@ -1576,7 +1576,7 @@ int SpeakNextClause(FILE *f_in, const void *text_in, int control) if(!iswalpha(0x010d)) { // check that c-caron is recognized as an alphabetic character - fprintf(stderr,"Warning: Accented letters are not recognized, eg: U+010D\n"); + fprintf(stderr,"Warning: Accented letters are not recognized, eg: U+010D\nSet LC_CTYPE to a UTF-8 locale\n"); } } if(phoneme_callback != NULL)