From 321c01267ae1c446f1bd22b642567fcafa016c02 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 4 Mar 2014 08:57:07 +0100 Subject: libX11 libxcb mesa xserver xcb-proto xkeyboard-config git update 4 Mar 2014 xserver commit b634e909895f6001e7d9543e1350b20c82c8c01c libxcb commit 4ffa6f83b92763eb901c7ddb7c20775e24d507ca libxcb/xcb-proto commit 4270141a7cb3c68f50251be19a5a628aa18553e6 xkeyboard-config commit d9e3d0ec1a48a5f61ea6dd6d20b8682eeecf3a39 libX11 commit d6bd988bc00494914b38b95ee5df77ac4f32f19f libXdmcp commit 089081dca4ba3598c6f9bf401c029378943b5854 libXext commit d5447c0156f556114dbf97d6064c0c7b0fcd5f70 libfontenc commit 0037a42107b952c9d903719615747e760e4e7247 libXinerama commit edd95182b26eb5d576d4878c559e0f17dddaa909 libXau commit 1e4635be11154dd8262f37b379511bd627defa2a xkbcomp commit 31b90ee4ffc774e0da540277907fc5540c0b012c pixman commit 82d094654a46bd97d47f1f132a01ae0a74b986f3 xextproto commit 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7 randrproto commit a4a6694c059d74247c16527eef4a0ec9f56bbef6 glproto commit f84853d97d5749308992412a215fa518b6536eb3 mkfontscale commit eac564e0fc9052a39981ea47b271f7f3d2821944 xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 libXft commit 4acfdaf95adb0a05c2a25550bdde036c865902f4 libXmu commit 22d9c590901e121936f50dee97dc60c4f7defb63 libxtrans commit 3f0de269abe59353acbd7a5587d68ce0da91db67 fontconfig commit e310d2fac2d874d5aa76c609df70cc7b871c0b6d mesa commit 1a568e0f2b65e4e1e1d19a6dece3a792a33da825 --- xorg-server/xkeyboard-config/symbols/ara | 2 +- xorg-server/xkeyboard-config/symbols/cz | 163 ++--- xorg-server/xkeyboard-config/symbols/es | 2 +- xorg-server/xkeyboard-config/symbols/il | 2 +- xorg-server/xkeyboard-config/symbols/in | 6 +- xorg-server/xkeyboard-config/symbols/it | 2 +- xorg-server/xkeyboard-config/symbols/kz | 2 - xorg-server/xkeyboard-config/symbols/lv | 4 +- xorg-server/xkeyboard-config/symbols/ru | 826 +++++++++++------------ xorg-server/xkeyboard-config/symbols/se | 51 ++ xorg-server/xkeyboard-config/symbols/sk | 138 ++-- xorg-server/xkeyboard-config/symbols/sun_vndr/pl | 2 +- xorg-server/xkeyboard-config/symbols/sun_vndr/sk | 2 +- xorg-server/xkeyboard-config/symbols/tr | 413 ++++++------ xorg-server/xkeyboard-config/symbols/ua | 477 ++++++------- 15 files changed, 1055 insertions(+), 1037 deletions(-) (limited to 'xorg-server/xkeyboard-config/symbols') diff --git a/xorg-server/xkeyboard-config/symbols/ara b/xorg-server/xkeyboard-config/symbols/ara index e677aaab1..d048b0090 100644 --- a/xorg-server/xkeyboard-config/symbols/ara +++ b/xorg-server/xkeyboard-config/symbols/ara @@ -94,7 +94,7 @@ xkb_symbols "azerty" { key { [ parenright, degree ] }; }; -partial alphanumeric_keys +partial hidden alphanumeric_keys xkb_symbols "digits_KP" { name[Group1]= "Arabic (digits_KP)"; diff --git a/xorg-server/xkeyboard-config/symbols/cz b/xorg-server/xkeyboard-config/symbols/cz index 083cc7674..97ab3cf68 100644 --- a/xorg-server/xkeyboard-config/symbols/cz +++ b/xorg-server/xkeyboard-config/symbols/cz @@ -1,117 +1,118 @@ default partial alphanumeric_keys xkb_symbols "basic" { - // This layout conforms to a new cz compromise standard designed - // to satisfy most unix, windows and mac users. - // 2001 by Kamil Toman + // This layout conforms to a new Czech compromise standard + // designed to satisfy most Unix, Windows and Mac users. + // 2001 by Kamil Toman include "latin" - name[Group1]= "Czech"; - key { [ semicolon, dead_abovering, grave, asciitilde ] }; - key { [ plus, 1, exclam, dead_tilde ] }; - key { [ ecaron, 2, at, dead_caron ] }; - key { [ scaron, 3, numbersign, dead_circumflex ] }; - key { [ ccaron, 4, dollar, dead_breve ] }; - key { [ rcaron, 5, percent, dead_abovering ] }; - key { [ zcaron, 6, asciicircum, dead_ogonek ] }; - key { [ yacute, 7, ampersand, dead_grave ] }; - key { [ aacute, 8, asterisk, dead_abovedot] }; - key { [ iacute, 9, braceleft, dead_acute ] }; - key { [ eacute, 0, braceright, dead_doubleacute ] }; - key { [ equal, percent, NoSymbol, dead_diaeresis ] }; - key { [dead_acute, dead_caron, dead_macron, dead_cedilla ] }; - - key { [ q, Q, backslash, NoSymbol ] }; - key { [ w, W, bar, Nosymbol ] }; - key { [ e, E, EuroSign, NoSymbol ] }; - key { [ r, R, NoSymbol, NoSymbol ] }; - key { [ t, T, NoSymbol, NoSymbol ] }; - key { [ z, Z, NoSymbol, NoSymbol ] }; - key { [ u, U, NoSymbol, NoSymbol ] }; - key { [ i, I, NoSymbol, NoSymbol ] }; - key { [ o, O, NoSymbol, NoSymbol ] }; - key { [ p, P, NoSymbol, NoSymbol ] }; - - key { [ uacute, slash, bracketleft, division ] }; - key { [parenright, parenleft, bracketright, multiply ] }; - - key { [ a, A, asciitilde, NoSymbol ] }; - key { [ s, S, dstroke, NoSymbol ] }; - key { [ d, D, Dstroke, NoSymbol ] }; - key { [ f, F, bracketleft, NoSymbol ] }; - key { [ g, G, bracketright, NoSymbol ] }; - key { [ h, H, grave, NoSymbol ] }; - key { [ j, J, apostrophe, NoSymbol ] }; - key { [ k, K, lstroke, NoSymbol ] }; - key { [ l, L, Lstroke, NoSymbol ] }; - - key { [ uring, quotedbl, dollar, NoSymbol ] }; - key { [ section, exclam, apostrophe, ssharp ] }; - key { [ EuroSign, dead_diaeresis, NoSymbol, NoSymbol ] }; - key { [dead_diaeresis, apostrophe, backslash, bar ] }; - - key { [ backslash, bar, slash, NoSymbol ] }; - key { [ y, Y, degree, NoSymbol ] }; - key { [ x, X, numbersign, Nosymbol ] }; - key { [ c, C, ampersand, NoSymbol ] }; - key { [ v, V, at, NoSymbol ] }; - key { [ b, B, braceleft, NoSymbol ] }; - key { [ n, N, braceright, NoSymbol ] }; - key { [ m, M, asciicircum, NoSymbol ] }; - key { [ comma, question, less, NoSymbol ] }; - key { [ period, colon, greater, NoSymbol ] }; - key { [ minus, underscore, asterisk, NoSymbol ] }; - - key { [ space, space, space, space ] }; + key { [ semicolon, dead_abovering, grave, asciitilde ] }; + key { [ plus, 1, exclam, dead_tilde ] }; + key { [ ecaron, 2, at, dead_caron ] }; + key { [ scaron, 3, numbersign, dead_circumflex ] }; + key { [ ccaron, 4, dollar, dead_breve ] }; + key { [ rcaron, 5, percent, dead_abovering]}; + key { [ zcaron, 6, asciicircum, dead_ogonek ] }; + key { [ yacute, 7, ampersand, dead_grave ] }; + key { [ aacute, 8, asterisk, dead_abovedot] }; + key { [ iacute, 9, braceleft, dead_acute ] }; + key { [ eacute, 0, braceright, dead_doubleacute ] }; + key { [ equal, percent, NoSymbol, dead_diaeresis]}; + key { [dead_acute, dead_caron, dead_macron, dead_cedilla ] }; + + key { [ q, Q, backslash, NoSymbol ] }; + key { [ w, W, bar, Nosymbol ] }; + key { [ e, E, EuroSign, NoSymbol ] }; + key { [ r, R, NoSymbol, NoSymbol ] }; + key { [ t, T, NoSymbol, NoSymbol ] }; + key { [ z, Z, NoSymbol, NoSymbol ] }; + key { [ u, U, NoSymbol, NoSymbol ] }; + key { [ i, I, NoSymbol, NoSymbol ] }; + key { [ o, O, NoSymbol, NoSymbol ] }; + key { [ p, P, NoSymbol, NoSymbol ] }; + + key { [ uacute, slash, bracketleft, division ] }; + key { [parenright, parenleft, bracketright, multiply ] }; + + key { [ a, A, asciitilde, NoSymbol ] }; + key { [ s, S, dstroke, NoSymbol ] }; + key { [ d, D, Dstroke, NoSymbol ] }; + key { [ f, F, bracketleft, NoSymbol ] }; + key { [ g, G, bracketright, NoSymbol ] }; + key { [ h, H, grave, NoSymbol ] }; + key { [ j, J, apostrophe, NoSymbol ] }; + key { [ k, K, lstroke, NoSymbol ] }; + key { [ l, L, Lstroke, NoSymbol ] }; + + key { [ uring, quotedbl, dollar, NoSymbol ] }; + key { [ section, exclam, apostrophe, ssharp ] }; + key { [ EuroSign, dead_diaeresis, NoSymbol, NoSymbol ] }; + key { [dead_diaeresis, apostrophe, backslash, bar ] }; + + key { [ backslash, bar, slash, NoSymbol ] }; + key { [ y, Y, degree, NoSymbol ] }; + key { [ x, X, numbersign, Nosymbol ] }; + key { [ c, C, ampersand, NoSymbol ] }; + key { [ v, V, at, NoSymbol ] }; + key { [ b, B, braceleft, NoSymbol ] }; + key { [ n, N, braceright, NoSymbol ] }; + key { [ m, M, asciicircum, NoSymbol ] }; + key { [ comma, question, less, NoSymbol ] }; + key { [ period, colon, greater, NoSymbol ] }; + key { [ minus, underscore, asterisk, NoSymbol ] }; + + key { [ space, space, space, space ] }; include "level3(ralt_switch)" }; -// Use instead of (useful for keyboard without key) xkb_symbols "bksl" { + + // Use instead of (useful for keyboards without key). + include "cz(basic)" name[Group1]= "Czech (with <\|> key)"; - key { [ backslash, bar, slash, NoSymbol ] }; + key { [ backslash, bar, slash, NoSymbol ] }; }; partial alphanumeric_keys xkb_symbols "qwerty" { - // This layout represent actual keyboard layout. It complies with symbols - // printed on keys. - // ----------------------------------------------------------------------- - // This layout was created in 2011 by Lukáš Mojžíš + // This layout represents the actual Czech keyboards; + // it complies with the symbols printed on the keys. + // 2011 by Lukáš Mojžíš include "cz(basic)" name[Group1]= "Czech (qwerty)"; - key { [ z, Z, degree, NoSymbol ] }; - key { [ uring, quotedbl, semicolon, colon ] }; - key { [ section, exclam, apostrophe, ssharp ] }; - key { [ y, Y, NoSymbol, NoSymbol ] }; - key { [ uacute, slash, bracketleft, braceleft ] }; - key { [parenright, parenleft, bracketright, braceright ] }; - key { [ iacute, 9, parenleft, dead_acute ] }; - key { [ eacute, 0, parenright, dead_doubleacute ] }; + key { [ z, Z, degree, NoSymbol ] }; + key { [ uring, quotedbl, semicolon, colon ] }; + key { [ section, exclam, apostrophe, ssharp ] }; + key { [ y, Y, NoSymbol, NoSymbol ] }; + key { [ uacute, slash, bracketleft, braceleft ] }; + key { [parenright, parenleft, bracketright, braceright ] }; + key { [ iacute, 9, parenleft, dead_acute ] }; + key { [ eacute, 0, parenright, dead_doubleacute ] }; }; -// Use instead of (useful for keyboard without key) xkb_symbols "qwerty_bksl" { - include "cz(qwerty)" + // Use instead of (useful for keyboards without key). + + include "cz(qwerty)" name[Group1]= "Czech (qwerty, extended Backslash)"; - key { [ backslash, bar, slash, NoSymbol ] }; + key { [ backslash, bar, slash, NoSymbol ] }; }; partial alphanumeric_keys alternate_group xkb_symbols "ucw" { - // This layout is usually used as the second group, it contains - // accented characters only, no 'latin' set. + // This layout is usually used as the second group, + // it contains accented characters only, no 'latin' set. // 2008 by Milan Vancura name[Group1]= "Czech (UCW layout, accented letters only)"; @@ -149,10 +150,10 @@ xkb_symbols "ucw" { partial alphanumeric_keys xkb_symbols "dvorak-ucw" { - // US Dvorak layout extend with UCW - AltGr produces accented characters + // US Dvorak layout extended with UCW, + // AltGr produces accented characters. include "us(dvorak)" - name[Group1]= "Czech (US Dvorak with CZ UCW support)"; key { [ j, J, eacute, Eacute ] }; diff --git a/xorg-server/xkeyboard-config/symbols/es b/xorg-server/xkeyboard-config/symbols/es index 749a86d71..ab29a05df 100644 --- a/xorg-server/xkeyboard-config/symbols/es +++ b/xorg-server/xkeyboard-config/symbols/es @@ -26,7 +26,7 @@ xkb_symbols "basic" { include "level3(ralt_switch)" }; -partial alphanumeric +partial alphanumeric_keys xkb_symbols "winkeys" { include "es(basic)" diff --git a/xorg-server/xkeyboard-config/symbols/il b/xorg-server/xkeyboard-config/symbols/il index 24028a867..48452d620 100644 --- a/xorg-server/xkeyboard-config/symbols/il +++ b/xorg-server/xkeyboard-config/symbols/il @@ -299,7 +299,7 @@ xkb_symbols "biblicalSIL" { key { [ U05B7, U05B8, U05C7, U05B2 ] }; //patah Qamats Qam. Qatan hat. patah key { [ hebrew_samech, U05E9 ] }; //Samech, shin no dot - - key { [ hebrew_dalet ] }; //dalet - - - - key { [ UFB2B, hebrew_sin, U05C2 ] }; //UCSv6 Sin sin (nodot) sindot - + key { [ UFB2B, hebrew_shin, U05C2 ] }; //UCSv6 Sin shin (nodot) sindot - key { [ hebrew_gimel, VoidSymbol, U25E6, U2022 ] }; //gimel - bullet(DSS) bulletfill (DSS) key { [ hebrew_he, VoidSymbol, U0336, U030A ] };//he - strikeout(DSS) Ring Above(DSS) key { [ UFB2A, hebrew_shin, U05C1] }; //UCSv6 Shin shin (nodot) shindot - diff --git a/xorg-server/xkeyboard-config/symbols/in b/xorg-server/xkeyboard-config/symbols/in index 054671513..04c35a200 100644 --- a/xorg-server/xkeyboard-config/symbols/in +++ b/xorg-server/xkeyboard-config/symbols/in @@ -1230,7 +1230,7 @@ xkb_symbols "tam_TSCII" { key { [ 0x10000b6, 0x10000aa ] }; // au key { [ 0x10000ab, 0x10000ac ] }; // a, A key { [ 0x10000fe, 0x10000ae ] }; // i, I - +}; partial alphanumeric_keys xkb_symbols "tam_TAB" { @@ -1392,7 +1392,7 @@ xkb_symbols "guru" { key { [ U0A6e ] }; key { [ U0A6F, parenleft ] }; key { [ U0A66, parenright ] }; - key { [ gur_visarga ] }; + key { [ U0A03 ] }; key { [ equal, plus ] }; // Mainly long vowels @@ -1638,7 +1638,7 @@ xkb_symbols "hin-wx" { key { [ 0x1000901, 0x100093C, 0x100093D, 0x1000950] }; key { [ 0x1000926, 0x1000927 ] }; key { [ 0x100091A, 0x100091B ] }; - key { [ 0x1000935, dead_V ] }; + key { [ 0x1000935 ] }; key { [ 0x100092C, 0x100092D ] }; key { [ 0x1000928, 0x1000923 ] }; key { [ 0x100092E, 0x1000902 ] }; diff --git a/xorg-server/xkeyboard-config/symbols/it b/xorg-server/xkeyboard-config/symbols/it index 8dd4365de..e9d0f306b 100644 --- a/xorg-server/xkeyboard-config/symbols/it +++ b/xorg-server/xkeyboard-config/symbols/it @@ -61,7 +61,7 @@ xkb_symbols "nodeadkeys" { key { [ ugrave, section, grave, breve ] }; }; -partial alphanueric_keys +partial alphanumeric_keys xkb_symbols "winkeys" { include "it(basic)" diff --git a/xorg-server/xkeyboard-config/symbols/kz b/xorg-server/xkeyboard-config/symbols/kz index 9f6260238..4f807d182 100644 --- a/xorg-server/xkeyboard-config/symbols/kz +++ b/xorg-server/xkeyboard-config/symbols/kz @@ -69,8 +69,6 @@ key.type[group1] = "ALPHABETIC"; key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; key { [ Cyrillic_be, Cyrillic_BE ] }; key { [ Cyrillic_yu, Cyrillic_YU ] }; - -key.type[group1]="TWO_LEVEL"; }; // Kikkarin KZ1 diff --git a/xorg-server/xkeyboard-config/symbols/lv b/xorg-server/xkeyboard-config/symbols/lv index 8b0e9d719..f1b831605 100644 --- a/xorg-server/xkeyboard-config/symbols/lv +++ b/xorg-server/xkeyboard-config/symbols/lv @@ -408,7 +408,7 @@ xkb_symbols "minuskeydvorak" { name[Group1]= "Latvian (US Dvorak, minus variant)"; - key {[ISO_Level3_Latch, ISO_Level3_Latch, mimus, underscore]}; + key {[ISO_Level3_Latch, ISO_Level3_Latch, minus, underscore]}; key {[space, space, minus, underscore]}; modifier_map Mod5 { }; @@ -467,7 +467,7 @@ xkb_symbols "minuskeydvorakprogr" { name[Group1]= "Latvian (programmer US Dvorak, minus variant)"; - key {[ISO_Level3_Latch, ISO_Level3_Latch, mimus, underscore]}; + key {[ISO_Level3_Latch, ISO_Level3_Latch, minus, underscore]}; key {[space, space, minus, underscore]}; modifier_map Mod5 { }; diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru index 782a3d75a..2b34a4d52 100644 --- a/xorg-server/xkeyboard-config/symbols/ru +++ b/xorg-server/xkeyboard-config/symbols/ru @@ -1,5 +1,4 @@ -// based on -// russian standard keyboard +// Keyboard layouts for Russia. // AEN // 2001/12/23 by Leon Kanter // 2005/12/09 Valery Inozemtsev @@ -7,83 +6,84 @@ // Windows layout default partial alphanumeric_keys xkb_symbols "winkeys" { - include "ru(common)" + include "ru(common)" name[Group1]= "Russian"; - key { [ 3, numerosign ] }; - key { [ 4, semicolon ] }; - key { [ 5, percent ] }; - key { [ 6, colon ] }; - key { [ 7, question ] }; - key { [ 8, asterisk ] }; + key { [ 3, numerosign ] }; + key { [ 4, semicolon ] }; + key { [ 5, percent ] }; + key { [ 6, colon ] }; + key { [ 7, question ] }; + key { [ 8, asterisk ] }; - key { [ period, comma ] }; - key { [ backslash, slash ] }; + key { [ period, comma ] }; + key { [ backslash, slash ] }; }; partial hidden alphanumeric_keys xkb_symbols "common" { - key { [ 1, exclam ] }; - key { [ 2, quotedbl ] }; - key { [ 3, numbersign ] }; - key { [ 4, asterisk ] }; - key { [ 5, colon ] }; - key { [ 6, comma ] }; - key { [ 7, period ] }; - key { [ 8, semicolon ] }; - key { [ 9, parenleft ] }; - key { [ 0, parenright ] }; - key { [ minus, underscore ] }; - key { [ equal, plus ] }; - key { [ backslash, bar ] }; - key { [ slash, question ] }; - key { [ slash, bar ] }; - - key { [ Cyrillic_io, Cyrillic_IO ] }; - key { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; - key { [ Cyrillic_tse, Cyrillic_TSE ] }; - key { [ Cyrillic_u, Cyrillic_U ] }; - key { [ Cyrillic_ka, Cyrillic_KA ] }; - key { [ Cyrillic_ie, Cyrillic_IE ] }; - key { [ Cyrillic_en, Cyrillic_EN ] }; - key { [ Cyrillic_ghe, Cyrillic_GHE ] }; - key { [ Cyrillic_sha, Cyrillic_SHA ] }; - key { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; - key { [ Cyrillic_ze, Cyrillic_ZE ] }; - key { [ Cyrillic_ha, Cyrillic_HA ] }; - key { [Cyrillic_hardsign,Cyrillic_HARDSIGN ] }; - key { [ Cyrillic_ef, Cyrillic_EF ] }; - key { [ Cyrillic_yeru, Cyrillic_YERU ] }; - key { [ Cyrillic_ve, Cyrillic_VE ] }; - key { [ Cyrillic_a, Cyrillic_A ] }; - key { [ Cyrillic_pe, Cyrillic_PE ] }; - key { [ Cyrillic_er, Cyrillic_ER ] }; - key { [ Cyrillic_o, Cyrillic_O ] }; - key { [ Cyrillic_el, Cyrillic_EL ] }; - key { [ Cyrillic_de, Cyrillic_DE ] }; - key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; - key { [ Cyrillic_e, Cyrillic_E ] }; - key { [ Cyrillic_ya, Cyrillic_YA ] }; - key { [ Cyrillic_che, Cyrillic_CHE ] }; - key { [ Cyrillic_es, Cyrillic_ES ] }; - key { [ Cyrillic_em, Cyrillic_EM ] }; - key { [ Cyrillic_i, Cyrillic_I ] }; - key { [ Cyrillic_te, Cyrillic_TE ] }; - key { [Cyrillic_softsign,Cyrillic_SOFTSIGN ] }; - key { [ Cyrillic_be, Cyrillic_BE ] }; - key { [ Cyrillic_yu, Cyrillic_YU ] }; - - key.type[group1]="TWO_LEVEL"; + key { [ 1, exclam ] }; + key { [ 2, quotedbl ] }; + key { [ 3, numbersign ] }; + key { [ 4, asterisk ] }; + key { [ 5, colon ] }; + key { [ 6, comma ] }; + key { [ 7, period ] }; + key { [ 8, semicolon ] }; + key { [ 9, parenleft ] }; + key { [ 0, parenright ] }; + key { [ minus, underscore ] }; + key { [ equal, plus ] }; + key { [ backslash, bar ] }; + + key { [ slash, question ] }; + key { [ slash, bar ] }; + + key { [ Cyrillic_io, Cyrillic_IO ] }; + key { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; + key { [ Cyrillic_tse, Cyrillic_TSE ] }; + key { [ Cyrillic_u, Cyrillic_U ] }; + key { [ Cyrillic_ka, Cyrillic_KA ] }; + key { [ Cyrillic_ie, Cyrillic_IE ] }; + key { [ Cyrillic_en, Cyrillic_EN ] }; + key { [ Cyrillic_ghe, Cyrillic_GHE ] }; + key { [ Cyrillic_sha, Cyrillic_SHA ] }; + key { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; + key { [ Cyrillic_ze, Cyrillic_ZE ] }; + key { [ Cyrillic_ha, Cyrillic_HA ] }; + key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; + + key { [ Cyrillic_ef, Cyrillic_EF ] }; + key { [ Cyrillic_yeru, Cyrillic_YERU ] }; + key { [ Cyrillic_ve, Cyrillic_VE ] }; + key { [ Cyrillic_a, Cyrillic_A ] }; + key { [ Cyrillic_pe, Cyrillic_PE ] }; + key { [ Cyrillic_er, Cyrillic_ER ] }; + key { [ Cyrillic_o, Cyrillic_O ] }; + key { [ Cyrillic_el, Cyrillic_EL ] }; + key { [ Cyrillic_de, Cyrillic_DE ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; + key { [ Cyrillic_e, Cyrillic_E ] }; + + key { [ Cyrillic_ya, Cyrillic_YA ] }; + key { [ Cyrillic_che, Cyrillic_CHE ] }; + key { [ Cyrillic_es, Cyrillic_ES ] }; + key { [ Cyrillic_em, Cyrillic_EM ] }; + key { [ Cyrillic_i, Cyrillic_I ] }; + key { [ Cyrillic_te, Cyrillic_TE ] }; + key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; + key { [ Cyrillic_be, Cyrillic_BE ] }; + key { [ Cyrillic_yu, Cyrillic_YU ] }; include "kpdl(comma)" }; partial alphanumeric_keys xkb_symbols "legacy" { - include "ru(common)" + include "ru(common)" name[Group1]= "Russian (legacy)"; }; @@ -92,118 +92,121 @@ xkb_symbols "olpc" { include "ru(common)" - key { [ 0x01000451, 0x01000401, grave ] }; // Ñ‘, Ð - key { [ 3, numbersign, 0x01002116 ] }; // â„– - key { [ 4, dollar, semicolon ] }; - key { [ 6, asciicircum, colon ] }; - key { [ 7, ampersand ] }; - key { [ 9, parenleft, acute ] }; - key { [ backslash, bar, slash ] }; + key { [ 0x01000451, 0x01000401, grave ] }; // Ñ‘, Ð + key { [ 3, numbersign, 0x01002116 ] }; // â„– + key { [ 4, dollar, semicolon ] }; + key { [ 6, asciicircum, colon ] }; + key { [ 7, ampersand ] }; + key { [ 9, parenleft, acute ] }; + key { [ backslash, bar, slash ] }; include "group(olpc)" }; partial alphanumeric_keys xkb_symbols "typewriter" { + include "ru(common)" name[Group1]= "Russian (typewriter)"; - key { [ bar, plus ] }; - key { [ numerosign, 1 ] }; - key { [ minus, 2 ] }; - key { [ slash, 3 ] }; - key { [ quotedbl, 4 ] }; - key { [ colon, 5 ] }; - key { [ comma, 6 ] }; - key { [ period, 7 ] }; - key { [ underscore, 8 ] }; - key { [ question, 9 ] }; - key { [ percent, 0 ] }; - key { [ exclam, equal ] }; - key { [ semicolon, backslash ] }; - - key { [ parenright, parenleft ] }; - - key { [Cyrillic_hardsign,Cyrillic_HARDSIGN ] }; - key { [ Cyrillic_io, Cyrillic_IO ] }; + + key { [ bar, plus ] }; + key { [ numerosign, 1 ] }; + key { [ minus, 2 ] }; + key { [ slash, 3 ] }; + key { [ quotedbl, 4 ] }; + key { [ colon, 5 ] }; + key { [ comma, 6 ] }; + key { [ period, 7 ] }; + key { [ underscore, 8 ] }; + key { [ question, 9 ] }; + key { [ percent, 0 ] }; + key { [ exclam, equal ] }; + key { [ semicolon, backslash ] }; + + key { [ parenright, parenleft ] }; + + key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; + key { [ Cyrillic_io, Cyrillic_IO ] }; }; partial alphanumeric_keys xkb_symbols "typewriter-legacy" { + include "ru(common)" name[Group1]= "Russian (typewriter, legacy)"; - key { [ apostrophe, quotedbl ] }; - key { [ exclam, 1 ] }; - key { [ numerosign, 2 ] }; - key { [ slash, 3 ] }; - key { [ semicolon, 4 ] }; - key { [ colon, 5 ] }; - key { [ comma, 6 ] }; - key { [ period, 7 ] }; - key { [ underscore, 8 ] }; - key { [ question, 9 ] }; - key { [ percent, 0 ] }; - key { [ parenleft, parenright ] }; - - key { [Cyrillic_hardsign,Cyrillic_HARDSIGN ] }; - key { [ Cyrillic_io, Cyrillic_IO ] }; + + key { [ apostrophe, quotedbl ] }; + key { [ exclam, 1 ] }; + key { [ numerosign, 2 ] }; + key { [ slash, 3 ] }; + key { [ semicolon, 4 ] }; + key { [ colon, 5 ] }; + key { [ comma, 6 ] }; + key { [ period, 7 ] }; + key { [ underscore, 8 ] }; + key { [ question, 9 ] }; + key { [ percent, 0 ] }; + + key { [ parenleft, parenright ] }; + + key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; + key { [ Cyrillic_io, Cyrillic_IO ] }; }; partial alphanumeric_keys xkb_symbols "phonetic" { - name[Group1]= "Russian (phonetic)"; - - key { [ 1, exclam ] }; - key { [ 2, at ] }; - key { [ 3, Cyrillic_io ] }; - key { [ 4, Cyrillic_IO ] }; - key { [ 5, Cyrillic_hardsign ] }; - key { [ 6, Cyrillic_HARDSIGN ] }; - key { [ 7, ampersand ] }; - key { [ 8, asterisk ] }; - key { [ 9, parenleft ] }; - key { [ 0, parenright ] }; - key { [ minus, underscore ] }; - - key { [ period, greater ] }; - key { [ slash, question ] }; - key { [ comma, less ] }; - key { [ semicolon, colon ] }; - key { [ apostrophe, quotedbl ] }; - key { [ bar, brokenbar ] }; - - key { [ Cyrillic_yu, Cyrillic_YU ] }; - key { [ Cyrillic_ya, Cyrillic_YA ] }; - key { [ Cyrillic_ze, Cyrillic_ZE ] }; - key { [ Cyrillic_es, Cyrillic_ES ] }; - key { [ Cyrillic_a, Cyrillic_A ] }; - key { [ Cyrillic_ve, Cyrillic_VE ] }; - key { [ Cyrillic_tse, Cyrillic_TSE ] }; - key { [ Cyrillic_ha, Cyrillic_HA ] }; - key { [ Cyrillic_de, Cyrillic_DE ] }; - key { [ Cyrillic_ie, Cyrillic_IE ] }; - key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; - key { [ Cyrillic_ef, Cyrillic_EF ] }; - key { [ Cyrillic_te, Cyrillic_TE ] }; - key { [ Cyrillic_er, Cyrillic_ER ] }; - key { [ Cyrillic_en, Cyrillic_EN ] }; - key { [ Cyrillic_be, Cyrillic_BE ] }; - key { [ Cyrillic_che, Cyrillic_CHE ] }; - key { [ Cyrillic_ghe, Cyrillic_GHE ] }; - key { [ Cyrillic_yeru, Cyrillic_YERU ] }; - key { [ Cyrillic_em, Cyrillic_EM ] }; - key { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; - key { [ Cyrillic_u, Cyrillic_U ] }; - key { [ Cyrillic_ka, Cyrillic_KA ] }; - key { [ Cyrillic_i, Cyrillic_I ] }; - key { [ Cyrillic_o, Cyrillic_O ] }; - key { [ Cyrillic_el, Cyrillic_EL ] }; - key { [ Cyrillic_pe, Cyrillic_PE ] }; - - key { [ Cyrillic_sha, Cyrillic_SHA ] }; - key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; - key { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; - key { [ Cyrillic_e, Cyrillic_E ] }; + key { [ 1, exclam ] }; + key { [ 2, at ] }; + key { [ 3, Cyrillic_io ] }; + key { [ 4, Cyrillic_IO ] }; + key { [ 5, Cyrillic_hardsign ] }; + key { [ 6, Cyrillic_HARDSIGN ] }; + key { [ 7, ampersand ] }; + key { [ 8, asterisk ] }; + key { [ 9, parenleft ] }; + key { [ 0, parenright ] }; + key { [ minus, underscore ] }; + + key { [ period, greater ] }; + key { [ slash, question ] }; + key { [ comma, less ] }; + key { [ semicolon, colon ] }; + key { [ apostrophe, quotedbl ] }; + key { [ bar, brokenbar ] }; + + key { [ Cyrillic_yu, Cyrillic_YU ] }; + key { [ Cyrillic_ya, Cyrillic_YA ] }; + key { [ Cyrillic_ze, Cyrillic_ZE ] }; + key { [ Cyrillic_es, Cyrillic_ES ] }; + key { [ Cyrillic_a, Cyrillic_A ] }; + key { [ Cyrillic_ve, Cyrillic_VE ] }; + key { [ Cyrillic_tse, Cyrillic_TSE ] }; + key { [ Cyrillic_ha, Cyrillic_HA ] }; + key { [ Cyrillic_de, Cyrillic_DE ] }; + key { [ Cyrillic_ie, Cyrillic_IE ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; + key { [ Cyrillic_ef, Cyrillic_EF ] }; + key { [ Cyrillic_te, Cyrillic_TE ] }; + key { [ Cyrillic_er, Cyrillic_ER ] }; + key { [ Cyrillic_en, Cyrillic_EN ] }; + key { [ Cyrillic_be, Cyrillic_BE ] }; + key { [ Cyrillic_che, Cyrillic_CHE ] }; + key { [ Cyrillic_ghe, Cyrillic_GHE ] }; + key { [ Cyrillic_yeru, Cyrillic_YERU ] }; + key { [ Cyrillic_em, Cyrillic_EM ] }; + key { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; + key { [ Cyrillic_u, Cyrillic_U ] }; + key { [ Cyrillic_ka, Cyrillic_KA ] }; + key { [ Cyrillic_i, Cyrillic_I ] }; + key { [ Cyrillic_o, Cyrillic_O ] }; + key { [ Cyrillic_el, Cyrillic_EL ] }; + key { [ Cyrillic_pe, Cyrillic_PE ] }; + + key { [ Cyrillic_sha, Cyrillic_SHA ] }; + key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; + key { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; + key { [ Cyrillic_e, Cyrillic_E ] }; }; partial alphanumeric_keys @@ -212,146 +215,128 @@ xkb_symbols "phonetic_winkeys" { include "ru(phonetic)" name[Group1]= "Russian (phonetic WinKeys)"; - key { [ Cyrillic_ha, Cyrillic_HA ] }; - key { [ Cyrillic_che, Cyrillic_CHE ] }; - key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; - + key { [ Cyrillic_ha, Cyrillic_HA ] }; + key { [ Cyrillic_che, Cyrillic_CHE ] }; + key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; }; partial alphanumeric_keys xkb_symbols "tt" { + include "ru(winkeys)" name[Group1]= "Tatar"; key.type[group1]="FOUR_LEVEL"; - key { [ 0x010004bb, 0x010004ba, - Cyrillic_io, Cyrillic_IO ] }; - key { [ 0x010004e9, 0x010004e8, - Cyrillic_tse, Cyrillic_TSE ] }; - key { [ 0x010004d9, 0x010004d8, - Cyrillic_shcha, Cyrillic_SHCHA ] }; - key { [ 0x010004af, 0x010004ae, - Cyrillic_hardsign,Cyrillic_HARDSIGN ] }; - key { [ 0x010004a3, 0x010004a2, - Cyrillic_zhe, Cyrillic_ZHE ] }; - key { [ 0x01000497, 0x01000496, - Cyrillic_softsign,Cyrillic_SOFTSIGN ] }; + key { [ 0x010004bb, 0x010004ba, Cyrillic_io, Cyrillic_IO ] }; + key { [ 0x010004e9, 0x010004e8, Cyrillic_tse, Cyrillic_TSE ] }; + key { [ 0x010004d9, 0x010004d8, Cyrillic_shcha, Cyrillic_SHCHA ] }; + key { [ 0x010004af, 0x010004ae, Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; + key { [ 0x010004a3, 0x010004a2, Cyrillic_zhe, Cyrillic_ZHE ] }; + key { [ 0x01000497, 0x01000496, Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; include "level3(ralt_switch)" - }; partial alphanumeric_keys xkb_symbols "os_legacy" { - include "ru(common)" + include "ru(common)" name[Group1]= "Ossetian (legacy)"; - key { [ Cyrillic_e, Cyrillic_E ] }; - key { [ Cyrillic_o, Cyrillic_O, Cyrillic_io, Cyrillic_IO ] }; - key { [ 0x010004D5, 0x010004D4 ] }; + key { [ Cyrillic_e, Cyrillic_E ] }; + key { [ Cyrillic_o, Cyrillic_O, Cyrillic_io, Cyrillic_IO ] }; + key { [ 0x010004D5, 0x010004D4 ] }; }; partial alphanumeric_keys xkb_symbols "os_winkeys" { - include "ru(winkeys)" + include "ru(winkeys)" name[Group1]= "Ossetian (WinKeys)"; - key { [ Cyrillic_e, Cyrillic_E ] }; - key { [ Cyrillic_o, Cyrillic_O, Cyrillic_io, Cyrillic_IO ] }; - key { [ 0x010004D5, 0x010004D4 ] }; + key { [ Cyrillic_e, Cyrillic_E ] }; + key { [ Cyrillic_o, Cyrillic_O, Cyrillic_io, Cyrillic_IO ] }; + key { [ 0x010004D5, 0x010004D4 ] }; }; partial alphanumeric_keys xkb_symbols "cv" { - include "ru(winkeys)" + include "ru(winkeys)" name[Group1]= "Chuvash"; key.type[group1]="FOUR_LEVEL"; - key { [ Cyrillic_u, Cyrillic_U, - U04F3, U04F2 ] }; - key { [ Cyrillic_ie, Cyrillic_IE, - U04D7, U04D6 ] }; - key { [ Cyrillic_a, Cyrillic_A, - U04D1, U04D0 ] }; - key { [ Cyrillic_es, Cyrillic_ES, - U04AB, U04AA ] }; + key { [ Cyrillic_u, Cyrillic_U, U04F3, U04F2 ] }; + key { [ Cyrillic_ie, Cyrillic_IE, U04D7, U04D6 ] }; + key { [ Cyrillic_a, Cyrillic_A, U04D1, U04D0 ] }; + key { [ Cyrillic_es, Cyrillic_ES, U04AB, U04AA ] }; include "level3(ralt_switch)" }; partial alphanumeric_keys xkb_symbols "udm" { - include "ru(winkeys)" + include "ru(winkeys)" name[Group1]= "Udmurt"; key.type[group1]="FOUR_LEVEL"; - key { [ question, exclam, 1, 1 ] }; - key { [ parenleft, quotedbl, 2, 2 ] }; - key { [ parenright, numerosign, 3, 3 ] }; - key { [ colon, semicolon, 4, 4 ] }; - key { [ asterisk, percent, 5, 5 ] }; - key { [ 0x010004dd, 0x010004dc, 6, 6 ] }; - key { [ 0x010004e7, 0x010004e6, 7, 7 ] }; - key { [ 0x010004f5, 0x010004f4, 8, 8 ] }; - key { [ 0x010004e5, 0x010004e4, 9, 9 ] }; - key { [ 0x010004df, 0x010004de, 0, 0 ] }; + key { [ question, exclam, 1, 1 ] }; + key { [ parenleft, quotedbl, 2, 2 ] }; + key { [ parenright, numerosign, 3, 3 ] }; + key { [ colon, semicolon, 4, 4 ] }; + key { [ asterisk, percent, 5, 5 ] }; + key { [ 0x010004dd, 0x010004dc, 6, 6 ] }; + key { [ 0x010004e7, 0x010004e6, 7, 7 ] }; + key { [ 0x010004f5, 0x010004f4, 8, 8 ] }; + key { [ 0x010004e5, 0x010004e4, 9, 9 ] }; + key { [ 0x010004df, 0x010004de, 0, 0 ] }; include "level3(ralt_switch)" }; partial alphanumeric_keys xkb_symbols "cv_latin" { - include "us(alt-intl)" + include "us(alt-intl)" name[Group1]= "Chuvash (Latin)"; key.type[group1]="FOUR_LEVEL"; - key { [ q, Q, 0x01000161, 0x01000160 ] }; - key { [ w, W, udiaeresis, Udiaeresis ] }; - key { [ e, E, 0x01000115, 0x01000114 ] }; - key { [ u, U, udiaeresis, Udiaeresis ] }; - key { [ i, I, 0x0100012d, 0x0100012c ] }; - key { [ o, O, odiaeresis, Odiaeresis ] }; - key { [ a, A, abreve, Abreve ] }; - key { [ s, S, scedilla, Scedilla ] }; - key { [ g, G, gbreve, Gbreve ] }; - key { [ j, J, 0x01000131, 0x01000130 ] }; - key { [ c, C, ccedilla, Ccedilla ] }; + key { [ q, Q, 0x01000161, 0x01000160 ] }; + key { [ w, W, udiaeresis, Udiaeresis ] }; + key { [ e, E, 0x01000115, 0x01000114 ] }; + key { [ u, U, udiaeresis, Udiaeresis ] }; + key { [ i, I, 0x0100012d, 0x0100012c ] }; + key { [ o, O, odiaeresis, Odiaeresis ] }; + key { [ a, A, abreve, Abreve ] }; + key { [ s, S, scedilla, Scedilla ] }; + key { [ g, G, gbreve, Gbreve ] }; + key { [ j, J, 0x01000131, 0x01000130 ] }; + key { [ c, C, ccedilla, Ccedilla ] }; include "level3(ralt_switch)" - }; // Komi language layout -// based on -// russian standard keyboard // Vlad Shakhov -// Last Changes 2007/10/23 by Vlad Shakhov - +// last changes 2007/10/23 partial alphanumeric_keys xkb_symbols "kom" { include "ru(winkeys)" - name[Group1]= "Komi"; key.type[group1]="FOUR_LEVEL_ALPHABETIC"; -// cyrilllic o with diaeresis - key { [ Cyrillic_o, Cyrillic_O, - U04E7, U04E6 ] }; + // cyrilllic o with diaeresis + key { [ Cyrillic_o, Cyrillic_O, U04E7, U04E6 ] }; -// hard I as additional key for soft Cyrillic_I - key { [ Cyrillic_i, Cyrillic_I, - Ukrainian_i, Ukrainian_I ] }; + // hard I as additional key for soft Cyrillic_I + key { [ Cyrillic_i, Cyrillic_I, Ukrainian_i, Ukrainian_I ] }; include "level3(ralt_switch)" }; @@ -364,37 +349,23 @@ partial alphanumeric_keys xkb_symbols "sah" { include "ru(winkeys)" - name[Group1]= "Yakut"; key.type[group1]="FOUR_LEVEL_ALPHABETIC"; - key { [ Cyrillic_io, Cyrillic_IO, - U04EB, U04EA ] }; - key { [ Cyrillic_shorti, Cyrillic_SHORTI, - U048B, U048A ] }; - key { [ Cyrillic_u, Cyrillic_U, - Cyrillic_u_straight, Cyrillic_U_straight ] }; - key { [ Cyrillic_ka, Cyrillic_KA, - U04C4, U04C3 ] }; - key { [ Cyrillic_en, Cyrillic_EN, - U04A5, U04A4 ] }; - key { [ Cyrillic_ghe, Cyrillic_GHE, - U0495, U0494 ] }; - key { [ Cyrillic_ze, Cyrillic_ZE, - U04E1, U04E0 ] }; - key { [ Cyrillic_ha, Cyrillic_HA, - Cyrillic_shha, Cyrillic_SHHA ] }; - key { [ Cyrillic_o, Cyrillic_O, - Cyrillic_o_bar, Cyrillic_O_bar ] }; - key { [ Cyrillic_zhe, Cyrillic_ZHE, - U0461, U0460 ] }; - key { [ Cyrillic_che, Cyrillic_CHE, - Cyrillic_u_macron, Cyrillic_U_macron ] }; - key { [ Cyrillic_em, Cyrillic_EM, - U04C8, U04C7 ] }; - key { [ Cyrillic_i, Cyrillic_I, - Cyrillic_i_macron, Cyrillic_I_macron ] }; + key { [ Cyrillic_io, Cyrillic_IO, U04EB, U04EA ] }; + key { [ Cyrillic_shorti, Cyrillic_SHORTI, U048B, U048A ] }; + key { [ Cyrillic_u, Cyrillic_U, Cyrillic_u_straight, Cyrillic_U_straight ] }; + key { [ Cyrillic_ka, Cyrillic_KA, U04C4, U04C3 ] }; + key { [ Cyrillic_en, Cyrillic_EN, U04A5, U04A4 ] }; + key { [ Cyrillic_ghe, Cyrillic_GHE, U0495, U0494 ] }; + key { [ Cyrillic_ze, Cyrillic_ZE, U04E1, U04E0 ] }; + key { [ Cyrillic_ha, Cyrillic_HA, Cyrillic_shha, Cyrillic_SHHA ] }; + key { [ Cyrillic_o, Cyrillic_O, Cyrillic_o_bar, Cyrillic_O_bar ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE, U0461, U0460 ] }; + key { [ Cyrillic_che, Cyrillic_CHE, Cyrillic_u_macron, Cyrillic_U_macron ] }; + key { [ Cyrillic_em, Cyrillic_EM, U04C8, U04C7 ] }; + key { [ Cyrillic_i, Cyrillic_I, Cyrillic_i_macron, Cyrillic_I_macron ] }; include "level3(ralt_switch)" }; @@ -404,38 +375,37 @@ xkb_symbols "sah" { //based on the Kalmyk language layout: http://soft.oyrat.org/ //Nikolay Korneev //Toli Miron - partial alphanumeric_keys xkb_symbols "xal" { - include "ru(winkeys)" + include "ru(winkeys)" name[Group1]= "Kalmyk"; key.type[group1]="FOUR_LEVEL"; - key { [ question, exclam, 1 ] }; - key { [ numerosign, quotedbl, 2 ] }; - key { [ Cyrillic_u_straight, Cyrillic_U_straight, 3 ] }; - key { [ Cyrillic_schwa, Cyrillic_SCHWA, 4 ] }; - key { [ asterisk, percent, 5 ] }; - key { [ Cyrillic_en_descender, Cyrillic_EN_descender, 6 ] }; - key { [ Cyrillic_o_bar, Cyrillic_O_bar, 7 ] }; - key { [ Cyrillic_shha, Cyrillic_SHHA, 8 ] }; - key { [ Cyrillic_zhe_descender, Cyrillic_ZHE_descender, 9 ] }; - key { [ semicolon, colon, 0 ] }; - - key { [ parenleft, parenright, Cyrillic_io, Cyrillic_IO ] }; - - key { [ Cyrillic_tse, Cyrillic_TSE, dollar ] }; - key { [ Cyrillic_u, Cyrillic_U, EuroSign ] }; - key { [ Cyrillic_ka, Cyrillic_KA, registered ] }; - key { [ Cyrillic_ie, Cyrillic_IE, trademark ] }; - key { [ Cyrillic_ha, Cyrillic_HA, bracketleft ] }; - key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, bracketright ] }; - key { [ Cyrillic_e, Cyrillic_E, apostrophe ] }; - key { [ Cyrillic_es, Cyrillic_ES, copyright ] }; - key { [ Cyrillic_be, Cyrillic_BE, less ] }; - key { [ Cyrillic_yu, Cyrillic_YU, greater ] }; + key { [ question, exclam, 1 ] }; + key { [ numerosign, quotedbl, 2 ] }; + key { [ Cyrillic_u_straight, Cyrillic_U_straight, 3 ] }; + key { [ Cyrillic_schwa, Cyrillic_SCHWA, 4 ] }; + key { [ asterisk, percent, 5 ] }; + key { [ Cyrillic_en_descender, Cyrillic_EN_descender, 6 ] }; + key { [ Cyrillic_o_bar, Cyrillic_O_bar, 7 ] }; + key { [ Cyrillic_shha, Cyrillic_SHHA, 8 ] }; + key { [ Cyrillic_zhe_descender, Cyrillic_ZHE_descender, 9 ] }; + key { [ semicolon, colon, 0 ] }; + + key { [ parenleft, parenright, Cyrillic_io, Cyrillic_IO ] }; + + key { [ Cyrillic_tse, Cyrillic_TSE, dollar ] }; + key { [ Cyrillic_u, Cyrillic_U, EuroSign ] }; + key { [ Cyrillic_ka, Cyrillic_KA, registered ] }; + key { [ Cyrillic_ie, Cyrillic_IE, trademark ] }; + key { [ Cyrillic_ha, Cyrillic_HA, bracketleft ] }; + key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, bracketright ] }; + key { [ Cyrillic_e, Cyrillic_E, apostrophe ] }; + key { [ Cyrillic_es, Cyrillic_ES, copyright ] }; + key { [ Cyrillic_be, Cyrillic_BE, less ] }; + key { [ Cyrillic_yu, Cyrillic_YU, greater ] }; include "level3(ralt_switch)" }; @@ -444,84 +414,84 @@ partial alphanumeric_keys xkb_symbols "dos" { include "ru(common)" - name[Group1]= "Russian (DOS)"; - key { [ parenright, parenleft ] }; - key { [ 4, currency ] }; - key { [ 9, question ] }; - key { [ 0, percent ] }; + key { [ parenright, parenleft ] }; + key { [ 4, currency ] }; + key { [ 9, question ] }; + key { [ 0, percent ] }; - key { [ Cyrillic_io, Cyrillic_IO ] }; + key { [ Cyrillic_io, Cyrillic_IO ] }; }; partial alphanumeric_keys xkb_symbols "bak" { - include "ru(winkeys)" + include "ru(winkeys)" name[Group1]= "Bashkirian"; + key.type[group1]="FOUR_LEVEL"; - key { [ 0x010004d9, 0x010004d8, Cyrillic_io, Cyrillic_IO ] }; - key { [ exclam, quotedbl, 1, 1 ] }; - key { [ 0x010004e9, 0x010004e8, 2, 2 ] }; - key { [ 0x010004a1, 0x010004a0, 3, 3 ] }; - key { [ 0x01000493, 0x01000492, 4, 4 ] }; - key { [ 0x010004ab, 0x010004aa, 5, 5 ] }; - key { [ colon, semicolon, 6, 6 ] }; - key { [ 0x01000499, 0x01000498, 7, 7 ] }; - key { [ 0x010004bb, 0x010004ba, 8, 8 ] }; - key { [ question, parenleft, 9, 9 ] }; - key { [ numerosign, parenright, 0, 0 ] }; - key { [ minus, percent, minus, underscore ]}; - key { [ 0x010004af, 0x010004ae, equal, plus ]}; - key { [ 0x010004a3, 0x010004a2, backslash, slash ]}; + key { [ 0x010004d9, 0x010004d8, Cyrillic_io, Cyrillic_IO ] }; + key { [ exclam, quotedbl, 1, 1 ] }; + key { [ 0x010004e9, 0x010004e8, 2, 2 ] }; + key { [ 0x010004a1, 0x010004a0, 3, 3 ] }; + key { [ 0x01000493, 0x01000492, 4, 4 ] }; + key { [ 0x010004ab, 0x010004aa, 5, 5 ] }; + key { [ colon, semicolon, 6, 6 ] }; + key { [ 0x01000499, 0x01000498, 7, 7 ] }; + key { [ 0x010004bb, 0x010004ba, 8, 8 ] }; + key { [ question, parenleft, 9, 9 ] }; + key { [ numerosign, parenright, 0, 0 ] }; + key { [ minus, percent, minus, underscore ] }; + key { [ 0x010004af, 0x010004ae, equal, plus ] }; + key { [ 0x010004a3, 0x010004a2, backslash, slash ] }; include "level3(ralt_switch)" }; -// Serbian charecters added as third level symbols to Russian keyboard layout. - +// Serbian characters are added as third-level symbols to Russian keyboard layout. partial alphanumeric_keys xkb_symbols "srp" { - include "ru(common)" - include "level3(ralt_switch)" + include "ru(common)" name[Group1]= "Serbian (Russia)"; - key { [ 3, numerosign ] }; - key { [ 4, semicolon ] }; - key { [ 5, percent ] }; - key { [ 6, colon ] }; - key { [ 7, question ] }; - key { [ 8, asterisk ] }; - key { [ period, comma ] }; - key { [ backslash, slash ] }; - key { [ Cyrillic_shorti, Cyrillic_SHORTI, U458, U408 ] }; - key { [ Cyrillic_en, Cyrillic_EN, U45A, U40A ] }; - key { [ Cyrillic_el, Cyrillic_EL, U459, U409 ] }; - key { [ Cyrillic_de, Cyrillic_DE, U45F, U40F ] }; - key { [ Cyrillic_zhe, Cyrillic_ZHE, U452, U402 ] }; - key { [ Cyrillic_che, Cyrillic_CHE, U45B, U40B ] }; + key { [ 3, numerosign ] }; + key { [ 4, semicolon ] }; + key { [ 5, percent ] }; + key { [ 6, colon ] }; + key { [ 7, question ] }; + key { [ 8, asterisk ] }; + key { [ period, comma ] }; + key { [ backslash, slash ] }; + key { [ Cyrillic_shorti, Cyrillic_SHORTI, U458, U408 ] }; + key { [ Cyrillic_en, Cyrillic_EN, U45A, U40A ] }; + key { [ Cyrillic_el, Cyrillic_EL, U459, U409 ] }; + key { [ Cyrillic_de, Cyrillic_DE, U45F, U40F ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE, U452, U402 ] }; + key { [ Cyrillic_che, Cyrillic_CHE, U45B, U40B ] }; + + include "level3(ralt_switch)" }; // Mari language layout -// based on Russian standard keyboard // http://www.marlamuter.ru/ partial alphanumeric_keys xkb_symbols "chm" { - include "ru(common)" + include "ru(common)" name[Group1]= "Mari"; key.type[group1]="FOUR_LEVEL_ALPHABETIC"; - key { [ Cyrillic_a, Cyrillic_A, U04D3, U04D2 ] }; - key { [ Cyrillic_u, Cyrillic_U, U04F1, U04F0 ] }; - key { [ Cyrillic_ui, Cyrillic_UI, U04F9, U04F8 ] }; - key { [ Cyrillic_n, Cyrillic_N, U04A5, U04A4 ] }; - key { [ Cyrillic_e, Cyrillic_E, U04E9, U04E8 ] }; - key { [ Cyrillic_zh, Cyrillic_ZH, U04EB, U04EA ] }; - key { [ Cyrillic_f, Cyrillic_F, UF537, UF536 ] }; + + key { [ Cyrillic_a, Cyrillic_A, U04D3, U04D2 ] }; + key { [ Cyrillic_u, Cyrillic_U, U04F1, U04F0 ] }; + key { [ Cyrillic_yeru, Cyrillic_YERU, U04F9, U04F8 ] }; + key { [ Cyrillic_en, Cyrillic_EN, U04A5, U04A4 ] }; + key { [ Cyrillic_e, Cyrillic_E, U04E9, U04E8 ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE, U04EB, U04EA ] }; + key { [ Cyrillic_ef, Cyrillic_EF, UF537, UF536 ] }; include "level3(ralt_switch)" }; @@ -529,71 +499,73 @@ xkb_symbols "chm" { // EXTRAS: // Church Slavonic language layout -// based on -// russian standard keyboard -// Aleksandr Andreev and Yuri Shardt -// Last Changes 2010/08/01. Contact - +// based on the Russian standard keyboard +// by Aleksandr Andreev and Yuri Shardt +// last changes 2010/08/01; contact partial alphanumeric_keys -xkb_symbols "chu" -{ - name[Group1]= "Church Slavonic"; - key { [ U0457, U0407, U0482, U20DD ] }; // ї Ї ҂ e.g: а⃝ where the last is a combining ten thousands sign - key { [ U0461, U0460, U047D, U047C] }; // ѡ Ѡ ѽ Ѽ - key { [ U0454, U0404, U0465, U0464] }; // є Є ѥ Ѥ - key { [ U046F, U046E, U0469, U0468] }; // ѯ Ѯ ѩ Ѩ - key { [ U0471, U0470, U046D, U046C] }; // ѱ Ѱ ѭ Ѭ - key { [ U0473, U0472, UA657, UA656] }; // ѳ Ѳ iotified A - key { [ U0475, U0474, U0477, U0476] }; // ѵ Ѵ ѷ Ѷ - key { [ U047B, U047A, UA64D, UA64C] }; // ѻ Ѻ ꙍ Ꙍ - key { [ U047F, U047E, U046B, U046A] }; // ѿ Ѿ ѫ Ѫ - key { [ U0455, U0405, parenleft, U002A ] }; // ѕ Ѕ ( * - key { [ Cyrillic_u, Cyrillic_U, parenright, U0488 ] }; // у У ) NB: for diagraph Ouk, use Cyrillic_o + Cyrillic_u - key { [ U0483, U0486, U0487, U005F] }; // а҃ а҆ а҇, _ (titlo, psili, pokrytie, underscore) - key { [ U0301, U0300, U0484, UA67E] }; // а̀ а́ а҄ ꙾ (oxia, varia, kamora, kavyka) - key { [ Cyrillic_shorti, Cyrillic_SHORTI, U0456 ] }; - key { [ Cyrillic_tse, Cyrillic_TSE, U2DF0 ] }; - key { [ UA64B, UA64A, U2DF9 ] }; // Cyrillic monograph Uk (not U)! - key { [ Cyrillic_ka, Cyrillic_KA, U2DE6 ] }; - key { [ Cyrillic_ie, Cyrillic_IE, U2DF7 ] }; - key { [ Cyrillic_en, Cyrillic_EN, U2DE9 ] }; - key { [ Cyrillic_ghe, Cyrillic_GHE, U2DE2 ] }; - key { [ Cyrillic_sha, Cyrillic_SHA, U2DF2 ] }; - key { [ Cyrillic_shcha, Cyrillic_SHCHA, U2DF3 ] }; - key { [ Cyrillic_ze, Cyrillic_ZE, U2DE5 ] }; - key { [ Cyrillic_ha, Cyrillic_HA, U2DEF ] }; - key { [Cyrillic_hardsign,Cyrillic_HARDSIGN, UA67D ] }; // Payerok - key { [backslash, slash, colon, question] }; // \ / : ? (note, for Slavonic question use semicolon - key { [ Cyrillic_ef, Cyrillic_EF ] }; - key { [ Cyrillic_yeru, Cyrillic_YERU ] }; - key { [ Cyrillic_ve, Cyrillic_VE, U2DE1 ] }; - key { [ Cyrillic_a, Cyrillic_A, U2DF6 ] }; - key { [ Cyrillic_pe, Cyrillic_PE, U2DEB ] }; - key { [ Cyrillic_er, Cyrillic_ER, U2DEC ] }; - key { [ Cyrillic_o, Cyrillic_O, U2DEA ] }; - key { [ Cyrillic_el, Cyrillic_EL, U2DE7 ] }; - key { [ Cyrillic_de, Cyrillic_DE, U2DE3 ] }; - key { [ Cyrillic_zhe, Cyrillic_ZHE, U2DE4 ] }; - key { [ U0463, U0462, U2DFA ] }; // Yat - key { [ U0467, U0466, U2DFD ] }; // Small Yus - key { [ Cyrillic_che, Cyrillic_CHE, U2DF1 ] }; - key { [ Cyrillic_es, Cyrillic_ES, U2DED ] }; - key { [ Cyrillic_em, Cyrillic_EM, U2DE8 ] }; - key { [ Cyrillic_i, Cyrillic_I ] }; - key { [ Cyrillic_te, Cyrillic_TE, U2DEE ] }; - key { [Cyrillic_softsign,Cyrillic_SOFTSIGN ] }; - key { [ Cyrillic_be, Cyrillic_BE, U2DE0 ] }; - key { [ Cyrillic_yu, Cyrillic_YU, U2DFB ] }; - key { [ period, comma, semicolon, exclam ] }; +xkb_symbols "chu" { + + name[Group1]= "Church Slavonic"; + + key { [ U0457, U0407, U0482, U20DD ] }; // ї Ї ҂ e.g: а⃝ where the last is a combining ten thousands sign + key { [ U0461, U0460, U047D, U047C ] }; // ѡ Ѡ ѽ Ѽ + key { [ U0454, U0404, U0465, U0464 ] }; // є Є ѥ Ѥ + key { [ U046F, U046E, U0469, U0468 ] }; // ѯ Ѯ ѩ Ѩ + key { [ U0471, U0470, U046D, U046C ] }; // ѱ Ѱ ѭ Ѭ + key { [ U0473, U0472, UA657, UA656 ] }; // ѳ Ѳ iotified A + key { [ U0475, U0474, U0477, U0476 ] }; // ѵ Ѵ ѷ Ѷ + key { [ U047B, U047A, UA64D, UA64C ] }; // ѻ Ѻ ꙍ Ꙍ + key { [ U047F, U047E, U046B, U046A ] }; // ѿ Ѿ ѫ Ѫ + key { [ U0455, U0405,parenleft,U002A ] }; // ѕ Ѕ ( * + key { [Cyrillic_u,Cyrillic_U,parenright,U0488]}; // у У ) NB: for digraph Ouk, use Cyrillic_o + Cyrillic_u + key { [ U0483, U0486, U0487, U005F ] }; // а҃ а҆ а҇, _ (titlo, psili, pokrytie, underscore) + key { [ U0301, U0300, U0484, UA67E ] }; // а̀ а́ а҄ ꙾ (oxia, varia, kamora, kavyka) + + key { [ Cyrillic_shorti, Cyrillic_SHORTI, U0456 ] }; + key { [ Cyrillic_tse, Cyrillic_TSE, U2DF0 ] }; + key { [ UA64B, UA64A, U2DF9 ] }; // Cyrillic monograph Uk (not U)! + key { [ Cyrillic_ka, Cyrillic_KA, U2DE6 ] }; + key { [ Cyrillic_ie, Cyrillic_IE, U2DF7 ] }; + key { [ Cyrillic_en, Cyrillic_EN, U2DE9 ] }; + key { [ Cyrillic_ghe, Cyrillic_GHE, U2DE2 ] }; + key { [ Cyrillic_sha, Cyrillic_SHA, U2DF2 ] }; + key { [ Cyrillic_shcha, Cyrillic_SHCHA, U2DF3 ] }; + key { [ Cyrillic_ze, Cyrillic_ZE, U2DE5 ] }; + key { [ Cyrillic_ha, Cyrillic_HA, U2DEF ] }; + key { [Cyrillic_hardsign,Cyrillic_HARDSIGN, UA67D ] }; // Payerok + key { [ backslash, slash, colon, question ] }; // \ / : ? NB: for Slavonic question, use semicolon + + key { [ Cyrillic_ef, Cyrillic_EF ] }; + key { [ Cyrillic_yeru, Cyrillic_YERU ] }; + key { [ Cyrillic_ve, Cyrillic_VE, U2DE1 ] }; + key { [ Cyrillic_a, Cyrillic_A, U2DF6 ] }; + key { [ Cyrillic_pe, Cyrillic_PE, U2DEB ] }; + key { [ Cyrillic_er, Cyrillic_ER, U2DEC ] }; + key { [ Cyrillic_o, Cyrillic_O, U2DEA ] }; + key { [ Cyrillic_el, Cyrillic_EL, U2DE7 ] }; + key { [ Cyrillic_de, Cyrillic_DE, U2DE3 ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE, U2DE4 ] }; + key { [ U0463, U0462, U2DFA ] }; // Yat + + key { [ U0467, U0466, U2DFD ] }; // Small Yus + key { [ Cyrillic_che, Cyrillic_CHE, U2DF1 ] }; + key { [ Cyrillic_es, Cyrillic_ES, U2DED ] }; + key { [ Cyrillic_em, Cyrillic_EM, U2DE8 ] }; + key { [ Cyrillic_i, Cyrillic_I ] }; + key { [ Cyrillic_te, Cyrillic_TE, U2DEE ] }; + key { [Cyrillic_softsign,Cyrillic_SOFTSIGN ] }; + key { [ Cyrillic_be, Cyrillic_BE, U2DE0 ] }; + key { [ Cyrillic_yu, Cyrillic_YU, U2DFB ] }; + key { [ period, comma, semicolon, exclam ] }; }; // RUU (Russian-Ukrainian United keyboard layout). -// Modified Russian standart keyboard with third level contains Ukrainian -// and Belorusian alphabetic letters and commonly used Unicode symbols. -// Description http://wiki.opennet.ru/RUU [russian] +// This is a modified Russian standard keyboard, with the third level containing +// Ukrainian and Belorusian alphabetic letters and commonly used Unicode symbols. +// For a description see http://wiki.opennet.ru/RUU [in Russian]. // Vasyĺ V. Vercynśkyj -// Last Changes 2011/05/11 +// last changes 2011/05/11 // // ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓ // │ ' ~ │ ! ≈ │ " ∞ │ № ₴ │ ; € │ % ‰ │ : ≤ │ ? ≥ │ * × │ ( { │ ) } │ _ – │ + ± ┃ ⌫ ┃ @@ -611,43 +583,43 @@ xkb_symbols "chu" // ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ // ┃ Ctrl ┃ Meta ┃ Alt ┃ Space ┃AltGr ⇮┃ Menu ┃ Ctrl ┃ // ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛ - - - partial alphanumeric_keys xkb_symbols "ruu" { - include "ru(common)" + include "ru(common)" name[Group1]= "Russian (with Ukrainian-Belorussian layout)"; - key { [ U2019, apostrophe, U0301, asciitilde ] }; // Apostrophe and Stress symbol - key { [ 1, exclam, U00F7, U2248 ] }; // Division Sign and Almost Equal To - key { [ 2, quotedbl, currency, infinity ] }; - key { [ 3, numerosign, U00A7, U20B4 ] }; // Paragraph and Hryvnia sign - key { [ 4, semicolon, dollar, EuroSign ] }; - key { [ 5, percent, degree, U2030 ] }; // Per Mille Sign - key { [ 6, colon, less, U2264 ] }; // Less-Than Or Equal To - key { [ 7, question, greater, U2265 ] }; // Greater-Than Or Equal To - key { [ 8, asterisk, enfilledcircbullet, U00D7 ] }; // Multiplication Sign - key { [ 9, parenleft, bracketleft, braceleft ] }; - key { [ 0, parenright, bracketright, braceright ] }; - key { [ minus, underscore, emdash, endash ] }; - key { [ equal, plus, notequal, plusminus ] }; - key { [ Cyrillic_u, Cyrillic_U, Byelorussian_shortu, Byelorussian_SHORTU ] }; - key { [ Cyrillic_ka, Cyrillic_KA, registered ] }; // Registered tm - key { [ Cyrillic_ie, Cyrillic_IE, Cyrillic_io, Cyrillic_IO ] }; - key { [Cyrillic_ghe, Cyrillic_GHE, Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; - key { [ Cyrillic_ze, Cyrillic_ZE, U00B6 ] }; // Pilcrow Sign - key { [Cyrillic_hardsign, Cyrillic_HARDSIGN, Ukrainian_yi, Ukrainian_YI ] }; - key { [ Cyrillic_yeru, Cyrillic_YERU, Ukrainian_i, Ukrainian_I ] }; - key { [ Cyrillic_e, Cyrillic_E, Ukrainian_ie,Ukrainian_IE ] }; - key { [ slash, bar, backslash, U00A6 ] }; // Broken Bar - key { [ Cyrillic_es, Cyrillic_ES, copyright ] }; - key { [ Cyrillic_te, Cyrillic_TE, trademark ] }; - key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN, U00B5 ] }; // Micro Sign - key { [ Cyrillic_be, Cyrillic_BE, guillemotleft, doublelowquotemark ] }; - key { [ Cyrillic_yu, Cyrillic_YU, guillemotright, leftdoublequotemark ] }; - key { [ period, comma, slash, ellipsis ] }; + key { [ U2019, apostrophe, U0301, asciitilde ] }; // Apostrophe and Stress symbol + key { [ 1, exclam, U00F7, U2248 ] }; // Division Sign and Almost Equal To + key { [ 2, quotedbl, currency, infinity ] }; + key { [ 3, numerosign, U00A7, U20B4 ] }; // Paragraph and Hryvnia sign + key { [ 4, semicolon, dollar, EuroSign ] }; + key { [ 5, percent, degree, U2030 ] }; // Per Mille Sign + key { [ 6, colon, less, U2264 ] }; // Less-Than Or Equal To + key { [ 7, question, greater, U2265 ] }; // Greater-Than Or Equal To + key { [ 8, asterisk, enfilledcircbullet, U00D7 ] }; // Multiplication Sign + key { [ 9, parenleft, bracketleft, braceleft ] }; + key { [ 0, parenright, bracketright, braceright ] }; + key { [ minus, underscore, emdash, endash ] }; + key { [ equal, plus, notequal, plusminus ] }; + + key { [ Cyrillic_u, Cyrillic_U, Byelorussian_shortu, Byelorussian_SHORTU ] }; + key { [ Cyrillic_ka, Cyrillic_KA, registered ] }; // Registered tm + key { [ Cyrillic_ie, Cyrillic_IE, Cyrillic_io, Cyrillic_IO ] }; + key { [ Cyrillic_ghe, Cyrillic_GHE, Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; + key { [ Cyrillic_ze, Cyrillic_ZE, U00B6 ] }; // Pilcrow Sign + key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, Ukrainian_yi, Ukrainian_YI ] }; + + key { [ Cyrillic_yeru, Cyrillic_YERU, Ukrainian_i, Ukrainian_I ] }; + key { [ Cyrillic_e, Cyrillic_E, Ukrainian_ie, Ukrainian_IE ] }; + key { [ slash, bar, backslash, U00A6 ] }; // Broken Bar + + key { [ Cyrillic_es, Cyrillic_ES, copyright ] }; + key { [ Cyrillic_te, Cyrillic_TE, trademark ] }; + key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN, U00B5 ] }; // Micro Sign + key { [ Cyrillic_be, Cyrillic_BE, guillemotleft, doublelowquotemark ] }; + key { [ Cyrillic_yu, Cyrillic_YU, guillemotright, leftdoublequotemark ] }; + key { [ period, comma, slash, ellipsis ] }; include "level3(ralt_switch)" }; @@ -660,18 +632,18 @@ partial alphanumeric_keys // Apple layout partial alphanumeric_keys xkb_symbols "mac" { -include "ru(common)" + include "ru(common)" name[Group1]= "Russian (Macintosh)"; - key { [ less, greater ] }; - key { [ 2, quotedbl ] }; - key { [ 3, numerosign ] }; - key { [ 4, percent ] }; - key { [ 5, colon ] }; - key { [ 6, comma ] }; - key { [ 7, period ] }; - key { [ 8, semicolon ] }; - key { [ bracketright, bracketleft ] }; - key { [ Cyrillic_io, Cyrillic_IO ] }; + key { [ less, greater ] }; + key { [ 2, quotedbl ] }; + key { [ 3, numerosign ] }; + key { [ 4, percent ] }; + key { [ 5, colon ] }; + key { [ 6, comma ] }; + key { [ 7, period ] }; + key { [ 8, semicolon ] }; + key { [ bracketright, bracketleft ] }; + key { [ Cyrillic_io, Cyrillic_IO ] }; }; diff --git a/xorg-server/xkeyboard-config/symbols/se b/xorg-server/xkeyboard-config/symbols/se index 320a1861d..be07cadf9 100644 --- a/xorg-server/xkeyboard-config/symbols/se +++ b/xorg-server/xkeyboard-config/symbols/se @@ -309,3 +309,54 @@ partial alphanumeric_keys xkb_symbols "sun_type6" { include "sun_vndr/se(sun_type6)" }; + +partial alphanumeric_keys +xkb_symbols "dvorak_a5" { + + include "se(basic)" + + name[Group1]="Swedish (Dvorak A5)"; + + key { [ dead_acute, dead_grave, plusminus, none ] }; + + key { [ aring, Aring, braceleft, none ] }; + key { [ adiaeresis, Adiaeresis, braceright, none ] }; + key { [ odiaeresis, Odiaeresis, bracketleft, none ] }; + key { [ p, P, bracketright, none ] }; + key { [ y, Y, dollar, none ] }; + key { [ f, F, quotedbl, none ] }; + key { [ g, G, question, none ] }; + key { [ c, C, ampersand, none ] }; + key { [ r, R, less, none ] }; + key { [ l, L, greater, none ] }; + key { [ comma, semicolon, dead_cedilla, none ] }; + key { [ dead_diaeresis, dead_circumflex, dead_tilde, asciicircum ] }; + + key { [ a, A, semicolon, none ] }; + key { [ o, O, slash, none ] }; + key { [ e, E, parenleft, none ] }; + key { [ u, U, parenright, none ] }; + key { [ i, I, bar, none ] }; + key { [ d, D, numbersign, none ] }; + key { [ h, H, asciicircum, none ] }; + key { [ t, T, numbersign, none ] }; + key { [ n, N, quotedbl, none ] }; + key { [ s, S, asciitilde, none ] }; + key { [ minus, underscore, grave, none ] }; + + key { [ period, colon, colon, none ] }; + key { [ q, Q, equal, none ] }; + key { [ j, J, at, none ] }; + key { [ k, K, exclam, none ] }; + key { [ x, X, backslash, none ] }; + key { [ b, B, percent, none ] }; + key { [ m, M, grave, none ] }; + key { [ w, W, lstroke, none ] }; + key { [ v, V, leftdoublequotemark, none ] }; + key { [ z, Z, guillemotleft, none ] }; + + key { [ apostrophe, asterisk, asterisk, none ] }; + +}; + + diff --git a/xorg-server/xkeyboard-config/symbols/sk b/xorg-server/xkeyboard-config/symbols/sk index 2162d533d..3be0b92e8 100644 --- a/xorg-server/xkeyboard-config/symbols/sk +++ b/xorg-server/xkeyboard-config/symbols/sk @@ -1,105 +1,105 @@ default partial alphanumeric_keys xkb_symbols "basic" { - // This layout conforms to a new sk compromise standard designed - // to satisfy most unix, windows and mac users. - // 2001 by Kamil Toman + // This layout conforms to a new Slovak compromise standard + // designed to satisfy most Unix, Windows and Mac users. + // 2001 by Kamil Toman include "latin" - name[Group1] = "Slovak"; - key { [ semicolon, dead_abovering, grave, asciitilde ] }; - key { [ plus, 1, exclam, dead_tilde ] }; - key { [ lcaron, 2, at, dead_caron ] }; - key { [ scaron, 3, numbersign, dead_circumflex ] }; - key { [ ccaron, 4, dollar, dead_breve ] }; - key { [ tcaron, 5, percent, dead_abovering ] }; - key { [ zcaron, 6, asciicircum, dead_ogonek ] }; - key { [ yacute, 7, ampersand, dead_grave ] }; - key { [ aacute, 8, asterisk, dead_abovedot ] }; - key { [ iacute, 9, braceleft, dead_acute ] }; - key { [ eacute, 0, braceright, dead_doubleacute ] }; - key { [ equal, percent, NoSymbol, dead_diaeresis ] }; - key { [dead_acute, dead_caron, dead_macron, dead_cedilla ] }; - - key { [ q, Q, backslash, NoSymbol ] }; - key { [ w, W, bar, Nosymbol ] }; - key { [ e, E, EuroSign, NoSymbol ] }; - key { [ r, R, NoSymbol, NoSymbol ] }; - key { [ t, T, NoSymbol, NoSymbol ] }; - key { [ z, Z, NoSymbol, NoSymbol ] }; - key { [ u, U, NoSymbol, NoSymbol ] }; - key { [ i, I, NoSymbol, NoSymbol ] }; - key { [ o, O, NoSymbol, NoSymbol ] }; - key { [ p, P, NoSymbol, NoSymbol ] }; - - key { [ uacute, slash, bracketleft, division ] }; - key { [adiaeresis, parenleft, bracketright, multiply ] }; - - key { [ a, A, asciitilde, NoSymbol ] }; - key { [ s, S, dstroke, NoSymbol ] }; - key { [ d, D, Dstroke, NoSymbol ] }; - key { [ f, F, bracketleft, NoSymbol ] }; - key { [ g, G, bracketright, NoSymbol ] }; - key { [ h, H, grave, NoSymbol ] }; - key { [ j, J, apostrophe, NoSymbol ] }; - key { [ k, K, lstroke, NoSymbol ] }; - key { [ l, L, Lstroke, NoSymbol ] }; - - key { [ocircumflex, quotedbl, dollar, NoSymbol ] }; - key { [ section, exclam, apostrophe, ssharp ] }; - key { [ EuroSign, dead_diaeresis, NoSymbol, NoSymbol ] }; - key { [ ncaron, parenright, backslash, bar ] }; - - key { [ backslash, bar, slash, NoSymbol ] }; - key { [ y, Y, degree, NoSymbol ] }; - key { [ x, X, numbersign, Nosymbol ] }; - key { [ c, C, ampersand, NoSymbol ] }; - key { [ v, V, at, NoSymbol ] }; - key { [ b, B, braceleft, NoSymbol ] }; - key { [ n, N, braceright, NoSymbol ] }; - key { [ m, M, asciicircum, NoSymbol ] }; - key { [ comma, question, less, NoSymbol ] }; - key { [ period, colon, greater, NoSymbol ] }; - key { [ minus, underscore, asterisk, NoSymbol ] }; + key { [ semicolon, dead_abovering, grave, asciitilde ] }; + key { [ plus, 1, exclam, dead_tilde ] }; + key { [ lcaron, 2, at, dead_caron ] }; + key { [ scaron, 3, numbersign, dead_circumflex ] }; + key { [ ccaron, 4, dollar, dead_breve ] }; + key { [ tcaron, 5, percent, dead_abovering]}; + key { [ zcaron, 6, asciicircum, dead_ogonek ] }; + key { [ yacute, 7, ampersand, dead_grave ] }; + key { [ aacute, 8, asterisk, dead_abovedot] }; + key { [ iacute, 9, braceleft, dead_acute ] }; + key { [ eacute, 0, braceright, dead_doubleacute ] }; + key { [ equal, percent, NoSymbol, dead_diaeresis]}; + key { [dead_acute, dead_caron, dead_macron, dead_cedilla ] }; + + key { [ q, Q, backslash, NoSymbol ] }; + key { [ w, W, bar, Nosymbol ] }; + key { [ e, E, EuroSign, NoSymbol ] }; + key { [ r, R, NoSymbol, NoSymbol ] }; + key { [ t, T, NoSymbol, NoSymbol ] }; + key { [ z, Z, NoSymbol, NoSymbol ] }; + key { [ u, U, NoSymbol, NoSymbol ] }; + key { [ i, I, NoSymbol, NoSymbol ] }; + key { [ o, O, NoSymbol, NoSymbol ] }; + key { [ p, P, NoSymbol, NoSymbol ] }; + + key { [ uacute, slash, bracketleft, division ] }; + key { [adiaeresis, parenleft, bracketright, multiply ] }; + + key { [ a, A, asciitilde, NoSymbol ] }; + key { [ s, S, dstroke, NoSymbol ] }; + key { [ d, D, Dstroke, NoSymbol ] }; + key { [ f, F, bracketleft, NoSymbol ] }; + key { [ g, G, bracketright, NoSymbol ] }; + key { [ h, H, grave, NoSymbol ] }; + key { [ j, J, apostrophe, NoSymbol ] }; + key { [ k, K, lstroke, NoSymbol ] }; + key { [ l, L, Lstroke, NoSymbol ] }; + + key { [ocircumflex, quotedbl, dollar, NoSymbol ] }; + key { [ section, exclam, apostrophe, ssharp ] }; + key { [ EuroSign, dead_diaeresis, NoSymbol, NoSymbol ] }; + key { [ ncaron, parenright, backslash, bar ] }; + + key { [ backslash, bar, slash, NoSymbol ] }; + key { [ y, Y, degree, NoSymbol ] }; + key { [ x, X, numbersign, Nosymbol ] }; + key { [ c, C, ampersand, NoSymbol ] }; + key { [ v, V, at, NoSymbol ] }; + key { [ b, B, braceleft, NoSymbol ] }; + key { [ n, N, braceright, NoSymbol ] }; + key { [ m, M, asciicircum, NoSymbol ] }; + key { [ comma, question, less, NoSymbol ] }; + key { [ period, colon, greater, NoSymbol ] }; + key { [ minus, underscore, asterisk, NoSymbol ] }; key { [ space, space, nobreakspace, nobreakspace ] }; include "level3(ralt_switch)" }; -// Use instead of (useful for keyboard without key) xkb_symbols "bksl" { - include "sk(basic)" + // Use instead of (useful for keyboards without key). + + include "sk(basic)" name[Group1] = "Slovak (extended Backslash)"; - key { [ backslash, bar, slash, NoSymbol ] }; + key { [ backslash, bar, slash, NoSymbol ] }; }; partial alphanumeric_keys xkb_symbols "qwerty" { - // This layout should work exactly as a sk with the exception - // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped). + // This layout works exactly as the basic Slovak one with the exception + // of the 'Z' and 'Y' keys, which are in Qwerty style (i.e. swapped). // 2001 by Kamil Toman include "sk(basic)" - name[Group1] = "Slovak (qwerty)"; - key { [ z, Z, degree, NoSymbol ] }; - key { [ y, Y, NoSymbol, NoSymbol ] }; + key { [ z, Z, degree, NoSymbol ] }; + key { [ y, Y, NoSymbol, NoSymbol ] }; }; -// Use instead of (useful for keyboard without key) xkb_symbols "qwerty_bksl" { - include "sk(qwerty)" + // Use instead of (useful for keyboards without key). + + include "sk(qwerty)" name[Group1] = "Slovak (qwerty, extended Backslash)"; - key { [ backslash, bar, slash, NoSymbol ] }; + key { [ backslash, bar, slash, NoSymbol ] }; }; // EXTRAS: diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/pl b/xorg-server/xkeyboard-config/symbols/sun_vndr/pl index d5a7f5b04..15e96ef15 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/pl +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/pl @@ -40,7 +40,7 @@ xkb_symbols "sun_type6" { key { [ 3, numbersign ] }; key { [ 4, dollar ] }; key { [ 5, percent ] }; - key { [ 6, asciicirum ] }; + key { [ 6, asciicircum ] }; key { [ 7, ampersand ] }; key { [ 8, asterisk ] }; key { [ 9, parenleft ] }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk index 18696bb3f..0d161a7f0 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk @@ -34,7 +34,7 @@ xkb_symbols "sun_type6" { include "sun_vndr/us(sun_type6)" - key { [ semicolon, dead_abovering, grave asciitilde ] }; + key { [ semicolon, dead_abovering, grave, asciitilde ] }; key { [ plus, 1, exclam, asciitilde ] }; key { [ lcaron, 2, at, dead_caron ] }; key { [ scaron, 3, numbersign, dead_circumflex ] }; diff --git a/xorg-server/xkeyboard-config/symbols/tr b/xorg-server/xkeyboard-config/symbols/tr index 1c288524b..15dd59ca6 100644 --- a/xorg-server/xkeyboard-config/symbols/tr +++ b/xorg-server/xkeyboard-config/symbols/tr @@ -1,9 +1,8 @@ -// based on -// Turkish keyboard symbols for PC and xkb -// This file distributed without any expressed or implied warranty +// Keyboard layouts for Turkey. +// This file distributed without any expressed or implied warranty. // Nilgün Belma Bugüner , 2005 -//Default Layout (Turkish Q) +// Turkish Q layout default partial xkb_symbols "basic" { @@ -11,54 +10,54 @@ xkb_symbols "basic" { name[Group1]="Turkish"; - key { [ 1, exclam, greater, exclamdown ] }; - key { [ 2, apostrophe, sterling, twosuperior ] }; - key { [ 3, asciicircum, numbersign, threesuperior ] }; - key { [ 4, plus, dollar, onequarter ] }; - key { [ 6, ampersand, threequarters, VoidSymbol ] }; - key { [ 7, slash, braceleft, VoidSymbol ] }; - key { [ 8, parenleft, bracketleft, VoidSymbol ] }; - key { [ 9, parenright, bracketright, plusminus ] }; - key { [ 0, equal, braceright, degree ] }; - key { [ asterisk, question, backslash, questiondown ] }; - key { [ minus, underscore, bar, VoidSymbol ] }; - - key { [ w, W, VoidSymbol, VoidSymbol ] }; - key { [ e, E, EuroSign, VoidSymbol ] }; - key { [ t, T, trademark, VoidSymbol ] }; - key { [ u, U, ucircumflex, Ucircumflex ] }; - key { type[group1] = "FOUR_LEVEL_ALPHABETIC", - [ idotless, I, icircumflex, Icircumflex ] }; - key { [ o, O, ocircumflex, Ocircumflex ] }; - key { [ p, P, VoidSymbol, VoidSymbol ] }; - key { [ gbreve, Gbreve ] }; - key { [udiaeresis, Udiaeresis, asciitilde, dead_macron ] }; - - key { [ a, A, acircumflex, Acircumflex ] }; - key { [ s, S, section, VoidSymbol ] }; - key { [ d, D, VoidSymbol, VoidSymbol ] }; - key { [ f, F, ordfeminine, VoidSymbol ] }; - key { [ g, G, VoidSymbol, VoidSymbol ] }; - key { [ h, H, VoidSymbol, VoidSymbol ] }; - key { [ k, K, VoidSymbol, VoidSymbol ] }; - key { [ l, L, VoidSymbol, VoidSymbol ] }; - key { [ scedilla, Scedilla, acute, dead_acute ] }; - key { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", - [ i, Iabovedot, apostrophe, dead_caron ] }; - key { [ quotedbl, eacute, less, degree ] }; - - key { [ comma, semicolon, grave, dead_grave ] }; - key { [ less, greater, bar, brokenbar ] }; - key { [odiaeresis, Odiaeresis, multiply, VoidSymbol ] }; - key { [ ccedilla, Ccedilla, periodcentered, division ] }; - key { [ period, colon, dead_abovedot, dead_abovedot ] }; + key { [ 1, exclam, greater, exclamdown ] }; + key { [ 2, apostrophe, sterling, twosuperior ] }; + key { [ 3,asciicircum, numbersign, threesuperior ] }; + key { [ 4, plus, dollar, onequarter ] }; + key { [ 6, ampersand, threequarters, VoidSymbol ] }; + key { [ 7, slash, braceleft, VoidSymbol ] }; + key { [ 8, parenleft, bracketleft, VoidSymbol ] }; + key { [ 9, parenright, bracketright, plusminus ] }; + key { [ 0, equal, braceright, degree ] }; + key { [ asterisk, question, backslash, questiondown ] }; + key { [ minus, underscore, bar, VoidSymbol ] }; + + key { [ w, W, VoidSymbol, VoidSymbol ] }; + key { [ e, E, EuroSign, VoidSymbol ] }; + key { [ t, T, trademark, VoidSymbol ] }; + key { [ u, U, ucircumflex, Ucircumflex ] }; + key { type[group1] = "FOUR_LEVEL_ALPHABETIC", + [ idotless, I, icircumflex, Icircumflex ] }; + key { [ o, O, ocircumflex, Ocircumflex ] }; + key { [ p, P, VoidSymbol, VoidSymbol ] }; + key { [ gbreve, Gbreve ] }; + key { [udiaeresis, Udiaeresis, asciitilde, dead_macron ] }; + + key { [ a, A, acircumflex, Acircumflex ] }; + key { [ s, S, section, VoidSymbol ] }; + key { [ d, D, VoidSymbol, VoidSymbol ] }; + key { [ f, F, ordfeminine, VoidSymbol ] }; + key { [ g, G, VoidSymbol, VoidSymbol ] }; + key { [ h, H, VoidSymbol, VoidSymbol ] }; + key { [ k, K, VoidSymbol, VoidSymbol ] }; + key { [ l, L, VoidSymbol, VoidSymbol ] }; + key { [ scedilla, Scedilla, acute, dead_acute ] }; + key { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", + [ i, Iabovedot, apostrophe, dead_caron ] }; + key { [ quotedbl, eacute, less, degree ] }; + + key { [ comma, semicolon, grave, dead_grave ] }; + key { [ less, greater, bar, brokenbar ] }; + key { [odiaeresis, Odiaeresis, multiply, VoidSymbol ] }; + key { [ ccedilla, Ccedilla,periodcentered, division ] }; + key { [ period, colon, dead_abovedot, dead_abovedot ] }; include "kpdl(comma)" include "level3(ralt_switch)" }; -// Turkish F Layout +// Turkish F layout partial xkb_symbols "f" { @@ -66,64 +65,64 @@ xkb_symbols "f" { name[Group1]="Turkish (F)"; - key { [ 1, exclam, onesuperior, exclamdown ] }; - key { [ 2, quotedbl, twosuperior, VoidSymbol ] }; - key { [ 3, asciicircum, numbersign, threesuperior ] }; - key { [ 4, dollar, onequarter, VoidSymbol ] }; - key { [ 6, ampersand, threequarters, VoidSymbol ] }; - key { [ 7, apostrophe, braceleft, VoidSymbol ] }; - key { [ 8, parenleft, bracketleft, VoidSymbol ] }; - key { [ 9, parenright, bracketright, plusminus ] }; - key { [ 0, equal, braceright, degree ] }; - key { [ slash, question, backslash, questiondown ] }; - key { [ minus, underscore, bar, VoidSymbol ] }; - - key { [ f, F, at, VoidSymbol ] }; - key { [ g, G, VoidSymbol, VoidSymbol ] }; - key { [ gbreve, Gbreve, VoidSymbol, VoidSymbol ] }; - key { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", - [ idotless, I, paragraph, VoidSymbol ] }; - key { [ o, O, ocircumflex, Ocircumflex ] }; - key { [ d, D, yen, VoidSymbol ] }; - key { [ r, R, registered, VoidSymbol ] }; - key { [ n, N, VoidSymbol, VoidSymbol ] }; - key { [ h, H, degree, VoidSymbol ] }; - key { [ p, P, sterling, VoidSymbol ] }; - key { [ q, Q, dead_diaeresis, dead_abovering ] }; - key { [ w, W, asciitilde, dead_breve ] }; - - key { [ u, U, ucircumflex, Ucircumflex ] }; - key { type[group1] = "FOUR_LEVEL_ALPHABETIC", - [ i, Iabovedot, icircumflex, Icircumflex ] }; - key { [ e, E, EuroSign, VoidSymbol ] }; - key { [ a, A, acircumflex, Acircumflex ] }; - key { [udiaeresis, Udiaeresis, ucircumflex, Ucircumflex ] }; - key { [ t, T, trademark, VoidSymbol ] }; - key { [ k, K, VoidSymbol, VoidSymbol ] }; - key { [ m, M, mu, VoidSymbol ] }; - key { [ l, L, VoidSymbol, VoidSymbol ] }; - key { [ y, Y, acute, dead_acute ] }; - key { [ scedilla, Scedilla, numbersign, dead_caron ] }; - key { [ plus, asterisk, notsign, plusminus ] }; - - key { [ x, X, grave, dead_grave ] }; - key { [ j, J, guillemotleft, VoidSymbol ] }; - key { [odiaeresis, Odiaeresis, guillemotright, VoidSymbol ] }; - key { [ v, V, leftdoublequotemark, VoidSymbol ] }; - key { [ c, C, cent, copyright ] }; - key { [ ccedilla, Ccedilla, rightdoublequotemark, VoidSymbol] }; - key { [ z, Z, VoidSymbol, VoidSymbol ] }; - key { [ s, S, section, VoidSymbol ] }; - key { [ b, B, multiply, nobreakspace ] }; - key { [ period, colon, division, dead_abovedot] }; - key { [ comma, semicolon, periodcentered, VoidSymbol ] }; - key { [ less, greater, bar, brokenbar ] }; + key { [ 1, exclam, onesuperior, exclamdown ] }; + key { [ 2, quotedbl, twosuperior, VoidSymbol ] }; + key { [ 3,asciicircum, numbersign, threesuperior ] }; + key { [ 4, dollar, onequarter, VoidSymbol ] }; + key { [ 6, ampersand, threequarters, VoidSymbol ] }; + key { [ 7, apostrophe, braceleft, VoidSymbol ] }; + key { [ 8, parenleft, bracketleft, VoidSymbol ] }; + key { [ 9, parenright, bracketright, plusminus ] }; + key { [ 0, equal, braceright, degree ] }; + key { [ slash, question, backslash, questiondown ] }; + key { [ minus, underscore, bar, VoidSymbol ] }; + + key { [ f, F, at, VoidSymbol ] }; + key { [ g, G, VoidSymbol, VoidSymbol ] }; + key { [ gbreve, Gbreve, VoidSymbol, VoidSymbol ] }; + key { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", + [ idotless, I, paragraph, VoidSymbol ] }; + key { [ o, O, ocircumflex, Ocircumflex ] }; + key { [ d, D, yen, VoidSymbol ] }; + key { [ r, R, registered, VoidSymbol ] }; + key { [ n, N, VoidSymbol, VoidSymbol ] }; + key { [ h, H, degree, VoidSymbol ] }; + key { [ p, P, sterling, VoidSymbol ] }; + key { [ q, Q,dead_diaeresis,dead_abovering ] }; + key { [ w, W, asciitilde, dead_breve ] }; + + key { [ u, U, ucircumflex, Ucircumflex ] }; + key { type[group1] = "FOUR_LEVEL_ALPHABETIC", + [ i, Iabovedot, icircumflex, Icircumflex ] }; + key { [ e, E, EuroSign, VoidSymbol ] }; + key { [ a, A, acircumflex, Acircumflex ] }; + key { [udiaeresis, Udiaeresis, ucircumflex, Ucircumflex ] }; + key { [ t, T, trademark, VoidSymbol ] }; + key { [ k, K, VoidSymbol, VoidSymbol ] }; + key { [ m, M, mu, VoidSymbol ] }; + key { [ l, L, VoidSymbol, VoidSymbol ] }; + key { [ y, Y, acute, dead_acute ] }; + key { [ scedilla, Scedilla, numbersign, dead_caron ] }; + key { [ plus, asterisk, notsign, plusminus ] }; + + key { [ x, X, grave, dead_grave ] }; + key { [ j, J, guillemotleft, VoidSymbol ] }; + key { [odiaeresis, Odiaeresis,guillemotright, VoidSymbol ] }; + key { [ v, V, leftdoublequotemark, VoidSymbol ] }; + key { [ c, C, cent, copyright ] }; + key { [ ccedilla, Ccedilla,rightdoublequotemark, VoidSymbol ] }; + key { [ z, Z, VoidSymbol, VoidSymbol ] }; + key { [ s, S, section, VoidSymbol ] }; + key { [ b, B, multiply, nobreakspace ] }; + key { [ period, colon, division, dead_abovedot ] }; + key { [ comma, semicolon,periodcentered, VoidSymbol ] }; + key { [ less, greater, bar, brokenbar ] }; include "kpdl(comma)" include "level3(ralt_switch)" }; -// Turkish Alt-Q Layout +// Turkish Alt-Q layout partial xkb_symbols "alt" { @@ -135,19 +134,19 @@ xkb_symbols "alt" { key { [ 8, asterisk, leftt, topt ] }; key { [ 9, parenleft, rightt, bott ] }; key { [ 0, parenright, lowrightcorner, uprightcorner ] }; - key { [ minus, underscore, horizlinescan5, vertbar ] }; - key { [ equal, plus, crossinglines ] }; + key { [ minus, underscore, horizlinescan5, vertbar ] }; + key { [ equal, plus, crossinglines ] }; - key { [ e, E, EuroSign, VoidSymbol ] }; -// key { [ t, T, trademark, VoidSymbol > - key { [ u, U, udiaeresis, Udiaeresis ] }; - key { [ i, I, idotless, Iabovedot ] }; - key { [ o, O, odiaeresis, Odiaeresis ] }; - key { [ a, A, acircumflex, Acircumflex ] }; - key { [ s, S, scedilla, Scedilla ] }; - key { [ g, G, gbreve, Gbreve ] }; + key { [ e, E, EuroSign, VoidSymbol ] }; +// key { [ t, T, trademark, VoidSymbol > + key { [ u, U, udiaeresis, Udiaeresis ] }; + key { [ i, I, idotless, Iabovedot ] }; + key { [ o, O, odiaeresis, Odiaeresis ] }; + key { [ a, A, acircumflex, Acircumflex ] }; + key { [ s, S, scedilla, Scedilla ] }; + key { [ g, G, gbreve, Gbreve ] }; - key { [ c, C, ccedilla, Ccedilla ] }; + key { [ c, C, ccedilla, Ccedilla ] }; include "level3(ralt_switch)" }; @@ -155,26 +154,18 @@ xkb_symbols "alt" { partial alphanumeric_keys xkb_symbols "Sundeadkeys" { - - // For naming consistency include "tr(basic)" - }; partial alphanumeric_keys xkb_symbols "sundeadkeys" { - - // For naming consistency include "tr(Sundeadkeys)" - name[Group1]="Turkish (Sun dead keys)"; }; -// Kurdish Q Layout +// Kurdish Q layout // Erdal Ronahi , 2006 // http://ferheng.org -// http://www.pckurd.net - partial xkb_symbols "ku" { @@ -182,14 +173,14 @@ xkb_symbols "ku" { name[Group1]="Kurdish (Turkey, Latin Q)"; - key { [ i, I, idotless, I ] }; - key { [ x, X, gbreve, Gbreve ] }; - key { [ucircumflex, Ucircumflex, asciitilde, dead_macron] }; - key { [icircumflex, Icircumflex, apostrophe, dead_caron ] }; - key { [ecircumflex, Ecircumflex, odiaeresis, Odiaeresis ] }; + key { [ i, I, idotless, I ] }; + key { [ x, X, gbreve, Gbreve ] }; + key { [ucircumflex, Ucircumflex, asciitilde, dead_macron ] }; + key { [icircumflex, Icircumflex, apostrophe, dead_caron ] }; + key { [ecircumflex, Ecircumflex, odiaeresis, Odiaeresis ] }; }; -// Kurdish F Layout +// Kurdish F layout partial xkb_symbols "ku_f" { @@ -197,18 +188,17 @@ xkb_symbols "ku_f" { name[Group1]="Kurdish (Turkey, F)"; - key { [ x, X, gbreve, Gbreve] }; - key { [ i, I, paragraph, VoidSymbol ] }; - key { [ o, O, ocircumflex, Ocircumflex ] }; - - key { [ ucircumflex, Ucircumflex, udiaeresis, Udiaeresis ] }; - key { [ icircumflex, Icircumflex, i, Iabovedot ] }; - key { [ u, U, udiaeresis, Udiaeresis ] }; - key { [ecircumflex, Ecircumflex, odiaeresis, Odiaeresis ] }; + key { [ x, X, gbreve, Gbreve ] }; + key { [ i, I, paragraph, VoidSymbol ] }; + key { [ o, O, ocircumflex, Ocircumflex ] }; + key { [ucircumflex, Ucircumflex, udiaeresis, Udiaeresis ] }; + key { [icircumflex, Icircumflex, i, Iabovedot ] }; + key { [ u, U, udiaeresis, Udiaeresis ] }; + key { [ecircumflex, Ecircumflex, odiaeresis, Odiaeresis ] }; }; -// Kurdish Alt-Q Layout +// Kurdish Alt-Q layout partial xkb_symbols "ku_alt" { @@ -216,56 +206,61 @@ xkb_symbols "ku_alt" { name[Group1]="Kurdish (Turkey, Latin Alt-Q)"; - key { [ e, E, ecircumflex, Ecircumflex ] }; - key { [ u, U, ucircumflex, Ucircumflex ] }; - key { [ i, I, icircumflex, Icircumflex ] }; - key { [ o, O, odiaeresis, Odiaeresis ] }; + key { [ e, E, ecircumflex, Ecircumflex ] }; + key { [ u, U, ucircumflex, Ucircumflex ] }; + key { [ i, I, icircumflex, Icircumflex ] }; + key { [ o, O, odiaeresis, Odiaeresis ] }; }; -// Turkish international Q Layout +// Turkish international Q layout // Alexis Pellicier , 2007 partial xkb_symbols "intl" { + include "latin" name[Group1]="Turkish (international with dead keys)"; - key { type[group1] = "FOUR_LEVEL", [ 1, exclam, onesuperior, exclamdown ] }; - key { type[group1] = "FOUR_LEVEL", [ 2, apostrophe, sterling, twosuperior ] }; - key { type[group1] = "FOUR_LEVEL", [ 3, dead_circumflex, numbersign, threesuperior ] }; - key { type[group1] = "FOUR_LEVEL", [ 4, plus, dollar, onequarter ] }; - key { type[group1] = "FOUR_LEVEL", [ 6, ampersand, threequarters, VoidSymbol ] }; - key { type[group1] = "FOUR_LEVEL", [ 7, slash, braceleft, VoidSymbol ] }; - key { type[group1] = "FOUR_LEVEL", [ 8, parenleft, bracketleft, VoidSymbol ] }; - key { type[group1] = "FOUR_LEVEL", [ 9, parenright, bracketright, plusminus ] }; - key { type[group1] = "FOUR_LEVEL", [ 0, equal, braceright, degree ] }; - key { type[group1] = "FOUR_LEVEL", [ asterisk, question, backslash, questiondown ] }; - key { type[group1] = "FOUR_LEVEL", [ minus, underscore, division, VoidSymbol ] }; - key { [ w, W, VoidSymbol, VoidSymbol ] }; - key { [ e, E, EuroSign, cent ] }; - key { [ t, T, trademark, VoidSymbol ] }; - key { [ u, U, ucircumflex, Ucircumflex ] }; - key { [ idotless, I, icircumflex, Icircumflex ] }; - key { [ o, O, ocircumflex, Ocircumflex ] }; - key { [ p, P, VoidSymbol, VoidSymbol ] }; - key { [ gbreve, Gbreve, dead_diaeresis ] }; - key { [udiaeresis, Udiaeresis, dead_tilde, dead_macron ] }; - key { [ a, A, acircumflex, Acircumflex ] }; - key { [ s, S, section, VoidSymbol ] }; - key { [ d, D, VoidSymbol, VoidSymbol ] }; - key { [ f, F, ordfeminine, VoidSymbol ] }; - key { [ g, G, VoidSymbol, VoidSymbol ] }; - key { [ h, H, VoidSymbol, VoidSymbol ] }; - key { [ k, K, VoidSymbol, VoidSymbol ] }; - key { [ l, L, VoidSymbol, VoidSymbol ] }; - key { [ scedilla, Scedilla, dead_acute, dead_acute ] }; - key { [ i, Iabovedot, apostrophe, dead_caron ] }; - key { type[group1] = "FOUR_LEVEL",[ quotedbl, eacute, plusminus, degree ] }; - key { type[group1] = "FOUR_LEVEL",[ comma, semicolon, dead_grave, dead_grave ] }; - key { type[group1] = "FOUR_LEVEL",[ less, greater, bar, brokenbar ] }; - key { [odiaeresis, Odiaeresis, multiply, VoidSymbol ] }; - key { [ ccedilla, Ccedilla, periodcentered, division ] }; - key { type[group1] = "FOUR_LEVEL",[ period, colon, dead_abovedot, dead_abovedot ] }; + key { type[group1] = "FOUR_LEVEL", [ 1, exclam, onesuperior, exclamdown ] }; + key { type[group1] = "FOUR_LEVEL", [ 2, apostrophe, sterling, twosuperior ] }; + key { type[group1] = "FOUR_LEVEL", [ 3, dead_circumflex, numbersign, threesuperior ] }; + key { type[group1] = "FOUR_LEVEL", [ 4, plus, dollar, onequarter ] }; + key { type[group1] = "FOUR_LEVEL", [ 6, ampersand, threequarters, VoidSymbol ] }; + key { type[group1] = "FOUR_LEVEL", [ 7, slash, braceleft, VoidSymbol ] }; + key { type[group1] = "FOUR_LEVEL", [ 8, parenleft, bracketleft, VoidSymbol ] }; + key { type[group1] = "FOUR_LEVEL", [ 9, parenright, bracketright, plusminus ] }; + key { type[group1] = "FOUR_LEVEL", [ 0, equal, braceright, degree ] }; + key { type[group1] = "FOUR_LEVEL", [ asterisk, question, backslash, questiondown ] }; + key { type[group1] = "FOUR_LEVEL", [ minus, underscore, division, VoidSymbol ] }; + + key { [ w, W, VoidSymbol, VoidSymbol ] }; + key { [ e, E, EuroSign, cent ] }; + key { [ t, T, trademark, VoidSymbol ] }; + key { [ u, U, ucircumflex, Ucircumflex ] }; + key { [ idotless, I, icircumflex, Icircumflex ] }; + key { [ o, O, ocircumflex, Ocircumflex ] }; + key { [ p, P, VoidSymbol, VoidSymbol ] }; + key { [ gbreve, Gbreve, dead_diaeresis ] }; + key { [udiaeresis, Udiaeresis, dead_tilde, dead_macron ] }; + + key { [ a, A, acircumflex, Acircumflex ] }; + key { [ s, S, section, VoidSymbol ] }; + key { [ d, D, VoidSymbol, VoidSymbol ] }; + key { [ f, F, ordfeminine, VoidSymbol ] }; + key { [ g, G, VoidSymbol, VoidSymbol ] }; + key { [ h, H, VoidSymbol, VoidSymbol ] }; + key { [ k, K, VoidSymbol, VoidSymbol ] }; + key { [ l, L, VoidSymbol, VoidSymbol ] }; + key { [ scedilla, Scedilla, dead_acute, dead_acute ] }; + key { [ i, Iabovedot, apostrophe, dead_caron ] }; + + key { type[group1] = "FOUR_LEVEL", [ quotedbl, eacute, plusminus, degree ] }; + key { type[group1] = "FOUR_LEVEL", [ comma, semicolon, dead_grave, dead_grave ] }; + key { type[group1] = "FOUR_LEVEL", [ less, greater, bar, brokenbar ] }; + + key { [odiaeresis, Odiaeresis, multiply, VoidSymbol ] }; + key { [ ccedilla, Ccedilla, periodcentered, division ] }; + key { type[group1] = "FOUR_LEVEL", [ period, colon, dead_abovedot, dead_abovedot ] }; include "nbsp(level3)" include "level3(ralt_switch)" @@ -274,36 +269,36 @@ xkb_symbols "intl" { partial alphanumeric_keys xkb_symbols "olpc" { - name[Group1]= "Turkish"; - include "tr(intl)" - - key { [ 1, exclam, VoidSymbol, VoidSymbol ] }; - key { [ 6, ampersand, VoidSymbol, VoidSymbol ] }; - key { type[group1] = "FOUR_LEVEL", [ minus, underscore, bar, VoidSymbol ] }; + include "tr(intl)" - key { [ c, C, leftdoublequotemark, VoidSymbol ] }; - key { [ v, V, rightdoublequotemark, VoidSymbol ] }; - key { [ b, B, VoidSymbol, VoidSymbol ] }; - key { [odiaeresis, Odiaeresis, VoidSymbol, VoidSymbol ] }; + name[Group1]= "Turkish"; - key { [ ccedilla, Ccedilla, multiply, VoidSymbol ] }; - key { [ period, colon, division, dead_abovedot ] }; + key { [ 1, exclam, VoidSymbol, VoidSymbol ] }; + key { [ 6, ampersand, VoidSymbol, VoidSymbol ] }; + key { type[group1] = "FOUR_LEVEL", + [ minus, underscore, bar, VoidSymbol ] }; - key { [ less, greater, VoidSymbol, VoidSymbol ] }; + key { [ c, C, leftdoublequotemark, VoidSymbol ] }; + key { [ v, V, rightdoublequotemark, VoidSymbol ] }; + key { [ b, B, VoidSymbol, VoidSymbol ] }; + key { [odiaeresis, Odiaeresis, VoidSymbol, VoidSymbol ] }; + key { [ ccedilla, Ccedilla, multiply, VoidSymbol ] }; + key { [ period, colon, division, dead_abovedot ] }; + key { [ less, greater, VoidSymbol, VoidSymbol ] }; }; // Crimean Tatar (Crimean Turkish) layouts. // First released (by Ubuntu): 2009-02-24. -// These layouts are not yet standard. In particular, the mapping of -// letter 'x' might change in the future. This letter is not used in the -// current official alphabet, but is included in the layouts for foreign words -// and shortcuts. +// These layouts are not yet standard. In particular, the mapping of +// the letter 'x' might change in the future. This letter is not used +// in the current official alphabet, but is included in the layouts for +// foreign words and for shortcuts. // Reşat SABIQ , 2009 // Özgür Qarahan , 2009 -// Crimean Tatar (Crimean Turkish) Q Layout +// Crimean Tatar (Crimean Turkish) Q layout partial xkb_symbols "crh" { @@ -311,16 +306,16 @@ xkb_symbols "crh" { name[Group1]="Crimean Tatar (Turkish Q)"; - key { [ x, X, asterisk, question ] }; + key { [ x, X, asterisk, question ] }; - key { [ f, F, iacute, Iacute ] }; - key { [ j, J, ibreve, Ibreve ] }; - key { [ quotedbl, backslash, less, degree ] }; + key { [ f, F, iacute, Iacute ] }; + key { [ j, J, ibreve, Ibreve ] }; + key { [ quotedbl, backslash, less, degree ] }; - key { [ ntilde, Ntilde, guillemotright, greater ] }; + key { [ ntilde, Ntilde, guillemotright, greater ] }; }; -// Crimean Tatar (Crimean Turkish) F Layout +// Crimean Tatar (Crimean Turkish) F layout partial xkb_symbols "crh_f" { @@ -328,18 +323,18 @@ xkb_symbols "crh_f" { name[Group1]="Crimean Tatar (Turkish F)"; - key { [ x, X, slash, question ] }; + key { [ x, X, slash, question ] }; - key { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", - [ idotless, I, iacute, Iacute ] }; + key { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", + [ idotless, I, iacute, Iacute ] }; - key { [ k, K, ibreve, Ibreve ] }; - key { [ plus, asterisk, backslash, plusminus ] }; + key { [ k, K, ibreve, Ibreve ] }; + key { [ plus, asterisk, backslash, plusminus ] }; - key { [ ntilde, Ntilde, grave, dead_grave ] }; + key { [ ntilde, Ntilde, grave, dead_grave ] }; }; -// Crimean Tatar (Crimean Turkish) Alt-Q Layout +// Crimean Tatar (Crimean Turkish) Alt-Q layout partial xkb_symbols "crh_alt" { @@ -347,10 +342,10 @@ xkb_symbols "crh_alt" { name[Group1]="Crimean Tatar (Turkish Alt-Q)"; - key { [ f, F, iacute, Iacute ] }; - key { [ j, J, ibreve, Ibreve ] }; + key { [ f, F, iacute, Iacute ] }; + key { [ j, J, ibreve, Ibreve ] }; - key { [ n, N, ntilde, Ntilde ] }; + key { [ n, N, ntilde, Ntilde ] }; }; // EXTRAS: diff --git a/xorg-server/xkeyboard-config/symbols/ua b/xorg-server/xkeyboard-config/symbols/ua index 81d696ec4..8852b9243 100644 --- a/xorg-server/xkeyboard-config/symbols/ua +++ b/xorg-server/xkeyboard-config/symbols/ua @@ -1,44 +1,45 @@ -// based on -// ukrainian standard keyboard +// Keyboard layouts for the Ukraine. // AEN & Leon Kanter -// Last Changes 2007/10/03 by Andriy Rysin +// last changes 2007/10/03 by Andriy Rysin -// Unicode - 3d level added with some Unicode symbols (typographic quotes, m-dash, n-dash etc), -// some often used cyrillics from other slavic languages and some ASCII symbols used often (slash, brackets...) +// The legacy WinKeys layout extended on the third and fourth level with +// some Unicode symbols (typographic quotes, m-dash, n-dash, ...), some +// often-used Cyrillics from other Slavic languages, and some often-used +// ASCII symbols (slash, brackets, ...). default partial alphanumeric_keys xkb_symbols "unicode" { - include "ua(winkeys)" + include "ua(winkeys)" name[Group1]= "Ukrainian"; - key { [ U2019, apostrophe, U0301, asciitilde ] }; // Apostrophe and Stress symbol - key { [ 1, exclam, onesuperior ] }; - key { [ 2, quotedbl, twosuperior ] }; - key { [ 3, numerosign, U00A7, U20B4 ] }; // Paragraph and Hryvnia sign - key { [ 4, semicolon, dollar, EuroSign ] }; - key { [ 5, percent, degree ] }; - key { [ 6, colon, less ] }; - key { [ 7, question, greater ] }; - key { [ 8, asterisk, enfilledcircbullet ] }; - key { [ 9, parenleft, bracketleft, braceleft ] }; - key { [ 0, parenright, bracketright, braceright] }; - key { [ minus, underscore, emdash, endash ] }; - key { [ equal, plus, notequal, plusminus ] }; - - key { [ Cyrillic_u, Cyrillic_U, Byelorussian_shortu, Byelorussian_SHORTU ]}; - key { [ Cyrillic_ka, Cyrillic_KA, registered ] }; // Registered tm - key { [ Cyrillic_ie, Cyrillic_IE, Cyrillic_io, Cyrillic_IO ] }; - key { [ Ukrainian_yi,Ukrainian_YI, Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; - key { [ Ukrainian_i, Ukrainian_I, Cyrillic_yeru, Cyrillic_YERU ] }; - key { [ Ukrainian_ie,Ukrainian_IE, Cyrillic_e, Cyrillic_E ] }; - - key { [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN, backslash, bar ] }; - - key { [ Cyrillic_es, Cyrillic_ES, copyright ] }; - key { [ Cyrillic_te, Cyrillic_TE, trademark ] }; - key { [ Cyrillic_be, Cyrillic_BE, guillemotleft, doublelowquotemark ] }; - key { [ Cyrillic_yu, Cyrillic_YU, guillemotright, leftdoublequotemark ] }; - key { [ period, comma, slash, ellipsis ] }; + key { [ U2019, apostrophe, U0301, asciitilde ] }; // Apostrophe and Stress symbol + key { [ 1, exclam, onesuperior ] }; + key { [ 2, quotedbl, twosuperior ] }; + key { [ 3, numerosign, U00A7, U20B4 ] }; // Paragraph and Hryvnia sign + key { [ 4, semicolon, dollar, EuroSign ] }; + key { [ 5, percent, degree ] }; + key { [ 6, colon, less ] }; + key { [ 7, question, greater ] }; + key { [ 8, asterisk, enfilledcircbullet ] }; + key { [ 9, parenleft, bracketleft, braceleft ] }; + key { [ 0, parenright, bracketright, braceright ] }; + key { [ minus, underscore, emdash, endash ] }; + key { [ equal, plus, notequal, plusminus ] }; + + key { [ Cyrillic_u, Cyrillic_U, Byelorussian_shortu, Byelorussian_SHORTU ] }; + key { [ Cyrillic_ka, Cyrillic_KA, registered ] }; // Registered tm + key { [ Cyrillic_ie, Cyrillic_IE, Cyrillic_io, Cyrillic_IO ] }; + key { [ Ukrainian_yi, Ukrainian_YI, Cyrillic_hardsign,Cyrillic_HARDSIGN ] }; + key { [ Ukrainian_i, Ukrainian_I, Cyrillic_yeru, Cyrillic_YERU ] }; + key { [ Ukrainian_ie, Ukrainian_IE, Cyrillic_e, Cyrillic_E ] }; + + key { [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN, backslash, bar ] }; + + key { [ Cyrillic_es, Cyrillic_ES, copyright ] }; + key { [ Cyrillic_te, Cyrillic_TE, trademark ] }; + key { [ Cyrillic_be, Cyrillic_BE, guillemotleft, doublelowquotemark ] }; + key { [ Cyrillic_yu, Cyrillic_YU, guillemotright, leftdoublequotemark ] }; + key { [ period, comma, slash, ellipsis ] }; include "level3(ralt_switch)" }; @@ -48,262 +49,262 @@ xkb_symbols "legacy" { name[Group1]= "Ukrainian (legacy)"; - key { [ apostrophe, asciitilde ] }; - key { [ 1, exclam ] }; - key { [ 2, quotedbl ] }; - key { [ 3, numbersign ] }; - key { [ 4, asterisk ] }; - key { [ 5, colon ] }; - key { [ 6, comma ] }; - key { [ 7, period ] }; - key { [ 8, semicolon ] }; - key { [ 9, parenleft ] }; - key { [ 0, parenright ] }; - key { [ minus, underscore ] }; - key { [ equal, plus ] }; - - key { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; - key { [ Cyrillic_tse, Cyrillic_TSE ] }; - key { [ Cyrillic_u, Cyrillic_U ] }; - key { [ Cyrillic_ka, Cyrillic_KA ] }; - key { [ Cyrillic_ie, Cyrillic_IE ] }; - key { [ Cyrillic_en, Cyrillic_EN ] }; - key { [ Cyrillic_ghe, Cyrillic_GHE ] }; - key { [ Cyrillic_sha, Cyrillic_SHA ] }; - key { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; - key { [ Cyrillic_ze, Cyrillic_ZE ] }; - key { [ Cyrillic_ha, Cyrillic_HA ] }; - key { [ Ukrainian_yi, Ukrainian_YI ] }; - key { [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; - - key { [ Cyrillic_ef, Cyrillic_EF ] }; - key { [ Ukrainian_i, Ukrainian_I ] }; - key { [ Cyrillic_ve, Cyrillic_VE ] }; - key { [ Cyrillic_a, Cyrillic_A ] }; - key { [ Cyrillic_pe, Cyrillic_PE ] }; - key { [ Cyrillic_er, Cyrillic_ER ] }; - key { [ Cyrillic_o, Cyrillic_O ] }; - key { [ Cyrillic_el, Cyrillic_EL ] }; - key { [ Cyrillic_de, Cyrillic_DE ] }; - key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; - key { [ Ukrainian_ie, Ukrainian_IE ] }; - - key { [ Cyrillic_ya, Cyrillic_YA ] }; - key { [ Cyrillic_che, Cyrillic_CHE ] }; - key { [ Cyrillic_es, Cyrillic_ES ] }; - key { [ Cyrillic_em, Cyrillic_EM ] }; - key { [ Cyrillic_te, Cyrillic_TE ] }; - key { [ Cyrillic_i, Cyrillic_I ] }; - key { [Cyrillic_softsign,Cyrillic_SOFTSIGN ] }; - key { [ Cyrillic_be, Cyrillic_BE ] }; - key { [ Cyrillic_yu, Cyrillic_YU ] }; - key { [ slash, question ] }; - - key { [ slash, bar ] }; + key { [ apostrophe, asciitilde ] }; + key { [ 1, exclam ] }; + key { [ 2, quotedbl ] }; + key { [ 3, numbersign ] }; + key { [ 4, asterisk ] }; + key { [ 5, colon ] }; + key { [ 6, comma ] }; + key { [ 7, period ] }; + key { [ 8, semicolon ] }; + key { [ 9, parenleft ] }; + key { [ 0, parenright ] }; + key { [ minus, underscore ] }; + key { [ equal, plus ] }; + + key { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; + key { [ Cyrillic_tse, Cyrillic_TSE ] }; + key { [ Cyrillic_u, Cyrillic_U ] }; + key { [ Cyrillic_ka, Cyrillic_KA ] }; + key { [ Cyrillic_ie, Cyrillic_IE ] }; + key { [ Cyrillic_en, Cyrillic_EN ] }; + key { [ Cyrillic_ghe, Cyrillic_GHE ] }; + key { [ Cyrillic_sha, Cyrillic_SHA ] }; + key { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; + key { [ Cyrillic_ze, Cyrillic_ZE ] }; + key { [ Cyrillic_ha, Cyrillic_HA ] }; + key { [ Ukrainian_yi, Ukrainian_YI ] }; + key { [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; + + key { [ Cyrillic_ef, Cyrillic_EF ] }; + key { [ Ukrainian_i, Ukrainian_I ] }; + key { [ Cyrillic_ve, Cyrillic_VE ] }; + key { [ Cyrillic_a, Cyrillic_A ] }; + key { [ Cyrillic_pe, Cyrillic_PE ] }; + key { [ Cyrillic_er, Cyrillic_ER ] }; + key { [ Cyrillic_o, Cyrillic_O ] }; + key { [ Cyrillic_el, Cyrillic_EL ] }; + key { [ Cyrillic_de, Cyrillic_DE ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; + key { [ Ukrainian_ie, Ukrainian_IE ] }; + + key { [ Cyrillic_ya, Cyrillic_YA ] }; + key { [ Cyrillic_che, Cyrillic_CHE ] }; + key { [ Cyrillic_es, Cyrillic_ES ] }; + key { [ Cyrillic_em, Cyrillic_EM ] }; + key { [ Cyrillic_te, Cyrillic_TE ] }; + key { [ Cyrillic_i, Cyrillic_I ] }; + key {[Cyrillic_softsign,Cyrillic_SOFTSIGN ] }; + key { [ Cyrillic_be, Cyrillic_BE ] }; + key { [ Cyrillic_yu, Cyrillic_YU ] }; + key { [ slash, question ] }; + + key { [ slash, bar ] }; }; partial alphanumeric_keys xkb_symbols "winkeys" { - include "ua(legacy)" + include "ua(legacy)" name[Group1]= "Ukrainian (WinKeys)"; - key { [ 3, numerosign ] }; - key { [ 4, semicolon ] }; - key { [ 5, percent ] }; - key { [ 6, colon ] }; - key { [ 7, question ] }; - key { [ 8, asterisk ] }; - key { [ period, comma ] }; + key { [ 3, numerosign ] }; + key { [ 4, semicolon ] }; + key { [ 5, percent ] }; + key { [ 6, colon ] }; + key { [ 7, question ] }; + key { [ 8, asterisk ] }; + key { [ period, comma ] }; }; partial alphanumeric_keys xkb_symbols "typewriter" { - include "ua(legacy)" + include "ua(legacy)" name[Group1]= "Ukrainian (typewriter)"; - key { [ apostrophe, quotedbl ] }; - key { [ exclam, 1 ] }; - key { [ numerosign, 2 ] }; - key { [ slash, 3 ] }; - key { [ semicolon, 4 ] }; - key { [ colon, 5 ] }; - key { [ comma, 6 ] }; - key { [ period, 7 ] }; - key { [ underscore, 8 ] }; - key { [ question, 9 ] }; - key { [ percent, 0 ] }; - - key { [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; + key { [ apostrophe, quotedbl ] }; + key { [ exclam, 1 ] }; + key { [ numerosign, 2 ] }; + key { [ slash, 3 ] }; + key { [ semicolon, 4 ] }; + key { [ colon, 5 ] }; + key { [ comma, 6 ] }; + key { [ period, 7 ] }; + key { [ underscore, 8 ] }; + key { [ question, 9 ] }; + key { [ percent, 0 ] }; - key { [ Cyrillic_i, Cyrillic_I ] }; + key { [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; - key { [ Ukrainian_i, Ukrainian_I ] }; + key { [ Cyrillic_i, Cyrillic_I ] }; - key { [ Ukrainian_yi, Ukrainian_YI ] }; + key { [ Ukrainian_i, Ukrainian_I ] }; + key { [ Ukrainian_yi, Ukrainian_YI ] }; - key { [ parenleft, parenright ] }; + key { [ parenleft, parenright ] }; }; partial alphanumeric_keys xkb_symbols "phonetic" { - include "ua(legacy)" + include "ua(legacy)" name[Group1]= "Ukrainian (phonetic)"; - key { [ Cyrillic_ya, Cyrillic_YA ] }; - key { [ Cyrillic_ve, Cyrillic_VE ] }; - key { [ Cyrillic_ie, Cyrillic_IE ] }; - key { [ Cyrillic_er, Cyrillic_ER ] }; - key { [ Cyrillic_te, Cyrillic_TE ] }; - key { [ Cyrillic_i, Cyrillic_I ] }; - key { [ Cyrillic_u, Cyrillic_U ] }; - key { [ Ukrainian_i, Ukrainian_I ] }; - key { [ Cyrillic_o, Cyrillic_O ] }; - key { [ Cyrillic_pe, Cyrillic_PE ] }; - key { [ Cyrillic_sha, Cyrillic_SHA ] }; - key { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; - - key { [ Cyrillic_a, Cyrillic_A ] }; - key { [ Cyrillic_es, Cyrillic_ES ] }; - key { [ Cyrillic_de, Cyrillic_DE ] }; - key { [ Cyrillic_ef, Cyrillic_EF ] }; - key { [ Cyrillic_ghe, Cyrillic_GHE ] }; - key { [ Cyrillic_ha, Cyrillic_HA ] }; - key { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; - key { [ Cyrillic_ka, Cyrillic_KA ] }; - key { [ Cyrillic_el, Cyrillic_EL ] }; - key { [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; - key { [ Cyrillic_che, Cyrillic_CHE ] }; - key { [ Cyrillic_yu, Cyrillic_YU ] }; - - key { [ Cyrillic_ze, Cyrillic_ZE ] }; - key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; - key { [ Cyrillic_tse, Cyrillic_TSE ] }; - key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; - key { [ Cyrillic_be, Cyrillic_BE ] }; - key { [ Cyrillic_en, Cyrillic_EN ] }; - key { [ Cyrillic_em, Cyrillic_EM ] }; - key { [ Ukrainian_yi, Ukrainian_YI ] }; - key { [ Ukrainian_ie, Ukrainian_IE ] }; - key { [ slash, question ] }; + key { [ Cyrillic_ya, Cyrillic_YA ] }; + key { [ Cyrillic_ve, Cyrillic_VE ] }; + key { [ Cyrillic_ie, Cyrillic_IE ] }; + key { [ Cyrillic_er, Cyrillic_ER ] }; + key { [ Cyrillic_te, Cyrillic_TE ] }; + key { [ Cyrillic_i, Cyrillic_I ] }; + key { [ Cyrillic_u, Cyrillic_U ] }; + key { [ Ukrainian_i, Ukrainian_I ] }; + key { [ Cyrillic_o, Cyrillic_O ] }; + key { [ Cyrillic_pe, Cyrillic_PE ] }; + key { [ Cyrillic_sha, Cyrillic_SHA ] }; + key { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; + + key { [ Cyrillic_a, Cyrillic_A ] }; + key { [ Cyrillic_es, Cyrillic_ES ] }; + key { [ Cyrillic_de, Cyrillic_DE ] }; + key { [ Cyrillic_ef, Cyrillic_EF ] }; + key { [ Cyrillic_ghe, Cyrillic_GHE ] }; + key { [ Cyrillic_ha, Cyrillic_HA ] }; + key { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; + key { [ Cyrillic_ka, Cyrillic_KA ] }; + key { [ Cyrillic_el, Cyrillic_EL ] }; + key { [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; + key { [ Cyrillic_che, Cyrillic_CHE ] }; + key { [ Cyrillic_yu, Cyrillic_YU ] }; + + key { [ Cyrillic_ze, Cyrillic_ZE ] }; + key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; + key { [ Cyrillic_tse, Cyrillic_TSE ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; + key { [ Cyrillic_be, Cyrillic_BE ] }; + key { [ Cyrillic_en, Cyrillic_EN ] }; + key { [ Cyrillic_em, Cyrillic_EM ] }; + key { [ Ukrainian_yi, Ukrainian_YI ] }; + key { [ Ukrainian_ie, Ukrainian_IE ] }; + key { [ slash, question ] }; }; -// ukrainian keyboard layout RSTU 2019-91 (Respublikanskij STandart Ukrajiny) +// Ukrainian RSTU 2019-91 keyboard layout (Respublikanskij STandart Ukrajiny). // Andrew Porokhnyak partial alphanumeric_keys xkb_symbols "rstu" { - include "ua(legacy)" + include "ua(legacy)" name[Group1]= "Ukrainian (standard RSTU)"; - key { [ apostrophe, question ] }; - key { [ exclam, 1 ] }; - key { [ quotedbl, 2 ] }; - key { [ numbersign, 3 ] }; - key { [ semicolon, 4 ] }; - key { [ colon, 5 ] }; - key { [ comma, 6 ] }; - key { [ period, 7 ] }; - key { [ asterisk, 8 ] }; - key { [ parenleft, 9 ] }; - key { [ parenright, 0 ] }; + key { [ apostrophe, question ] }; + key { [ exclam, 1 ] }; + key { [ quotedbl, 2 ] }; + key { [ numbersign, 3 ] }; + key { [ semicolon, 4 ] }; + key { [ colon, 5 ] }; + key { [ comma, 6 ] }; + key { [ period, 7 ] }; + key { [ asterisk, 8 ] }; + key { [ parenleft, 9 ] }; + key { [ parenright, 0 ] }; - key { [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; + key { [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; - key { [ Cyrillic_i, Cyrillic_I ] }; + key { [ Cyrillic_i, Cyrillic_I ] }; - key { [ Ukrainian_i, Ukrainian_I ] }; + key { [ Ukrainian_i, Ukrainian_I ] }; + key { [ Ukrainian_yi, Ukrainian_YI ] }; - key { [ Ukrainian_yi, Ukrainian_YI ] }; - - key { [ slash, percent ] }; + key { [ slash, percent ] }; }; -// russian keyboard layout RSTU 2019-91 (Respublikanskij STandart Ukrajiny) +// Russian RSTU 2019-91 keyboard layout (Respublikanskij STandart Ukrajiny). // Andrew Porokhnyak partial alphanumeric_keys xkb_symbols "rstu_ru" { + include "ru(common)" name[Group1]= "Russian (Ukraine, standard RSTU)"; - key { [ apostrophe, question ] }; - key { [ exclam, 1 ] }; - key { [ quotedbl, 2 ] }; - key { [ numbersign, 3 ] }; - key { [ semicolon, 4 ] }; - key { [ colon, 5 ] }; - key { [ comma, 6 ] }; - key { [ period, 7 ] }; - key { [ asterisk, 8 ] }; - key { [ parenleft, 9 ] }; - key { [ parenright, 0 ] }; - key { [ slash, percent ] }; - -key.type[group1]="ALPHABETIC"; - - key { [ Cyrillic_io, Cyrillic_IO ] }; + key { [ apostrophe, question ] }; + key { [ exclam, 1 ] }; + key { [ quotedbl, 2 ] }; + key { [ numbersign, 3 ] }; + key { [ semicolon, 4 ] }; + key { [ colon, 5 ] }; + key { [ comma, 6 ] }; + key { [ period, 7 ] }; + key { [ asterisk, 8 ] }; + key { [ parenleft, 9 ] }; + key { [ parenright, 0 ] }; + key { [ slash, percent ] }; + + key.type[group1]="ALPHABETIC"; + + key { [ Cyrillic_io, Cyrillic_IO ] }; }; -//Homophonic keyboard layout (Tomas Marko Miljenović) -//Based on Ukrainian National Transliteration, commonly used phonetic layouts for Mac and Win. -//Existing layout "phonetic" used as template. +// Homophonic keyboard layout (by Tomas Marko Miljenović), +// based on the Ukrainian National Transliteration, +// commonly used phonetic layouts for Mac and Win. partial alphanumeric_keys xkb_symbols "homophonic" { + include "ua(legacy)" name[Group1]= "Ukrainian (homophonic)"; - key { [ grave, underscore ] }; - key { [ 1, exclam ] }; - key { [ 2, at ] }; - key { [ 3, semicolon ] }; - key { [ 4, colon ] }; - key { [ 5, percent ] }; - key { [ 6, apostrophe ] }; - key { [ 7, quotedbl ] }; - key { [ 8, asterisk ] }; - key { [ 9, parenleft ] }; - key { [ 0, parenright ] }; - key { [ Ukrainian_ie, Ukrainian_IE ] }; - key { [ Ukrainian_yi, Ukrainian_YI ] }; - - key { [ Cyrillic_ya, Cyrillic_YA ] }; - key { [ Cyrillic_sha, Cyrillic_SHA ] }; - key { [ Cyrillic_ie, Cyrillic_IE ] }; - key { [ Cyrillic_er, Cyrillic_ER ] }; - key { [ Cyrillic_te, Cyrillic_TE ] }; - key { [ Cyrillic_i, Cyrillic_I ] }; - key { [ Cyrillic_u, Cyrillic_U ] }; - key { [ Ukrainian_i, Ukrainian_I ] }; - key { [ Cyrillic_o, Cyrillic_O ] }; - key { [ Cyrillic_pe, Cyrillic_PE ] }; - key { [ Cyrillic_yu, Cyrillic_YU ] }; - key { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; - - key { [ Cyrillic_a, Cyrillic_A ] }; - key { [ Cyrillic_es, Cyrillic_ES ] }; - key { [ Cyrillic_de, Cyrillic_DE ] }; - key { [ Cyrillic_ef, Cyrillic_EF ] }; - key { [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; - key { [ Cyrillic_ghe, Cyrillic_GHE ] }; - key { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; - key { [ Cyrillic_ka, Cyrillic_KA ] }; - key { [ Cyrillic_el, Cyrillic_EL ] }; - key { [ Cyrillic_che, Cyrillic_CHE ] }; - key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; - key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; - - key { [ Cyrillic_ze, Cyrillic_ZE ] }; - key { [ Cyrillic_ha, Cyrillic_HA ] }; - key { [ Cyrillic_tse, Cyrillic_TSE ] }; - key { [ Cyrillic_ve, Cyrillic_VE ] }; - key { [ Cyrillic_be, Cyrillic_BE ] }; - key { [ Cyrillic_en, Cyrillic_EN ] }; - key { [ Cyrillic_em, Cyrillic_EM ] }; - key { [ comma, less ] }; - key { [ period, greater ] }; - key { [ slash, question ] }; + key { [ grave, underscore ] }; + key { [ 1, exclam ] }; + key { [ 2, at ] }; + key { [ 3, semicolon ] }; + key { [ 4, colon ] }; + key { [ 5, percent ] }; + key { [ 6, apostrophe ] }; + key { [ 7, quotedbl ] }; + key { [ 8, asterisk ] }; + key { [ 9, parenleft ] }; + key { [ 0, parenright ] }; + key { [ Ukrainian_ie, Ukrainian_IE ] }; + key { [ Ukrainian_yi, Ukrainian_YI ] }; + + key { [ Cyrillic_ya, Cyrillic_YA ] }; + key { [ Cyrillic_sha, Cyrillic_SHA ] }; + key { [ Cyrillic_ie, Cyrillic_IE ] }; + key { [ Cyrillic_er, Cyrillic_ER ] }; + key { [ Cyrillic_te, Cyrillic_TE ] }; + key { [ Cyrillic_i, Cyrillic_I ] }; + key { [ Cyrillic_u, Cyrillic_U ] }; + key { [ Ukrainian_i, Ukrainian_I ] }; + key { [ Cyrillic_o, Cyrillic_O ] }; + key { [ Cyrillic_pe, Cyrillic_PE ] }; + key { [ Cyrillic_yu, Cyrillic_YU ] }; + key { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; + + key { [ Cyrillic_a, Cyrillic_A ] }; + key { [ Cyrillic_es, Cyrillic_ES ] }; + key { [ Cyrillic_de, Cyrillic_DE ] }; + key { [ Cyrillic_ef, Cyrillic_EF ] }; + key { [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; + key { [ Cyrillic_ghe, Cyrillic_GHE ] }; + key { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; + key { [ Cyrillic_ka, Cyrillic_KA ] }; + key { [ Cyrillic_el, Cyrillic_EL ] }; + key { [ Cyrillic_che, Cyrillic_CHE ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; + key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; + + key { [ Cyrillic_ze, Cyrillic_ZE ] }; + key { [ Cyrillic_ha, Cyrillic_HA ] }; + key { [ Cyrillic_tse, Cyrillic_TSE ] }; + key { [ Cyrillic_ve, Cyrillic_VE ] }; + key { [ Cyrillic_be, Cyrillic_BE ] }; + key { [ Cyrillic_en, Cyrillic_EN ] }; + key { [ Cyrillic_em, Cyrillic_EM ] }; + key { [ comma, less ] }; + key { [ period, greater ] }; + key { [ slash, question ] }; }; // EXTRAS: -- cgit v1.2.3