Index: types/pc
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/types/pc,v
retrieving revision 1.3
diff -u -r1.3 pc
--- types/pc	21 Mar 2006 23:41:29 -0000	1.3
+++ types/pc	26 Aug 2007 01:21:01 -0000
@@ -8,8 +8,12 @@
     // a PC compatible keyboard.
     virtual_modifiers Alt;
     virtual_modifiers LevelThree;
+    virtual_modifiers LAlt;
+    virtual_modifiers RAlt;
+    virtual_modifiers RControl;
+    virtual_modifiers LControl;
 
-    type "PC_BREAK" {
+    type "PC_CONTROL_LEVEL2" {
 	modifiers = Control;
 	map[None] = Level1;
 	map[Control] = Level2;
@@ -17,12 +21,20 @@
 	level_name[Level2] = "Control";
     };
 
-    type "PC_ALT_LEVEL2" {
-	modifiers = Alt;
+    type "PC_LCONTROL_LEVEL2" {
+	modifiers = LControl;
 	map[None] = Level1;
-	map[Alt] = Level2;
+	map[LControl] = Level2;
 	level_name[Level1] = "Base";
-	level_name[Level2] = "Alt";
+	level_name[Level2] = "LControl";
+    };
+
+    type "PC_RCONTROL_LEVEL2" {
+	modifiers = RControl;
+	map[None] = Level1;
+	map[RControl] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "RControl";
     };
 
     type "PC_SYSRQ" {
@@ -35,6 +47,30 @@
 	level_name[Level3] = "Level3";
     };
 
+    type "PC_ALT_LEVEL2" {
+	modifiers = Alt;
+	map[None] = Level1;
+	map[Alt] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Alt";
+    };
+
+    type "PC_LALT_LEVEL2" {
+	modifiers = LAlt;
+	map[None] = Level1;
+	map[LAlt] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "LAlt";
+    };
+
+    type "PC_RALT_LEVEL2" {
+	modifiers = RAlt;
+	map[None] = Level1;
+	map[RAlt] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "RAlt";
+    };
+
     type "CTRL+ALT" {
 	modifiers = Control+Alt;
 	map[Control+Alt] = Level2;
Index: symbols/group
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/group,v
retrieving revision 1.10
diff -u -r1.10 group
--- symbols/group	16 Oct 2006 19:27:05 -0000	1.10
+++ symbols/group	26 Aug 2007 01:21:01 -0000
@@ -102,11 +102,11 @@
 partial modifier_keys 
 xkb_symbols "ctrl_shift_toggle" {
     key <LFSH> {
-	type[Group1]="PC_BREAK",
+	type[Group1]="PC_CONTROL_LEVEL2",
 	symbols[Group1]= [ Shift_L,	ISO_Prev_Group ]
     };
     key <RTSH> {
-	type[Group1]="PC_BREAK",
+	type[Group1]="PC_CONTROL_LEVEL2",
 	symbols[Group1]= [ Shift_R,	ISO_Next_Group ]
     };
     key <LCTL>	{	[	Control_L,	ISO_Prev_Group ]	};
@@ -120,7 +120,7 @@
 partial modifier_keys 
 xkb_symbols "lctrl_lshift_toggle" {
     key <LFSH> {
-	type[Group1]="PC_BREAK",
+	type[Group1]="PC_CONTROL_LEVEL2",
 	symbols[Group1]= [ Shift_L,	ISO_Next_Group ]
     };
     key <LCTL>	{	[	Control_L,	ISO_Next_Group ]	};
@@ -150,21 +150,21 @@
 xkb_symbols "ctrl_alt_toggle" {
     virtual_modifiers Alt;
     key <LALT> {
-	type[Group1]="PC_BREAK",
+	type[Group1]="PC_CONTROL_LEVEL2",
 	symbols[Group1]= [ NoSymbol,	ISO_Prev_Group ],
 	virtualMods= Alt
     };
     key <RALT> {
-	type[Group1]="PC_BREAK",
+	type[Group1]="PC_CONTROL_LEVEL2",
 	symbols[Group1]= [ NoSymbol,	ISO_Next_Group ],
 	virtualMods= Alt
     };
     key <LCTL> {
-	type[Group1]="PC_SYSRQ",
+	type[Group1]="PC_ALT_LEVEL2",
 	symbols[Group1]= [ Control_L,	ISO_Prev_Group ]
     };
     key <RCTL> {
-	type[Group1]="PC_SYSRQ",
+	type[Group1]="PC_ALT_LEVEL2",
 	symbols[Group1]= [ Control_R,	ISO_Next_Group ]
     };
 };
@@ -186,11 +186,11 @@
 	virtualMods= Alt
     };
     key <LFSH> {
-	type[Group1]="PC_SYSRQ",
+	type[Group1]="PC_ALT_LEVEL2",
 	symbols[Group1]= [ Shift_L,	ISO_Prev_Group ]
     };
     key <RTSH> {
-	type[Group1]="PC_SYSRQ",
+	type[Group1]="PC_ALT_LEVEL2",
 	symbols[Group1]= [ Shift_R,	ISO_Next_Group ]
     };
 };
@@ -230,30 +230,32 @@
 // Both Ctrls pressed together toggle group
 partial modifier_keys
 xkb_symbols "ctrls_toggle" {
-  virtual_modifiers AltGr;
+  virtual_modifiers LControl, RControl;
     key <LCTL> {
-	type[Group1]="PC_BREAK",
-	symbols[Group1]= [ NoSymbol,	ISO_Prev_Group ]
+	type[Group1]="PC_RCONTROL_LEVEL2",
+	symbols[Group1]= [ NoSymbol,	ISO_Prev_Group ],
+	virtualMods= LControl
     };
     key <RCTL> {
-	type[Group1]="PC_BREAK",
-	symbols[Group1]= [ NoSymbol,	ISO_Next_Group ]
+	type[Group1]="PC_LCONTROL_LEVEL2",
+	symbols[Group1]= [ NoSymbol,	ISO_Next_Group ],
+	virtualMods= RControl
     };
 };
 
 // Both Alts pressed together toggle group
 partial modifier_keys
 xkb_symbols "alts_toggle" {
-  virtual_modifiers Alt;
+  virtual_modifiers LAlt, RAlt;
     key <LALT> {
-	type[Group1]="PC_SYSRQ",
+	type[Group1]="PC_RALT_LEVEL2",
 	symbols[Group1]= [ NoSymbol,	ISO_Prev_Group ],
-	virtualMods= Alt
+	virtualMods= LAlt
     };
     key <RALT> {
-	type[Group1]="PC_SYSRQ",
+	type[Group1]="PC_LALT_LEVEL2",
 	symbols[Group1]= [ NoSymbol,	ISO_Next_Group ],
-	virtualMods= Alt
+	virtualMods= RAlt
     };
 };
 
@@ -313,7 +315,7 @@
 partial modifier_keys
 xkb_symbols "alt_caps_toggle" {
     key        <CAPS> {
-       type="PC_SYSRQ",
+       type="PC_ALT_LEVEL2",
        symbols[Group1]= [  Caps_Lock,  ISO_Next_Group]
     };
 };
Index: symbols/jp
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/jp,v
retrieving revision 1.15
diff -u -r1.15 jp
--- symbols/jp	28 May 2007 20:26:53 -0000	1.15
+++ symbols/jp	26 Aug 2007 01:21:01 -0000
@@ -19,7 +19,7 @@
 
     // Alphanumeric section
     key <HZTG> {
-	type[Group1]="PC_SYSRQ",
+	type[Group1]="PC_ALT_LEVEL2",
 	symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
     };
 
@@ -80,27 +80,27 @@
     key <NFER> { [ Muhenkan		] };
 
     key <XFER> {
-	type[Group1]="PC_SYSRQ",
+	type[Group1]="PC_ALT_LEVEL2",
 	symbols[Group1]= [ Henkan, Mode_switch ]
     };
     key <HKTG> {
-	type[Group1]="PC_SYSRQ",
+	type[Group1]="PC_ALT_LEVEL2",
 	symbols[Group1]= [ Hiragana_Katakana, Romaji ]
     };
 
     key <EISU> {
-       type[Group1]="PC_SYSRQ",
+       type[Group1]="PC_ALT_LEVEL2",
        symbols[Group1]= [ Eisu_toggle ]
     };
 
     key <KANA> {
-       type[Group1]="PC_SYSRQ",
+       type[Group1]="PC_ALT_LEVEL2",
        symbols[Group1]= [ Hiragana_Katakana ]
     };
 
 
     key <PRSC> {
-        type[Group1]= "PC_SYSRQ",
+        type[Group1]= "PC_ALT_LEVEL2",
         symbols[Group1]= [ Print, Execute ]
     };
 };
@@ -122,7 +122,7 @@
 
     // Alphanumeric section
     key <HZTG> {
-	type[Group1]="PC_SYSRQ",
+	type[Group1]="PC_ALT_LEVEL2",
 	symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
     };
     key <AE01> { [ kana_NU		]	};
@@ -182,18 +182,18 @@
     key <NFER> { [ Muhenkan		]	};
 
     key <XFER> {
-	type[Group1]="PC_SYSRQ",
+	type[Group1]="PC_ALT_LEVEL2",
 	symbols[Group1]= [ Henkan, Mode_switch ]
     };
     key <HKTG> {
-	type[Group1]="PC_SYSRQ",
+	type[Group1]="PC_ALT_LEVEL2",
 	symbols[Group1]= [ Hiragana_Katakana, Romaji ]
     };
 
     // End alphanumeric section
 
     key <PRSC> {
-        type[Group1]= "PC_SYSRQ",
+        type[Group1]= "PC_ALT_LEVEL2",
         symbols[Group1]= [ Print, Execute ]
     };
 };
Index: symbols/la
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/la,v
retrieving revision 1.5
diff -u -r1.5 la
--- symbols/la	4 Sep 2006 20:25:10 -0000	1.5
+++ symbols/la	26 Aug 2007 01:21:01 -0000
@@ -67,11 +67,11 @@
     key <AB10> { [ 0x1000e9d,       parenright	]};
 
 override key <LFSH> {
-	type[Group1]="PC_SYSRQ",
+	type[Group1]="PC_ALT_LEVEL2",
 	[ 	 Shift_L,		ISO_First_Group		]
     };
 override key <RTSH> {
-	type[Group1]="PC_SYSRQ",
+	type[Group1]="PC_ALT_LEVEL2",
 	[ 	Shift_R,		ISO_Last_Group 		]
     };
 };
