Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	espeak-data/voices/asia/fa-en-us
	phsource/compile_report
	phsource/mbrola/ir1

phsource/mbrola/us

@@ -49,3 +49,5 @@
 4  t   VWL    0  t_h
 4  k   VWL    0  k_h
 0  t2  NULL   0  t
+0  ?   NULL   0  t
+0  n-  NULL   0  n

phsource/mbrola/us3

@@ -46,5 +46,7 @@
 0  i@  NULL   50  I  @
 0  i@3 NULL   60  i  r
 0  t2  NULL   0  t
+0  ?   NULL   0  t
+0  n-  NULL   0  n
 
 

phsource/ph_english

@@ -51,6 +51,12 @@ endphoneme
 phoneme r-   // linking r, used in English between certain vowels and a following vowel
   liquid rhotic
   ipa ɹ
+  
+  IF NOT thisPh(isWordEnd) THEN
+    ChangePhoneme(r)
+  ENDIF
+//  ChangePhoneme(r)  // always use [r], not [r-] ?
+  
   lengthmod 0
 
   NextVowelStarts
@@ -99,7 +105,7 @@ phoneme w#
     EndSwitch
   ENDIF
 
-  WAV(h/hu)
+  WAV(h/hu, 70)
 endphoneme
 
 
@@ -113,7 +119,7 @@ phoneme @    //  Schwa
   length 140
   IfNextVowelAppend(r-)
   IF thisPh(isWordEnd) THEN
-    FMT(vowel/@_6)
+    FMT(vowel/@_6, 90)
   ENDIF
   FMT(vowel/@)
 endphoneme
@@ -168,11 +174,22 @@ phoneme a
 endphoneme
 
 
+phoneme a2  // don't reduce to a#
+  vowel dontlist
+  ChangePhoneme(a)
+endphoneme
+
+
 phoneme a#
   vowel  starttype #@  endtype #@
   ipa ɐ
   unstressed
   length 150
+  
+  IF NOT thisPh(isUnstressed) THEN
+    ChangePhoneme(a)          // syllable has an explicit stress
+  ENDIF
+
   FMT(vowel/a#_3)
 endphoneme
 
@@ -187,7 +204,7 @@ phoneme aa   //   'bath' etc.
   ENDIF
 
   IfNextVowelAppend(r-)
-  FMT(vowel/a_6, 90)
+  FMT(vowel/a_6, 88)
 endphoneme
 
 
@@ -266,9 +283,9 @@ phoneme i   //  optional variant of [I] for end of words
   length 150
   IfNextVowelAppend(;)
   
-//  IF prevVowel(isStressed) AND prevPhW(dZ) THEN
-//    FMT(vowel/ii_final)
-//  ENDIF
+  IF NOT thisPh(isFinalVowel) THEN
+    ChangePhoneme(I)
+  ENDIF
   
   FMT(vowel/ii_7)
 endphoneme
@@ -314,6 +331,12 @@ endphoneme
 phoneme U
   vowel  starttype #o  endtype #o
   length 150
+  
+  IF prevPhW(j) THEN
+    length 130
+    FMT(vowel/8_2)
+  ENDIF
+
   FMT(vowel/uu)
 endphoneme
 
@@ -410,8 +433,8 @@ phoneme u:
   IF nextPh(l/2) THEN
     FMT(vwl_en/u_L)
   ENDIF
-  IF prevPhW(j) THEN
-    length 180
+  IF prevPhW(j) AND NOT thisPh(isWordEnd) THEN
+    length 160
   ENDIF
   FMT(vdiph2/uw_2)
 endphoneme

phsource/ph_english_rp

@@ -81,6 +81,11 @@ phoneme i   //  optional variant of [I] for end of words
   vowel  starttype #i  endtype #i
   length 140
   IfNextVowelAppend(;)
+
+  IF NOT thisPh(isFinalVowel) THEN
+    ChangePhoneme(I)
+  ENDIF
+    
   FMT(vowel/ii_final)
 endphoneme
 

phsource/ph_english_us

@@ -49,7 +49,8 @@ phoneme a
   IF nextPh(isNasal) THEN
     FMT(vnasal/ee_n2)
   ELSEIF nextPh(r) THEN
-    FMT(vowel/ee_7)
+    length 230
+    FMT(vwl_en_us/ar)
   ENDIF
   FMT(vwl_en_us/a)
 endphoneme
@@ -65,7 +66,11 @@ phoneme a#
   ipa ɐ
   unstressed
   length 150
-  
+
+  IF thisPh(isStressed) THEN
+    ChangePhoneme(a)
+  ENDIF
+
   IF nextPhW(r) THEN
     ChangePhoneme(3)
   ENDIF
@@ -121,6 +126,11 @@ phoneme i   //  optional variant of [I] for end of words
   unstressed
   length 170
   IfNextVowelAppend(;)
+
+  IF NOT thisPh(isFinalVowel) THEN
+    ChangePhoneme(I)
+  ENDIF
+  
   FMT(vowel/ii_final)
 endphoneme
 
@@ -163,7 +173,7 @@ phoneme A:
   vowel  starttype #a  endtype #a
   length 200
   IF nextPhW(r) THEN
-    FMT(vwl_en_us/ar)
+    FMT(vwl_en_us/aar)
   ENDIF
   FMT(vowel/aa_8)
 endphoneme
@@ -177,7 +187,7 @@ phoneme A@      // Used for [A:] when followed by 'r', becomes [A:]+[r] in Ameri
   ENDIF
   length 260
   IfNextVowelAppend(r-)
-  FMT(vwl_en_us/ar)
+  FMT(vwl_en_us/aar)
 endphoneme
 
 
@@ -250,6 +260,11 @@ endphoneme
 phoneme u:
   vowel  starttype #u  endtype #u
   length 190
+  
+  IF prevPhW(j)  AND NOT thisPh(isWordEnd) THEN
+    length 160
+  ENDIF
+  
   FMT(vdiph2/uw_6)
 endphoneme
 
@@ -295,7 +310,7 @@ endphoneme
 
 phoneme e@
   vowel  starttype #e  endtype #@
-  length 280
+  length 260
   ipa ɛ|ɹ
   IF nextPhW(r) THEN
     ipa ɛ

phsource/ph_tamil

@@ -163,3 +163,24 @@ phoneme z.
   CALL base/z.
   ipa U+027B
 endphoneme
+
+phoneme r
+  liquid rhotic
+  lengthmod 3
+  
+  IF thisPh(isWordEnd) THEN
+    CALL base/r/
+  ENDIF
+    
+  IF prevPhW(isVowel) THEN
+    IF nextPhW(isNotVowel) THEN
+      ChangePhoneme(**)
+    ENDIF
+
+    ChangePhoneme(*)
+  ENDIF
+    
+  CALL base/r
+  ipa ɾ
+endphoneme
+