Merge branch 'development'

phsource/ph_english_sc

@@ -113,6 +113,10 @@ phoneme I2
   CALL I
 endphoneme
 
+phoneme I#
+  vowel  starttype #@ endtype #@
+  ChangePhoneme(I2)
+endphoneme
 
 phoneme i   //  optional variant of [I] for end of words
   vowel  starttype #i  endtype #e
@@ -171,11 +175,10 @@ endphoneme
 
 phoneme 3:
   vowel  starttype #e  endtype #@
-  length 210
+  length 230
   ChangeIfNotStressed(VR)    // also need "replace 02 3: VR" in voice file
   ipa e
-  AppendPhoneme(r)
-  FMT(vdiph2/e@)
+  FMT(vowelr/e_r)
 endphoneme
 
 
@@ -217,7 +220,7 @@ phoneme o@
   length 230
   ipa o
   AppendPhoneme(r)
-  FMT(vowelr/o_r)
+  FMT(vowelr/oo_r)
 endphoneme
 
 
@@ -310,7 +313,7 @@ endphoneme
 phoneme i@3
   vowel  starttype #i  endtype #@
   ipa ɪ
-  length 220
+  length 240
   AppendPhoneme(r)
   FMT(vowelr/i_r)
 endphoneme

phsource/xph_nepali

@@ -1,133 +0,0 @@
-
-//====================================================
-//  Nepali  (inherits from Hindi)
-//====================================================
-
-phoneme V
-  vowel  starttype #@  endtype #@
-  length 160
-  ChangeIfNotStressed(@)
-  IF nextPh(H) THEN
-    FMT(vowel/@_low)
-  ENDIF
-  FMT(vowel/@_bck)
-endphoneme
-
-phoneme @3    // use a more front [@] after palatal consonants
-  vowel  starttype #@  endtype #@
-  length 140
-  FMT(vowel/@_3)
-endphoneme
-
-phoneme @/
-  vowel  starttype #@  endtype #@
-  length 130
-  IF nextPh(H) THEN
-    FMT(vowel/@_low)
-  ENDIF
-  FMT(vowel/@_bck)
-endphoneme
-
-
-phoneme i
-  vowel starttype #i endtype #i
-  length 160
-  IfNextVowelAppend(;)
-  FMT(vowel/i)
-endphoneme
-
-phoneme e
-  vowel starttype #e endtype #e
-  length 180
-  FMT(vowel/e)
-endphoneme
-
-phoneme a
-  vowel long starttype #a endtype #a
-  length 230
-  FMT(vowel/aa_9)
-endphoneme
-
-phoneme o
-  vowel starttype #o endtype #o
-  length 180
-  FMT(vowel/o_mid)
-endphoneme
-
-phoneme u
-  vowel starttype #u endtype #u
-  length 160
-  FMT(vowel/u_bck)
-endphoneme
-
-
-
-
-
-// Diphthongs
-//===========
-
-
-phoneme aI
-  vowel long starttype #a endtype #i
-  length 240
-  long
-  FMT(vdiph/aai)
-endphoneme
-
-phoneme aU
-  vowel long starttype #a endtype #u
-  length 240
-  long
-  FMT(vdiph/aau_3)
-endphoneme
-
-phoneme eI
-  vowel long starttype #e endtype #i
-  length 240
-  long
-  FMT(vdiph/eei)
-endphoneme
-
-phoneme eU
-  vowel long starttype #e endtype #u
-  length 240
-  long
-  FMT(vdiph/eu)
-endphoneme
-
-phoneme VI
-  vowel long starttype #@ endtype #i
-  length 240
-  long
-  FMT(vdiph/Vi)
-endphoneme
-
-phoneme VU
-  vowel long starttype #@ endtype #u
-  length 240
-  long
-  FMT(vdiph/Vu)
-endphoneme
-
-phoneme oI
-  vowel long starttype #o endtype #i
-  length 240
-  long
-  FMT(vdiph/oi)
-endphoneme
-
-phoneme oU
-  vowel long starttype #o endtype #u
-  length 240
-  long
-  FMT(vdiph/ou)
-endphoneme
-
-phoneme uI
-  vowel long starttype #u endtype #i
-  length 240
-  long
-  FMT(vdiph/ui)
-endphoneme
-