fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013

xserver          commit 902ff0b3497d202b86bf9a411e17db7b694d6eaa
xkeyboard-config commit 70bbf18d6cddb7271db1b2e042765ace3c4ac485
libX11           commit 6cb02b166361200da35ba14f52cd9aaa493eb0ea
glproto          commit aacc7a51b6161c765b04524e0d2ab31e5e586834
fontconfig       commit 525a135ccf53e4bf3363c3143d9cfdf15fba55ab
mesa             commit b16b3c8703f198ca0f025b730d582600df79c19c

1 files changed, 56 insertions, 67 deletions

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: