diff -r ac7e4d1d9209 -r ebd48d2de13c textinput/ptienginev2/keymaps/EMU/ELangThaiLatin.txt
--- a/textinput/ptienginev2/keymaps/EMU/ELangThaiLatin.txt	Thu Aug 19 10:15:25 2010 +0300
+++ b/textinput/ptienginev2/keymaps/EMU/ELangThaiLatin.txt	Tue Aug 31 15:31:50 2010 +0300
@@ -41,73 +41,96 @@
 key upper (4 2) 0x20,0x30,0x21b2
 
 #
-# Standard 4x12 qwerty keymap data.
+# Qwerty keymap data.
 #
 [KEYBOARD BLOCK QWERTY STANDARD]
 
-key lower (1 1) 0x0071
-key upper (1 1) 0x0051
-key lower (1 2) 0x0077
-key upper (1 2) 0x0057
-key lower (1 3) 0x0065
-key upper (1 3) 0x0045
-key lower (1 4) 0x0072
-key upper (1 4) 0x0052
-key lower (1 5) 0x0074
-key upper (1 5) 0x0054
-key lower (1 6) 0x0079
-key upper (1 6) 0x0059
-key lower (1 7) 0x0075
-key upper (1 7) 0x0055
-key lower (1 8) 0x0069
-key upper (1 8) 0x0049
-key lower (1 9) 0x006F
-key upper (1 9) 0x004F
-key lower (1 10) 0x0070
-
-key upper (1 10) 0x0050
-key lower (2 1) 0x0061
-key upper (2 1) 0x0041
-key lower (2 2) 0x0073
-key upper (2 2) 0x0053
-key lower (2 3) 0x0064
-key upper (2 3) 0x0044
+key lower (1 2) 0x0031 
+key upper (1 2) 0x002B
+key lower (1 3) 0x0032
+key upper (1 3) 0x0040
+key lower (1 4) 0x0033
+key upper (1 4) 0x0023
+key lower (1 5) 0x0034
+key upper (1 5) 0x0024
+key lower (1 6) 0x0035
+key upper (1 6) 0x0025
+key lower (1 7) 0x0036
+key upper (1 7) 0x002A
+key lower (1 8) 0x0037
+key upper (1 8) 0x003D
+key lower (1 9) 0x0038
+key upper (1 9) 0x0028
+key lower (1 10) 0x0039
+key upper (1 10) 0x0029
+key lower (1 11) 0x0030
 
-key lower (2 4) 0x0066
-key upper (2 4) 0x0046
-key lower (2 5) 0x0067
-key upper (2 5) 0x0047
-key lower (2 6) 0x0068
-key upper (2 6) 0x0048
-key lower (2 7) 0x006A
-key upper (2 7) 0x004A
-key lower (2 8) 0x006B
-key upper (2 8) 0x004B
-key lower (2 9) 0x006C
-key upper (2 9) 0x004C
-key lower (2 10) 0x0027
-key upper (2 10) 0x002F
-key lower (3 1) 0x007A
-key upper (3 1) 0x005A
-key lower (3 2) 0x0078
-key upper (3 2) 0x0058
+key lower (2 1) 0x003F  
+key upper (2 1) 0x0021
+key lower (2 2) 0x0071
+key upper (2 2) 0x0051
+key lower (2 3) 0x0077
+key upper (2 3) 0x0057
+key lower (2 4) 0x0065,0x00E8,0x00E9,0x00EA,0x00EB
+key upper (2 4) 0x0045,0x00C8,0x00C9,0x00CA,0x00CB
+key lower (2 5) 0x0072
+key upper (2 5) 0x0052
+key lower (2 6) 0x0074,0x00FE
+key upper (2 6) 0x0054,0x00DE
+key lower (2 7) 0x0079,0x00FD
+key upper (2 7) 0x0059,0x00DD
+key lower (2 8) 0x0075,0x00F9,0x00FA,0x00FB,0x00FC
+key upper (2 8) 0x0055,0x00D9,0x00DA,0x00DB,0x00DC
+key lower (2 9) 0x0069,0x00EC,0x00ED,0x00EE,0x00EF
+key upper (2 9) 0x0049,0x00CC,0x00CD,0x00CE,0x00CF
+key lower (2 10) 0x006F,0x00F6,0x00F8,0x00F2,0x00F3,0x00F4,0x00F5
+key upper (2 10) 0x004F,0x00D6,0x00D8,0x00D2,0x00D3,0x00D4,0x00D5
+key lower (2 11) 0x0070
+key upper (2 11) 0x0050
+key lower (2 12) 0x002D
+key upper (2 12) 0x002D
 
-key lower (3 3) 0x0063
-key upper (3 3) 0x0043
-key lower (3 4) 0x0076
-key upper (3 4) 0x0056
-key lower (3 5) 0x0062
-key upper (3 5) 0x0042
-key lower (3 6) 0x006E
-key upper (3 6) 0x004E
-key lower (3 7) 0x006D
-key upper (3 7) 0x004D
-key lower (3 8) 0x002C
-key upper (3 8) 0x002B
-key lower (3 9) 0x002E
-key upper (3 9) 0x002D
-key lower (3 10) 0x003F
-key upper (3 10) 0x0021
+key lower (3 1) 0x002C
+key upper (3 1) 0x002E
+key lower (3 2) 0x0061,0x00E4,0x00E6,0x00E5,0x00E0,0x00E1,0x00E2,0x00E3
+key upper (3 2) 0x0041,0x00C4,0x00C6,0x00C5,0x00C0,0x00C1,0x00C2,0x00C3
+key lower (3 3) 0x0073,0x00DF
+key upper (3 3) 0x0053
+key lower (3 4) 0x0064,0x00F0
+key upper (3 4) 0x0044,0x00D0
+key lower (3 5) 0x0066
+key upper (3 5) 0x0046
+key lower (3 6) 0x0067
+key upper (3 6) 0x0047
+key lower (3 7) 0x0068
+key upper (3 7) 0x0048
+key lower (3 8) 0x006A
+key upper (3 8) 0x004A
+key lower (3 9) 0x006B
+key upper (3 9) 0x004B
+key lower (3 10) 0x006C
+key upper (3 10) 0x004C
+key lower (3 11) 0x003B
+key upper (3 11) 0x003A
+key lower (3 12) 0x0027
+key upper (3 12) 0x0022
+
+key lower (4 2) 0x007A
+key upper (4 2) 0x005A
+key lower (4 3) 0x0078
+key upper (4 3) 0x0058
+key lower (4 4) 0x0063,0x00E7
+key upper (4 4) 0x0043,0x00C7
+key lower (4 5) 0x0076
+key upper (4 5) 0x0056
+key lower (4 6) 0x0062
+key upper (4 6) 0x0042
+key lower (4 7) 0x006E,0x00F1
+key upper (4 7) 0x004E,0x00D1
+key lower (4 8) 0x006D
+key upper (4 8) 0x004D
+key lower (4 11) 0x002F
+key upper (4 11) 0x002F 
 
 #
 # Four row mini qwerty keymap data.