From f2745667a891760908943aa3ad092079356d456c Mon Sep 17 00:00:00 2001
From: "Sergey V. Udaltsov" <svu@gnome.org>
Date: Thu, 6 Nov 2008 22:53:53 +0000
Subject: [PATCH] Added capslock(escape)

---
 ChangeLog           |   5 ++
 rules/base.o_s.part |   1 +
 rules/base.xml.in   | 176 +++++++++++++++++++++++---------------------
 symbols/capslock    |   6 ++
 4 files changed, 103 insertions(+), 85 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6504ac7..828b33e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 	http://bugs.freedesktop.org/show_bug.cgi?id=17110
 	* rules/base.xml.in, symbols/de: added de(qwerty)
 
+2008-11-06  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added
+	capslock(escape)
+
 2008-10-14  Sergey Udaltsov
 
 	* rules/base.o_s.part, rules/base.xml.in, symbols/keypad: removed
diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index d7d2050..4379512 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -48,6 +48,7 @@
   caps:capslock		=	+capslock(capslock)
   caps:shiftlock	=	+capslock(shiftlock)
   caps:swapescape	=	+capslock(swapescape)
+  caps:escape		=	+capslock(escape)
   ctrl:nocaps		=	+ctrl(nocaps)
   ctrl:swapcaps		=	+ctrl(swapcaps)
   ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index c66a8ed..e979ac9 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4022,163 +4022,163 @@
       <option>
         <configItem>
           <name>grp:switch</name>
-          <_description>R-Alt switches layout while pressed.</_description>
+          <_description>R-Alt switches layout while pressed</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:lswitch</name>
-          <_description>Left Alt key switches layout while pressed.</_description>
+          <_description>Left Alt key switches layout while pressed</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:lwin_switch</name>
-          <_description>Left Win-key switches layout while pressed.</_description>
+          <_description>Left Win-key switches layout while pressed</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:rwin_switch</name>
-          <_description>Right Win-key switches layout while pressed.</_description>
+          <_description>Right Win-key switches layout while pressed</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:win_switch</name>
-          <_description>Both Win-keys switch layout while pressed.</_description>
+          <_description>Both Win-keys switch layout while pressed</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:caps_switch</name>
-          <_description>CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.</_description>
+          <_description>CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:rctrl_switch</name>
-          <_description>Right Ctrl key switches layout while pressed.</_description>
+          <_description>Right Ctrl key switches layout while pressed</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:toggle</name>
-          <_description>Right Alt key changes layout.</_description>
+          <_description>Right Alt key changes layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:lalt_toggle</name>
-          <_description>Left Alt key changes layout.</_description>
+          <_description>Left Alt key changes layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:caps_toggle</name>
-          <_description>CapsLock key changes layout.</_description>
+          <_description>CapsLock key changes layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:shift_caps_toggle</name>
-          <_description>Shift+CapsLock changes layout.</_description>
+          <_description>Shift+CapsLock changes layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:shift_caps_switch</name>
-          <_description>CapsLock switch to first layout, Shift+CapsLock switch to last layout.</_description>
+          <_description>CapsLock switch to first layout, Shift+CapsLock switch to last layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:alt_caps_toggle</name>
-          <_description>Alt+CapsLock changes layout.</_description>
+          <_description>Alt+CapsLock changes layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:shifts_toggle</name>
-          <_description>Both Shift keys together change layout.</_description>
+          <_description>Both Shift keys together change layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:alts_toggle</name>
-          <_description>Both Alt keys together change layout.</_description>
+          <_description>Both Alt keys together change layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:ctrls_toggle</name>
-          <_description>Both Ctrl keys together change layout.</_description>
+          <_description>Both Ctrl keys together change layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:ctrl_shift_toggle</name>
-          <_description>Ctrl+Shift change layout.</_description>
+          <_description>Ctrl+Shift change layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:lctrl_lshift_toggle</name>
-          <_description>LCtrl+LShift change layout.</_description>
+          <_description>LCtrl+LShift change layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:ctrl_alt_toggle</name>
-          <_description>Alt+Ctrl change layout.</_description>
+          <_description>Alt+Ctrl change layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:alt_shift_toggle</name>
-          <_description>Alt+Shift change layout.</_description>
+          <_description>Alt+Shift change layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:menu_toggle</name>
-          <_description>Menu key changes layout.</_description>
+          <_description>Menu key changes layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:lwin_toggle</name>
-          <_description>Left Win-key changes layout.</_description>
+          <_description>Left Win-key changes layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:rwin_toggle</name>
-          <_description>Right Win-key changes layout.</_description>
+          <_description>Right Win-key changes layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:lshift_toggle</name>
-          <_description>Left Shift key changes layout.</_description>
+          <_description>Left Shift key changes layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:rshift_toggle</name>
-          <_description>Right Shift key changes layout.</_description>
+          <_description>Right Shift key changes layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:lctrl_toggle</name>
-          <_description>Left Ctrl key changes layout.</_description>
+          <_description>Left Ctrl key changes layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:rctrl_toggle</name>
-          <_description>Right Ctrl key changes layout.</_description>
+          <_description>Right Ctrl key changes layout</_description>
         </configItem>
       </option>
     </group>
