From aa6b7a1858094ab827589d3370d7c9c69baa2e3f Mon Sep 17 00:00:00 2001 From: jonsd Date: Sun, 13 May 2007 23:10:45 +0000 Subject: [PATCH] lang=no added numbers and letter names lang=cs r-caron quieter after p,t,k,v lang=it,es,sk changed 'r' to use phoneme [R] git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@10 d46cf337-b52f-0410-862d-fd96e6ae7743 --- dictsource/cs_list | 8 +- dictsource/cs_rules | 8 +- dictsource/en_rules | 1 + dictsource/eo_list | 25 ++++- dictsource/eo_rules | 40 ++++--- dictsource/it_rules | 10 +- dictsource/no_list | 56 +++++++++- dictsource/no_rules | 4 + dictsource/pt_list | 233 +++++++++++++++++++++------------------- dictsource/pt_rules | 78 +++++++++----- dictsource/sk_rules | 18 +++- phsource/compile_report | 35 +++--- phsource/ph_czech | 18 ---- phsource/ph_greek | 1 - phsource/ph_hindi | 1 - phsource/ph_italian | 2 +- phsource/ph_portuguese | 4 +- phsource/ph_slovak | 19 +++- phsource/ph_spanish | 18 +--- phsource/phonemes | 2 +- phsource/r3/r_trill | Bin 5811 -> 5811 bytes phsource/voc/zh_2 | Bin 5808 -> 5808 bytes src/phonemelist.cpp | 2 +- src/synthdata.cpp | 2 +- src/tr_languages.cpp | 1 + 25 files changed, 354 insertions(+), 232 deletions(-) diff --git a/dictsource/cs_list b/dictsource/cs_list index 88ad7790..74d77980 100644 --- a/dictsource/cs_list +++ b/dictsource/cs_list @@ -95,7 +95,7 @@ _0 n'ula _1 j'eden _2 dv'a _2f dvj'e -_3 tR^i +_3 tR^/i _4 tSt'iR^i _5 p'jet _6 S'est @@ -105,7 +105,7 @@ _9 d'evjet _10 d'eset _11 j'edena:tst _12 dv'ana:tst -_13 tR^'ina:tst +_13 tR^/'ina:tst _14 tSt'r-na:tst _15 p'atna:tst _16 S'estna:tst @@ -113,7 +113,7 @@ _17 s'edumna:tst _18 'osumna:tst _19 d'evatena:tst _2X dv'atset -_3X tR^'itset +_3X tR^/'itset _4X tSt'iR^itset _5X p'adesa:t _6X S'edesa:t @@ -123,7 +123,7 @@ _9X d'evadesa:t _0C s'et _1C st'o _2C dvj'esc'e -_3C tR^'ist'a +_3C tR^/'ist'a _4C tStiR^ist'a _1M1 c'isi:ts diff --git a/dictsource/cs_rules b/dictsource/cs_rules index 684182cf..5073bcff 100644 --- a/dictsource/cs_rules +++ b/dictsource/cs_rules @@ -384,16 +384,20 @@ _mícha) ni n^i // A) r (A * // C) r (A @-* // rr *r +// right rajt K) r (K r- -// right rajt - r R + rr R right Rajt .group ř ř R^ + p) ř R^/ // quieter after unvoiced consonant + f) ř R^/ + t) ř R^/ + k) ř R^/ .group s s s diff --git a/dictsource/en_rules b/dictsource/en_rules index 349ed165..29311729 100644 --- a/dictsource/en_rules +++ b/dictsource/en_rules @@ -3106,6 +3106,7 @@ kn (it n kn (ob n kn (ow n + kha kA: khar kA@ _) ki (lC@ kI2 diff --git a/dictsource/eo_list b/dictsource/eo_list index d62ab732..2255f862 100644 --- a/dictsource/eo_list +++ b/dictsource/eo_list @@ -5,8 +5,8 @@ _0 nul _1 'unu _2 d'u -_3 tr'i -_4 kv'ar +_3 t@-r'i +_4 kv'aR _5 kv'in _6 s'es _7 s'ep @@ -14,8 +14,8 @@ _8 'ok _9 n'aU _1X d'ek _2X d'udek -_3X tr'idek -_4X kv'ardek +_3X t@-*'idek +_4X kv'aRdek _5X kv'indek _6X s'esdek _7X s'epdek @@ -35,6 +35,23 @@ _. punkto t.e t'e,e +// Abbreviations +a.k ,antaUk@-*'isto +akk alinome +anst anstataU +bea $abbrev +ekz ekzemple +i.a 'i'a +k.a kaIal'iaI +k.c kaItset'eRe +n.b n'otu||b'one +nro numeRo +pĝ paZo +p.k p,ostk@-*'isto +uea $abbrev +uk $abbrev + + // includes both accented characters and ascii digraph alternatives (cx, gx, ux, etc) l' la diff --git a/dictsource/eo_rules b/dictsource/eo_rules index 1b3af2e4..1714040b 100644 --- a/dictsource/eo_rules +++ b/dictsource/eo_rules @@ -33,6 +33,9 @@ _) d(_ do d d + _) d (-ro_ dokt'o + _) d (-rino_ d,okto + .group e _) e(_ e e e @@ -44,6 +47,9 @@ .group f _) f(_ fo f f + + _) f (-ino_ fR%aUl + _) f (-lo_ fRaU .group g _) g(_ go @@ -63,6 +69,7 @@ .group i _) i(_ i i i + .group j _) j(_ jo @@ -79,6 +86,9 @@ _) l(_ lo l l ll (_ l + + -) lo (_ l%o + .group m _) m(_ mo @@ -88,6 +98,9 @@ _) n(_ no n n n (_S1 n + + _) n (-ro_ num'e + .group o _) o(_ o @@ -107,12 +120,12 @@ qu kv .group r - _) r(_ ro - r r - rr @-*r - A) r (A * -// A) r (A @-* + _) r(_ Ro + r R + A) r (A R C) r (A @-* + + -) ro (_ R%o .group s _) s(_ so @@ -122,6 +135,9 @@ sx S sh (K S // foreign words K) sh S // foreign words + + _) s (-ino_ s,injoR + _) s (-ro_ sinj'o .group t @@ -184,8 +200,8 @@ = ,,egala, - \ malantaIstreko - / streko + \ malantaIst@-*eko + / st@-*eko ' + plus _) ++ (_ plusplus @@ -196,16 +212,16 @@ . (D _:k'omo_ - * asterisko + * asteRisko pundo (D _pundOI_: - ! ,ekkrio, + ! ,ekk@-*io, : dupunkto - _ - (_a - $ dolaro - $ (D _dolarOI_: - % protsento + $ dolaRo + $ (D _dolaROI_: + % p@-*otsento @ po & %kaI diff --git a/dictsource/it_rules b/dictsource/it_rules index 6fe308d8..d06a2c31 100644 --- a/dictsource/it_rules +++ b/dictsource/it_rules @@ -218,10 +218,12 @@ qu kw .group r - _) r(_ ERRe - r R - rr RR - A) r (A r + _) r(_ ER*e + C) r @-* + r r + _) r R + rr R* + A) r (A R .group s _) s(_ Esse diff --git a/dictsource/no_list b/dictsource/no_list index 2c99c726..ed4ddcc9 100755 --- a/dictsource/no_list +++ b/dictsource/no_list @@ -9,6 +9,27 @@ // character names //**************** +a A: +b be: +c se: +d de: +f Ef +g ge: +h ho: +j je: +k ko: +l El +m e:m +n En +p pe: +q ku-: +r Err +s Es +t te: +v ve: +w d'Ob:e:l,ve: +x Eks +z sEt // numeric @@ -16,16 +37,41 @@ _0 n'Ul _1 'E:n _2 t'u: -_3 tr'e: -_4 f'i:rE +_3 t@-*'e: +_4 f'i:*E _5 f'E:m _6 s'Eks _7 S'u-: _8 'Ot:@2 _9 n'i: +_10 t'i: +_11 'Elle:v@2 +_12 t'u:lv +_13 t@-*'Et:@n +_14 fj'Urt@n +_15 f'e:mt@n +_16 s'e:kst@n +_17 s'yt:@n +_18 'At:@n +_19 n'It:@n +_2X s;'u-:@2 +_3X t@-*'Et:i: +_4X f'Y:rti: +_5X f'e:mti: +_6X s'e:ksti: +_7X s'yt:i: +_8X 'Ot:i: +_9X n'It:i: +_0C h'u-:nd@-*e:d@2 +_0M1 t'u-:s@n +_1M2 m'Illi:;,u:n +_0M2 m'Illi:;,u:n@r +_0and u:g +_dpt kOmmA + // abbreviations //************** @@ -164,5 +210,11 @@ bare $u // only også $brk // also +// letters which are also words +_å o: +å o: $atend +_i i: +i i: $atend + // MAIN WORD DICTIONARY //********************* diff --git a/dictsource/no_rules b/dictsource/no_rules index e712609a..0359a1dc 100644 --- a/dictsource/no_rules +++ b/dictsource/no_rules @@ -120,6 +120,8 @@ .group r r r + K) r @-* + A) r (A * r) r rs (_ S @@ -192,4 +194,6 @@ .group é 'e: + ü y: + diff --git a/dictsource/pt_list b/dictsource/pt_list index ab80e73e..3c01bd11 100755 --- a/dictsource/pt_list +++ b/dictsource/pt_list @@ -1,4 +1,4 @@ - + // This file in UTF8 encoded // Options @@ -53,7 +53,7 @@ _- 'ifeIN _/ b'aQ& _: d,oIsp'oNtus _; p,oNtu_iv'irgul& -_< men'Or +_< men'Or ?1 _= igw'al ?2 _= igw'aU _> maI'Or @@ -73,8 +73,8 @@ _} f,ES&S'avi ?2 _~ tS'iU _¡ ,eskl&mas,&U~,iNvertS'id& _¿ ,iNtex,ogas,&U~,iNvertS'id& -?1 _" 'ab@-*i;'asp&S d'upl&S -?2 _" 'ab@-*i;'asp&z d'upl&s +?1 _" 'ab@-*i;'asp&||Sd'upl&S +?2 _" 'ab@-*i;'asp&||d'upl&s // numeric @@ -138,7 +138,7 @@ _1C0 s'eIN _1C s'eINtu ?1_2C duz'eINtuS ?2_2C duz'eINtuz -?1_3C trez'eNtuS +?1_3C t:ryz'eNtuS ?2_3C t@-*ez'eNtuz ?1_5C kin^'eINtuS ?2_5C kin^'eINtuz @@ -165,41 +165,41 @@ _0Z3 mil'Ezim& // 1000ths // ABBREVIATIONS //************** aapp $abbrev -abadv $abbrev +abadv $abbrev abc $abbrev a.c 'as'e -adsl $abbrev -ae $abbrev -aids $abbrev -apedv $abbrev +adsl $abbrev +ae $abbrev +aids $abbrev +apedv $abbrev avc $abbrev bios b'i,OS d.c d,es'e cne $abbrev -cpu $abbrev -cpuc $abbrev -dpoc $abbrev +cpu $abbrev +cpuc $abbrev +dpoc $abbrev ecg $abbrev -edp $abbrev +edp $abbrev ?1 etc ,ets'Et:r& ?2 etc ,ets'Ete*& hiv $abbrev (http ://) ag,atete'pe_ -icc $abbrev -IEEE $abbrev // Institute of Electrical and Electronics Engineers +icc $abbrev +ieee $abbrev // Institute of Electrical and Electronics Engineers iss $abbrev jpeg Z,Ot&p'Eg mpeg ,Emp'Eg nba $abbrev -nvda $abbrev +nvda $abbrev oms $abbrev omt $abbrev -osi $abbrev +osi $abbrev ?1 sa ,Esj'a ?1 sos ,Esj,O'Es -ue $abbrev -unts $abbrev -usb $abbrev +ue $abbrev +unts $abbrev +usb $abbrev // articles @@ -539,20 +539,23 @@ mortos $alt porte $alt norte $alt corpos $alt +modo $alt modos $alt fogos $alt sorte $alt toque $alt bloco $alt -blocos $alt +blocos $alt floco $alt -flocos $alt +flocos $alt +lopes $alt +jogos $alt // Open [E] nela n'El& nessa n'Es& -era 'Er& +era 'Er& abacaxi abakaSi axé aSE @@ -564,52 +567,61 @@ roxo x'oSu // foreign words ?1 alt 'alt ?1 bacalhau b,&k&lj'aU -?1 back _^_EN -?1 blind _^_EN -?1 braille b:r'aily -?1 cancel _^_EN -?1 caps _^_EN -?1 ctrl k'oNt:r,Ol -?2 ctrl k'oNt:r,OU -?1 delete _^_EN -?1 design _^_EN -?1 down _^_EN -?1 download _^_EN -?1 end _^_EN +?1 back b'Ek +?1 blind bl'aind +?1 braille b:r'aily +?1 cancel k'&ns'El +?1 caps k'aps +?1 com kom + ctrl k'oNt:r,Ol +?1 dat d'at +?1 doc d'Ok +?1 delete d'il'it +?1 design d,iz'ain +?1 down d'a,wn +?1 download d'a,wnl'oud +?1 end 'end ?1 escape Sk'eIpy -?1 eyes _^_EN -?1 gmail g,em'eIl +?1 exe 'Ezy +?1 explorer ,ekspl'O:r&@- +?1 eyes 'aiz +?1 gmail g,em'eIl ?1 google g'u:g&l -?1 hardware _^_EN -?2hardware h'ardwe@ -?1 home _^_EN -?1 hotmail _^_EN -?1 install _^_EN +?1 hardware 'ard,w'E@ +?2 hardware h'ardwe@ +?1 home 'omy +?1 hotmail 'Otm'eIl +?1 install ,inst'al ?1 kernel k'Ern,El ?2 kernel k'ErnEU -?1 line _^_EN +?1 line l'ain layout l'eI,aUt -?1 lock _^_EN -?1 mail _^_EN -?2 mail m'eja +?1 lock l'Ok +?1 mail m'eIl +?1 maior m'&j'O@ +?2 maior maI'Or +?1 menor myn'O@ +?2 menor men'Or ?1 menu menu -?1 next _^_EN +?1 next n'Ekst ok Ok'eI +?1 ovo 'ovu ?1 pause p'au:z -?1 page _^_EN -?1 scanner _^_EN -?1 shift S'ift -?1 scroll _^_EN -site s'aIt -software s'Oftwe@ -?1 space _^_EN -?1 sporting sp'Ort,ing -?1 tab t'ab -?1 up _^_EN -?1 upload _^_EN -?1 window _^_EN -?1 yahoo _^_EN -?1 yes _^_EN +?1 page p'eIdZ +?1 readme r'i:dmi: +?1 scanner sk'En&@ +?1 shift S'ift +?1 scroll sk:r'ol + site s'aIt + software s'Oftwe@ +?1 space sp'eIsy +?1 sporting sp'Ort,ing +?1 tab t'ab +?1 up &p +?1 upload &pl'oud +?1 window w'iNd'ou +?1 yahoo 'i,a'u +?1 yes j'Es // common person names @@ -618,54 +630,49 @@ louis _^_FR // foreign product names -?1 access _^_EN -?1 adobe &d'Oby -?1 debian _^_EN -?2 debian d'Ebj&~N -?1 excel _^_EN -?1 express _^_EN -espeak isp'i:k -espeakedit isp'i:k,Ed,it -?1 fedora _^_EN -?1 firefox _^_EN -?2 firefox f'ai@foks -?1 front _^_EN -?1 hal _^_EN -?1 jaws dZ'au:z -?1 linux l,in'uks -?2 linux l'inuks -?1 live _^_EN -?1 maker _^_EN -?1 media _^_EN -?1 messenger _^_EN -?1 microsoft m,ik:r'os,Oft -?1 movie _^_EN -?1 nero n'E:ru -?1 office _^_EN -openoffice 'opeIN|'Ofis -?1 outlook _^_EN -?1 paint p'aint -?1 player _^_EN -?1 point _^_EN -?1 power _^_EN -?1 product _^_EN -?1 Publisher _^_EN -?1 reader _^_EN -?1 setup _^_EN -?1 scout _^_EN // Nero Scout -?1 skype _^_EN -slackware sl'akwe@ -?1 smart _^_EN // nero StartSmart -speak spi:k -suse z'u:ts@ -?1 start _^_EN // nero StartSmart -?1 time _^_EN // nero show time -ubuntu ub'untu -?1 unix ,u:n'iks -?2 unix j'u:niks -?1 windows _^_EN -?1 WinRAR _^_EN - +?1 access 'aks,Es +?1 adobe &d'Oby + debian d'Ebj&~N +?1 excel ,Eks'El +?1 express ,Ekspr,Es + espeak isp'i:k +?1 espeakedit isp'i:k,Ed,it +?1 fedora _^_EN + firefox f'ai@foks +?1 front f:r'ont +?1 jaws dZ'au:z +?1 linux l,in'uks +?2 linux l'inuks +?1 live l'aiv +?1 maker m'eIk&@ +?1 media m'Ed,i& +?1 messenger m'Es&ndZ&@ +?1 microsoft m,ik:r'os,Oft +?1 movie m'uvi +?1 nero n'E:ru +?1 office 'Of,is + openoffice 'opeIN|'Ofis +?1 outlook 'autl'uk +?1 paint p'aint +?1 player pl'eI&@- +?1 point p'oint +?1 power p'aU&@ +?1 product p:r'&d&kt +?1 Publisher p'&bl,iS&@ +?1 reader _^_EN +?1 setup s'Et'&p +?1 scout sk'aut // Nero scout +?1 skype sk'aip + slackware sl'akwe@ +?1 smart sm'art // nero StartSmart + speak spi:k + suse z'u:ts@ +?1 start st'art // nero StartSmart +?1 time t'aImy // nero show time + ubuntu ub'untu +?1 unix ,u:n'iks +?2 unix j'u:niks +?1 windows w'iNd'ou:z // historical/famous person names @@ -703,10 +710,15 @@ von f'On // foreign common names/surnames +?1 alison &l'is&N +?1 cleverson kl'Evyrs&N +?1 elton 'Elt&N +?1 halison &l'is&N klein kl'aIn // Very common on southern Brazil. krueger k@-*'iZer krüger k@-*'iZer kühl k'il +?1 nelson n'Els&N mueler m'iler mueller m'iler müler m'iler @@ -717,3 +729,4 @@ volkmann f'Olkman + diff --git a/dictsource/pt_rules b/dictsource/pt_rules index 52424461..b4b8fcc5 100755 --- a/dictsource/pt_rules +++ b/dictsource/pt_rules @@ -1,4 +1,4 @@ -// translation rules Brazilian +// translation rules Brazilian // This file is UTF-8 encoded // Options @@ -29,6 +29,7 @@ ?1 p) a (d_ =E a (CC_ & ?1 al (_ 'al // eg: Portugal, capital, etc. +//?1 al (C ''al // Algarve, alto, etc... ?2 al (K aU ?2 alh alj @@ -40,6 +41,7 @@ a (nhA &~ am (_ =&U~ ?1 a (z_ 'a //eg: paz, rapaz, capaz, etc... +?1 C) acç 'a's // eg: selecção, etc... ai aI ai (s aI @@ -157,23 +159,35 @@ ?1 _) es (C@@ S // drop initial "e". ?1 _) e (f i // efectuar, etc. ?1 _n) e (nhu i // eg: nenhum, nenhuma, nenhuns, nenhumas. +?1 e (la_ 'E // eg: cadela, janela, vela, etc... ?1 C) e (cC ,E // eg: seleccionar, efectuar, etc... ?1 C) ecç 'E's // eg: selecção, etc... ?1 C) e (ã i // leão, panteão, etc. ?1 C) e (a i // oceano, etc. +?1 C) e (o 'i // eg: geologia, etc... +?1 C) e (ú i // conteúdo, etc. +?1 Cã) e j // cães, mãe, etc... +?1 d) e (fici y // deficiênte, deficiência, etc... ?1 _d) e (fini y //definições. -?1 _d) e (slig y // desligar. -?1 _d) e (sloc y // eg: deslocamento, etc... -?1 _f) e (ch y // fechar -?1 _t) e (rmin y // terminar. +?1 _d) e (slig y // desligar. +?1 _d) e (sloc y // eg: deslocamento, etc... +?1 _f) e (ch y // fechar +?1 _p) e (rcentag y // percentagem +?1 p) e (ssoa y //pessoal, pessoais, etc. +?1 pr) e (f y // preferências, etc. +?1 _t) e (rmin y // terminar. ?1 _r) e (cicl y // recicla, reciclagem, etc... -?1 _f) e (rramenta y // ferramenta, ferramentas. -?1 _p) e (squ y // pesquisar +?1 _v) e (loci y // velocidade +?1 _f) e (rramenta y // ferramenta, ferramentas. +?1 _p) e (squ y // pesquisar ?1 hip) e (r ,E // eg: hiper ?1 sup) e (r ,E // super -?1 int) e (rn ,E // Interno -?1 n) e (t ,E // eg: net -?1 e (l_ ,E // eg: possível, manuel, etc... +?1 _m) e (ga ,E // mega +?1 _int) e (rn ,E // Interno +?1 n) e (t 'E // eg: net +?1 e (l_ 'E // eg: possível, manuel, etc... +?1 v) e (l_ ,E // eg: possível, amovível, disponível, etc... +?1 l) e (ta 'E // eg: bicicleta, atleta. .group é @@ -210,19 +224,19 @@ .group g ?1 _) g (_ ge -?1 _) g (_W Ze // within an acronym +?1 _) g (_W Ze // within an acronym _) g (_ Ze g g g (g - g (Y Z // ge gi + g (Y Z // ge gi gu (Y g ?1 guen (C gw'eIN // aguenta, etc. -?1 n) gu (A gw // eg: língua, etc. -?1 gu (ém_ g // eg: alguém, ninguém, etc... +?1 n) gu (A gw // eg: língua, etc. +?1 gu (ém_ g // eg: alguém, ninguém, etc... .group h - _) h (_ ag'a + _) h (_ ag'a h // silent @@ -268,6 +282,7 @@ úC) i (A_ j úCC) i (A_ j +?1 _) i (ntern 'i //inter ?1 @) ing (_ _^_EN ?1 @) ings (_ _^_EN @@ -301,11 +316,11 @@ l (l lh l^ A) lh lj -?1 A) lh l^ // ?? +?1 A) lh l^ // .group m -?1 _) m (_W 'Em; +?1 _) m (_W Em; ?1 _) m (_ Em _) m (_ 'eme m m @@ -313,7 +328,7 @@ .group n -?1 _) n (_W 'En +?1 _) n (_W En; ?1 _) n (_ En _) n (_ 'ene n n @@ -337,7 +352,7 @@ oy OI o (Ca_ O -?1 ol (_ Ol +?1 o (l_ 'O ?2 ol (K Ow ?2 olh olj @@ -356,9 +371,13 @@ o (zes_ O o (ra_ O o (ras_ O -?1 _) o (C O // eg: olá, orla, opção, etc... -?1 _C) o (CACACC u // Documento, documentação, etc. -?1 C) o (CCAC u // formatar, formato. +?1 _) o (C O // eg: olá, orla, opção, etc... +?1 _C) o (CACAC u // Documento, documentação, localizar, etc. +?1 f) o (rmat u // formatar, formato. +?1 _p) o (rtuC u // Portugal, Portucalense, etc... +?1 _s) o (lu u // solução, soluções. +?1 interr) o (g u // eg: interrogação +?1 f) o (rmulá u // eg: formulário, formulários. .group ô @@ -401,6 +420,7 @@ qu (K ku ?1 _) qua kwa // quatro, etc. ?1 _) que ke // quente, etc. +?1 _) quei (C k'eI // queira, queima, etc... ?1 C) quen (C kw'eIN // cinquenta, etc. ?1 A) quen (C kw'eIN // frequência, etc. ?1 quec kes // esquece, etc. @@ -436,16 +456,16 @@ .group s -?1 _) s (_W 'Es|; within an acronym [s]+[;] not [s;] phoneme -?1 _) s (_ 'Es -?2 _) s (_ 'Ese +?1 _) s (_W Es|; within an acronym [s]+[;] not [s;] phoneme +?1 _) s (_ Es +?2 _) s (_ Ese s s ss s sc (Y s sç s A) s (A z ?1 @) s (_ S -?2 @) s (_ s +?2 s (_ s @) s (_A z // next word starts with vowel @) s (_G z // next word starts with voiced consonant @@ -534,8 +554,8 @@ .group y -?1 _) y (_ 'ipsil,ON -?2 _) y (_ 'ipsiloN +?1 _) y (_ 'ips,ilON +?2 _) y (_ 'ipsiloN y i y (A j @@ -559,6 +579,7 @@ ç s _) ç (_ s'esed'il^& + ü u ß s @@ -606,3 +627,4 @@ + diff --git a/dictsource/sk_rules b/dictsource/sk_rules index 61219cb6..6afb16aa 100644 --- a/dictsource/sk_rules +++ b/dictsource/sk_rules @@ -332,17 +332,27 @@ _administratív) n (e n qu kv .group r - r r - A) r (A * - C) r (A @-* - rr *r +// r r +// A) r (A * +// C) r (A @-* +// rr *r K) r (K r- + r R + rr R .group ŕ ŕ r: +.group ř // Czech r-caron + ř R^ + p) ř R^/ // quieter after unvoiced consonant + f) ř R^/ + t) ř R^/ + k) ř R^/ + + .group s s s diff --git a/phsource/compile_report b/phsource/compile_report index acd57941..71e23070 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -18,16 +18,16 @@ hu 24 109 nl 25 112 pl 17 103 - sk 23 118 - cs 7 119 - hr 16 122 + sk 25 120 + cs 5 120 + hr 16 124 ru 36 120 - it 28 111 - es 7 111 - pt 25 126 - pt_pt 17 126 - ro 36 135 - el 7 111 + it 28 112 + es 6 112 + pt 25 127 + pt_pt 17 127 + ro 36 136 + el 7 112 sv 25 114 no 29 118 is 27 113 @@ -184,25 +184,25 @@ 1 r3/r_i base 7 r3/r_n base cy eo fr pl ru it 1 r3/r_o base - 2 r3/r_trill base cs - 2 r3/r_trill.wav base cs + 1 r3/r_trill base + 1 r3/r_trill.wav base 1 r3/r_u base 30 r3/rx base af cy eo fr fr_ca pl ru it pt_pt ro is - 1 r3/rz_cs cs + 2 r3/rz_cs sk 2 r3/@tap base 2 r3/@tap_i base 7 r/r base en_sc de fr hu it 5 r/_r base en_sc fr hu it - 18 r/r_ base en_sc af cy de eo fi fr hu nl pl ru ++ + 17 r/r_ base en_sc af cy de eo fi fr hu nl pl ru ++ 1 r/r@ base 1 r/ra base 1 r/re base 1 r/ri base 1 r/ro base - 32 r/rr base af cy de eo fi nl pl ru it es ro ++ + 30 r/rr base af cy de eo fi nl pl ru it ro no ++ 1 r/ru base 15 r/tr base en_sc fr hu it - 63 r/trr base af cy de eo fi nl pl ru it es ro ++ + 60 r/trr base af cy de eo fi nl pl ru it ro sv ++ 11 r/xr base 1 ufric/ch base 3 ufric/f base de ro @@ -252,7 +252,7 @@ 26 ustop/t_dnt base fi fr hi hu pl hr ru it ro vi sw 2 ustop/t_dnt2 hi vi 4 ustop/t_pzd pl ru - 9 ustop/tr base hi sk ru el + 5 ustop/tr base hi ru 8 ustop/ts de eo hu pl ru it ro zh_yue 2 ustop/tsh base zh_yue 2 ustop/tsh_ base zh_yue @@ -392,8 +392,9 @@ 2 vocw/zh_rfx base 3 voc/z base fr ro 3 voc/z_ base fr ro - 4 voc/zh base cs ro + 4 voc/zh base sk ro 3 voc/zh_ base ro + 1 voc/zh_2 sk 2 voc/z_pzd base 2 voc/z_pzd_ base 14 vowel/@ base en en_us en_rp cy hi hr diff --git a/phsource/ph_czech b/phsource/ph_czech index 27a88549..b1beb6eb 100644 --- a/phsource/ph_czech +++ b/phsource/ph_czech @@ -23,22 +23,4 @@ phoneme u: endphoneme -phoneme R^ - vcd pla frc sibilant - vowelin f1=0 f2=1700 -300 300 f3=-300 80 - vowelout f1=2 f2=1700 -300 300 f3=-300 80 brk - formants voc/zh+r3/rz_cs%60 - lengthmod 6 -endphoneme - -phoneme R - liquid - vowelin f1=0 f2=1700 -300 300 f3=-300 80 - vowelout f1=2 f2=1700 -300 300 f3=-300 80 brk - formants r3/r_trill+r3/r_trill.wav%60 - lengthmod 6 -endphoneme - - - diff --git a/phsource/ph_greek b/phsource/ph_greek index 9a0d59ad..5867a81e 100644 --- a/phsource/ph_greek +++ b/phsource/ph_greek @@ -33,7 +33,6 @@ phoneme t // revert to alveolar /t/ lengthmod 2 wave ustop/t_short%80 before _ ustop/t_ - before r ustop/tr switchvoicing d endphoneme diff --git a/phsource/ph_hindi b/phsource/ph_hindi index 54092416..5eb28f87 100644 --- a/phsource/ph_hindi +++ b/phsource/ph_hindi @@ -387,7 +387,6 @@ phoneme t. lengthmod 2 wave ustop/t_short before _ ustop/t_ - before r ustop/tr switchvoicing d endphoneme diff --git a/phsource/ph_italian b/phsource/ph_italian index f8734d3a..f4de9edc 100644 --- a/phsource/ph_italian +++ b/phsource/ph_italian @@ -153,7 +153,7 @@ endphoneme -phoneme R +phoneme R2 liquid starttype r endtype r length 100 lengthmod 7 diff --git a/phsource/ph_portuguese b/phsource/ph_portuguese index d5090264..7be7b497 100644 --- a/phsource/ph_portuguese +++ b/phsource/ph_portuguese @@ -50,7 +50,7 @@ endphoneme phoneme y vowel starttype (@) endtype (@) - length 100 + length 110 formants vowel/i#_5 endphoneme @@ -96,7 +96,7 @@ endphoneme phoneme U vowel starttype (u) endtype (u) - length 100 + length 110 beforevowel w formants vowel/u_6 endphoneme diff --git a/phsource/ph_slovak b/phsource/ph_slovak index b304ae67..1b2a16aa 100644 --- a/phsource/ph_slovak +++ b/phsource/ph_slovak @@ -107,6 +107,23 @@ phoneme r: formants vowelr/r-voc endphoneme +phoneme R^ // Czech r-caron + vcd pla frc sibilant + vowelin f1=0 f2=1700 -300 300 f3=-300 80 + vowelout f1=2 f2=1700 -300 300 f3=-300 80 brk + formants voc/zh+r3/rz_cs%50 + lengthmod 6 +endphoneme + +phoneme R^/ // Czech r-caron (weaker, for after p,f,t,k) + vcd pla frc sibilant + vowelin f1=0 f2=1700 -300 300 f3=-300 80 + vowelout f1=2 f2=1700 -300 300 f3=-300 80 brk + formants voc/zh_2+r3/rz_cs%30 + lengthmod 6 +endphoneme + + phoneme l- vowel starttype (@) endtype (@) length 140 @@ -145,8 +162,6 @@ phoneme t lengthmod 2 wave ustop/t_short before _ ustop/t_ - before r ustop/tr - before R ustop/tr switchvoicing d endphoneme diff --git a/phsource/ph_spanish b/phsource/ph_spanish index e2f8652c..7fb35eda 100644 --- a/phsource/ph_spanish +++ b/phsource/ph_spanish @@ -32,23 +32,6 @@ phoneme g endphoneme - - - -phoneme R - liquid starttype r endtype r - length 100 - lengthmod 7 - beforenotvowel r/ - trill - formants r/rr - after _ r/rr - after t r/trr p r/trr k r/trr - before _ r/r_ -endphoneme - - - phoneme D vcd dnt frc vowelout f1=0 f2=1700 -300 300 f3=-100 60 len=50 @@ -58,6 +41,7 @@ phoneme D switchvoicing T endphoneme + phoneme s vls alv frc sibilant vowelin f1=0 f2=1700 -300 300 f3=-100 80 diff --git a/phsource/phonemes b/phsource/phonemes index 750ecff2..fd1edaed 100644 --- a/phsource/phonemes +++ b/phsource/phonemes @@ -383,7 +383,7 @@ phoneme R liquid vowelin f1=0 f2=1700 -300 300 f3=-300 80 vowelout f1=2 f2=1700 -300 300 f3=-300 80 brk - formants r3/r_trill+r3/r_trill.wav%45 + formants r3/r_trill+r3/r_trill.wav%50 trill lengthmod 6 endphoneme diff --git a/phsource/r3/r_trill b/phsource/r3/r_trill index 45211f84165ea5e78dacecf7929129ddc7e36766..bf0453a6b0a1e4a8043a343d84bc562916a2b703 100644 GIT binary patch delta 172 zcmdn2yIFUFe!TgMsY<;{(QTyn>7kJP@{{;BTfYybw0X$OP#b%pf%k41ydL xa%w=GAT|So2D>tZvvI2f^W>fEDw`!)<}r*O-20{|40D{cS) delta 150 zcmdn2yIFUF{$yrhnJ`0+6ATOt5lj(Gk&IOgk&FxsUl_kIW^nQYF$04dlN!?zE^Z)( zu)pyNGJfNQsCN|n&EzP^z_5pD4-?P`h8j^ATaaV&Mt-r4+wGXe?|@{0z=3&pt2~%B fm63(PdovHq8s^Dgm{m95W#7ik7`1r{w>&ohn9?DJ diff --git a/phsource/voc/zh_2 b/phsource/voc/zh_2 index 72c6bdfb71a4d97e351aea7eb52952674f57c29a..f063c783f8aca2415274abfcd6d8475054f5a285 100644 GIT binary patch delta 19 bcmdm>yFqt?6QjdM=flj5ESuR`RtfyFqt?6C=Y$=flj5E}Pj|Rtfmnemonic == 'v') || (ph->mnemonic == ((';'<<8)+'v')) || (ph->mnemonic == (('^'<<8)+'R'))) + if((ph->mnemonic == 'v') || (ph->mnemonic == ((';'<<8)+'v')) || ((ph->mnemonic & 0xff)== 'R')) type = phLIQUID; } diff --git a/src/synthdata.cpp b/src/synthdata.cpp index 0d5d0db0..60e6f586 100755 --- a/src/synthdata.cpp +++ b/src/synthdata.cpp @@ -35,7 +35,7 @@ #include "translate.h" #include "wave.h" -const char *version_string = "1.24.08 12.May.07"; +const char *version_string = "1.24.09 13.May.07"; const int version_phdata = 0x012201; int option_device_number = -1; diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp index 9a3e2a91..1bdeac79 100644 --- a/src/tr_languages.cpp +++ b/src/tr_languages.cpp @@ -357,6 +357,7 @@ Translator *SelectTranslator(const char *name) tr->langopts.stress_rule = 0; SetLetterVowel(tr,'y'); + tr->langopts.numbers = 0x11049; } break;