From 9dbecb420fb16a043590adee9900c2aa53fad5f6 Mon Sep 17 00:00:00 2001 From: "Sergey V. Udaltsov" Date: Wed, 2 Sep 2009 00:13:24 +0100 Subject: [PATCH] restructured Belarussian variants, made winkeys default https://bugs.freedesktop.org/show_bug.cgi?id=23604 --- ChangeLog | 5 ++ rules/base.xml.in | 4 +- symbols/by | 120 +++++++++++++++++----------------------------- 3 files changed, 52 insertions(+), 77 deletions(-) diff --git a/ChangeLog b/ChangeLog index 355f26d..beabd96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-09-02 Sergey Udaltsov + + * rules/base.xml.in, symbols/by: restructured Belarussian variants, + https://bugs.freedesktop.org/show_bug.cgi?id=23604 + 2009-08-28 Sergey Udaltsov * symbols/no: updated layout, diff --git a/rules/base.xml.in b/rules/base.xml.in index 823e98b..82c301c 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -1497,8 +1497,8 @@ - winkeys - <_description>Winkeys + legacy + <_description>Legacy diff --git a/symbols/by b/symbols/by index d05e224..3742ce6 100644 --- a/symbols/by +++ b/symbols/by @@ -3,76 +3,33 @@ // based on // belarusian standard keyboard // Alexander Mikhailian +// Reworked to use winkeys by default and russian keymap as base by Paul Lubetsky +// Added third level with russian symbols +// See freedesktop.org bug #23604 partial default alphanumeric_keys xkb_symbols "basic" { + include "ru(winkeys)" + name[Group1]= "Belarus"; - name[Group1]= "Belarus"; - - key { [ Cyrillic_io, Cyrillic_IO ] }; - key { [ bar, brokenbar ] }; - - key { [ 2, quotedbl ] }; - key { [ 4, semicolon ] }; - key { [ 5, percent ] }; - key { [ 6, colon ] }; - key { [ 7, question ] }; - 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_softsign,Cyrillic_SOFTSIGN ] }; - key { [ Cyrillic_ghe, Cyrillic_GHE ] }; - key { [ Cyrillic_sha, Cyrillic_SHA ] }; - key { [ Byelorussian_shortu, Byelorussian_SHORTU ]}; - key { [ Cyrillic_ze, Cyrillic_ZE ] }; - key { [ Cyrillic_ha, Cyrillic_HA ] }; - key { [ apostrophe, apostrophe ] }; - - 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 { [ Ukrainian_i, Ukrainian_I ] }; - key { [ Cyrillic_te, Cyrillic_TE ] }; - key { [ Cyrillic_be, Cyrillic_BE ] }; - key { [ Cyrillic_yu, Cyrillic_YU ] }; - key { [ period, comma ] }; - - key { [ slash, bar ] }; - - // End alphanumeric section + key { [ Byelorussian_shortu, Byelorussian_SHORTU ] }; + key { [ apostrophe, apostrophe ] }; + key { [ Ukrainian_i, Ukrainian_I ] }; }; partial alphanumeric_keys -xkb_symbols "winkeys" { - include "by(basic)" - name[Group1]= "Belarus - Winkeys"; - key { [ 3, numerosign ] }; - key { [ 4, semicolon ] }; - key { [ 5, percent ] }; - key { [ 6, colon ] }; - key { [ 7, question ] }; - key { [ 8, asterisk ] }; - key { [ period, comma ] }; - key { [ slash, bar ] }; +xkb_symbols "legacy" { + include "by(basic)" + name[Group1]= "Belarus - Legacy"; + + key { [ 3, numbersign ] }; + key { [ 4, asterisk ] }; + key { [ 5, colon ] }; + key { [ 6, comma ] }; + key { [ 7, period ] }; + key { [ 8, semicolon ] }; + key { [ slash, question ] }; + key { [ backslash, bar ] }; }; // based on a keyboard map from an 'xkb/symbols/iso3335-3' file @@ -81,18 +38,31 @@ xkb_symbols "winkeys" { partial alphanumeric_keys xkb_symbols "latin" { + include "latin" + name[Group1]= "Belarus - Latin"; + + key { [ w, W, scaron, Scaron ] }; + key { [ u, U, ubreve, Ubreve ] }; + key { [ s, S, sacute, Sacute ] }; + key { [ l, L, lstroke, Lstroke ] }; + key { [ z, Z, zacute, Zacute ] }; + key { [ x, X, zcaron, Zcaron ] }; + key { [ c, C, cacute, Cacute ] }; + key { [ v, V, ccaron, Ccaron ] }; + key { [ n, N, nacute, Nacute ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "common" { + include "ru(winkeys)" + name[Group1]= "Belarus - Common"; - include "latin" - name[Group1]= "Belarus - Latin"; - key { [ w, W, scaron, Scaron ] }; - key { [ u, U, ubreve, Ubreve ] }; - key { [ s, S, sacute, Sacute ] }; - key { [ l, L, lstroke, Lstroke ] }; - key { [ z, Z, zacute, Zacute ] }; - key { [ x, X, zcaron, Zcaron ] }; - key { [ c, C, cacute, Cacute ] }; - key { [ v, V, ccaron, Ccaron ] }; - key { [ n, N, nacute, Nacute ] }; + key { [ Byelorussian_shortu, Byelorussian_SHORTU, Cyrillic_shcha, Cyrillic_SHCHA ] }; + key { [ apostrophe, apostrophe, Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; + key { [ Ukrainian_i, Ukrainian_I, Cyrillic_i, Cyrillic_I ] }; - include "level3(ralt_switch)" + + include "level3(ralt_switch)" }; -- 2.32.0.93.g670b81a890