@@ -4192,61 +4192,61 @@
       <option>
         <configItem>
           <name>lv3:switch</name>
-          <_description>Press Right Ctrl to choose 3rd level.</_description>
+          <_description>Press Right Ctrl to choose 3rd level</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>lv3:menu_switch</name>
-          <_description>Press Menu key to choose 3rd level.</_description>
+          <_description>Press Menu key to choose 3rd level</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>lv3:win_switch</name>
-          <_description>Press any of Win-keys to choose 3rd level.</_description>
+          <_description>Press any of Win-keys to choose 3rd level</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>lv3:lwin_switch</name>
-          <_description>Press Left Win-key to choose 3rd level.</_description>
+          <_description>Press Left Win-key to choose 3rd level</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>lv3:rwin_switch</name>
-          <_description>Press Right Win-key to choose 3rd level.</_description>
+          <_description>Press Right Win-key to choose 3rd level</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>lv3:alt_switch</name>
-          <_description>Press any of Alt keys to choose 3rd level.</_description>
+          <_description>Press any of Alt keys to choose 3rd level</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>lv3:lalt_switch</name>
-          <_description>Press Left Alt key to choose 3rd level.</_description>
+          <_description>Press Left Alt key to choose 3rd level</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>lv3:ralt_switch</name>
-          <_description>Press Right Alt key to choose 3rd level.</_description>
+          <_description>Press Right Alt key to choose 3rd level</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>lv3:ralt_switch_multikey</name>
-          <_description>Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key.</_description>
+          <_description>Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>lv3:ralt_alt</name>
-          <_description>Right Alt key never chooses 3rd level.</_description>
+          <_description>Right Alt key never chooses 3rd level</_description>
         </configItem>
       </option>
     </group>
@@ -4259,13 +4259,13 @@
       <option>
         <configItem>
           <name>ctrl:nocaps</name>
-          <_description>Make CapsLock an additional Ctrl.</_description>
+          <_description>Make CapsLock an additional Ctrl</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>ctrl:swapcaps</name>
-          <_description>Swap Ctrl and CapsLock.</_description>
+          <_description>Swap Ctrl and CapsLock</_description>
         </configItem>
       </option>
       <option>
@@ -4283,7 +4283,7 @@
       <option>
         <configItem>
           <name>ctrl:ctrl_ra</name>
-          <_description>Right Ctrl key works as Right Alt.</_description>
+          <_description>Right Ctrl key works as Right Alt</_description>
         </configItem>
       </option>
     </group>
@@ -4291,24 +4291,24 @@
       <!-- Using startard LEDs to indicate the alternative (not first) group(s) -->
       <configItem>
         <name>grp_led</name>
-        <_description>Use keyboard LED to show alternative layout.</_description>
+        <_description>Use keyboard LED to show alternative layout</_description>
       </configItem>
       <option>
         <configItem>
           <name>grp_led:num</name>
-          <_description>NumLock LED shows alternative layout.</_description>
+          <_description>NumLock LED shows alternative layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp_led:caps</name>
-          <_description>CapsLock LED shows alternative layout.</_description>
+          <_description>CapsLock LED shows alternative layout</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp_led:scroll</name>
-          <_description>ScrollLock LED shows alternative layout.</_description>
+          <_description>ScrollLock LED shows alternative layout</_description>
         </configItem>
       </option>
     </group>
