diff -r e6a39382bb9c -r c8fb4cf7b3ae textinput/ptienginev2/keymaps/EMU/ELangPortuguese.txt
--- a/textinput/ptienginev2/keymaps/EMU/ELangPortuguese.txt	Tue Apr 27 16:59:43 2010 +0300
+++ b/textinput/ptienginev2/keymaps/EMU/ELangPortuguese.txt	Tue May 11 16:31:42 2010 +0300
@@ -45,302 +45,101 @@
 #
 [KEYBOARD BLOCK QWERTY STANDARD]
 
-key lower (1 2) 0x0031
-key upper (1 2) 0x0040
-key lower (1 3) 0x0032
-key upper (1 3) 0x0022
-key lower (1 4) 0x0033
-key upper (1 4) 0x0023
-key lower (1 5) 0x0034
-key upper (1 5) 0x002b
-key lower (1 6) 0x0035
-key upper (1 6) 0x003d
-key lower (1 7) 0x0036
-key upper (1 7) 0x002a
-key lower (1 8) 0x0037
-key upper (1 8) 0x002f
-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 upper (1 11) 0x0027
-key lower (3 2) 0x0061,0x00e2,0x00e1,0x00e0,0x00e3,0x00aa,0x00e4,0x00e5,0x00e6
-key upper (3 2) 0x0041,0x00c2,0x00c1,0x00c0,0x00c3,0x00aa,0x00c4,0x00c5,0x00c6
-key lower (4 6) 0x0062
-key upper (4 6) 0x0042
-key lower (4 4) 0x0063,0x00e7
-key upper (4 4) 0x0043,0x00c7
-key lower (3 4) 0x0064,0x00f0
-key upper (3 4) 0x0044,0x00d0
-key lower (2 4) 0x0065,0x00ea,0x00e9,0x00e8,0x00eb
-key upper (2 4) 0x0045,0x00ca,0x00c9,0x00c8,0x00cb
-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 (2 9) 0x0069,0x00ed,0x00ee,0x00ec,0x00ef
-key upper (2 9) 0x0049,0x00cd,0x00ce,0x00cc,0x00cf
-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 (4 8) 0x006d
-key upper (4 8) 0x004d
-key lower (4 7) 0x006e,0x00f1
-key upper (4 7) 0x004e,0x00d1
-key lower (2 10) 0x006f,0x00f5,0x00f4,0x00f3,0x00f2,0x00f6,0x00ba,0x00f8
-key upper (2 10) 0x004f,0x00d5,0x00d4,0x00d3,0x00d2,0x00d6,0x00ba,0x00d8
-key lower (2 11) 0x0070
-key upper (2 11) 0x0050
-key lower (2 2) 0x0071
-key upper (2 2) 0x0051
-key lower (2 5) 0x0072
-key upper (2 5) 0x0052
-key lower (3 3) 0x0073,0x00df
-key upper (3 3) 0x0053
-key lower (2 6) 0x0074,0x00fe
-key upper (2 6) 0x0054,0x00de
-key lower (2 8) 0x0075,0x00fa,0x00fb,0x00f9,0x00fc
-key upper (2 8) 0x0055,0x00da,0x00db,0x00d9,0x00dc
-key lower (4 5) 0x0076
-key upper (4 5) 0x0056
-key lower (2 3) 0x0077
-key upper (2 3) 0x0057
-key lower (4 3) 0x0078
-key upper (4 3) 0x0058
-key lower (2 7) 0x0079,0x00fd
-key upper (2 7) 0x0059,0x00dd
-key lower (4 2) 0x007a
-key upper (4 2) 0x005a
-key lower (2 1) 0x003f
-key upper (2 1) 0x0021
-key lower (2 12) 0xf001,0x00b4
-key upper (2 12) 0xf002,0x00a8
-key lower (4 9) 0x002c
-key upper (4 9) 0x003b
-key lower (3 11) 0x00e7,0x00f1
-key upper (3 11) 0x00c7,0x00d1
-key lower (4 10) 0x002e
-key upper (4 10) 0x003a
-key lower (3 1) 0x00bf
-key upper (3 1) 0x00a1
-key lower (4 11) 0x002d
-key upper (4 11) 0xf003,0x0060
-key lower (3 12) 0xf005,0x007e
-key upper (3 12) 0xf004,0x005e
 
