Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

phsource/intonation

@@ -7,6 +7,17 @@ nucleus0 fall 64 8
 nucleus  fall 70 18 24 12
 endtune
 
+tune s_ml
+prehead   46 57
+headenv   fall 16
+head       3 40 60 15 30
+headextend 0 63 38 13 0
+nucleus0 fall 64 8
+nucleus  fall 70 18 24 12
+endtune
+
+
+
 tune c1
 prehead   46 57
 headenv   fall 16
@@ -132,3 +143,45 @@ nucleus0 fall  92 8
 nucleus  fall  92 80 76 8
 endtune
 
+
+// italian (by  llajta@gmx.us)
+
+tune s4
+prehead   46 57
+headenv   fall 16
+head       4 80 50 -8 -5
+headextend 0 63 38 13 0
+nucleus0 fall 64 8
+nucleus  fall 70 18 24 12
+endtune
+
+tune c4
+prehead   46 57
+headenv   fall 16
+head       4 76 42 -8 -5
+headextend 0 63 38 13 0
+nucleus0 fall-rise  77 25
+nucleus  fall-rise2 78 25 24 52
+endtune
+
+tune q4
+prehead   47 58
+headenv   fall 16
+head       5 75 53 -7 1
+headextend 0 60 55 45 60
+onset 60 48 62
+headlast 60 44 40
+nucleus0 fall-rise  95 29
+nucleus  fall-rise2 92 21 34 79
+endtune
+
+tune e4
+prehead   46 57
+headenv   fall 16
+head       5 77 53 -7 0
+headextend 40 80 75 70 67
+headlast 80 72 60
+nucleus0 fall  92 8
+nucleus  fall  88 77 75 10
+endtune
+

phsource/ph_english

@@ -212,6 +212,17 @@ phoneme E
 endphoneme
 
 
+phoneme E#    // [@] in unstressed syllables, if next vowel is stressed
+  vowel  starttype #e  endtype #e
+
+  IF thisPh(isUnstressed) AND nextVowel(isVowel) AND nextVowel(isStressed) THEN
+    ChangePhoneme(@)
+  ENDIF
+
+  ChangePhoneme(E)
+endphoneme
+
+
 phoneme I
   vowel  starttype #i  endtype #i
   length 130
@@ -250,7 +261,7 @@ endphoneme
 
 phoneme i   //  optional variant of [I] for end of words
   vowel  starttype #i  endtype #i
-  ipa ɪ
+  ipa i
   length 140
   IfNextVowelAppend(;)
   FMT(vowel/ii_7)

phsource/ph_gujarati

@@ -2,3 +2,18 @@
 // Phonemes for gujarati
 // This inherits from ph_hindi
 
+phoneme aI
+  vowel long starttype #@ endtype #i
+  length 240
+  long
+  FMT(vdiph/@i_4)
+endphoneme
+
+phoneme aU
+  vowel long starttype #a endtype #u
+  length 240
+  long
+  FMT(vdiph/a#u)
+endphoneme
+
+

phsource/ph_spanish_la

@@ -3,4 +3,8 @@
 //  Latin American Spanish  - based on Spanish
 //====================================================
 
+phoneme T
+  vls alv frc sibilant
+  ChangePhoneme(s)
+endphoneme