[1.26] leng-en-r adjust [a] [oU], adjust stressLength in voice file.

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

dictsource/en_list

@@ -2442,6 +2442,9 @@ can              %kan           $verbf $only $strend2
 can't            kA:nt          $verbf $only $strend2
 (can't have)     kA:nta2v       $pastf
 (can't have to)   ,kA:nt'avt@5       $verbf $atend
+?3 can't            kant          $verbf $only $strend2
+?3 (can't have)     kanta2v       $pastf
+?3 (can't have to)   ,kant'avt@5       $verbf $atend
 could            %kUd           $verbf $strend2 $only
 (could have)     ,kUda2v        $pastf
 (could have)     kUdhav         $pastf $atend

dictsource/hu_list

@@ -1,43 +1,43 @@
 
 // Numbers
 
-_0        n'ullA
-_1        'EJ
-_2        k'EttY:
-_3        h'a:Rom
-_4        n'e:J
-_5        'Yt
-_6        h'At
-_7        h'e:t
-_8        n^'olts
-_9        k'ilEnts
-_10       t'i:z
-_1X       t'izEn
-_20       h'u:s
-_2X       h'uson
-_3X       h'Armints
-_4X       n'EJvEn
-_5X       'YtvEn
-_6X       h'AtvAn
-_7X       h'EtvEn
-_8X       n^'oltsvAn
-_9X       k'ilEntsvEn
-_0C       s'a:z_
-_1C       s'a:z
+_0        nullA
+_1        EJ
+_2        kEttY:
+_3        ha:Rom
+_4        ne:J
+_5        Yt
+_6        hAt
+_7        he:t
+_8        n^olts
+_9        kilEnts
+_10       ti:z
+_1X       tizEn
+_20       hu:s
+_2X       huson
+_3X       hArmints
+_4X       nEJvEn
+_5X       YtvEn
+_6X       hAtvAn
+_7X       hEtvEn
+_8X       n^oltsvAn
+_9X       kilEntsvEn
+_0C       sa:z
+_1C       sa:z
 
-_0M1      'EzER
-_1M1      'EzER
-_2M1      k'e:t,EzER
-_0M2      m'illio:
-_1M2      m'illio:
-_2M2      k'e:tm,illio:
-_0M3      m'illia:Rd
-_1M3      m'illia:Rd
-_1M3      k'e:tm,illia:Rd
-_0M4      b'illio:
-_1M4      b'illio:
-_2M4      k'e:tb,illio:
-_dpt      v,Ess2Y:
+_0M1      EzER
+_1M1      EzER
+_2M1      ke:tEzER
+_0M2      millio:
+_1M2      millio:
+_2M2      ke:tmillio:
+_0M3      millia:Rd
+_1M3      millia:Rd
+_1M3      ke:tmillia:Rd
+_0M4      billio:
+_1M4      billio:
+_2M4      ke:tbillio:
+_dpt      ||_vEss2Y:_
 
 
 // Abbreviations
@@ -249,12 +249,8 @@ _.	pont
 //=====================
 
 
-// Places
-oslo		oslo:
-osló		oslo:
-
 
 // Names
-ricárd		R'iCArd
-richard		R'iCARd
+ricárd		RiCArd
+richard		RiCARd
 

dictsource/hu_rules

@@ -14,7 +14,7 @@
         b        b
         bb       b:
 
-        bizal (mát   b'iz'Al       // TEST
+        biz (A   b'iz,       // TEST
 
 .group c
         c        ts
@@ -22,6 +22,8 @@
         cs       tS
         ccs      tS:
 
+  anar) ch (i    C
+hierar) ch (i    C
     me) ch (a    C
     te) ch (n    C
   pszi) ch       C
@@ -29,8 +31,6 @@
    mün) ch (en   C
   maso) ch (istA C
 
-  _sto) ck (holm  k
-
  kilen) c (sz    ts
   kvar) c (sz    ts
   mala) c (sá    ts
@@ -44,6 +44,10 @@
    rán) c (sz    ts
    tán) c (sz    ts
 
+  _szé) che (ny   tSe:
+  _szé) ché (ny   tSe:
+  _sto) ck (holm  k
+
 
 .group d
         d        d
@@ -106,6 +110,8 @@
     _e) gy (üt   J:
 _minde) gy (ik   J:
 
+    na) gysz (abású  Js
+
 
 .group h
         h        h
@@ -188,7 +194,10 @@ _minde) gy (ik   J:
         sz       s
         ssz      ss2
 
+   hel) s (inki  z
     ki) s (ebb   SS
+    _o) slo      slo:
+    _o) sló      slo:
 
         sz (öld  Sz
     va) s (zabl  S||

dictsource/ro_rules

@@ -35,7 +35,7 @@
 ăi (ni_ @'i
 ăi (ne_ @'i
 @) ăt (_S2t @t
-//@) ătă (_S3t @t@
+@) ătă (_S3t @t@
 @) ătul (_S4t @tul
 @) ătele (_S5t @tele
 @) ătului (_S6t @tuluI
@@ -262,6 +262,7 @@ ioa iO'a
      _) re (gul    re
     @u) ri (_NS2t   rI^
     @u) rile (_S4t rile
+     @) rilor (_S5t rilor
 
 
 
@@ -329,7 +330,6 @@ ui (se_ u'i
    @ic) ul (_S2 ul
    @ic) uri (_S3 urI^
    @ic) urile (_S5 urile
-   @ic) urilor (_S6 urilor
 
 
 

phsource/compile_report

@@ -291,6 +291,7 @@
   1  vdiph2/y#@     af
   1  vdiph2/yu      nl
   1  vdiph2/y-y#    fi
+  1  vdiph/8u       en_us
   1  vdiph/aai      zh_yue
   2  vdiph/aai_2    af cy
   1  vdiph/aai_3    fi
@@ -353,7 +354,7 @@
   1  vdiph/ui_4     hr
   1  vdiph/Vi       vi
   1  vdiph/Vu       af
-  2  vdiph/Vu_2     en_us en_wm
+  1  vdiph/Vu_2     en_wm
   1  vdiph/Vu_3     nl
   2  vdiph/&y       fi nl
   2  vdiph/yi       fi no

phsource/ph_english_us

@@ -218,8 +218,8 @@ endphoneme
 
 phoneme oU
   vowel  starttype (@)  endtype (u)
-  length 210
-  formants vdiph/Vu_2
+  length 230
+  formants vdiph/8u
 endphoneme
 
 

src/synthdata.cpp

@@ -35,8 +35,8 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.25.19  06.Jun.07";
-const int version_phdata  = 0x012514;
+const char *version_string = "1.26  09.Jun.07";
+const int version_phdata  = 0x012601;
 
 int option_device_number = -1;