Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013

Conflicts:
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.c
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdri.c
	xorg-server/glx/glxext.c
	xorg-server/glx/glxext.h
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_reqsize.c
	xorg-server/glx/indirect_reqsize.h
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.c
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_texture_compression.c
	xorg-server/glx/render2.c
	xorg-server/glx/render2swap.c

2 files changed, 131 insertions, 156 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/br b/xorg-server/xkeyboard-config/symbols/br
index b75ffc98c..85f5f5522 100644
--- a/xorg-server/xkeyboard-config/symbols/br
+++ b/xorg-server/xkeyboard-config/symbols/br
@@ -1,45 +1,40 @@
-//
-// 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)";
 
-    key <AE02>	{ [         2,         at,  twosuperior,      onehalf ]	};
-    key <AE03>	{ [         3, numbersign, threesuperior, threequarters ] };
-    key <AE04>	{ [         4,     dollar,     sterling,   onequarter ]	};
-    key <AE05>	{ [         5,    percent,         cent, threeeighths ]	};
-    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 <AD03>	{ [         e,          E,     EuroSign,     EuroSign ]	};
-    key <AD04>	{ [         r,          R,   registered,   registered ]	};
-    key <AD11>	{ [dead_acute, dead_grave,        acute,        grave ]	};
-    key <AD12>	{ [bracketleft,  braceleft, ordfeminine,  dead_macron ]	};
-
-    key <AC10>	{ [  ccedilla,   Ccedilla,  dead_acute, dead_doubleacute] };
-    key <AC11>	{ [dead_tilde, dead_circumflex, asciitilde, asciicircum ] };
-    key <BKSL>  { [bracketright, braceright,  masculine,    masculine   ] };
-
-    key <TLDE>	{ [apostrophe,   quotedbl,      notsign,      notsign ]	};
-
-    key <LSGT>	{ [ backslash,        bar,    masculine,   dead_breve ]	};
-    key <AB03>	{ [         c,          C,    copyright,    copyright ]	};
-    key <AB07>  { [         m,          M,           mu,           mu ] };
-    key <AB10>	{ [ semicolon,    colon, dead_belowdot, dead_abovedot ]	};
-
-// ABNT-2 keyboard has this special key
-
-    key <AB11>	{ [     slash,   question,       degree, questiondown ]	};
+    key <TLDE> { [   apostrophe,       quotedbl,       notsign,         notsign ] };
+    key <AE02> { [            2,             at,   twosuperior,         onehalf ] };
+    key <AE03> { [            3,     numbersign, threesuperior,   threequarters ] };
+    key <AE04> { [            4,         dollar,      sterling,      onequarter ] };
+    key <AE05> { [            5,        percent,          cent,    threeeighths ] };
+    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 <AD03> { [            e,              E,      EuroSign,        EuroSign ] };
+    key <AD04> { [            r,              R,    registered,      registered ] };
+    key <AD11> { [   dead_acute,     dead_grave,         acute,           grave ] };
+    key <AD12> { [  bracketleft,      braceleft,   ordfeminine,     dead_macron ] };
+    key <BKSL> { [ bracketright,     braceright,     masculine,       masculine ] };
+
+    key <AC10> { [     ccedilla,       Ccedilla,    dead_acute,dead_doubleacute ] };
+    key <AC11> { [   dead_tilde,dead_circumflex,    asciitilde,     asciicircum ] };
+
+    key <LSGT> { [    backslash,            bar,     masculine,      dead_breve ] };
+    key <AB03> { [            c,              C,     copyright,       copyright ] };
+    key <AB07> { [            m,              M,            mu,              mu ] };
+    key <AB10> { [    semicolon,          colon, dead_belowdot,   dead_abovedot ] };
+
+    // The ABNT-2 keyboard has this special key:
+    key <AB11> { [        slash,       question,        degree,    questiondown ] };
 
     modifier_map Mod3   { Scroll_Lock };
 
@@ -51,27 +46,27 @@ 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 ]	};
-    key <AD11>	{ [apostrophe,      grave ]	};
-    key <AC10>	{ [  ccedilla,   Ccedilla,        acute,  doubleacute ]	};
-    key <AC11>	{ [asciitilde, asciicircum ]	};
-    key <AB10>	{ [ semicolon,      colon, dead_belowdot,    abovedot ]	};
+    key <AE06> { [            6,      diaeresis,       notsign,         notsign ] };
+    key <AD11> { [   apostrophe,          grave                                 ] };
+    key <AC10> { [     ccedilla,       Ccedilla,         acute,     doubleacute ] };
+    key <AC11> { [   asciitilde,    asciicircum                                 ] };
+    key <AB10> { [    semicolon,          colon, dead_belowdot,        abovedot ] };
 };
 
 
-// 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 ] };
+    key <RCTL> { [        slash,       question,        degree,    questiondown ] };
 };
 
 
@@ -81,37 +76,36 @@ xkb_symbols "olpc" {
     include "us(basic)"
     name[Group1]="Portuguese (Brazil)";
 
-    key <TLDE> { [   apostrophe,       quotedbl                                ] };
-
-    key <AE01> { [           1,          exclam,   onesuperior                 ] };
-    key <AE02> { [           2,              at,   twosuperior                 ] };
-    key <AE03> { [           3,      numbersign, threesuperior                 ] };
-    key <AE04> { [           4,          dollar,      sterling                 ] };
-    key <AE05> { [           5,         percent,          cent                 ] };
-    key <AE06> { [           6,  dead_diaeresis,       notsign                 ] };
-    key <AE12>  { [       equal,           plus,       section                 ] };
-
-    key <AD03> { [            e,              E,      EuroSign                 ] };
-    key <AD11> { [   dead_acute,      dead_grave,        acute,          grave ] };
+    key <TLDE> { [   apostrophe,        quotedbl                                ] };
+    key <AE01> { [            1,          exclam,   onesuperior                 ] };
+    key <AE02> { [            2,              at,   twosuperior                 ] };
+    key <AE03> { [            3,      numbersign, threesuperior                 ] };
+    key <AE04> { [            4,          dollar,      sterling                 ] };
+    key <AE05> { [            5,         percent,          cent                 ] };
+    key <AE06> { [            6,  dead_diaeresis,       notsign                 ] };
+    key <AE12> { [        equal,            plus,       section                 ] };
+
+    key <AD03> { [            e,               E,      EuroSign                 ] };
+    key <AD11> { [   dead_acute,      dead_grave,         acute,          grave ] };
     key <AD12> { [  bracketleft,       braceleft,     0x10000AA                 ] };
+    key <BKSL> { [ bracketright,      braceright,     0x10000BA                 ] };
 
-    key <AC10> { [     ccedilla,       Ccedilla                                ] };
-    key <AC11> { [   dead_tilde, dead_circumflex                               ] };
-    key <BKSL> { [ bracketright,      braceright,     0x10000BA                        ] };
+    key <AC10> { [     ccedilla,        Ccedilla                                ] };
+    key <AC11> { [   dead_tilde, dead_circumflex                                ] };
 
-    key <AB01> { [            z,              Z,           bar                 ] };
-    key <AB03> { [            c,              C,     0x10020A2                 ] };
-    key <AB09> { [       period,        greater,     backslash                 ] };
+    key <AB01> { [            z,               Z,           bar                 ] };
+    key <AB03> { [            c,               C,     0x10020A2                 ] };
+    key <AB09> { [       period,         greater,     backslash                 ] };
     key <AB10> { [    semicolon,           colon                                ] };
 
-    key <I219> { [        slash,       question,        degree, ISO_Next_Group ] };
+    key <I219> { [        slash,        question,        degree, ISO_Next_Group ] };
 
     include "level3(ralt_switch)"
 };
 
 
 //
-// Brazilian Dvorak keyboard                               2005-04-18
+// Brazilian Dvorak layout                                 2005-04-18
 // "Teclado Simplificado Brasileiro" ou "Dvorak Brasileiro"
 //
 // Heitor Moraes    heitor.moraes@gmail.com