-#
-# Dead key data
-# 0xf000 means "no dead key character for that index".
-#
-dead_key_data lower (2 4) 0x00E9, 0x00EB, 0x00E8, 0x00EA, 0xF000
-dead_key_data upper (2 4) 0x00C9, 0x00CB, 0x00C8, 0x00CA, 0xF000
-dead_key_data lower (2 7) 0x00FD, 0xF000, 0xF000, 0xF000, 0xF000
-dead_key_data upper (2 7) 0x00DD, 0xF000, 0xF000, 0xF000, 0xF000
-dead_key_data lower (2 8) 0x00FA, 0x00FC, 0x00F9, 0x00FB, 0xF000
-dead_key_data upper (2 8) 0x00DA, 0x00DC, 0x00D9, 0x00DB, 0xF000
-dead_key_data lower (2 9) 0x00ED, 0x00EF, 0x00EC, 0x00EE, 0xF000
-dead_key_data upper (2 9) 0x00CD, 0x00CF, 0x00CC, 0x00CE, 0xF000
-dead_key_data lower (2 10) 0x00F3, 0x00F6, 0x00F2, 0x00F4, 0x00F5
-dead_key_data upper (2 10) 0x00D3, 0x00D6, 0x00D2, 0x00D4, 0x00D5
-dead_key_data lower (3 2) 0x00E1, 0x00E4, 0x00E0, 0x00E2, 0x00E3
-dead_key_data upper (3 2) 0x00C1, 0x00C4, 0x00C0, 0x00C2, 0x00C3
-dead_key_data lower (4 7) 0xF000, 0xF000, 0xF000, 0xF000, 0x00F1
-dead_key_data upper (4 7) 0xF000, 0xF000, 0xF000, 0xF000, 0x00D1
 
-#
-# Three row mini qwerty keymap data. 
-#
-[KEYBOARD BLOCK QWERTY 3X11]
 
 key lower (1 1) 0x0071
 key upper (1 1) 0x0051
