Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

phsource/ph_danish

@@ -2,7 +2,7 @@
 phoneme @
   vowel starttype #@ endtype #@
   unstressed
-  length 130
+  length 110
   FMT(vowel/@_3)
 endphoneme
 
@@ -10,7 +10,7 @@ endphoneme
 phoneme 3
   vowel starttype #a endtype #a
   unstressed
-  length 130
+  length 110
   FMT(vowel/a#_3)
 endphoneme
 
@@ -21,24 +21,65 @@ phoneme i
   FMT(vowel/i_4)
 endphoneme
 
+// PB Experimental glottal i
+// sviret vs. svirret
+phoneme ?i
+  vowel starttype #i endtype #i
+  length 95
+  IfNextVowelAppend(;)
+  FMT(vowel/i_4)
+endphoneme
+
+// PB English i - Tim
+phoneme I
+  vowel  starttype #i  endtype #i
+  length 130
+  IfNextVowelAppend(;)
+  FMT(vowel/ii_2)
+endphoneme
+
 phoneme e
   vowel starttype #e endtype #e
   length 150
   FMT(vowel/e)
 endphoneme
 
+// PB glottal e
+// "skille" vs. "skele", "pille" vs. "pile"
+phoneme ?e
+  vowel starttype #e endtype #e
+  length 95
+  FMT(vowel/e)
+endphoneme
+
 phoneme E
   vowel starttype #e endtype #e
   length 150
   FMT(vowel/e_mid2)
 endphoneme
 
+// PB Experimental glottal E
+// "læsse" vs. "læse"
+phoneme ?E
+  vowel starttype #e endtype #e
+  length 95
+  FMT(vowel/e_mid2)
+endphoneme
+
 phoneme &
   vowel starttype #e endtype #e
   length 150
   FMT(vowel/ee_2)
 endphoneme
 
+// PB Experimental glottal a
+// e.g. the last a in "staldkarl"
+phoneme ?&
+  vowel starttype #e endtype #e
+  length 95
+  FMT(vowel/ee_2)
+endphoneme
+
 // PB added for the æ in "dræbt"
 phoneme &#
   vowel starttype  #e endtype #e
@@ -64,6 +105,14 @@ phoneme u
   FMT(vowel/u_bck)
 endphoneme
 
+// PB glottal u
+// "gud" vs. "guden" - [guD] [g?D@n]
+phoneme ?u
+  vowel starttype #u endtype #u
+  length 95
+  FMT(vowel/u_bck)
+endphoneme
+
 phoneme o
   vowel starttype #o endtype #o
   length 150
@@ -76,6 +125,14 @@ phoneme O
   FMT(vowel/o_5)
 endphoneme
 
+// PB Experimental glottal O
+// "toget" vs. "tåget"
+phoneme ?O
+  vowel starttype #o endtype #o
+  length 95
+  FMT(vowel/o_5)
+endphoneme
+
 phoneme V
   vowel starttype #@ endtype #@
   length 150
@@ -95,6 +152,14 @@ phoneme y
   FMT(vowel/y)
 endphoneme
 
+// PB glottal y
+// "kylling" vs. "kyle", "krybbe" vs. "krybe"
+phoneme ?y
+  vowel starttype #i endtype #i
+  length 95
+  FMT(vowel/y)
+endphoneme
+
 phoneme Y
   vowel starttype #i endtype #i
   length 150
@@ -107,6 +172,14 @@ phoneme W
   FMT(vowel/oe)
 endphoneme
 
+// PB glottal W
+// "prøv" vs. "prøve"
+phoneme ?W
+  vowel starttype #@ endtype #@
+  length 80
+  FMT(vowel/oe)
+endphoneme
+
 // PB added for the ø in "røv", "røg", "øje" instead of [V3]
 phoneme W#
   vowel starttype #@ endtype #@

phsource/ph_english

@@ -248,6 +248,17 @@ phoneme 0
 endphoneme
 
 
+phoneme 0#    // [@] in unstressed syllables
+  vowel  starttype #o  endtype #o
+
+  IF thisPh(isUnstressed) AND nextVowel(isVowel) AND NOT nextVowel(isUnstressed) THEN
+    ChangePhoneme(@)
+  ENDIF
+
+  ChangePhoneme(0)
+endphoneme
+
+
 phoneme V
   vowel  starttype #a  endtype #@
   length 140