[1.31.09]

More fixes for &--; sequences.
lang=es: use phoneme [O] for letter 'o' except at end of word.
leng=es: attempt to improve single 'r' between two vowels.


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

phsource/compile_report

@@ -41,7 +41,7 @@
       is  32  124
       vi  42  137
      zhy  40  132
-      zh  64  148
+      zh  63  147
       sw  14  108
       th  50  142
       id  14  120
@@ -597,15 +597,14 @@ ufric/sh_       [S] base
                 [s#] pt_pt
 ufric/sh_pzd    [S;] base
                 [S;] ro
-                [S;] zh
 ufric/sh_pzd_   [S;] base
                 [Z;] base
-ufric/sh_rfx    [s.] base
-                [s.] zh
-ufric/sh_sr     [S#] zh
-ufric/sh_sr.wav  [S] sr
+ufric/sh_pzd2   [S] sr
                 [Z] sr
                 [dZ] sr
+                [S;] zh
+ufric/sh_rfx    [s.] base
+                [s.] zh
 ufric/s_pzd     [s;] base
                 [z;] base
                 [s;] ro
@@ -802,7 +801,7 @@ ustop/tsh_pzd   [tS;] zh
                 [ch] th
 ustop/tsh_pzd_unasp  [tS;] zh
                 [c] th
-ustop/tsh_sr.wav  [tS] sr
+ustop/tsh_sr    [tS] sr
 ustop/ts_pzd    [tS;] base
                 [ts;] base
                 [ch] hi
@@ -816,7 +815,7 @@ ustop/t_sr      [d] sr
                 [t] zh
 ustop/ts_rfx    [ts.] zh
 ustop/ts_rfx_unasp  [ts.] zh
-ustop/ts_sr.wav  [tS;] sr
+ustop/ts_sr     [tS;] sr
                 [dZ;] sr
 ustop/ts_unasp  [ts] zh
 ustop/t_unasp   [t] th
@@ -872,8 +871,8 @@ vdiph2/uu@      [U@] en
                 [u@] vi
                 [ua] th
                 [u:a] th
+vdiph2/y@       [y@] zh
 vdiph2/y#@      [Y@] af
-                [y@] zh
 vdiph2/yu       [yU] nl
                 [yu] zh
 vdiph2/y-y#     [yY] fi
@@ -1541,7 +1540,7 @@ vowel/oo        [O:] en_sc
                 [O@] en_wi
                 [O] de
                 [o] eo
-                [o] es
+                [O] es
                 [o] el
                 [O] sv
                 [O] no

phsource/ph_serbian

@@ -1,13 +1,3 @@
-// ufric/x_sr
-// ufric/ch_sr
-// ufric/sh_sr
-// ustop/t_sr
-// ustop/ts_sr
-// ustop/tsh_sr
-// r3/r_sr
-// m/m_sr
-// n/n_sr
-// n^/nj_sr
 
 // This file inherits phonemes from ph_croatian
 // Only phonemes which differ from the inherited phonemes need
@@ -97,10 +87,10 @@ phoneme dZ
   vcd pla afr sibilant
   vowelin f1=2  f2=2300 200 400  f3=100 80
   vowelout f1=2  f2=2300 250 300  f3=100 80 brk
-  formants dzh/dzh+ufric/sh_sr.wav
-  before _ dzh/dzh+ufric/sh_sr.wav
+  formants dzh/dzh+ufric/sh_pzd2
+  before _ dzh/dzh+ufric/sh_pzd2
   after _ NULL
-  after @ dzh/dzh+ufric/sh_sr.wav
+  after @ dzh/dzh+ufric/sh_pzd2
   lengthmod 5
   switchvoicing tS
 endphoneme
@@ -109,10 +99,10 @@ endphoneme
 phoneme dZ;
   vcd pla afr sibilant palatal
   vowelin f1=2  f2=2700 400 600  f3=300 80 rate len=70
-  formants dzh/dzh+ustop/ts_sr.wav
-  before _ dzh/dzh+ustop/ts_sr.wav
+  formants dzh/dzh+ustop/ts_sr
+  before _ dzh/dzh+ustop/ts_sr
   after _ NULL
-  after @ dzh/dzh+ustop/ts_sr.wav
+  after @ dzh/dzh+ustop/ts_sr
   lengthmod 5
   switchvoicing tS;
 endphoneme
@@ -122,8 +112,8 @@ phoneme tS
   vls pla afr sibilant
   vowelin f1=0  f2=2300 200 400  f3=-100 80
   lengthmod 2
-  wave ustop/tsh_sr.wav%50
-  before _ ustop/tsh_sr.wav%50
+  wave ustop/tsh_sr%50
+  before _ ustop/tsh_sr%50
   switchvoicing dZ
 endphoneme
 
@@ -132,8 +122,8 @@ phoneme tS;
   vls pal afr sibilant palatal
   vowelin f1=0  f2=2700 400 600  f3=300 80 rate len=70
   lengthmod 2
-  wave ustop/ts_sr.wav
-  before _ ustop/ts_sr.wav
+  wave ustop/ts_sr
+  before _ ustop/ts_sr
   switchvoicing dZ;
 endphoneme
 
@@ -144,8 +134,8 @@ phoneme Z
   vcd pla frc sibilant
   vowelin  f1=0  f2=2000 0 300  f3=-200 80
   vowelout f1=2  f2=2000 0 300  f3=-200 80 brk
-  formants voc/zh+ufric/sh_sr.wav%60
-  before _ voc/zh+ufric/sh_sr.wav%50
+  formants voc/zh+ufric/sh_pzd2%60
+  before _ voc/zh+ufric/sh_pzd2%50
   lengthmod 6
   switchvoicing S
 endphoneme
@@ -157,8 +147,8 @@ phoneme S
   vowelout f1=0  f2=2100 100 300  f3=-100 80
   length 100
   lengthmod 3
-  wave ufric/sh_sr.wav%70
-  before _ ufric/sh_sr.wav%60
+  wave ufric/sh_pzd2%70
+  before _ ufric/sh_pzd2%60
   switchvoicing Z
 endphoneme
 

phsource/ph_spanish

@@ -9,7 +9,7 @@ phoneme E
   formants vowel/e_mid
 endphoneme
 
-phoneme o
+phoneme O
   vowel starttype (o) endtype (o)
   length 170
   formants vowel/oo

phsource/ph_zh

@@ -147,21 +147,14 @@ phoneme tS;h
   vls pal afr sibilant palatal
   vowelin f1=0  f2=2700 400 600  f3=300 80
   lengthmod 2
-  wave ustop/tsh_pzd
+  wave ustop/tsh_pzd%80
 endphoneme
 
 phoneme S;
   vls pla frc sibilant
   vowelin f1=0  f2=2700 400 600  f3=300 80
   lengthmod 2
-  wave ufric/sh_pzd
-endphoneme
-
-phoneme S#
-  vls pla frc sibilant
-  vowelin f1=0  f2=2700 400 600  f3=300 80
-  lengthmod 2
-  wave ufric/sh_sr%20
+  wave ufric/sh_pzd2%20
 endphoneme
 
 phoneme s.
@@ -170,7 +163,7 @@ phoneme s.
   vowelout f1=0  f2=1800 -100 300  f3=-300 80
   length 100
   lengthmod 3
-  wave ufric/sh_rfx%60   // quieter
+  wave ufric/sh_rfx%50   // quieter
   before _ ufric/sh_rfx%50
 endphoneme
 
@@ -429,5 +422,5 @@ endphoneme
 phoneme y@
   vowel  starttype (i)  endtype (@)
   length 250
-  formants vdiph2/y#@
+  formants vdiph2/y@
 endphoneme

phsource/phonemes

@@ -603,8 +603,8 @@ endphoneme
 phoneme **    //   TEST flap
   liquid alv
   vowelout f1=3 f2=1600 -300 300  f3=-300 80 rms=35 len=15
-  vowelin f1=2  f2=1600 -300 300  f3=-300 80
-  formants r3/@tap+r3/rx%50
+  vowelin f1=2  f2=1600 -300 300  f3=-100 80 len=20
+  formants r3/@tap
   vowelin f1=3  f2=1600 -300 300  f3=-300 80
   before (i) r3/@tap_i+r3/rx
   before (e) r3/@tap_i+r3/rx