Merge branch 'development'

Conflicts:
	src/Makefile.espeakedit

dictsource/de_rules

@@ -256,7 +256,7 @@
      e) chen (_    C@n
      ü) chen (_    C@n
 
-        chs        ks        (_
+        chs        ks
         chance     SA~s@
         chara (kt  k%ara
      _) ch (ic     S

dictsource/en_list

@@ -3054,6 +3054,7 @@ Katie		keIti
 Keighli		keIli
 Keanu		kI'A:nu:
 Kieran		ki@r@n
+Kris		krIs
 Laurence	l0r@ns
 Lawrence	l0r@ns
 Leann		li:'an

dictsource/es_rules

@@ -1,4 +1,4 @@
-// translation rules for Spanish
+// translation rules for Spanish
 // This file is UTF-8 encoded
 
 // Conditional rules
@@ -128,8 +128,9 @@ ll	(_	l
 
 .group m
           m          m
+       @) m (_       =m
        _) mn (em     n
-_)	mb	(A	mb
+       _) mb (A      mb
 
 
 .group n

dictsource/ko_list

@@ -1,28 +1,65 @@
+// eSpeak Korean rules. Changed pronunciation, as numbers were not announced.
+
+
+// Number forms:
+_0	j'@N_!
+_1	'iR_!
+_2	'i_!
+_3	s'am_!
+_4	s'a_!
+_5	'o_!
+_6	j'uq_!
+_7	tS'h'iR_!
+_8	ph'aR_!
+_9	g'u_!
+_1X	s'ip_!
+_2X	'i_!||s'ip_!
+_3X	s'am_!||s'ip_!
+_4X	s'a_!||s'ip_!
+_5X	'o_!||s'ip_!
+_6X	j'uq_!||s'ip_!
+_7X	tS'h'iR_!s'ip_!
+_8X	ph'aR_!||s'ip_!
+_9X	g'u_!||s'ip_!
+_0C	p'Eq_!
+
+// Larger numbers
+_0M0	tS'h-@n       // 10^3
+_1M0	tS'h-@n
+_0M1	m'an          // 10^4
+_1M1	m'an
+_0M2	'@q           // 10^8
+_1M2	'@q
+_0M3	tS;'o         // 10^12
+_1M3	tS;'o
+_0M4	gj'@N
+_1M4	gj'@N
+
+// Character names:
+ᄀ	gij'@q
+ᄁ	's-aNq,ij@q
+ᄂ	ni;'u-n
+ᄃ	diq'u-d-
+ᄄ	's-aNd,iqu-d-
+ᄅ	*i;'u-rr
+ᄆ	mi;'u-m
+ᄇ	pi;'u-p
+ᄈ	's-aNb,i;u-p
+ᄉ	si;'ot-
+ᄊ	's-aNs,i;ot-
+ᄋ	i;'u-N
+ᄌ	tS;i;'u-t
+ᄍ	's-aNdZ;,i;u-t
+ᄎ	tSh-'i;u-t
+ᄏ	khi;'u-k
+ᄐ	thi;'u-t-
+ᄑ	phi;'u-p
+ᄒ	hi;'u-t-
+// end of character names.
+
+
 $textmode
-
-_0      ᅧᆼ
-_1      ᅵᆯ
-_2      ᅵ
-_3      삼
-_4      사
-_5      ᅩ
-_6      ᅲᆨ
-_7      칠
-_8      팔
-_9      구
-_1X     십
-_2X     ᅵ십
-_3X     삼십
-_4X     사십
-_5X     ᅩ십
-_6X     ᅲᆨ십
-_7X     칠십
-_8X     팔십
-_9X     구십
-_0C     백
-_0M1    천
-_1M1    천
-
+// Misc:
 // 사ᅵ시ᅩᆺ
 고랫재		고랟째
 귓밥		귇빱

dictsource/ko_rules

@@ -1,5 +1,14 @@
+// eSpeak Korean rules
 // This file is UTF8 encoded
 
+// char names (mostly to catch "ng" sound):
+.group ᄋ
+ᄋ	i;'u-N
+
+
+
+
+
 .replace
 
 // Note: These specific range of "normalized" unicode characters of Korean are
@@ -15,24 +24,27 @@
 // h-finals: ㅎ ㄶㅀ
 .L03	ᇂ	ᆭ	ᆶ
 
+// Char names:
+
+
 // Initials
 // Order: ㄱㄲㅋ ㄷㄸㅌ ㅂㅃㅍ ㅅㅆㅈㅉㅊ ㄴㅁ ㄹ ㅎ
 
 .group		ᄀ	// ㄱ
-		ᄀ	g
-	_)	ᄀ	k
+		ᄀ	q
+	_)	ᄀ	g
 	L01)	ᄀ	k-
 	L03)	ᄀ	kh
 
 .group		ᄁ	// ㄲ
-		ᄁ	k-
+		ᄁ	q-
 
 .group		ᄏ	// ㅋ
 		ᄏ	kh
 
 .group		ᄃ	// ㄷ
 		ᄃ	d
-	_)	ᄃ	t
+	_)	ᄃ	d
 	L01)	ᄃ	t-
 	L03)	ᄃ	th
 
@@ -55,7 +67,7 @@
 		ᄑ	ph
 
 .group		ᄉ	// ㅅ
-		ᄉ	s
+		ᄉ	|s
 	L01)	ᄉ	s-
 
 .group		ᄊ	// ㅆ
@@ -68,16 +80,16 @@
 	L03)	ᄌ	tSh;
 
 .group		ᄍ	// ㅉ