@@ -146,7 +140,7 @@ xkb_symbols "dvorak" {
     key <AD03> { [       period,         greater,           0x01002022,   periodcentered ] };
     key <AD04> { [            p,               P,                thorn,            THORN ] };
     key <AD05> { [            y,               Y,                  yen,              yen ] };
-    key <AD06> { [            f,               F,  leftdoublequotemark, leftsinglequotemark ] };
+    key <AD06> { [            f,               F,  leftdoublequotemark,  leftsinglequotemark ] };
     key <AD07> { [            g,               G, rightdoublequotemark, rightsinglequotemark ] };
     key <AD08> { [            c,               C,              uparrow,        copyright ] };
     key <AD09> { [            r,               R,           registered,       registered ] };
@@ -189,21 +183,19 @@ xkb_symbols "dvorak" {
 
 // Configures the use of the AltGr key
     include "level3(ralt_switch)"
-
 };
 
 
 //
-// Teclado Nativo Brasileiro                               2005-07-19
-// Brazilian Nativo Keyboard
-//      This is a Dvorak-based layout, designed for the Portuguese language
+// Brazilian Nativo layout.
+//     This is a Dvorak-based layout, designed for the Portuguese language.
 //
-// Ari Caldeira     ari@tecladobrasileiro.com.br
+// Ari Caldeira    <ari@tecladobrasileiro.com.br>    2005-07-19
 //
 partial alphanumeric_keys
 xkb_symbols "nativo" {
 
-    name[Group1]="Portuguese (Brazil, nativo)";
+    name[Group1]="Portuguese (Brazil, Nativo)";
 
 // Numeric row
     key <TLDE> { [        equal,            plus,              section,        plusminus ] };
@@ -256,8 +248,8 @@ xkb_symbols "nativo" {
     key <AB04> { [            b,               B,        guillemotleft,       0x01002039 ] };
     key <AB05> { [            k,               K,       guillemotright,       0x0100203A ] };
     key <AB06> { [            q,               Q,           0x01000259,       0x0100018F ] };
-    key <AB07> { [            v,               V,   doublelowquotemark, singlelowquotemark ] };
-    key <AB08> { [            g,               G,  leftdoublequotemark, leftsinglequotemark ] };
+    key <AB07> { [            v,               V,   doublelowquotemark,   singlelowquotemark ] };
+    key <AB08> { [            g,               G,  leftdoublequotemark,  leftsinglequotemark ] };
     key <AB09> { [            f,               F, rightdoublequotemark, rightsinglequotemark ] };
     key <AB10> { [            z,               Z,           0x0100201F,       0x0100201B ] };
     key <AB11> { [    backslash,             bar,             currency,        brokenbar ] };
@@ -269,51 +261,45 @@ xkb_symbols "nativo" {
 
 // Configures the use of the AltGr key
     include "level3(ralt_switch)"
-
 };
 
 
 //
-// Teclado Nativo Brasileiro para o teclado estadunidense  2005-07-19
-// Brazilian Nativo Keyboard for USA keyboards
+// Brazilian Nativo layout for US keyboards.
 //
-// Ari Caldeira     ari@tecladobrasileiro.com.br
+// Ari Caldeira    <ari@tecladobrasileiro.com.br>    2005-07-19
 //
 partial alphanumeric_keys
 xkb_symbols "nativo-us" {
+
     include "br(nativo)"
 
-    name[Group1]="Portuguese (Brazil, nativo for US keyboards)";
+    name[Group1]="Portuguese (Brazil, Nativo for US keyboards)";
 
-// Lower row
     key <AB01> { [            y,               Y,              ccedilla,        Ccedilla ] };
     key <AB02> { [    semicolon,           colon,             backslash,             bar ] };
-
 };
 
 
 //
-// Teclado Nativo Brasileiro para digitacao em Esperanto   2005-07-19
-// Brazilian Nativo Keyboard for typing Esperanto
+// Brazilian Nativo layout for typing Esperanto.
 //
-// Ari Caldeira     ari@tecladobrasileiro.com.br
+// Ari Caldeira    <ari@tecladobrasileiro.com.br>    2005-07-19
 //
 partial alphanumeric_keys
 xkb_symbols "nativo-epo" {
+
     include "br(nativo)"
 
-    name[Group1]="Portuguese (Brazil, nativo for Esperanto)";
+    name[Group1]="Esperanto (Brazil, Nativo)";
 
-// Upper row Esperanto
     key <AD04> { [            h,               H,          hcircumflex,      Hcircumflex ] };
     key <AD05> { [  ccircumflex,     Ccircumflex,                    x,                X ] };
     key <AD06> { [       ubreve,          Ubreve,                    w,                W ] };
 
-// Lower row Esperanto
     key <AB01> { [  jcircumflex,     Jcircumflex,                    y,                Y ] };
     key <AB02> { [  scircumflex,     Scircumflex,             ccedilla,         Ccedilla ] };
     key <AB06> { [  gcircumflex,     Gcircumflex,                    q,                Q ] };
-
 };
 
 // EXTRAS:
diff --git a/xorg-server/xkeyboard-config/symbols/pt b/xorg-server/xkeyboard-config/symbols/pt
index db3dde907..9a6cffc57 100644
--- a/xorg-server/xkeyboard-config/symbols/pt
+++ b/xorg-server/xkeyboard-config/symbols/pt
@@ -1,26 +1,23 @@
-// based on a keyboard map from an 'xkb/symbols/pt' file
-
 default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin(type4)"
-
     name[Group1]="Portuguese";
 
-    key <LSGT>  { [      less,    greater,    backslash,    backslash ] };
-    key <AE03>	{ [         3, numbersign,     sterling,     sterling ]	};
-    key <AE04>	{ [         4,     dollar,      section,       dollar ]	};
-    key <AE11>	{ [apostrophe,   question,    backslash, questiondown ]	};
-    key <AE12>	{ [guillemotleft, guillemotright, dead_cedilla, dead_ogonek ] };
+    key <TLDE> { [     backslash,             bar,        notsign,          notsign ] };
+    key <AE03> { [             3,      numbersign,       sterling,         sterling ] };
+    key <AE04> { [             4,          dollar,        section,           dollar ] };
+    key <AE11> { [    apostrophe,        question,      backslash,     questiondown ] };
+    key <AE12> { [ guillemotleft,  guillemotright,   dead_cedilla,      dead_ogonek ] };
 
-    key <AD11>	{ [      plus,   asterisk, dead_diaeresis, dead_abovering ] };
-    key <AD12>	{ [dead_acute, dead_grave,   dead_tilde,  dead_macron ]	};
+    key <AD11> { [          plus,        asterisk, dead_diaeresis,   dead_abovering ] };
+    key <AD12> { [    dead_acute,      dead_grave,     dead_tilde,      dead_macron ] };
+    key <BKSL> { [    dead_tilde, dead_circumflex,     dead_grave,       dead_breve ] };
 
-    key <AC10>	{ [  ccedilla,   Ccedilla,   dead_acute, dead_doubleacute ] };
-    key <AC11>	{ [ masculine, ordfeminine, dead_circumflex,   dead_caron ] };
-    key <TLDE>	{ [ backslash,        bar,      notsign,      notsign ]	};
+    key <AC10> { [      ccedilla,        Ccedilla,     dead_acute, dead_doubleacute ] };
+    key <AC11> { [     masculine,     ordfeminine,dead_circumflex,       dead_caron ] };
 
-    key <BKSL>	{ [dead_tilde, dead_circumflex, dead_grave, dead_breve]	};
+    key <LSGT> { [          less,         greater,      backslash,        backslash ] };
 
     include "level3(ralt_switch)"
 };
@@ -28,81 +25,79 @@ 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 ]	};
-    key <AD12>	{ [dead_acute, dead_grave ]	};
+    key <AD11> { [          plus,        asterisk, dead_diaeresis,   dead_diaeresis ] };
+    key <AD12> { [    dead_acute,      dead_grave                                   ] };
+    key <BKSL> { [    dead_tilde, dead_circumflex                                   ] };
 };
 
 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 ]	};
