[1.25.07] lang=pt, change phoneme [&~], add [U]

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

dictsource/dict_phonemes

@@ -112,9 +112,9 @@ S    s2   t    v    Z
 
 Dictionary fr_dict
 
-@    @-   a    A    aU   A~   e    E    
-E~   i    I    o    O    O    O~   u    
-W    w^i  W~   y    Y    
+@    @-   a    A    A~   e    E    E~   
+i    o    O    O~   u    u:   W    w^i  
+W~   y    Y    
 
 (o)  :    ;    b    c    d    dZ   f    
 g    h    j    k    l    L    l/2  m    
@@ -140,13 +140,13 @@ Dictionary hr_dict
 
 &    8    @    @-   @2   a    A    a:   
 aI   aU   E    e    e:   eI   i    I    
-i:   iI   l-   o    o:   oI   oU   r-   
-u    U    u:   uI   
+i:   iI   l-   o    o:   oI   oU   O~   
+r-   u    U    u:   uI   
 
-*    b    d    d;   dZ   dZ;  f    g    
-h    j    k    l    l^   m    n    N    
-n^   p    r    R    s    S    t    t;   
-tS   ts   tS;  v    x    z    Z    
+*    b    d    dZ   dZ;  f    g    h    
+j    k    l    l^   m    n    N    n^   
+p    r    R    s    S    t    t;   tS   
+ts   tS;  v    x    z    Z    
 
 
 Dictionary hu_dict
@@ -212,7 +212,7 @@ Dictionary pt_dict
 
 &    &/   &U~  &~   @    @-   a    A    
 aI   aU   e    E    eI   EI   eU   EU   
-i    i/   iU   i~   o    O    oI   OI   
+e~   i    i/   iU   o    O    oI   OI   
 o~   U    u    uI   u~   y    
 
 *    :    ;    b    C    d    dZ   f    
@@ -318,5 +318,5 @@ y    y#   Yy
 *    :    ;    b    c    C    d    D    
 f    g    h    j    J    k    l    l#   
 m    m#   n    N    n#   N#   n^   n^#  
-p    Q    r    r#   s    S    t    T    
-tl#  v    x    z    
+p    Q    r    R    r#   R2   s    S    
+t    T    tl#  v    x    z    

dictsource/pt_list

@@ -1,4 +1,4 @@
-
+
 // This file in UTF8 encoded
 
 // Options
@@ -26,7 +26,7 @@ _ó	,o&g'udu
 _ô	,osirkuNfl'Eksu
 _õ	,otS'iU
 _ú	,u&g'udu
-_ü	,utr@-*'em&
+_ü	,ut@-*'em&
 
 _cap	maI'uskulu
 _?A	l'et@-*&

dictsource/pt_rules

@@ -447,7 +447,7 @@
 ?2     A) r (_A      *
           rr         x
 ?1     C) r (A       r
-?2     C) r (A       @-*
+?2     C) r (A       R   // was [@-*]
        _) r          x
        l) r          x
        n) r          x

phsource/compile_report

@@ -1,39 +1,39 @@
 34 phoneme tables
           new total
-    base  93   93
-      en  52  140
-    en_n  29  140
-   en_us  36  140
-   en_sc  39  142
-   en_rp  34  140
-   en_wm  30  140
-      af  37  124
-      cy  30  119
-      de  28  116
-      eo  13  105
-      fi  40  124
-      fr  33  115
-   fr_ca  11  115
-      hi  49  128
-      hu  24  110
-      nl  25  113
-      pl  17  104
-      sk  26  121
-      cs   5  121
-      hr  25  131
-      ru  36  121
-      it  28  114
-      es   6  114
-      pt  25  129
-   pt_pt  17  129
-      ro  36  138
-      el   8  114
-      sv  25  115
-      no  29  119
-      is  33  119
-      vi  41  130
-  zh_yue  32  121
-      sw  14  102
+    base  94   94
+      en  52  141
+    en_n  29  141
+   en_us  36  141
+   en_sc  39  143
+   en_rp  34  141
+   en_wm  30  141
+      af  37  125
+      cy  30  120
+      de  28  117
+      eo  13  106
+      fi  40  125
+      fr  33  116
+   fr_ca  11  116
+      hi  49  129
+      hu  24  111
+      nl  25  114
+      pl  17  105
+      sk  26  122
+      cs   5  122
+      hr  25  132
+      ru  36  122
+      it  28  115
+      es   6  115
+      pt  27  131
+   pt_pt  17  131
+      ro  36  139
+      el   8  115
+      sv  25  116
+      no  29  120
+      is  33  120
+      vi  41  131
+  zh_yue  32  122
+      sw  14  103
 
   3  b/b            base hi ro
   2  b/b_           base hi