-		ᄍ	tS;-	// TODO: phoneme
+		ᄍ	'tS;-	// TODO: phoneme
 
 .group		ᄎ	// ㅊ
-		ᄎ	tSh;	// TODO: phoneme
+		ᄎ	tSh-	// TODO: phoneme
 
 .group		ᄂ	// ㄴ
-		ᄂ	n
+		ᄂ	;n
 
 .group		ᄆ	// ㅁ
-		ᄆ	m
+		ᄆ	;m
 
 .group		ᄅ	// ㄹ
 		ᄅ		*	// TODO: alveolar flap [ɾ]
@@ -87,7 +99,7 @@
 		ᄒ	h	// TODO: [ɦ]
 	_)	ᄒ	h
 
-// Medials
+// Medials or vowels
 
 .group		ᅡ	// ㅏ
 		ᅡ	a
@@ -157,7 +169,7 @@
 // Order: ㄱㄳㄲㅋ ㄷㅌ ㅂㅍ ㅅㅆㅈㅊ ㄴㅁ ㅇㅎ ㄹ
 
 .group		ᆨ	// ㄱ
-		ᆨ		k	// TODO: final stops
+		ᆨ		q	// It is actually q, as using k adds unnecessary sound.
 		ᆨᄒ		kh
 
 .group		ᆪ	// ㄳ