@@ -4333,7 +4333,7 @@
       <option>
         <configItem>
           <name>keypad:future</name>
-          <_description>Keypad with unicode additions (arrows and math operators). Math operators on default level.</_description>
+          <_description>Keypad with unicode additions (arrows and math operators). Math operators on default level</_description>
        </configItem>
       </option>
       <option>
@@ -4351,7 +4351,7 @@
       <option>
         <configItem>
           <name>keypad:future_wang</name>
-          <_description>Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level.</_description>
+          <_description>Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level</_description>
        </configItem>
       </option>
       <option>
@@ -4438,43 +4438,49 @@
       <option>
         <configItem>
           <name>caps:internal</name>
-          <_description>CapsLock uses internal capitalization. Shift "pauses" CapsLock.</_description>
+          <_description>CapsLock uses internal capitalization. Shift "pauses" CapsLock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:internal_nocancel</name>
-          <_description>CapsLock uses internal capitalization. Shift doesn't affect CapsLock.</_description>
+          <_description>CapsLock uses internal capitalization. Shift doesn't affect CapsLock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:shift</name>
-          <_description>CapsLock acts as Shift with locking. Shift "pauses" CapsLock.</_description>
+          <_description>CapsLock acts as Shift with locking. Shift "pauses" CapsLock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:shift_nocancel</name>
-          <_description>CapsLock acts as Shift with locking. Shift doesn't affect CapsLock.</_description>
+          <_description>CapsLock acts as Shift with locking. Shift doesn't affect CapsLock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:capslock</name>
-          <_description>CapsLock toggles normal capitalization of alphabetic characters.</_description>
+          <_description>CapsLock toggles normal capitalization of alphabetic characters</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:swapescape</name>
-          <_description>Swap ESC and CapsLock.</_description>
+          <_description>Swap ESC and CapsLock</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:escape</name>
+          <_description>Make CapsLock an additional ESC</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:shiftlock</name>
-          <_description>CapsLock toggles Shift so all keys are affected.</_description>
+          <_description>CapsLock toggles Shift so all keys are affected</_description>
         </configItem>
       </option>
     </group>
@@ -4487,61 +4493,61 @@
       <option>
         <configItem>
           <name>altwin:menu</name>
-          <_description>Add the standard behavior to Menu key.</_description>
+          <_description>Add the standard behavior to Menu key</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>altwin:meta_alt</name>
-          <_description>Alt and Meta are on the Alt keys.</_description>
+          <_description>Alt and Meta are on the Alt keys</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>altwin:ctrl_win</name>
-          <_description>Control is mapped to the Win-keys (and the usual Ctrl keys).</_description>
+          <_description>Control is mapped to the Win-keys (and the usual Ctrl keys)</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>altwin:ctrl_alt_win</name>
-          <_description>Control is mapped to the Alt-keys, Alt is mapped to the Win-keys.</_description>
+          <_description>Control is mapped to the Alt-keys, Alt is mapped to the Win-keys</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>altwin:meta_win</name>
-          <_description>Meta is mapped to the Win-keys.</_description>
+          <_description>Meta is mapped to the Win-keys</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>altwin:left_meta_win</name>
-          <_description>Meta is mapped to the left Win-key.</_description>
+          <_description>Meta is mapped to the left Win-key</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>altwin:super_win</name>
-          <_description>Super is mapped to the Win-keys.</_description>
+          <_description>Super is mapped to the Win-keys</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>altwin:hyper_win</name>
-          <_description>Hyper is mapped to the Win-keys.</_description>
+          <_description>Hyper is mapped to the Win-keys</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>altwin:alt_super_win</name>
-          <_description>Alt is mapped to the right Win-key and Super to Menu.</_description>
+          <_description>Alt is mapped to the right Win-key and Super to Menu</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>altwin:swap_lalt_lwin</name>
-          <_description>Left Alt is swapped with left Win-key.</_description>
+          <_description>Left Alt is swapped with left Win-key</_description>
         </configItem>
       </option>
     </group>
@@ -4554,43 +4560,43 @@
       <option>
         <configItem>
           <name>compose:ralt</name>
