[1.265.16]

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

dictsource/de_rules

              a (C%        a
              a (CC        a
              a (sch       a
+        &CC) a (_         =A:
 
              ai           aI
              ay           aI
          @A) al (_        'al
           @) an (_        'an
           @) ant (_       'ant
+          _) anthropo     ,ant@-*o:p%o:
           @) atisch (_S6  'A:tIS
           @) atisieren (_S9  A:tIs'i:*@n
              anier (_     'A:ni:3
 
              ell (_       'El
           &) e (_$1       @
+         @t) e (_S1       @
           &) e (BB_       E2
              e (gt_+      e:
           &) el (_        @l
           @) er (r        E*
           @) er (nC       E*
           @) er (_$2      3
-          &) ere (_       @*@
-          &) eren (_$1    n
-          &) erer (_      @*3
-          &) eres (_$1    s
+          &) ere (_$3     @*@
+          &) erem (_$4    @*@m
+          &) eren (_$4    @*@n
+          &) erer (_$4    @*3
+          &) eres (_$4    @*@s
           &) er (C_       @*
           &) er (n_       @r
           &) er (r_       E
           &) erung (_     =@*UN
 
           _) ein (@P3     'aIn
+             ein (and     _|%aIn
           _) emp (@P3     _|%Emp
           _) ent (@P3     _|%Ent
           _) enten        Ent@n
 
           _) haupt (@@P5     h'aUpt
           _) high            _^_EN
+          _) hinter (@       h,Int3
           _) hyper           _^_EN
 
 
              i (CC        I
              i (sch       I
           @) i (ng        I
+        &CC) i (_         =i:
 
           &) ie (ll_      i:,E
           &) ier (_       'i:3
           r) ien (@       IEn
           &) ien (_S1     n
+         &n) ien (_       I@n
           &) iens (_      =I;@ns
           &) ient (_      =I;@nt
         sch) ie (n        i:
 
           @) lich (_$4    lIC
              lady         _^_EN
+          @) lo (gisch    l'o:
 
 .group m
           _) m (_         Em
              o (C%        O
              o (CC        O
              o (sch       O
+        &CC) o (_         =o:
 
           _) ober (@P4    _|,o:b3
           _) ober (ste    o:b3
              thrill       _^_EN
           @) tient (_     tsI'Ent
           @) tion (_      tsI'o:n
+          @) ti (v_       t'i:
           _) trail        _^_EN
           _) train        _^_EN
           _) tranqu       _^_EN
           @) uerisch (_   'u:*IS
           _) user         _^_EN
 
+          _) ueber (@P5   _|,y:b3
+
+
 .group v
           _) v (_         faU
              v            v
 
 
 .group y
-          _) y (_         UpsIlOn
+          _) y (_         ypsIlOn
 
              y            y:
              y (CC        y

dictsource/dict_phonemes

 z    Z    Z;   
 
 
-Dictionary pt_dict
-
-&    &/   &U~  &~   @    @-   a    A    
-aI   aU   e    E    eI   EI   eU   EU   
-i    i/   iU   i~   o    O    oI   OI   
-o~   U    u    uI   u~   y    
-
-*    :    ;    b    C    d    dZ   f    
-g    h    j    k    l    l^   m    n    
-N    n^   p    Q    r    R    r-   s    
-S    s#   s;   t    T    tS   ts   v    
-w    x    z    Z    
-
-
 Dictionary ru_dict
 
 8    @-   A    a    E    e    E#   E2   
 tS   v    w    z    
 
 
+Dictionary pt_dict
+
+&    &/   &U~  &~   @    @-   a    A    
+aI   aU   e    E    eI   EI   eU   EU   
+i    i/   iU   i~   o    O    oI   OI   
+o~   U    u    uI   u~   y    
+
+*    :    ;    b    C    d    dZ   f    
+g    h    j    k    l    l^   m    n    
+N    n^   p    Q    r    R    r-   s    
+S    s#   s;   t    T    tS   ts   v    
+w    x    z    Z    
+
+
 Dictionary ro_dict
 
 @    @-   @I   @U   a    aI   aU   e    

dictsource/en_list

 imperative       I2mpEr@tIv
 impi              $1
 imprecise        I2mprIs'aIs
+impregnable      I2mprEgn@b@L
 inappropriate    ,Ina2proUpri@t
 incense          Ins'Ens       $verb
 incoming         InkVmI2N
 Mexico            $1
 Milan             $2
 Mindanao         mInd@n'aU
+Minneapolis      mIni:'ap@lI2s
 Missouri         mIs'U@rI
 Montreal         m0ntrI'O:l
 Morocco          m@r0koU

dictsource/en_rules

          _)  jere (C      dZEr@
          _)  jes (ui      dZEz
          _)  joa (n@      dZoU'a
+             j (ü         j
 
 .group k
              k            k
        for)  tuna (t      tS@n@
          s)  t (l
              to (morr     t@
+         _)  to (nn       tV     
          @)  town (_$4    taUn
          _)  tri (A       traI
          _)  trie         traI

dictsource/pt_list

 ?1_13	tR'ezy
 ?2_13	tR'ezi
 ?1_14	k&t'orzy
-?2_14	kat'Orzi
+?2_14	kat'orzi
 ?1_15	k'iNzy
 ?2_15	k'iNzi
 ?1_16	dyz&s'eis#
 // Open [E]
 nela         n'El&
 nessa        n'Es&
-era         'Er&
+era         'E*&
 
 abacaxi      abakaSi
 axé          aSE
 
 
 
+

dictsource/pt_rules

           e (rtA_    E
           e (rtAm_    E
           e (rtAs_    E
+          e (rrA_    E
+          e (rrAm_    E
+          e (rrAs_    E
 
           e (x_      E
           e (xA_     E
 
 
 
+

src/synthdata.cpp

 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.25.15  01.Jun.07";
+const char *version_string = "1.25.16  02.Jun.07";
 const int version_phdata  = 0x012514;
 
 int option_device_number = -1;

src/tr_languages.cpp

 			tr->langopts.stress_flags =  0x6 | 0x10; 
 			tr->langopts.numbers = 0xa69 + 0x2000;
 			tr->punct_to_tone[0][3] = 2;   // use exclamation intonation
+			SetLetterVowel(tr,'y');
 		}
 		break;
 

src/voices.cpp

 
 // limit the rate of change for each formant number
 //static int formant_rate_22050[9] = {50, 104, 165, 230, 220, 220, 220, 220, 220};  // values for 22kHz sample rate
-static int formant_rate_22050[9] = {50, 100, 165, 200, 200, 200, 200, 200, 200};  // values for 22kHz sample rate
+static int formant_rate_22050[9] = {50, 100, 160, 200, 200, 200, 200, 200, 200};  // values for 22kHz sample rate
 int formant_rate[9];         // values adjusted for actual sample rate