[1.47.03c]

Phoneme definition files: added prev2PhW() and next3PhW().
Added language: ms (Malay).


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

phsource/mbrola/id1

@@ -1,6 +1,5 @@
 
-// CR1 doesn't like same phonemes twice
-0  e   E     5  e  _
+// ID1 and MS1 don't like same phonemes twice
 0  s   s     5  s  _
 0  ?   k     5  k  _
 0  t   t     5  t  _
@@ -8,6 +7,10 @@
 0  n   n     5  n  _
 0  p   p     5  p  _
 0  l/  l     5  l  _
+0  h   h     5  h  _
+0  k   k     5  k  _
+0  z   z     5  z  _
+0  D   D     5  z  _
 
 0  l/2 NULL  0  l
 0  l/ NULL   0  l
@@ -28,10 +31,13 @@
 
 0  a   NULL  0  V
 0  E   NULL  0  e
+0  E2  NULL  0  e
 0  i   NULL  0  I
 0  o   NULL  0  Q
 0  O   NULL  0  Q
 0  u   NULL  0  U
+// 'id1' has phonemes OI aI aU
+
 
 0  n^  NULL  0  nY
 0  ?   NULL  0  k
@@ -40,3 +46,35 @@
 0  R   NULL  0  r
 0  x   NULL  0  h
 
+// some English phonemes
+0  A:  NULL  60 V  r
+0  A@  NULL  60 V  r
+0  eI  NULL  0  e
+0  oU  NULL  60  Q  U
+0  u:  NULL  0  U
+0  i:  NULL  0  I
+0  I2  NULL  0  I
+0  I#  NULL  0  I
+0  3   NULL  0  @
+0  3:  NULL  0  @
+0  e@  NULL  0  e
+0  i@  NULL  60 I  @
+0  i@3 NULL  60 I  r
+0  o@  NULL  60 Q  @
+0  O@  NULL  60 Q  @
+0  O:  NULL  80 Q  @
+0  U@  NULL  60 U  @
+0  0   NULL  0  Q
+0  a#  NULL  0  @
+0  aa  NULL  0  V
+0  @L  NULL  50 @  l
+0  aI  @     5  aI _
+0  aI  3     5  aI _
+0  aU  @     5  aU _
+0  aI@ NULL  75 V  @
+0  aI3 NULL  75 V  r
+0  aU@ NULL  75 V  @
+
+0  Z   NULL  60 z j
+0  T   NULL  0  t
+0  D   NULL  0  z

phsource/ph_bengali

@@ -8,6 +8,10 @@ phoneme V  // inherent vowel, can be [O] or [o]
   vowel flag1 starttype #o  endtype #o
   length 200
 
+  IF thisPh(isWordEnd) AND prevPhW(isNotVowel) AND prev2PhW(isNotVowel) THEN
+    ChangePhoneme(NULL)
+  ENDIF
+
   IF thisPh(isFirstVowel) THEN
     IF nextVowel(i) OR nextVowel(u) THEN
       ChangePhoneme(o)

phsource/ph_indonesian

@@ -3,6 +3,9 @@ phoneme @
   vowel starttype #@ endtype #@
   unstressed
   length 140
+  IF prevPh(@) THEN
+    InsertPhoneme(_|)
+  ENDIF
   FMT(vowel/@_low)
 endphoneme
 
@@ -11,6 +14,9 @@ endphoneme
 phoneme a
   vowel starttype #a endtype #a
   length 180
+  IF prevPh(a) THEN
+    InsertPhoneme(_|)
+  ENDIF
   ChangeIfUnstressed(a/)
   FMT(vowel/a)
 endphoneme
@@ -19,6 +25,9 @@ endphoneme
 phoneme E
   vowel starttype #e endtype #e
   length 180