@@ -175,14 +187,14 @@
 		ᆿ	(A	kh
 
 .group		ᆮ	// ㄷ
-		ᆮ		t
+		ᆮ		d- // Actually a soft D.
 		ᆮᄂ		nn
 		ᆮᄆ		mm
 		ᆮᄒ		th
 		ᆮ	(L02	dZ;
 
 .group		ᇀ	// ㅌ
-		ᇀ		t
+		ᇀ		t-
 		ᇀᄂ		nn
 		ᇀᄆ		mm
 		ᇀ	(A	th
@@ -202,14 +214,14 @@
 		ᇁ	(A	ph
 
 .group		ᆺ	// ㅅ
-		ᆺ		t
+		ᆺ		t-
 		ᆺᄂ		nn
 		ᆺᄆ		mm
 		ᆺ	(A	s
 		ᆺᄒ		s-
 
 .group		ᆻ	// ㅆ
-		ᆻ		t
+		ᆻ		t-
 		ᆻᄂ		nn
 		ᆻᄆ		mm
 		ᆻ	(A	s-
@@ -241,14 +253,14 @@
 		ᆷ		m
 
 .group		ᆼ	// ㅇ
-		ᆼ		ng
+		ᆼ		N
 
 .group		ᇂ	// ㅎ
-		ᇂ		t
+		ᇂ		t-
 		ᇂ	(A
 
 .group		ᆯ	// ㄹ
-		ᆯ		l
+		ᆯ		rr
 		ᆯᄅ		l
 		ᆯ	(A	*
 

dictsource/pt_list

@@ -217,7 +217,7 @@ _6o	s'est
 _7o	s'EtSim
 _8o	oIt'av
 _9o	n'on
-_10o	d'Esim
+_1Xo	d'Esim
 _2Xo	viZ'Ezim
 _3Xo	tRiZ'Ezim	
 _4Xo	kwad*aZ'Ezim
@@ -644,6 +644,7 @@ governo	gov'ernU	$noun
 // $alt   changes stressed [e] or [o] phoneme to open [E] or [O]
 // $alt2   changes stressed [E] or [O] phoneme to close [e] or [o]
 
+aborto		$alt $verb
 acerto		$alt2 $noun
 adereço		$alt2
 adore		$alt
@@ -659,10 +660,12 @@ ameba		$alt
 amores		$alt2
 anoiteça	$alt2
 anoiteço	$alt2
+apego		$alt2
 apreço		$alt2
 aperto		$alt2 $noun
 apoio		$alt $verb
 aprendeste	$alt2
+arremesso	$alt2 $noun
 assembleia	$alt
 atrozes		$alt
 austera		$alt
@@ -676,11 +679,13 @@ boleia		$alt
 bolo		$alt2
 borboleta	$alt2
 bordo		$alt
+bromelha	$alt
 cabeça		$alt2
 cacete		$alt2
 cachorra	$alt2
 camiseta	$alt2
 cantora		$alt2
+caractere	$alt
 casebre		$alt
 catorze		$alt2
 cefaleia	$alt
@@ -714,9 +719,12 @@ crede		$alt2
 cresce		$alt
 crescem		$alt
 der		$alt
+desapego	$alt2 $noun
 desce		$alt
 descem		$alt
+descordo	$alt
 descova		$alt2
+desespero	$alt2 $noun
 desfecho	$alt2
 desprezo	$alt $verb
 deva		$alt2
@@ -727,8 +735,11 @@ discordo	$alt
 dobro		$alt2 $noun
 doce		$alt2
 droga		$alt
+emprego		$alt2 $noun
 endereço	$alt2
 enumerem	$alt
+enredo		$alt $verb
+enterro		$alt2 $noun
 enxerto		$alt2 $noun
 epopeia		$alt
 eritreia	$alt
@@ -740,7 +751,7 @@ esforços	$alt
 esperma		$alt
 espeto		$alt2 $noun
 espiroqueta	$alt2
-enterro		$alt2 $noun
+esqueleto	$alt2
 estiverdes	$alt
 estiveres	$alt
 estrofe		$alt
@@ -750,6 +761,7 @@ expeça		$alt2
 expeço		$alt2
 farofa		$alt
 febre		$alt
+fera		$alt
 fere		$alt
 ferem		$alt
 fezes		$alt
@@ -758,6 +770,7 @@ Fizeram		$alt
 fizerem		$alt
 fizerdes	$alt
 fizeres		$alt
+folga		$alt
 fogos		$alt
 fores		$alt2
 forro		$alt $verb
@@ -765,6 +778,7 @@ fosse		$alt2
 fossem		$alt2
 foste		$alt2
 frevo		$alt2
+galera		$alt
 gameta		$alt2
 geleia		$alt
 gelo		$alt $verb
@@ -850,10 +864,12 @@ povos		$alt
 poxa		p'oS&
 preta		$alt2
 preto		$alt2
+primavera	$alt
 profere		$alt
 proferem	$alt
 puder		$alt
 puserdes	$alt
+recomeço	$alt2 $noun
 recordo		$alt
 recorto		$alt
 rede		$alt2
@@ -874,11 +890,14 @@ sincero		$alt
 sobe		$alt
 sobem		$alt
 soco		$alt2
+soco		$alt $verb
 sofrem		$alt
 sofre		$alt
 sofreste	$alt2
+sogra		$alt
 sopre		$alt
 soprem		$alt
+sopro		$alt $verb
 sorvete		$alt2
 sossego     $alt2 $noun
 souber		$alt
@@ -889,6 +908,7 @@ sugere		$alt
 sugerem		$alt
 suor		swOr
 tapete		$alt2
+tempero		$alt $verb
 teta		$alt2
 tiver		$alt
 tiveres		$alt

dictsource/pt_rules

@@ -16,7 +16,7 @@
 
 // endings
 .L01 a am o
-.L02 a am e em o
+.L02 a am e em o ue uem
 .L03 a am
 
 .group a
@@ -367,6 +367,13 @@ _compar) e (çL01_   e
 _desapar) e (çL01_  e
 _esclar) e (çL01_    e
 _reapar) e (çL01_   e
+ _sol) e (trL01_    E
+_acont) e (çL03_    e
+_envaid) e (çL01_   e
+ _ofer) e (çL01_    e
+_enriqu) e (çL01_   e
+_descr) e (vL01_    e
+_enfraqu) e (çL01_  e
 //endsort
 
 .group é
@@ -653,11 +660,14 @@ _reapar) e (çL01_   e
 ?1   f) o (rmulá   u         // eg: formulário, formulários.
 ?1   v) o (lt      O
 
+//sort
     _m) o (lhL02_  O
+  _ref) o (gL02_   O
      c) o (rrL03_  o   // escorra, incorra, corra, recorra
     _m) o (rrL03_  o
    _ap) oi (L03_   OI
      p) ostos (_   Ost=Us#   // dispostos etc.
+//endsort
 
 .group ô
         ô          ''o

dictsource/tt_list

@@ -36,8 +36,8 @@
 щ	SS;A
 ъ	kAlVnl,Vqbilges'e
 ы	V:
-ь	neS;kal,ekbilges'e
-э	e:
+ь	neS;k&l,ekbilges'e
+э	e|:
 ю	ju
 я	jA
 
@@ -69,7 +69,7 @@ _4X	kVr'Vk
 _5X	ill'e
 _6X	Altm'VS
 _7X	Z;itm'eS
-_8X	siks'an
+_8X	siks'&n
 _9X	tuks'An
 _0C	j'Wz
 _0M1	m'eN
@@ -80,4 +80,4 @@ _1M3	milli'Ard
 _0M4	billi'on
 _1M4	billi'on
 
-_dpt	bWt,en
+_dpt	_bWt,en

dictsource/tt_rules

@@ -6,7 +6,8 @@
         а        A
 
 .group ә
-        ә        a
+        ә        &
+        әе       e:  // 'әнкәен'
 
 .group б
         б        b
@@ -15,13 +16,13 @@
         в        w   // [v] in Russian words
 
 .group г
-        г        g  // may be [Q] or [r"] ??
+        г        g  // changes to [Q] or [Q"]
 
 .group д
         д        d
 
 .group е
-     _) е        je2  // may be [je] [jV]
+     _) е        je2  // changes to [je] or [jV]
         е        e
 
 .group ё
@@ -38,6 +39,7 @@
 
 .group и
         и        i
+     A) и        j
 
 .group й
         й        j
@@ -54,7 +56,7 @@
 
 .group н
         н        n
-        н (к     N
+//        н (к     N
         н (г     N
         н (х     N
 
@@ -81,9 +83,11 @@
 
 .group у
         у        u   // or w
+     A) у        w
 
 .group ү
         ү        y   // or w
+     A) ү        w
 
 .group ф
         ф        f
@@ -120,10 +124,10 @@
         э        e
 
 .group ю
-        ю        ju2   // or jy
+        ю        ju2   // changes to ju or jy
 
 .group я
-        я        jA2   // or ja
+        я        ja   // changes to jA or j&
 
 .group
         $        dolAR

espeak-data/voices/test/tt

@@ -1,3 +1,5 @@
 name tatar-test
 language tt
- 
+
+tunes s3 c3 q3 e3
+

phsource/ph_bulgarian

@@ -72,20 +72,7 @@ phoneme l
 endphoneme
 
 phoneme L   // velar L
-  liquid
-  lengthmod 7
-
-  IF nextPh(isNotVowel) THEN
-    ChangePhoneme(l/2)     // use 'dark' [l] after a vowel
-  ENDIF
-
-  VowelEnding(ll/xll, -40)
-
-  IF prevPh(isPause) THEN
-     FMT(ll/_ll)
-  ENDIF
-
-  FMT(ll/ll)
+  import_phoneme base/L
 endphoneme
 
 

phsource/ph_english

@@ -51,8 +51,7 @@ phoneme l      // use dark [l/2] before not-vowel
   liquid
   lengthmod 7
 
-  IF nextPhW(isVowel) THEN
-  ELSE
+  IF NOT nextPhW(isVowel) THEN
     IF prevPh(isVowel) OR prevPh(j) OR prevPh(w) THEN
       ChangePhoneme(l/2)
     ELSE
@@ -110,8 +109,7 @@ phoneme z/2    // used for 's suffix
     InsertPhoneme(I2)
   ENDIF
 
-  IF prevPh(isVoiced) THEN
-  ELSE
+  IF NOT prevPh(isVoiced) THEN
     ChangePhoneme(s)
   ENDIF
   ChangePhoneme(z)

phsource/ph_english_us

@@ -235,7 +235,7 @@ endphoneme
 phoneme u:
   vowel  starttype #u  endtype #u
   length 190
-  FMT(vdiph2/uw)
+  FMT(vdiph2/uw_6)
 endphoneme
 
 

phsource/ph_tatar

@@ -1,6 +1,6 @@
 
 
-// use 'flag1' for front vowels
+// use 'flag1' for front vowels, 'flag2' for back vowels
 
 phoneme i
   vowel flag1 starttype #i endtype #i
@@ -15,11 +15,87 @@ phoneme y
 endphoneme
 
 phoneme u
-  vowel starttype #u endtype #u
+  vowel flag2 starttype #u endtype #u
   length 180
   FMT(vowel/u)
 endphoneme
 
+
+phoneme e
+  vowel flag1 starttype #@ endtype #@
+  length 110
+  FMT(vowel/ii#)
+endphoneme
+
+
+phoneme W
+  vowel flag1 starttype #@ endtype #@
+  length 110
+  FMT(vowel/oe)
+endphoneme
+
+phoneme o
+  vowel flag2 starttype #o endtype #o
+  length 110
+  FMT(vowel/o_mid)
+endphoneme
+
+phoneme V
+  vowel flag2 starttype #@ endtype #@
+  length 110
+  ipa ɯ
+  FMT(vowel/@_2)
+endphoneme
+
+
+phoneme &
+  vowel flag1 starttype #e endtype #e
+  length 180
+  FMT(vowel/ee)
+endphoneme
+
+phoneme A
+  vowel flag2 starttype #a endtype #a
+  length 180
+  IF NOT nextPhW(w) AND NOT thisPh(isTranslationGiven) THEN
+    IF thisPh(isFirstVowel) THEN
+      ChangePhoneme(0)
+    ENDIF
+    IF prevVowel(0) AND thisPh(isSecondVowel) THEN
+      ChangePhoneme(0)
+    ENDIF
+  ENDIF
+  FMT(vowel/aa_8)
+endphoneme
+
+phoneme 0
+  vowel flag2 starttype #o endtype #o
+  length 180
+  FMT(vowel/0_3)
+endphoneme
+
+
+phoneme e:
+  vowel flag1 starttype #e endtype #e
+  length 240
+  FMT(vowel/e_6)
+endphoneme
+
+phoneme I
+  vowel flag1 starttype #i endtype #i
+  length 110
+  FMT(vowel/ii)
+endphoneme
+
+phoneme a  // letter 'я'
+  vowel starttype #a endtype #a
+  length 180
+  IF prevVowel(isFlag1) OR nextVowel(isFlag1) THEN   // front vowels
+    ChangePhoneme(&)
+  ENDIF
+  ChangePhoneme(A)
+endphoneme
+
 phoneme u2   // letter 'ю'
   vowel starttype #u endtype #u
   length 180
@@ -30,78 +106,14 @@ phoneme u2   // letter 'ю'
   ENDIF
 endphoneme
 
-phoneme e
-  vowel flag1 starttype #@ endtype #@
-  length 100
-  FMT(vowel/ii#)
-endphoneme
-
 phoneme e2    // 'e' at start of word
   vowel starttype #@ endtype #@
   length 100
-  IF nextVowel(isFlag1) THEN
+  IF nextVowel(isFlag2) THEN
+    ChangePhoneme(V)
+  ELSE
     ChangePhoneme(e)
   ENDIF
-  ChangePhoneme(V)
-endphoneme
-
-phoneme W
-  vowel flag1 starttype #@ endtype #@
-  length 100
-  FMT(vowel/oe)
-endphoneme
-
-phoneme o
-  vowel starttype #o endtype #o
-  length 100
-  FMT(vowel/o_mid)
-endphoneme
-
-phoneme V
-  vowel starttype #@ endtype #@
-  length 100
-  FMT(vowel/o-_3)
-endphoneme
-
-
-phoneme a
-  vowel flag1 starttype #a endtype #a
-  length 180
-  FMT(vowel/&_2)
-endphoneme
-
-phoneme A
-  vowel starttype #a endtype #a
-  length 180
-  IF thisPh(isFirstVowel) THEN
-    ChangePhoneme(0)
-  ENDIF
-  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
-  length 180
-  FMT(vowel/0_3)
-endphoneme
-
-
-phoneme I
-  vowel flag1 starttype #i endtype #i
-  length 100
-  FMT(vowel/ii)
 endphoneme
 
 
@@ -113,10 +125,39 @@ phoneme r
 endphoneme
 
 phoneme t
-  import_phoneme base/t[
+  import_phoneme base2/t
 endphoneme
 
 phoneme d
   import_phoneme base/d[
 endphoneme
 
+phoneme k
+  vls vel stop
+  IF prevVowel(isFlag2) OR nextVowel(isFlag2) THEN   // back vowels
+    ChangePhoneme(q)
+  ENDIF
+  CALL base/k
+endphoneme
+
+phoneme G
+  import_phoneme base/Q"
+endphoneme
+
+phoneme g
+  vcd vel frc
+  IF prevVowel(isFlag2) OR nextVowel(isFlag2) THEN
+    ChangePhoneme(G)
+  ELSE
+    ChangePhoneme(Q)
+  ENDIF 
+endphoneme
+
+
+phoneme l
+  liquid
+  IF prevVowel(isFlag2) OR nextVowel(isFlag2) THEN
+    ChangePhoneme(L)
+  ENDIF
+  CALL base/l
+endphoneme

phsource/phonemes

@@ -576,6 +576,29 @@ phoneme l.
 endphoneme
 
 
+phoneme L/
+  import_phoneme base/l/2
+endphoneme
+
+phoneme L   // velar L
+  liquid
+  lengthmod 7
+
+  IF nextPh(isNotVowel) THEN
+    ChangePhoneme(L/)     // use 'dark' [l] after a vowel
+  ENDIF
+
+  VowelEnding(ll/xll, -40)
+
+  IF prevPh(isPause) THEN
+     FMT(ll/_ll)
+  ENDIF
+
+  FMT(ll/ll)
+endphoneme
+
+
+
 
 phoneme w
   liquid

phsource/vowelcharts/af

@@ -1,7 +1,7 @@
 @	 1 536 1416 2320   584 1400 2000
 @	 0 536 1420 2420   536 1420 2420
 @-	 0 525 1441 2340   525 1441 2340
-a	 0 -27598 -14028 13533   666 -14224 -23000
+a	 0 654 1274 2586   654 1274 2586
 i	 0 272 2247 3100   288 2247 3100
 u	 0 352 1000 2240   352 1000 2200
 E	 0 504 1900 2544   496 1920 2552
@@ -13,6 +13,7 @@ W	 0 525 1320 2200   525 1320 2200
 &:	 0 735 1760 2420   675 1738 2420
 @L	 0 485  891 2780   450  792 2980
 A:	 0 664 1040 2800   648 1060 2840
+e@	 0 264 2180 3040   488 1700 2600
 o@	 0 336 1060 2360   480 1480 2500
 y	 0 328 2100 2580   304 2160 2640
 iu	 0 280 2180 3040   272  900 2300

phsource/vowelcharts/am

@@ -6,3 +6,4 @@ e	 0 504 1900 2544   496 1920 2552
 i	 0 336 2210 2800   336 2210 2760
 o	 0 496  972 2500   496  972 2500
 u	 0 344  800 2360   344  800 2360
+y	 0 408 1760 2540   408 1760 2540

phsource/vowelcharts/az

@@ -1,3 +1,4 @@
+@	 0 456 1240 2400   456 1240 2400
 a	 0 688 1064 2806   672 1100 2806
 e	 0 504 1900 2544   496 1920 2552
 i	 0 336 2210 2800   336 2210 2760

phsource/vowelcharts/base

@@ -10,3 +10,5 @@ m-	 0 512 1300 2340   370 1040 2300
 n-	 1 496 1512 2380   480 1500 2540
 n-	 0 496 1512 2380   380 1780 2540
 N-	 0 504 1824 2548   490 2100 2540
+r-	 0 648 1200 2300   640 1200 2260
+l-	 0 352 1240 3020   352 1200 3020

phsource/vowelcharts/base2

@@ -11,6 +11,8 @@ m-	 0 512 1300 2340   370 1040 2300
 n-	 1 496 1512 2380   480 1500 2540
 n-	 0 496 1512 2380   380 1780 2540
 N-	 0 504 1824 2548   490 2100 2540
+r-	 0 648 1200 2300   640 1200 2260
+l-	 0 352 1240 3020   352 1200 3020
 a/	 0 760 1420 2600   736 1380 2540
 E	 0 720 1760 2420   672 1562 2520
 O	 0 584  940 2580   584  940 2580

phsource/vowelcharts/bg

@@ -1,6 +1,8 @@
 @	 1 612 1232 2620   612 1240 2620
 @	 0 544 1220 2520   544 1260 2520
-a	 0 800 1320 2637   800 1320 2637
+a	 1 800 1320 2637   800 1320 2637
+a	 1 695 1316 2500   695 1316 2500
+a	 0 904 1320 2700   896 1340 2660
 e	 1 504 1900 2544   496 1920 2552
 e	 0 584 1820 2560   584 1820 2560
 i	 1 336 2210 2800   336 2210 2760

phsource/vowelcharts/bo

@@ -3,6 +3,8 @@ e	 0 504 1900 2544   496 1920 2552
 i	 0 280 2280 2840   240 2339 2840
 o	 0 454  812 2559   432  824 2520
 u	 0 320  860 2360   320  860 2460
+r-	 0 648 1200 2300   640 1200 2260
+l-	 0 352 1240 3020   352 1200 3020
 i:	 0 304 2440 3020   304 2440 3020
 e:	 0 416 2140 2660   416 2140 2660
 a:	 0 712 1160 2780   696 1160 2780

phsource/vowelcharts/ca

@@ -8,5 +8,5 @@ E	 0 584 1820 2560   584 1820 2560
 O	 0 552  860 2660   552  880 2660
 U	 0 388  940 2420   394  980 2360
 aI	 0 912 1320 2740   360 2200 2820
-a#	 0 514  514  514   514  514  514
+a#	 0 658 1408 2460   658 1408 2460
 E2	 0 584 1820 2560   584 1820 2560

phsource/vowelcharts/consonants

@@ -10,3 +10,5 @@ m-	 0 512 1300 2340   370 1040 2300
 n-	 1 496 1512 2380   480 1500 2540
 n-	 0 496 1512 2380   380 1780 2540
 N-	 0 504 1824 2548   490 2100 2540
+r-	 0 648 1200 2300   640 1200 2260
+l-	 0 352 1240 3020   352 1200 3020

phsource/vowelcharts/cs

@@ -5,6 +5,8 @@ e	 0 584 1820 2560   584 1820 2560
 i	 0 360 2120 2680   360 2120 2660
 o	 0 566  890 2641   566  890 2641
 u	 0 344  800 2360   344  800 2360
+r-	 0 648 1200 2300   640 1200 2260
+l-	 0 352 1240 3020   352 1200 3020
 i:	 0 272 2247 3100   288 2247 3100
 e:	 0 584 1820 2560   584 1820 2560
 a:	 0 784 1180 2680   776 1200 2680

phsource/vowelcharts/cy

@@ -2,6 +2,7 @@
 @-	 0 525 1441 2340   525 1441 2340
 a	 0 904 1320 2700   896 1340 2660
 E	 0 645 1705 2520   645 1705 2520
+I	 0 360 2120 2680   360 2120 2660
 Y	 0 448 1660 2528   448 1660 2528
 O	 0 566  890 2641   566  890 2641
 U	 0 320  740 2400   320  740 2400
@@ -14,6 +15,7 @@ o:	 0 424  800 2580   408  780 2600
 A:	 0 775 1067 2800   795 1122 2580
 AY	 0 664 1040 2800   312 2240 2940
 aI	 0 860 1240 2820   415 2044 2600
+aY	 0 860 1240 2820   415 2044 2600
 aU	 0 847 1383 2510   360  800 2360
 @I	 0 640 1562 2400   355 2222 2720
 @Y	 0 640 1562 2400   355 2222 2720
@@ -23,3 +25,4 @@ Yu	 0 405 1790 2442   344 1080 2200
 OI	 0 545  780 2720   310 2002 2500
 OY	 0 545  780 2720   310 2002 2500
 uI	 0 352  960 2340   343 1911 2586
+uY	 0 352  960 2340   343 1911 2586

phsource/vowelcharts/en

@@ -9,7 +9,7 @@ I2	 0 408 1920 2580   416 1900 2580
 @5	 0 525 1441 2340   525 1441 2340
 U	 0 445  902 2620   445  902 2620
 @L	 0 485  891 2780   450  792 2980
-a#	 0  -1   -1  257   257  257  257
+a#	 0 658 1408 2460   658 1408 2460
 aa	 0 904 1320 2700   896 1340 2660
 E	 0 646 1780 2500   646 1780 2500
 I	 0 408 1940 2600   408 1940 2600

phsource/vowelcharts/en-n

@@ -25,8 +25,9 @@ O@	 0 575  891 2640   580 1023 2480
 o@	 0 575  891 2640   580 1023 2480
 u:	 0 332 1527 2256   290 1023 2220
 aU	 0 660 1562 2360   340  990 2360
-oU	 0 20480    0  256   768  578  140
+oU	 0 454  812 2559   432  824 2520
 aI	 0 860 1360 2660   488 1840 2440
+eI	 0 456 1980 2540   440 1980 2540
 OI	 0 545  780 2720   310 2002 2500
 e@	 0 647 1778 2530   593 1553 2370
 i@	 0 320 2220 2800   528 1520 2360

phsource/vowelcharts/en-sc

@@ -6,6 +6,7 @@ i	 0 520 2000 2540   520 2000 2540
 3	 0 612 1232 2620   612 1240 2620
 @2	 0 528 1500 2380   528 1500 2380
 @5	 0 528 1500 2380   528 1500 2380
+U	 0 407 1500 2160   392 1500 2160
 @L	 0 560  900 2780   450  792 2980
 a#	 0 760 1420 2600   736 1380 2540
 aa	 0 784 1180 2680   776 1200 2680
@@ -27,8 +28,10 @@ o@	 0 424  780 2680   504  940 1820
 u:	 1 407 1500 2160   392 1500 2160
 u:	 0 392 1700 2240   392 1700 2240
 aU	 0 698 1320 2484   280 1600 2340
+oU	 0 412  760 2680   412  760 2680
 aI	 1 892 1340 2684   552 1800 2480
 aI	 0 760 1200 2680   352 2280 2780
+eI	 0 416 2140 2660   416 2140 2660
 OI	 0 624  980 2620   328 2127 2940
 e@	 0 464 1980 2520   658 1408 2460
 i@	 0 368 2156 2720   528 1595 2460

phsource/vowelcharts/en-us

@@ -9,34 +9,37 @@ I2	 0 416 1800 2560   416 1800 2560
 @5	 0 525 1441 2340   525 1441 2340
 U	 0 496 1040 2560   496 1040 2560
 @L	 0 485  891 2780   450  792 2980
-a#	 0 -256  255    0   257  257  257
+a#	 0 658 1408 2460   658 1408 2460
 aa	 1 670 1719 2556   710 1672 2671
 aa	 0 700 1680 2506   652 1488 2470
-E	 0 544 1760 2580   608 1600 2580
+E	 0 584 1820 2560   608 1600 2580
 I	 0 408 1920 2580   416 1900 2580
 I#	 0 448 1660 2528   448 1660 2528
 0	 0 728 1200 2660   712 1200 2660
-V	 0 632 1300 2640   632 1300 2640
+V	 0 632 1300 2600   616 1340 2600
 A:	 1 728 1200 2600   520 1260 1900
 A:	 0 728 1200 2660   712 1200 2660
 A@	 0 728 1200 2600   520 1260 1900
-3:	 0 480 1460 2180   464 1440 2000
+3:	 0 480 1408 2320   464 1440 2000
 i:	 0 296 2220 2820   216 2400 2820
 O:	 1 612 1000 2600   512 1200 1800
 O:	 0 656 1000 2620   630  960 2700
 O	 0 657 1100 2703   657 1120 2703
 O@	 0 612 1000 2600   512 1200 1800
 o@	 0 468  840 2660   520 1160 1900
-u:	 0 352 1380 2260   296 1000 2220
+u:	 0 352 1420 2260   320 1120 2235
 aU	 0 784 1320 2620   496  900 2620
 oU	 0 549 1116 2380   384  800 2460
-aI	 0 736 1200 2520   560 1820 2500
+aI	 0 796 1260 2610   560 1820 2500
 eI	 0 536 1800 2540   381 2100 2708
 OI	 0 552  940 2656   400 1805 2592
 e@	 0 536 1776 2540   520 1400 1800
 i@	 0 368 2156 2720   528 1595 2460
 i@3	 0 405 1932 2549   506 1460 1820
 U@	 0 456 1080 2400   520 1180 1980
+aI@	 0 736 1220 2700   584 1500 2400
+aI3	 0 736 1220 2700   524 1470 2190
+aU@	 0 784 1320 2620   464 1380 2000
 IR	 0 544 1340 2460   616 1190 2450
 VR	 0 648 1180 2595   640 1140 2460
 o:	 0 454  812 2559   432  824 2520

phsource/vowelcharts/en-wm

@@ -9,7 +9,7 @@ I2	 0 312 2213 2775   312 2213 2775
 @5	 0 525 1441 2340   525 1441 2340
 U	 0 445  902 2620   445  902 2620
 @L	 0 485  891 2780   450  792 2980
-a#	 0 511   -1  257   257  257   -1
+a#	 0 658 1408 2460   658 1408 2460
 aa	 0 904 1320 2700   896 1340 2660
 E	 0 456 1980 2540   440 1980 2540
 I	 1 384 2030 2610   384 2030 2610
@@ -28,6 +28,8 @@ u:	 0 525 1441 2340   340  990 2360
 aU	 0 660 1562 2360   340  990 2360
 oU	 0 616 1220 2380   390  957 2140
 aI	 0 562  943 2656   357 1915 2761
+eI	 0 649 1485 2430   355 2222 2720
+OI	 0 469  864 2440   310 2040 2440
 e@	 0 480 1408 2320   545 1419 2320
 i@	 0 328 2190 2770   525 1441 2340
 i@3	 0 368 2156 2720   528 1595 2460

phsource/vowelcharts/fa

@@ -10,6 +10,8 @@ m-	 0 512 1300 2340   370 1040 2300
 n-	 1 496 1512 2380   480 1500 2540
 n-	 0 496 1512 2380   380 1780 2540
 N-	 0 504 1824 2548   490 2100 2540
+r-	 0 648 1200 2300   640 1200 2260
+l-	 0 352 1240 3020   352 1200 3020
 A	 0 656 1000 2620   630  960 2700
 eI	 0 547 1855 2536   320 2300 2740
 oU	 0 496  900 2520   360  800 2140

phsource/vowelcharts/fr

@@ -17,7 +17,7 @@ O~	 0 344  700 2620   344  700 2620
 W	 0 552 1441 2400   552 1441 2400
 j/	 0 355 2222 2720   355 2222 2720
 a-	 0 856 1320 2700   856 1320 2700
-a#	 0  -1   -1  257   257  257  257
+a#	 0 658 1408 2460   658 1408 2460
 e-	 0 488 1990 2540   488 1990 2540
 E-	 0 584 1820 2560   584 1820 2560
 I	 0 408 1940 2600   408 1940 2600

phsource/vowelcharts/fr-ca

@@ -11,6 +11,8 @@ m-	 0 512 1300 2340   370 1040 2300
 n-	 1 496 1512 2380   480 1500 2540
 n-	 0 496 1512 2380   380 1780 2540
 N-	 0 504 1824 2548   490 2100 2540
+r-	 0 648 1200 2300   640 1200 2260
+l-	 0 352 1240 3020   352 1200 3020
 y	 1 280 1720 2340   280 1720 2340
 y	 0 280 1720 2340   280 1720 2340
 E	 0 584 1820 2560   584 1820 2560
@@ -21,7 +23,7 @@ O~	 0 344  700 2620   344  700 2620
 W	 0 552 1441 2400   552 1441 2400
 j/	 0 355 2222 2720   355 2222 2720
 a-	 0 856 1320 2700   856 1320 2700
-a#	 0  -1   -1  257   257  257  257
+a#	 0 658 1408 2460   658 1408 2460
 e-	 0 488 1990 2540   488 1990 2540
 E-	 0 584 1820 2560   584 1820 2560
 I	 0 384 2030 2610   384 2030 2610

phsource/vowelcharts/gd

@@ -10,3 +10,5 @@ m-	 0 512 1300 2340   370 1040 2300
 n-	 1 496 1512 2380   480 1500 2540
 n-	 0 496 1512 2380   380 1780 2540
 N-	 0 504 1824 2548   490 2100 2540
+r-	 0 648 1200 2300   640 1200 2260
+l-	 0 352 1240 3020   352 1200 3020

phsource/vowelcharts/hi

@@ -4,6 +4,8 @@ a	 0 658 1408 2460   658 1408 2460
 e	 0 416 2140 2660   416 2140 2660
 i	 0 296 2220 2880   288 2260 2900
 o	 0 454  812 2559   432  824 2520
+r-	 0 648 1200 2300   640 1200 2260
+l-	 0 352 1240 3020   352 1200 3020
 V	 1 584 1440 2460   600 1440 2460
 V	 0 695 1316 2500   695 1316 2500
 @3	 0 528 1500 2380   528 1500 2380

phsource/vowelcharts/hr

@@ -4,6 +4,8 @@ e	 0 456 1980 2540   440 1980 2540
 i	 0 296 2220 2880   288 2260 2900
 o	 0 512  860 2648   512  860 2648
 u	 0 320  740 2400   320  740 2400
+r-	 0 648 1200 2300   640 1200 2260
+l-	 0 352 1240 3020   352 1200 3020
 E	 0 584 1820 2560   584 1820 2560
 O	 0 536  920 2600   536  920 2600
 i:	 0 272 2247 3100   288 2247 3100

phsource/vowelcharts/jbo

@@ -7,6 +7,8 @@ o	 0 512  860 2648   512  860 2648
 u	 0 320  860 2360   320  860 2460
 n-	 1 496 1512 2380   480 1500 2540
 n-	 0 496 1512 2380   380 1780 2540
+r-	 0 648 1200 2300   640 1200 2260
+l-	 0 352 1240 3020   352 1200 3020
 aU	 0 847 1383 2510   360  800 2360
 aI	 0 912 1320 2740   360 2200 2820
 eI	 0 547 1855 2536   320 2300 2740

phsource/vowelcharts/kn

@@ -1,8 +1,10 @@
 @	 0 525 1441 2340   525 1441 2340
+a	 0 728 1300 2595   736 1300 2595
 e	 0 456 1980 2540   440 1980 2540
 i	 0 296 2220 2880   288 2260 2900
 o	 0 454  812 2559   432  824 2520
 u	 0 368  880 2440   368  900 2440
+r-	 0 648 1200 2300   640 1200 2260
 i:	 0 280 2280 2840   240 2339 2840
 I	 0 360 2120 2680   360 2120 2660
 e:	 0 456 1980 2540   440 1980 2540

phsource/vowelcharts/ko

@@ -0,0 +1,8 @@
+@	 0 566  890 2641   566  890 2641
+a	 0 728 1200 2660   712 1200 2660
+e	 0 456 1980 2540   440 1980 2540
+i	 0 280 2280 2840   240 2339 2840
+o	 0 412  760 2680   412  760 2680
+u	 0 320  740 2400   320  740 2400
+E	 0 646 1780 2500   646 1780 2500
+u-	 0 336 1440 2460   336 1440 2460

phsource/vowelcharts/lt

@@ -5,6 +5,7 @@ e	 0 584 1820 2560   584 1820 2560
 i	 0 272 2247 3100   288 2247 3100
 o	 0 512  860 2648   512  860 2648
 u	 0 320  860 2360   320  860 2460
+l	 0 352 1240 3020   352 1200 3020
 w	 0 320  860 2360   320  860 2460
 A	 0 784 1180 2680   776 1200 2680
 a:	 0 784 1180 2680   776 1200 2680

phsource/vowelcharts/lv

@@ -8,6 +8,7 @@ i:	 0 296 2220 2880   288 2260 2900
 e:	 0 584 1820 2560   584 1820 2560
 &	 0 736 1540 2500   752 1540 2500
 &:	 0 736 1540 2500   752 1540 2500
+a#	 0 632 1300 2600   616 1340 2600
 a:	 0 784 1180 2680   776 1200 2680
 o:	 0 512  860 2648   512  860 2648
 u:	 0 320  860 2360   320  860 2460

phsource/vowelcharts/mk

@@ -5,6 +5,8 @@ e	 0 456 1980 2540   440 1980 2540
 i	 0 296 2220 2880   288 2260 2900
 o	 0 512  860 2648   512  860 2648
 u	 0 320  740 2400   320  740 2400
+r-	 0 648 1200 2300   640 1200 2260
+l-	 0 352 1240 3020   352 1200 3020
 E	 0 584 1820 2560   584 1820 2560
 i:	 0 272 2247 3100   288 2247 3100
 &	 0 728 1300 2595   736 1300 2595

phsource/vowelcharts/ml

@@ -5,6 +5,7 @@ e	 0 456 1980 2540   440 1980 2540
 i	 0 296 2220 2880   288 2260 2900
 o	 0 454  812 2559   432  824 2520
 u	 0 320  860 2360   320  860 2460
+r-	 0 648 1200 2300   640 1200 2260
 V	 1 584 1440 2460   600 1440 2460
 V	 0 695 1316 2500   695 1316 2500
 i:	 0 280 2280 2840   240 2339 2840
@@ -16,3 +17,4 @@ o:	 0 454  812 2559   432  824 2520
 u:	 0 320  860 2360   320  860 2460
 aI	 0 912 1320 2740   360 2200 2820
 aU	 0 724 1130 2760   472  780 2500
+y	 0 407 1500 2160   392 1500 2160