From 87dcf301265c969ee601b372fca511aeae66dfac Mon Sep 17 00:00:00 2001 From: Pierre Le Marre Date: Thu, 28 Sep 2023 09:51:25 +0200 Subject: [PATCH] Fix trailing whitespaces in XKB files --- test/data/keycodes/xfree86 | 2 +- test/data/locale/locale.alias | 4 +- test/data/rules/base | 6 +- test/data/rules/base.xml | 4 +- test/data/rules/evdev | 6 +- test/data/rules/evdev-xkbcommon | 6 +- test/data/rules/evdev.xml | 4 +- test/data/rules/xkb.dtd | 2 +- test/data/symbols/cz | 10 +-- test/data/symbols/de | 18 ++--- test/data/symbols/group | 1 - test/data/symbols/il | 4 +- test/data/symbols/in | 108 ++++++++++++------------- test/data/symbols/inet | 1 - test/data/symbols/macintosh_vndr/apple | 4 +- test/data/symbols/macintosh_vndr/us | 2 +- test/data/symbols/ru | 6 +- test/data/symbols/us | 2 +- 18 files changed, 94 insertions(+), 96 deletions(-) diff --git a/test/data/keycodes/xfree86 b/test/data/keycodes/xfree86 index 47dc893..5897fd0 100644 --- a/test/data/keycodes/xfree86 +++ b/test/data/keycodes/xfree86 @@ -326,7 +326,7 @@ xkb_keycodes "basic" { = 219; // = 220; // = 221; // - + // Solaris compatibility alias = ; diff --git a/test/data/locale/locale.alias b/test/data/locale/locale.alias index 03cd99c..b73dc5c 100644 --- a/test/data/locale/locale.alias +++ b/test/data/locale/locale.alias @@ -1230,7 +1230,7 @@ thai th_TH.ISO8859-11 univ.utf8 en_US.UTF-8 # Digital Unix utf universal.utf8@ucs4 en_US.UTF-8 -# Solaris and SunOS have iso_8859_1 and iso_8859_15 LC_CTYPES +# Solaris and SunOS have iso_8859_1 and iso_8859_15 LC_CTYPES # to augment LANG=C iso_8859_1 en_US.ISO8859-1 iso_8859_15 en_US.ISO8859-15 @@ -2471,7 +2471,7 @@ thai: th_TH.ISO8859-11 univ.utf8: en_US.UTF-8 # Digital Unix utf universal.utf8@ucs4: en_US.UTF-8 -# Solaris and SunOS have iso_8859_1 and iso_8859_15 LC_CTYPES +# Solaris and SunOS have iso_8859_1 and iso_8859_15 LC_CTYPES # to augment LANG=C iso_8859_1: en_US.ISO8859-1 iso_8859_15: en_US.ISO8859-15 diff --git a/test/data/rules/base b/test/data/rules/base index 71aaa91..51e35d8 100644 --- a/test/data/rules/base +++ b/test/data/rules/base @@ -29,7 +29,7 @@ ! $tmgeometries = tm2020 tm2030PS2 tm2030USB tm2030USB-102 tm2030USB-106 // Layouts that provide further specializations for the OLPC -! $olpclayouts = af am ara br ca es et fr it kh kz in mn np ru th tr us +! $olpclayouts = af am ara br ca es et fr it kh kz in mn np ru th tr us ! $macbooks = macbook78 macbook79 ! $maclaptop = ibook powerbook macbook78 macbook79 @@ -39,7 +39,7 @@ ! $macvendorlayouts = ch de dk fi fr gb is it latam nl no pt se us ! $azerty = be fr -! $qwertz = al cz de hr hu ro si sk +! $qwertz = al cz de hr hu ro si sk // all layouts with 3rd and 4th groups @@ -1199,7 +1199,7 @@ keypad:future = +keypad(future) keypad:future_wang = +keypad(future_wang) keypad:hex = +keypad(ops)+keypad(hex) - keypad:atm = +keypad(ops)+keypad(hex)+keypad(atm) + keypad:atm = +keypad(ops)+keypad(hex)+keypad(atm) nbsp:none = +nbsp(none) nbsp:level2 = +nbsp(level2) nbsp:level3 = +nbsp(level3) diff --git a/test/data/rules/base.xml b/test/data/rules/base.xml index a13af8f..d389a03 100644 --- a/test/data/rules/base.xml +++ b/test/data/rules/base.xml @@ -2307,7 +2307,7 @@ - + marathi @@ -6371,7 +6371,7 @@ - + jv jv diff --git a/test/data/rules/evdev b/test/data/rules/evdev index e949490..32c8ed3 100644 --- a/test/data/rules/evdev +++ b/test/data/rules/evdev @@ -29,7 +29,7 @@ ! $tmgeometries = tm2020 tm2030PS2 tm2030USB tm2030USB-102 tm2030USB-106 // Layouts that provide further specializations for the OLPC -! $olpclayouts = af am ara br ca es et fr it kh kz in mn np ru th tr us +! $olpclayouts = af am ara br ca es et fr it kh kz in mn np ru th tr us ! $macbooks = macbook78 macbook79 ! $maclaptop = ibook powerbook macbook78 macbook79 @@ -39,7 +39,7 @@ ! $macvendorlayouts = ch de dk fi fr gb is it latam nl no pt se us ! $azerty = be fr -! $qwertz = al cz de hr hu ro si sk +! $qwertz = al cz de hr hu ro si sk // all layouts with 3rd and 4th groups @@ -1086,7 +1086,7 @@ keypad:future = +keypad(future) keypad:future_wang = +keypad(future_wang) keypad:hex = +keypad(ops)+keypad(hex) - keypad:atm = +keypad(ops)+keypad(hex)+keypad(atm) + keypad:atm = +keypad(ops)+keypad(hex)+keypad(atm) nbsp:none = +nbsp(none) nbsp:level2 = +nbsp(level2) nbsp:level3 = +nbsp(level3) diff --git a/test/data/rules/evdev-xkbcommon b/test/data/rules/evdev-xkbcommon index bde6ad2..8a37557 100644 --- a/test/data/rules/evdev-xkbcommon +++ b/test/data/rules/evdev-xkbcommon @@ -28,7 +28,7 @@ ! $tmgeometries = tm2020 tm2030PS2 tm2030USB tm2030USB-102 tm2030USB-106 // Layouts that provide further specializations for the OLPC -! $olpclayouts = af am ara br ca es et fr it kh kz in mn np ru th tr us +! $olpclayouts = af am ara br ca es et fr it kh kz in mn np ru th tr us ! $macbooks = macbook78 macbook79 ! $maclaptop = ibook powerbook macbook78 macbook79 @@ -38,7 +38,7 @@ ! $macvendorlayouts = ch de dk fi fr gb is it latam nl no pt se us ! $azerty = be fr -! $qwertz = al cz de hr hu ro si sk +! $qwertz = al cz de hr hu ro si sk ! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \ airkey \ @@ -1033,7 +1033,7 @@ keypad:future = +keypad(future) keypad:future_wang = +keypad(future_wang) keypad:hex = +keypad(ops)+keypad(hex) - keypad:atm = +keypad(ops)+keypad(hex)+keypad(atm) + keypad:atm = +keypad(ops)+keypad(hex)+keypad(atm) nbsp:none = +nbsp(none) nbsp:level2 = +nbsp(level2) nbsp:level3 = +nbsp(level3) diff --git a/test/data/rules/evdev.xml b/test/data/rules/evdev.xml index a13af8f..d389a03 100644 --- a/test/data/rules/evdev.xml +++ b/test/data/rules/evdev.xml @@ -2307,7 +2307,7 @@ - + marathi @@ -6371,7 +6371,7 @@ - + jv jv diff --git a/test/data/rules/xkb.dtd b/test/data/rules/xkb.dtd index 0a37b11..941151f 100644 --- a/test/data/rules/xkb.dtd +++ b/test/data/rules/xkb.dtd @@ -9,7 +9,7 @@ - diff --git a/test/data/symbols/cz b/test/data/symbols/cz index 8fbff0e..7f55228 100644 --- a/test/data/symbols/cz +++ b/test/data/symbols/cz @@ -328,7 +328,7 @@ xkb_symbols "prog" { // Programmer keyboard. Based on the US layout with accented Czech letters and dead keys. // Using AltGr and a key from the 1st row generates original level 2 US key as level 3 except TLDE and AE12. // Using AltGr+Shift on accented letters generates its uppercase variant. - // Using AltGr or AltGr+Shift on letters which have accent in Czech but are not on the 1st row directly accessible generate accented letters, + // Using AltGr or AltGr+Shift on letters which have accent in Czech but are not on the 1st row directly accessible generate accented letters, // i.e. [d, D], [t, T], [n, N], [o, O] generate with AltGr and AltGr+Shift: [dcaron, Dcaron], [tcaron, Tcaron], [ncaron, Ncaron], [oacute, Oacute]. // Other Czech letters besides alphanumeric keys (like uacute, uring) are generated using AltGr. @@ -395,14 +395,14 @@ xkb_symbols "prog" { key { [ space ] }; key { [ Tab, ISO_Left_Tab ] }; key { [ grave, asciitilde ] }; - + include "level3(ralt_switch)" }; xkb_symbols "typo" { // cz-typo 1.0 2019-05-15 by Viktor Grešák and Tomáš Hudec // - // Contains typographic symbols in third and fourth level. + // Contains typographic symbols in third and fourth level. // It is intended to be used in conjuction with other existing layout, e.g. setxkbmap -symbols "pc+cz(basic)+cz(typo)+inet(evdev)" name[Group1]="Czech (typographic)"; @@ -470,11 +470,11 @@ xkb_symbols "prog_typo" { // Programmer + Typographic keyboard. Based on the US layout with accented Czech letters and dead keys. // Using AltGr and a key from the 1st row generates original level 2 US key as level 3 except TLDE and AE12. // Using AltGr+Shift on accented letters generates its uppercase variant. - // Using AltGr or AltGr+Shift on letters which have accent in Czech but are not on the 1st row directly accessible generate accented letters, + // Using AltGr or AltGr+Shift on letters which have accent in Czech but are not on the 1st row directly accessible generate accented letters, // i.e. [d, D], [t, T], [n, N], [o, O] generate with AltGr and AltGr+Shift: [dcaron, Dcaron], [tcaron, Tcaron], [ncaron, Ncaron], [oacute, Oacute]. // Other Czech letters besides alphanumeric keys (like uacute, uring) are generated using AltGr. // - // Contains typographic symbols in third and fourth level. + // Contains typographic symbols in third and fourth level. name[Group1]="Czech (programming, typographic)"; diff --git a/test/data/symbols/de b/test/data/symbols/de index 8c1083f..364ecf7 100644 --- a/test/data/symbols/de +++ b/test/data/symbols/de @@ -131,7 +131,7 @@ xkb_symbols "T3" { key { [ udiaeresis, Udiaeresis, dead_horn, NoSymbol, U017F, dead_abovering, dead_grave, NoSymbol ] }; key.type[Group1] = "EIGHT_LEVEL"; key { [ plus, asterisk, asciitilde, NoSymbol, dead_tilde, dead_macron, at, NoSymbol ] }; - + key.type[Group1] = "ONE_LEVEL"; key { [ Caps_Lock ] }; key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC"; @@ -210,7 +210,7 @@ xkb_symbols "ro_nodeadkeys" { }; // German Dvorak keymap by Thorsten Staerk (www.staerk.de/thorsten) -// Have acute and grave as dead keys, tilde and circumflex alive as they are needed +// Have acute and grave as dead keys, tilde and circumflex alive as they are needed // in many programming languages. // to use this keymap, use a 105-key-keyboard and the command setxkbmap -model pc105 -layout dvorak -variant de // source: http://www-lehre.informatik.uni-osnabrueck.de/~rfreund/dvorak.php @@ -292,7 +292,7 @@ xkb_symbols "sundeadkeys" { // adopted 2004 by Hanno Behrens // inspired by Dvorak/de-ergo http://www.goebel-consult.de/de-ergo/ // -// Authors: +// Authors: // Stephan Hilb // // Benjamin Kellermann @@ -321,12 +321,12 @@ xkb_symbols "neo_base" { // Legend // =============== - // Levels in Xkbmap jargon to be found here in the definitions. + // Levels in Xkbmap jargon to be found here in the definitions. // These are the levels used, and Xorg's translations: // -------------------------------------------------------------- - // Xorg: Level1 Level2 Level3 Level4 Level5 Level6 Level7 Level8 - // Neo: Ebene1 Ebene2 Ebene3 Ebene5 Ebene4 Pseudo-Ebene Ebene6 ??? - // Keys (Neo): None Shift Mod3 Mod3 + Shift Mod4 Mod4 + Shift Mod3 + Mod4 Mod3 + Mod4 + Shift + // Xorg: Level1 Level2 Level3 Level4 Level5 Level6 Level7 Level8 + // Neo: Ebene1 Ebene2 Ebene3 Ebene5 Ebene4 Pseudo-Ebene Ebene6 ??? + // Keys (Neo): None Shift Mod3 Mod3 + Shift Mod4 Mod4 + Shift Mod3 + Mod4 Mod3 + Mod4 + Shift // Alphanumeric-keys @@ -567,7 +567,7 @@ xkb_symbols "dsb_qwertz" partial alphanumeric_keys xkb_symbols "qwerty" { - // This layout should work exactly as a de with the exception + // This layout should work exactly as a de with the exception // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped). // 2008 by Matej Košík @@ -740,7 +740,7 @@ xkb_symbols "pl" { // https://github.com/kontextify/xkeyboard-config include "latin(type4)" - + name[Group1]= "Polish (Germany, no dead keys)"; include "de(nodeadkeys)" diff --git a/test/data/symbols/group b/test/data/symbols/group index 12f35a4..694fc6f 100644 --- a/test/data/symbols/group +++ b/test/data/symbols/group @@ -466,4 +466,3 @@ xkb_symbols "lctrl_lwin_toggle" { symbols[ Group1 ] = [ Super_L, ISO_Next_Group ] }; }; - diff --git a/test/data/symbols/il b/test/data/symbols/il index dcd640c..e0a197c 100644 --- a/test/data/symbols/il +++ b/test/data/symbols/il @@ -257,7 +257,7 @@ xkb_symbols "biblical" { // EXTRAS // Biblical hebrew (SIL) US Standard layout version 1.5 -// This map is based closely on v 1.5 of the standard. The only deviation being the replacement of the composite characters sin and shin +// This map is based closely on v 1.5 of the standard. The only deviation being the replacement of the composite characters sin and shin // by their more recent Unicodev6 counterparts // this map contains all the characters found in Biblical annotation, masoretic and Dead Sea Scroll related work. // The layout corresponds phonetically to a US standard layout or similar (Qwerty). @@ -308,7 +308,7 @@ xkb_symbols "biblicalSIL" { key { [ U05B0, U05F4, semicolon, U05C3 ] }; //sva gers. p semicolon sof pasuq key { [ U2019, U201D, U0323, U05C4 ] };//QuoteRight double R Quote punctum punctum Above - key { [ hebrew_zain ] }; //Zayin - - + key { [ hebrew_zain ] }; //Zayin - - key { [ hebrew_chet ] }; //chet - - key { [ hebrew_zade, U05E5 ] }; // tzade, final tzade - key { [ hebrew_tet ] }; //tet - - diff --git a/test/data/symbols/in b/test/data/symbols/in index b3a5ca9..4cc7bfc 100644 --- a/test/data/symbols/in +++ b/test/data/symbols/in @@ -129,7 +129,7 @@ xkb_symbols "bolnagri" { key { [ equal, plus ] }; key { [ U0964, U0965, U007C, U005C ] }; //pipe : danda, double danda - //Q Row + //Q Row key { [ U200C, U200D ] }; // Q: ZWNJ, ZWJ key { [ U0935, U950 ] }; // W: wa, OM key { [ U0947, U0948, U090F, U0910 ] }; // E: e, ai matras @@ -149,7 +149,7 @@ xkb_symbols "bolnagri" { key { [ U0926, U0927 ] }; // D: da, dha key { [ U091F, U0920 ] }; // F: TA, THA key { [ U0917, U0918 ] }; // G: ga, gha - key { [ U0939, U0903 ] }; // H: ha, visarg + key { [ U0939, U0903 ] }; // H: ha, visarg key { [ U091C, U091D ] }; // J: ja, jha key { [ U0915, U0916 ] }; // K: ka, kha key { [ U0932, U0933, U0962, U090C ] }; // L: la, vocalic L or lru matra @@ -270,7 +270,7 @@ xkb_symbols "ben_probhat" { key { [ equal, plus ] }; key { [ BackSpace ] }; -// tab, q to ] +// tab, q to ] key { [ Tab, ISO_Left_Tab ] }; key { [ U09A6, U09A7 ] }; key { [ U09C2, U098A ] }; @@ -286,7 +286,7 @@ xkb_symbols "ben_probhat" { key { [ U09CB, U09CC, U09D7 ] }; key { [ Return ] }; -// caps, a to ' +// caps, a to ' // key { [ Caps_Lock ] }; key { [ U09BE, U0985, U098C, U09E0 ] }; key { [ U09B8, U09B7, U09E1, U09E3 ] }; @@ -347,7 +347,7 @@ xkb_symbols "ben_baishakhi" { key { [ equal, plus ] }; key { [ BackSpace ] }; -// tab, q to ] +// tab, q to ] key { [ Tab, ISO_Left_Tab ] }; key { [ 0x10009A1, 0x10009A2 ] }; key { [ 0x10009C0 , 0x10009C2 ] }; @@ -363,7 +363,7 @@ xkb_symbols "ben_baishakhi" { key { [ bracketright, braceright ] }; key { [ Return ] }; -// caps, a to ' +// caps, a to ' // key { [ Caps_Lock ] }; key { [ 0x10009BE, 0x1000985, 0x1000986 ] }; key { [ 0x10009B8, 0x10009B6, 0x10009B7 ] }; @@ -488,7 +488,7 @@ xkb_symbols "ben_gitanjali" { key { [ 0x10009C3, 0x100098B ] }; key { [ BackSpace ] }; -// tab, q to ] +// tab, q to ] key { [ Tab, ISO_Left_Tab ] }; key { [ 0x10009D7, 0x1000994 ] }; key { [ 0x10009C8, 0x1000990 ] }; @@ -504,7 +504,7 @@ xkb_symbols "ben_gitanjali" { key { [ 0x100200C, 0x100099E ] }; key { [ Return ] }; -// caps, a to ' +// caps, a to ' // key { [ Caps_Lock ] }; key { [ 0x100200D, 0x1000993 ] }; key { [ 0x10009C7, 0x100098F ] }; @@ -564,7 +564,7 @@ xkb_symbols "ben_bornona" { key { [ equal, plus ] }; key { [ BackSpace ] }; -// tab, q to ] +// tab, q to ] key { [ Tab, ISO_Left_Tab ] }; key { [ 0x1000982, 0x1000999, 0x10009D7 ] }; key { [ 0x10009A2, 0x10009A0, 0x100098A ] }; @@ -580,7 +580,7 @@ xkb_symbols "ben_bornona" { key { [ 0x100005D, 0x100007D ] }; key { [ Return ] }; -// caps, a to ' +// caps, a to ' // key { [ Caps_Lock ] }; key { [ 0x10009BE, 0x1000985, 0x10009F4 ] }; key { [ 0x10009B8, 0x10009B6, 0x10009F5 ] }; @@ -688,7 +688,7 @@ xkb_symbols "guj" { partial alphanumeric_keys xkb_symbols "kan" { - // Inscript layout for Kannada + // Inscript layout for Kannada // Author : G Karunakar // Date : Wed Nov 13 17:22:58 IST 2002 // Kannada digits mapped in basic only @@ -768,8 +768,8 @@ xkb_symbols "mal" { key { [ U0d4a , U0d12 ] }; -// svu: -// These lines were in former "mal" variant - +// svu: +// These lines were in former "mal" variant - // but the digits are replaced with the ones from 'mal_plusnum' - // for the integrity of all Indian layouts // @@ -797,7 +797,7 @@ xkb_symbols "mal" { key { [ minus , U0d03 ] }; key { [ U0d43 , U0d0b ] }; - key { [U0200c, U05C ]};//bksl: ZWNJ + key { [U0200c, U05C ]};//bksl: ZWNJ // From 'q' to right bracket (]) @@ -870,10 +870,10 @@ xkb_symbols "mal_lalitha" { key { [ 0, parenright, U0D66, parenright ] }; key { [ minus, underscore ] }; key { [ equal, plus ] }; - key { [ U005C, U007C, U200C ] };//backslash:pipe,backslash,ZWNJ + key { [ U005C, U007C, U200C ] };//backslash:pipe,backslash,ZWNJ - //Q Row - key { [ U0D48, U0D4C, U0D10, U0D14 ] }; // Q: ai and au matras + //Q Row + key { [ U0D48, U0D4C, U0D10, U0D14 ] }; // Q: ai and au matras key { [ U0D35 ] }; // W: wa, OM key { [ U0D46, U0D47, U0D0E, U0D0F ] }; // E: e,ee matras key { [ U0D30, U0D31, U0D43, U0D0B ] }; // R: ra,rra, vocalic Ri @@ -883,7 +883,7 @@ xkb_symbols "mal_lalitha" { key { [ U0D3F, U0D40, U0D07, U0D08 ] }; // I: i, ii matras key { [ U0D4A, U0D4B, U0D12, U0D13 ] }; // O: o, oo matras key { [ U0D2A ] }; // P: pa - key { [ bracketleft, braceleft ] };//braceleft: + key { [ bracketleft, braceleft ] };//braceleft: key { [ bracketright, braceright ] };//braceright: //A Row @@ -892,7 +892,7 @@ xkb_symbols "mal_lalitha" { key { [ U0D26, U0D27, U0D21, U0D22 ] }; // D: soft da,soft dda,hard da,hard dda, key { [ U0D2B ] }; // F: pha key { [ U0D17, U0D18 ] }; // G: ga, gha - key { [ U0D39, U0D03 ] }; // H: ha, visarg + key { [ U0D39, U0D03 ] }; // H: ha, visarg key { [ U0D1C, U0D1D ] }; // J: ja, jha key { [ U0D15, U0D16 ] }; // K: ka, kha key { [ U0D32, U0D33 ] }; // L: la, vocalic L or lru matra` @@ -991,7 +991,7 @@ xkb_symbols "olck" { partial alphanumeric_keys xkb_symbols "ori" { - // Inscript layout for Oriya + // Inscript layout for Oriya // Author: G Karunakar // Date: Wed Nov 13 18:16:19 IST 2002 @@ -1124,7 +1124,7 @@ xkb_symbols "tam" { partial alphanumeric_keys xkb_symbols "tam_tamilnet" { -// Description: A keymap based on the TamilNet'99 typewriter keyboard +// Description: A keymap based on the TamilNet'99 typewriter keyboard // Encoding: Unicode (http://www.unicode.org) // Author: Thuraiappah Vaseeharan // Modifed by: Malathi S @@ -1190,7 +1190,7 @@ xkb_symbols "tam_tamilnet" { partial alphanumeric_keys xkb_symbols "tam_tamilnet_with_tam_nums" { -// Description: A keymap based on the TamilNet'99 typewriter keyboard +// Description: A keymap based on the TamilNet'99 typewriter keyboard // Encoding: Unicode (http://www.unicode.org) // Author: Malathi S // Secondary contact: Sri Ramadoss M @@ -1255,8 +1255,8 @@ xkb_symbols "tam_tamilnet_with_tam_nums" { partial alphanumeric_keys xkb_symbols "tam_tamilnet_TSCII" { -// Description : A Tamil typewrite-style keymap -// loosely based on TamilNet'99 reommendations +// Description : A Tamil typewrite-style keymap +// loosely based on TamilNet'99 reommendations // Encoding : TSCII (http://www.tscii.org) // Author : Thuraiappah Vaseeharan // Last Modified: Sat Jan 5 17:11:26 CST 2002 @@ -1311,7 +1311,7 @@ xkb_symbols "tam_tamilnet_TSCII" { partial alphanumeric_keys xkb_symbols "tam_tamilnet_TAB" { -// Description: A keymap based on the TamilNet'99 typewriter keyboard +// Description: A keymap based on the TamilNet'99 typewriter keyboard // Encoding: TAB (http://www.tamilnet99.org) // Author: Thuraiappah Vaseeharan // Date : Sun Aug 12 02:23:00 CDT 2001 @@ -1367,7 +1367,7 @@ xkb_symbols "tam_tamilnet_TAB" { partial alphanumeric_keys xkb_symbols "tel" { - // Inscript layout for Telugu using Unicode + // Inscript layout for Telugu using Unicode // Author: G Karunakar // Date: // See layout at http://www.indlinux.org/keymap/telugu.php @@ -1425,7 +1425,7 @@ xkb_symbols "tel" { key { [ period ] }; key { [ U0c2f, U0040 ] }; - key { + key { symbols[Group1] = [ Mode_switch, Multi_key ], virtualMods = AltGr }; @@ -1434,15 +1434,15 @@ xkb_symbols "tel" { }; //Name : Sarala -//Description : This is an adaptation of the Sarala keyboard (http://www.medhajananam.org/sarala/) developed +//Description : This is an adaptation of the Sarala keyboard (http://www.medhajananam.org/sarala/) developed // by Krishna Dhullipalla. Because of the way keyboard shortcuts are laid out in KDE, the keyboard -// modifiers had to be changed. The layout does not take any part of the original Sarala keyboard +// modifiers had to be changed. The layout does not take any part of the original Sarala keyboard // code however. It has been developed from scratch, so the experience may differ. -// -// There is a ibus-m17n version of Sarala layout developed by Satya Pothamsetti on +// +// There is a ibus-m17n version of Sarala layout developed by Satya Pothamsetti on // http://www.medhajananam.org/. -//Standard : Supports Unicode 9.0. -//Help : This layout differs slightly from the layout on Medhajenanam. The layout has been depicted in the +//Standard : Supports Unicode 9.0. +//Help : This layout differs slightly from the layout on Medhajenanam. The layout has been depicted in the // pdf file attached to this post on Sarala google group. // (https://groups.google.com/forum/#!topic/sarala-keyboard/-gsa90dUFcs). // @@ -1475,7 +1475,7 @@ xkb_symbols "tel-sarala" key { [ U0C15, U0C16, U0C62, U0C63 ] }; // క ఖ ౢ ౣ key { [ U0C32, U0C33, U0C0C, U0C61 ] }; // ల ళ ఌ ౡ key { [ U0C1F, U0C20, semicolon, colon ] }; // ట ఠ ; : - key { [ quoteright, quotedbl ] }; // ' " + key { [ quoteright, quotedbl ] }; // ' " key { [ U0C46, U0C0E, U0C44, U0C34 ] }; // ె ఎ ౄ ఴ key { [ U0C38, U0C37, U0C44 ] }; // స ష ౄ key { [ U0C47, U0C0F, U0C44 ] }; // ే ఏ ౄ @@ -1502,11 +1502,11 @@ xkb_symbols "tel-sarala" key { [ KP_Equal, KP_Add ] }; // = + key { [ U0C4C, U0C14, U0964, U0965 ] }; // ౌ ఔ । ॥ key { [ U0C43, U0C0B, quoteleft, asciitilde ] }; // ృ ఋ ` ~ - - include "level3(ralt_switch)" + + include "level3(ralt_switch)" }; -partial alphanumeric_keys +partial alphanumeric_keys xkb_symbols "urd-phonetic" { include "pk(urd-phonetic)" name[Group1]= "Urdu (phonetic)"; @@ -1621,7 +1621,7 @@ xkb_symbols "jhelum" { key { [ equal,plus] }; key { [ U0964,U0965,U007C,U005C] }; //pipe : danda, double danda - //Q Row + //Q Row key { [ U0A4C, U0A14 ] }; // Q: oo, ooh key { [ U0A48, U0A10 ] }; // W: ee, ae key { [ U0A3E, U0A06 ] }; // E: a, aa @@ -1839,7 +1839,7 @@ xkb_symbols "mal_enhanced" { key { [ minus , U0d03 ] }; key { [ U0d43 , U0d0b ] }; - key { [ U0d7c , U05C ] }; //bksl: chillu RR + key { [ U0d7c , U05C ] }; //bksl: chillu RR // From 'q' to right bracket (]) @@ -2147,9 +2147,9 @@ xkb_symbols "tel-kagapa" { // Encoding : Unicode (http://www.unicode.org) // Author : Santosh Heigrujam // Date : December, 2013 -// Source : +// Source : // Comment : - + partial alphanumeric_keys modifier_keys xkb_symbols "eeyek" { @@ -2206,7 +2206,7 @@ xkb_symbols "eeyek" { key { [ slash, question ] }; key { [ backslash, bar ] }; - + include "level3(ralt_switch)" }; @@ -2280,8 +2280,8 @@ xkb_symbols "marathi" { key { [ U0968, U0945, 2, at ] }; // Added ॅ key { [ U0969, U093D, 3, numbersign ] }; // Added ऽ key { [ U096a, U20B9, 4 ] }; // Added ₹ - key { [ U096b, percent, 5, percent ] }; - key { [ U096c, asciicircum, 6, asciicircum ] }; + key { [ U096b, percent, 5, percent ] }; + key { [ U096c, asciicircum, 6, asciicircum ] }; key { [ U096d, U0970, 7, ampersand ] }; // Added ॰ key { [ U096e, U0950, 8, asterisk ] }; key { [ U096f, parenleft, 9, parenleft ] }; @@ -2316,7 +2316,7 @@ xkb_symbols "marathi" { key { [ U091f, U0920, NoSymbol, U0951 ] }; key { [ apostrophe, U0972, U0953 ] }; // Added apostrophe & ॲ - key { [ U0902, U0901, NoSymbol, U0950 ] }; + key { [ U0902, U0901, NoSymbol, U0950 ] }; key { [ U092e, U0923, U0954 ] }; key { [ U0928, quotedbl ] }; // Added " key { [ U0935, UA8FB ] }; // Added headstroke @@ -2334,7 +2334,7 @@ xkb_symbols "marathi" { // // Author : D.Abhi // -// +// partial alphanumeric_keys xkb_symbols "modi-kagapa" { name[Group1] = "Modi (KaGaPa phonetic)"; @@ -2349,24 +2349,24 @@ xkb_symbols "modi-kagapa" { key { [ 5, percent, U11655 ] }; key { [ 6, asciicircum, U11656, U200C ] }; // ZWNJ key { [ 7, ampersand, U11657, U200D ] }; // ZWJ - key { [ 8, asterisk, U11658 ] }; + key { [ 8, asterisk, U11658 ] }; key { [ 9, parenleft, U11659 ] }; key { [ 0, parenright, U11650, U11643 ] }; // U11643: Modi abbreviation sign - key { [ minus, underscore ] }; + key { [ minus, underscore ] }; key { [ equal, plus ] }; key { [ U005C, U007C, U11641, U11642 ] }; // backslash, pipe, Modi danda, Modi double danda //Q Row key { [ U11618, U11619 ] }; // Q: retroflex Modi letter Ta, Tha - key { [ U1161A, U1161B ] }; // W: retroflex Modi letter Da, Dha + key { [ U1161A, U1161B ] }; // W: retroflex Modi letter Da, Dha key { [ U11639, U1160A, U1160B ] }; // E: Modi vovel sign E, Modi letter E, letter ai - key { [ U11628, U11635, U11606 ] }; // R: Modi ra, Modi vowel sign vocalic R, vocalic letter R + key { [ U11628, U11635, U11606 ] }; // R: Modi ra, Modi vowel sign vocalic R, vocalic letter R key { [ U1161D, U1161E ] }; // T: dental Modi letter ta, tha key { [ U11627, U1163A ] }; // Y: Modi letter ya, Modi vowel sign ai key { [ U11633, U11634, U11604, U11605 ] }; // U: Modi vowel sign u, uu, Modi letter u, uu key { [ U11631, U11632, U11602, U11603 ] }; // I: Modi vowel sign i, ii, Modi letter i, ii key { [ U1163B, U1160C ] }; // O: Modi vowel sign o, Modi letter o - key { [ U11622, U11623 ] }; // P: Modi letter pa, pha + key { [ U11622, U11623 ] }; // P: Modi letter pa, pha key { [ bracketleft, braceleft ] }; key { [ bracketright, braceright ] }; @@ -2381,11 +2381,11 @@ xkb_symbols "modi-kagapa" { key { [ U1160E, U1160F ] }; // K: Modi letter ka, kha key { [ U11629, U1162F, U11637, U11608 ] }; // L: Modi letter la, lla, Modi vowel sign vocalic L, letter vocalic L key { [ semicolon, colon ] }; - key { [ apostrophe, quotedbl ] }; - + key { [ apostrophe, quotedbl ] }; + //Z Row key { [ U11617, U11612 ] }; // Z: Modi letter nya, nga - key { [ U1162C, U11609, U11638 ] }; // X: Modi letter ssa, Modi letter vocalic ll, Modi vowel sign vocalic ll + key { [ U1162C, U11609, U11638 ] }; // X: Modi letter ssa, Modi letter vocalic ll, Modi vowel sign vocalic ll key { [ U11613, U11614 ] }; // C: Modi letter ca, cha key { [ U1162A, U1163C, U1160D ] }; // V: Modi letter va, Modi vowel sign au, Modi letter au key { [ U11624, U11625 ] }; // B: Modi letter ba, bha diff --git a/test/data/symbols/inet b/test/data/symbols/inet index 049ac18..f985c4f 100644 --- a/test/data/symbols/inet +++ b/test/data/symbols/inet @@ -1896,4 +1896,3 @@ partial alphanumeric_keys xkb_symbols "teck229" { include "inet(teck227)" }; - diff --git a/test/data/symbols/macintosh_vndr/apple b/test/data/symbols/macintosh_vndr/apple index 342eb7d..e9b6e7a 100644 --- a/test/data/symbols/macintosh_vndr/apple +++ b/test/data/symbols/macintosh_vndr/apple @@ -5,7 +5,7 @@ default partial modifier_keys xkb_symbols "extended" { - key { [ KP_Equal ] }; + key { [ KP_Equal ] }; // The key in the PC's Insert position is sometimes engraved Help (at least // in Switzerland and Great Britain), with Insert sometimes above. But in the @@ -41,7 +41,7 @@ xkb_symbols "laptop" { // the fn-keypad, so use the Enter key (right of ) for Mode_switch, // and use fn+Enter (Apple's code for Menu) for KP_Enter. replace key { [ ISO_Level3_Shift ] }; - modifier_map Mod5 { ISO_Level3_Shift }; + modifier_map Mod5 { ISO_Level3_Shift }; // Linux kernel bug with Menu on macs means this does not work yet // replace key { [ KP_Enter ] }; // should be keycode 117 }; diff --git a/test/data/symbols/macintosh_vndr/us b/test/data/symbols/macintosh_vndr/us index 58bfee5..9747072 100644 --- a/test/data/symbols/macintosh_vndr/us +++ b/test/data/symbols/macintosh_vndr/us @@ -124,7 +124,7 @@ xkb_symbols "oldmac" { modifier_map Control{ Control_L, Control_R }; modifier_map Mod2 { Num_Lock }; - // Fake keys for virtual<->real modifiers mapping + // Fake keys for virtual<->real modifiers mapping key { [ ISO_Level3_Shift ] }; key { [ Mode_switch ] }; modifier_map Mod5 { , }; diff --git a/test/data/symbols/ru b/test/data/symbols/ru index 7fd8f45..d23cffe 100644 --- a/test/data/symbols/ru +++ b/test/data/symbols/ru @@ -228,7 +228,7 @@ xkb_symbols "phonetic_YAZHERTY" { include "ru(phonetic_winkeys)" name[Group1]= "Russian (phonetic, YAZHERTY)"; key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; - key { [ Cyrillic_ve, Cyrillic_VE ] }; + key { [ Cyrillic_ve, Cyrillic_VE ] }; }; @@ -923,7 +923,7 @@ xkb_symbols "prxn" { key { [ Cyrillic_shorti, Cyrillic_SHORTI, Cyrillic_je, Cyrillic_JE, U04CF, U04C0, U030A, U0325 ] }; // й Й ј Ј ӏ Ӏ, Combining Ring Above and Below key { [ Cyrillic_tse, Cyrillic_TSE, U04B5, U04B4, Cyrillic_u_straight, Cyrillic_U_straight, U051B, U051A ] }; // ц Ц ҵ Ҵ ү Ү ԛ Ԛ key { [ Cyrillic_u, Cyrillic_U, Byelorussian_shortu, Byelorussian_SHORTU, Cyrillic_u_straight_bar,Cyrillic_U_straight_bar, Byelorussian_shortu, Byelorussian_SHORTU ] }; // у У ў Ў ұ Ұ ў Ў - key { [ Cyrillic_ka, Cyrillic_KA, Cyrillic_ka_descender, Cyrillic_KA_descender, U049F, U049E, U046F, U046E ] }; // к К Қ қ ҟ Ҟ ѯ Ѯ + key { [ Cyrillic_ka, Cyrillic_KA, Cyrillic_ka_descender, Cyrillic_KA_descender, U049F, U049E, U046F, U046E ] }; // к К Қ қ ҟ Ҟ ѯ Ѯ key { [ Cyrillic_ie, Cyrillic_IE, Cyrillic_io, Cyrillic_IO, U0463, U0462, UA653, UA652 ] }; // е Е ё Ё ѣ Ѣ ꙓ Ꙓ key { [ Cyrillic_en, Cyrillic_EN, Cyrillic_nje, Cyrillic_NJE, Cyrillic_en_descender, Cyrillic_EN_descender, U04C8, U04C7 ] }; // н Н њ Њ ң Ң ӈ Ӈ key { [ Cyrillic_ghe, Cyrillic_GHE, Ukrainian_ghe_with_upturn,Ukrainian_GHE_WITH_UPTURN, Cyrillic_ghe_bar, Cyrillic_GHE_bar, U04F7, U04F6 ] }; // г Г Ґ ґ ғ Ғ ӷ Ӷ @@ -1001,7 +1001,7 @@ xkb_symbols "unipunct" { include "us(basic)" name[Group1]= "Russian (with US punctuation)"; - + // Единственный символ, который отсутствует на US раскладке - № key { [ 3, numbersign, 3, numerosign ] }; diff --git a/test/data/symbols/us b/test/data/symbols/us index b876978..43238de 100644 --- a/test/data/symbols/us +++ b/test/data/symbols/us @@ -1867,7 +1867,7 @@ xkb_symbols "3l-cros" { }; }; -// A 3l variant for emacs users, which maps control to caps lock and (re)maps +// A 3l variant for emacs users, which maps control to caps lock and (re)maps // tab back to tab. partial modifier_keys xkb_symbols "3l-emacs" {