diff -r ac7e4d1d9209 -r ebd48d2de13c textinput/ptienginev2/keymaps/EMU/ELangFrench.txt
--- a/textinput/ptienginev2/keymaps/EMU/ELangFrench.txt	Thu Aug 19 10:15:25 2010 +0300
+++ b/textinput/ptienginev2/keymaps/EMU/ELangFrench.txt	Tue Aug 31 15:31:50 2010 +0300
@@ -44,97 +44,110 @@
 # Standard 4x12 qwerty keymap data.
 #
 [KEYBOARD BLOCK QWERTY STANDARD]
-key lower (1 1) 0x0061,0x00E2,0x00E0,0x00E1
-key upper (1 1) 0x0041,0x00C2,0x00C0,0x00C1
-deadkeydata lower (1 1) 0x00E2,0x00E0,0xF000,0x00E1,0xF000
-deadkeydata upper (1 1) 0x00C2,0x00C0,0xF000,0x00C1,0xF000
-key lower (1 2) 0x007A,0x017a
-key upper (1 2) 0x005A,0x0179
-deadkeydata lower (1 2) 0xf000,0xf000,0xf000,0x017a,0xf000
-deadkeydata upper (1 2) 0xf000,0xf000,0xf000,0x0179,0xf000
-key lower (1 3) 0x0065,0x00ea,0x00e8,0x00eb,0x00e9
-key upper (1 3) 0x0045,0x00ca,0x00c8,0x00cb,0x00c9
-deadkeydata lower (1 3) 0x00ea,0x00e8,0x00eb,0x00e9,0xf000
-deadkeydata upper (1 3) 0x00ca,0x00c8,0x00cb,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,0x00ff,0x00fd
-key upper (1 6) 0x0059,0x0178,0x00dd
-deadkeydata lower (1 6) 0xf000,0xf000,0x00ff,0x00fd,0xf000
-deadkeydata upper (1 6) 0xf000,0xf000,0x0178,0x00dd,0xf000
-key lower (1 7) 0x0075,0x00fb,0x00f9,0x00fc,0x00fa
-key upper (1 7) 0x0055,0x00db,0x00d9,0x00dc,0x00da
-deadkeydata lower (1 7) 0x00fb,0x00f9,0x00fc,0x00fa,0xf000
-deadkeydata upper (1 7) 0x00db,0x00d9,0x00dc,0x00da,0xf000
-key lower (1 8) 0x0069,0x00ee,0x00ec,0x00ef,0x00ed
-key upper (1 8) 0x0049,0x00ce,0x00cc,0x00cf,0x00cd
-deadkeydata lower (1 8) 0x00ee,0x00ec,0x00ef,0x00ed,0xf000
-deadkeydata upper (1 8) 0x00ce,0x00cc,0x00cf,0x00cd,0xf000
-key lower (1 9) 0x006F,0x00f4,0x00f2,0x00F6,0x00f3
-key upper (1 9) 0x004F,0x00d4,0x00d2,0x00D6,0x00d3
-deadkeydata lower (1 9) 0x00f4,0x00f2,0x00F6,0x00f3,0xf000
-deadkeydata upper (1 9) 0x00d4,0x00d2,0x00D6,0x00d3,0xf000
-key lower (1 10) 0x0070
-key upper (1 10) 0x0050
-key lower (1 11) 0xF001,0x005E
-key upper (1 11) 0xF001,0x005E
-key lower (2 1) 0x0071
-key upper (2 1) 0x0051
-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 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,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) 0x006D
-key upper (2 10) 0x004D
-key lower (2 11) 0xF002,0x0060
-key upper (2 11) 0xF002,0x0060
-key lower (3 1) 0x0077
-key upper (3 1) 0x0057
-key lower (3 2) 0x0078
-key upper (3 2) 0x0058
-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 lower (3 5) 0x0062
-key upper (3 5) 0x0042
-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) 0x002E
-key upper (3 7) 0x002C
-key lower (3 8) 0x003F
-key upper (3 8) 0x0027
-key lower (3 9) 0x00E7
-key upper (3 9) 0x00C7
-key lower (3 10) 0xF003,0x00A8
-key upper (3 10) 0xF003,0x00A8
-key lower (3 11) 0xF004,0x00B4
-key upper (3 11) 0xF004,0x00B4
 
+key lower (1 2) 0x26
+key upper (1 2) 0x31
+key lower (1 3) 0xe9
+key upper (1 3) 0x32
+key lower (1 4) 0x22
+key upper (1 4) 0x33
+key lower (1 5) 0x27
+key upper (1 5) 0x34
+key lower (1 6) 0x28
+key upper (1 6) 0x35
+key lower (1 7) 0x2d
+key upper (1 7) 0x36
+key lower (1 8) 0xe8
+key upper (1 8) 0x37
+key lower (1 9) 0x29
+key upper (1 9) 0x38
+key lower (1 10) 0xe7
+key upper (1 10) 0x39
+key lower (1 11) 0xe0
+key upper (1 11) 0x30
+key lower (3 2) 0x71
+key upper (3 2) 0x51
+key lower (4 6) 0x62
+key upper (4 6) 0x42
+key lower (4 4) 0x63,0xe7
+key upper (4 4) 0x43,0xc7
+key lower (3 4) 0x64
+key upper (3 4) 0x44
+key lower (2 4) 0x65,0xeb,0xea,0xe8,0xe9
+key upper (2 4) 0x45,0xcb,0xca,0xc8,0xc9
+key lower (3 5) 0x66
+key upper (3 5) 0x46
+key lower (3 6) 0x67,0x11f
+key upper (3 6) 0x47,0x11e
+key lower (3 7) 0x68
+key upper (3 7) 0x48
+key lower (2 9) 0x69,0xef,0xee,0xec,0xed,0x131
+key upper (2 9) 0x49,0xcf,0xce,0xcc,0xcd,0x130
+key lower (3 8) 0x6a
+key upper (3 8) 0x4a
+key lower (3 9) 0x6b
+key upper (3 9) 0x4b
+key lower (3 10) 0x6c
+key upper (3 10) 0x4c
+key lower (4 8) 0x2c
+key upper (4 8) 0x3f
+key lower (4 7) 0x6e,0xf1
+key upper (4 7) 0x4e,0xd1
+key lower (2 10) 0x6f,0x153,0xf6,0xf4,0xf2,0xf3,0xf8
+key upper (2 10) 0x4f,0x152,0xd6,0xd4,0xd2,0xd3,0xd8
+key lower (2 11) 0x70
+key upper (2 11) 0x50
+key lower (2 2) 0x61,0xe6,0xe2,0xe0,0xe1,0xe3,0xe4
+key upper (2 2) 0x41,0xc6,0xc2,0xc0,0xc1,0xc3,0xc4
+key lower (2 5) 0x72
+key upper (2 5) 0x52
+key lower (3 3) 0x73,0xdf
+key upper (3 3) 0x53
+key lower (2 6) 0x74
+key upper (2 6) 0x54
+key lower (2 8) 0x75,0xf9,0xfb,0xfa,0xfc
+key upper (2 8) 0x55,0xd9,0xdb,0xda,0xdc
+key lower (4 5) 0x76
+key upper (4 5) 0x56
+key lower (2 3) 0x7a
+key upper (2 3) 0x5a
+key lower (4 3) 0x78
+key upper (4 3) 0x58
+key lower (2 7) 0x79
+key upper (2 7) 0x59
+key lower (4 2) 0x77
+key upper (4 2) 0x57
+key lower (2 1) 0x40
+key upper (2 1) 0x20ac
+key lower (2 12) 0xf001,0x5e
+key upper (2 12) 0xf002,0xa8
+key lower (4 9) 0x3b
+key upper (4 9) 0x2e
+key lower (3 11) 0x6d
+key upper (3 11) 0x4d
+key lower (4 10) 0x3a
+key upper (4 10) 0x2f
+key lower (3 1) 0x2b
+key upper (3 1) 0x23
+key lower (4 11) 0x21
+key upper (4 11) 0x25
+key lower (3 12) 0xf9
+key upper (3 12) 0x2a
+
+#
+# Dead key data
+# 0xf000 means "no dead key character for that index".
+#
+dead_key_data lower (2 2) 0x00e2,0x00e4,0xf000,0xf000,0xf000
+dead_key_data upper (2 2) 0x00c2,0x00c4,0xf000,0xf000,0xf000
+dead_key_data lower (2 4) 0x00ea,0x00eb,0xf000,0xf000,0xf000
+dead_key_data upper (2 4) 0x00ca,0x00cb,0xf000,0xf000,0xf000
+dead_key_data lower (2 8) 0x00fb,0x00fc,0xf000,0xf000,0xf000
+dead_key_data upper (2 8) 0x00db,0x00dc,0xf000,0xf000,0xf000
+dead_key_data lower (2 9) 0x00ee,0x00ef,0xf000,0xf000,0xf000
+dead_key_data upper (2 9) 0x00ce,0x00cf,0xf000,0xf000,0xf000
+dead_key_data lower (2 10) 0x00f4,0x00f6,0xf000,0xf000,0xf000
+dead_key_data upper (2 10) 0x00d4,0x00d6,0x0000,0x0000,0x0000
 
 #
 # 4x10 mini qwerty keymap data. These are from Surfer keyboard spec.