From 3a534cdcba1c109503a8f51c28cf8659e95d3a19 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Sun, 14 Aug 2016 09:40:54 +0200 Subject: [PATCH 2/3] symbols/rs: Remove pointless trailing "any" and "NoSymbol". They add nothing and just clutter things up. Signed-off-by: Benno Schulenberg --- symbols/rs | 193 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 96 insertions(+), 97 deletions(-) diff --git a/symbols/rs b/symbols/rs index 9b9c74a..abf75b5 100644 --- a/symbols/rs +++ b/symbols/rs @@ -41,8 +41,8 @@ xkb_symbols "yz" { include "rs(basic)" name[Group1]= "Serbian (Cyrillic, ZE and ZHE swapped)"; - key { [ Cyrillic_zhe, Cyrillic_ZHE, any, any ] }; // y - key { [ Cyrillic_ze, Cyrillic_ZE, any, any ] }; // z + key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; // y + key { [ Cyrillic_ze, Cyrillic_ZE ] }; // z }; hidden partial alphanumeric_keys @@ -50,23 +50,23 @@ xkb_symbols "common" { // "Common" keys: keys that are the same // for both latin and cyrillic keyboards. - key { [ grave, asciitilde, any, any ] }; - key { [ 1, exclam, any, any ] }; - key { [ 2, quotedbl, any, any ] }; - key { [ 3, numbersign, any, any ] }; - key { [ 4, dollar, any, any ] }; - key { [ 5, percent, any, any ] }; - key { [ 6, ampersand, any, any ] }; - key { [ 7, slash, any, any ] }; - key { [ 8, parenleft, any, any ] }; - key { [ 9, parenright, any, any ] }; - key { [ 0, equal, any, any ] }; - key { [ apostrophe, question, any, any ] }; - key { [ plus, asterisk, any, any ] }; - - key { [ comma, semicolon, any, any ] }; - key { [ period, colon, any, any ] }; - key { [ minus, underscore, any, any ] }; + key { [ grave, asciitilde ] }; + key { [ 1, exclam ] }; + key { [ 2, quotedbl ] }; + key { [ 3, numbersign ] }; + key { [ 4, dollar ] }; + key { [ 5, percent ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash ] }; + key { [ 8, parenleft ] }; + key { [ 9, parenright ] }; + key { [ 0, equal ] }; + key { [ apostrophe, question ] }; + key { [ plus, asterisk ] }; + + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; include "kpdl(comma)" }; @@ -74,51 +74,51 @@ xkb_symbols "common" { hidden partial alphanumeric_keys xkb_symbols "cyralpha" { - key { [ Cyrillic_lje, Cyrillic_LJE, any, any ] }; // q - key { [ Cyrillic_nje, Cyrillic_NJE, any, any ] }; // w - key { [ Cyrillic_ie, Cyrillic_IE, any, any ] }; // e - key { [ Cyrillic_er, Cyrillic_ER, any, any ] }; // r - key { [ Cyrillic_te, Cyrillic_TE, any, any ] }; // t - key { [ Cyrillic_ze, Cyrillic_ZE, any, any ] }; // y - key { [ Cyrillic_u, Cyrillic_U, any, any ] }; // u - key { [ Cyrillic_i, Cyrillic_I, any, any ] }; // i - key { [ Cyrillic_o, Cyrillic_O, any, any ] }; // o - key { [ Cyrillic_pe, Cyrillic_PE, any, any ] }; // p - key { [ Cyrillic_sha, Cyrillic_SHA, any, any ] }; // [ { - key { [ Serbian_dje, Serbian_DJE, any, any ] }; // ] } - - key { [ Cyrillic_a, Cyrillic_A, any, any ] }; // a - key { [ Cyrillic_es, Cyrillic_ES, any, any ] }; // s - key { [ Cyrillic_de, Cyrillic_DE, any, any ] }; // d - key { [ Cyrillic_ef, Cyrillic_EF, any, any ] }; // f - key { [ Cyrillic_ghe, Cyrillic_GHE, any, any ] }; // g - key { [ Cyrillic_ha, Cyrillic_HA, any, any ] }; // h - key { [ Cyrillic_je, Cyrillic_JE, any, any ] }; // j - key { [ Cyrillic_ka, Cyrillic_KA, any, any ] }; // k - key { [ Cyrillic_el, Cyrillic_EL, any, any ] }; // l - key { [ Cyrillic_che, Cyrillic_CHE, any, any ] }; // ; : - key { [ Serbian_tshe, Serbian_TSHE, any, any ] }; // ' " - key { [ Cyrillic_zhe, Cyrillic_ZHE, any, any ] }; // \ | - - key { [ Cyrillic_zhe, Cyrillic_ZHE, any, any ] }; // z - key { [ Cyrillic_dzhe, Cyrillic_DZHE, any, any ] }; // x - key { [ Cyrillic_tse, Cyrillic_TSE, any, any ] }; // c - key { [ Cyrillic_ve, Cyrillic_VE, any, any ] }; // v - key { [ Cyrillic_be, Cyrillic_BE, any, any ] }; // b - key { [ Cyrillic_en, Cyrillic_EN, any, any ] }; // n - key { [ Cyrillic_em, Cyrillic_EM, any, any ] }; // m + key { [ Cyrillic_lje, Cyrillic_LJE ] }; // q + key { [ Cyrillic_nje, Cyrillic_NJE ] }; // w + key { [ Cyrillic_ie, Cyrillic_IE ] }; // e + key { [ Cyrillic_er, Cyrillic_ER ] }; // r + key { [ Cyrillic_te, Cyrillic_TE ] }; // t + key { [ Cyrillic_ze, Cyrillic_ZE ] }; // y + key { [ Cyrillic_u, Cyrillic_U ] }; // u + key { [ Cyrillic_i, Cyrillic_I ] }; // i + key { [ Cyrillic_o, Cyrillic_O ] }; // o + key { [ Cyrillic_pe, Cyrillic_PE ] }; // p + key { [ Cyrillic_sha, Cyrillic_SHA ] }; // [ { + key { [ Serbian_dje, Serbian_DJE ] }; // ] } + + key { [ Cyrillic_a, Cyrillic_A ] }; // a + key { [ Cyrillic_es, Cyrillic_ES ] }; // s + key { [ Cyrillic_de, Cyrillic_DE ] }; // d + key { [ Cyrillic_ef, Cyrillic_EF ] }; // f + key { [ Cyrillic_ghe, Cyrillic_GHE ] }; // g + key { [ Cyrillic_ha, Cyrillic_HA ] }; // h + key { [ Cyrillic_je, Cyrillic_JE ] }; // j + key { [ Cyrillic_ka, Cyrillic_KA ] }; // k + key { [ Cyrillic_el, Cyrillic_EL ] }; // l + key { [ Cyrillic_che, Cyrillic_CHE ] }; // ; : + key { [ Serbian_tshe, Serbian_TSHE ] }; // ' " + key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; // \ | + + key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; // z + key { [ Cyrillic_dzhe, Cyrillic_DZHE ] }; // x + key { [ Cyrillic_tse, Cyrillic_TSE ] }; // c + key { [ Cyrillic_ve, Cyrillic_VE ] }; // v + key { [ Cyrillic_be, Cyrillic_BE ] }; // b + key { [ Cyrillic_en, Cyrillic_EN ] }; // n + key { [ Cyrillic_em, Cyrillic_EM ] }; // m }; hidden partial alphanumeric_keys xkb_symbols "latalpha" { - key { [ scaron, Scaron, any, any ] }; // [ { - key { [ dstroke, Dstroke, any, any ] }; // ] } + key { [ scaron, Scaron ] }; // [ { + key { [ dstroke, Dstroke ] }; // ] } - key { [ ccaron, Ccaron, any, any ] }; // ; : - key { [ cacute, Cacute, any, any ] }; // ' " - key { [ zcaron, Zcaron, any, any ] }; // \ | + key { [ ccaron, Ccaron ] }; // ; : + key { [ cacute, Cacute ] }; // ' " + key { [ zcaron, Zcaron ] }; // \ | }; hidden partial alphanumeric_keys @@ -133,7 +133,7 @@ xkb_symbols "twoletter" { [ U1C6, U1C5, any, U1C4 ] }; // x // Also replace letter Y with Zcaron, since Y is of no use any longer. - key { [ zcaron, Zcaron, any, any ] }; // z + key { [ zcaron, Zcaron ] }; // z }; hidden partial alphanumeric_keys @@ -171,7 +171,6 @@ xkb_symbols "latlevel3" { key { [ any, any, bracketleft, ordfeminine ] }; // f key { [ any, any, bracketright, ENG ] }; // g key { [ any, any, hstroke, Hstroke ] }; // h // ALPHABETIC - key { [ any, any, NoSymbol, NoSymbol ] }; // j key { [ any, any, lstroke, ampersand ] }; // k key { [ any, any, lstroke, Lstroke ] }; // l key { [ any, any, dead_acute, dead_doubleacute ] }; // ; @@ -193,40 +192,40 @@ xkb_symbols "latlevel3" { hidden partial alphanumeric_keys xkb_symbols "cyrlevel3" { key { [ any, any, degree, notsign ] }; // ` ~ - key { [ any, any, dead_circumflex, NoSymbol ] }; // 3 # - key { [ any, any, dead_grave, NoSymbol ] }; // 7 & - key { [ any, any, dead_doublegrave, NoSymbol ] }; // 8 * - key { [ any, any, dead_acute, NoSymbol ] }; // 9 ( - key { [ any, any, dead_invertedbreve, NoSymbol ] }; // 0 ) - key { [ any, any, dead_macron, NoSymbol ] }; // - _ - - key { [ any, any, backslash, NoSymbol ] }; // q - key { [ any, any, bar, NoSymbol ] }; // w + key { [ any, any, dead_circumflex ] }; // 3 # + key { [ any, any, dead_grave ] }; // 7 & + key { [ any, any, dead_doublegrave ] }; // 8 * + key { [ any, any, dead_acute ] }; // 9 ( + key { [ any, any, dead_invertedbreve ] }; // 0 ) + key { [ any, any, dead_macron ] }; // - _ + + key { [ any, any, backslash ] }; // q + key { [ any, any, bar ] }; // w key { [ any, any, EuroSign, sterling ] }; // e key { [ any, any, paragraph, registered ] }; // r - key { [ any, any, ellipsis, NoSymbol ] }; // t // ALPHABETIC + key { [ any, any, ellipsis ] }; // t // ALPHABETIC key { [ any, any, leftarrow, yen ] }; // y key { [ any, any, downarrow, uparrow ] }; // u - key { [ any, any, rightarrow, NoSymbol ] }; // i - key { [ any, any, section, NoSymbol ] }; // o // ALPHABETIC - key { [ any, any, division, NoSymbol ] }; // [ - key { [ any, any, multiply, NoSymbol ] }; // ] + key { [ any, any, rightarrow ] }; // i + key { [ any, any, section ] }; // o // ALPHABETIC + key { [ any, any, division ] }; // [ + key { [ any, any, multiply ] }; // ] key { [ any, any, doublelowquotemark, guillemotright ] }; // s key { [ any, any, leftdoublequotemark, guillemotleft ] }; // d - key { [ any, any, bracketleft, NoSymbol ] }; // f - key { [ any, any, bracketright, NoSymbol ] }; // g - key { [ any, any, currency, NoSymbol ] }; // \ + key { [ any, any, bracketleft ] }; // f + key { [ any, any, bracketright ] }; // g + key { [ any, any, currency ] }; // \ - key { [ any, any, leftsinglequotemark, NoSymbol ] }; // z - key { [ any, any, rightsinglequotemark,NoSymbol ] }; // x + key { [ any, any, leftsinglequotemark ] }; // z + key { [ any, any, rightsinglequotemark ] }; // x key { [ any, any, cent, copyright ] }; // c - key { [ any, any, at, NoSymbol ] }; // v - key { [ any, any, braceleft, NoSymbol ] }; // b - key { [ any, any, braceright, NoSymbol ] }; // n - key { [ any, any, asciicircum, NoSymbol ] }; // m - key { [ any, any, less, NoSymbol ] }; // , < - key { [ any, any, greater, NoSymbol ] }; // . > + key { [ any, any, at ] }; // v + key { [ any, any, braceleft ] }; // b + key { [ any, any, braceright ] }; // n + key { [ any, any, asciicircum ] }; // m + key { [ any, any, less ] }; // , < + key { [ any, any, greater ] }; // . > key { [ any, any, emdash, endash ] }; // / ? }; @@ -248,8 +247,8 @@ xkb_symbols "latinyz" { include "rs(latin)" name[Group1]= "Serbian (Latin qwerty)"; - key { [ y, Y, any, any ] }; // y - key { [ z, Z, any, any ] }; // z + key { [ y, Y ] }; // y + key { [ z, Z ] }; // z }; partial alphanumeric_keys @@ -259,8 +258,8 @@ xkb_symbols "latinunicodeyz" { include "rs(latinunicode)" name[Group1]= "Serbian (Latin Unicode qwerty)"; - key { [ zcaron, Zcaron, any, any ] }; // y - key { [ z, Z, any, any ] }; // z + key { [ zcaron, Zcaron ] }; // y + key { [ z, Z ] }; // z }; xkb_symbols "alternatequotes" { @@ -269,8 +268,8 @@ xkb_symbols "alternatequotes" { include "rs(basic)" name[Group1]= "Serbian (Cyrillic with guillemets)"; - key { [ any, any, guillemotright, NoSymbol ] }; // s - key { [ any, any, guillemotleft, NoSymbol ] }; // d + key { [ any, any, guillemotright ] }; // s + key { [ any, any, guillemotleft ] }; // d }; xkb_symbols "latinalternatequotes" { @@ -279,8 +278,8 @@ xkb_symbols "latinalternatequotes" { include "rs(latin)" name[Group1]= "Serbian (Latin with guillemets)"; - key { [ any, any, guillemotright, NoSymbol ] }; // s - key { [ any, any, guillemotleft, NoSymbol ] }; // d + key { [ any, any, guillemotright ] }; // s + key { [ any, any, guillemotleft ] }; // d }; xkb_symbols "rue" { @@ -317,9 +316,9 @@ xkb_symbols "combiningkeys" { name[Group1]= "Serbian (combining accents instead of dead keys)"; key { [ any, any, U0302, dead_circumflex ] }; // 3, U0302 = COMBINING CIRCUMFLEX ACCENT - key { [ any, any, U0300, NoSymbol ] }; // 7, U0300 = COMBINING GRAVE ACCENT - key { [ any, any, U030F, NoSymbol ] }; // 8, U030F = COMBINING DOUBLE GRAVE ACCENT - key { [ any, any, U0301, NoSymbol ] }; // 9, U0301 = COMBINING ACUTE ACCENT - key { [ any, any, U0311, NoSymbol ] }; // 0, U0311 = COMBINING INVERTED BREVE - key { [ any, any, U0304, NoSymbol ] }; // -, U0304 = COMBINING MACRON + key { [ any, any, U0300 ] }; // 7, U0300 = COMBINING GRAVE ACCENT + key { [ any, any, U030F ] }; // 8, U030F = COMBINING DOUBLE GRAVE ACCENT + key { [ any, any, U0301 ] }; // 9, U0301 = COMBINING ACUTE ACCENT + key { [ any, any, U0311 ] }; // 0, U0311 = COMBINING INVERTED BREVE + key { [ any, any, U0304 ] }; // -, U0304 = COMBINING MACRON }; -- 2.9.2