symbols/tj: condense comments, reshuffle keys into their normal order

1 files changed, 116 insertions, 119 deletions

diff --git a/symbols/tj b/symbols/tj
index c168253..6dca933 100644
--- a/symbols/tj
+++ b/symbols/tj
@@ -1,136 +1,133 @@
-// 17/07/2008
-// -------------------------------------------------------------
-// Standard Tojiki Keyboard Layout, Official Standard
-// -------------------------------------------------------------
-// Created by Victor Ibragimov <victor.ibragimov@gmail.com>
-// Tajik Fedora & Software Localization Team
-// -------------------------------------------------------------
-//                        DUAL INPUT METHOD
-// --------------------------------------------------------------------
-// -------------- Tajiki Official Keyboard Layout----------------------
-// --------------------------------------------------------------------
-//
+// Keyboard layouts for Tajikistan.
 
+// ---------------------------------------------------------------------
+// The Official Standard Tojiki keyboard layout.
+// ---------------------------------------------------------------------
+// Original author: Victor Ibragimov <victor.ibragimov@gmail.com>, 2008.
+// ---------------------------------------------------------------------
 default partial alphanumeric_keys
 xkb_symbols "basic"
 {
 	name[Group1] = "Tajik";
 
+	key <TLDE> {[    Cyrillic_io,    Cyrillic_IO                                 ]}; // ё Ё
+	key <AE01> {[              1,         exclam,        section                 ]}; // 1 ! §
+	key <AE02> {[              2,       quotedbl,  guillemotleft, guillemotright ]}; // 2 " « »
+	key <AE03> {[              3,     numerosign                                 ]}; // 3 №
+	key <AE04> {[              4,      semicolon                                 ]}; // 4 ;
+	key <AE05> {[              5,        percent                                 ]}; // 5 %
+	key <AE06> {[              6,          colon,          U2013                 ]}; // 6 : –
+	key <AE07> {[              7,       question,      ampersand                 ]}; // 7 ? &
+	key <AE08> {[              8,       asterisk                                 ]}; // 8 *
+	key <AE09> {[              9,      parenleft                                 ]}; // 9 (
+	key <AE10> {[              0,     parenright,         degree                 ]}; // 0 ) °
+	key <AE11> {[ Cyrillic_ghe_bar, Cyrillic_GHE_bar,      minus,     underscore ]}; // ғ Ғ - _
+	key <AE12> {[ Cyrillic_u_macron, Cyrillic_U_macron,    equal,           plus ]}; // ӯ Ӯ = +
+
+	key <AD01> {[ Cyrillic_shorti, Cyrillic_SHORTI                               ]}; // й Й
+	key <AD02> {[ Cyrillic_ka_descender, Cyrillic_KA_descender                   ]}; // қ Қ
+	key <AD03> {[     Cyrillic_u,     Cyrillic_U                                 ]}; // у У
+	key <AD04> {[    Cyrillic_ka,    Cyrillic_KA                                 ]}; // к К
+	key <AD05> {[    Cyrillic_ie,    Cyrillic_IE                                 ]}; // е Е
+	key <AD06> {[    Cyrillic_en,    Cyrillic_EN                                 ]}; // н Н
+	key <AD07> {[   Cyrillic_ghe,   Cyrillic_GHE                                 ]}; // г Г
+	key <AD08> {[   Cyrillic_sha,   Cyrillic_SHA                                 ]}; // ш Ш
+	key <AD09> {[ Cyrillic_ha_descender, Cyrillic_HA_descender                   ]}; // ҳ Ҳ
+	key <AD10> {[    Cyrillic_ze,    Cyrillic_ZE                                 ]}; // з З
+	key <AD11> {[    Cyrillic_ha,    Cyrillic_HA                                 ]}; // х Х
+	key <AD12> {[ Cyrillic_hardsign, Cyrillic_HARDSIGN                           ]}; // ъ Ъ
+
+	key <AC01> {[    Cyrillic_ef,    Cyrillic_EF                                 ]}; // ф Ф
+	key <AC02> {[ Cyrillic_che_descender, Cyrillic_CHE_descender                 ]}; // ҷ Ҷ
+	key <AC03> {[    Cyrillic_ve,    Cyrillic_VE                                 ]}; // в В
+	key <AC04> {[     Cyrillic_a,     Cyrillic_A                                 ]}; // а А
+	key <AC05> {[    Cyrillic_pe,    Cyrillic_PE                                 ]}; // п П
+	key <AC06> {[    Cyrillic_er,    Cyrillic_ER                                 ]}; // р Р
+	key <AC07> {[     Cyrillic_o,     Cyrillic_O                                 ]}; // о О
+	key <AC08> {[    Cyrillic_el,    Cyrillic_EL                                 ]}; // л Л
+	key <AC09> {[    Cyrillic_de,    Cyrillic_DE                                 ]}; // д Д
+	key <AC10> {[   Cyrillic_zhe,   Cyrillic_ZHE                                 ]}; // ж Ж
+	key <AC11> {[     Cyrillic_e,     Cyrillic_E                                 ]}; // э Э
+	key <BKSL> {[      backslash,          slash                                 ]}; // \ /
+
+	key <LSGT> {[          slash,            bar                                 ]}; // / |
+	key <AB01> {[    Cyrillic_ya,    Cyrillic_YA                                 ]}; // я Я
+	key <AB02> {[   Cyrillic_che,   Cyrillic_CHE                                 ]}; // ч Ч
+	key <AB03> {[    Cyrillic_es,    Cyrillic_ES                                 ]}; // с С
+	key <AB04> {[    Cyrillic_em,    Cyrillic_EM                                 ]}; // м М
+	key <AB05> {[     Cyrillic_i,     Cyrillic_I                                 ]}; // и И
+	key <AB06> {[    Cyrillic_te,    Cyrillic_TE                                 ]}; // т Т
+	key <AB07> {[ Cyrillic_i_macron, Cyrillic_I_macron                           ]}; // ӣ Ӣ
+	key <AB08> {[    Cyrillic_be,    Cyrillic_BE                                 ]}; // б Б
+	key <AB09> {[    Cyrillic_yu,    Cyrillic_YU                                 ]}; // ю Ю
+	key <AB10> {[         period,          comma                                 ]}; // . ,
+
 	include "kpdl(comma)"
 	include "level3(ralt_switch)"
-
-	key <AB01> { [    Cyrillic_ya,    Cyrillic_YA                                 ] }; // я Я
-	key <AB02> { [   Cyrillic_che,   Cyrillic_CHE                                 ] }; // ч Ч
-	key <AB03> { [    Cyrillic_es,    Cyrillic_ES                                 ] }; // с С
-	key <AB04> { [    Cyrillic_em,    Cyrillic_EM                                 ] }; // м М
-	key <AB05> { [     Cyrillic_i,     Cyrillic_I                                 ] }; // и И
-	key <AB06> { [    Cyrillic_te,    Cyrillic_TE                                 ] }; // т Т
-	key <AB07> { [ Cyrillic_i_macron, Cyrillic_I_macron                           ] }; // ӣ Ӣ
-	key <AB08> { [    Cyrillic_be,    Cyrillic_BE                                 ] }; // б Б
-	key <AB09> { [    Cyrillic_yu,    Cyrillic_YU                                 ] }; // ю Ю
-	key <AB10> { [         period,          comma                                 ] }; // . ,
-	key <AC01> { [    Cyrillic_ef,    Cyrillic_EF                                 ] }; // ф Ф
-	key <AC02> { [ Cyrillic_che_descender, Cyrillic_CHE_descender                 ] }; // ҷ Ҷ
-	key <AC03> { [    Cyrillic_ve,    Cyrillic_VE                                 ] }; // в В
-	key <AC04> { [     Cyrillic_a,     Cyrillic_A                                 ] }; // а А
-	key <AC05> { [    Cyrillic_pe,    Cyrillic_PE                                 ] }; // п П
-	key <AC06> { [    Cyrillic_er,    Cyrillic_ER                                 ] }; // р Р
-	key <AC07> { [     Cyrillic_o,     Cyrillic_O                                 ] }; // о О
-	key <AC08> { [    Cyrillic_el,    Cyrillic_EL                                 ] }; // л Л
-	key <AC09> { [    Cyrillic_de,    Cyrillic_DE                                 ] }; // д Д
-	key <AC10> { [   Cyrillic_zhe,   Cyrillic_ZHE                                 ] }; // ж Ж
-	key <AC11> { [     Cyrillic_e,     Cyrillic_E                                 ] }; // э Э
-	key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI                               ] }; // й Й
-	key <AD02> { [ Cyrillic_ka_descender, Cyrillic_KA_descender                   ] }; // қ Қ
-	key <AD03> { [     Cyrillic_u,     Cyrillic_U                                 ] }; // у У
-	key <AD04> { [    Cyrillic_ka,    Cyrillic_KA                                 ] }; // к К
-	key <AD05> { [    Cyrillic_ie,    Cyrillic_IE                                 ] }; // е Е
-	key <AD06> { [    Cyrillic_en,    Cyrillic_EN                                 ] }; // н Н
-	key <AD07> { [   Cyrillic_ghe,   Cyrillic_GHE                                 ] }; // г Г
-	key <AD08> { [   Cyrillic_sha,   Cyrillic_SHA                                 ] }; // ш Ш
-	key <AD09> { [ Cyrillic_ha_descender, Cyrillic_HA_descender                   ] }; // ҳ Ҳ
-	key <AD10> { [    Cyrillic_ze,    Cyrillic_ZE                                 ] }; // з З
-	key <AD11> { [    Cyrillic_ha,    Cyrillic_HA                                 ] }; // х Х
-	key <AD12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN                           ] }; // ъ Ъ
-	key <AE01> { [              1,         exclam,        section                 ] }; // 1 ! §
-	key <AE02> { [              2,       quotedbl,  guillemotleft, guillemotright ] }; // 2 " « »
-	key <AE03> { [              3,     numerosign                                 ] }; // 3 №
-	key <AE04> { [              4,      semicolon                                 ] }; // 4 ;
-	key <AE05> { [              5,        percent                                 ] }; // 5 %
-	key <AE06> { [              6,          colon,      0x1002013                 ] }; // 6 : –
-	key <AE07> { [              7,       question,      ampersand                 ] }; // 7 ? &
-	key <AE08> { [              8,       asterisk                                 ] }; // 8 *
-	key <AE09> { [              9,      parenleft                                 ] }; // 9 (
-	key <AE10> { [              0,     parenright,         degree                 ] }; // 0 ) °
-	key <AE11> { [ Cyrillic_ghe_bar, Cyrillic_GHE_bar,      minus,     underscore ] }; // ғ Ғ - _
-	key <AE12> { [ Cyrillic_u_macron, Cyrillic_U_macron,    equal,           plus ] }; // ӯ Ӯ = +
-	key <BKSL> { [      backslash,          slash                                 ] }; // \ /
-	key <LSGT> { [          slash,            bar                                 ] }; // / |
-	key <TLDE> { [    Cyrillic_io,    Cyrillic_IO                                 ] }; // ё Ё
 };
 