Index: symbols/level3
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/level3,v
retrieving revision 1.16
diff -u -r1.16 level3
--- symbols/level3	19 Dec 2006 00:18:37 -0000	1.16
+++ symbols/level3	26 Aug 2007 01:21:02 -0000
@@ -48,9 +48,11 @@
 //
 partial hidden modifier_keys
 xkb_symbols "ralt_switch_for_alts_toggle" {
+ virtual_modifiers LAlt, AlGr;
   key <LALT> {
-    type[Group1]="PC_SYSRQ",
-    symbols[Group1] = [ Alt_L,  ISO_Prev_Group,  ISO_Prev_Group ]
+    type[Group1]="PC_RALT_LEVEL2",
+    symbols[Group1] = [ Alt_L,  ISO_Prev_Group,  ISO_Prev_Group ],
+    virtualMods= LAlt
   };
   key <RALT> {
     type[Group1]="PC_ALT_LEVEL2",
Index: symbols/pc
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/pc,v
retrieving revision 1.7
diff -u -r1.7 pc
--- symbols/pc	2 Jan 2007 20:56:55 -0000	1.7
+++ symbols/pc	26 Aug 2007 01:21:02 -0000
@@ -122,12 +122,12 @@
 partial hidden alphanumeric_keys
 xkb_symbols "editing" {
     key <PRSC> {
-	type= "PC_SYSRQ",
+	type= "PC_ALT_LEVEL2",
 	symbols[Group1]= [ Print, Sys_Req ]
     };
     key <SCLK> {  [  Scroll_Lock	]	};
     key <PAUS> {
-	type= "PC_BREAK",
+	type= "PC_CONTROL_LEVEL2",
 	symbols[Group1]= [ Pause, Break ]
     };
     key  <INS> {	[  Insert		]	};
Index: symbols/digital_vndr/pc
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/digital_vndr/pc,v
retrieving revision 1.2
diff -u -r1.2 pc
--- symbols/digital_vndr/pc	6 May 2004 00:05:32 -0000	1.2
+++ symbols/digital_vndr/pc	26 Aug 2007 01:21:02 -0000
@@ -111,12 +111,12 @@
     key <FK11> {       [	     F11 ] };
     key <FK12> {       [	     F12 ] };
     key <PRSC> {
-	type= "PC_SYSRQ",
+	type= "PC_ALT_LEVEL2",
 	symbols[Group1]= [	     Print,	    Sys_Req ]
     };
     key <SCLK> {       [     Scroll_Lock ] };
     key <PAUS> {
-	type= "PC_BREAK",
+	type= "PC_CONTROL_LEVEL2",
 	symbols[Group1]= [	     Pause,	      Break ]
     };