From a01131d5e2a79a333b808fbef1ec6fba253d0a29 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Tue, 28 Jan 2014 18:11:22 +0100 Subject: symbols/ru: Tweaking the comments, and harmonizing includes and blank lines. Signed-off-by: Benno Schulenberg --- symbols/ru | 90 +++++++++++++++++++++++++++++++------------------------------- 1 file 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 // 2001/12/23 by Leon Kanter // 2005/12/09 Valery Inozemtsev @@ -7,8 +6,8 @@ // Windows layout default partial alphanumeric_keys xkb_symbols "winkeys" { - include "ru(common)" + include "ru(common)" name[Group1]= "Russian"; key { [ 3, numerosign ] }; @@ -54,6 +53,7 @@ xkb_symbols "common" { key { [ Cyrillic_ze, Cyrillic_ZE ] }; key { [ Cyrillic_ha, Cyrillic_HA ] }; key { [Cyrillic_hardsign,Cyrillic_HARDSIGN ] }; + key { [ Cyrillic_ef, Cyrillic_EF ] }; key { [ Cyrillic_yeru, Cyrillic_YERU ] }; key { [ Cyrillic_ve, Cyrillic_VE ] }; @@ -65,6 +65,7 @@ xkb_symbols "common" { key { [ Cyrillic_de, Cyrillic_DE ] }; key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; key { [ Cyrillic_e, Cyrillic_E ] }; + key { [ Cyrillic_ya, Cyrillic_YA ] }; key { [ Cyrillic_che, Cyrillic_CHE ] }; key { [ 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 { [ bar, plus ] }; key { [ numerosign, 1 ] }; key { [ 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 { [ apostrophe, quotedbl ] }; key { [ exclam, 1 ] }; key { [ numerosign, 2 ] }; @@ -142,6 +147,7 @@ xkb_symbols "typewriter-legacy" { key { [ underscore, 8 ] }; key { [ question, 9 ] }; key { [ percent, 0 ] }; + key { [ parenleft, parenright ] }; key { [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 { [ 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 { [ 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 { [ c, C, ccedilla, Ccedilla ] }; include "level3(ralt_switch)" - }; // Komi language layout -// based on -// russian standard keyboard // Vlad Shakhov -// Last Changes 2007/10/23 by Vlad Shakhov - +// 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 { [ 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 { [ 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 //Toli Miron - 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 { [ 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 { [ 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 { [ 3, numerosign ] }; @@ -503,15 +500,16 @@ xkb_symbols "srp" { key { [ Cyrillic_de, Cyrillic_DE, U45F, U40F ] }; key { [ Cyrillic_zhe, Cyrillic_ZHE, U452, U402 ] }; key { [ 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 - +// based on the Russian standard keyboard +// by Aleksandr Andreev and Yuri Shardt +// last changes 2010/08/01; contact partial alphanumeric_keys -xkb_symbols "chu" -{ +xkb_symbols "chu" { + name[Group1]= "Church Slavonic"; + key { [ U0457, U0407, U0482, U20DD ] }; // ї Ї ҂ e.g: а⃝ where the last is a combining ten thousands sign key { [ U0461, U0460, U047D, U047C] }; // ѡ Ѡ ѽ Ѽ key { [ U0454, U0404, U0465, U0464] }; // є Є ѥ Ѥ @@ -551,6 +548,7 @@ xkb_symbols "chu" key { [ Cyrillic_u, Cyrillic_U, parenright, U0488 ] }; // у У ) NB: for diagraph Ouk, use Cyrillic_o + Cyrillic_u key { [ U0483, U0486, U0487, U005F] }; // а҃ а҆ а҇, _ (titlo, psili, pokrytie, underscore) key { [ U0301, U0300, U0484, UA67E] }; // а̀ а́ а҄ ꙾ (oxia, varia, kamora, kavyka) + key { [ Cyrillic_shorti, Cyrillic_SHORTI, U0456 ] }; key { [ Cyrillic_tse, Cyrillic_TSE, U2DF0 ] }; key { [ UA64B, UA64A, U2DF9 ] }; // Cyrillic monograph Uk (not U)! @@ -564,6 +562,7 @@ xkb_symbols "chu" key { [ Cyrillic_ha, Cyrillic_HA, U2DEF ] }; key { [Cyrillic_hardsign,Cyrillic_HARDSIGN, UA67D ] }; // Payerok key { [backslash, slash, colon, question] }; // \ / : ? (note, for Slavonic question use semicolon + key { [ Cyrillic_ef, Cyrillic_EF ] }; key { [ Cyrillic_yeru, Cyrillic_YERU ] }; key { [ Cyrillic_ve, Cyrillic_VE, U2DE1 ] }; @@ -575,6 +574,7 @@ xkb_symbols "chu" key { [ Cyrillic_de, Cyrillic_DE, U2DE3 ] }; key { [ Cyrillic_zhe, Cyrillic_ZHE, U2DE4 ] }; key { [ U0463, U0462, U2DFA ] }; // Yat + key { [ U0467, U0466, U2DFD ] }; // Small Yus key { [ Cyrillic_che, Cyrillic_CHE, U2DF1 ] }; key { [ 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 -// 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 { [ U2019, apostrophe, U0301, asciitilde ] }; // Apostrophe and Stress symbol @@ -633,15 +630,18 @@ xkb_symbols "ruu" { key { [ 0, parenright, bracketright, braceright ] }; key { [ minus, underscore, emdash, endash ] }; key { [ equal, plus, notequal, plusminus ] }; + key { [ Cyrillic_u, Cyrillic_U, Byelorussian_shortu, Byelorussian_SHORTU ] }; key { [ Cyrillic_ka, Cyrillic_KA, registered ] }; // Registered tm key { [ Cyrillic_ie, Cyrillic_IE, Cyrillic_io, Cyrillic_IO ] }; key { [Cyrillic_ghe, Cyrillic_GHE, Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; key { [ Cyrillic_ze, Cyrillic_ZE, U00B6 ] }; // Pilcrow Sign key { [Cyrillic_hardsign, Cyrillic_HARDSIGN, Ukrainian_yi, Ukrainian_YI ] }; + key { [ Cyrillic_yeru, Cyrillic_YERU, Ukrainian_i, Ukrainian_I ] }; key { [ Cyrillic_e, Cyrillic_E, Ukrainian_ie,Ukrainian_IE ] }; key { [ slash, bar, backslash, U00A6 ] }; // Broken Bar + key { [ Cyrillic_es, Cyrillic_ES, copyright ] }; key { [ Cyrillic_te, Cyrillic_TE, trademark ] }; key { [ 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 { [ less, greater ] }; -- cgit v1.2.1