-key fn_lower (1 1) 0x0031
-key lower (1 2) 0x0077
-key upper (1 2) 0x0057
-key fn_lower (1 2) 0x0032
-key lower (1 3) 0x0065,0x00EA,0x00E9,0x00E8,0x00EB
-key upper (1 3) 0x0045,0x00CA,0x00C9,0x00C8,0x00CB
-key fn_lower (1 3) 0x0033
-key lower (1 4) 0x0072
-key upper (1 4) 0x0052
-key fn_lower (1 4) 0x0034
-key lower (1 5) 0x0074,0x00FE
-key upper (1 5) 0x0054,0x00DE
-key fn_lower (1 5) 0x0035
-key lower (1 6) 0x0079,0x00FD
-key upper (1 6) 0x0059,0x00DD
-key fn_lower (1 6) 0x0036
-key lower (1 7) 0x0075,0x00FA,0x00FB,0x00F9,0x00FC
-key upper (1 7) 0x0055,0x00DA,0x00DB,0x00D9,0x00DC
-key fn_lower (1 7) 0x0037
-key lower (1 8) 0x0069,0x00ED,0x00EE,0x00EC,0x00EF
-key upper (1 8) 0x0049,0x00CD,0x00CE,0x00CC,0x00CF
-key fn_lower (1 8) 0x0038
-key lower (1 9) 0x006F,0x00F5,0x00F4,0x00F3,0x00F2,0x00F6,0x00BA,0x00F8
-key upper (1 9) 0x004F,0x00D5,0x00D4,0x00D3,0x00D2,0x00D6,0x00BA,0x00D8
-key fn_lower (1 9) 0x0039
-key lower (1 10) 0x0070
-key upper (1 10) 0x0050
-key fn_lower (1 10) 0x0030
-key lower (2 1) 0x0061,0x00E2,0x00E1,0x00E0,0x00E3,0x00AA,0x00E4,0x00E5,0x00E6
-key upper (2 1) 0x0041,0x00C2,0x00C1,0x00C0,0x00C3,0x00AA,0x00C4,0x00C5,0x00C6
-key fn_lower (2 1) 0x0040
-key lower (2 2) 0x0073,0x00DF
-key upper (2 2) 0x0053
-key fn_lower (2 2) 0x002F
-key lower (2 3) 0x0064,0x00F0
-key upper (2 3) 0x0044,0x00D0
-key fn_lower (2 3) 0x002B
-key lower (2 4) 0x0066
-key upper (2 4) 0x0046
-key fn_lower (2 4) 0x002D
-key lower (2 5) 0x0067
-key upper (2 5) 0x0047
-key fn_lower (2 5) 0x002A
-key lower (2 6) 0x0068
-key upper (2 6) 0x0048
-key fn_lower (2 6) 0x0023
-key lower (2 7) 0x006A
-key upper (2 7) 0x004A
-key fn_lower (2 7) 0x003D
-key lower (2 8) 0x006B
-key upper (2 8) 0x004B
-key fn_lower (2 8) 0x003F
-key lower (2 9) 0x006C
-key upper (2 9) 0x004C
-key fn_lower (2 9) 0x0021
-key lower (2 10) 0x00E7
-key upper (2 10) 0x00C7
-key fn_lower (2 10) 0x0027
-key lower (3 2) 0x007A
-key upper (3 2) 0x005A
-key fn_lower (3 2) 0x0028
-key lower (3 3) 0x0078
-key upper (3 3) 0x0058
-key fn_lower (3 3) 0x0029
-key lower (3 4) 0x0063,0x00E7
-key upper (3 4) 0x0043,0x00C7
-key fn_lower (3 4) 0x0025
-key lower (3 5) 0x0076
-key upper (3 5) 0x0056
-key fn_lower (3 5) 0x002C
-key lower (3 6) 0x0062
-key upper (3 6) 0x0042
-key fn_lower (3 6) 0x002E
-key lower (3 7) 0x006E,0x00F1
-key upper (3 7) 0x004E,0x00D1
-key fn_lower (3 7) 0x003B
-key lower (3 8) 0x006D
-key upper (3 8) 0x004D
-key fn_lower (3 8) 0x003A
-
-#
-# Four row mini qwerty keymap data. 
-#
-[KEYBOARD BLOCK QWERTY 4X10]
-
-key lower (1 1) 0x0071
-key upper (1 1) 0x0051
-key fn_lower (1 1) 0x0021
 key lower (1 2) 0x0077
 key upper (1 2) 0x0057
-key fn_lower (1 2) 0x0022
-key lower (1 3) 0x0065,0x00EA,0x00E9,0x00E8,0x00EB
-key upper (1 3) 0x0045,0x00CA,0x00C9,0x00C8,0x00CB
-key fn_lower (1 3) 0x0031
-key lower (1 4) 0x0072
-key upper (1 4) 0x0052
-key fn_lower (1 4) 0x0031
-key lower (1 5) 0x0074,0x00FE
-key upper (1 5) 0x0054,0x00DE
-key fn_lower (1 5) 0x0032
+key lower (1 3) 0x0065,0x00EA,0x00E8,0x00E9
+key upper (1 3) 0x0045,0x00CA,0x00C8,0x00C9
+deadkeydata lower (1 3) 0x00EA,0x00E8,0xf000,0x00E9,0xf000
+deadkeydata upper (1 3) 0x00CA,0x00C8,0xf000,0x00C9,0xf000
+key lower (1 4) 0x0072,0x0155
+key upper (1 4) 0x0052,0x0154
+deadkeydata lower (1 4) 0xf000,0xf000,0xf000,0x0155,0xf000
+deadkeydata upper (1 4) 0xf000,0xf000,0xf000,0x0154,0xf000
+key lower (1 5) 0x0074
+key upper (1 5) 0x0054
 key lower (1 6) 0x0079,0x00FD
 key upper (1 6) 0x0059,0x00DD
