From a12cf779e828ec70da714832e1eaa730119fe10c Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 30 Sep 2013 08:58:27 +0200
Subject: git update fontconfig mesa libXau pixman xkeyboard-config 30 Sep 2013

xkeyboard-config commit fe5c2416314fd1df423c8ce53cac2d28b00420e7
libXau           commit 304a11be4727c5a7feeb2501e8e001466f8ce84e
pixman           commit b513b3dffe979056dbbbdc8e0659f8018c51c5f5
fontconfig       commit 9161ed1e4a3f4afaee6dbcfc0b84a279ad99b397
mesa             commit 868791f0baa0b51f4255c839448d3ca87ab1aa35
---
 xorg-server/xkeyboard-config/symbols/am | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

(limited to 'xorg-server/xkeyboard-config/symbols/am')

diff --git a/xorg-server/xkeyboard-config/symbols/am b/xorg-server/xkeyboard-config/symbols/am
index abe6e1270..c3be81db0 100644
--- a/xorg-server/xkeyboard-config/symbols/am
+++ b/xorg-server/xkeyboard-config/symbols/am
@@ -5,10 +5,9 @@ xkb_symbols "basic" {
 
     name[Group1]= "Armenian";
 
-    // Alphanumeric section
-    key <TLDE> {	[ 0x100055d, 0x100055c	]	};
-    key	<LSGT> {	[  question,  0x100058a	]	};
-    key <BKSL> {        [ guillemotright, guillemotleft ] };
+    key <TLDE> {	[ 0x100055d,  0x100055c	]	};
+    key <LSGT> {	[  question,  0x100058a	]	};
+    key <BKSL> {	[ guillemotright, guillemotleft]};
 
     key <AE01> {	[ 0x1000586,  0x1000556	]	};
     key <AE02> {	[ 0x1000571,  0x1000541	]	};
@@ -23,7 +22,6 @@ xkb_symbols "basic" {
     key <AE11> {	[ 0x1000567,  0x1000537	]	};
     key <AE12> {	[ 0x1000572,  0x1000542	]	};
 
-
     key <AD01> {	[ 0x1000573, 0x1000543	]       };
     key <AD02> {	[ 0x1000583, 0x1000553	]	};
     key <AD03> {	[ 0x1000562, 0x1000532	]       };
@@ -152,23 +150,22 @@ xkb_symbols "eastern" {
 
     // This is the closer phonetic transliteration for Eastern Armenian
     // than the Windows XP layout for Eastern Armenian, which seems
-    // to have contained a bug, with the reversal of 'g' for keh and 'c' for gim
-    // Also, AE01 (the colon) has been replaced with the Armenian_full_stop and
-    // capital AE07 (ken) with the Armenian ligature ew
+    // to have contained a bug, with the reversal of 'g' for keh and 'c' for gim.
+    // Also, AE01 (the colon) has been replaced with the Armenian_full_stop,
+    // and capital AE07 (ken) with the Armenian ligature ew.
 
     key <TLDE> {	[ Armenian_separation_mark,  Armenian_exclam ]	};
-//  key <AE01> {	[ colon,  		KP_1 ]	};
-    key <AE01> {	[ Armenian_full_stop,  	KP_1 ]	};
+    key <AE01> {	[ Armenian_full_stop,  	KP_1 ]		};
     key <AE02> {	[ Armenian_dza,  	Armenian_DZA ]	};
     key <AE03> {	[ Armenian_hi,  	Armenian_HI ]	};
-    key <AE04> {	[ Armenian_accent,  	KP_3 ]       };
-    key <AE05> {	[ comma,  		KP_4 ]	};
-    key <AE06> {	[ minus,  		KP_9 ]	};
+    key <AE04> {	[ Armenian_accent,  	KP_3 ]		};
+    key <AE05> {	[ comma,  		KP_4 ]		};
+    key <AE06> {	[ minus,  		KP_9 ]		};
     key <AE07> {	[ period,  		Armenian_ligature_ew ]	};
     key <AE08> {	[ guillemotleft,  	parenleft ]	};
     key <AE09> {	[ guillemotright,  	parenright ]	};
     key <AE10> {	[ Armenian_o,  		Armenian_O ]	};
-    key <AE11> {	[ Armenian_ra,  	Armenian_RA ]       };
+    key <AE11> {	[ Armenian_ra,  	Armenian_RA ]	};
     key <AE12> {	[ Armenian_zhe,  	Armenian_ZHE ]	};
 
     key <LatQ> {	[ Armenian_khe,  	Armenian_KHE ]	};
@@ -204,8 +201,8 @@ xkb_symbols "eastern" {
     key <LatB> {	[ Armenian_ben,  	Armenian_BEN ]	};
     key <LatN> {	[ Armenian_nu,  	Armenian_NU ]	};
     key <LatM> {	[ Armenian_men,  	Armenian_MEN ]	};
-    key <AB08> {	[ Armenian_sha,  	Armenian_SHA ]       };
-    key <AB09> {	[ Armenian_ghat,  	Armenian_GHAT ]       };
+    key <AB08> {	[ Armenian_sha,  	Armenian_SHA ]	};
+    key <AB09> {	[ Armenian_ghat,  	Armenian_GHAT ]	};
     key <AB10> {	[ Armenian_tsa,  	Armenian_TSA ]	};
 
 };
-- 
cgit v1.2.3