Attachment 137972 Details for Bug 105430 – rulemak.diff

[patch] rulemak.diff

rulemak.diff (text/plain), 11.00 KB, created by Geert Hendrickx on 2018-03-10 18:50:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Geert Hendrickx

Created: 2018-03-10 18:50:51 UTC

Size: 11.00 KB

patch

obsolete

>diff --git a/symbols/ru b/symbols/ru
>index 964705c..9ed67fe 100644
>--- a/symbols/ru
>+++ b/symbols/ru
>@@ -632,66 +632,82 @@ xkb_symbols "phonetic_fr" {
> // Rulemak, Colemak based Russian phonetic layout
> // contact: Geert Hendrickx <geert@hendrickx.be>
> // http://forum.colemak.com/viewtopic.php?id=519
>+//
>+// âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ²ââââââââââ
>+// â Ð ``â ! Ë â @   â â   â $   â %   â ^ Â¯ â & Ó â * â´ â (   â )   â _ â â Ðª + â â«       â
>+// â Ñ ` â 1 Â´ â 2 Â¨ â 3 # â 4 Â¢ â 5 â¬ â 6 Ë â 7 Ó â 8 â½ â 9 [ â 0 ] â - â â Ñ = âBackspaceâ
>+// â¢ââââââ·ââ±ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââºââ³ââââââââ«
>+// â       â Ð¯   â Ð   â Ð¤   â Ð   â Ð Ò â Ð¹ Ð â Ð Ð â Ð£ Ð â Ð« Ð â Ð® : â Ð¨ { â Ð© } â Enter â
>+// â Tab â¹ â Ñ   â Ð¶   â Ñ   â Ð¿   â Ð³ Ò â Ð¹ Ñ â Ð» Ñ â Ñ Ñ â Ñ Ñ â Ñ ; â Ñ Â« â Ñ Â» â   â   â
>+// â£ââââââââ»â±âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââºâ      â
>+// â â« Back â Ð   â Ð    â Ð¡   â Ð¢ Ð â Ð Ð â Ð§ Ð â Ð Ð â Ð Ð â Ð Ð â Ð   â Ð¬ " â Ð | â      â
>+// â  space â Ð°   â Ñ   â Ñ   â Ñ Ñ â Ð´ Ñ â Ñ Ñ â Ð½ Ñ â Ðµ Ñ â Ð¸ Ñ â Ð¾   â Ñ ' â Ñ \ â      â
>+// â£âââââââââ»ââ±ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ²ââââ·ââââââ»âââââââ«
>+// â          â Ð Ð â Ð¥   â Ð¦   â Ð Ð â Ð Ð â Ð   â Ð   â ;   â :   â ?   â                â
>+// â  Shift â§ â Ð· Ñ â Ñ   â Ñ   â Ð² Ñ â Ð± Ñ â Ðº   â Ð¼   â , < â . > â /   â     Shift â§    â
>+// â£ââââââââ³âââ»âââââ³â·ââââââ·â±âââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´â²âââââ·âââ³âââ»âââââ³ââââââââ³ââââ
>+// â       â       â       â                                   â       â       â       â
>+// â Ctrl  â Meta  â  Alt  â                Space              âAltGr â®â Menu  â Ctrl  â
>+// âââââââââ»ââââââââ»ââââââââ¹ââââââââââââââââââââââââââââââââââââºââââââââ»ââââââââ»ââââââââ
> 
> partial alphanumeric_keys
> xkb_symbols "rulemak" {
>-    include "us(basic)"
> 
>     name[Group1]= "Russian (Rulemak, phonetic Colemak)";
> 
>-    key <TLDE> { [     Cyrillic_io,     Cyrillic_IO,           U0300,      asciitilde ] };
>-    key <AE01> { [               1,          exclam,           U0301                  ] };
>-    key <AE02> { [               2,              at,           U030B                  ] };
>+    key <TLDE> { [     Cyrillic_io,     Cyrillic_IO,      dead_grave,dead_doublegrave ] };
>+    key <AE01> { [               1,          exclam,      dead_acute,dead_doubleacute ] };
>+    key <AE02> { [               2,              at,  dead_diaeresis                  ] };
>     key <AE03> { [               3,      numerosign,      numbersign                  ] };
>     key <AE04> { [               4,          dollar,            cent                  ] };
>     key <AE05> { [               5,         percent,        EuroSign                  ] };
>-    key <AE06> { [               6,     asciicircum,           U0306                  ] };
>-    key <AE07> { [               7,       ampersand,           U0307                  ] };
>-    key <AE08> { [               8,        asterisk,           U20BD                  ] };
>+    key <AE06> { [               6,     asciicircum,      dead_breve,     dead_macron ] };
>+    key <AE07> { [               7,       ampersand                                   ] };
>+    key <AE08> { [               8,        asterisk,           U20BD,           U20B4 ] }; // ruble, hryvnia
>     key <AE09> { [               9,       parenleft,     bracketleft                  ] };
>     key <AE10> { [               0,      parenright,    bracketright                  ] };
>     key <AE11> { [           minus,      underscore,          endash,          emdash ] };
>     key <AE12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN,       equal,            plus ] };
> 
>-    key <AD01> { [     Cyrillic_ya,     Cyrillic_YA,               q,               Q ] };
>-    key <AD02> { [    Cyrillic_zhe,    Cyrillic_ZHE,               w,               W ] };
>-    key <AD03> { [     Cyrillic_ef,     Cyrillic_EF,               f,               F ] };
>-    key <AD04> { [     Cyrillic_pe,     Cyrillic_PE,               p,               P ] };
>-    key <AD05> { [    Cyrillic_ghe,    Cyrillic_GHE,               g,               G ] };
>-    key <AD06> { [ Cyrillic_shorti, Cyrillic_SHORTI,               j,               J ] };
>-    key <AD07> { [     Cyrillic_el,     Cyrillic_EL,               l,               L ] };
>-    key <AD08> { [      Cyrillic_u,      Cyrillic_U,               u,               U ] };
>-    key <AD09> { [   Cyrillic_yeru,   Cyrillic_YERU,               y,               Y ] };
>+    key <AD01> { [     Cyrillic_ya,     Cyrillic_YA                                   ] };
>+    key <AD02> { [    Cyrillic_zhe,    Cyrillic_ZHE                                   ] };
>+    key <AD03> { [     Cyrillic_ef,     Cyrillic_EF                                   ] };
>+    key <AD04> { [     Cyrillic_pe,     Cyrillic_PE                                   ] };
>+    key <AD05> { [    Cyrillic_ghe,    Cyrillic_GHE, Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
>+    key <AD06> { [ Cyrillic_shorti, Cyrillic_SHORTI,     Cyrillic_je,     Cyrillic_JE ] };
>+    key <AD07> { [     Cyrillic_el,     Cyrillic_EL,    Cyrillic_lje,    Cyrillic_LJE ] };
>+    key <AD08> { [      Cyrillic_u,      Cyrillic_U, Byelorussian_shortu, Byelorussian_SHORTU ] };
>+    key <AD09> { [   Cyrillic_yeru,   Cyrillic_YERU,    Ukrainian_yi,    Ukrainian_YI ] };
>     key <AD10> { [     Cyrillic_yu,     Cyrillic_YU,       semicolon,           colon ] };
>     key <AD11> { [    Cyrillic_sha,    Cyrillic_SHA,   guillemotleft,       braceleft ] };
>     key <AD12> { [  Cyrillic_shcha,  Cyrillic_SHCHA,  guillemotright,      braceright ] };
>     key <BKSL> { [      Cyrillic_e,      Cyrillic_E,       backslash,             bar ] };
> 
>-    key <AC01> { [      Cyrillic_a,      Cyrillic_A,               a,               A ] };
>-    key <AC02> { [     Cyrillic_er,     Cyrillic_ER,               r,               R ] };
>-    key <AC03> { [     Cyrillic_es,     Cyrillic_ES,               s,               S ] };
>-    key <AC04> { [     Cyrillic_te,     Cyrillic_TE,               t,               T ] };
>-    key <AC05> { [     Cyrillic_de,     Cyrillic_DE,               d,               D ] };
>-    key <AC06> { [     Cyrillic_che,   Cyrillic_CHE,               h,               H ] };
>-    key <AC07> { [     Cyrillic_en,     Cyrillic_EN,               n,               N ] };
>-    key <AC08> { [     Cyrillic_ie,     Cyrillic_IE,               e,               E ] };
>-    key <AC09> { [      Cyrillic_i,      Cyrillic_I,               i,               I ] };
>-    key <AC10> { [      Cyrillic_o,      Cyrillic_O,               o,               O ] };
>+    key <AC01> { [      Cyrillic_a,      Cyrillic_A                                   ] };
>+    key <AC02> { [     Cyrillic_er,     Cyrillic_ER                                   ] };
>+    key <AC03> { [     Cyrillic_es,     Cyrillic_ES                                   ] };
>+    key <AC04> { [     Cyrillic_te,     Cyrillic_TE,    Serbian_tshe,    Serbian_TSHE ] };
>+    key <AC05> { [     Cyrillic_de,     Cyrillic_DE,     Serbian_dje,     Serbian_DJE ] };
>+    key <AC06> { [     Cyrillic_che,   Cyrillic_CHE,   Cyrillic_dzhe,   Cyrillic_DZHE ] };
>+    key <AC07> { [     Cyrillic_en,     Cyrillic_EN,    Cyrillic_nje,    Cyrillic_NJE ] };
>+    key <AC08> { [     Cyrillic_ie,     Cyrillic_IE,    Ukrainian_ie,    Ukrainian_IE ] };
>+    key <AC09> { [      Cyrillic_i,      Cyrillic_I,     Ukrainian_i,     Ukrainian_I ] };
>+    key <AC10> { [      Cyrillic_o,      Cyrillic_O                                   ] };
>     key <AC11> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN,  apostrophe,        quotedbl ] };
> 
>-    key <AB01> { [     Cyrillic_ze,     Cyrillic_ZE,               z,               Z ] };
>-    key <AB02> { [     Cyrillic_ha,     Cyrillic_HA,               x,               X ] };
>-    key <AB03> { [    Cyrillic_tse,    Cyrillic_TSE,               c,               C ] };
>-    key <AB04> { [     Cyrillic_ve,     Cyrillic_VE,               v,               V ] };
>-    key <AB05> { [     Cyrillic_be,     Cyrillic_BE,               b,               B ] };
>-    key <AB06> { [     Cyrillic_ka,     Cyrillic_KA,               k,               K ] };
>-    key <AB07> { [     Cyrillic_em,     Cyrillic_EM,               m,               M ] };
>+    key <AB01> { [     Cyrillic_ze,     Cyrillic_ZE,   Macedonia_dse,   Macedonia_DSE ] };
>+    key <AB02> { [     Cyrillic_ha,     Cyrillic_HA                                   ] };
>+    key <AB03> { [    Cyrillic_tse,    Cyrillic_TSE                                   ] };
>+    key <AB04> { [     Cyrillic_ve,     Cyrillic_VE,   Macedonia_kje,   Macedonia_KJE ] };
>+    key <AB05> { [     Cyrillic_be,     Cyrillic_BE,   Macedonia_gje,   Macedonia_GJE ] };
>+    key <AB06> { [     Cyrillic_ka,     Cyrillic_KA                                   ] };
>+    key <AB07> { [     Cyrillic_em,     Cyrillic_EM                                   ] };
>     key <AB08> { [           comma,       semicolon,            less                  ] };
>     key <AB09> { [          period,           colon,         greater                  ] };
>-    key <AB10> { [           slash,        question                                   ] };
>+    key <AB10> { [           slash,        question,           U04CF,           U04C0 ] }; // palochka
> 
>     key <CAPS> { [       BackSpace,       BackSpace,       BackSpace,       BackSpace ] };
>-    key <LSGT> { [           U0301,      asciitilde,           grave                  ] };
>+    key <LSGT> { [           equal,            plus,        multiply,        division ] };
>     key <SPCE> { [           space,           space,           space,    nobreakspace ] };
>     key <MENU> { [     Mode_switch,       Multi_key                                   ] };
>

Actions: View | Splinter Review

Attachments on bug 105430: 137972 | 138114

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.