xkbdesc/symbols Makefile.am, 1.20, 1.21 capslock, NONE, 1.1 group, 1.2, 1.3 lock, 1.1, NONE

[Sergey V. Oudaltsov]

Committed by: svu

Update of /cvs/xlibs/xkbdesc/symbols
In directory gabe:/tmp/cvs-serv14530/symbols

Modified Files:
	Makefile.am group 
Added Files:
	capslock 
Removed Files:
	lock 
Log Message:
reorganizing indicators, thanks to Frank Murphy

Index: Makefile.am
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile.am	27 Aug 2004 01:23:57 -0000	1.20
+++ Makefile.am	4 Sep 2004 21:39:35 -0000	1.21
@@ -26,7 +26,7 @@
 tel th tj \
 tr ua us \
 uz vn \
-altwin compose ctrl group inet keypad level3 lock srvr_ctrl \
+altwin capslock compose ctrl group inet keypad level3 srvr_ctrl \
 eurosign
                                                                                           
 EXTRA_DIST= $(symbols_DATA)

--- NEW FILE: capslock ---
// $Xorg: $

default partial hidden modifier_keys
xkb_symbols "capslock" {
    key <CAPS> {	[	Caps_Lock		]	};
    modifier_map Lock { Caps_Lock };
};

partial hidden modifier_keys
xkb_symbols "shiftlock" {
    key <CAPS> {	[	Shift_Lock		]	};
    modifier_map Shift { Shift_Lock };
};

partial hidden modifier_keys
xkb_symbols "grouplock" {
    key <CAPS> {	[	ISO_Next_Group,	Caps_Lock	]	};
};


Index: group
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/group,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- group	24 Apr 2004 11:35:45 -0000	1.2
+++ group	4 Sep 2004 21:39:35 -0000	1.3
@@ -115,7 +115,7 @@
 //     Shift+Caps Lock toggles caps lock
 partial modifier_keys
 xkb_symbols "caps_toggle" {
-    key	<CAPS> {	[  ISO_Next_Group,	 Caps_Lock	]	};
+    include "capslock(grouplock)"
 };
 
 // using the group(shift_caps_toggle) map, pressing:

--- lock DELETED ---