[1.47.13]

Program changes to enable audio output from Windows DLL.

Language changes: an, de, en, nl, ta.


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

phsource/compile_report

@@ -1,5 +1,5 @@
 
-91 phoneme tables
+93 phoneme tables
           new total
     base 109  109
 consonants  11  119
@@ -22,7 +22,7 @@ consonants  11  119
       et  40  135
       fr  64  146
    fr-ca  11  146
-      nl  35  130
+      nl  37  131
       hi  58  149
       bn  12  152
       ne  18  157
@@ -30,7 +30,7 @@ consonants  11  119
       pa  15  151
       ta  24  153
       kn  17  149
-      ml  27  152
+      ml  30  152
       hu  25  124
       lt  44  139
       lv  29  127
@@ -47,7 +47,7 @@ consonants  11  119
       es  15  125
    es-la   1  125
       ca  11  127
-      an   4  125
+      an   5  126
       pt  29  140
    pt-pt  20  140
       ro  36  148
@@ -85,6 +85,8 @@ consonants  11  119
       si  24  155
       gu   1  149
       as  12  152
+      or  12  152
+     mni  11  152
       tn  27  121
       mt  32  129
       bo  10  153
@@ -1090,11 +1092,15 @@ ustop/ts2       [ts] lv
 ustop/tsh       [tS] base
                 [tS#] bn
                 [c] zhy
+                [tS#] or
+                [tS#] mni
                 [tS] tn
 ustop/tsh_      [tS] base
                 [c] hi
                 [tS#] bn
                 [c] zhy
+                [tS#] or
+                [tS#] mni
                 [tS] tn
 ustop/tsh2      [tS] hr
                 [dZ] hr
@@ -1112,6 +1118,8 @@ ustop/tsh_unasp  [c] hi
                 [tS] hy
                 [tS`] am
 ustop/tsh_unasp2  [tS] bn
+                [tS] or
+                [tS] mni
 ustop/ts_pzd    [tS;] base
                 [J#] hi
                 [J#] ml
@@ -1637,6 +1645,8 @@ vowel/@_2       [@:] vi
                 [V] tt
 vowel/&_2       [&] bn
                 [&] as
+                [&] or
+                [&] mni
 vowel/@_3       [@#] en
                 [@] en-sc
                 [I] en-sc
@@ -1731,6 +1741,8 @@ vowel/a#_2      [A] nl
                 [a] nso
                 [a] te
                 [a] si
+                [a] or
+                [a] mni
 vowel/a_3       [a] en-sc
                 [a/] en-sc
                 [A:] en-sc
@@ -1749,6 +1761,8 @@ vowel/a_3       [a] en-sc
                 [a] ka
                 [a:] si
                 [a] as
+                [a] or
+                [a] mni
 vowel/a#_3      [a#] en
                 [a#] en-n
                 [a#] en-us
@@ -1888,6 +1902,8 @@ vowel/e         [e] base
                 [e:] dv
                 [e:] te
                 [e] as
+                [e] or
+                [e] mni
                 [E] kl
 vowel/e#        [I] en-sc
                 [e] et
@@ -2107,6 +2123,8 @@ vowel/i_6       [i] bn
                 [i] te
                 [i] si
                 [i] as
+                [i] or
+                [i] mni
 vowel/i#_6      [i.] zh
 vowel/i_7       [i:] et
                 [i] pl
@@ -2246,6 +2264,8 @@ vowel/o         [o] base2
                 [o] te
                 [o:] te
                 [o] as
+                [o] or
+                [o] mni
                 [o] bo
                 [o] kl
 vowel/o_2       [o:] cy
@@ -2363,6 +2383,8 @@ vowel/oo_5      [O] bn
                 [O] is
                 [O] sq
                 [O] as
+                [O] or
+                [O] mni
 vowel/oo_en     [O] en
                 [O:] en
                 [O@] en
@@ -2405,6 +2427,8 @@ vowel/u         [u] base
                 [u] ak
                 [u:] wo
                 [u] as
+                [u] or
+                [u] mni
                 [u] bo
                 [u] tt
 vowel/u#        [u:] en-sc

phsource/ph_aragon

@@ -15,6 +15,12 @@ phoneme E
   FMT(vowel/ee_1)
 endphoneme
 
+phoneme e#
+  vowel starttype #e endtype #e
+  length 200
+  ChangeIfStressed(e)
+  ChangePhoneme(NULL)
+endphoneme
 
 phoneme O
   vowel starttype #o endtype #o

phsource/ph_dutch

@@ -286,3 +286,11 @@ phoneme z
   CALL base/z
 endphoneme
 
+
+phoneme l
+  import_phoneme en/l
+endphoneme
+
+phoneme x2
+  import_phoneme af/x2
+endphoneme

phsource/ph_english_us

@@ -359,11 +359,13 @@ phoneme t
   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)
+  IF nextPhW(isVowel) AND nextPh(isUnstressed) THEN
+    IF NOT next2PhW(n) OR nextPhW(3:) THEN
+      IF prevPhW(isVowel) AND NOT prevPhW(aI@) THEN
+        ChangePhoneme(t#)
+      ELIF prevPhW(n) THEN
+        WAV(ustop/t, 60)
+      ENDIF
     ENDIF
   ENDIF
 

phsource/ph_malayalam

@@ -277,3 +277,44 @@ phoneme g#
 endphoneme
 
 
+
+// suggested by Prasenjit Sen, but perhaps not needed?
+// ml_rules changes [p], [t], [k] to [b], [d], [g] in non-initial
+// positions
+
+phoneme p
+  import_phoneme consonants/p-
+  voicingswitch b
+
+  IF thisPh(isWordStart) THEN
+      CALL base/p
+  ELIF thisPh(isWordEnd) AND NOT thisPh(isFirstVowel) THEN
+      ChangePhoneme(b)
+  ENDIF
+endphoneme
+
+
+phoneme t 
+  import_phoneme base/t[
+  voicingswitch d
+
+  IF thisPh(isWordStart) THEN
+      CALL base/t
+  ELIF thisPh(isWordEnd) AND NOT thisPh(isFirstVowel) THEN
+      ChangePhoneme(d)
+  ENDIF
+endphoneme
+
+
+phoneme k
+  import_phoneme consonants/k-
+  voicingswitch g
+
+  IF thisPh(isWordStart) THEN
+      CALL base/k
+  ELIF thisPh(isWordEnd) AND NOT thisPh(isFirstVowel) THEN
+      ChangePhoneme(g)
+  ENDIF
+endphoneme
+
+

phsource/phonemes

@@ -1934,6 +1934,11 @@ include ph_gujarati
 phonemetable as bn
 include ph_assamese
 
+phonemetable or bn
+include ph_oriya
+
+phonemetable mni bn
+include ph_manipuri