Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

phsource/mbrola/hn1

@@ -0,0 +1,27 @@
+
+// Korean
+
+0 k-   NULL 0 k_>
+0 t-   NULL 0 t_>
+0 *    NULL 0 4
+0 p-   NULL 0 p_>
+0 s-   NULL 0 s_>
+0 tS;  NULL 0 ts\
+0 tS;- NULL 0 ts\_>
+0 tSh; NULL 0 ts\_h
+0 k_h  NULL 0 ts\_h
+0 tSh; NULL 0 ts\_h
+0 kh   NULL 0 k_h
+0 th   NULL 0 t_h
+0 ph   NULL 0 p_h
+0 dZ;  NULL 0 dz\
+
+0 ng   NULL 0 N
+
+0 @    NULL 0 V
+0 j@   NULL 0 jV
+0 Y    NULL 0 2
+0 w@   NULL 0 wV
+0 u-   NULL 0 M
+0 u-j  NULL 0 M\i
+

phsource/ph_korean

@@ -0,0 +1,110 @@
+
+// vowels
+
+phoneme a   // a(ㅏ)
+  ipa ɐ
+  vowel starttype #a endtype #a
+  length 200
+  FMT(vowel/aa_8)
+endphoneme
+
+phoneme E   // ae(ㅐ)
+  ipa ɛ
+  vowel starttype #e endtype #e
+  length 200
+  FMT(vowel/ee_5)
+endphoneme
+
+phoneme @   // eo(ㅓ)
+  ipa ʌ
+  vowel starttype #@ endtype #@
+  length 200
+  FMT(vowel/oo_2)
+endphoneme
+
+phoneme o   // o(ㅗ)
+  ipa o
+  vowel starttype #o endtype #o
+  length 200
+  FMT(vowel/o_8)
+endphoneme
+
+phoneme u   // u(ㅜ)
+  ipa u
+  vowel starttype #u endtype #u
+  length 200
+  FMT(vowel/u_bck)
+endphoneme
+
+phoneme u-  // eu(ㅡ)
+  ipa ɯ
+  vowel starttype #u endtype #u
+  length 200
+  FMT(vowel/i#_7)
+endphoneme
+
+// diphthongs
+
+
+// consonants
+
+phoneme k-  //  /ㄲ/
+  vls vel stop
+  lengthmod 3
+  Vowelin f1=1  f2=1700 0 200  f3=-300 80 f4
+  Vowelout f1=1 f2=1700 0 200  f3=-300 80 f4 rms=30
+  WAV(ustop/k_unasp_, 75)
+  length 100
+endphoneme
+
+phoneme kh  //  /ㅋ/
+  import_phoneme  consonants/kh
+endphoneme
+
+phoneme t-  //  /ㄸ/
+  vls alv stop
+  lengthmod 3
+  Vowelin f1=0  f2=1700 -300 300  f3=-100 80  rms=40
+  Vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
+  WAV(ustop/t_unasp, 40)    // TODO
+endphoneme
+
+// TODO: ㅌ
+
+phoneme p-  //  /ㅃ/
+  import_phoneme  consonants/p-
+endphoneme
+
+phoneme ph  //  /ㅍ/
+  import_phoneme  consonants/ph
+endphoneme
+
+phoneme tS; //  voiceless /ㅈ/
+  vls pla afr sibilant palatal
+  ipa tɕ
+  lengthmod 2
+  Vowelin f1=0  f2=2700 400 600  f3=300 80
+  WAV(ustop/ts_pzd3)
+endphoneme
+
+phoneme dZ; //  voiced /ㅈ/
+  vcd pla afr sibilant palatal
+  ipa dʑ
+  lengthmod 2
+  Vowelin f1=0  f2=2700 400 600  f3=300 80
+  FMT(dzh/dzh) addWav(x/dz_pzd)
+endphoneme
+
+phoneme *   // r(ㄹ) at initial, medial
+  vcd alv flp rhotic
+  ipa ɾ
+  lengthmod 3
+  Vowelout f1=3 f2=1600 -300 300  f3=-300 80 rms=35 len=15
+  Vowelin f1=2  f2=1600 -300 300  f3=-100 80 len=20
+
+  IF prevPh(#i) OR prevPh(#e) THEN
+    FMT(r3/@tap2)
+  ENDIF
+  FMT(r3/@tap)
+endphoneme
+

phsource/ph_tatar

@@ -1,12 +1,15 @@
 
+
+// use 'flag1' for front vowels
+
 phoneme i
-  vowel starttype #i endtype #i
+  vowel flag1 starttype #i endtype #i
   length 180
   FMT(vowel/i)
 endphoneme
 
 phoneme y
-  vowel starttype #u endtype #u
+  vowel flag1 starttype #u endtype #u
   length 180
   FMT(vowel/y)
 endphoneme
@@ -17,16 +20,34 @@ phoneme u
   FMT(vowel/u)
 endphoneme
 
+phoneme u2   // letter 'ю'
+  vowel starttype #u endtype #u
+  length 180
+  IF prevVowel(isFlag1) OR nextVowel(isFlag1) THEN
+    ChangePhoneme(y)
+  ELSE
+    ChangePhoneme(u)
+  ENDIF
+endphoneme
 
 phoneme e
-  vowel starttype #@ endtype #@
+  vowel flag1 starttype #@ endtype #@
   length 100
   FMT(vowel/ii#)
 endphoneme
 
-phoneme W
+phoneme e2    // 'e' at start of word
   vowel starttype #@ endtype #@
   length 100
+  IF nextVowel(isFlag1) THEN
+    ChangePhoneme(e)
+  ENDIF
+  ChangePhoneme(V)
+endphoneme
+
+phoneme W
+  vowel flag1 starttype #@ endtype #@
+  length 100
   FMT(vowel/oe)
 endphoneme
 
@@ -44,7 +65,7 @@ endphoneme
 
 
 phoneme a
-  vowel starttype #a endtype #a
+  vowel flag1 starttype #a endtype #a
   length 180
   FMT(vowel/&_2)
 endphoneme
@@ -55,22 +76,30 @@ phoneme A
   IF thisPh(isFirstVowel) THEN
     ChangePhoneme(0)
   ENDIF
-  IF thisPh(isSeqFlag1) THEN
+  IF prevVowel(0) THEN
     ChangePhoneme(0)
   ENDIF
   FMT(vowel/aa)
 endphoneme
 
+phoneme A2  // letter 'я'
+  vowel starttype #a endtype #a
+  length 180
+  IF prevVowel(isFlag1) OR nextVowel(isFlag1) THEN
+    ChangePhoneme(a)
+  ENDIF
+  ChangePhoneme(A)
+endphoneme
+
 phoneme 0
   vowel starttype #o endtype #o
-  flag1
   length 180
   FMT(vowel/0_3)
 endphoneme
 
 
 phoneme I
-  vowel starttype #i endtype #i
+  vowel flag1 starttype #i endtype #i
   length 100
   FMT(vowel/ii)
 endphoneme

phsource/phonemes

@@ -1900,3 +1900,7 @@ include ph_irish
 
 phonemetable tt base
 include ph_tatar
+
+phonemetable ko base
+include ph_korean
+