diff options
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols')
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk | 144 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/us | 6 |
2 files changed, 72 insertions, 78 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk index a2ac773e7..11e38598c 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk @@ -1,76 +1,68 @@ -partial alphanumeric_keys
-xkb_symbols "basic" {
-
- // Describes the differences between a very simple en_US
- // keyboard and a Danish keyboard with dead key support
- // and all of ISO-8859-1 characters available.
-
- include "latin"
- name[Group1]= "Denmark - Mac";
-
- key <TLDE> { [ onehalf, section, threequarters, paragraph ]};
- key <LSGT> { [ less, greater, backslash, notsign ]};
- key <SPCE> { [ space, space, nobreakspace, nobreakspace ]};
- key <AE01> { [ 1, exclam, exclamdown, onesuperior ]};
- key <AE02> { [ 2, quotedbl, at, twosuperior ]};
- key <AE03> { [ 3, numbersign, sterling, threesuperior ]};
- key <AE04> { [ 4, EuroSign, dollar, onequarter ]};
- key <AE05> { [ 5, percent, NoSymbol, cent ]};
- key <AE06> { [ 6, ampersand, yen, NoSymbol ]};
- key <AE07> { [ 7, slash, braceleft, division ]};
- key <AE08> { [ 8, parenleft, bracketleft, guillemotleft ]};
- key <AE09> { [ 9, parenright, bracketright, guillemotright ]};
- key <AE10> { [ 0, equal, braceright, degree ]};
- key <AB08> { [ comma, semicolon, dead_cedilla, dead_ogonek ]};
- key <AB09> { [ period, colon, periodcentered, dead_abovedot ]};
- key <AB03> { [ c, C, copyright, NoSymbol ]};
- key <AB10> { [ minus, underscore, hyphen, macron ]};
- key <AC01> { [ a, A, ordfeminine, masculine ]};
- key <AC03> { [ d, D, eth, ETH ]};
- key <AD03> { [ e, E, EuroSign, cent ]};
- key <AD04> { [ r, R, registered, NoSymbol ]};
- key <AD05> { [ t, T, thorn, THORN ]};
- key <AD08> { [ i, I, NoSymbol, NoSymbol ]};
- key <AD09> { [ o, O, oe, OE ]};
- key <AC10> { [ ae, AE ]};
- key <AE11> { [ plus, question, plusminus, questiondown ]};
- key <AC11> { [ oslash, Ooblique ]};
- key <BKSL> { [ apostrophe, asterisk, dead_doubleacute, multiply ]};
- key <AD11> { [ aring, Aring ]};
- key <AE12> { [ dead_acute, dead_grave, bar, brokenbar ]};
- key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ]};
-
- // End alphanumeric section
-
- include "eurosign(e)"
- include "level3(ralt_switch)"
-};
-
-
-partial default alphanumeric_keys
-xkb_symbols "full" {
- include "iso9995-3(full)"
- include "dk(basic)"
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
- include "macintosh_vndr/dk(basic)"
- name[Group1]= "Denmark - Mac, eliminate dead keys";
-
- key <AE12> { [ acute, grave, bar, ogonek ] };
- key <AD12> { [ diaeresis, asciicircum, asciitilde, dead_macron ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "macbookpro" {
-
- include "level3(win_switch)"
- include "macintosh_vndr/dk(basic)"
-
- name[Group1]= "Denmark - Mac, MacBook Pro";
-
- key <BKSL> { [apostrophe, asterisk, at, at ] };
- key <TLDE> { [ dollar, section, dollar, dollar ] };
-};
+partial alphanumeric_keys +xkb_symbols "basic" { + + // Describes the differences between a very simple en_US + // keyboard and a Danish keyboard with dead key support + // and all of ISO-8859-1 characters available. + + include "latin" + name[Group1]= "Denmark - Mac"; + + key <TLDE> { [ onehalf, section, threequarters, paragraph ]}; + key <LSGT> { [ less, greater, backslash, notsign ]}; + key <SPCE> { [ space, space, nobreakspace, nobreakspace ]}; + key <AE01> { [ 1, exclam, exclamdown, onesuperior ]}; + key <AE02> { [ 2, quotedbl, at, twosuperior ]}; + key <AE03> { [ 3, numbersign, sterling, threesuperior ]}; + key <AE04> { [ 4, EuroSign, dollar, onequarter ]}; + key <AE05> { [ 5, percent, NoSymbol, cent ]}; + key <AE06> { [ 6, ampersand, yen, NoSymbol ]}; + key <AE07> { [ 7, slash, braceleft, division ]}; + key <AE08> { [ 8, parenleft, bracketleft, guillemotleft ]}; + key <AE09> { [ 9, parenright, bracketright, guillemotright ]}; + key <AE10> { [ 0, equal, braceright, degree ]}; + key <AB08> { [ comma, semicolon, dead_cedilla, dead_ogonek ]}; + key <AB09> { [ period, colon, periodcentered, dead_abovedot ]}; + key <AB03> { [ c, C, copyright, NoSymbol ]}; + key <AB10> { [ minus, underscore, hyphen, macron ]}; + key <AC01> { [ a, A, ordfeminine, masculine ]}; + key <AC03> { [ d, D, eth, ETH ]}; + key <AD03> { [ e, E, EuroSign, cent ]}; + key <AD04> { [ r, R, registered, NoSymbol ]}; + key <AD05> { [ t, T, thorn, THORN ]}; + key <AD08> { [ i, I, NoSymbol, NoSymbol ]}; + key <AD09> { [ o, O, oe, OE ]}; + key <AC10> { [ ae, AE ]}; + key <AE11> { [ plus, question, plusminus, questiondown ]}; + key <AC11> { [ oslash, Ooblique ]}; + key <BKSL> { [ apostrophe, asterisk, dead_doubleacute, multiply ]}; + key <AD11> { [ aring, Aring ]}; + key <AE12> { [ dead_acute, dead_grave, bar, brokenbar ]}; + key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ]}; + + // End alphanumeric section + + include "eurosign(e)" + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + include "macintosh_vndr/dk(basic)" + name[Group1]= "Denmark - Mac, eliminate dead keys"; + + key <AE12> { [ acute, grave, bar, ogonek ] }; + key <AD12> { [ diaeresis, asciicircum, asciitilde, dead_macron ] }; +}; + +partial alphanumeric_keys +xkb_symbols "macbookpro" { + + include "level3(win_switch)" + include "macintosh_vndr/dk(basic)" + + name[Group1]= "Denmark - Mac, MacBook Pro"; + + key <BKSL> { [apostrophe, asterisk, at, at ] }; + key <TLDE> { [ dollar, section, dollar, dollar ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us index 7c3ee2499..5cdd1e351 100644 --- a/xorg-server/xkeyboard-config/symbols/us +++ b/xorg-server/xkeyboard-config/symbols/us @@ -1129,6 +1129,8 @@ xkb_symbols "hbs" { key <TLDE> { [ grave, asciitilde ] }; key <AE06> { [ 6, dead_caron, asciicircum, asciicircum ] }; + key <AE08> { [ 8, asterisk, multiply, division ] }; + key <AE11> { [ minus, underscore, endash, emdash ] }; key <AC09> { [ l, L, U1C9, U1C8 ] }; key <AB06> { [ n, N, U1CC, U1CB ] }; key <AB01> { [ z, Z, U1C6, U1C5 ] }; @@ -1136,8 +1138,8 @@ xkb_symbols "hbs" { key <AC03> { [ d, D, dstroke, Dstroke ] }; key <AC11> { [ dead_acute, quotedbl, apostrophe, apostrophe ] }; key <SPCE> { [ space, space, nobreakspace, nobreakspace ] }; - key <AB08> { [ comma, less, NoSymbol, guillemotright ] }; - key <AB09> { [ period, greater, NoSymbol, guillemotleft ] }; + key <AB08> { [ comma, less, U3003, guillemotright ] }; + key <AB09> { [ period, greater, ellipsis, guillemotleft ] }; include "level3(ralt_switch)" }; |