symbols/ru: Tweaking the comments, and harmonizing includes and blank lines.

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

1 files changed, 45 insertions, 45 deletions

diff --git a/symbols/ru b/symbols/ru
index 782a3d7..ce8a9c1 100644
--- a/symbols/ru
+++ b/symbols/ru
@@ -1,5 +1,4 @@
-// based on
-// russian standard keyboard
+// Keyboard layouts for Russia.
 // AEN <aen@logic.ru>
 // 2001/12/23 by Leon Kanter <leon@blackcatlinux.com>
 // 2005/12/09 Valery Inozemtsev <shrek@altlinux.ru>
@@ -7,8 +6,8 @@
 // Windows layout
 default  partial alphanumeric_keys
 xkb_symbols "winkeys" {
-    include "ru(common)"
 
+    include "ru(common)"
     name[Group1]= "Russian";
 
     key <AE03> {        [               3,      numerosign      ]       };
@@ -54,6 +53,7 @@ xkb_symbols "common" {
     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_yeru,   Cyrillic_YERU	]	};
     key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	]	};
@@ -65,6 +65,7 @@ xkb_symbols "common" {
     key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	]	};
     key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
     key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	]	};
+
     key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	]	};
     key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	]	};
     key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	]	};
@@ -82,8 +83,8 @@ xkb_symbols "common" {
 
 partial alphanumeric_keys
 xkb_symbols "legacy" {
-    include "ru(common)"
 
+    include "ru(common)"
     name[Group1]= "Russian (legacy)";
 };
 
@@ -105,8 +106,10 @@ xkb_symbols "olpc" {
 
 partial alphanumeric_keys
 xkb_symbols "typewriter" {
+
     include "ru(common)"
     name[Group1]= "Russian (typewriter)";
+
     key	<TLDE> {	[	      bar,	      plus	] 	};
     key	<AE01> {	[      numerosign,		 1 	]	};
     key	<AE02> {	[           minus,		 2	]	};
@@ -129,8 +132,10 @@ xkb_symbols "typewriter" {
 
 partial alphanumeric_keys
 xkb_symbols "typewriter-legacy" {
+
     include "ru(common)"
     name[Group1]= "Russian (typewriter, legacy)";
+
     key	<TLDE> {	[      apostrophe,	  quotedbl	] 	};
     key	<AE01> {	[	   exclam,		 1 	]	};
     key	<AE02> {	[      numerosign,		 2	]	};
@@ -142,6 +147,7 @@ xkb_symbols "typewriter-legacy" {
     key	<AE08> {	[      underscore,		 8	]	};
     key	<AE09> {	[	 question,		 9	]	};
     key	<AE10> {	[	  percent,		 0	]	};
+
     key	<BKSL> {	[	parenleft,	parenright	]	};
 
     key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	]	};
@@ -220,6 +226,7 @@ xkb_symbols "phonetic_winkeys" {
 
 partial alphanumeric_keys
 xkb_symbols "tt" {
+
     include "ru(winkeys)"
     name[Group1]= "Tatar";
 
@@ -239,13 +246,12 @@ xkb_symbols "tt" {
                        Cyrillic_softsign,Cyrillic_SOFTSIGN     ]       };
 
     include "level3(ralt_switch)"
-
 };
 
 partial alphanumeric_keys
 xkb_symbols "os_legacy" {
-    include "ru(common)"
 
+    include "ru(common)"
     name[Group1]= "Ossetian (legacy)";
 
     key	<TLDE> {	[      Cyrillic_e,      Cyrillic_E	]	};
@@ -255,8 +261,8 @@ xkb_symbols "os_legacy" {
 
 partial alphanumeric_keys
 xkb_symbols "os_winkeys" {
-    include "ru(winkeys)"
 
+    include "ru(winkeys)"
     name[Group1]= "Ossetian (WinKeys)";
 
     key	<TLDE> {	[      Cyrillic_e,      Cyrillic_E	]	};
@@ -266,8 +272,8 @@ xkb_symbols "os_winkeys" {
 
 partial alphanumeric_keys
 xkb_symbols "cv" {
-    include "ru(winkeys)"
 
+    include "ru(winkeys)"
     name[Group1]= "Chuvash";
 
     key.type[group1]="FOUR_LEVEL";
@@ -286,8 +292,8 @@ xkb_symbols "cv" {
 
 partial alphanumeric_keys
 xkb_symbols "udm" {
-    include "ru(winkeys)"
 
+    include "ru(winkeys)"
     name[Group1]= "Udmurt";
 
     key.type[group1]="FOUR_LEVEL";
@@ -308,8 +314,8 @@ xkb_symbols "udm" {
 
 partial alphanumeric_keys
 xkb_symbols "cv_latin" {
-    include "us(alt-intl)"
 
+    include "us(alt-intl)"
     name[Group1]= "Chuvash (Latin)";
 
     key.type[group1]="FOUR_LEVEL";
@@ -327,29 +333,24 @@ xkb_symbols "cv_latin" {
     key        <AB03> { [         c,    C,      ccedilla,         Ccedilla ] };
 
     include "level3(ralt_switch)"
-
 };
 
 // Komi language layout
-// based on
-// russian standard keyboard
 // Vlad Shakhov <lumpen.intellectual@gmail.com>
-// Last Changes 2007/10/23 by Vlad Shakhov <lumpen.intellectual@gmail.com>
-
+// last changes 2007/10/23
 partial alphanumeric_keys
 xkb_symbols "kom" {
 
     include "ru(winkeys)"
-
     name[Group1]= "Komi";
 
     key.type[group1]="FOUR_LEVEL_ALPHABETIC";
 
-// cyrilllic o with diaeresis 
+    // cyrilllic o with diaeresis
     key	<AC07> { [ 	Cyrillic_o,		Cyrillic_O,		
 			U04E7,  		U04E6		] };
 
-// hard I as additional key for soft Cyrillic_I 
+    // hard I as additional key for soft Cyrillic_I
     key <AB05> { [      Cyrillic_i,		Cyrillic_I,
 			Ukrainian_i,     	Ukrainian_I     ] };
 
@@ -364,7 +365,6 @@ partial alphanumeric_keys
 xkb_symbols "sah" {
 
     include "ru(winkeys)"
-
     name[Group1]= "Yakut";
 
     key.type[group1]="FOUR_LEVEL_ALPHABETIC";
@@ -404,11 +404,10 @@ xkb_symbols "sah" {
 //based on the Kalmyk language layout: http://soft.oyrat.org/
 //Nikolay Korneev <halmg@oyrat.org>
 //Toli Miron <mirontoli@gmail.com>
-
 partial alphanumeric_keys
 xkb_symbols "xal" {
-    include "ru(winkeys)"
 
+    include "ru(winkeys)"
     name[Group1]= "Kalmyk";
 
     key.type[group1]="FOUR_LEVEL";
@@ -444,7 +443,6 @@ partial alphanumeric_keys
 xkb_symbols "dos" {
 
     include "ru(common)"
-
     name[Group1]= "Russian (DOS)";
 
     key        <TLDE> {        [   parenright,  parenleft   ] };
@@ -457,9 +455,10 @@ xkb_symbols "dos" {
 
 partial alphanumeric_keys
 xkb_symbols "bak" {
-    include "ru(winkeys)"
 
+    include "ru(winkeys)"
     name[Group1]= "Bashkirian";
+
     key.type[group1]="FOUR_LEVEL";
 
     key <TLDE> { [     0x010004d9,       0x010004d8,   Cyrillic_io,   Cyrillic_IO      ] };
@@ -480,13 +479,11 @@ xkb_symbols "bak" {
     include "level3(ralt_switch)"
 };
 
-// Serbian charecters added as third level symbols to Russian keyboard layout.
-
+// Serbian characters are added as third-level symbols to Russian keyboard layout.
 partial alphanumeric_keys
 xkb_symbols "srp" {
-    include "ru(common)"
-    include "level3(ralt_switch)"
 
+    include "ru(common)"
     name[Group1]= "Serbian (Russia)";
 
     key <AE03> { [ 3, numerosign ] };
@@ -503,15 +500,16 @@ xkb_symbols "srp" {
     key	<AC09> { [ Cyrillic_de, Cyrillic_DE, U45F, U40F ] };
     key	<AC10> { [ Cyrillic_zhe, Cyrillic_ZHE, U452, U402 ] };
     key	<AB02> { [ Cyrillic_che, Cyrillic_CHE, U45B, U40B ] };
+
+    include "level3(ralt_switch)"
 };
 
 // Mari language layout
-// based on Russian standard keyboard
 // http://www.marlamuter.ru/
 partial alphanumeric_keys
 xkb_symbols "chm" {
-    include "ru(common)"
 
+    include "ru(common)"
     name[Group1]= "Mari";
 
     key.type[group1]="FOUR_LEVEL_ALPHABETIC";
@@ -529,15 +527,14 @@ xkb_symbols "chm" {
 // EXTRAS:
 
 // Church Slavonic language layout
-// based on
-// russian standard keyboard
-// Aleksandr Andreev and Yuri Shardt 
-// Last Changes 2010/08/01. Contact <aleksandr.andreev@gmail.com>
-
+// based on the Russian standard keyboard
+// by Aleksandr Andreev and Yuri Shardt
+// last changes 2010/08/01; contact <aleksandr.andreev@gmail.com>
 partial alphanumeric_keys
-xkb_symbols "chu"
-{
+xkb_symbols "chu" {
+
 	    name[Group1]= "Church Slavonic";
+
 	    key <TLDE> { [ U0457, U0407, U0482, U20DD ] }; // ї Ї ҂ e.g: а⃝ where the last is a combining ten thousands sign
 	    key <AE01> { [ U0461, U0460, U047D, U047C] }; // ѡ Ѡ ѽ Ѽ
 	    key <AE02> { [ U0454, U0404, U0465, U0464] }; // є Є ѥ Ѥ
@@ -551,6 +548,7 @@ xkb_symbols "chu"
 	    key <AE10> { [ Cyrillic_u,	Cyrillic_U, parenright, U0488 ] }; // у У ) NB: for diagraph Ouk, use Cyrillic_o + Cyrillic_u
 	    key <AE11> { [ U0483, U0486, U0487, U005F] }; // а҃ а҆ а҇, _ (titlo, psili, pokrytie, underscore)
 	    key <AE12> { [ U0301, U0300, U0484, UA67E] }; //  а̀ а́ а҄ ꙾ (oxia, varia, kamora, kavyka)
+
 	    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI, U0456	]	};
 	    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE, U2DF0	]	};
 	    key	<AD03> {	[   UA64B,  UA64A, U2DF9  	]	}; // Cyrillic monograph Uk (not U)!
@@ -564,6 +562,7 @@ xkb_symbols "chu"
 	    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA, U2DEF	]	};
 	    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN, UA67D	]	}; // Payerok
 	    key <BKSL> { [backslash, slash, colon, question] }; // \ / : ? (note, for Slavonic question use semicolon
+
 	    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	]	};
 	    key	<AC02> {	[   Cyrillic_yeru,   Cyrillic_YERU	]	};
 	    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE, U2DE1	]	};
@@ -575,6 +574,7 @@ xkb_symbols "chu"
 	    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE, U2DE3	]	};
 	    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE, U2DE4	]	};
 	    key	<AC11> {	[     U0463,	U0462, U2DFA	]	}; // Yat
+
 	    key	<AB01> {	[    U0467, U0466, U2DFD 	]	}; // Small Yus
 	    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE, U2DF1	]	};
 	    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES, U2DED	]	};
@@ -589,11 +589,11 @@ xkb_symbols "chu"
 
 
 // RUU (Russian-Ukrainian United keyboard layout).
-// Modified Russian standart keyboard with third level contains Ukrainian
-// and Belorusian alphabetic letters and commonly used Unicode symbols.
-// Description http://wiki.opennet.ru/RUU [russian]
+// This is a modified Russian standard keyboard, with the third level containing
+// Ukrainian and Belorusian alphabetic letters and commonly used Unicode symbols.
+// For a description see http://wiki.opennet.ru/RUU [in Russian].
 // Vasyĺ V. Vercynśkyj <fuckel@ukr.net>
-// Last Changes 2011/05/11
+// last changes 2011/05/11
 //
 // ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
 // │ ' ~ │ ! ≈ │ " ∞ │ № ₴ │ ; € │ % ‰ │ : ≤ │ ? ≥ │ * × │ ( { │ ) } │ _ – │ + ± ┃ ⌫       ┃
@@ -611,13 +611,10 @@ xkb_symbols "chu"
 // ┃       ┃       ┃       ┃                                   ┃       ┃       ┃       ┃
 // ┃ Ctrl  ┃ Meta  ┃  Alt  ┃                Space              ┃AltGr ⇮┃ Menu  ┃ Ctrl  ┃
 // ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
-
-
-
 partial alphanumeric_keys
 xkb_symbols "ruu" {
-    include "ru(common)"
 
+    include "ru(common)"
     name[Group1]= "Russian (with Ukrainian-Belorussian layout)";
 
     key <TLDE> {    [	U2019,		apostrophe,	U0301,		asciitilde	]	};	// Apostrophe and Stress symbol
@@ -633,15 +630,18 @@ xkb_symbols "ruu" {
     key <AE10> {    [	0,		parenright,	bracketright,	braceright	]	};
     key <AE11> {    [	minus,		underscore,	emdash,		endash		]	};
     key <AE12> {    [	equal,		plus,		notequal,	plusminus	]	};
+
     key <AD03> {    [	Cyrillic_u,	Cyrillic_U, Byelorussian_shortu, Byelorussian_SHORTU ]	};
     key <AD04> {    [	Cyrillic_ka,	Cyrillic_KA,	registered			]	};	// Registered tm
     key <AD05> {    [	Cyrillic_ie,	Cyrillic_IE,	Cyrillic_io,	Cyrillic_IO	]	};
     key <AD07> {    [Cyrillic_ghe, Cyrillic_GHE, Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
     key <AD10> {    [	Cyrillic_ze,	Cyrillic_ZE,	U00B6				]	};	// Pilcrow Sign
     key <AD12> {    [Cyrillic_hardsign,	Cyrillic_HARDSIGN, Ukrainian_yi, Ukrainian_YI	]	};
+
     key <AC02> {    [	Cyrillic_yeru,	Cyrillic_YERU,	Ukrainian_i,  Ukrainian_I	]	};
     key <AC11> {    [	Cyrillic_e,	Cyrillic_E,	Ukrainian_ie,Ukrainian_IE	]	};
     key <BKSL> {    [	slash,		bar,		backslash,	U00A6		]	};	// Broken Bar
+
     key <AB03> {    [	Cyrillic_es,	Cyrillic_ES,	copyright			]	};
     key <AB06> {    [	Cyrillic_te,	Cyrillic_TE,	trademark			]	};
     key <AB07> {    [	Cyrillic_softsign, Cyrillic_SOFTSIGN, U00B5			]	};	// Micro Sign
@@ -660,8 +660,8 @@ partial alphanumeric_keys
 // Apple layout
 partial alphanumeric_keys
 xkb_symbols "mac" {
-include "ru(common)"
 
+    include "ru(common)"
     name[Group1]= "Russian (Macintosh)";
 
     key <LSGT> {	[	     less,	   greater	]	};