diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes index beb1caf9..274de6d3 100644 --- a/dictsource/dict_phonemes +++ b/dictsource/dict_phonemes @@ -68,7 +68,7 @@ r R R3 s S t T tS v w x z Z -Dictionary hu_dict 2013-03-12 +Dictionary hu_dict 2013-03-13 a A a: e E e: i i: o o: u u: Y y y: Y: diff --git a/dictsource/hu_rules b/dictsource/hu_rules index 71c6573e..d99e1978 100644 --- a/dictsource/hu_rules +++ b/dictsource/hu_rules @@ -459,8 +459,9 @@ shetlan) d (szige d szaba) d (szem d _tren) dsz (e d|s vakon) d (sz d -vé) d (jeggy d -své) d (zseb d + vé) d (jeggy d + své) d (zseb d + csalá) d (szer d .group dz fogó) dz (kod ts @@ -646,6 +647,7 @@ csilla) g (gy g han) g (gy g hazugsá) g (gy g tőze) g (gy g +doppin) g (gy g .group gy gy J @@ -1023,8 +1025,9 @@ szivárvá) ny (játsz n^ _elle) n (jav n vagyo) n (jog n nny (elv n|n^ -haszo) n (jár n + haszo) n (jár n boszorká) ny (jelet n^ + káno) n (jog n .group o o o @@ -1166,8 +1169,8 @@ _tetszé) s S ki) s (szőlő S körö) s (szeg S kolbászo) s S -feldolgozá) s S -_ki) s (szín S +feldolgozá) s S + _ki) s (szín S .group ss ssz ss2 @@ -1763,8 +1766,8 @@ fáklyá) sz (ene Sz pénze) sz (k s ellenállá) sz (ón Sz ré) sz (árás Sz -_te) szts (or st|S -serté) szs (ir S|Z + _te) szts (or st|S + serté) szs (ir S|Z .group t t t @@ -1909,6 +1912,8 @@ szögle) t (szob t zár) t (szék t szé) t (szortír t _robo) t (szoftve t + diva) t (cirk t + álla) t (cirk t .group tj C) tj c @@ -1996,7 +2001,7 @@ _tisztele) tj (el tj zené) tj (átsz tj szen) tj (akab tj közérze) tj (aví tj -ké) tj (átszm tj + ké) tj (átszm tj .group ts ts (_S2 tS //general rule with word end of ts letters @@ -2213,7 +2218,7 @@ felira) ts (áv t|S leme) tsz (vén ts _cha) tsz (ob t|s robo) ts (of t|S -merényle) ts (or t|S +merényle) ts (or t|S .group tt diff --git a/dictsource/pt_list b/dictsource/pt_list index 45e03d84..dcd1d75d 100755 --- a/dictsource/pt_list +++ b/dictsource/pt_list @@ -645,7 +645,7 @@ alcateia $alt alferes $alt algozes $alt alicerce $alt -almoço alt $verb +almoço $alt $verb amarelo $alt ameba $alt amores $alt2 @@ -859,6 +859,7 @@ jogo $alt2 $noun joguete $alt2 lambreta $alt2 lebre $alt +lembrete $alt2 leste $alt2 $verb lopes $alt maior $alt @@ -939,6 +940,7 @@ polca $alt porcos $alt porrete $alt2 porra $alt2 +porto $alt2 portos $alt pose $alt2 povos $alt diff --git a/dictsource/pt_rules b/dictsource/pt_rules index 2b6c74a5..8ce4ba30 100755 --- a/dictsource/pt_rules +++ b/dictsource/pt_rules @@ -359,6 +359,7 @@ _perd) e (L05_ e _quis) e (L05_ E _soub) e (L05_ E +proteg) e (L05_ e // des- tend) e (L06_ e // a- con- en- es- _mord) e (L06_ e _rend) e (L06_ e @@ -442,7 +443,6 @@ respond) e (L07_ e // cor- _n) e (grL03_ e _estr) ei (L03_ EI _inv) e (jL04_ E -proteg) e (l05_ e // des- tr) e (pL04_ E // es- _dec) e (pL04_ E _in) e (ptL03_ E @@ -854,6 +854,7 @@ _desabr) o (chL04_ O _enf) o (rquL02_ O c) o (rrL01_ o // escorra, incorra, corra, recorra _m) o (rrL01_ o + p) o (rtL03_ O // im- trans- de- re- com- a- ex- _r) o (snL04_ O _c) o (spL02_ O p) ostos (_ Ost=Us# // dispostos etc. @@ -946,7 +947,7 @@ _desabr) o (chL04_ O .group s -?1 _) s (_W Es|; within an acronym [s]+[;] not [s;] phoneme +?1 _) s (_W Es|; // within an acronym [s]+[;] not [s;] phoneme ?1 _) s (_ Es ?2 _) s (_ 'Ese s s diff --git a/phsource/compile_report b/phsource/compile_report index 2f62ec62..33c2a042 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -48,8 +48,8 @@ consonants 11 119 es-la 1 125 ca 11 127 an 4 125 - pt 32 143 - pt-pt 20 143 + pt 29 140 + pt-pt 19 140 ro 36 148 el 10 125 grc 12 129 @@ -452,7 +452,7 @@ l/l_ [l] base l/l_@ [l/3] base [l/] fr [l/3] da -l/l@ [|8] base +l/l@ [\.] base [l#] base [l] fr [l/2] fr @@ -486,7 +486,7 @@ l/L2_oL [l/2] base l/L2_uL [l/2] base l/l_3 [l/] de l/l_4 [ll] sq -l/la [|8] base +l/la [\.] base [l#] base [l] fr [l/2] fr @@ -495,7 +495,7 @@ l/la [ l/l_a [l/3] base [l/] fr [l/3] da -l/le [|8] base +l/le [\.] base [l#] base [l] fr [l/2] fr @@ -508,7 +508,7 @@ l/L_eL_af [&] af [&:] af l/l_front [L] sq l/l_front_ [l/4] sq -l/li [|8] base +l/li [\.] base [l#] base [l] fr [l/2] fr @@ -523,7 +523,7 @@ ll/ll [L] base ll/_ll [L] base l/l_long [l] base [l] fr -l/lo [|8] base +l/lo [\.] base [l#] base [l/2] fr [K] nso @@ -535,7 +535,7 @@ l^/l_rfx [l.] base [l;] lt [l] ru [l^] ru -l/lu [|8] base +l/lu [\.] base [l#] base [l] fr [l/2] fr @@ -721,7 +721,6 @@ r3/rx [*] base [r] et [r/] fr [R] fr-ca - [x] pt-pt [*;] ro [r#] is [r/] tn @@ -2553,7 +2552,6 @@ vwl_fr/r [r] fr vwl_fr/r_ [r/] fr vwl_fr/r_@ [r/] fr vwl_fr/r@ [] fr -vwl_fr/@R [x] pt-pt vwl_fr/r@2 [] fr vwl_fr/@R2 [R] fr-ca vwl_fr/ra [] fr diff --git a/phsource/ph_portugal b/phsource/ph_portugal index 19386fe7..a31660c4 100644 --- a/phsource/ph_portugal +++ b/phsource/ph_portugal @@ -134,19 +134,6 @@ endphoneme -phoneme x // [r] for Portugal - liquid - trill - ipa ʁ - lengthmod 7 - Vowelin f1=0 f2=1500 -400 400 f3=-400 80 - IF nextPh(isNotVowel) THEN - ChangePhoneme(r/) - ENDIF - FMT(vwl_fr/@R) addWav(r3/rx, 120) -endphoneme - - phoneme R // for Portugal this is same the as [r] import_phoneme pt/r endphoneme diff --git a/phsource/ph_pt_brazil b/phsource/ph_pt_brazil index cc5ff8ae..2d86b1c9 100644 --- a/phsource/ph_pt_brazil +++ b/phsource/ph_pt_brazil @@ -189,8 +189,9 @@ phoneme l endphoneme -phoneme x // (previously [R] from Slovak/Czech) - import_phoneme base/h +phoneme x + CALL base/h + ipa x endphoneme @@ -217,20 +218,3 @@ phoneme * FMT(d/tap2) addWav(x/d, 40) endphoneme - - -// testing -phoneme x2 - import_phoneme af/x2 -endphoneme - -phoneme x3 - import_phoneme base/x -endphoneme - -phoneme R1 - import_phoneme base/R -endphoneme - - - diff --git a/src/phonemelist.cpp b/src/phonemelist.cpp index c4114d72..1e39610f 100644 --- a/src/phonemelist.cpp +++ b/src/phonemelist.cpp @@ -197,6 +197,8 @@ void MakePhonemeList(Translator *tr, int post_pause, int start_sentence) { stop_propagation = 0; voicing = 0; + if(regression & 0x100) + voicing = 1; // word-end devoicing continue; } diff --git a/src/synthdata.cpp b/src/synthdata.cpp index 97cb1aa2..056c1a78 100644 --- a/src/synthdata.cpp +++ b/src/synthdata.cpp @@ -35,7 +35,7 @@ #include "translate.h" #include "wave.h" -const char *version_string = "1.46.47 12.Mar.13"; +const char *version_string = "1.46.48 13.Mar.13"; const int version_phdata = 0x014640; int option_device_number = -1;