fixing keyword

[xorg/xkeyboard-config] / symbols / gb

diff --git a/symbols/gb b/symbols/gb
index d2ec15b..9a5a0c6 100644 (file)
--- a/symbols/gb
+++ b/symbols/gb
@@ -1,7 +1,7 @@
 
 // based on a keyboard map from an 'xkb/symbols/gb' file
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/gb,v 1.6 2003/10/04 10:25:14 pascal Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/gb,v 1.6 2003/10/04 10:25:14 pascal Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
@@ -11,7 +11,7 @@ xkb_symbols "basic" {
     // the SVR4 European Language Supplement and sometimes also
     // known as the IBM 166 layout.
 
-    include "pc/latin"
+    include "latin"
 
     name[Group1]="Great Britain";
 
@@ -25,7 +25,7 @@ xkb_symbols "basic" {
     key <BKSL> { [numbersign, asciitilde,   dead_grave,   dead_breve ] };
     key <LSGT> { [ backslash,        bar,          bar,    brokenbar ] };
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 partial default alphanumeric_keys 
@@ -42,7 +42,7 @@ xkb_symbols "intl" {
     // dead_tilde 
     // dead_diaeresis 
 
-    include "pc/latin" 
+    include "latin" 
 
     name[Group1]="Great Britain"; 
 
@@ -57,5 +57,20 @@ xkb_symbols "intl" {
     key <BKSL>  { [ numbersign, dead_tilde,            bar,         bar ] };
     key <LSGT>  { [  backslash,        bar,            bar,         bar ] };
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
+};
+
+// Dvorak (UK) keymap (by odaen) allowing the usage of
+// the £ and ? key and swapping the @ and " keys.
+
+partial alphanumeric_keys
+xkb_symbols "dvorak" {
+    include "us(dvorak)"
+
+    key <BKSL> { [ numbersign, asciitilde      ] };
+    key <AE02> { [         2,  quotedbl,  twosuperior,   NoSymbol      ] };
+    key <AE03> { [         3,  sterling,  threesuperior, NoSymbol      ] };
+    key <AE04> { [         4,  dollar,    EuroSign,      NoSymbol      ] };
+    key <LSGT> { [  backslash, bar             ] };
+    key <AD01> { [ apostrophe, at              ] };
 };