-// --------------------------------------------------------------------
-// -------------- Tojiki Rusi Keyboard Layout--------------------------
-// --------------------------------------------------------------------
-// AEN <aen@logic.ru>
-// 2001/12/23 by Leon Kanter <leon@blackcatlinux.com>
-// 2005/12/09 Valery Inozemtsev <shrek@altlinux.ru>
-// Pablo Saratxaga <pablo@mandrakesoft> (for the dead keys changes)
-// --------------------------------------------------------------------
-
+// -----------------------------------------------------------------------
+// The legacy Tojiki Rusi layout.
+// -----------------------------------------------------------------------
+// Authors: AEN <aen@logic.ru>, Leon Kanter <leon@blackcatlinux.com> 2001,
+//          Valery Inozemtsev <shrek@altlinux.ru> 205, Pablo Saratxaga.
+// -----------------------------------------------------------------------
 xkb_symbols "legacy"
 {
 	name[Group1] = "Tajik (legacy)";
 
+	key <TLDE> {[    Cyrillic_io,    Cyrillic_IO                                 ]}; // ё Ё
+	key <AE01> {[              1,         exclam,        section                 ]}; // 1 ! §
+	key <AE02> {[              2,       quotedbl,  guillemotleft, guillemotright ]}; // 2 " « »
+	key <AE03> {[              3,     numerosign                                 ]}; // 3 №
+	key <AE04> {[              4,      semicolon                                 ]}; // 4 ;
+	key <AE05> {[              5,        percent                                 ]}; // 5 %
+	key <AE06> {[              6,          colon,          U2013                 ]}; // 6 : –
+	key <AE07> {[              7,       question,      ampersand                 ]}; // 7 ? &
+	key <AE08> {[              8,       asterisk                                 ]}; // 8 *
+	key <AE09> {[              9,      parenleft                                 ]}; // 9 (
+	key <AE10> {[              0,     parenright                                 ]}; // 0 )
+	key <AE11> {[          minus,     underscore                                 ]}; // - _
+	key <AE12> {[          equal,           plus                                 ]}; // = +
+
+	key <AD01> {[ Cyrillic_shorti, Cyrillic_SHORTI                               ]}; // й Й
+	key <AD02> {[   Cyrillic_tse,   Cyrillic_TSE                                 ]}; // ц Ц
+	key <AD03> {[     Cyrillic_u,     Cyrillic_U, Cyrillic_u_macron, Cyrillic_U_macron ]}; // у У ӯ Ӯ
+	key <AD04> {[    Cyrillic_ka,    Cyrillic_KA, Cyrillic_ka_descender, Cyrillic_KA_descender ]}; // к К қ Қ
+	key <AD05> {[    Cyrillic_ie,    Cyrillic_IE                                 ]}; // е Е
+	key <AD06> {[    Cyrillic_en,    Cyrillic_EN                                 ]}; // н Н
+	key <AD07> {[   Cyrillic_ghe,   Cyrillic_GHE, Cyrillic_ghe_bar, Cyrillic_GHE_bar ]}; // г Г ғ Ғ
+	key <AD08> {[   Cyrillic_sha,   Cyrillic_SHA                                 ]}; // ш Ш
+	key <AD09> {[ Cyrillic_shcha, Cyrillic_SHCHA                                 ]}; // щ Щ
+	key <AD10> {[    Cyrillic_ze,    Cyrillic_ZE                                 ]}; // з З
+	key <AD11> {[    Cyrillic_ha,    Cyrillic_HA, Cyrillic_ha_descender, Cyrillic_HA_descender ]}; // х Х ҳ Ҳ
+	key <AD12> {[ Cyrillic_hardsign, Cyrillic_HARDSIGN                           ]}; // ъ Ъ
+
+	key <AC01> {[    Cyrillic_ef,    Cyrillic_EF                                 ]}; // ф Ф
+	key <AC02> {[  Cyrillic_yeru,  Cyrillic_YERU                                 ]}; // ы Ы
+	key <AC03> {[    Cyrillic_ve,    Cyrillic_VE                                 ]}; // в В
+	key <AC04> {[     Cyrillic_a,     Cyrillic_A                                 ]}; // а А
+	key <AC05> {[    Cyrillic_pe,    Cyrillic_PE                                 ]}; // п П
+	key <AC06> {[    Cyrillic_er,    Cyrillic_ER                                 ]}; // р Р
+	key <AC07> {[     Cyrillic_o,     Cyrillic_O                                 ]}; // о О
+	key <AC08> {[    Cyrillic_el,    Cyrillic_EL                                 ]}; // л Л
+	key <AC09> {[    Cyrillic_de,    Cyrillic_DE                                 ]}; // д Д
+	key <AC10> {[   Cyrillic_zhe,   Cyrillic_ZHE                                 ]}; // ж Ж
+	key <AC11> {[     Cyrillic_e,     Cyrillic_E                                 ]}; // э Э
+	key <BKSL> {[      backslash,          slash                                 ]}; // \ /
+
+	key <LSGT> {[          slash,            bar                                 ]}; // / |
+	key <AB01> {[    Cyrillic_ya,    Cyrillic_YA                                 ]}; // я Я
+	key <AB02> {[   Cyrillic_che,   Cyrillic_CHE, Cyrillic_che_descender, Cyrillic_CHE_descender ]}; // ч Ч ҷ Ҷ
+	key <AB03> {[    Cyrillic_es,    Cyrillic_ES                                 ]}; // с С
+	key <AB04> {[    Cyrillic_em,    Cyrillic_EM                                 ]}; // м М
+	key <AB05> {[     Cyrillic_i,     Cyrillic_I, Cyrillic_i_macron, Cyrillic_I_macron ]}; // и И ӣ Ӣ
+	key <AB06> {[    Cyrillic_te,    Cyrillic_TE                                 ]}; // т Т
+	key <AB07> {[ Cyrillic_softsign, Cyrillic_SOFTSIGN                           ]}; // ь Ь
+	key <AB08> {[    Cyrillic_be,    Cyrillic_BE                                 ]}; // б Б
+	key <AB09> {[    Cyrillic_yu,    Cyrillic_YU                                 ]}; // ю Ю
+	key <AB10> {[         period,          comma                                 ]}; // . ,
+
 	include "kpdl(comma)"
 	include "level3(ralt_switch)"
-
-	key <AB01> { [    Cyrillic_ya,    Cyrillic_YA                                 ] }; // я Я
-	key <AB02> { [   Cyrillic_che,   Cyrillic_CHE, Cyrillic_che_descender, Cyrillic_CHE_descender ] }; // ч Ч ҷ Ҷ
-	key <AB03> { [    Cyrillic_es,    Cyrillic_ES                                 ] }; // с С
-	key <AB04> { [    Cyrillic_em,    Cyrillic_EM                                 ] }; // м М
-	key <AB05> { [     Cyrillic_i,     Cyrillic_I, Cyrillic_i_macron, Cyrillic_I_macron ] }; // и И ӣ Ӣ
-	key <AB06> { [    Cyrillic_te,    Cyrillic_TE                                 ] }; // т Т
-	key <AB07> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN                           ] }; // ь Ь
-	key <AB08> { [    Cyrillic_be,    Cyrillic_BE                                 ] }; // б Б
-	key <AB09> { [    Cyrillic_yu,    Cyrillic_YU                                 ] }; // ю Ю
-	key <AB10> { [         period,          comma                                 ] }; // . ,
-	key <AC01> { [    Cyrillic_ef,    Cyrillic_EF                                 ] }; // ф Ф
-	key <AC02> { [  Cyrillic_yeru,  Cyrillic_YERU                                 ] }; // ы Ы
-	key <AC03> { [    Cyrillic_ve,    Cyrillic_VE                                 ] }; // в В
-	key <AC04> { [     Cyrillic_a,     Cyrillic_A                                 ] }; // а А
-	key <AC05> { [    Cyrillic_pe,    Cyrillic_PE                                 ] }; // п П
-	key <AC06> { [    Cyrillic_er,    Cyrillic_ER                                 ] }; // р Р
-	key <AC07> { [     Cyrillic_o,     Cyrillic_O                                 ] }; // о О
-	key <AC08> { [    Cyrillic_el,    Cyrillic_EL                                 ] }; // л Л
-	key <AC09> { [    Cyrillic_de,    Cyrillic_DE                                 ] }; // д Д
-	key <AC10> { [   Cyrillic_zhe,   Cyrillic_ZHE                                 ] }; // ж Ж
-	key <AC11> { [     Cyrillic_e,     Cyrillic_E                                 ] }; // э Э
-	key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI                               ] }; // й Й
-	key <AD02> { [   Cyrillic_tse,   Cyrillic_TSE                                 ] }; // ц Ц
-	key <AD03> { [     Cyrillic_u,     Cyrillic_U, Cyrillic_u_macron, Cyrillic_U_macron ] }; // у У ӯ Ӯ
-	key <AD04> { [    Cyrillic_ka,    Cyrillic_KA, Cyrillic_ka_descender, Cyrillic_KA_descender ] }; // к К қ Қ
-	key <AD05> { [    Cyrillic_ie,    Cyrillic_IE                                 ] }; // е Е
-	key <AD06> { [    Cyrillic_en,    Cyrillic_EN                                 ] }; // н Н
-	key <AD07> { [   Cyrillic_ghe,   Cyrillic_GHE, Cyrillic_ghe_bar, Cyrillic_GHE_bar ] }; // г Г ғ Ғ
-	key <AD08> { [   Cyrillic_sha,   Cyrillic_SHA                                 ] }; // ш Ш
-	key <AD09> { [ Cyrillic_shcha, Cyrillic_SHCHA                                 ] }; // щ Щ
-	key <AD10> { [    Cyrillic_ze,    Cyrillic_ZE                                 ] }; // з З
-	key <AD11> { [    Cyrillic_ha,    Cyrillic_HA, Cyrillic_ha_descender, Cyrillic_HA_descender ] }; // х Х ҳ Ҳ
-	key <AD12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN                           ] }; // ъ Ъ
-	key <AE01> { [              1,         exclam,        section                 ] }; // 1 ! §
-	key <AE02> { [              2,       quotedbl,  guillemotleft, guillemotright ] }; // 2 " « »
-	key <AE03> { [              3,     numerosign                                 ] }; // 3 №
-	key <AE04> { [              4,      semicolon                                 ] }; // 4 ;
-	key <AE05> { [              5,        percent                                 ] }; // 5 %
-	key <AE06> { [              6,          colon,      0x1002013                 ] }; // 6 : –
-	key <AE07> { [              7,       question,      ampersand                 ] }; // 7 ? &
-	key <AE08> { [              8,       asterisk                                 ] }; // 8 *
-	key <AE09> { [              9,      parenleft                                 ] }; // 9 (
-	key <AE10> { [              0,     parenright                                 ] }; // 0 )
-	key <AE11> { [          minus,     underscore                                 ] }; // - _
-	key <AE12> { [          equal,           plus                                 ] }; // = +
-	key <BKSL> { [      backslash,          slash                                 ] }; // \ /
-	key <LSGT> { [          slash,            bar                                 ] }; // / |
-	key <TLDE> { [    Cyrillic_io,    Cyrillic_IO                                 ] }; // ё Ё
 };