symbols/{pt,br}: Adjusting some comments, whitespace and alignments.

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

2 files changed, 32 insertions, 34 deletions

diff --git a/symbols/br b/symbols/br
index 00e213e..44e2a38 100644
--- a/symbols/br
+++ b/symbols/br
@@ -1,14 +1,11 @@
-//
-// based on 
-// "a very simple Brasilian ABNT2 keyboard
-// by Ricardo Y. Igarashi (iga@that.com.br)
-// Adds suport for dead-keys in I18N applications
-// by Conectiva  (http://www.conectiva.com.br)"
-//
-
 default
 xkb_symbols "abnt2" {
 
+    // Based on a very simple Brazilian ABNT2 keyboard,
+    // by Ricardo Y. Igarashi (iga@that.com.br).
+    // With added support for dead keys in I18N applications,
+    // by Conectiva  (http://www.conectiva.com.br).
+
     include "latin"
     name[Group1]="Portuguese (Brazil)";
 
@@ -19,8 +16,8 @@ xkb_symbols "abnt2" {
     key <AE06>	{ [         6, dead_diaeresis,  notsign,    diaeresis ]	};
     key <AE12>	{ [     equal,       plus,      section,  dead_ogonek ]	};
 
-    key <AD01>  { [         q,          Q,        slash,        slash ] };   
-    key <AD02>  { [         w,          W,     question,     question ] };   
+    key <AD01>  { [         q,          Q,        slash,        slash ] };
+    key <AD02>  { [         w,          W,     question,     question ] };
     key <AD03>	{ [         e,          E,     EuroSign,     EuroSign ]	};
     key <AD04>	{ [         r,          R,   registered,   registered ]	};
     key <AD11>	{ [dead_acute, dead_grave,        acute,        grave ]	};
@@ -37,8 +34,7 @@ xkb_symbols "abnt2" {
     key <AB07>  { [         m,          M,           mu,           mu ] };
     key <AB10>	{ [ semicolon,    colon, dead_belowdot, dead_abovedot ]	};
 
-// ABNT-2 keyboard has this special key
-
+    // The ABNT-2 keyboard has this special key:
     key <AB11>	{ [     slash,   question,       degree, questiondown ]	};
 
     modifier_map Mod3   { Scroll_Lock };
@@ -51,7 +47,7 @@ xkb_symbols "abnt2" {
 partial alphanumeric_keys
 xkb_symbols "nodeadkeys" {
 
-    include "br(abnt2)" // for consistent naming
+    include "br(abnt2)"
     name[Group1]="Portuguese (Brazil, eliminate dead keys)";
 
     key <AE06>	{ [         6,  diaeresis,      notsign,      notsign ]	};
@@ -62,13 +58,13 @@ xkb_symbols "nodeadkeys" {
 };
 
 
-// ABNT2 Keyboard to IBM/Lenovo Thinkpads 
-// by Piter PUNK <piterpk@terra.com.br>
+// The ABNT2 keyboard on IBM/Lenovo Thinkpads,
+// by Piter PUNK <piterpk@terra.com.br>.
 //
 partial alphanumeric_keys
 xkb_symbols "thinkpad" {
 
-    include "br(abnt2)" // for consistent naming
+    include "br(abnt2)"
     name[Group1]="Portuguese (Brazil)";
 
     key <RCTL> { [     slash,   question,       degree, questiondown ] };
@@ -89,20 +85,20 @@ xkb_symbols "olpc" {
     key <AE04> { [           4,          dollar,      sterling                 ] };
     key <AE05> { [           5,         percent,          cent                 ] };
     key <AE06> { [           6,  dead_diaeresis,       notsign                 ] };
-    key <AE12>  { [       equal,           plus,       section                 ] };
+    key <AE12> { [       equal,            plus,       section                 ] };
 
     key <AD03> { [            e,              E,      EuroSign                 ] };
     key <AD11> { [   dead_acute,      dead_grave,        acute,          grave ] };
-    key <AD12> { [  bracketleft,       braceleft,     0x10000AA                 ] };
+    key <AD12> { [  bracketleft,       braceleft,    0x10000AA                 ] };
 
     key <AC10> { [     ccedilla,       Ccedilla                                ] };
     key <AC11> { [   dead_tilde, dead_circumflex                               ] };
-    key <BKSL> { [ bracketright,      braceright,     0x10000BA                        ] };
+    key <BKSL> { [ bracketright,      braceright,    0x10000BA                 ] };
 
     key <AB01> { [            z,              Z,           bar                 ] };
     key <AB03> { [            c,              C,     0x10020A2                 ] };
     key <AB09> { [       period,        greater,     backslash                 ] };
-    key <AB10> { [    semicolon,           colon                                ] };
+    key <AB10> { [    semicolon,          colon                                ] };
 
     key <I219> { [        slash,       question,        degree, ISO_Next_Group ] };
 
@@ -278,6 +274,7 @@ xkb_symbols "nativo" {
 //
 partial alphanumeric_keys
 xkb_symbols "nativo-us" {
+
     include "br(nativo)"
 
     name[Group1]="Portuguese (Brazil, Nativo for US keyboards)";
@@ -294,6 +291,7 @@ xkb_symbols "nativo-us" {
 //
 partial alphanumeric_keys
 xkb_symbols "nativo-epo" {
+
     include "br(nativo)"
 
     name[Group1]="Esperanto (Brazil, Nativo)";
diff --git a/symbols/pt b/symbols/pt
index 58a82d2..b34be72 100644
--- a/symbols/pt
+++ b/symbols/pt
@@ -2,7 +2,6 @@ default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin(type4)"
-
     name[Group1]="Portuguese";
 
     key <LSGT>  { [      less,    greater,    backslash,    backslash ] };
@@ -26,7 +25,7 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "Sundeadkeys" {
 
-    include "pt(basic)" // for consistent naming
+    include "pt(basic)"
 
     key <AD11>	{ [plus,   asterisk, dead_diaeresis, dead_diaeresis ]	};
     key <BKSL>	{ [dead_tilde, dead_circumflex ]	};
@@ -35,16 +34,14 @@ xkb_symbols "Sundeadkeys" {
 
 partial alphanumeric_keys
 xkb_symbols "sundeadkeys" {
-    include "pt(Sundeadkeys)" // for consistent naming
-
+    include "pt(Sundeadkeys)"
     name[Group1]="Portuguese (Sun dead keys)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "nodeadkeys" {
 
-    include "pt(basic)" // for consistent naming
-
+    include "pt(basic)"
     name[Group1]="Portuguese (eliminate dead keys)";
 
     key <AE12>	{ [guillemotleft, guillemotright, cedilla,     ogonek ]	};
@@ -56,9 +53,8 @@ xkb_symbols "nodeadkeys" {
     key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
 };
 
-// mac version from Ricardo Cabral <bfe00991@mail.telepac.pt>
-// Copied from macintosh_vndr/pt
-partial alphanumeric_keys 
+// Layout variant for Mac, by Ricardo Cabral <bfe00991@mail.telepac.pt>.
+partial alphanumeric_keys
 xkb_symbols "mac" {
 
     include "pt"
@@ -68,24 +64,26 @@ xkb_symbols "mac" {
     key <AE08>	{ [         8,  parenleft,  bracketleft,    braceleft ]	};
     key <AE09>	{ [         9, parenright, bracketright,   braceright ]	};
     key <AE12>	{ [      plus,   asterisk, dead_diaeresis     ]	};
-    key <AC11>	{ [ dead_tilde, dead_circumflex       ]	};
     key <AD11>	{ [ masculine, ordfeminine            ]	};
+    key <AC11>	{ [ dead_tilde, dead_circumflex       ]	};
     key <BKSL>	{ [ backslash,        bar,   dead_grave,   dead_breve ]	};
     key <TLDE>	{ [     grave, asciitilde,      notsign,      notsign ]	};
 };
 
-partial alphanumeric_keys 
+partial alphanumeric_keys
 xkb_symbols "mac_sundeadkeys" {
+
     include "pt(mac)"
     name[Group1]= "Portuguese (Macintosh, Sun dead keys)";
-    
-    key <AE12> {	[	     plus,        asterisk,  dead_diaeresis, dead_diaeresis      ]	};
+
+    key <AE12> {	[           plus,        asterisk,  dead_diaeresis, dead_diaeresis      ]	};
     key <AC11> {	[     dead_tilde,    dead_circumflex	]	};
     key <AD12> {	[     dead_acute,     dead_grave 	]	};
 };
 
-partial alphanumeric_keys 
+partial alphanumeric_keys
 xkb_symbols "mac_nodeadkeys" {
+
     include "pt(mac)"
     name[Group1]= "Portuguese (Macintosh, eliminate dead keys)";
 
@@ -176,6 +174,7 @@ xkb_symbols "nativo" {
 //
 partial alphanumeric_keys
 xkb_symbols "nativo-us" {
+
     include "pt(nativo)"
 
     name[Group1]="Portuguese (Nativo for US keyboards)";
@@ -192,6 +191,7 @@ xkb_symbols "nativo-us" {
 //
 partial alphanumeric_keys
 xkb_symbols "nativo-epo" {
+
     include "pt(nativo)"
 
     name[Group1]="Esperanto (Portugal, Nativo)";