-    key <AD11>	{ [      plus,   asterisk,     quotedbl,     quotedbl ]	};
-    key <AD12>	{ [     acute,      grave ]	};
-    key <AC10>	{ [  ccedilla,   Ccedilla,        acute,  doubleacute ]	};
-    key <AC11>	{ [ masculine, ordfeminine, asciicircum,        caron ]	};
-    key <BKSL>	{ [asciitilde, asciicircum ]	};
-    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
+    key <AE12> { [ guillemotleft,  guillemotright,        cedilla,           ogonek ] };
+    key <AD11> { [          plus,        asterisk,       quotedbl,         quotedbl ] };
+    key <AD12> { [         acute,           grave                                   ] };
+    key <BKSL> { [    asciitilde,     asciicircum                                   ] };
+    key <AC10> { [      ccedilla,        Ccedilla,          acute,      doubleacute ] };
+    key <AC11> { [     masculine,     ordfeminine,    asciicircum,            caron ] };
+    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"
     name[Group1]= "Portuguese (Macintosh)";
 
-    key <AE06>	{ [         6,  ampersand, threequarters, fiveeighths ]	};
-    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 <BKSL>	{ [ backslash,        bar,   dead_grave,   dead_breve ]	};
-    key <TLDE>	{ [     grave, asciitilde,      notsign,      notsign ]	};
+    key <TLDE> { [         grave,      asciitilde,        notsign,          notsign ] };
+    key <AE06> { [             6,       ampersand,  threequarters,      fiveeighths ] };
+    key <AE08> { [             8,       parenleft,    bracketleft,        braceleft ] };
+    key <AE09> { [             9,      parenright,   bracketright,       braceright ] };
+    key <AE12> { [          plus,        asterisk, dead_diaeresis                   ] };
+    key <AD11> { [     masculine,     ordfeminine                                   ] };
+    key <BKSL> { [     backslash,             bar,     dead_grave,       dead_breve ] };
+    key <AC11> { [    dead_tilde, dead_circumflex                                   ] };
 };
 
