xkbdesc/rules base.o_c.part, 1.3, 1.4 base.o_s.part, 1.5, 1.6 base.xml.in, 1.29, 1.30

[Sergey V. Oudaltsov]

Committed by: svu

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

Modified Files:
	base.o_c.part base.o_s.part base.xml.in 
Log Message:
reorganizing indicators, thanks to Frank Murphy

Index: base.o_c.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.o_c.part,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- base.o_c.part	20 Jul 2004 01:29:47 -0000	1.3
+++ base.o_c.part	4 Sep 2004 21:39:34 -0000	1.4
@@ -1,3 +1,5 @@
-  grp_led:num		=	+leds(num)
-  grp_led:caps		=	+leds(caps)
-  grp_led:scroll	=	+leds(scroll)
+  grp_led:num		=	+capsled(num_lock)
+  grp_led:caps		=	+capsled(caps_lock)
+  grp_led:scroll	=	+capsled(scroll_lock)
+  grp:caps_toggle	=	+capsled(group_lock)
+

Index: base.o_s.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.o_s.part,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- base.o_s.part	28 Aug 2004 01:04:33 -0000	1.5
+++ base.o_s.part	4 Sep 2004 21:39:34 -0000	1.6
@@ -28,6 +28,9 @@
   lv3:win_switch	=	+level3(win_switch)
   lv3:lwin_switch	=	+level3(lwin_switch)
   lv3:rwin_switch	=	+level3(rwin_switch)
+  caps:capslock		=	+capslock(capslock)
+  caps:shiftlock	=	+capslock(shiftlock)
+  caps:grouplock	=	+capslock(grouplock)
   ctrl:nocaps		=	+ctrl(nocaps)
   ctrl:swapcaps		=	+ctrl(swapcaps)
   ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
@@ -48,3 +51,4 @@
   eurosign:e		=	+eurosign(e)
   eurosign:5		=	+eurosign(5)
   eurosign:2		=	+eurosign(2)
+  caps:shift_lock	=	+lock(shift)

Index: base.xml.in
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.xml.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- base.xml.in	28 Aug 2004 01:04:33 -0000	1.29
+++ base.xml.in	4 Sep 2004 21:39:34 -0000	1.30
@@ -2146,7 +2146,7 @@
       <option>
         <configItem>
           <name>grp:caps_toggle</name>
-          <_description>Caps Lock key changes group</_description>
+          <_description>CapsLock key changes group</_description>
         </configItem>
       </option>
       <option>
@@ -2233,6 +2233,12 @@
           <_description>Right Ctrl key changes group</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>grp:caps</name>
+          <_description>CapsLock key changes group</_description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="true">
       <configItem>
@@ -2302,7 +2308,7 @@
       <option>
         <configItem>
           <name>ctrl:swapcaps</name>
-          <_description>Swap Control and Caps Lock</_description>
+          <_description>Swap Control and CapsLock</_description>
         </configItem>
       </option>
       <option>
@@ -2356,25 +2362,50 @@
       <option>
         <configItem>
           <name>caps:internal</name>
-          <_description>Uses internal capitalization. Shift cancels Caps.</_description>
+          <_description>Uses internal capitalization. Shift cancels CapsLock.</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:internal_nocancel</name>
-          <_description>Uses internal capitalization. Shift doesn't cancel Caps.</_description>
+          <_description>Uses internal capitalization. Shift doesn't cancel CapsLock.</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:shift</name>
-          <_description>Acts as Shift with locking. Shift cancels Caps.</_description>
+          <_description>Acts as Shift with locking. Shift cancels CapsLock.</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:shift_nocancel</name>
-          <_description>Acts as Shift with locking. Shift doesn't cancel Caps.</_description>
+          <_description>Acts as Shift with locking. Shift doesn't cancel CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:shift_lock</name>
+          <_description>CapsLock just locks the Shift modifier.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:capslock</name>
+          <_description>Toggles normal capitalization of alphabetic characters.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:shiftlock</name>
+          <_description>Toggles Shift so all keys are affected.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <!-- use the grp name so the LED rule is used too-->
+          <name>grp:caps_toggle</name>
+          <_description>Toggles the group key between two keyboard groups.</_description>
         </configItem>
       </option>
     </group>