symbols/rs: Remove pointless trailing "any" and "NoSymbol".

They add nothing and just clutter things up.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>

1 files changed, 96 insertions, 97 deletions

diff --git a/symbols/rs b/symbols/rs
index 9b9c74a8..abf75b59 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 <AD06> { [ Cyrillic_zhe,    Cyrillic_ZHE,  any, any ] }; // y
-    key <AB01> { [ Cyrillic_ze,     Cyrillic_ZE,   any, any ] }; // z
+    key <AD06> { [ Cyrillic_zhe,    Cyrillic_ZHE ] }; // y
+    key <AB01> { [ 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 <TLDE> { [ grave,          asciitilde,     any, any ] };
-    key <AE01> { [ 1,              exclam,         any, any ] };
-    key <AE02> { [ 2,              quotedbl,       any, any ] };
-    key <AE03> { [ 3,              numbersign,     any, any ] };
-    key <AE04> { [ 4,              dollar,         any, any ] };
-    key <AE05> { [ 5,              percent,        any, any ] };
-    key <AE06> { [ 6,              ampersand,      any, any ] };
-    key <AE07> { [ 7,              slash,          any, any ] };
-    key <AE08> { [ 8,              parenleft,      any, any ] };
-    key <AE09> { [ 9,              parenright,     any, any ] };
-    key <AE10> { [ 0,              equal,          any, any ] };
-    key <AE11> { [ apostrophe,     question,       any, any ] };
-    key <AE12> { [ plus,           asterisk,       any, any ] };
-
-    key <AB08> { [ comma,          semicolon,      any, any ] };
-    key <AB09> { [ period,         colon,          any, any ] };
-    key <AB10> { [ minus,          underscore,     any, any ] };
+    key <TLDE> { [ grave,          asciitilde    ] };
+    key <AE01> { [ 1,              exclam        ] };
+    key <AE02> { [ 2,              quotedbl      ] };
+    key <AE03> { [ 3,              numbersign    ] };
+    key <AE04> { [ 4,              dollar        ] };
+    key <AE05> { [ 5,              percent       ] };
+    key <AE06> { [ 6,              ampersand     ] };
+    key <AE07> { [ 7,              slash         ] };
+    key <AE08> { [ 8,              parenleft     ] };
+    key <AE09> { [ 9,              parenright    ] };
+    key <AE10> { [ 0,              equal         ] };
+    key <AE11> { [ apostrophe,     question      ] };
+    key <AE12> { [ plus,           asterisk      ] };
+
+    key <AB08> { [ comma,          semicolon     ] };
+    key <AB09> { [ period,         colon         ] };
+    key <AB10> { [ minus,          underscore    ] };
 
     include "kpdl(comma)"
 };
@@ -74,51 +74,51 @@ xkb_symbols "common" {
 hidden partial alphanumeric_keys
 xkb_symbols "cyralpha" {
 
-    key <AD01> { [ Cyrillic_lje,   Cyrillic_LJE,   any, any ] }; // q
-    key <AD02> { [ Cyrillic_nje,   Cyrillic_NJE,   any, any ] }; // w
-    key <AD03> { [ Cyrillic_ie,    Cyrillic_IE,    any, any ] }; // e
-    key <AD04> { [ Cyrillic_er,    Cyrillic_ER,    any, any ] }; // r
-    key <AD05> { [ Cyrillic_te,    Cyrillic_TE,    any, any ] }; // t
-    key <AD06> { [ Cyrillic_ze,    Cyrillic_ZE,    any, any ] }; // y
-    key <AD07> { [ Cyrillic_u,     Cyrillic_U,     any, any ] }; // u
-    key <AD08> { [ Cyrillic_i,     Cyrillic_I,     any, any ] }; // i
-    key <AD09> { [ Cyrillic_o,     Cyrillic_O,     any, any ] }; // o
-    key <AD10> { [ Cyrillic_pe,    Cyrillic_PE,    any, any ] }; // p
-    key <AD11> { [ Cyrillic_sha,   Cyrillic_SHA,   any, any ] }; // [ {
-    key <AD12> { [ Serbian_dje,    Serbian_DJE,    any, any ] }; // ] }
-
-    key <AC01> { [ Cyrillic_a,     Cyrillic_A,     any, any ] }; // a
-    key <AC02> { [ Cyrillic_es,    Cyrillic_ES,    any, any ] }; // s
-    key <AC03> { [ Cyrillic_de,    Cyrillic_DE,    any, any ] }; // d
-    key <AC04> { [ Cyrillic_ef,    Cyrillic_EF,    any, any ] }; // f
-    key <AC05> { [ Cyrillic_ghe,   Cyrillic_GHE,   any, any ] }; // g
-    key <AC06> { [ Cyrillic_ha,    Cyrillic_HA,    any, any ] }; // h
-    key <AC07> { [ Cyrillic_je,    Cyrillic_JE,    any, any ] }; // j
-    key <AC08> { [ Cyrillic_ka,    Cyrillic_KA,    any, any ] }; // k
-    key <AC09> { [ Cyrillic_el,    Cyrillic_EL,    any, any ] }; // l
-    key <AC10> { [ Cyrillic_che,   Cyrillic_CHE,   any, any ] }; // ; :
-    key <AC11> { [ Serbian_tshe,   Serbian_TSHE,   any, any ] }; // ' "
-    key <BKSL> { [ Cyrillic_zhe,   Cyrillic_ZHE,   any, any ] }; // \ |
-
-    key <AB01> { [ Cyrillic_zhe,   Cyrillic_ZHE,   any, any ] }; // z
-    key <AB02> { [ Cyrillic_dzhe,  Cyrillic_DZHE,  any, any ] }; // x
-    key <AB03> { [ Cyrillic_tse,   Cyrillic_TSE,   any, any ] }; // c
-    key <AB04> { [ Cyrillic_ve,    Cyrillic_VE,    any, any ] }; // v
-    key <AB05> { [ Cyrillic_be,    Cyrillic_BE,    any, any ] }; // b
-    key <AB06> { [ Cyrillic_en,    Cyrillic_EN,    any, any ] }; // n
-    key <AB07> { [ Cyrillic_em,    Cyrillic_EM,    any, any ] }; // m
+    key <AD01> { [ Cyrillic_lje,   Cyrillic_LJE  ] }; // q
+    key <AD02> { [ Cyrillic_nje,   Cyrillic_NJE  ] }; // w
+    key <AD03> { [ Cyrillic_ie,    Cyrillic_IE   ] }; // e
+    key <AD04> { [ Cyrillic_er,    Cyrillic_ER   ] }; // r
+    key <AD05> { [ Cyrillic_te,    Cyrillic_TE   ] }; // t
+    key <AD06> { [ Cyrillic_ze,    Cyrillic_ZE   ] }; // y
+    key <AD07> { [ Cyrillic_u,     Cyrillic_U    ] }; // u
+    key <AD08> { [ Cyrillic_i,     Cyrillic_I    ] }; // i
+    key <AD09> { [ Cyrillic_o,     Cyrillic_O    ] }; // o
+    key <AD10> { [ Cyrillic_pe,    Cyrillic_PE   ] }; // p
+    key <AD11> { [ Cyrillic_sha,   Cyrillic_SHA  ] }; // [ {
+    key <AD12> { [ Serbian_dje,    Serbian_DJE   ] }; // ] }
+
+    key <AC01> { [ Cyrillic_a,     Cyrillic_A    ] }; // a
+    key <AC02> { [ Cyrillic_es,    Cyrillic_ES   ] }; // s
+    key <AC03> { [ Cyrillic_de,    Cyrillic_DE   ] }; // d
+    key <AC04> { [ Cyrillic_ef,    Cyrillic_EF   ] }; // f
+    key <AC05> { [ Cyrillic_ghe,   Cyrillic_GHE  ] }; // g
+    key <AC06> { [ Cyrillic_ha,    Cyrillic_HA   ] }; // h
+    key <AC07> { [ Cyrillic_je,    Cyrillic_JE   ] }; // j
+    key <AC08> { [ Cyrillic_ka,    Cyrillic_KA   ] }; // k
+    key <AC09> { [ Cyrillic_el,    Cyrillic_EL   ] }; // l
+    key <AC10> { [ Cyrillic_che,   Cyrillic_CHE  ] }; // ; :
+    key <AC11> { [ Serbian_tshe,   Serbian_TSHE  ] }; // ' "
+    key <BKSL> { [ Cyrillic_zhe,   Cyrillic_ZHE  ] }; // \ |
+
+    key <AB01> { [ Cyrillic_zhe,   Cyrillic_ZHE  ] }; // z
+    key <AB02> { [ Cyrillic_dzhe,  Cyrillic_DZHE ] }; // x
+    key <AB03> { [ Cyrillic_tse,   Cyrillic_TSE  ] }; // c
+    key <AB04> { [ Cyrillic_ve,    Cyrillic_VE   ] }; // v
+    key <AB05> { [ Cyrillic_be,    Cyrillic_BE   ] }; // b
+    key <AB06> { [ Cyrillic_en,    Cyrillic_EN   ] }; // n
+    key <AB07> { [ Cyrillic_em,    Cyrillic_EM   ] }; // m
 };
 
 
 hidden partial alphanumeric_keys
 xkb_symbols "latalpha" {
 
-    key <AD11> { [ scaron,         Scaron,         any, any ] }; // [ {
-    key <AD12> { [ dstroke,        Dstroke,        any, any ] }; // ] }
+    key <AD11> { [ scaron,         Scaron        ] }; // [ {
+    key <AD12> { [ dstroke,        Dstroke       ] }; // ] }
 
-    key <AC10> { [ ccaron,         Ccaron,         any, any ] }; // ; :
-    key <AC11> { [ cacute,         Cacute,         any, any ] }; // ' "
-    key <BKSL> { [ zcaron,         Zcaron,         any, any ] }; // \ |
+    key <AC10> { [ ccaron,         Ccaron        ] }; // ; :
+    key <AC11> { [ cacute,         Cacute        ] }; // ' "
+    key <BKSL> { [ 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 <AB01> { [ zcaron,         Zcaron,        any, any ] }; // z
+    key <AB01> { [ zcaron,         Zcaron        ] }; // z
 };
 
 hidden partial alphanumeric_keys
@@ -171,7 +171,6 @@ xkb_symbols "latlevel3" {
     key <AC04> { [ any, any,   bracketleft,         ordfeminine      ] }; // f
     key <AC05> { [ any, any,   bracketright,        ENG              ] }; // g
     key <AC06> { [ any, any,   hstroke,             Hstroke          ] }; // h // ALPHABETIC
-    key <AC07> { [ any, any,   NoSymbol,            NoSymbol         ] }; // j
     key <AC08> { [ any, any,   lstroke,             ampersand        ] }; // k
     key <AC09> { [ any, any,   lstroke,             Lstroke          ] }; // l
     key <AC10> { [ any, any,   dead_acute,          dead_doubleacute ] }; // ;
@@ -193,40 +192,40 @@ xkb_symbols "latlevel3" {
 hidden partial alphanumeric_keys
 xkb_symbols "cyrlevel3" {
     key <TLDE> { [ any, any,   degree,              notsign          ] }; // ` ~
-    key <AE03> { [ any, any,   dead_circumflex,     NoSymbol         ] }; // 3 #
-    key <AE07> { [ any, any,   dead_grave,          NoSymbol         ] }; // 7 &
-    key <AE08> { [ any, any,   dead_doublegrave,    NoSymbol         ] }; // 8 *
-    key <AE09> { [ any, any,   dead_acute,          NoSymbol         ] }; // 9 (
-    key <AE10> { [ any, any,   dead_invertedbreve,  NoSymbol         ] }; // 0 )
-    key <AE11> { [ any, any,   dead_macron,         NoSymbol         ] }; // - _
-
-    key <AD01> { [ any, any,   backslash,           NoSymbol         ] }; // q
-    key <AD02> { [ any, any,   bar,                 NoSymbol         ] }; // w
+    key <AE03> { [ any, any,   dead_circumflex                       ] }; // 3 #
+    key <AE07> { [ any, any,   dead_grave                            ] }; // 7 &
+    key <AE08> { [ any, any,   dead_doublegrave                      ] }; // 8 *
+    key <AE09> { [ any, any,   dead_acute                            ] }; // 9 (
+    key <AE10> { [ any, any,   dead_invertedbreve                    ] }; // 0 )
+    key <AE11> { [ any, any,   dead_macron                           ] }; // - _
+
+    key <AD01> { [ any, any,   backslash                             ] }; // q
+    key <AD02> { [ any, any,   bar                                   ] }; // w
     key <AD03> { [ any, any,   EuroSign,            sterling         ] }; // e
     key <AD04> { [ any, any,   paragraph,           registered       ] }; // r
-    key <AD05> { [ any, any,   ellipsis,            NoSymbol         ] }; // t // ALPHABETIC
+    key <AD05> { [ any, any,   ellipsis                              ] }; // t // ALPHABETIC
     key <AD06> { [ any, any,   leftarrow,           yen              ] }; // y
     key <AD07> { [ any, any,   downarrow,           uparrow          ] }; // u
-    key <AD08> { [ any, any,   rightarrow,          NoSymbol         ] }; // i
-    key <AD09> { [ any, any,   section,             NoSymbol         ] }; // o // ALPHABETIC
-    key <AD11> { [ any, any,   division,            NoSymbol         ] }; // [
-    key <AD12> { [ any, any,   multiply,            NoSymbol         ] }; // ]
+    key <AD08> { [ any, any,   rightarrow                            ] }; // i
+    key <AD09> { [ any, any,   section                               ] }; // o // ALPHABETIC
+    key <AD11> { [ any, any,   division                              ] }; // [
+    key <AD12> { [ any, any,   multiply                              ] }; // ]
 
     key <AC02> { [ any, any,   doublelowquotemark,  guillemotright   ] }; // s
     key <AC03> { [ any, any,   leftdoublequotemark, guillemotleft    ] }; // d
-    key <AC04> { [ any, any,   bracketleft,         NoSymbol         ] }; // f
-    key <AC05> { [ any, any,   bracketright,        NoSymbol         ] }; // g
-    key <BKSL> { [ any, any,   currency,            NoSymbol         ] }; // \
+    key <AC04> { [ any, any,   bracketleft                           ] }; // f
+    key <AC05> { [ any, any,   bracketright                          ] }; // g
+    key <BKSL> { [ any, any,   currency                              ] }; // \
 
-    key <AB01> { [ any, any,   leftsinglequotemark, NoSymbol         ] }; // z
-    key <AB02> { [ any, any,   rightsinglequotemark,NoSymbol         ] }; // x
+    key <AB01> { [ any, any,   leftsinglequotemark                   ] }; // z
+    key <AB02> { [ any, any,   rightsinglequotemark                  ] }; // x
     key <AB03> { [ any, any,   cent,                copyright        ] }; // c
-    key <AB04> { [ any, any,   at,                  NoSymbol         ] }; // v
-    key <AB05> { [ any, any,   braceleft,           NoSymbol         ] }; // b
-    key <AB06> { [ any, any,   braceright,          NoSymbol         ] }; // n
-    key <AB07> { [ any, any,   asciicircum,         NoSymbol         ] }; // m
-    key <AB08> { [ any, any,   less,                NoSymbol         ] }; // , <
-    key <AB09> { [ any, any,   greater,             NoSymbol         ] }; // . >
+    key <AB04> { [ any, any,   at                                    ] }; // v
+    key <AB05> { [ any, any,   braceleft                             ] }; // b
+    key <AB06> { [ any, any,   braceright                            ] }; // n
+    key <AB07> { [ any, any,   asciicircum                           ] }; // m
+    key <AB08> { [ any, any,   less                                  ] }; // , <
+    key <AB09> { [ any, any,   greater                               ] }; // . >
     key <AB10> { [ any, any,   emdash,              endash           ] }; // / ?
 };
 
@@ -248,8 +247,8 @@ xkb_symbols "latinyz" {
     include "rs(latin)"
     name[Group1]= "Serbian (Latin qwerty)";
 
-    key <AD06> { [ y,              Y,              any, any ] }; // y
-    key <AB01> { [ z,              Z,              any, any ] }; // z
+    key <AD06> { [ y,              Y             ] }; // y
+    key <AB01> { [ z,              Z             ] }; // z
 };
 
 partial alphanumeric_keys
@@ -259,8 +258,8 @@ xkb_symbols "latinunicodeyz" {
     include "rs(latinunicode)"
     name[Group1]= "Serbian (Latin Unicode qwerty)";
 
-    key <AD06> { [ zcaron,         Zcaron,         any, any ] }; // y
-    key <AB01> { [ z,              Z,              any, any ] }; // z
+    key <AD06> { [ zcaron,         Zcaron        ] }; // y
+    key <AB01> { [ z,              Z             ] }; // z
 };
 
 xkb_symbols "alternatequotes" {
@@ -269,8 +268,8 @@ xkb_symbols "alternatequotes" {
     include "rs(basic)"
     name[Group1]= "Serbian (Cyrillic with guillemets)";
 
-    key <AC02> { [ any, any,   guillemotright, NoSymbol ] }; // s
-    key <AC03> { [ any, any,   guillemotleft,  NoSymbol ] }; // d
+    key <AC02> { [ any, any,   guillemotright    ] }; // s
+    key <AC03> { [ any, any,   guillemotleft     ] }; // d
 };
 
 xkb_symbols "latinalternatequotes" {
@@ -279,8 +278,8 @@ xkb_symbols "latinalternatequotes" {
     include "rs(latin)"
     name[Group1]= "Serbian (Latin with guillemets)";
 
-    key <AC02> { [ any, any,   guillemotright, NoSymbol ] }; // s
-    key <AC03> { [ any, any,   guillemotleft,  NoSymbol ] }; // d
+    key <AC02> { [ any, any,   guillemotright    ] }; // s
+    key <AC03> { [ any, any,   guillemotleft     ] }; // d
 };
 
 xkb_symbols "rue" {
@@ -317,9 +316,9 @@ xkb_symbols "combiningkeys" {
     name[Group1]= "Serbian (combining accents instead of dead keys)";
 
     key <AE03> { [ any, any,   U0302, dead_circumflex ] }; // 3, U0302 = COMBINING CIRCUMFLEX ACCENT
-    key <AE07> { [ any, any,   U0300, NoSymbol        ] }; // 7, U0300 = COMBINING GRAVE ACCENT
-    key <AE08> { [ any, any,   U030F, NoSymbol        ] }; // 8, U030F = COMBINING DOUBLE GRAVE ACCENT
-    key <AE09> { [ any, any,   U0301, NoSymbol        ] }; // 9, U0301 = COMBINING ACUTE ACCENT
-    key <AE10> { [ any, any,   U0311, NoSymbol        ] }; // 0, U0311 = COMBINING INVERTED BREVE
-    key <AE11> { [ any, any,   U0304, NoSymbol        ] }; // -, U0304 = COMBINING MACRON
+    key <AE07> { [ any, any,   U0300                  ] }; // 7, U0300 = COMBINING GRAVE ACCENT
+    key <AE08> { [ any, any,   U030F                  ] }; // 8, U030F = COMBINING DOUBLE GRAVE ACCENT
+    key <AE09> { [ any, any,   U0301                  ] }; // 9, U0301 = COMBINING ACUTE ACCENT
+    key <AE10> { [ any, any,   U0311                  ] }; // 0, U0311 = COMBINING INVERTED BREVE
+    key <AE11> { [ any, any,   U0304                  ] }; // -, U0304 = COMBINING MACRON
 };