+  IF prevPh(#e) THEN
+    InsertPhoneme(_|)
+  ENDIF
   ChangeIfUnstressed(@)
   FMT(vowel/e_mid)
 endphoneme
@@ -26,6 +35,9 @@ endphoneme
 phoneme E2   // as [E] but don't reduce to [@]
   vowel starttype #e endtype #e
   length 180
+  IF prevPh(#e) THEN
+    InsertPhoneme(_|)
+  ENDIF
   FMT(vowel/e_mid)
 endphoneme
 
@@ -33,6 +45,9 @@ endphoneme
 phoneme e
   vowel starttype #e endtype #e
   length 180
+  IF prevPh(#e) THEN
+    InsertPhoneme(_|)
+  ENDIF
   FMT(vowel/e)
 endphoneme
 
@@ -40,7 +55,9 @@ endphoneme
 phoneme i
   vowel starttype #i endtype #i
   length 180
-  IfNextVowelAppend(;)
+  IF prevPh(i) THEN
+    InsertPhoneme(_|)
+  ENDIF
   FMT(vowel/i_6)
 endphoneme
 
@@ -48,6 +65,9 @@ endphoneme
 phoneme O
   vowel starttype #o endtype #o
   length 180
+  IF prevPh(#o) THEN
+    InsertPhoneme(_|)
+  ENDIF
   FMT(vowel/oo)
 endphoneme
 
@@ -55,6 +75,9 @@ endphoneme
 phoneme o
   vowel starttype #o endtype #o
   length 180
+  IF prevPh(#o) THEN
+    InsertPhoneme(_|)
+  ENDIF
   FMT(vowel/o)
 endphoneme
 
@@ -62,6 +85,9 @@ endphoneme
 phoneme u
   vowel starttype #u endtype #u
   length 180
+  IF prevPh(u) THEN
+    InsertPhoneme(_|)
+  ENDIF
   FMT(vowel/u)
 endphoneme
 
@@ -69,6 +95,12 @@ endphoneme
 phoneme aI
   vowel starttype #a endtype #i
   length 240
+  IF prevPh(isVowel) THEN
+    InsertPhoneme(_|)
+  ENDIF
+  IF nextPh(isVowel) THEN
+    AppendPhoneme(_|)
+  ENDIF
   FMT(vdiph/ai)
 endphoneme
 
@@ -78,9 +110,27 @@ phoneme eI
   FMT(vdiph/eei_2)
 endphoneme
 
+phoneme OI
+  vowel starttype #o endtype #i
+  length 240
+  IF prevPh(isVowel) THEN
+    InsertPhoneme(_|)
+  ENDIF
+  IF nextPh(isVowel) THEN
+    AppendPhoneme(_|)
+  ENDIF
+  FMT(vdiph/ooi)
+endphoneme
+
 phoneme aU
   vowel starttype #a endtype #u
   length 240
+  IF prevPh(isVowel) THEN
+    InsertPhoneme(_|)
+  ENDIF
+  IF nextPh(isVowel) THEN
+    AppendPhoneme(_|)
+  ENDIF
   FMT(vdiph/au_4)
 endphoneme
 

phsource/phonemes

@@ -1864,6 +1864,20 @@ include ph_georgian
 phonemetable fa base
 include ph_farsi
 
+// experimental 
+
+phonemetable ko base
+include ph_korean
+
+phonemetable kl base
+include ph_greenlandic
+
+phonemetable am base
+include ph_amhari
+
+phonemetable si hi
+include ph_sinhala
+
 
 //**************************************************************************************
 // The following lines are experimental, for future additions.
@@ -1882,61 +1896,49 @@ include ph_kinyarwanda
 //phonemetable mn base
 //include ph_mongolian
 
-phonemetable prs base
-include ph_dari
+//phonemetable prs base
+//include ph_dari
 
 phonemetable sl sk
 include ph_slovenian
 
-phonemetable gd base
-include ph_s_gaelic
+//phonemetable gd base
+//include ph_s_gaelic
 
-phonemetable nso base
-include ph_northern-sotho
+//phonemetable nso base
+//include ph_northern-sotho
 
-phonemetable ht fr
-include ph_haitian
+//phonemetable ht fr
+//include ph_haitian
 
-phonemetable az tr
-include ph_azerbaijani
+//phonemetable az tr
+//include ph_azerbaijani
 
-phonemetable ak base
-include ph_akan
+//phonemetable ak base
+//include ph_akan
 
-phonemetable am base
-include ph_amhari
+//phonemetable wo base
+//include ph_wolof
 
-phonemetable wo base
-include ph_wolof
+//phonemetable dv hi
+//include ph_divehi
 
-phonemetable dv hi
-include ph_divehi
+//phonemetable te hi
+//include ph_telugu
 
-phonemetable te hi
-include ph_telugu
-
-phonemetable si hi
-include ph_sinhala
-
-phonemetable tn base
-include ph_setswana
+//phonemetable tn base
+//include ph_setswana
 
 
-phonemetable mt base
-include ph_maltese
+//phonemetable mt base
+//include ph_maltese
 
-phonemetable bo hi
-include ph_tibetan
+//phonemetable bo hi
+//include ph_tibetan
 
-phonemetable kk base
-include ph_kazakh
+//phonemetable kk base
+//include ph_kazakh
 
-phonemetable tt base
-include ph_tatar
-
-phonemetable ko base
-include ph_korean
-
-phonemetable kl base
-include ph_greenlandic
+//phonemetable tt base
+//include ph_tatar