keyboards: update cyrillic keyboard

1 files changed, 179 insertions, 21 deletions

diff --git a/keyboards.org b/keyboards.org
index 22079fc..fbfab00 100644
--- a/keyboards.org
+++ b/keyboards.org
@@ -1,28 +1,186 @@
 #+TITLE: My Custom Keyboards
 
 * Cyrillic
-Setting up ~phonetic_mac~ on Wayland was too cumbersome for me, so I just set it up as a separate keymap altogether
+
 #+begin_src fundamental :tangle "/sudo::/usr/share/X11/xkb/symbols/my-cyr" :auto_tangle nil
+partial alphanumeric_keys
+xkb_symbols "phonetic" {
+
+    name[Group1]= "Russian (phonetic)";
+
+    key <AE01> { [           1,      exclam  ] };
+    key <AE02> { [           2,          at  ] };
+    key <AE03> { [           3, Cyrillic_io  ] };
+    key <AE04> { [           4, Cyrillic_IO  ] };
+    key <AE05> { [           5, Cyrillic_hardsign  ] };
+    key <AE06> { [           6, Cyrillic_HARDSIGN  ] };
+    key <AE07> { [           7,   ampersand  ] };
+    key <AE08> { [           8,    asterisk  ] };
+    key <AE09> { [           9,   parenleft  ] };
+    key <AE10> { [           0,  parenright  ] };
+    key <AE11> { [       minus,  underscore  ] };
+
+    key <AB09> { [      period,     greater  ] };
+    key <AB10> { [       slash,    question  ] };
+    key <AB08> { [       comma,        less  ] };
+    key <AC10> { [   semicolon,       colon  ] };
+    key <AC11> { [  apostrophe,    quotedbl  ] };
+    key <LSGT> { [         bar,   brokenbar  ] };
+
+    key <TLDE> { [       Cyrillic_yu,       Cyrillic_YU  ] };
+    key <LatQ> { [       Cyrillic_ya,       Cyrillic_YA  ] };
+    key <LatZ> { [       Cyrillic_ze,       Cyrillic_ZE  ] };
+    key <LatS> { [       Cyrillic_es,       Cyrillic_ES  ] };
+    key <LatA> { [        Cyrillic_a,        Cyrillic_A  ] };
+    key <LatW> { [       Cyrillic_ve,       Cyrillic_VE  ] };
+    key <LatC> { [      Cyrillic_tse,      Cyrillic_TSE  ] };
+    key <LatX> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN  ] };
+    key <LatD> { [       Cyrillic_de,       Cyrillic_DE  ] };
+    key <LatE> { [       Cyrillic_ie,       Cyrillic_IE  ] };
+    key <LatV> { [      Cyrillic_zhe,      Cyrillic_ZHE  ] };
+    key <LatF> { [       Cyrillic_ef,       Cyrillic_EF  ] };
+    key <LatT> { [       Cyrillic_te,       Cyrillic_TE  ] };
+    key <LatR> { [       Cyrillic_er,       Cyrillic_ER  ] };
+    key <LatN> { [       Cyrillic_en,       Cyrillic_EN  ] };
+    key <LatB> { [       Cyrillic_be,       Cyrillic_BE  ] };
+    key <LatH> { [       Cyrillic_ha,       Cyrillic_HA  ] };
+    key <LatG> { [      Cyrillic_ghe,      Cyrillic_GHE  ] };
+    key <LatY> { [     Cyrillic_yeru,     Cyrillic_YERU  ] };
+    key <LatM> { [       Cyrillic_em,       Cyrillic_EM  ] };
+    key <LatJ> { [   Cyrillic_shorti,   Cyrillic_SHORTI  ] };
+    key <LatU> { [        Cyrillic_u,        Cyrillic_U  ] };
+    key <LatK> { [       Cyrillic_ka,       Cyrillic_KA  ] };
+    key <LatI> { [        Cyrillic_i,        Cyrillic_I  ] };
+    key <LatO> { [        Cyrillic_o,        Cyrillic_O  ] };
+    key <LatL> { [       Cyrillic_el,       Cyrillic_EL  ] };
+    key <LatP> { [       Cyrillic_pe,       Cyrillic_PE  ] };
+
+    key <AD11> { [      Cyrillic_sha,      Cyrillic_SHA  ] };
+    key <AE12> { [      Cyrillic_che,      Cyrillic_CHE  ] };
+    key <AD12> { [    Cyrillic_shcha,    Cyrillic_SHCHA  ] };
+    key <BKSL> { [        Cyrillic_e,        Cyrillic_E  ] };
+};
+#+end_src
+
+#+begin_src fundamental :tangle "/sudo::/usr/share/X11/xkb/symbols/my-cyr2"
+partial alphanumeric_keys
+xkb_symbols "phonetic" {
+
+    name[Group1]= "Russian (phonetic)";
+
+    key <AE01> { [           1,      exclam  ] };
+    key <AE02> { [           2,          at  ] };
+    key <AE03> { [           3, Cyrillic_io  ] };
+    key <AE04> { [           4, Cyrillic_IO  ] };
+    key <AE05> { [           5, Cyrillic_hardsign  ] };
+    key <AE06> { [           6, Cyrillic_HARDSIGN  ] };
+    key <AE07> { [           7,   ampersand  ] };
+    key <AE08> { [           8,    asterisk  ] };
+    key <AE09> { [           9,   parenleft  ] };
+    key <AE10> { [           0,  parenright  ] };
+    key <AE11> { [       minus,  underscore  ] };
+
+    key <AB09> { [      period,     greater  ] };
+    key <AB10> { [       slash,    question  ] };
+    key <AB08> { [       comma,        less  ] };
+    key <AC10> { [   semicolon,       colon  ] };
+    key <AC11> { [  apostrophe,    quotedbl  ] };
+    key <LSGT> { [         bar,   brokenbar  ] };
+
+    key <TLDE> { [       Cyrillic_yu,       Cyrillic_YU  ] };
+    key <LatQ> { [       Cyrillic_ya,       Cyrillic_YA  ] };
+    key <LatZ> { [       Cyrillic_ze,       Cyrillic_ZE  ] };
+    key <LatS> { [       Cyrillic_es,       Cyrillic_ES  ] };
+    key <LatA> { [        Cyrillic_a,        Cyrillic_A  ] };
+    key <LatW> { [       Cyrillic_ve,       Cyrillic_VE  ] };
+    key <LatC> { [      Cyrillic_tse,      Cyrillic_TSE  ] };
+    key <LatX> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN  ] };
+    key <LatD> { [       Cyrillic_de,       Cyrillic_DE  ] };
+    key <LatE> { [       Cyrillic_ie,       Cyrillic_IE  ] };
+    key <LatV> { [      Cyrillic_zhe,      Cyrillic_ZHE  ] };
+    key <LatF> { [       Cyrillic_ef,       Cyrillic_EF  ] };
+    key <LatT> { [       Cyrillic_te,       Cyrillic_TE  ] };
+    key <LatR> { [       Cyrillic_er,       Cyrillic_ER  ] };
+    key <LatN> { [       Cyrillic_en,       Cyrillic_EN  ] };
+    key <LatB> { [       Cyrillic_be,       Cyrillic_BE  ] };
+    key <LatH> { [       Cyrillic_ha,       Cyrillic_HA  ] };
+    key <LatG> { [      Cyrillic_ghe,      Cyrillic_GHE  ] };
+    key <LatY> { [     Cyrillic_yeru,     Cyrillic_YERU  ] };
+    key <LatM> { [       Cyrillic_em,       Cyrillic_EM  ] };
+    key <LatJ> { [   Cyrillic_shorti,   Cyrillic_SHORTI  ] };
+    key <LatU> { [        Cyrillic_u,        Cyrillic_U  ] };
+    key <LatK> { [       Cyrillic_ka,       Cyrillic_KA  ] };
+    key <LatI> { [        Cyrillic_i,        Cyrillic_I  ] };
+    key <LatO> { [        Cyrillic_o,        Cyrillic_O  ] };
+    key <LatL> { [       Cyrillic_el,       Cyrillic_EL  ] };
+    key <LatP> { [       Cyrillic_pe,       Cyrillic_PE  ] };
+
+    key <AD11> { [      Cyrillic_sha,      Cyrillic_SHA  ] };
+    key <AE12> { [      Cyrillic_che,      Cyrillic_CHE  ] };
+    key <AD12> { [    Cyrillic_shcha,    Cyrillic_SHCHA  ] };
+    key <BKSL> { [        Cyrillic_e,        Cyrillic_E  ] };
+};
+#+end_src
+
+#+begin_src fundamental :tangle "/sudo::/usr/share/X11/xkb/symbols/my-bg"
   partial alphanumeric_keys
