From c229b34ae22a24b73bd66a9d395d3838938504bc Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Sat, 2 Mar 2013 17:08:18 +0000
Subject: [PATCH] 1.46.39 (from http://espeak.sourceforge.net/test/latest.html)

---
 dictsource/bn_list                       | 278 ++++++++++++++++++++
 dictsource/bn_rules                      | 316 +++++++++++++++++++++++
 dictsource/pa_list                       | 107 ++++----
 dictsource/ur_list                       |   5 +
 dictsource/ur_rules                      |   7 +-
 espeak-data/voices/{test => asia}/fa     |   0
 espeak-data/voices/{test => asia}/fa-pin |   0
 espeak-data/voices/{ => asia}/hi         |   0
 espeak-data/voices/{ => asia}/hy         |   0
 espeak-data/voices/{ => asia}/hy-west    |   0
 espeak-data/voices/{ => asia}/id         |   2 +-
 espeak-data/voices/asia/ka               |   2 +
 espeak-data/voices/{ => asia}/kn         |   0
 espeak-data/voices/{ => asia}/ku         |   0
 espeak-data/voices/{ => asia}/ml         |   0
 espeak-data/voices/{test => asia}/ne     |   2 +-
 espeak-data/voices/{ => asia}/ta         |   0
 espeak-data/voices/{ => asia}/tr         |   0
 espeak-data/voices/{ => asia}/vi         |   0
 espeak-data/voices/{ => asia}/vi-hue     |   0
 espeak-data/voices/{ => asia}/zh         |   0
 espeak-data/voices/{ => asia}/zh-yue     |   0
 espeak-data/voices/{en => }/en           |   0
 espeak-data/voices/{en => }/en-us        |   0
 espeak-data/voices/{ => europe}/bg       |   2 +-
 espeak-data/voices/{ => europe}/bs       |   0
 espeak-data/voices/{ => europe}/ca       |   0
 espeak-data/voices/{ => europe}/cs       |   0
 espeak-data/voices/{ => europe}/cy       |   2 +-
 espeak-data/voices/{ => europe}/da       |   0
 espeak-data/voices/{ => europe}/el       |   0
 espeak-data/voices/{ => europe}/es       |   0
 espeak-data/voices/{ => europe}/et       |   0
 espeak-data/voices/{ => europe}/fi       |   0
 espeak-data/voices/{ => europe}/fr-be    |   0
 espeak-data/voices/{ => europe}/hr       |   0
 espeak-data/voices/{ => europe}/hu       |   0
 espeak-data/voices/{ => europe}/is       |   2 +-
 espeak-data/voices/{ => europe}/it       |   0
 espeak-data/voices/{ => europe}/lv       |   0
 espeak-data/voices/{ => europe}/mk       |   2 +-
 espeak-data/voices/{ => europe}/nl       |   0
 espeak-data/voices/{ => europe}/no       |   0
 espeak-data/voices/{ => europe}/pl       |   0
 espeak-data/voices/{ => europe}/pt-pt    |   0
 espeak-data/voices/{ => europe}/ro       |   0
 espeak-data/voices/{ => europe}/ru       |   2 +-
 espeak-data/voices/{ => europe}/sk       |   0
 espeak-data/voices/{ => europe}/sq       |   0
 espeak-data/voices/{ => europe}/sr       |   0
 espeak-data/voices/{ => europe}/sv       |   0
 espeak-data/voices/ka                    |   2 -
 espeak-data/voices/{ => other}/af        |   0
 espeak-data/voices/{en => other}/en-n    |   0
 espeak-data/voices/{en => other}/en-rp   |   0
 espeak-data/voices/{en => other}/en-sc   |   0
 espeak-data/voices/{en => other}/en-wi   |   0
 espeak-data/voices/{en => other}/en-wm   |   0
 espeak-data/voices/{ => other}/eo        |   0
 espeak-data/voices/{test => other}/grc   |   0
 espeak-data/voices/{test => other}/jbo   |   0
 espeak-data/voices/{ => other}/la        |   0
 espeak-data/voices/{ => other}/sw        |   0
 espeak-data/voices/test/bg               |   5 -
 espeak-data/voices/test/ga               |   4 -
 phsource/ph_bengali                      |  37 +++
 66 files changed, 701 insertions(+), 76 deletions(-)
 create mode 100644 dictsource/bn_list
 create mode 100644 dictsource/bn_rules
 rename espeak-data/voices/{test => asia}/fa (100%)
 rename espeak-data/voices/{test => asia}/fa-pin (100%)
 rename espeak-data/voices/{ => asia}/hi (100%)
 rename espeak-data/voices/{ => asia}/hy (100%)
 rename espeak-data/voices/{ => asia}/hy-west (100%)
 rename espeak-data/voices/{ => asia}/id (86%)
 create mode 100644 espeak-data/voices/asia/ka
 rename espeak-data/voices/{ => asia}/kn (100%)
 rename espeak-data/voices/{ => asia}/ku (100%)
 rename espeak-data/voices/{ => asia}/ml (100%)
 rename espeak-data/voices/{test => asia}/ne (68%)
 rename espeak-data/voices/{ => asia}/ta (100%)
 rename espeak-data/voices/{ => asia}/tr (100%)
 rename espeak-data/voices/{ => asia}/vi (100%)
 rename espeak-data/voices/{ => asia}/vi-hue (100%)
 rename espeak-data/voices/{ => asia}/zh (100%)
 rename espeak-data/voices/{ => asia}/zh-yue (100%)
 rename espeak-data/voices/{en => }/en (100%)
 rename espeak-data/voices/{en => }/en-us (100%)
 rename espeak-data/voices/{ => europe}/bg (82%)
 rename espeak-data/voices/{ => europe}/bs (100%)
 rename espeak-data/voices/{ => europe}/ca (100%)
 rename espeak-data/voices/{ => europe}/cs (100%)
 rename espeak-data/voices/{ => europe}/cy (70%)
 rename espeak-data/voices/{ => europe}/da (100%)
 rename espeak-data/voices/{ => europe}/el (100%)
 rename espeak-data/voices/{ => europe}/es (100%)
 rename espeak-data/voices/{ => europe}/et (100%)
 rename espeak-data/voices/{ => europe}/fi (100%)
 rename espeak-data/voices/{ => europe}/fr-be (100%)
 rename espeak-data/voices/{ => europe}/hr (100%)
 rename espeak-data/voices/{ => europe}/hu (100%)
 rename espeak-data/voices/{ => europe}/is (55%)
 rename espeak-data/voices/{ => europe}/it (100%)
 rename espeak-data/voices/{ => europe}/lv (100%)
 rename espeak-data/voices/{ => europe}/mk (54%)
 rename espeak-data/voices/{ => europe}/nl (100%)
 rename espeak-data/voices/{ => europe}/no (100%)
 rename espeak-data/voices/{ => europe}/pl (100%)
 rename espeak-data/voices/{ => europe}/pt-pt (100%)
 rename espeak-data/voices/{ => europe}/ro (100%)
 rename espeak-data/voices/{ => europe}/ru (70%)
 rename espeak-data/voices/{ => europe}/sk (100%)
 rename espeak-data/voices/{ => europe}/sq (100%)
 rename espeak-data/voices/{ => europe}/sr (100%)
 rename espeak-data/voices/{ => europe}/sv (100%)
 delete mode 100644 espeak-data/voices/ka
 rename espeak-data/voices/{ => other}/af (100%)
 rename espeak-data/voices/{en => other}/en-n (100%)
 rename espeak-data/voices/{en => other}/en-rp (100%)
 rename espeak-data/voices/{en => other}/en-sc (100%)
 rename espeak-data/voices/{en => other}/en-wi (100%)
 rename espeak-data/voices/{en => other}/en-wm (100%)
 rename espeak-data/voices/{ => other}/eo (100%)
 rename espeak-data/voices/{test => other}/grc (100%)
 rename espeak-data/voices/{test => other}/jbo (100%)
 rename espeak-data/voices/{ => other}/la (100%)
 rename espeak-data/voices/{ => other}/sw (100%)
 delete mode 100644 espeak-data/voices/test/bg
 delete mode 100644 espeak-data/voices/test/ga
 create mode 100644 phsource/ph_bengali

diff --git a/dictsource/bn_list b/dictsource/bn_list
new file mode 100644
index 00000000..065d77c3
--- /dev/null
+++ b/dictsource/bn_list
@@ -0,0 +1,278 @@
+// Translation rules for Bengali
+// This file is UTF8 encoded
+
+// Numbers
+ devanagari numbers are changed to latin characters before translation
+_0	S'u:n.nV'o:
+_1	a'k
+_2	d:UI
+_3	t'i:n
+_4	c'a:@'r
+_5	,pa~c
+_6	ch'O:j
+_7	S'a:t
+_8	'a:th.
+_9	n'O:j
+
+_10	d'O:S
+_11	a'g'a:rO:
+_12	b'a:rO:
+_13	t'a:rO:
+_14	ch:O:d'dO:
+_15	p'O:n'e:rO:
+_16	S'o:lO:
+_17	SO:t'e:rO:
+_18	a:th'e:rO:
+_19	U'n'IS
+
+_20	kU:'ri
+_21	e:kU'S
+_22	b'a:IS
+_23	t'e:IS
+_24	c'O:b'bIS
+_25	pa~O:c'IS
+_26	ch'a:'bb'IS
+_27	Sa:ta:S
+_28	ath'a:S
+_29	Unt'rIs
+_30	t'i:rIS
+
+_31	e:k't:rIS
+_32	bat:'rIS
+_33	tE't'rIS
+_34	ca~o:u:t'rIS
+_35	pa~O:it'rIS
+_36	cha'trIS
+_37	Sa~it'rIS
+_38	at'tr'IS
+_39	U'nO:cO:l'IS
+
+_40	co:l'lIS
+_41	e:k'co:l'lIS
+_42	bi'al'lIS
+_43	te:ta:l'lIS
+_44	cu:a:l'lIS
+_45	paI'nta:l'lIS
+_46	che:co:l'lIS
+_47	Sat'co:l'lIs
+_48	at'co:l'lIS
+_49	Uno:pan'ca:S
+
+_50	p@n'ca:s
+_51	e:ka:n'no:
+_52	ba:h@n'no:
+_53	t'Ip'pan'no:
+_54	cu:wan'no:
+_55	po:n'ca:n'no:
+_56	chh@p:'an'no:
+_57	Sa:ta:n'no:
+_58	ath'a:n'no:
+_59	Uno:s'ath
+
+_60	s'a:th.
+_61	e:k'so:t'tI
+_62	ba:so:t'tI
+_63	te:so:t'tI
+_64	ca~o:u:so:t'tI
+_65	pa~I'so:t'tI
+_66	che:so:t'tI
+_67	Sat'so:t'tI
+_68	atso:t'ti
+_69	,Uno:Sat'to:r
+
+_70	So:t'to:r
+_71	e:kat'to:r
+_72	ba:hat'to:r
+_73	tIat'to:r
+_74	cu:at'to:r
+_75	pa~chat'to:r
+_76	chI'at:to:r
+_77	Sa:t@'t:o:r
+_78	atat'to:r
+_79	,Uno:a:Si:
+
+_80	a:Si
+_81	e:ka:Si:
+_82	bI'ra:Si:
+_83	tIra:Si:
+_84	cu:ra:Si:
+_85	pa~ca:Si:
+_86	chIa:Si:
+_87	Sa:ta:Si:
+_88	O:sto:a:Si:
+_89	Uno:no:b'bo:I
+
+_90	no:b:bo:I
+_91	e:ka:no:b'bo:I
+_92	bIra:no:b'bo:I
+_93	tIr'a:no:b'bo:I
+_94	cu:r'a:no:b'bo:I
+_95	pa~ca:no:b'bo:I
+_96	chIa:no:b'bo:I
+_97	S@ta:no:b'bo:I
+_98	ata:no:b'bo:I
+_99	nIra:no:b'bo:I
+
+_0C	SO:
+_0M1	h@z'a:r
+_0M2	l'a:kh
+_0M3	ko:tI
+_0M4	o:r'bu:d
+_dpt	d@so:mIk
+
+// Single consonants
+ক	k@
+খ	kh@
+গ	g@
+ঘ	gh@
+ঙ	N'g
+চ	c@
+ছ	ch@
+জ	J@
+ঝ	Jh@
+ঞ	n^@
+ট	t.@
+ঠ	th.@
+ড	d.@
+ঢ	dh.@
+ণ	n.@   // retroflex n.@
+ত	t@
+থ	th@
+দ	d@
+ধ	dh@
+ন	n@
+প	p@
+ফ	ph@
+ব	b@
+ভ	bh@
+ম	m@
+য়	O:j
+য	J@
+র	r@
+ড়	r-@
+ঢ়	hr@
+ল	l@
+শ	S@
+ষ	s.@   //  retroflex [S]
+স	s@
+হ	H@
+ৎ	t@
+
+
+// combining vowel signs
+ा	#X2a:
+ि	#X1I
+ी	#X2i:
+ূ	#X1U
+ू	#X2u:
+ृ	#X1rI
+ে	#X1e:
+ৈ	#X2E:
+ো	#X1o:
+ৌ	#X1O:
+ॐ	#X1o~m
+
+
+// Punctuation
+।	dVn.d.V
+
+// Pronouns
+আমি 	$u	// main: I
+আমায়	$u
+আমার 	$u
+
+আমরা 	$u	// we
+আমাদের	$u
+
+আপনি	$u	// you(formal)
+আপনাকে	$u
+আপনার 	$u
+
+তুমি	$u	// you (informal)
+তোমায় 	$u
+তোমার 	$u
+তোমাদের 	$u
+
+তুই	$u	// you (informal)
+তোকে 	$u
+তোর 	$u
+
+এ	$u	// he/she/it
+একে 	$u
+এটার 	$u
+এর 	$u
+
+ইনি	$u	// they
+এনাকে	$u
+এনার 	$u
+
+ও	$u	// he/she/it
+সে 	$u
+ওর 	$u
+তার 	$u
+
+ওরা	$u	// they
+তারা	$u
+ওদের	$u	// unheṃ: them 
+তাদের	$u
+
+এই	$u	// e:I this/it
+এটা 	$u	// e:ta: this/it
+এটার 	$u	// e:ta:'r  this/it
+এর 	$u	// e:r  this/it
+
+ওটা	$u	// o:ta: that
+ওটাকে 	$u	// o:ta:ke: to that
+ওটার 	$u	// o:ta:'r  of that
+
+ওগুলো	$u	// o:gu:lo: those
+ওগুলোকে $u	// o:gu:lo:ke: to those
+ওগুলোর 	$u	// o:gu:lo:'r  of those
+
+
+
+// Prepositions/Postpositions
+মধ্যে	$u	// moddhe  in
+উপর	$u	// upor    on, above
+নীচে	$u	// niche   below
+
+পূর্ব্বে	$u	// purbe   before, prior
+পর্য্যন্ত 	$u	// parjonto  till
+অব্দি	$u 	// abdi      till
+বিনা	$u	// bina      without
+
+
+
+// Questions
+কেন	$u $pause	// kano why  interrogative particle
+কি	$u $pause	// ki  what
+কোথায়	$u $pause	// kothaay  where
+কখন	$u $pause	// kakhon   when
+কে	$u $pause	// ke       who
+
+// Conjunctions
+
+এবং	$u $pause	// ebong: and
+আর	$u $pause	// aar: and
+অথবা	$u $pause	// athoba: or
+কিন্তু	$u $pause	// kintu: but
+যদি	$pause	// jodi: if
+তবু	$pause	// tobu: still, yet
+তবে	$pause	// tabe: if...then
+অথচ	$u	// athacho: yet
+
+
+// Verbs
+
+ছিল	$u	// chilo: past aux
+ছিলেন 	$u	// chilen
+
+
+করছি 	$u	// korchi: continuous
+করছিলাম	$u	// korchilam: past indefinite
+করেছি 	$u	// korechi: past
+
+
+// Exceptions
+ক্রিকেট        krIk'Et
+সাইবার        s'aIb@r
diff --git a/dictsource/bn_rules b/dictsource/bn_rules
new file mode 100644
index 00000000..2a356171
--- /dev/null
+++ b/dictsource/bn_rules
@@ -0,0 +1,316 @@
+
+// This file is UTF8 encoded 
+
+// letter groups:
+// A   vowel letters and vowel signs
+// B   vowel signs and virama ्
+// C   consonants
+// Y   vowel letters and vowel signs
+
+// conditional rules
+// ?2   use diphthong for "ai"
+// ?3   use diphthong for "au"
+
+
+.replace
+ ০	0
+ ১	1
+ ২	2
+ ৩	3
+ ৪	4
+ ৫	5
+ ৬	6
+ ৭	7
+ ৮	8
+ ৯	9
+
+
+// Vowels
+
+
+.group অ
+       অ        a
+      
+
+.group আ
+       আ        a:
+
+.group ই
+        ই        I
+        ইঁ        i~
+        ইং        I'ng
+
+.group ঈ
+        ঈ        i:
+        ঈ (_     i
+
+.group উ
+        উ        U
+
+.group ঊ
+        ঊ        u:
+        ঊং        u~  // + anusvara
+        ঊঁ        u~  // + candrabinbu
+
+.group ঋ
+        ঋ        rI
+
+.group এঁ
+        এঁ        E   // candra e
+
+.group ঐ
+        ঐ        e
+
+.group এ
+        এ        e:
+
+.group ঐ
+        ঐ        E:  // ?? [aI] [E:] [&:] 
+        ঐং        E~
+        ঐঁ        E~
+?2      ঐ        aI  // ?? [aI] [E:] [&:] 
+
+
+.group ওঁ
+        ওঁ        O  // candra O
+
+.group ঔ
+        ঔ        o
+
+.group ও
+        ও        o:
+        ওং        o~   // +anusvara
+        ওঁ        o~   // +candrabindu
+
+.group ঔ
+        ঔ        O:  // ?? [aU] [O:]
+        ঔঁ        O~  // +candrabindu
+
+
+// Vowel Signs
+
+.group া
+       া          a:
+       
+.group ি
+       ি        I
+    
+.group ী
+       ী        i:
+       ী (_  i
+
+.group ূ
+       ূ        U
+
+.group ু
+       ু        u:
+     
+.group ৃ
+       ৃ        rI
+
+.group ে
+       ে        e:
+
+.group ৈ
+       ৈ        E:    // ?? [aI] [E:] [&:] 
+    
+.group ো
+       ো        o:
+  
+.group ৌ
+       ৌ        O:    //  [O:] or [aU] ??
+  
+.group ॐ
+        ॐ        o~m
+
+// Consonants
+
+.group ক
+        ক        k@
+        ক (B     k
+        ক্য (्য    kja:
+        ক্ষ            kh'@
+
+.group খ
+        খ        khV
+        খ (B  kh@
+  
+.group গ
+        গ        gV
+        গ (B  g@
+    ঈ)গ (ল   g@
+
+.group ঘ
+        ঘ        ghV
+        ঘ (B  gh
+
+.group ঙ
+        ঙ        N'g
+        ঙ্ (B     N
+    গা)ঙ (চি     Ng@
+
+.group চ
+        চ        cV
+        চ (B     c
+  ্য) চ্য     c'j@
+
+.group ছ
+        ছ        chV
+        ছ  (B  ch@
+
+.group জ
+        জ        J@
+        জ (B  J@
+  ্) জ        zV
+        জ (B  J@
+
+.group ঝ
+        ঝ        Jh@
+        ঝ (B  Jh@
+
+.group ঞ
+        ঞ        n^V
+        ঞ্ (B     n^
+   
+.group ট
+        ট        tV
+        ট (B     tV
+        ট (्য়      t.j@
+
+.group ঠ
+        ঠ        thV
+        ঠ (B  th.
+
+.group ড
+        ড        d.V
+        ড (B     d.
+
+.group ঢ
+       ঢ        dh.V
+       ঢ (B     dh.
+.group ণ
+        ণ        n.V   // (temporary) same as dental [n]
+        ণ (B     n.
+        ণ্ম       n.m
+
+
+.group ত
+        ত        t@
+        ত (B  t@
+              
+.group থ
+        থ        th@
+        থ (B  th.
+ ক) থ (ন    th@
+
+.group দ
+        দ        d@
+        দ (B     d.
+ ব) দ (ল     d@
+
+.group ধ
+        ধ        dh@
+        ধ (B     dh.
+ সা) ধ (ন         dh@
+
+.group ন
+        ন        n@
+        ন  (B     n@
+  ্) ন (্          n@
+   র্) ন (_     r.n          // r +virama অর্ণব
+
+
+.group ন
+        ন        n:     // should this be a long [n] ?
+
+.group প
+        প        p@
+        প (B     p
+        প্য (्য    p:
+
+.group ফ
+        ফ        ph@
+        ফ (B     ph@
+        ফ        ph@
+  
+
+.group ব
+        ব        b@
+        ব (B     b@
+
+.group ভ
+        ভ        bh@
+        ভ (B     bh@
+
+.group ম
+        ম        mV
+ ्) ম (_  mV
+   র্) ম (_ r.m@          // r +virama
+   ন্) ম (_ n.m          // n +virama
+
+.group য়
+        য়            jV
+        য় (B    jV    
+    
+.group য
+        য       J@
+        য (B    J@     
+ ्) য (_    ja
+
+.group র
+        র        rV
+        র (B     r
+ ्) র (_     r@
+
+
+.group ল
+        ল         l
+        ল  (B  l@
+  ক) ল  (ম    l@
+
+
+.group শ
+        শ        S@
+        শ (B     S@
+
+.group ষ
+        ষ        s   
+        ষ (B     s    //??
+
+.group স
+        স        s@
+        স (B     s.
+
+.group হ
+        হ        H@  
+        হ (B     H@
+       হ্ব       v@
+.group হ্ব 
+  B) হ্ব (B v@
+     
+.group ৎ
+        ৎ (B     t@t
+
+
+
+                       // nukta,  modifies a consonant
+
+.group ্যা                // ja'falaa 
+        ্যা       a
+
+.group ँ
+	ँ	n	// candrabindu
+
+.group ং
+       ং        aN'g   //  anusvara
+
+.group ः
+        ः        H   //  visarga
+
+.group ্		// virama
+	্
+
+
+
+
+
diff --git a/dictsource/pa_list b/dictsource/pa_list
index ebbb9966..e8ce7beb 100644
--- a/dictsource/pa_list
+++ b/dictsource/pa_list
@@ -1,4 +1,4 @@
- 
+ 
 // This file is UTF8 encoded 		
 // Punjabi/Gurmukhi
 
@@ -24,14 +24,14 @@ _15	p'Vnd@Ra~
 _16	s'ol.a~
 _17	s@t'aRa~
 _18	Vth.'aRa~
-_19	'Uni
+_19	'Unni
 
 _20	v'iH
 _21	Ik:i
 _22	b'ai
 _23	t'ei
 _24	c'Ovi
-_25	p'VnJhi
+_25	p'Vc:i
 _26	ch'Vb:i
 _27	s@t'ai
 _28	Vth.'ai
@@ -40,79 +40,80 @@ _29	Un'Vt:i
 _30	t'iH
 _31	Ik'Vt:i
 _32	b'Vt:i
-_33	t'eti
-_34	c'O~ti
-_35	p'E~ti
+_33	t'et:i
+_34	c'ONti
+_35	p'ENti
 _36	ch'Vt:i
-_37	s'E~ti
+_37	s'ENti
+
 _38	Vth.'Vt:i
-_39	Un@t'ali
+_39	U~Nt'ali
 
 _40	c'ali
 _41	Ik@t'ali
-_42	b@t'ali
+_42	be'ali
 _43	t@R@t'ali
-_44	cOt'ali
-_45	p@nJ@t'ali
+_44	cUt'ali
+_45	p@nt'ali
 _46	chI'ali
 _47	s@nt'ali
-_48	Vth.:@t'ali
-_49	'Un.I~Ja
+_48	,@R2@t'ali
+_49	Un'VnJa
 
 _50	p@nJ'aH
-_51	'Ik@vI~Ja
-_52	b'VvI~Ja
-_53	t'VR@vI~Ja
-_54	c'VRI~Ja
-_55	p'Vc@vI~Ja
-_56	ch'VpI~Ja
-_57	s'Vt@vI~Ja
-_58	'Vth.:@vI~Ja
+_51	,@k@v'VnJa
+_52	b@v'VnJa
+_53	t,@R@v'VnJa
+_54	cUR'VnJa
+_55	p,@c@v'VnJa
+_56	ch@p'VnJa
+_57	s,@t@v'VnJa
+_58	,@th.@v'VnJa
 _59	Un.'ath.
 
 _60	s'Vth.:
-_61	Ik'ath.
-_62	b'ath.H
-_63	t@R'eth.H
-_64	c'Oth.H
-_65	p'E~th.
-_66	chI'ath.
-_67	s@t'aH@th.
-_68	Vth.:'ath.
+_61	Ik'aH@t.
+_62	b'aH@t.
+_63	t@R'e~H@t.
+_64	c'O~H@t.
+_65	p'E~H@t.
+_66	che'aH@t.
+_67	s@t'aH@t.
+_68	,@th.'aH@t.
 _69	Un.'Vt:@R
 
 _70	s'Vt:@R
-_71	IkH'Vt:@R
+_71	Ik'Vt:@R
 _72	b@H'Vt:@R
-_73	t@H'Vt:@R
+_73	t@H'et:@R
 _74	cOH'Vt:@R
-_75	p@nJ'Vt:@R
+_75	p@J'Vt:@R
 _76	chIH'Vt:@R
 _77	s@t'Vt:@R
 _78	Vth.'Vt:@R
 _79	Un.'asi
 
 _80	'Vssi
-_81	Ik'asi
-_82	bI'asi
-_83	t@R@'asi
-_84	c@R'asi
-_85	p@nJ'asi
-_86	chI'asi
+_81	,IkI;'asi
+_82	bI;'asi
+_83	t,@RI;'asi
+_84	cUR'asi
+_85	p@c'asi
+_86	chI;'asi
 _87	s@t'asi
 _88	Vth.'asi
-_89	Un.a~n@v'eN
+_89	Un'an@v,e~
 
 _90	n'Vb:e
-_91	Ik@'an@v,e~
-_92	bI;'an@v,e~
-_93	t@R@'an@ve~
-_94	c@R'an@ve~
-_95	p@c'an@ve~
+_91	Ik'an@v,e~
+_92	b'an@v,e~
+_93	t@R'a~n@v,e~
+_94	cUR'an@v,e~
+_95	p@c'an@v,e~
 _96	chI'an@ve~
 _97	s@t'an@ve~
 _98	Vth.'an@ve~
-_99	nIR'Vnn@ve~
+_99	n@R2'I~n@v,e~
 
 _0C	s'O
 _0M1	H@J'aR
@@ -130,8 +131,6 @@ _dpt	_dOth  // ??
 ੱ	VddVk
 ਃ	visaRg
 ੍	hVlVnt
-ॄ 	addak
-
 
 ਅ	'ERV
 ੲ	'IRI
@@ -157,15 +156,13 @@ _ਔ	'ERV||kVnOR'a
 ੌ	kVn'ORa
 
 ।	d.'Vnd.i
-₹ 	rupi
-
-
 ਸਰਕਾਰ	 sR@k'aR
  ਸਰਕਾਰੀ	sR@k'aRi
 
+$textmode
+ਸੋਫਟਵਿਅਰ  software
+ਈਮੇਲ   email
+ਕੀਬੋਰਡ  keyboard
+ਬੋਰਡ    board
+$phonememode
 
-// English words
-ਸੋਫਟਵਿਅਰ	 s'OftwER
-ਵੈਬਪੇਜ	w'EbpeIdZ
-ਈਮੇਲ	'i:meIl
-ਕੀਬੋਰਡ	k'i:boRd
diff --git a/dictsource/ur_list b/dictsource/ur_list
index b0fae0c2..a35bf8ea 100644
--- a/dictsource/ur_list
+++ b/dictsource/ur_list
@@ -164,4 +164,9 @@ _dpt	_ISaRI'Ia_
 
 // Exception of phonemes
 
+یہ	jE	$u
+کہ	kE	$u
+وہ	wo:	$u
+
+
 پاکستان	p'a:k'i:st'a:n
diff --git a/dictsource/ur_rules b/dictsource/ur_rules
index 18542979..a69f822f 100644
--- a/dictsource/ur_rules
+++ b/dictsource/ur_rules
@@ -19,7 +19,7 @@
 
 
 // vowel signs, alif acts as consonants  at start of word if these follow
-.L01  َ  ِ  ُ  و  ی   ع  ا
+.L01  َ ِ ُ و ی ع ا ے 
 
 
 // VOWELS
@@ -52,6 +52,7 @@
 _) ا	a
 _) او	u:
 _) ای	i:
+	ائ	a:j
 
 .group آ
 	آ	a:
@@ -68,13 +69,13 @@ _) ای	i:
 	وُ	u:
 	وٗ	u:
 	و (L01	v
-	_) و	v
+	_) و	vV
 
 .group ی
 	ی	e:
 	ی (L01	j
 	ی (_	i:
-	_) ی	j
+	_) ی	jV
 
 
 .group ے		// yeh barree
diff --git a/espeak-data/voices/test/fa b/espeak-data/voices/asia/fa
similarity index 100%
rename from espeak-data/voices/test/fa
rename to espeak-data/voices/asia/fa
diff --git a/espeak-data/voices/test/fa-pin b/espeak-data/voices/asia/fa-pin
similarity index 100%
rename from espeak-data/voices/test/fa-pin
rename to espeak-data/voices/asia/fa-pin
diff --git a/espeak-data/voices/hi b/espeak-data/voices/asia/hi
similarity index 100%
rename from espeak-data/voices/hi
rename to espeak-data/voices/asia/hi
diff --git a/espeak-data/voices/hy b/espeak-data/voices/asia/hy
similarity index 100%
rename from espeak-data/voices/hy
rename to espeak-data/voices/asia/hy
diff --git a/espeak-data/voices/hy-west b/espeak-data/voices/asia/hy-west
similarity index 100%
rename from espeak-data/voices/hy-west
rename to espeak-data/voices/asia/hy-west
diff --git a/espeak-data/voices/id b/espeak-data/voices/asia/id
similarity index 86%
rename from espeak-data/voices/id
rename to espeak-data/voices/asia/id
index ce800f70..f35b116a 100644
--- a/espeak-data/voices/id
+++ b/espeak-data/voices/asia/id
@@ -1,4 +1,4 @@
-name indonesian-test
+name indonesian
 language id
 gender male
 
diff --git a/espeak-data/voices/asia/ka b/espeak-data/voices/asia/ka
new file mode 100644
index 00000000..6f748b7f
--- /dev/null
+++ b/espeak-data/voices/asia/ka
@@ -0,0 +1,2 @@
+name georgian
+language ka
diff --git a/espeak-data/voices/kn b/espeak-data/voices/asia/kn
similarity index 100%
rename from espeak-data/voices/kn
rename to espeak-data/voices/asia/kn
diff --git a/espeak-data/voices/ku b/espeak-data/voices/asia/ku
similarity index 100%
rename from espeak-data/voices/ku
rename to espeak-data/voices/asia/ku
diff --git a/espeak-data/voices/ml b/espeak-data/voices/asia/ml
similarity index 100%
rename from espeak-data/voices/ml
rename to espeak-data/voices/asia/ml
diff --git a/espeak-data/voices/test/ne b/espeak-data/voices/asia/ne
similarity index 68%
rename from espeak-data/voices/test/ne
rename to espeak-data/voices/asia/ne
index e9671231..fc829532 100644
--- a/espeak-data/voices/test/ne
+++ b/espeak-data/voices/asia/ne
@@ -1,4 +1,4 @@
-name nepali-test
+name nepali
 language ne
 gender male
 
diff --git a/espeak-data/voices/ta b/espeak-data/voices/asia/ta
similarity index 100%
rename from espeak-data/voices/ta
rename to espeak-data/voices/asia/ta
diff --git a/espeak-data/voices/tr b/espeak-data/voices/asia/tr
similarity index 100%
rename from espeak-data/voices/tr
rename to espeak-data/voices/asia/tr
diff --git a/espeak-data/voices/vi b/espeak-data/voices/asia/vi
similarity index 100%
rename from espeak-data/voices/vi
rename to espeak-data/voices/asia/vi
diff --git a/espeak-data/voices/vi-hue b/espeak-data/voices/asia/vi-hue
similarity index 100%
rename from espeak-data/voices/vi-hue
rename to espeak-data/voices/asia/vi-hue
diff --git a/espeak-data/voices/zh b/espeak-data/voices/asia/zh
similarity index 100%
rename from espeak-data/voices/zh
rename to espeak-data/voices/asia/zh
diff --git a/espeak-data/voices/zh-yue b/espeak-data/voices/asia/zh-yue
similarity index 100%
rename from espeak-data/voices/zh-yue
rename to espeak-data/voices/asia/zh-yue
diff --git a/espeak-data/voices/en/en b/espeak-data/voices/en
similarity index 100%
rename from espeak-data/voices/en/en
rename to espeak-data/voices/en
diff --git a/espeak-data/voices/en/en-us b/espeak-data/voices/en-us
similarity index 100%
rename from espeak-data/voices/en/en-us
rename to espeak-data/voices/en-us
diff --git a/espeak-data/voices/bg b/espeak-data/voices/europe/bg
similarity index 82%
rename from espeak-data/voices/bg
rename to espeak-data/voices/europe/bg
index 688d9fd6..c3842ca7 100644
--- a/espeak-data/voices/bg
+++ b/espeak-data/voices/europe/bg
@@ -1,4 +1,4 @@
-name bulgarian-test
+name bulgarian
 language bg
 
 stressAmp 13 12 17 17 20 22 22 21 
diff --git a/espeak-data/voices/bs b/espeak-data/voices/europe/bs
similarity index 100%
rename from espeak-data/voices/bs
rename to espeak-data/voices/europe/bs
diff --git a/espeak-data/voices/ca b/espeak-data/voices/europe/ca
similarity index 100%
rename from espeak-data/voices/ca
rename to espeak-data/voices/europe/ca
diff --git a/espeak-data/voices/cs b/espeak-data/voices/europe/cs
similarity index 100%
rename from espeak-data/voices/cs
rename to espeak-data/voices/europe/cs
diff --git a/espeak-data/voices/cy b/espeak-data/voices/europe/cy
similarity index 70%
rename from espeak-data/voices/cy
rename to espeak-data/voices/europe/cy
index 2991e99d..30abd943 100644
--- a/espeak-data/voices/cy
+++ b/espeak-data/voices/europe/cy
@@ -1,5 +1,5 @@
 language cy
-name welsh-test
+name welsh
 gender male
 
 intonation 4
diff --git a/espeak-data/voices/da b/espeak-data/voices/europe/da
similarity index 100%
rename from espeak-data/voices/da
rename to espeak-data/voices/europe/da
diff --git a/espeak-data/voices/el b/espeak-data/voices/europe/el
similarity index 100%
rename from espeak-data/voices/el
rename to espeak-data/voices/europe/el
diff --git a/espeak-data/voices/es b/espeak-data/voices/europe/es
similarity index 100%
rename from espeak-data/voices/es
rename to espeak-data/voices/europe/es
diff --git a/espeak-data/voices/et b/espeak-data/voices/europe/et
similarity index 100%
rename from espeak-data/voices/et
rename to espeak-data/voices/europe/et
diff --git a/espeak-data/voices/fi b/espeak-data/voices/europe/fi
similarity index 100%
rename from espeak-data/voices/fi
rename to espeak-data/voices/europe/fi
diff --git a/espeak-data/voices/fr-be b/espeak-data/voices/europe/fr-be
similarity index 100%
rename from espeak-data/voices/fr-be
rename to espeak-data/voices/europe/fr-be
diff --git a/espeak-data/voices/hr b/espeak-data/voices/europe/hr
similarity index 100%
rename from espeak-data/voices/hr
rename to espeak-data/voices/europe/hr
diff --git a/espeak-data/voices/hu b/espeak-data/voices/europe/hu
similarity index 100%
rename from espeak-data/voices/hu
rename to espeak-data/voices/europe/hu
diff --git a/espeak-data/voices/is b/espeak-data/voices/europe/is
similarity index 55%
rename from espeak-data/voices/is
rename to espeak-data/voices/europe/is
index 9e9c4e74..b8f23834 100644
--- a/espeak-data/voices/is
+++ b/espeak-data/voices/europe/is
@@ -1,4 +1,4 @@
-name icelandic-test
+name icelandic
 language is
 gender male
 
diff --git a/espeak-data/voices/it b/espeak-data/voices/europe/it
similarity index 100%
rename from espeak-data/voices/it
rename to espeak-data/voices/europe/it
diff --git a/espeak-data/voices/lv b/espeak-data/voices/europe/lv
similarity index 100%
rename from espeak-data/voices/lv
rename to espeak-data/voices/europe/lv
diff --git a/espeak-data/voices/mk b/espeak-data/voices/europe/mk
similarity index 54%
rename from espeak-data/voices/mk
rename to espeak-data/voices/europe/mk
index 4607dd07..47a8398c 100644
--- a/espeak-data/voices/mk
+++ b/espeak-data/voices/europe/mk
@@ -1,4 +1,4 @@
-name macedonian-test
+name macedonian
 language mk
 gender male
 
diff --git a/espeak-data/voices/nl b/espeak-data/voices/europe/nl
similarity index 100%
rename from espeak-data/voices/nl
rename to espeak-data/voices/europe/nl
diff --git a/espeak-data/voices/no b/espeak-data/voices/europe/no
similarity index 100%
rename from espeak-data/voices/no
rename to espeak-data/voices/europe/no
diff --git a/espeak-data/voices/pl b/espeak-data/voices/europe/pl
similarity index 100%
rename from espeak-data/voices/pl
rename to espeak-data/voices/europe/pl
diff --git a/espeak-data/voices/pt-pt b/espeak-data/voices/europe/pt-pt
similarity index 100%
rename from espeak-data/voices/pt-pt
rename to espeak-data/voices/europe/pt-pt
diff --git a/espeak-data/voices/ro b/espeak-data/voices/europe/ro
similarity index 100%
rename from espeak-data/voices/ro
rename to espeak-data/voices/europe/ro
diff --git a/espeak-data/voices/ru b/espeak-data/voices/europe/ru
similarity index 70%
rename from espeak-data/voices/ru
rename to espeak-data/voices/europe/ru
index 238c6912..6be1017b 100644
--- a/espeak-data/voices/ru
+++ b/espeak-data/voices/europe/ru
@@ -1,4 +1,4 @@
-name russian_test
+name russian
 language ru
 gender male
 
diff --git a/espeak-data/voices/sk b/espeak-data/voices/europe/sk
similarity index 100%
rename from espeak-data/voices/sk
rename to espeak-data/voices/europe/sk
diff --git a/espeak-data/voices/sq b/espeak-data/voices/europe/sq
similarity index 100%
rename from espeak-data/voices/sq
rename to espeak-data/voices/europe/sq
diff --git a/espeak-data/voices/sr b/espeak-data/voices/europe/sr
similarity index 100%
rename from espeak-data/voices/sr
rename to espeak-data/voices/europe/sr
diff --git a/espeak-data/voices/sv b/espeak-data/voices/europe/sv
similarity index 100%
rename from espeak-data/voices/sv
rename to espeak-data/voices/europe/sv
diff --git a/espeak-data/voices/ka b/espeak-data/voices/ka
deleted file mode 100644
index bc2def28..00000000
--- a/espeak-data/voices/ka
+++ /dev/null
@@ -1,2 +0,0 @@
-name georgian-test
-language ka
diff --git a/espeak-data/voices/af b/espeak-data/voices/other/af
similarity index 100%
rename from espeak-data/voices/af
rename to espeak-data/voices/other/af
diff --git a/espeak-data/voices/en/en-n b/espeak-data/voices/other/en-n
similarity index 100%
rename from espeak-data/voices/en/en-n
rename to espeak-data/voices/other/en-n
diff --git a/espeak-data/voices/en/en-rp b/espeak-data/voices/other/en-rp
similarity index 100%
rename from espeak-data/voices/en/en-rp
rename to espeak-data/voices/other/en-rp
diff --git a/espeak-data/voices/en/en-sc b/espeak-data/voices/other/en-sc
similarity index 100%
rename from espeak-data/voices/en/en-sc
rename to espeak-data/voices/other/en-sc
diff --git a/espeak-data/voices/en/en-wi b/espeak-data/voices/other/en-wi
similarity index 100%
rename from espeak-data/voices/en/en-wi
rename to espeak-data/voices/other/en-wi
diff --git a/espeak-data/voices/en/en-wm b/espeak-data/voices/other/en-wm
similarity index 100%
rename from espeak-data/voices/en/en-wm
rename to espeak-data/voices/other/en-wm
diff --git a/espeak-data/voices/eo b/espeak-data/voices/other/eo
similarity index 100%
rename from espeak-data/voices/eo
rename to espeak-data/voices/other/eo
diff --git a/espeak-data/voices/test/grc b/espeak-data/voices/other/grc
similarity index 100%
rename from espeak-data/voices/test/grc
rename to espeak-data/voices/other/grc
diff --git a/espeak-data/voices/test/jbo b/espeak-data/voices/other/jbo
similarity index 100%
rename from espeak-data/voices/test/jbo
rename to espeak-data/voices/other/jbo
diff --git a/espeak-data/voices/la b/espeak-data/voices/other/la
similarity index 100%
rename from espeak-data/voices/la
rename to espeak-data/voices/other/la
diff --git a/espeak-data/voices/sw b/espeak-data/voices/other/sw
similarity index 100%
rename from espeak-data/voices/sw
rename to espeak-data/voices/other/sw
diff --git a/espeak-data/voices/test/bg b/espeak-data/voices/test/bg
deleted file mode 100644
index 688d9fd6..00000000
--- a/espeak-data/voices/test/bg
+++ /dev/null
@@ -1,5 +0,0 @@
-name bulgarian-test
-language bg
-
-stressAmp 13 12 17 17 20 22 22 21 
-stressLength 180 170  200 200  200 200  210 220
\ No newline at end of file
diff --git a/espeak-data/voices/test/ga b/espeak-data/voices/test/ga
deleted file mode 100644
index 2467ea18..00000000
--- a/espeak-data/voices/test/ga
+++ /dev/null
@@ -1,4 +0,0 @@
-name irish-test
-language ga
-stressrule 0
-
diff --git a/phsource/ph_bengali b/phsource/ph_bengali
new file mode 100644
index 00000000..1fceed4b
--- /dev/null
+++ b/phsource/ph_bengali
@@ -0,0 +1,37 @@
+
+//====================================================
+//  Bengali, inherits from Hindi
+//====================================================
+
+phoneme @
+  vowel flag1 starttype #@  endtype #@
+  length 65
+
+  ChangeIfDiminished(@-)
+  IF nextPh(H) THEN
+    FMT(vowel/@_low)
+  ENDIF
+  FMT(vowel/@_bck)
+endphoneme
+
+
+phoneme V
+  vowel flag1 starttype #@  endtype #@
+  length 180
+  CALL hi/V
+endphoneme
+
+
+phoneme a:
+  vowel long starttype #a endtype #a
+  length 230
+  FMT(vowel/aa_9)
+endphoneme
+
+
+phoneme o:
+  vowel long starttype #o endtype #o
+  length 220
+  FMT(vowel/o_2)
+endphoneme
+