Better Canadian

3 files changed, 13 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index c5c52120..84252a3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-10  Sergey Udaltsov
+
+	symbols/level5, compat5/level5: better working Canadian
+	layout, but not complete yet
+
 2006-06-01  Sergey Udaltsov
 
 	symbols/am: fixed comma in Armenian, closing
diff --git a/compat/level5 b/compat/level5
index e485d894..e41cd631 100644
--- a/compat/level5
+++ b/compat/level5
@@ -15,33 +15,33 @@ default partial xkb_compatibility "default"  {
     latchMods.latchToLock= True;
 
     //ISO_Level5_Shift
-    interpret F35+Any {
+    interpret F21+Any {
 	useModMapMods= level1;
 	virtualModifier= LevelFive;
 	action= SetMods(modifiers=LevelFive);
     };
 
-    interpret F35 {
+    interpret F21 {
 	action= SetMods(modifiers=LevelFive);
     };
 
     //ISO_Level5_Latch
-    interpret F34+Any {
+    interpret F22+Any {
 	virtualModifier= LevelFive;
 	action= LatchMods(modifiers=LevelFive);
     };
 
-    interpret F34 {
+    interpret F22 {
 	action= LatchMods(modifiers=LevelFive);
     };
 
     //ISO_Level5_Lock
-    interpret F33+Any {
+    interpret F23+Any {
 	virtualModifier= LevelFive;
 	action= LockMods(modifiers=LevelFive);
     };
 
-    interpret F33 {
+    interpret F23 {
 	action= LockMods(modifiers=LevelFive);
     };
 };
diff --git a/symbols/level5 b/symbols/level5
index 3ed1a531..391529fc 100644
--- a/symbols/level5
+++ b/symbols/level5
@@ -12,7 +12,7 @@ partial modifier_keys
 xkb_symbols "rctrl_switch" {
   key <RCTL> {
     type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ F35 ]
+    symbols[Group1] = [ F21 ]
     };
-  modifier_map Mod5   { F35 };
+  modifier_map Mod3   { F21 };
 };