-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 <AC11> {	[     dead_tilde,    dead_circumflex	]	};
-    key <AD12> {	[     dead_acute,     dead_grave 	]	};
+
+    key <AE12> { [          plus,        asterisk, dead_diaeresis,   dead_diaeresis ] };
+    key <AD12> { [    dead_acute,      dead_grave                                   ] };
+    key <AC11> { [    dead_tilde, dead_circumflex                                   ] };
 };
 
-partial alphanumeric_keys 
+partial alphanumeric_keys
 xkb_symbols "mac_nodeadkeys" {
+
     include "pt(mac)"
     name[Group1]= "Portuguese (Macintosh, eliminate dead keys)";
 
-    key <AE12> {	[	     plus,        asterisk, 	 quotedbl,        quotedbl      ]	};
-    key <AC11> {	[      asciitilde,     asciicircum	]	};
-    key <AD12> {	[	    acute,           grave 	]	};
+    key <AE12> { [          plus,       asterisk,         quotedbl,        quotedbl ] };
+    key <AD12> { [         acute,          grave                                    ] };
+    key <AC11> { [    asciitilde,    asciicircum                                    ] };
 };
 
 
 //
-// Teclado Nativo Portugues                                2005-07-19
-// Portuguese Nativo Keyboard
-//      This is a Dvorak-based layout, designed for the Portuguese language
+// Portuguese Nativo layout.
+//     This is a Dvorak-based layout, designed for the Portuguese language.
 //
-// Ari Caldeira     ari@tecladobrasileiro.com.br
+// Ari Caldeira    <ari@tecladobrasileiro.com.br>    2005-07-19
 //
 partial alphanumeric_keys
 xkb_symbols "nativo" {
@@ -160,8 +155,8 @@ xkb_symbols "nativo" {
     key <AB04> { [            b,               B,           apostrophe,         quotedbl ] };
     key <AB05> { [            k,               K,             currency,        brokenbar ] };
     key <AB06> { [            q,               Q,           0x01000259,       0x0100018F ] };
-    key <AB07> { [            v,               V,   doublelowquotemark, singlelowquotemark ] };
-    key <AB08> { [            g,               G,  leftdoublequotemark, leftsinglequotemark ] };
+    key <AB07> { [            v,               V,   doublelowquotemark,   singlelowquotemark ] };
+    key <AB08> { [            g,               G,  leftdoublequotemark,  leftsinglequotemark ] };
     key <AB09> { [            f,               F, rightdoublequotemark, rightsinglequotemark ] };
     key <AB10> { [            z,               Z,           0x0100201F,       0x0100201B ] };
 
@@ -169,51 +164,45 @@ xkb_symbols "nativo" {
 
 // Configures the use of the AltGr key
     include "level3(ralt_switch)"
-
 };
 
 
 //
-// Teclado Nativo Portugues para o teclado estadunidense   2005-07-19
-// Portuguese Nativo Keyboard for USA keyboards
+// Portuguese Nativo layout for US keyboards.
 //
-// Ari Caldeira     ari@tecladobrasileiro.com.br
+// Ari Caldeira    <ari@tecladobrasileiro.com.br>    2005-07-19
 //
 partial alphanumeric_keys
 xkb_symbols "nativo-us" {
+
     include "pt(nativo)"
 
     name[Group1]="Portuguese (Nativo for US keyboards)";
 
-// Lower row
     key <AB01> { [            y,               Y,              ccedilla,        Ccedilla ] };
     key <AB02> { [ guillemotleft, guillemotright,           0x01002039,       0x0100203A ] };
-
 };
 
 
 //
-// Teclado Nativo Portugues para digitacao em Esperanto    2005-07-19
-// Portuguese Nativo Keyboard for typing Esperanto
+// Portuguese Nativo layout for typing Esperanto.
 //
-// Ari Caldeira     ari@tecladobrasileiro.com.br
+// Ari Caldeira    <ari@tecladobrasileiro.com.br>    2005-07-19
 //
 partial alphanumeric_keys
 xkb_symbols "nativo-epo" {
+
     include "pt(nativo)"
 
     name[Group1]="Esperanto (Portugal, Nativo)";
 
-// Upper row Esperanto
     key <AD04> { [            h,               H,          hcircumflex,      Hcircumflex ] };
     key <AD05> { [  ccircumflex,     Ccircumflex,                    x,                X ] };
     key <AD06> { [       ubreve,          Ubreve,                    w,                W ] };
 
-// Lower row Esperanto
     key <AB01> { [  jcircumflex,     Jcircumflex,                    y,                Y ] };
     key <AB02> { [  scircumflex,     Scircumflex,             ccedilla,         Ccedilla ] };
     key <AB06> { [  gcircumflex,     Gcircumflex,                    q,                Q ] };
-
 };
 
 // EXTRAS: