Removal of some useless comments, and alignment of some braces.

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

diff --git a/symbols/fujitsu_vndr/us b/symbols/fujitsu_vndr/us
index b856393..30661db 100644 (file)
--- a/symbols/fujitsu_vndr/us
+++ b/symbols/fujitsu_vndr/us
@@ -133,7 +133,6 @@ xkb_symbols {
     key <KP00> { [  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 (file)
--- a/symbols/hp_vndr/us
+++ b/symbols/hp_vndr/us
@@ -69,8 +69,9 @@ xkb_symbols "hil" {
     key <DOWN> { [ Down        ]       };
     key <UP>   { [ Up  ]       };
     key <RGHT> { [ Right       ]};
+    // End "Editing" section
 
-    // End "Editing" section, begin "Keypad"
+    // Begin "Keypad" section
     key <KPMU> { [ KP_Multiply ]};
     key <KPDV> { [ KP_Divide   ]};
     key <KPAD> { [ KP_Add      ]};
@@ -95,8 +96,6 @@ xkb_symbols "hil" {
     key <KPDL> { [ 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 (file)
--- a/symbols/in
+++ b/symbols/in
@@ -163,7 +163,6 @@ xkb_symbols "bolnagri" {
     key <AB09>   { [   period,   U093C          ] };  // period: period, nukta
     key <AB10>  { [   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 <AB09>   { [   period,          U003E ] };  // period: period
     key <AB10>  { [   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 <AB07>   { [   U0A2E, U0A2E       ] };  // M: ma
      key <AB08>   { [   comma,    U262C         ] };// comma: comma, dev abbreviation sign
      key <AB09>   { [   period,   U0A74         ] };  // period: period, nukta
-     key <AB10>         { [   slash,   question ] };
+     key <AB10>   { [   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 (file)
--- a/symbols/macintosh_vndr/us
+++ b/symbols/macintosh_vndr/us
@@ -5,7 +5,6 @@ xkb_symbols "extended" {
     name[Group1]= "USA";
     key <ESC>  {       [ Escape                        ]       };
 
-    // Alphanumeric section
     key <TLDE> {       [     grave,    asciitilde      ]       };
     key <AE01> {       [         1,    exclam          ]       };
     key <AE02> {       [         2,    at              ]       };
@@ -58,13 +57,11 @@ xkb_symbols "extended" {
     key <AB10> {       [     slash,    question        ]       };
 
     key <SPCE> {       [  space                        ]       };
-    // End alphanumeric section
-
 
     include "eurosign(e)"
     include "keypad"
 
-    key <KPEQ> {       [  equal                                ]       };
+    key <KPEQ> {       [  equal                        ]       };
 };
 
 hidden
@@ -104,11 +101,11 @@ xkb_symbols "oldmac" {
     key <RGHT> {       [  Right        ]       };
     // End "Editing" section
 
-    key <BKSP> {       [ BackSpace                     ]       };
-    key  <TAB> {       [ Tab,  ISO_Left_Tab    ]       };
+    key <BKSP> {       [ BackSpace     ]       };
+    key  <TAB> {       [ Tab,  ISO_Left_Tab ]  };
     key <RTRN> {       [ Return        ]       };
     key <CAPS> {       [ Caps_Lock     ]       };
-    key <NMLK> {       [ Num_Lock, Pointer_EnableKeys          ]       };
+    key <NMLK> {       [ Num_Lock, Pointer_EnableKeys ] };
 
     // Begin "Modifier" section
     key <LFSH> {       [  Shift_L      ]       };

diff --git a/symbols/mv b/symbols/mv
index e82b1e8..5c9177b 100644 (file)
--- 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 <AD08> { [     0x10007A8,      0x10007A9      ]       };
     key <AD09> { [     0x10007AE,      0x10007AF      ]       };
     key <AD10> { [     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 <AD11> {       [       bracketleft,    braceleft      ]        };
     key <AD12> {       [       bracketright,   braceright     ]        };
 
-
     key <AC01> { [     0x10007A6,       0x10007A7     ]       };
     key <AC02> { [     0x1000790,       0x1000781     ]       };
     key <AC03> { [     0x100078B,       0x1000791     ]       };
@@ -53,7 +47,6 @@ xkb_symbols "basic" {
 
     key <LSGT> { [        bar,         brokenbar       ]       };
     key <AB01> { [     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 <AB02> { [     multiply,       0x1000798         ]       };
     key <AB03> { [     0x1000797,      0x100079D         ]       };
     key <AB04> { [     0x1000788,      0x10007A5         ]       };
@@ -64,10 +57,6 @@ xkb_symbols "basic" {
     key <AB09> { [     period,         greater           ]       };
     key <AB10> { [     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 (file)
--- a/symbols/nec_vndr/jp
+++ b/symbols/nec_vndr/jp
@@ -93,7 +93,6 @@ default xkb_symbols "pc98" {
     key <NFER> { [ Muhenkan            ]       };
     key <SPCE> { [ space               ]       };
     key <XFER> { [ Henkan, Kanji       ]       };
-
     // End alphanumeric section
 
     // Begin "Function" section
@@ -154,7 +153,6 @@ default xkb_symbols "pc98" {
 //    key <KPEN> { [ 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 (file)
--- a/symbols/nokia_vndr/su-8w
+++ b/symbols/nokia_vndr/su-8w
@@ -428,13 +428,13 @@ xkb_symbols "base" {
     key <FK11> { [ F10 ] };
     key <FK12> { [ 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 <LVL3> {       [ ISO_Level3_Shift      ]       };
     key <MDSW> {       [ Mode_switch           ]       };
     modifier_map Mod5   { <LVL3>, <MDSW> };
@@ -450,6 +450,7 @@ xkb_symbols "base" {
 
     key <HYPR> {       [ NoSymbol, Hyper_L     ]       };
     modifier_map Mod4   { <HYPR> };
+    // End modifier mappings
 
     key  <INS> {        [  Insert               ]       };
     key <DELE> {        [  Delete               ]       };

diff --git a/symbols/sony_vndr/us b/symbols/sony_vndr/us
index e91ca11..69102bf 100644 (file)
--- a/symbols/sony_vndr/us
+++ b/symbols/sony_vndr/us
@@ -27,7 +27,7 @@
 xkb_symbols "nwp5461" {
     include "us(basic)"
 
-    key <LALT> { [ Alt_L, Meta_L       ]       };
+    key <LALT> { [ Alt_L, Meta_L ]     };
     key <RTSH> { [ Shift_R     ]       };
     key <AB11> { [ NoSymbol    ]       };
 
@@ -84,8 +84,6 @@ xkb_symbols "nwp5461" {
     key <KPTB> { [ 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 (file)
--- a/symbols/sy
+++ b/symbols/sy
@@ -59,13 +59,9 @@ xkb_symbols "syc" {
     key <AB09> {  [    0x1000719,      Arabic_semicolon                        ]     };
     key <AB10> {  [    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 <AB09> {  [    0x100002E,      Arabic_semicolon                        ]     };
     key <AB10> {  [    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 (file)
--- a/symbols/xfree68_vndr/amiga
+++ b/symbols/xfree68_vndr/amiga
@@ -113,10 +113,9 @@ default xkb_symbols "usa1" {
 
     key <KP0>  {       [ KP_0,         KP_Insert       ]       };
     key <KPDC> {       [ KP_Decimal,   KP_Delete       ]       };
-    key <KPEN> {       [        KP_Enter       ]       };
+    key <KPEN> {       [        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 (file)
--- a/symbols/xfree68_vndr/ataritt
+++ b/symbols/xfree68_vndr/ataritt
@@ -1,6 +1,7 @@
 default xkb_symbols "us" {
 
     name[Group1]= "US/ASCII";
+
     key <ESC>  {       [       Escape                  ]       };
 
     // Alphanumeric section
@@ -112,7 +113,6 @@ default xkb_symbols "us" {
     key <KPEN> {       [       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 <AE02> {       [         2,    quotedbl        ]       };
     key <AE03> {       [         3,    section         ]       };
     key <AE06> {       [         6,    ampersand       ]       };