[1.46.38]

Speak names of characters in non-native alphabets (eg. non-Latin).
Language changes: en, nl, pt.


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

phsource/compile_report

@@ -1,5 +1,5 @@
 
-86 phoneme tables
+87 phoneme tables
           new total
     base 109  109
 consonants  10  118
@@ -53,6 +53,7 @@ consonants  10  118
       no  28  134
       is  42  141
       vi  53  147
+  vi-hue   8  147
      zhy  41  138
       zh  64  155
       sw   9  110
@@ -235,11 +236,15 @@ dzh/xdz_pzd     [J] base
 envelope/i_risefall  [11] zh
 envelope/i_risefall2  [+2] rw
 envelope/p_214  [5] vi
+                [5] vi-hue
                 [214] zh
 envelope/p_512  [6] vi
+                [4] vi-hue
+                [6] vi-hue
                 [+] pa
 envelope/p_fall  [2] vi
                 [7] vi
+                [2] vi-hue
                 [4] zhy
                 [7] zhy
                 [21] zh
@@ -250,17 +255,23 @@ envelope/p_fall  [2] vi
                 [+] rw
 envelope/p_fallrise  [4] vi
 envelope/p_level  [1] vi
+                [1] vi-hue
+                [7] vi-hue
                 [1] zhy
                 [3] zhy
                 [6] zhy
                 [55] zh
 envelope/p_rise  [3] vi
+                [3] vi-hue
                 [2] zhy
                 [5] zhy
                 [44] zh
                 [35] zh
 envelope/vi_5amp  [5] vi
+                [5] vi-hue
 envelope/vi_6amp  [6] vi
+                [2] vi-hue
+                [6] vi-hue
 g2/xg           [gh] hi
 g/g             [g] base
                 [g-] en
@@ -421,7 +432,7 @@ l/l_            [l] base
                 [l/] fr
 l/l_@           [l/3] base
                 [l/] fr
-l/l@            [h6s] base
+l/l@            [h6r] base
                 [l#] base
                 [l] fr
                 [l/2] fr
@@ -455,7 +466,7 @@ l/L2_oL         [l/2] base
 l/L2_uL         [l/2] base
 l/l_3           [l/] de
 l/l_4           [ll] sq
-l/la            [h6s] base
+l/la            [h6r] base
                 [l#] base
                 [l] fr
                 [l/2] fr
@@ -463,7 +474,7 @@ l/la            [h6s] base
                 [K] tn
 l/l_a           [l/3] base
                 [l/] fr
-l/le            [h6s] base
+l/le            [h6r] base
                 [l#] base
                 [l] fr
                 [l/2] fr
@@ -475,7 +486,7 @@ l/L_eL_af       [&] af
                 [&:] af
 l/l_front       [L] sq
 l/l_front_      [l/4] sq
-l/li            [h6s] base
+l/li            [h6r] base
                 [l#] base
                 [l] fr
                 [l/2] fr
@@ -489,7 +500,7 @@ ll/ll           [L] base
 ll/_ll          [L] base
 l/l_long        [l] base
                 [l] fr
-l/lo            [h6s] base
+l/lo            [h6r] base
                 [l#] base
                 [l/2] fr
                 [K] nso
@@ -500,7 +511,7 @@ l^/l_rfx        [l.] base
                 [l;] lt
                 [l] ru
                 [l^] ru
-l/lu            [h6s] base
+l/lu            [h6r] base
                 [l#] base
                 [l] fr
                 [l/2] fr
@@ -1356,6 +1367,7 @@ vnasal/aa_n4    [A~] de
                 [A~] fr
                 [A~] ht
 vnasal/a#_n     [&~] pt
+vnasal/a#_n2    [&~] pt
 vnasal/a#u_n    [&U~] pt
                 [&U~] pt-pt
                 [o#] vi
@@ -1391,7 +1403,6 @@ vnasal/u_n      [U~] hi
 vnasal/V_n      [V~] hi
 vnasal/W_n      [E~] fr
                 [W~] fr
-                [&~] pt
                 [E~] ht
 voc/bh          [B] base
 voc/dh          [D] base

phsource/ph_english_us

@@ -354,20 +354,17 @@ phoneme t
   vls alv stop
   voicingswitch d
   lengthmod 2
-
-//  IF prevPhW(isVowel) OR prevPhW(n) THEN
-  IF prevPhW(isVowel) THEN   // test, don't reduce [t] after [n]
-    IF nextPhW(isVowel) AND nextPh(isUnstressed) THEN
-      IF next2Ph(n) AND next2Ph(notWordStart) THEN
-      ELSE
-        ChangePhoneme(t#)
-      ENDIF
-    ENDIF
-  ENDIF
-
   Vowelin f1=0  f2=1700 -300 300  f3=-100 80
   Vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
 
+  IF nextPhW(isVowel) AND nextPh(isUnstressed) AND NOT next2PhW(n) THEN
+    IF prevPhW(isVowel) THEN
+      ChangePhoneme(t#)
+    ELIF prevPhW(n) THEN
+      WAV(ustop/t, 60)
+    ENDIF
+  ENDIF
+
   IF nextPh(isPause2) THEN
     WAV(ustop/t_)
   ELIF nextPh(r) OR nextPh(R) OR nextPh(R2) THEN

phsource/ph_pt_brazil

@@ -40,7 +40,7 @@ phoneme &~
   ipa ɐU+0303
   length 180
   IF thisPh(isFinalVowel) THEN
-    FMT(vnasal/W_n)
+    FMT(vnasal/a#_n2)
   ELSE
     FMT(vnasal/a#_n)
   ENDIF

phsource/phonemes

@@ -1814,6 +1814,9 @@ include ph_icelandic
 phonemetable vi base
 include ph_vietnam
 
+phonemetable vi-hue vi
+include ph_vietnam_hue
+
 phonemetable zhy base
 include ph_zh_yue