-  xkb_symbols "phonetic_mac" {
-
-      include "ru(phonetic_winkeys)"
-      name[Group1]= "Russian (phonetic Macintosh)";
-
-      key <LatE> { [       Cyrillic_ie,       Cyrillic_IE, Cyrillic_io, Cyrillic_IO  ] };
-      key <LatW> { [      Cyrillic_sha,      Cyrillic_SHA  ] };
-      key <LatV> { [       Cyrillic_ve,       Cyrillic_VE  ] };
-      key <TLDE> { [    Cyrillic_shcha,    Cyrillic_SHCHA  ] };
-      key <AD11> { [       Cyrillic_yu,       Cyrillic_YU  ] };
-      key <AD12> { [      Cyrillic_zhe,      Cyrillic_ZHE  ] };
-      key <AE03> { [                 3,        numbersign, numerosign  ] };
-      key <AE04> { [                 4,            dollar, U20BD       ] }; // ruble
-      key <AE05> { [                 5,           percent  ] };
-      key <AE06> { [                 6,       asciicircum  ] };
-      key <AE11> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN, minus,       underscore  ] };
-      key <AE12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, equal,       plus        ] };
-
-      include "level3(ralt_switch)"
+  xkb_symbols "phonetic" {
+    name[Group1]= "Bulgarian (traditional phonetic)";
+
+    key <TLDE> {[ Cyrillic_che,      Cyrillic_CHE                                              ]};
+    key <AE01> {[ 1,                 exclam                                                    ]};
+    key <AE02> {[ 2,                 at                                                        ]};
+    key <AE03> {[ 3,                 numerosign                                                ]};
+    key <AE04> {[ 4,                 dollar,            EuroSign,          EuroSign            ]};
+    key <AE05> {[ 5,                 percent                                                   ]};
+    key <AE06> {[ 6,                 EuroSign                                                  ]};
+    key <AE07> {[ 7,                 section                                                   ]};
+    key <AE08> {[ 8,                 asterisk                                                  ]};
+    key <AE09> {[ 9,                 parenleft,         bracketleft,       U2329               ]};
+    key <AE10> {[ 0,                 parenright,        bracketright,      U232A               ]};
+    key <AE11> {[ minus,             endash,            U2011,             U2011               ]};
+    key <AE12> {[ equal,             plus,              emdash,            dagger              ]};
+
+    key <AD01> {[ Cyrillic_ya,       Cyrillic_YA,       U0463,             U0462               ]};
+    key <AD02> {[ Cyrillic_ve,       Cyrillic_VE                                               ]};
+    key <AD03> {[ Cyrillic_ie,       Cyrillic_IE,       Cyrillic_e,        Cyrillic_E          ]};
+    key <AD04> {[ Cyrillic_er,       Cyrillic_ER,       registered,        registered          ]};
+    key <AD05> {[ Cyrillic_te,       Cyrillic_TE,       trademark,         trademark           ]};
+    key <AD06> {[ Cyrillic_hardsign, Cyrillic_HARDSIGN, U046B,             U046A               ]};
+    key <AD07> {[ Cyrillic_u,        Cyrillic_U                                                ]};
+    key <AD08> {[ Cyrillic_i,        Cyrillic_I,        U045D,             U040D               ]};
+    key <AD09> {[ Cyrillic_o,        Cyrillic_O                                                ]};
+    key <AD10> {[ Cyrillic_pe,       Cyrillic_PE                                               ]};
+    key <AD11> {[ Cyrillic_sha,      Cyrillic_SHA                                              ]};
+    key <AD12> {[ Cyrillic_shcha,    Cyrillic_SHCHA                                            ]};
+
+    key <AC01> {[ Cyrillic_a,        Cyrillic_A                                                ]};
+    key <AC02> {[ Cyrillic_es,       Cyrillic_ES,       copyright,         copyright           ]};
+    key <AC03> {[ Cyrillic_de,       Cyrillic_DE                                               ]};
+    key <AC04> {[ Cyrillic_ef,       Cyrillic_EF                                               ]};
+    key <AC05> {[ Cyrillic_ghe,      Cyrillic_GHE                                              ]};
+    key <AC06> {[ Cyrillic_ha,       Cyrillic_HA                                               ]};
+    key <AC07> {[ Cyrillic_shorti,   Cyrillic_SHORTI,   U046D,             U046C               ]};
+    key <AC08> {[ Cyrillic_ka,       Cyrillic_KA                                               ]};
+    key <AC09> {[ Cyrillic_el,       Cyrillic_EL                                               ]};
+    key <AC10> {[ semicolon,         colon,             ellipsis,          ellipsis            ]};
+    key <AC11> {[ apostrophe,        quotedbl,       rightsinglequotemark, leftsinglequotemark ]};
+    key <BKSL> {[ Cyrillic_yu,       Cyrillic_YU                                               ]};
+
+    key <LSGT> {[ U045D,             U040D                                                     ]};
+    key <AB01> {[ Cyrillic_ze,       Cyrillic_ZE                                               ]};
+    key <AB02> {[ Cyrillic_softsign, U045D,             Cyrillic_yeru,     Cyrillic_YERU       ]};
+    key <AB03> {[ Cyrillic_tse,      Cyrillic_TSE,      copyright,         copyright           ]};
+    key <AB04> {[ Cyrillic_zhe,      Cyrillic_ZHE                                              ]};
+    key <AB05> {[ Cyrillic_be,       Cyrillic_BE                                               ]};
+    key <AB06> {[ Cyrillic_en,       Cyrillic_EN                                               ]};
+    key <AB07> {[ Cyrillic_em,       Cyrillic_EM                                               ]};
+    key <AB08> {[ comma,            doublelowquotemark, guillemotleft,     guillemotleft       ]};
+    key <AB09> {[ period,          leftdoublequotemark, guillemotright,    guillemotright      ]};
+    key <AB10> {[ slash,             question,          U0300,             U0301               ]};
+
+    key <SPCE> {[ space,             space,             nobreakspace,      nobreakspace        ]};
+
+    key <KPDL> { type[Group1] = "KEYPAD",             [ KP_Delete,         KP_Separator        ]};
   };
 #+end_src
-