added gb(colemak), b.fd.o#15303

diff --git a/ChangeLog b/ChangeLog
index 6f34d42..0550fef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-01  Sergey Udaltsov
+
+       * rules/base.xml.in, symbols/gb: added gb(colemak),
+       http://bugs.freedesktop.org/show_bug.cgi?id=15303
+
 2008-03-30  Sergey Udaltsov
 
        * symbols/gn, symbols/ng: fixed unicode sequences,

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 8177c58..8653a87 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -3488,6 +3488,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>colemak</name>
+            <_description>Colemak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>dvorak</name>
             <_description>Dvorak</_description>
           </configItem>

diff --git a/symbols/gb b/symbols/gb
index 92c613a..05f8c48 100644 (file)
--- a/symbols/gb
+++ b/symbols/gb
@@ -61,6 +61,29 @@ xkb_symbols "intl" {
     include "level3(ralt_switch)"
 };
 
+// Describe the differences between the US Colemak layout
+// and a UK variant. By Andy Buckley (andy@insectnation.org)
+
+partial alphanumeric_keys
+xkb_symbols "colemak" {
+    include "us(colemak)"
+
+    name[Group1]="United Kingdom - Colemak";
+
+    key <AE02> { [         2,   quotedbl,  twosuperior,    oneeighth ] };
+    key <AE03> { [         3,   sterling, threesuperior,    sterling ] };
+    key <AE04> { [         4,     dollar,     EuroSign,   onequarter ] };
+
+    key <AC11> { [apostrophe,         at, dead_circumflex, dead_caron] };
+    key <TLDE> { [     grave,    notsign,          bar,          bar ] };
+
+    key <BKSL> { [numbersign, asciitilde,   dead_grave,   dead_breve ] };
+    key <LSGT> { [ backslash,        bar,          bar,    brokenbar ] };
+
+    include "level3(ralt_switch_multikey)"
+};
+
+
 // Dvorak (UK) keymap (by odaen) allowing the usage of
 // the £ and ? key and swapping the @ and " keys.