From 982ac918afe6a1c02d5cf735d7b6c56443a048cc Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 7 Feb 2014 23:28:38 +0100 Subject: xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014 Update to openssl1.0.1f xserver commit 83e38eb73fd8c852513aac2da2975b4c01070ec2 libxcb commit d7eb0bdf3b5b11ee9f40ee5e73df8fc0bdfa59f3 xkeyboard-config commit 7596672b96315465df8d8d691e3a567a52f70743 libX11 commit aacf95dacc7c598e7297894580d4d655593813b2 xkbcomp commit 31b90ee4ffc774e0da540277907fc5540c0b012c libxtrans commit 3f0de269abe59353acbd7a5587d68ce0da91db67 fontconfig commit e310d2fac2d874d5aa76c609df70cc7b871c0b6d mesa commit dd2229d4c68ed78a50104637aef904f8ab6d7dd3 --- xorg-server/xkeyboard-config/symbols/us | 41 +++++++++++---------------------- 1 file changed, 14 insertions(+), 27 deletions(-) (limited to 'xorg-server/xkeyboard-config/symbols/us') diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us index 4948a6345..d5a6c18e4 100644 --- a/xorg-server/xkeyboard-config/symbols/us +++ b/xorg-server/xkeyboard-config/symbols/us @@ -59,9 +59,8 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "euro" { - name[Group1]= "English (US, with euro on 5)"; - include "us(basic)" + name[Group1]= "English (US, with euro on 5)"; include "eurosign(5)" @@ -72,9 +71,8 @@ xkb_symbols "euro" { partial alphanumeric_keys xkb_symbols "intl" { - name[Group1]= "English (US, international with dead keys)"; - include "us(basic)" + name[Group1]= "English (US, international with dead keys)"; key { [dead_grave, dead_tilde, grave, asciitilde ] }; key { [ 1, exclam, exclamdown, onesuperior ] }; @@ -163,9 +161,8 @@ xkb_symbols "intl" { partial alphanumeric_keys xkb_symbols "alt-intl" { - name[Group1]= "English (US, alternative international)"; - include "us" + name[Group1]= "English (US, alternative international)"; key { [ dead_grave, dead_tilde, grave, asciitilde ] }; key { [ 5, percent, EuroSign ] }; @@ -257,9 +254,8 @@ xkb_symbols "dvorak" { partial alphanumeric_keys xkb_symbols "dvorak-intl" { - name[Group1]= "English (Dvorak, international with dead keys)"; - include "us(dvorak)" + name[Group1]= "English (Dvorak, international with dead keys)"; key { [dead_grave, dead_tilde, grave, asciitilde ] }; @@ -336,9 +332,8 @@ xkb_symbols "dvorak-intl" { partial alphanumeric_keys xkb_symbols "dvorak-alt-intl" { - name[Group1]= "English (Dvorak alternative international no dead keys)"; - include "us(dvorak)" + name[Group1]= "English (Dvorak alternative international no dead keys)"; key { [ 4, dollar, EuroSign ] }; @@ -548,8 +543,8 @@ xkb_symbols "dvorak-classic" { // symbols that usually follows, accented characters are possible for I18N. partial alphanumeric_keys xkb_symbols "dvp" { - include "us(dvorak)" + include "us(dvorak)" name[Group1] = "English (programmer Dvorak)"; // Unmodified Shift AltGr Shift+AltGr @@ -619,9 +614,8 @@ xkb_symbols "dvp" { partial alphanumeric_keys xkb_symbols "rus" { - name[Group1]= "Russian (US, phonetic)"; - include "us(basic)" + name[Group1]= "Russian (US, phonetic)"; key.type[group1]="FOUR_LEVEL_ALPHABETIC"; @@ -732,6 +726,7 @@ xkb_symbols "mac" { partial alphanumeric_keys xkb_symbols "colemak" { + include "us" name[Group1]= "English (Colemak)"; @@ -812,9 +807,8 @@ xkb_symbols "colemak" { partial alphanumeric_keys xkb_symbols "altgr-intl" { - name[Group1]= "English (international AltGr dead keys)"; - include "us(intl)" + name[Group1]= "English (international AltGr dead keys)"; // five dead keys moved into level3: @@ -1175,9 +1169,8 @@ xkb_symbols "chr" { partial alphanumeric_keys xkb_symbols "hbs" { - name[Group1]= "Serbo-Croatian (US)"; - include "us" + name[Group1]= "Serbo-Croatian (US)"; key { [ grave, asciitilde ] }; key { [ 6, dead_caron, asciicircum, asciicircum ] }; @@ -1247,9 +1240,8 @@ xkb_symbols "htcdream" { partial alphanumeric_keys xkb_symbols "workman" { - name[Group1]= "English (Workman)"; - include "us(basic)" + name[Group1]= "English (Workman)"; key { [ q, Q ] }; key { [ d, D ] }; @@ -1289,9 +1281,8 @@ xkb_symbols "workman" { partial alphanumeric_keys xkb_symbols "workman-intl" { - name[Group1]= "English (Workman, international with dead keys)"; - include "us(intl)" + name[Group1]= "English (Workman, international with dead keys)"; key { [ q, Q, adiaeresis, Adiaeresis ] }; key { [ d, D, eth, ETH ] }; @@ -1337,11 +1328,9 @@ xkb_symbols "workman-intl" { partial alphanumeric_keys xkb_symbols "norman" { - name[Group1]= "English (Norman)"; - include "us(basic)" + name[Group1]= "English (Norman)"; - // Alphanumeric section key { [ q, Q ] }; key { [ w, W ] }; key { [ d, D ] }; @@ -1371,7 +1360,6 @@ xkb_symbols "norman" { key { [ b, B ] }; key { [ p, P ] }; key { [ m, M ] }; - // End alphanumeric section key { [ BackSpace ] }; @@ -1383,6 +1371,7 @@ xkb_symbols "norman" { // Czech, Slovak and German charecters added as third level symbols to US keyboard layout. partial alphanumeric_keys xkb_symbols "cz_sk_de" { + include "us" name[Group1]="Czech Slovak and German (US)"; @@ -1518,7 +1507,6 @@ partial alphanumeric_keys xkb_symbols "ats" { include "us" - name[Group1]= "Atsina"; //Using Dead key to get COMBINING COMMA ABOVE for ejectives on @@ -1548,7 +1536,6 @@ partial alphanumeric_keys xkb_symbols "crd" { include "us" - name[Group1]= "Coeur d'Alene Salish"; key { [ w, W, U02B7, U02B7 ] }; -- cgit v1.2.3