-          <_description>Right Alt is Compose.</_description>
+          <_description>Right Alt is Compose</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>compose:lwin</name>
-          <_description>Left Win-key is Compose.</_description>
+          <_description>Left Win-key is Compose</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>compose:rwin</name>
-          <_description>Right Win-key is Compose.</_description>
+          <_description>Right Win-key is Compose</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>compose:menu</name>
-          <_description>Menu is Compose.</_description>
+          <_description>Menu is Compose</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>compose:rctrl</name>
-          <_description>Right Ctrl is Compose.</_description>
+          <_description>Right Ctrl is Compose</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>compose:caps</name>
-          <_description>Caps Lock is Compose.</_description>
+          <_description>Caps Lock is Compose</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>compose:102</name>
-          <_description>Less-than/Greater-than is Compose.</_description>
+          <_description>Less-than/Greater-than is Compose</_description>
         </configItem>
       </option>
     </group>
@@ -4602,19 +4608,19 @@
       <option>
         <configItem>
           <name>numpad:pc</name>
-          <_description>Default numeric keypad keys.</_description>
+          <_description>Default numeric keypad keys</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>numpad:mac</name>
-          <_description>Numeric keypad keys work as with Mac.</_description>
+          <_description>Numeric keypad keys work as with Mac</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>numpad:microsoft</name>
-          <_description>Shift with numeric keypad keys works as in MS Windows.</_description>
+          <_description>Shift with numeric keypad keys works as in MS Windows</_description>
         </configItem>
       </option>
       <option>
@@ -4626,19 +4632,19 @@
       <option>
         <configItem>
           <name>srvrkeys:none</name>
-          <_description>Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.</_description>
+          <_description>Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>apple:badmap</name>
-          <_description>Swap keycodes of two keys when Mac keyboards are misdetected by kernel.</_description>
+          <_description>Swap keycodes of two keys when Mac keyboards are misdetected by kernel</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>shift:breaks_caps</name>
-          <_description>Shift cancels CapsLock.</_description>
+          <_description>Shift cancels CapsLock</_description>
         </configItem>
       </option>
     </group>
@@ -4651,25 +4657,25 @@
       <option>
         <configItem>
           <name>eurosign:e</name>
-          <_description>Add the EuroSign to the E key.</_description>
+          <_description>Add the EuroSign to the E key</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>eurosign:2</name>
-          <_description>Add the EuroSign to the 2 key.</_description>
+          <_description>Add the EuroSign to the 2 key</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>eurosign:4</name>
-          <_description>Add the EuroSign to the 4 key.</_description>
+          <_description>Add the EuroSign to the 4 key</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>eurosign:5</name>
-          <_description>Add the EuroSign to the 5 key.</_description>
+          <_description>Add the EuroSign to the 5 key</_description>
         </configItem>
       </option>
     </group>
@@ -4682,25 +4688,25 @@
       <option>
         <configItem>
           <name>nbsp:none</name>
-          <_description>Space key outputs usual space at any level.</_description>
+          <_description>Space key outputs usual space at any level</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>nbsp:level2</name>
-          <_description>Space key outputs non-breakable space character at second level.</_description>
+          <_description>Space key outputs non-breakable space character at second level</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>nbsp:level3</name>
-          <_description>Space key outputs non-breakable space character at third level.</_description>
+          <_description>Space key outputs non-breakable space character at third level</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>nbsp:level3s</name>
-          <_description>Space key outputs non-breakable space character at third level, nothing at fourth level.</_description>
+          <_description>Space key outputs non-breakable space character at third level, nothing at fourth level</_description>
         </configItem>
       </option>
       <option>
@@ -4712,7 +4718,7 @@
       <option>
         <configItem>
           <name>nbsp:level4</name>
-          <_description>Space key outputs non-breakable space character at fourth level.</_description>
+          <_description>Space key outputs non-breakable space character at fourth level</_description>
         </configItem>
       </option>
       <option>
diff --git a/symbols/capslock b/symbols/capslock
index 735e148..f9f4827 100644
--- a/symbols/capslock
+++ b/symbols/capslock
@@ -31,3 +31,9 @@ xkb_symbols "groupshift" {
     };
 };
 
+partial hidden modifier_keys
+xkb_symbols "escape" {
+    key <CAPS> {        [       Escape  ]       };
+    key <ESC>  {        [       None    ]       };
+};
+
-- 
2.32.0.93.g670b81a890