1.44.19

Changes for numbers lang=vi
Undo a change for lang=hu which broke oridinal numbers.


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

phsource/compile_report

@@ -17,7 +17,7 @@ consonants   9  115
      jbo   2  114
      nci   3  123
       fi  40  133
-      fr  58  140
+      fr  59  140
    fr-ca  11  140
       hi  59  150
       ta  21  153
@@ -300,6 +300,7 @@ klatt/m         [m] base
 klatt/m_        [m] base
 klatt/m-syl     [m-] base
 klatt/n         [n] base
+                [n] fr
 klatt/n^        [n^] base
 klatt/n^@       [n^] base
 klatt/nn        [N] base
@@ -346,7 +347,7 @@ l/l_            [l] base
                 [l/] fr
 l/l_@           [l/3] base
                 [l/] fr
-l/l@            [há] base
+l/l@            [hVt] base
                 [l#] base
                 [l] fr
                 [l/2] fr
@@ -379,14 +380,14 @@ l/L2_oL         [l/2] base
 l/L2_uL         [l/2] base
 l/l_3           [l/] de
 l/l_4           [ll] sq
-l/la            [há] base
+l/la            [hVt] base
                 [l#] base
                 [l] fr
                 [l/2] fr
                 [K] nso
 l/l_a           [l/3] base
                 [l/] fr
-l/le            [há] base
+l/le            [hVt] base
                 [l#] base
                 [l] fr
                 [l/2] fr
@@ -397,7 +398,7 @@ l/L_eL_af       [&] af
                 [&:] af
 l/l_front       [L] sq
 l/l_front_      [l/4] sq
-l/li            [há] base
+l/li            [hVt] base
                 [l#] base
                 [l] fr
                 [l/2] fr
@@ -410,7 +411,7 @@ ll/ll           [L] bg
 ll/_ll          [L] bg
 l/l_long        [l] base
                 [l] fr
-l/lo            [há] base
+l/lo            [hVt] base
                 [l#] base
                 [l] fr
                 [l/2] fr
@@ -418,7 +419,7 @@ l/lo            [h
 l/l_o           [l/3] base
                 [l/] fr
 l^/l_rfx        [l.] base
-l/lu            [há] base
+l/lu            [hVt] base
                 [l#] base
                 [l] fr
                 [l/2] fr
@@ -455,32 +456,39 @@ n^/n^_          [n^] base
 n^/n^@          [n^] base
 n^/n^#_         [n^#] is
 n/_n            [n] base
+                [n] fr
                 [n] zh
 n/n_            [n] base
 n/n@            [n] base
                 [n.] base
+                [n] fr
                 [n#] is
                 [n] zh
 n/n#_           [n#] is
 n^/n^a          [n^] base
 n/na            [n] base
                 [n.] base
+                [n] fr
                 [n#] is
                 [n] zh
 n^/n^e          [n^] base
 n/ne            [n] base
                 [n.] base
+                [n] fr
                 [n#] is
                 [n] zh
 n^/n^i          [n^] base
 n/ni            [n] base
                 [n.] base
+                [n] fr
                 [n#] is
                 [n] zh
 nn/inn          [N] base
 n/nj            [n] base
                 [n.] base
-n/n_long_       [n] zh
+                [n] fr
+n/n_long_       [n] fr
+                [n] zh
 nn/_nn          [N] base
                 [N] zh
 nn/nn_          [N] base
@@ -510,6 +518,7 @@ nn/nnu          [N] base
 n^/n^o          [n^] base
 n/no            [n] base
                 [n.] base
+                [n] fr
                 [n#] is
                 [n] zh
 n/_nr           [n.] base
@@ -518,6 +527,7 @@ n/n-syl         [n-] base
 n^/n^u          [n^] base
 n/nu            [n] base
                 [n.] base
+                [n] fr
                 [n#] is
                 [n] zh
 r/@_            [V#] de

phsource/ph_french

@@ -1,7 +1,7 @@
 //====================================================
 //  French
 //====================================================
-// Updated 2010-07-25 Michel Such  <michel.such@free.fr>
+// Updated 2010-11-19 Michel Such  <michel.such@free.fr>
 
 phoneme #l  virtual
 // Used for l and l/
@@ -702,6 +702,35 @@ phoneme k
 endphoneme
 
 
+phoneme n
+  vcd alv nasal
+  Vowelout f1=2 f2=1700 -300 250  f3=-100 80  rms=20 brk
+  lengthmod 4
+
+  IF KlattSynth THEN
+    Vowelin f1=0 f2=1500 -200 200 f3=0 80
+    FMT(klatt/n)
+  ENDIF
+
+  NextVowelStarts
+    VowelStart(n/n@)
+    VowelStart(n/na)
+    VowelStart(n/ne)
+    VowelStart(n/ni)
+    VowelStart(n/no)
+    VowelStart(n/nu)
+  EndSwitch
+
+  IF prevPh(isNotVowel) AND nextPhW(isLiquid) THEN
+    FMT(n/nj)
+  ELIF prevPh(isPause) OR prevPh(n) THEN
+    FMT(n/_n)
+  ELIF nextPh(isNotVowel) THEN
+    length 120
+    FMT(n/n_long_)
+  ENDIF
+endphoneme
+
 
 phoneme n2
   vcd alv nasal
@@ -726,10 +755,10 @@ phoneme p
   ELIF nextPh(@-) THEN
     WAV(ustop/p_unasp, 70)
   ELIF nextPh(#l) THEN
-    WAV(ustop/pl, 40)
+    WAV(ustop/pl, 50)
   ELIF nextPh(#r) THEN
     length 40
-    WAV(ustop/p_, 70)
+    WAV(ustop/p_, 80)
   ENDIF
   WAV(ustop/p_unasp_, 90)
 endphoneme
@@ -761,6 +790,7 @@ phoneme s
   ELIF nextPh(p) OR nextPh(t) OR nextPh(k) THEN
     WAV(ufric/s!, 45)
   ENDIF
+
   WAV(ufric/s, 45)
 endphoneme
 
@@ -797,7 +827,7 @@ phoneme t
     WAV(ustop/t_, 40)
   ELIF nextPh(#r) THEN
     length 40
-    WAV(ustop/t_short_, 40)
+    WAV(ustop/t_short_, 50)
   ENDIF
 
   WAV(ustop/t_short, 40)