-key fn_lower (1 6) 0x0032
-key lower (1 7) 0x0075,0x00FA,0x00FB,0x00F9,0x00FC
-key upper (1 7) 0x0055,0x00DA,0x00DB,0x00D9,0x00DC
-key fn_lower (1 7) 0x0033
-key lower (1 8) 0x0069,0x00ED,0x00EE,0x00EC,0x00EF
-key upper (1 8) 0x0049,0x00CD,0x00CE,0x00CC,0x00CF
-key fn_lower (1 8) 0x0033
-key lower (1 9) 0x006F,0x00F5,0x00F4,0x00F3,0x00F2,0x00F6,0x00BA,0x00F8
-key upper (1 9) 0x004F,0x00D5,0x00D4,0x00D3,0x00D2,0x00D6,0x00BA,0x00D8
-key fn_lower (1 9) 0x002B
+deadkeydata lower (1 6) 0xf000,0xf000,0xf000,0x00FD,0xf000
+deadkeydata upper (1 6) 0xf000,0xf000,0xf000,0x00DD,0xf000
+key lower (1 7) 0x0075,0x00FB,0x00F9,0x00FA
+key upper (1 7) 0x0055,0x00DB,0x00D9,0x00DA
+deadkeydata lower (1 7) 0x00FB,0x00F9,0xf000,0x00FA,0xf000
+deadkeydata upper (1 7) 0x00DB,0x00D9,0xf000,0x00DA,0xf000
+key lower (1 8) 0x0069,0x00EE,0x00EC,0x00ED
+key upper (1 8) 0x0049,0x00CE,0x00CC,0x00CD
+deadkeydata lower (1 8) 0x00EE,0x00EC,0xf000,0x00ED,0xf000
+deadkeydata upper (1 8) 0x00CE,0x00CC,0xf000,0x00CD,0xf000
+key lower (1 9) 0x006F,0x00F4,0x00F2,0x00F5,0x00F3
+key upper (1 9) 0x004F,0x00D4,0x00D2,0x00D5,0x00D3
+deadkeydata lower (1 9) 0x00F4,0x00F2,0x00F5,0x00F3,0xf000
+deadkeydata upper (1 9) 0x00D4,0x00D2,0x00D5,0x00D3,0xf000
 key lower (1 10) 0x0070
 key upper (1 10) 0x0050
-key lower (2 1) 0x0061,0x00E2,0x00E1,0x00E0,0x00E3,0x00AA,0x00E4,0x00E5,0x00E6
-key upper (2 1) 0x0041,0x00C2,0x00C1,0x00C0,0x00C3,0x00AA,0x00C4,0x00C5,0x00C6
-key fn_lower (2 1) 0x002F
-key lower (2 2) 0x0073,0x00DF
-key upper (2 2) 0x0053
-key fn_lower (2 2) 0x0025
-key lower (2 3) 0x0064,0x00F0
-key upper (2 3) 0x0044,0x00D0
-key fn_lower (2 3) 0x0034
+key lower (1 11) 0xf004,0x00B4
+key upper (1 11) 0xf004,0x00B4
+key lower (2 1) 0x0061,0x00E2,0x00E0,0x00E3,0x00E1
+key upper (2 1) 0x0041,0x00C2,0x00C0,0x00C3,0x00C1
+deadkeydata lower (2 1) 0x00E2,0x00E0,0x00E3,0x00E1,0xf000
+deadkeydata upper (2 1) 0x00C2,0x00C0,0x00C3,0x00C1,0xf000
+key lower (2 2) 0x0073,0x015B
+key upper (2 2) 0x0053,0x015A
+deadkeydata lower (2 2) 0xf000,0xf000,0xf000,0x015B,0xf000
+deadkeydata upper (2 2) 0xf000,0xf000,0xf000,0x015A,0xf000
+key lower (2 3) 0x0064
+key upper (2 3) 0x0044
 key lower (2 4) 0x0066
 key upper (2 4) 0x0046
-key fn_lower (2 4) 0x0034
 key lower (2 5) 0x0067
 key upper (2 5) 0x0047
