Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/ph_azerbaijani

phsource/ph_azerbaijani

@@ -1,19 +1,22 @@
 
 phoneme i
   vowel starttype #i endtype #i
-  length 160
+  length 180
   FMT(vowel/ii_5)
 endphoneme
 
 phoneme e
   vowel starttype #e endtype #e
-  length 160
+  length 200
   FMT(vowel/e_mid2)
 endphoneme
 
 phoneme &
   vowel starttype #e endtype #e
-  length 160
+  length 200
+  IF thisPh(isWordEnd) THEN
+    FMT(vowel/&_3)
+  ENDIF
   FMT(vowel/&)
 endphoneme
 
@@ -25,32 +28,35 @@ endphoneme
 
 phoneme W
   vowel starttype #@ endtype #@
-  length 180
+  length 200
   FMT(vowel/y#_2)
 endphoneme
 
 phoneme u
   vowel starttype #u endtype #u
-  length 160
-  FMT(vowel/u_5)
+  length 180
+  FMT(vowel/u_2)
 endphoneme
 
 phoneme o
   vowel starttype #o endtype #o
-  length 160
-  FMT(vowel/o_mid)
+  length 200
+  FMT(vowel/o_mid2)
 endphoneme
 
 phoneme a
   vowel starttype #a endtype #a
   length 200
-  FMT(vowel/aa)
+  IF thisPh(isWordEnd) THEN
+    FMT(vowel/a#)
+  ENDIF
+  FMT(vowel/aa_9)
 endphoneme
 
 phoneme @
   vowel starttype #@ endtype #@
   ipa ɯ
-  length 160
+  length 180
   FMT(vowel/u#_7)
 endphoneme
 

phsource/ph_base2

@@ -7,7 +7,7 @@
 
 phoneme a
   vowel starttype #a endtype #a
-  length 180
+  length 190
   IF thisPh(isDiminished) THEN
     ChangePhoneme(a/)
     FMT(vowel/a#)
@@ -18,28 +18,28 @@ endphoneme
 
 phoneme a/
   vowel starttype #@ endtype #@
-  length 180
+  length 190
   FMT(vowel/a#)
 endphoneme
 
 
 phoneme e
   vowel starttype #e endtype #e
-  length 170
+  length 180
   FMT(vowel/e)
 endphoneme
 
 
 phoneme E
   vowel starttype #e endtype #e
-  length 170
+  length 180
   FMT(vowel/ee_1)
 endphoneme
 
 
 phoneme i
   vowel starttype #i endtype #i
-  length 150
+  length 170
   IfNextVowelAppend(;)
   FMT(vowel/i)
 endphoneme
@@ -47,42 +47,42 @@ endphoneme
 
 phoneme o
   vowel starttype #o endtype #o
-  length 170
+  length 180
   FMT(vowel/o)
 endphoneme
 
 
 phoneme O
   vowel starttype #o endtype #o
-  length 170
+  length 180
   FMT(vowel/oo_4)
 endphoneme
 
 
 phoneme u
   vowel starttype #u endtype #u
-  length 160
+  length 180
   FMT(vowel/u_bck)
 endphoneme
 
 
 phoneme U
   vowel starttype #u endtype #u
-  length 160
+  length 180
   FMT(vowel/uu_2)
 endphoneme
 
 
 phoneme y
   vowel starttype #i endtype #i
-  length 160
+  length 180
   FMT(vowel/y)
 endphoneme
 
 
 phoneme Y
   vowel starttype #@ endtype #@
-  length 160
+  length 180
   FMT(vowel/y#)
 endphoneme
 

phsource/ph_spanish

@@ -111,22 +111,12 @@ phoneme D
   ENDIF
 endphoneme
 
+
 phoneme t        // dental variant of /t/
-  vls dnt stop
-  voicingswitch d[
-  lengthmod 2
-  Vowelin f1=1  f2=1500 -250 250  f3=-100 80  amp=16
-  Vowelout f1=0 f2=1500 -300 250  f3=-100 80  rms=20
-
-  IF nextPh(isPause2) THEN
-    WAV(ustop/t_dnt2, 35)
-  ENDIF
-  WAV(ustop/t_dnt2, 70)
-
+  import_phoneme base/t[
 endphoneme
 
 
-
 phoneme s
   vls alv frc sibilant
   lengthmod 3

phsource/phonemes

@@ -634,7 +634,7 @@ endphoneme
 
 
 phoneme j
-  liquid palatal
+  liquid palatal starttype #i
   lengthmod 7
 
   IF nextPhW(isVowel) THEN
@@ -1610,7 +1610,7 @@ phoneme x
   Vowelout f1=0 f2=2300 300 400  f3=-100 80  rms=20
 
   IF nextPh(isPause) THEN
-    WAV(ufric/x, 110)
+    WAV(ufric/x_, 60)
   ENDIF
   WAV(ufric/x_hr, 20)
 endphoneme