diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
| commit | fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf (patch) | |
| tree | c59c3e084f79bd1f6060f9a5cedb5c48d4da14ee /xorg-server/xkeyboard-config/symbols | |
| parent | 5d6e342b3c2d0d3607b184b1472b816228839e3f (diff) | |
| parent | 528f5bd58a139174170c4130c67dca30193c9057 (diff) | |
| download | vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.gz vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.bz2 vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols')
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/cd.in | 2 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/is | 20 |
2 files changed, 16 insertions, 6 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/cd.in b/xorg-server/xkeyboard-config/symbols/cd.in index 938bf2b69..78803dbcc 100644 --- a/xorg-server/xkeyboard-config/symbols/cd.in +++ b/xorg-server/xkeyboard-config/symbols/cd.in @@ -30,7 +30,7 @@ xkb_symbols "basic" { key <AD04> { [ r, R ] }; key <AD05> { [ t, T ] }; key <AD06> { [ y, Y ] }; - key <AD07> { [ u, U, 0x01000289, 0x01001d7e ] }; + key <AD07> { [ u, U, 0x01000289, 0x01000244 ] }; key <AD08> { [ i, I, 0x01000268, 0x01000197 ] }; key <AD09> { [ o, O, oslash, Ooblique ] }; key <AD10> { [ p, P ] }; diff --git a/xorg-server/xkeyboard-config/symbols/is b/xorg-server/xkeyboard-config/symbols/is index c40b8a965..f8e0ce133 100644 --- a/xorg-server/xkeyboard-config/symbols/is +++ b/xorg-server/xkeyboard-config/symbols/is @@ -2,6 +2,10 @@ // XKB keyboard by Hrafnkell Eiriksson - hkelle@rhi.hi.is // fixes by Olafur Osvaldsson - oli@isnic.is // +// "basic" corrected according to the Icelandic standard for keyboards, +// IST 125:1995 (some symbols substituted by a dead diacritic). +// Some positions are according to IST ISO/IEC 9995-3:1994 +// Added nobreakspace default partial alphanumeric_keys xkb_symbols "basic" { @@ -10,21 +14,27 @@ xkb_symbols "basic" { name[Group1]="Icelandic"; +// <AE00> = <TLDE> key <AE02> { [ 2, quotedbl, twosuperior, oneeighth ] }; key <AE04> { [ 4, dollar, onequarter, currency ] }; key <AE11> { [odiaeresis, Odiaeresis, backslash, questiondown ] }; - key <AE12> { [ minus, underscore, ccedilla, dead_ogonek ] }; + key <AE12> { [ minus, underscore, dead_cedilla, dead_ogonek ] }; key <AD11> { [ eth, ETH, dead_diaeresis, dead_abovering ] }; - key <AD12> { [apostrophe, question, asciitilde, dead_macron ] }; + key <AD12> { [apostrophe, question, dead_tilde, dead_macron ] }; key <AC10> { [ ae, AE, asciicircum, dead_doubleacute ] }; - key <AC11> { [dead_acute, dead_circumflex, dead_circumflex ] }; - key <TLDE> { [ degree, diaeresis, notsign, notsign ] }; + key <AC11> { [dead_acute, dead_acute, dead_circumflex, dead_caron ] }; + key <TLDE> { [dead_abovering, dead_diaeresis, notsign, hyphen ] }; - key <BKSL> { [ plus, asterisk, grave, dead_breve ] }; +// <AC12> = <BKSL> + key <BKSL> { [ plus, asterisk, dead_grave, dead_breve ] }; + +// <AB00> = <LSGT>, is in file "pc": pc105 key <AB10> { [ thorn, THORN, dead_belowdot, dead_abovedot ] }; + key <SPCE> { [ space, space, nobreakspace, nobreakspace ] }; + include "level3(ralt_switch)" }; |