upload tizen2.0 source

[framework/uifw/xorg/util/xkeyboard-config.git] / symbols / gb

diff --git a/symbols/gb b/symbols/gb
index de11f64..58e966f 100644 (file)
--- a/symbols/gb
+++ b/symbols/gb
@@ -1,8 +1,4 @@
-// $XKeyboardConfig$
-
 // based on a keyboard map from an 'xkb/symbols/gb' file
-//
-// $XFree86: xc/programs/xkbcomp/symbols/gb,v 1.6 2003/10/04 10:25:14 pascal Exp $
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
@@ -14,7 +10,7 @@ xkb_symbols "basic" {
 
     include "latin"
 
-    name[Group1]="United Kingdom";
+    name[Group1]="English (UK)";
 
     key <AE02> { [         2,   quotedbl,  twosuperior,    oneeighth ] };
     key <AE03> { [         3,   sterling, threesuperior,    sterling ] };
@@ -45,7 +41,7 @@ xkb_symbols "intl" {
 
     include "latin" 
 
-    name[Group1]="United Kingdom - International (with dead keys)"; 
+    name[Group1]="English (UK, international with dead keys)"; 
 
     key <AE02>  { [   2,  dead_diaeresis,      twosuperior,     onehalf ] };
     key <AE03>  { [   3,        sterling,    threesuperior,    onethird ] };
@@ -63,7 +59,7 @@ xkb_symbols "intl" {
 
 partial alphanumeric_keys 
 xkb_symbols "extd" {
-    // Clone of the Microsoft "United Kingdom - Extended" layout, which
+    // Clone of the Microsoft "English (UK, Extended" layout, which
     // includes dead keys for: grave; diaeresis; circumflex; tilde; and
     // accute. It also enables direct access to accute characters using
     // the Multi_key (Alt Gr).
@@ -76,7 +72,7 @@ xkb_symbols "extd" {
 
     include "latin"
 
-    name[Group1]="United Kingdom - Extended - Winkeys";
+    name[Group1]="English (UK, extended WinKeys)";
     
     // Alphanumeric section
     key <TLDE> { [ dead_grave,    notsign,       brokenbar,    NoSymbol ] };
@@ -112,7 +108,7 @@ partial alphanumeric_keys
 xkb_symbols "colemak" {
     include "us(colemak)"
 
-    name[Group1]="United Kingdom - Colemak";
+    name[Group1]="English (UK, Colemak)";
 
     key <AE02> { [         2,   quotedbl,  twosuperior,    oneeighth ] };
     key <AE03> { [         3,   sterling, threesuperior,    sterling ] };
@@ -122,17 +118,8 @@ xkb_symbols "colemak" {
     key <TLDE> { [     grave,    notsign,          bar,          bar ] };
 
     key <BKSL> { [numbersign, asciitilde,   dead_grave,   dead_breve ] };
-    key <LSGT> { [            z,            Z,              ae,               AE ] };
-    key <AB01> { [            x,            X, dead_circumflex,       asciitilde ] };
-    key <AB02> { [            c,            C,        ccedilla,         Ccedilla ] };
-    key <AB03> { [            v,            V,              oe,               OE ] };
-    key <AB04> { [            b,            B,      dead_breve,       asciitilde ] };
-    key <AB05> { [            k,            K,  dead_abovering,       asciitilde ] };
-    key <AB06> { [            m,            M,     dead_macron,       asciitilde ] };
-    key <AB07> { [        comma,         less,    dead_cedilla,       asciitilde ] };
-    key <AB08> { [       period,      greater,   dead_abovedot,       asciitilde ] };
-    key <AB09> { [    backslash,          bar,      asciitilde,       asciitilde ] };
-    key <AB10> { [        slash,     question,    questiondown,       asciitilde ] };
+    key <LSGT> { [ backslash,        bar,          bar,    brokenbar ] };
+
     include "level3(ralt_switch_multikey)"
 };
 
@@ -142,9 +129,9 @@ xkb_symbols "colemak" {
 
 partial alphanumeric_keys
 xkb_symbols "dvorak" {
-    include "us(dvorak-intl)"
+    include "us(dvorak-alt-intl)"
 
-    name[Group1]="United Kingdom - Dvorak";
+    name[Group1]="English (UK, Dvorak)";
 
     key <AD01> { [ apostrophe, at              ] };
     key <AE02> { [         2,  quotedbl,  twosuperior,   NoSymbol      ] };
@@ -159,7 +146,7 @@ partial alphanumeric_keys
 xkb_symbols "dvorakukp" {
     include "gb(dvorak)"
 
-    name[Group1]="United Kingdom - Dvorak (UK Punctuation)";
+    name[Group1]="English (UK, Dvorak with UK punctuation)";
 
     key <AE11> {        [     minus,    underscore      ]       };
     key <AE12> {        [     equal,    plus            ]       };
@@ -178,14 +165,37 @@ xkb_symbols "mac" {
 
     include "latin"
 
-    name[Group1]= "United Kingdom - Macintosh";
+    name[Group1]= "English (UK, Macintosh)";
 
     key <AE02> {       [               2,              at,         EuroSign    ]       };
     key <AE03> {       [               3,        sterling,       numbersign    ]       };
+    key <LSGT> {       [               grave,  asciitilde ]    };
 
     // End alphanumeric section
     
     include "level3(ralt_switch)"
+    include "level3(enter_switch)"
 };
 
 
+partial alphanumeric_keys 
+xkb_symbols "mac_intl" { 
+
+    include "latin" 
+
+    name[Group1]="English (UK, Macintosh international)"; 
+
+    key <AE02>  { [   2,                       at,           EuroSign,    onehalf ] };
+    key <AE03>  { [   3,                 sterling,        twosuperior,   onethird ] };
+    key <AE04>  { [   4,                   dollar,      threesuperior, onequarter ] };
+    key <AE06>  { [   6,          dead_circumflex,           NoSymbol,   onesixth ] };
+    key <AD09>    { [   o,                        O,                 oe,       OE ] };
+
+    key <AC11>  { [ dead_acute,    dead_diaeresis,     dead_diaeresis,        bar ] }; //dead_doubleacute
+    key <TLDE>  { [ section,            plusminus,            notsign,    notsign ] }; //dead_grave
+
+    key <BKSL>  { [ backslash,                bar,         numbersign,        bar ] };
+    key <LSGT>  { [ dead_grave,        dead_tilde,          brokenbar,        bar ] };
+
+    include "level3(ralt_switch)"
+};