Merge commit 'e4854a9cd6' into android

Conflicts:
	src/voices.cpp

phsource/ph_english_us

@@ -8,7 +8,7 @@ phoneme 3    //  Schwa, used for rhotic schwa in American
   vowel   starttype #@  endtype #@
   ipa ɚ
   unstressed
-  length 210
+  length 200
   IfNextVowelAppend(r-)
   FMT(vwl_en_us/3_us)
 endphoneme
@@ -21,15 +21,12 @@ phoneme @    //  Schwa
   IF nextPh(isRhotic) THEN
     ChangePhoneme(3)
   ENDIF
+  IF thisPh(isWordEnd) THEN
+    FMT(vowel/@_6)
+  ENDIF
   FMT(vowel/@_4)
 endphoneme
 
-phoneme @/    //  Schwa, end of word
-  vowel   starttype #@  endtype #@
-  unstressed
-  length 130
-  FMT(vowel/@_low2)
-endphoneme
 
 phoneme @2   //  Schwa, changes to I before a vowel
   vowel  starttype #@  endtype #@

phsource/ph_pt_brazil

@@ -39,7 +39,11 @@ phoneme &~
   vowel  starttype #@ endtype #@
   ipa ɐU+0303
   length 180
-  FMT(vnasal/a#_n)
+  IF thisPh(isFinalVowel) THEN
+    FMT(vnasal/W_n)
+  ELSE
+    FMT(vnasal/a#_n)
+  ENDIF
 endphoneme
 
 phoneme &U~
@@ -224,10 +228,3 @@ phoneme *
 endphoneme
 
 
-// TESTING
-phoneme &2~
-  vowel  starttype #@ endtype #@
-  ipa ɐU+0303
-  length 200
-  FMT(vnasal/W_n)
-endphoneme

phsource/ph_vietnam

@@ -85,14 +85,18 @@ phoneme i
   IF prevPhW(w) THEN
     VowelStart(w/wi)
   ENDIF
-  FMT(vowel/i_4)
+  IF nextPh(n^) OR nextPh(c) THEN
+  FMT(vnasal/ii_n)
+ELSE
+FMT(vowel/i_4)
+ENDIF
 endphoneme
 
 
 phoneme O
   vowel starttype #o endtype #o
-    IF nextPh(kh) THEN 
-	length 95
+    IF nextPh(kh) OR nextPh(N) THEN 
+	length 110
 	ELSE
 	length 200
 	ENDIF
@@ -101,8 +105,8 @@ endphoneme
 
 phoneme o
   vowel starttype #o endtype #o
-  IF nextPh(kh) THEN
-	length 95
+  IF nextPh(kh) OR nextPh(N) THEN
+	length 110
 	ELSE
 	length 200
 	ENDIF
@@ -286,7 +290,7 @@ endphoneme
 
 phoneme u@
   vowel  starttype #u  endtype #@
-  length 200
+  length 150 //200
   FMT(vdiph2/uu@)
 endphoneme
 
@@ -317,6 +321,12 @@ phoneme o&
   FMT(vietnam/oe)
 endphoneme
 
+phoneme iE // iê : viết, giệc
+  vowel  starttype #i  endtype #e
+  length 190
+  FMT(vietnam/ie_2)
+endphoneme
+
 phoneme kh
   vls vel frc
   lengthmod 3

phsource/ph_vietnam_hue

@@ -0,0 +1,49 @@
+ 
+//====================================================
+//  Vietnamese Phonemes - Make Huế Dialect
+//====================================================
+
+
+phoneme 1   //  ngang tone: level
+  stress
+  Tone(30, 2, envelope/p_level, NULL) // similar Hue dialect tone
+endphoneme
+
+
+phoneme 2   //  huyền tone: low falling
+  stress
+  Tone(20, 25, envelope/p_fall,envelope/vi_6amp) // NULL) //20 8
+endphoneme
+
+
+phoneme 3   //  sắc Tone(rising
+  stress
+  Tone(2, 10, envelope/p_rise, NULL) // 25 50 45 75
+endphoneme
+
+
+phoneme 4   //  hỏi Tone(curve (dipping rising)
+  stress
+  Tone(20, 5, envelope/p_512,NULL) //Tone(55, 5, envelope/p_fallrise, NULL) //30 5 m 55 5
+endphoneme
+
+
+phoneme 5   //  ngã tone: broken (creaking rising)
+  stress
+  Tone(50,2, envelope/p_214, envelope/vi_5amp) // 28,58 m20 85
+endphoneme
+
+
+phoneme 6   //  nặng Tone(drop  (constricted)
+  stress
+  //length 150 // ignore because it make too short sound 75  // reduce the length of the vowel
+  Tone(25, 10, envelope/p_512, envelope/vi_6amp) // 40 20
+endphoneme
+
+
+phoneme 7   //  Tone(1 (ngang) at end of clause
+  stress
+  Tone(5, 40, envelope/p_level, NULL) //Tone(99,  50, envelope/p_fall, NULL) // 40 20
+endphoneme
+
+

phsource/phonemes

@@ -771,12 +771,12 @@ phoneme n.
   ENDIF
 
   NextVowelStarts
-    VowelStart(n/n@)
-    VowelStart(n/na)
-    VowelStart(n/ne)
-    VowelStart(n/ni)
-    VowelStart(n/no)
-    VowelStart(n/nu)
+    VowelStart(n/nr@)
+    VowelStart(n/nra)
+    VowelStart(n/nre)
+    VowelStart(n/nri)
+    VowelStart(n/nro)
+    VowelStart(n/nru)
   EndSwitch
 
   IF prevPh(isNotVowel) AND nextPhW(isLiquid) THEN
@@ -1936,4 +1936,3 @@ include ph_korean
 phonemetable kl base
 include ph_greenlandic
 
-