diff -r e6a39382bb9c -r c8fb4cf7b3ae textinput/ptienginev2/keymaps/EMU/ELangCanadianFrench.txt
--- a/textinput/ptienginev2/keymaps/EMU/ELangCanadianFrench.txt	Tue Apr 27 16:59:43 2010 +0300
+++ b/textinput/ptienginev2/keymaps/EMU/ELangCanadianFrench.txt	Tue May 11 16:31:42 2010 +0300
@@ -45,112 +45,100 @@
 #
 [KEYBOARD BLOCK QWERTY STANDARD]
 
-key lower (1 2) 0x0031
-key upper (1 2) 0x0021
-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) 0x003F
-key lower (1 7) 0x0036
-key upper (1 7) 0x002B
-key lower (1 8) 0x0037
-key upper (1 8) 0x002D
-key lower (1 9) 0x0038
-key upper (1 9) 0x002A
-key lower (1 10) 0x0039
-key upper (1 10) 0x0028
-key lower (1 11) 0x0030
-key upper (1 11) 0x0029
+key lower (1 1) 0x0071
+key upper (1 1) 0x0051
+key lower (1 2) 0x0077
+key upper (1 2) 0x0057
 
-key lower (2 1) 0xF001,0x005E 
-key upper (2 1) 0xF002,0x00A8
-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,0x00EB,0x00EA,0x00E8,0x00E9
-key upper (2 4) 0x0045,0x00CB,0x00CA,0x00C8,0x00C9
-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,0x00FB,0x00FA,0x00FC
-key upper (2 8) 0x0055,0x00D9,0x00DB,0x00DA,0x00DC
-key lower (2 9) 0x0069,0x00EF,0x00EE,0x00EC,0x00ED
-key upper (2 9) 0x0049,0x00CF,0x00CE,0x00CC,0x00CD
-key lower (2 10) 0x006F,0x0153,0x00F4,0x00F2,0x00F3,0x00F5,0x00F6,0x00F8
-key upper (2 10) 0x004F,0x0152,0x00D4,0x00D2,0x00D3,0x00D5,0x00D6,0x00D8
-key lower (2 11) 0x0070
-key upper (2 11) 0x0050
-key lower (2 12) 0x00E7
-key upper (2 12) 0x00C7
+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 lower (3 1) 0x003B
-key upper (3 1) 0x003A
-key lower (3 2) 0x0061,0x00E6,0x00E2,0x00E0,0x00E1,0x00E3,0x00E4,0x00E5
-key upper (3 2) 0x0041,0x00C6,0x00C2,0x00C0,0x00C1,0x00C3,0x00C4,0x00C5
-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) 0x00E8
-key upper (3 11) 0x00C8
-key lower (3 12) 0x00E0
-key upper (3 12) 0x00C0
+key upper (1 11) 0xF001,0x005E
+key lower (2 1) 0x0061,0x00E2,0x00E0,0x00E1
+key upper (2 1) 0x0041,0x00C2,0x00C0,0x00C1
+deadkeydata lower (2 1) 0x00E2,0x00E0,0xF000,0x00E1,0xF000
+deadkeydata upper (2 1) 0x00C2,0x00C0,0xF000,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 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) 0xF004,0x00B4
+key upper (2 10) 0xF004,0x00B4
+key lower (2 11) 0xF002,0x0060
+key upper (2 11) 0xF002,0x0060
 
-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 9) 0x002C
-key upper (4 9) 0x0027
-key lower (4 10) 0x002E
-key upper (4 10) 0x0022
-key lower (4 11) 0x00E9
-key upper (4 11) 0x00C9
+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 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) 0x006D
+key upper (3 7) 0x004D
+key lower (3 8) 0x002E
+key upper (3 8) 0x002C
+key lower (3 9) 0x003F
+key upper (3 9) 0x0027
+key lower (3 10) 0x00E7
+key upper (3 10) 0x00C7
+key lower (3 11) 0xF003,0x00A8
+key upper (3 11) 0xF003,0x00A8
 
-#
-# Dead key data
-# 0xf000 means "no dead key character for that index".
-#
-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,0xf000,0xf000,0xf000
-dead_key_data lower (3 2) 0x00E2,0x00E4,0xf000,0xf000,0xf000
-dead_key_data upper (3 2) 0x00C2,0x00C4,0xf000,0xf000,0xf000
 
 #
 # Three row mini qwerty keymap data.