Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/ph_irish

phsource/ph_danish

@@ -674,7 +674,7 @@ phoneme j
     NextVowelStarts
       VowelStart(j/j@)
       VowelStart(j/ja)
-      VowelStart(j/je,-60)
+      VowelStart(j/je,-40)
       VowelStart(j/ji)
       VowelStart(j/jo)
       VowelStart(j/ju)

phsource/ph_georgian

@@ -28,7 +28,10 @@ endphoneme
 phoneme a
   vowel  starttype #a  endtype #a
   length 180
-  FMT(vowel/a#_2)
+  IF thisPh(isUnstressed) THEN
+    FMT(vowel/a#_2)
+  ENDIF
+  FMT(vowel/a_3)
 endphoneme
 
 
@@ -69,12 +72,15 @@ phoneme k#
   Vowelin f1=1  f2=1400 -100 100  f3=-150 80
   Vowelout f1=0 f2=2300 300 400  f3=-150 80  rms=20
   IF nextPh(isPause2) THEN
-    WAV(ustop/k_asp2, 40)
+    WAV(ustop/k_asp, 40)
   ENDIF
-  IF nextPh(l) THEN
-    WAV(ustop/kl)
+  IF nextPhW(#e) OR nextPhW(#i) THEN
+    WAV(ustop/k_asp_e, 40)
+  ELIF nextPhW(#o) OR nextPhW(#u) THEN
+    WAV(ustop/k_asp_u, 50)
+  ELSE
+    WAV(ustop/k_asp_a, 45)
   ENDIF
-  WAV(ustop/k_asp2, 60)
 endphoneme
 
 
@@ -113,24 +119,27 @@ phoneme k
   import_phoneme consonants/k-
 endphoneme
 
-phoneme q
-  vls uvl stop
-  lengthmod 2
-  Vowelin f1=1  f2=1700 0 200  f3=-300 80 gpaus f4 rms=30
-  Vowelout f1=1 f2=1700 -100 200  f3=-300 80  f4 rms=35
-
-  IF nextPh(#i) THEN
-    WAV(ustop/q2_i, 40)
-  ENDIF
-  WAV(ustop/q2, 48)
-endphoneme
-
 
 
 phoneme Q
-  import_phoneme base/r"
+  vcd vel frc
+  voicingswitch x
+  lengthmod 6
+  Vowelin f1=2  f2=2300 200 400  f3=-100 80
+  Vowelout f1=2  f2=2300 250 300  f3=-300 80 brk
+  FMT(voc/Q) addWav(ufric/xx, 100)
 endphoneme
 
+phoneme Q2
+  vcd vel frc
+  voicingswitch x
+  lengthmod 6
+  Vowelin f1=2  f2=2300 200 400  f3=-100 80
+  Vowelout f1=2  f2=2300 250 300  f3=-300 80 brk
+  FMT(voc/Q) addWav(ufric/x2, 50)
+endphoneme
+
+
 phoneme r
   import_phoneme base/R
 endphoneme

phsource/ph_irish

@@ -1,9 +1,30 @@
+// Version 2.4 January 2013
 
 // short vowels
 
 
-phoneme @
-  vowel starttype #@ endtype #@
+phoneme @    //  Schwa, but always unstressed
+  vowel   starttype #@  endtype #@
+  unstressed
+  length 100
+  IF nextPh(i:) THEN
+    Length 70
+    FMT(vwl_af/r@)
+  ENDIF
+  IF nextPh(I) THEN
+    Length 70
+    FMT(vwl_af/r@)
+  ENDIF
+  IF nextPh(e:) THEN
+    Length 70
+    FMT(vwl_af/r@)
+  ENDIF
+  FMT(vwl_af/@)
+endphoneme
+
+
+phoneme @/
+  vowel  starttype #@  endtype #@
   length 120
   FMT(vowel/@)
 endphoneme
@@ -11,12 +32,14 @@ endphoneme
 
 phoneme a
   vowel starttype #a endtype #a
-  length 200
+  length 150
   FMT(vowel/a_4)
 endphoneme
 
+
 phoneme a#
   vowel starttype #@ endtype #@
+  ipa ɐ
   length 120
   ChangeIfStressed(a)
   FMT(vowel/a#_3)
@@ -33,38 +56,35 @@ phoneme E#
   vowel  starttype #@  endtype #@
   length 120
   ChangeIfStressed(E)
-  FMT(vowel/@)
+  ChangePhoneme(@/)
 endphoneme
 
 
 phoneme I
   vowel  starttype #i  endtype #i
   length 120
-  IfNextVowelAppend(;)
   FMT(vowel/ii_2)
 endphoneme
 
-phoneme I#
-  vowel  starttype #@  endtype #@
-  length 120
-  ChangeIfStressed(I)
-  IfNextVowelAppend(;)
-  FMT(vowel/@)
+phoneme i   // non syllabic i for end of words
+  vowel  starttype #i  endtype #i
+  ipa iU+032F
+  length 40
+  FMT(vowel/ii_7)
 endphoneme
 
 
-
 phoneme O
-  vowel starttype #o endtype #o
+  vowel  starttype #a  endtype #@
   length 140
-  FMT(vowel/oo_4)
+  FMT(vowel/V_4)
 endphoneme
 
 phoneme O#
   vowel starttype #@ endtype #@
   length 120
   ChangeIfStressed(O)
-  FMT(vowel/@)
+  ChangePhoneme(a#)
 endphoneme
 
 
@@ -78,7 +98,35 @@ phoneme U#
   vowel starttype #@ endtype #@
   length 120
   ChangeIfStressed(U)
-  FMT(vowel/@)
+  ChangePhoneme(@/)
+endphoneme
+
+phoneme u1
+  vowel starttype #u endtype #u
+  ipa uU+0306
+  length 50
+  FMT(vowel/u)
+endphoneme
+
+phoneme 0
+  vowel  starttype #a   endtype #a
+  length 180
+  ipa A
+  FMT(vowel/aa_8)
+endphoneme
+
+phoneme 0#
+  vowel starttype #@ endtype #@
+  length 120
+  ChangeIfStressed(0)
+  ChangePhoneme(a#)
+endphoneme
+
+  
+phoneme o:
+  vowel  starttype #o  endtype #o
+  length 190
+  FMT(vowel/o)
 endphoneme
 
 
@@ -105,11 +153,6 @@ phoneme i:
 endphoneme
 
 
-phoneme o:
-  vowel  starttype #o  endtype #o
-  length 190
-  FMT(vowel/o)
-endphoneme
 
 
 phoneme u:
@@ -121,11 +164,6 @@ endphoneme
 
 // Diphthongs
 
-phoneme @I
-  vowel starttype #@ endtype #i
-  length 240
-  FMT(vdiph/@i)
-endphoneme
 
 phoneme @U
   vowel starttype #@ endtype #u
@@ -145,4 +183,57 @@ phoneme u@
   FMT(vdiph2/u@)
 endphoneme
 
+phoneme aI
+  vowel starttype #a endtype #i
+  length 250
+  FMT(vdiph/ai)
+endphoneme
+
+phoneme aI#
+  vowel starttype #@ endtype #@
+  length 120
+  ChangeIfStressed(aI)
+  ChangePhoneme(a#)
+endphoneme
+
+phoneme aU
+  vowel starttype #a endtype #u
+  length 270
+  FMT(vdiph/au_4)
+endphoneme
+
+phoneme aU#
+  vowel starttype #@ endtype #@
+  length 120
+  ChangeIfStressed(aU)
+  FMT(vdiph/au_4)
+endphoneme
+
+
+phoneme ;     // linking j, used between (i) vowels and a following vowel
+              // also to palatalize consonants
+  liquid palatal
+  lengthmod 0
+
+  IF prevPh(#i) THEN
+    ipa NULL   // linking after i vowel, don't show in ipa
+  ENDIF
+
+  NextVowelStarts
+    VowelStart(j2/j2@)
+    VowelStart(j2/j2a)
+    VowelStart(j2/j2e)
+    VowelStart(j2/j2i)
+    VowelStart(j2/j2o)
+    VowelStart(j2/j2u)
+  EndSwitch
+
+  IF prevPh(#i) THEN
+    VowelEnding(j2/xj2, -40)
+  ENDIF
+
+  IF prevPh(isPause) THEN
+    FMT(j2/_j2)
+  ENDIF
+endphoneme
 

phsource/ph_malayalam

@@ -144,18 +144,3 @@ phoneme d#   // 'rr' sounds like English 'd'
 endphoneme
 
 
-phoneme kh2
-  vls vel stop
-  lengthmod 2
-  voicingswitch g
-  Vowelin f1=0  f2=2300 200 300  f3=-150 80
-  Vowelout f1=0 f2=2300 300 400  f3=-150 80  rms=20
-  IF nextPh(isPause2) THEN
-    WAV(ustop/k_asp2, 50)
-  ENDIF
-  IF nextPh(l) THEN
-    WAV(ustop/kl)
-  ENDIF
-  WAV(ustop/k_asp2, 90)
-endphoneme
-