From 9fa2d90a85ec9e67bed962dfc297b3134df280c4 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Sun, 8 Sep 2013 11:14:34 +0200 Subject: [PATCH] Removal of some useless comments, and alignment of some braces. Signed-off-by: Benno Schulenberg --- symbols/fujitsu_vndr/us | 1 - symbols/hp_vndr/us | 5 ++--- symbols/in | 5 +---- symbols/macintosh_vndr/us | 11 ++++------- symbols/mv | 13 +------------ symbols/nec_vndr/jp | 2 -- symbols/nokia_vndr/su-8w | 5 +++-- symbols/sony_vndr/us | 4 +--- symbols/sy | 11 +---------- symbols/xfree68_vndr/amiga | 3 +-- symbols/xfree68_vndr/ataritt | 3 +-- 11 files changed, 15 insertions(+), 48 deletions(-) diff --git a/symbols/fujitsu_vndr/us b/symbols/fujitsu_vndr/us index b856393..30661db 100644 --- a/symbols/fujitsu_vndr/us +++ b/symbols/fujitsu_vndr/us @@ -133,7 +133,6 @@ xkb_symbols { key { [ KP_0 ] }; // End "Keypad" section - // begin modifier mappings modifier_map Shift { Shift_R }; modifier_map Mod1 { Meta_L, Meta_R }; modifier_map Mod2 { Mode_switch }; diff --git a/symbols/hp_vndr/us b/symbols/hp_vndr/us index aedda92..8bbe2e6 100644 --- a/symbols/hp_vndr/us +++ b/symbols/hp_vndr/us @@ -69,8 +69,9 @@ xkb_symbols "hil" { key { [ Down ] }; key { [ Up ] }; key { [ Right ]}; + // End "Editing" section - // End "Editing" section, begin "Keypad" + // Begin "Keypad" section key { [ KP_Multiply ]}; key { [ KP_Divide ]}; key { [ KP_Add ]}; @@ -95,8 +96,6 @@ xkb_symbols "hil" { key { [ KP_Decimal ] }; // End "Keypad" section - - // begin modifier mappings modifier_map Shift { Shift_R }; modifier_map Mod1 { Meta_L, Meta_R }; modifier_map Mod2 { Alt_L }; diff --git a/symbols/in b/symbols/in index 5336232..9f05949 100644 --- a/symbols/in +++ b/symbols/in @@ -163,7 +163,6 @@ xkb_symbols "bolnagri" { key { [ period, U093C ] }; // period: period, nukta key { [ slash, question ] }; - // begin modifier mappings // modifier_map Shift { Shift_L }; // modifier_map Lock { Caps_Lock }; // modifier_map Control{ Control_L }; @@ -911,7 +910,6 @@ xkb_symbols "mal_lalitha" { key { [ period, U003E ] }; // period: period key { [ slash, question ] }; - // begin modifier mappings // modifier_map Shift { Shift_L }; // modifier_map Lock { Caps_Lock }; // modifier_map Control{ Control_L }; @@ -1518,9 +1516,8 @@ xkb_symbols "jhelum" { key { [ U0A2E, U0A2E ] }; // M: ma key { [ comma, U262C ] };// comma: comma, dev abbreviation sign key { [ period, U0A74 ] }; // period: period, nukta - key { [ slash, question ] }; + key { [ slash, question ] }; -// begin modifier mappings // modifier_map Shift { Shift_L }; // modifier_map Lock { Caps_Lock }; // modifier_map Control{ Control_L }; diff --git a/symbols/macintosh_vndr/us b/symbols/macintosh_vndr/us index d0cf560..81e4b77 100644 --- a/symbols/macintosh_vndr/us +++ b/symbols/macintosh_vndr/us @@ -5,7 +5,6 @@ xkb_symbols "extended" { name[Group1]= "USA"; key { [ Escape ] }; - // Alphanumeric section key { [ grave, asciitilde ] }; key { [ 1, exclam ] }; key { [ 2, at ] }; @@ -58,13 +57,11 @@ xkb_symbols "extended" { key { [ slash, question ] }; key { [ space ] }; - // End alphanumeric section - include "eurosign(e)" include "keypad" - key { [ equal ] }; + key { [ equal ] }; }; hidden @@ -104,11 +101,11 @@ xkb_symbols "oldmac" { key { [ Right ] }; // End "Editing" section - key { [ BackSpace ] }; - key { [ Tab, ISO_Left_Tab ] }; + key { [ BackSpace ] }; + key { [ Tab, ISO_Left_Tab ] }; key { [ Return ] }; key { [ Caps_Lock ] }; - key { [ Num_Lock, Pointer_EnableKeys ] }; + key { [ Num_Lock, Pointer_EnableKeys ] }; // Begin "Modifier" section key { [ Shift_L ] }; diff --git a/symbols/mv b/symbols/mv index e82b1e8..5c9177b 100644 --- a/symbols/mv +++ b/symbols/mv @@ -1,7 +1,4 @@ -// -// NOTES: -// -//Keymap for thaana/divehi script (divehi language) +// Keymap for Thaana/Dhivehi script (Dhivehi language). partial default alphanumeric_keys xkb_symbols "basic" { @@ -32,12 +29,9 @@ xkb_symbols "basic" { key { [ 0x10007A8, 0x10007A9 ] }; key { [ 0x10007AE, 0x10007AF ] }; key { [ 0x1000795, division ] }; -// The following brackets are as they appear on the US_en keyboard. -//Please verify whether the names used are correct. I referred to keysymdef.h key { [ bracketleft, braceleft ] }; key { [ bracketright, braceright ] }; - key { [ 0x10007A6, 0x10007A7 ] }; key { [ 0x1000790, 0x1000781 ] }; key { [ 0x100078B, 0x1000791 ] }; @@ -53,7 +47,6 @@ xkb_symbols "basic" { key { [ bar, brokenbar ] }; key { [ 0x1000792, 0x10007A1 ] }; -//multiply sign is the same as the algebraic symbol which looks like an italicized x. I am presuming its the same thing here. If not, please substitute an 'x' instead key { [ multiply, 0x1000798 ] }; key { [ 0x1000797, 0x100079D ] }; key { [ 0x1000788, 0x10007A5 ] }; @@ -64,10 +57,6 @@ xkb_symbols "basic" { key { [ period, greater ] }; key { [ slash, Arabic_question_mark ] }; - // End alphanumeric section - - // Begin modifier mappings - modifier_map Shift { Shift_L }; modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L }; diff --git a/symbols/nec_vndr/jp b/symbols/nec_vndr/jp index 6a9c328..2931f3a 100644 --- a/symbols/nec_vndr/jp +++ b/symbols/nec_vndr/jp @@ -93,7 +93,6 @@ default xkb_symbols "pc98" { key { [ Muhenkan ] }; key { [ space ] }; key { [ Henkan, Kanji ] }; - // End alphanumeric section // Begin "Function" section @@ -154,7 +153,6 @@ default xkb_symbols "pc98" { // key { [ KP_Enter ] }; // End "Keypad" section - // begin modifier mappings modifier_map Shift { Shift_L }; modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L }; diff --git a/symbols/nokia_vndr/su-8w b/symbols/nokia_vndr/su-8w index 441b3fe..029906d 100644 --- a/symbols/nokia_vndr/su-8w +++ b/symbols/nokia_vndr/su-8w @@ -428,13 +428,13 @@ xkb_symbols "base" { key { [ F10 ] }; key { [ F12 ] }; - // begin modifier mappings + // Begin modifier mappings modifier_map Shift { Shift_L, Shift_R }; modifier_map Lock { Caps_Lock }; 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 { , }; @@ -450,6 +450,7 @@ xkb_symbols "base" { key { [ NoSymbol, Hyper_L ] }; modifier_map Mod4 { }; + // End modifier mappings key { [ Insert ] }; key { [ Delete ] }; diff --git a/symbols/sony_vndr/us b/symbols/sony_vndr/us index e91ca11..69102bf 100644 --- a/symbols/sony_vndr/us +++ b/symbols/sony_vndr/us @@ -27,7 +27,7 @@ xkb_symbols "nwp5461" { include "us(basic)" - key { [ Alt_L, Meta_L ] }; + key { [ Alt_L, Meta_L ] }; key { [ Shift_R ] }; key { [ NoSymbol ] }; @@ -84,8 +84,6 @@ xkb_symbols "nwp5461" { key { [ KP_Tab ] }; // End "Keypad" section - - // begin modifier mappings modifier_map Shift { Shift_R }; modifier_map Mod3 { Alt_L }; }; diff --git a/symbols/sy b/symbols/sy index 1a82f0e..aa6ce82 100644 --- a/symbols/sy +++ b/symbols/sy @@ -59,13 +59,9 @@ xkb_symbols "syc" { key { [ 0x1000719, Arabic_semicolon ] }; key { [ 0x1000707, Arabic_question_mark ] }; - // End Alphanumeric Section - - // Space + // Space plus zero-width non-joiner: include "nbsp(zwnj2)" - // Begin Modifier Mappings - modifier_map Shift { Shift_L, Shift_R }; modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L, Control_R }; @@ -130,11 +126,6 @@ xkb_symbols "syc_phonetic" { key { [ 0x100002E, Arabic_semicolon ] }; key { [ 0x1000707, Arabic_question_mark ] }; - // End Alphanumeric Section - - - // Begin Modifier Mappings - modifier_map Shift { Shift_L, Shift_R }; modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L, Control_R }; diff --git a/symbols/xfree68_vndr/amiga b/symbols/xfree68_vndr/amiga index 46d48a2..f785288 100644 --- a/symbols/xfree68_vndr/amiga +++ b/symbols/xfree68_vndr/amiga @@ -113,10 +113,9 @@ default xkb_symbols "usa1" { key { [ KP_0, KP_Insert ] }; key { [ KP_Decimal, KP_Delete ] }; - key { [ KP_Enter ] }; + key { [ KP_Enter ] }; // End "Keypad" section - // begin modifier mappings modifier_map Shift { Shift_L, Shift_R }; modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L }; diff --git a/symbols/xfree68_vndr/ataritt b/symbols/xfree68_vndr/ataritt index 65048bd..0ceb3ed 100644 --- a/symbols/xfree68_vndr/ataritt +++ b/symbols/xfree68_vndr/ataritt @@ -1,6 +1,7 @@ default xkb_symbols "us" { name[Group1]= "US/ASCII"; + key { [ Escape ] }; // Alphanumeric section @@ -112,7 +113,6 @@ default xkb_symbols "us" { key { [ KP_Enter ] }; // End "Keypad" section - // begin modifier mappings modifier_map Shift { Shift_L, Shift_R }; modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L }; @@ -124,7 +124,6 @@ xkb_symbols "de" { name[Group1]= "German"; - // Alphanumeric section key { [ 2, quotedbl ] }; key { [ 3, section ] }; key { [ 6, ampersand ] }; -- 2.7.4