[1.46.48]

Language change: pt.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@314 d46cf337-b52f-0410-862d-fd96e6ae7743

dictsource/dict_phonemes

 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:   

dictsource/hu_rules

  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
    han) g (gy      g
 hazugsá) g (gy     g
   tőze) g (gy      g
+doppin) g (gy      g
 
 .group gy
         gy         J
  _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
     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
  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
    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
   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
   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

dictsource/pt_list

 alferes		$alt
 algozes		$alt
 alicerce	$alt
-almoço		alt $verb
+almoço		$alt $verb
 amarelo		$alt
 ameba		$alt
 amores		$alt2
 joguete		$alt2
 lambreta	$alt2
 lebre		$alt
+lembrete	$alt2
 leste		$alt2 $verb
 lopes		$alt
 maior		$alt
 porcos		$alt
 porrete		$alt2
 porra		$alt2
+porto		$alt2
 portos		$alt
 pose		$alt2
 povos		$alt

dictsource/pt_rules

  _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
     _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
   _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.
 
 
 .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

phsource/compile_report

    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
 l/l_@           [l/3] base
                 [l/] fr
                 [l/3] da
-l/l@            [¨|8] base
+l/l@            [¨\.] base
                 [l#] base
                 [l] fr
                 [l/2] fr
 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
 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
                 [&:] 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
 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
                 [l;] lt
                 [l] ru
                 [l^] ru
-l/lu            [¨|8] base
+l/lu            [¨\.] base
                 [l#] base
                 [l] fr
                 [l/2] fr
                 [r] et
                 [r/] fr
                 [R] fr-ca
-                [x] pt-pt
                 [*;] ro
                 [r#] is
                 [r/] tn
 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

phsource/ph_portugal

 
 
 
-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

phsource/ph_pt_brazil

 endphoneme
 
 
-phoneme x   // (previously [R] from Slovak/Czech)
-  import_phoneme base/h
+phoneme x
+  CALL base/h
+  ipa x
 endphoneme
 
 
   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
-
-
-

src/phonemelist.cpp

 			{
 				stop_propagation = 0;
 				voicing = 0;
+				if(regression & 0x100)
+					voicing = 1;   // word-end devoicing
 				continue;
 			}
 

src/synthdata.cpp

 #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;