From 3429569644e69f4359e880a45ded8780b14d0891 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Mon, 28 Oct 2013 12:16:05 +0200 Subject: [PATCH] symbols/{pt,br}: Adjusting some comments, whitespace and alignments. Signed-off-by: Benno Schulenberg --- symbols/br | 38 ++++++++++++++++++-------------------- symbols/pt | 28 ++++++++++++++-------------- 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 { [ 6, dead_diaeresis, notsign, diaeresis ] }; key { [ equal, plus, section, dead_ogonek ] }; - key { [ q, Q, slash, slash ] }; - key { [ w, W, question, question ] }; + key { [ q, Q, slash, slash ] }; + key { [ w, W, question, question ] }; key { [ e, E, EuroSign, EuroSign ] }; key { [ r, R, registered, registered ] }; key { [dead_acute, dead_grave, acute, grave ] }; @@ -37,8 +34,7 @@ xkb_symbols "abnt2" { key { [ m, M, mu, mu ] }; key { [ semicolon, colon, dead_belowdot, dead_abovedot ] }; -// ABNT-2 keyboard has this special key - + // The ABNT-2 keyboard has this special key: key { [ 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 { [ 6, diaeresis, notsign, notsign ] }; @@ -62,13 +58,13 @@ xkb_symbols "nodeadkeys" { }; -// ABNT2 Keyboard to IBM/Lenovo Thinkpads -// by Piter PUNK +// The ABNT2 keyboard on IBM/Lenovo Thinkpads, +// by Piter PUNK . // partial alphanumeric_keys xkb_symbols "thinkpad" { - include "br(abnt2)" // for consistent naming + include "br(abnt2)" name[Group1]="Portuguese (Brazil)"; key { [ slash, question, degree, questiondown ] }; @@ -89,20 +85,20 @@ xkb_symbols "olpc" { key { [ 4, dollar, sterling ] }; key { [ 5, percent, cent ] }; key { [ 6, dead_diaeresis, notsign ] }; - key { [ equal, plus, section ] }; + key { [ equal, plus, section ] }; key { [ e, E, EuroSign ] }; key { [ dead_acute, dead_grave, acute, grave ] }; - key { [ bracketleft, braceleft, 0x10000AA ] }; + key { [ bracketleft, braceleft, 0x10000AA ] }; key { [ ccedilla, Ccedilla ] }; key { [ dead_tilde, dead_circumflex ] }; - key { [ bracketright, braceright, 0x10000BA ] }; + key { [ bracketright, braceright, 0x10000BA ] }; key { [ z, Z, bar ] }; key { [ c, C, 0x10020A2 ] }; key { [ period, greater, backslash ] }; - key { [ semicolon, colon ] }; + key { [ semicolon, colon ] }; key { [ 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 { [ 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 { [plus, asterisk, dead_diaeresis, dead_diaeresis ] }; key { [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 { [guillemotleft, guillemotright, cedilla, ogonek ] }; @@ -56,9 +53,8 @@ xkb_symbols "nodeadkeys" { key { [ minus, underscore, dead_belowdot, abovedot ] }; }; -// mac version from Ricardo Cabral -// Copied from macintosh_vndr/pt -partial alphanumeric_keys +// Layout variant for Mac, by Ricardo Cabral . +partial alphanumeric_keys xkb_symbols "mac" { include "pt" @@ -68,24 +64,26 @@ xkb_symbols "mac" { key { [ 8, parenleft, bracketleft, braceleft ] }; key { [ 9, parenright, bracketright, braceright ] }; key { [ plus, asterisk, dead_diaeresis ] }; - key { [ dead_tilde, dead_circumflex ] }; key { [ masculine, ordfeminine ] }; + key { [ dead_tilde, dead_circumflex ] }; key { [ backslash, bar, dead_grave, dead_breve ] }; key { [ 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 { [ plus, asterisk, dead_diaeresis, dead_diaeresis ] }; + + key { [ plus, asterisk, dead_diaeresis, dead_diaeresis ] }; key { [ dead_tilde, dead_circumflex ] }; key { [ 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)"; -- 2.7.4