-key fn_lower (2 5) 0x0035
 key lower (2 6) 0x0068
 key upper (2 6) 0x0048
-key fn_lower (2 6) 0x0035
 key lower (2 7) 0x006A
 key upper (2 7) 0x004A
-key fn_lower (2 7) 0x0036
 key lower (2 8) 0x006B
 key upper (2 8) 0x004B
-key fn_lower (2 8) 0x0036
-key lower (2 9) 0x006C
-key upper (2 9) 0x004C
-key fn_lower (2 9) 0x00E7
-key fn_upper (2 9) 0x00C7
-key lower (3 1) 0x007A
-key upper (3 1) 0x005A
-key fn_lower (3 1) 0x002D
+key lower (2 9) 0x006C,0x013A
+key upper (2 9) 0x004C,0x0139
+deadkeydata lower (2 9) 0xf000,0xf000,0xf000,0x013A,0xf000
+deadkeydata upper (2 9) 0xf000,0xf000,0xf000,0x0139,0xf000
+key lower (2 10) 0x00E7
+key upper (2 10) 0x00C7
+key lower (2 11) 0xf003,0x007E
+key upper (2 11) 0xf003,0x007E
+
+
+key lower (3 1) 0x007A,0x017A
+key upper (3 1) 0x005A,0x0179
+deadkeydata lower (3 1) 0xf000,0xf000,0xf000,0x017A,0xf000
+deadkeydata upper (3 1) 0xf000,0xf000,0xf000,0x0179,0xf000
 key lower (3 2) 0x0078
 key upper (3 2) 0x0058
-key fn_lower (3 2) 0x003D
-key lower (3 3) 0x0063,0x00E7
-key upper (3 3) 0x0043,0x00C7
-key fn_lower (3 3) 0x0037
+key lower (3 3) 0x0063,0x0107
+key upper (3 3) 0x0043,0x0106
+deadkeydata lower (3 3) 0xf000,0xf000,0xf000,0x0107,0xf000
+deadkeydata upper (3 3) 0xf000,0xf000,0xf000,0x0106,0xf000
 key lower (3 4) 0x0076
 key upper (3 4) 0x0056
-key fn_lower (3 4) 0x0037
 key lower (3 5) 0x0062
 key upper (3 5) 0x0042
-key fn_lower (3 5) 0x0038
-key lower (3 6) 0x006E,0x00F1
-key upper (3 6) 0x004E,0x00D1
-key fn_lower (3 6) 0x0038
+key lower (3 6) 0x006E,0x0144
+key upper (3 6) 0x004E,0x0143
+deadkeydata lower (3 6) 0xf000,0xf000,0xf000,0x0144,0xf000
+deadkeydata upper (3 6) 0xf000,0xf000,0xf000,0x0143,0xf000
 key lower (3 7) 0x006D
 key upper (3 7) 0x004D
-key fn_lower (3 7) 0x0039
-key lower (3 8) 0x002C
-key upper (3 8) 0x003B
-key fn_lower (3 8) 0x0039
-key lower (3 9) 0x002E
-key upper (3 9) 0x003A
-key fn_lower (3 9) 0x0027
-key lower (4 3) 0x0040
-key fn_lower (4 3) 0x002A
-key lower (4 4) 0x003F
-key fn_lower (4 4) 0x002A
-key fn_lower (4 5) 0x0030
-key fn_lower (4 6) 0x0030
-key lower (4 7) 0x00B4
-key upper (4 7) 0x0060
-key fn_lower (4 7) 0x0023
-key lower (4 8) 0x007E
-key upper (4 8) 0x005E
-key fn_lower (4 8) 0x0023
+key lower (3 8) 0x002E
+key upper (3 8) 0x002C
+key lower (3 9) 0x003F
+key upper (3 9) 0x0021
+key lower (3 10) 0xf002,0x0060
+key upper (3 10) 0xf002,0x0060
+key lower (3 11) 0xf001,0x005E
+key upper (3 11) 0xf001,0x005E
 
 #end of file