Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

phsource/ph_aragon

@@ -28,3 +28,38 @@ phoneme O
   FMT(vowel/oo_4)
 endphoneme
 
+
+
+phoneme k
+  vls vel stop
+  lengthmod 2
+  voicingswitch g
+  Vowelin f1=0  f2=2300 200 400  f3=-100 80
+  Vowelout f1=0 f2=2300 300 400  f3=-100 80  rms=20
+
+  IF nextPh(isPause2) THEN
+    WAV(ustop/k_)
+  ELIF nextPh(#i) OR nextPh(;) THEN
+    WAV(ustop/ki_unasp2, 30)
+//  ELIF nextPh(isRhotic) THEN
+//    WAV(ustop/kr)
+//  ELIF nextPh(l) THEN
+//    WAV(ustop/kl)
+  ENDIF
+  WAV(ustop/k_unasp2, 25)
+endphoneme
+
+
+phoneme t
+  vls dnt stop
+  lengthmod 2
+  voicingswitch d
+  Vowelin f1=0  f2=1600 -300 300  f3=-100 80
+  Vowelout f1=0 f2=1600 -300 250  f3=-100 80  rms=20
+  IF nextPh(isPause2) THEN
+    WAV(ustop/t_dnt, 25)
+  ENDIF
+  WAV(ustop/t_unasp3, 50)
+endphoneme
+
+

phsource/ph_english_us

@@ -137,7 +137,7 @@ endphoneme
 
 phoneme 0
   vowel  starttype #a   endtype #a
-  length 200
+  length 220
   ipa ɑː
   ChangeIfDiminished(@)
   IF nextPh(r) THEN
@@ -171,7 +171,7 @@ endphoneme
 
 phoneme A:
   vowel  starttype #a  endtype #a
-  length 200
+  length 220
   IF nextPhW(r) THEN
     FMT(vwl_en_us/aar)
   ENDIF
@@ -208,7 +208,7 @@ endphoneme
 
 phoneme i:
   vowel  starttype #i  endtype #i
-  length 170
+  length 180
   IfNextVowelAppend(;)
   FMT(vowel/i_en)
 endphoneme
@@ -216,7 +216,7 @@ endphoneme
 
 phoneme O:
   vowel  starttype #o  endtype #o
-  length 200
+  length 220
   ChangeIfDiminished(@)
   IF nextPhW(r) THEN
     FMT(vwl_en_us/oor)

phsource/ph_german

@@ -344,9 +344,9 @@ phoneme r   // note, following consonant must be 'ustop/t_' not 'ustop/tr' etc.
       IF prevPhW(isVowel) THEN
         ChangePhoneme(R)
       ELSE
-        IF prevPhW(t) OR prevPhW(p) OR prevPhW(k) THEN
-          PauseBefore 40
-        ELSEIF prevPhW(d) OR prevPhW(b) OR prevPhW(g) THEN
+        IF prevPhW(t) THEN
+          PauseBefore 30
+        ELSEIF prevPhW(d) OR prevPhW(b) OR prevPhW(g) OR prevPhW(k) OR prevPhW(p) THEN
           PauseBefore 15
         ELSE
           InsertPhoneme(@-)

phsource/ph_spanish

@@ -157,38 +157,3 @@ phoneme r
 endphoneme
 
 
-
-
-phoneme k
-  vls vel stop
-  lengthmod 2
-  voicingswitch g
-  Vowelin f1=0  f2=2300 200 400  f3=-100 80
-  Vowelout f1=0 f2=2300 300 400  f3=-100 80  rms=20
-
-  IF nextPh(isPause2) THEN
-    WAV(ustop/k_)
-  ELIF nextPh(#i) OR nextPh(;) THEN
-    WAV(ustop/ki_unasp2, 50)
-//  ELIF nextPh(isRhotic) THEN
-//    WAV(ustop/kr)
-//  ELIF nextPh(l) THEN
-//    WAV(ustop/kl)
-  ENDIF
-  WAV(ustop/k_unasp2, 50)
-endphoneme
-
-
-phoneme t
-  vls dnt stop
-  lengthmod 2
-  voicingswitch d
-  Vowelin f1=0  f2=1600 -300 300  f3=-100 80
-  Vowelout f1=0 f2=1600 -300 250  f3=-100 80  rms=20
-  IF nextPh(isPause2) THEN
-    WAV(ustop/t_unasp3, 30)
-  ENDIF
-  WAV(ustop/t_unasp3, 60)
-endphoneme
-
-