@@ -185,9 +185,10 @@
   1  r3/r_i         base
   5  r3/r_n         base cy fr pl ru
   1  r3/r_o         base
-  3  r3/r_trill     base sk it
+  4  r3/r_trill     base sk it
   2  r3/r_trill2    base hr
   2  r3/r_trill2.wav base hr
+  1  r3/r_trill3.wav base
   3  r3/r_trill.wav base sk it
   1  r3/r_u         base
  26  r3/rx          base af cy fr fr_ca pl ru pt_pt ro is
@@ -367,9 +368,9 @@
   2  vnasal/ee_n    en fr_ca
   3  vnasal/ee_n2   hi pl pt_pt
   2  vnasal/e_n     af pt
+  1  vnasal/e#_n    pt
   1  vnasal/i_n     pt
   1  vnasal/m-      sw
-  1  vnasal/&_n     pt
   1  vnasal/n-      sw
   1  vnasal/nn-     sw
   1  vnasal/oi_n    pt
@@ -422,7 +423,7 @@
   5  vowel/a_2      eo it pt_pt ro vi
   4  vowel/a#_2     hr sv is sw
   6  vowel/a_3      en_sc cs is
- 12  vowel/a#_3     en en_n en_us en_wm de hi ru pt_pt vi zh_yue
+ 13  vowel/a#_3     en en_n en_us en_wm de hi ru pt pt_pt vi zh_yue
   4  vowel/a_4      en_wm el vi
   2  vowel/a_5      sv sw
   7  vowel/aa       en_us fi fr_ca no zh_yue
@@ -506,7 +507,7 @@
   2  vowel/uu_2     de it
   1  vowel/uu_3     af
   2  vowel/uu_4     fi sv
-  7  vowel/uu_bck   fr_ca hi hu hr no zh_yue
+  8  vowel/uu_bck   fr_ca hi hu hr pt no zh_yue
   2  vowel/V        en en_sc
   3  vowel/V_2      af ru
   3  vowel/V_3      en_rp hi vi

phsource/ph_pt_brazil

@@ -31,7 +31,7 @@ endphoneme
 phoneme &~
   vowel  starttype (@) endtype (@)
   length 240
-  formants vnasal/&_n
+  formants vnasal/e#_n
 endphoneme
 
 phoneme &U~
@@ -62,6 +62,14 @@ phoneme &/       // Used for final "a" when next word starts with "a"
   formants vowel/a#
 endphoneme
 
+phoneme &#
+  vowel starttype (@) endtype (@)
+  length 180
+  formants vowel/a#_3
+  unstressed
+endphoneme
+
+
 phoneme A            // for "al" in European Portuguese
   vowel starttype (a) endtype (a)
   length 180
@@ -113,6 +121,13 @@ phoneme u
   formants vowel/u_bck
 endphoneme
 
+phoneme U
+  vowel starttype (u) endtype (u)
+  length 160
+  formants vowel/uu_bck
+endphoneme
+
+
 
 
 phoneme aI

phsource/phonemes

@@ -397,6 +397,15 @@ phoneme R2   // this is [R] from Slovak/Czech
   lengthmod 6
 endphoneme
 
+phoneme R3
+  liquid
+  vowelin  f1=2  f2=70 -300 300  f3=-300 80 dnt
+  vowelout f1=2  f2=70 -300 300  f3=-300 80 brk
+  formants r3/r_trill+r3/r_trill3.wav%60
+  trill
+  lengthmod 6
+endphoneme
+
 
 
 phoneme l