Merge branch 'master' into android

phsource/ph_hindi

@@ -430,15 +430,14 @@ phoneme d.#
   lengthmod 5
   ipa ɖU+02B0
   voicingswitch t.#
-  Vowelin f1=1  f2=1800 -300 300  f3=-400 80
+  Vowelin f1=1  f2=1800 -300 300  f3=-150 80
   Vowelout f1=1 f2=1800 -300 300  f3=-400 80 colr=2
 
   IF PreVoicing THEN
     FMT(d/xdr)
   ENDIF
 
-  FMT(d/dr) addWav(ustop/t)
-//  FMT(d/dr) addWav(ustop/th_rfx)
+  FMT(d/dr2, 50) addWav(ustop/th_rfx2, 80)
 endphoneme
 
 

phsource/ph_malayalam

@@ -193,11 +193,26 @@ phoneme d#
 endphoneme
 
 
+phoneme t.#
+  vls rfx stop
+  lengthmod 2
+  ipa ʈU+02B0
+  voicingswitch d.#
+  Vowelin f1=0  f2=1800 -300 300  f3=-200 80
+  Vowelout f1=0 f2=1800 -300 250  f3=-400 80  rms=20 colr=2
+  
+  IF nextPhW(t.#) THEN
+    ChangePhoneme(t.)
+  ENDIF
+  WAV(ustop/th_rfx2, 80)
+endphoneme
+
+
 phoneme d.#
   vls rfx stop prevoice
   lengthmod 2
   ipa ʈU+02B0
-  Vowelin f1=0  f2=1800 -300 300  f3=-400 80
+  Vowelin f1=0  f2=1800 -300 300  f3=-200 80
   Vowelout f1=0 f2=1800 -300 250  f3=-400 80  rms=20 colr=2
 
   IF PreVoicing THEN
@@ -209,7 +224,7 @@ phoneme d.#
   ENDIF
 
   voicingswitch d.#
-  WAV(ustop/t)
+  WAV(ustop/th_rfx2, 80)
 endphoneme
 
 

phsource/ph_slovenian

@@ -1,13 +1,20 @@
 
+
+phoneme : //  lengthen previous vowel by "length"
+  virtual
+  length 40   // only a small increase for "long stress" because we probably put the stress on the wrong syllable
+endphoneme
+
+
 phoneme @    //  Schwa, can be stressed
   vowel   starttype #@  endtype #@
-  length 140
+  length 160
   FMT(vowel/@)
 endphoneme
 
 phoneme i
   vowel starttype #i endtype #i
-  length 140
+  length 160
   IfNextVowelAppend(;)
   IF thisPh(isStressed) AND NOT nextPhW(isRhotic) THEN
     FMT(vowel/ii_6)
@@ -17,31 +24,32 @@ endphoneme
 
 phoneme u
   vowel starttype #u endtype #u
-  length 140
+  length 160
   FMT(vowel/u_2)
 endphoneme
 
 
-
 phoneme a
   vowel starttype #a endtype #a
   length 170
+  IF thisPh(isUnstressed) THEN
+    FMT(vowel/a_8)
+  ENDIF
   FMT(vowel/a)
 endphoneme
 
 
 phoneme e
   vowel starttype #e endtype #e
-  length 160
+  length 170
+  ChangeIfUnstressed(E)
   FMT(vowel/e_2)
 endphoneme
 
-phoneme e:
+phoneme e+   // doesn't reduce to [e]
   vowel starttype #e endtype #e
-  length 240
-  FMT(vowel/e)
-endphoneme
-
+  ChangePhoneme(e)
+  endphoneme
 
 phoneme E
   vowel starttype #e endtype #e
@@ -49,14 +57,27 @@ phoneme E
   FMT(vowel/e_mid)
 endphoneme
 
+phoneme E#
+  vowel starttype #e endtype #e
+  length 160
+  IF thisPh(isNotStressed) THEN
+    ChangePhoneme(@)
+  ENDIF
+  FMT(vowel/e_mid)
+endphoneme
 
 
 phoneme o
   vowel starttype #o endtype #o
-  length 160
+  length 170
+  ChangeIfUnstressed(O)
   FMT(vowel/o_8)
 endphoneme
 
+phoneme o+   // doesn't reduce to [O]
+  vowel starttype #o endtype #o
+  ChangePhoneme(o)
+  endphoneme
 
 phoneme O
   vowel starttype #o endtype #o
@@ -69,3 +90,17 @@ endphoneme
 phoneme v
   import_phoneme base/v#
 endphoneme
+
+
+// for foreign letters
+phoneme y
+  vowel starttype #i endtype #i
+  length 170
+  FMT(vowel/y)
+endphoneme
+
+phoneme R^       // Czech r-caron
+  import_phoneme sk/R^
+endphoneme
+
+

phsource/ph_telugu

@@ -104,3 +104,36 @@ endphoneme
 phoneme r
   import_phoneme base/R2
 endphoneme
+
+
+phoneme t.#
+  vls rfx stop
+  lengthmod 2
+  ipa ʈU+02B0
+  voicingswitch d.#
+  Vowelin f1=0  f2=1800 -300 300  f3=-200 80
+  Vowelout f1=0 f2=1800 -300 250  f3=-400 80  rms=20 colr=2
+  
+  IF nextPhW(t.#) THEN
+    ChangePhoneme(t.)
+  ENDIF
+  WAV(ustop/th_rfx2, 80)
+endphoneme
+
+phoneme d.#
+  vcd rfx stop
+  lengthmod 5
+  ipa ɖU+02B0
+  voicingswitch t.#
+  Vowelin f1=1  f2=1800 -300 300  f3=-150 80
+  Vowelout f1=1 f2=1800 -300 300  f3=-400 80 colr=2
+
+  IF PreVoicing THEN
+    FMT(d/xdr)
+  ENDIF
+
+  FMT(d/dr2, 50) addWav(ustop/th_rfx2, 80)
+
+endphoneme
+
+

phsource/ph_turkish

@@ -92,7 +92,10 @@ endphoneme
 phoneme a
   vowel starttype #a endtype #a
   length 200
-  FMT(vowel/a#_4)
+  IF thisPh(isUnstressed) AND thisPh(isWordEnd) THEN
+    FMT(vowel/a#_2)
+  ENDIF
+  FMT(vowel/aa_6)
 endphoneme
 
 
@@ -198,13 +201,11 @@ endphoneme
 
 
 phoneme R
-  vcd alv flp rhotic
+  liquid trill rhotic
+  lengthmod 6
   IF prevPhW(isVowel) AND nextPhW(isVowel) THEN
-    CALL base/*
-//  ELIF prevPhW(isNotVowel) THEN
-//    CALL base/R
-  ELSE
-    CALL base/r
+    ChangePhoneme(*)
   ENDIF
-  ipa ɾ
+  CALL base/R
 endphoneme
+

phsource/phonemes

@@ -344,7 +344,7 @@ endphoneme
 
 
 phoneme R
-  liquid
+  liquid rhotic
   trill
   lengthmod 6
   ipa r
@@ -357,7 +357,7 @@ phoneme R
 endphoneme
 
 phoneme R2   // this is [R] from Slovak/Czech
-  liquid
+  liquid rhotic
   trill
   lengthmod 6
   ipa r
@@ -367,7 +367,7 @@ phoneme R2   // this is [R] from Slovak/Czech
 endphoneme
 
 phoneme R3  // Afrikaans
-  liquid
+  liquid rhotic
   trill  
   lengthmod 6
   length 60
@@ -394,7 +394,7 @@ endphoneme
 
 
 phoneme r"     // uvular trill
-  vcd uvl frc
+  vcd uvl frc rhotic
   ipa ʀ
   lengthmod 6
   IF nextPh(isNotVowel) THEN
@@ -1892,7 +1892,7 @@ include ph_kinyarwanda
 phonemetable prs base
 include ph_dari
 
-phonemetable sl sk
+phonemetable sl pl
 include ph_slovenian
 
 phonemetable gd base
@@ -1947,9 +1947,3 @@ include ph_korean
 phonemetable kl base
 include ph_greenlandic
 
-phonemetable ar base
-include ph_arabic
-
-phonemetable gu hi
-include ph_gujarati
-