Merged origin/release (checked in because wanted to merge new stuff)

1 files changed, 51 insertions, 0 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/ara b/xorg-server/xkeyboard-config/symbols/ara
index 9c1d57e09..a79a84ab6 100644
--- a/xorg-server/xkeyboard-config/symbols/ara
+++ b/xorg-server/xkeyboard-config/symbols/ara
@@ -283,6 +283,57 @@ xkb_symbols "olpc" {
     include "group(olpc)"
 };
 
+partial alphanumeric_keys
+xkb_symbols "mac" {
+    
+    //This is a layout that is compatible with macbooks
+
+    include "ara(digits)"
+    name[Group1]= "Arabic (Macintosh)";
+    
+    key <AE11> {  [            minus,      underscore      ]     };
+    key <AE12> {  [            equal,            plus      ]     };
+    
+    key <TLDE> {  [       VoidSymbol,      VoidSymbol      ]	 };
+    key <AD03> {  [      Arabic_theh,     Arabic_kasra     ]     };
+    key <AD04> {  [       Arabic_qaf,     Arabic_kasratan  ]     };
+    key <AD05> {  [       Arabic_feh,     Arabic_damma     ]     };
+    key <AD06> {  [     Arabic_ghain,     Arabic_dammatan  ]     };
+    key <AD07> {  [       Arabic_ain,     Arabic_sukun     ]     };
+    key <AD08> {  [        Arabic_ha,     Arabic_shadda    ]     };
+    key <AD09> {  [      Arabic_khah,     bracketright     ]     };
+    key <AD10> {  [       Arabic_hah,     bracketleft      ]     };
+    key <AD11> {  [      Arabic_jeem,     braceright        ]     };
+    key <AD12> {  [Arabic_tehmarbuta,     braceleft       ]     };
+    
+    key <AC01> {  [    Arabic_sheen,     guillemotright     ]     };
+    key <AC02> {  [     Arabic_seen,     guillemotleft    ]     };
+    key <AC03> {  [      Arabic_yeh,     Arabic_alefmaksura]     };
+    key <AC04> {  [      Arabic_beh,     VoidSymbol        ]     };
+    key <AC05> {  [      Arabic_lam,     VoidSymbol        ]     };
+    key <AC06> {  [     Arabic_alef,   Arabic_maddaonalef  ]     };
+    key <AC07> {  [      Arabic_teh,     VoidSymbol        ]     };
+    key <AC08> {  [     Arabic_noon,     VoidSymbol        ]     };
+    key <AC09> {  [     Arabic_meem,     VoidSymbol        ]     };
+    key <AC10> {  [      Arabic_kaf,            colon      ]     };
+    key <AC11> {  [      Arabic_semicolon,      quotedbl   ]     };
+    
+    key <BKSL> {  [       backslash,             bar       ]     };
+    
+    key <LSGT> {  [   Arabic_tatweel,     VoidSymbol               ]     };
+    key <AB01> {  [       Arabic_zah,     VoidSymbol               ]     };
+    key <AB02> {  [       Arabic_tah,     VoidSymbol               ]     };
+    key <AB03> {  [      Arabic_thal,     Arabic_hamzaonyeh        ]     };
+    key <AB04> {  [       Arabic_dal,     Arabic_hamza             ]     };
+    key <AB05> {  [      Arabic_zain,     Arabic_hamzaonalef       ]     };
+    key <AB06> {  [        Arabic_ra,     Arabic_hamzaunderalef    ]     };
+    key <AB07> {  [       Arabic_waw,     Arabic_hamzaonwaw        ]     };
+    key <AB08> {  [     Arabic_comma,     greater                     ]     };
+    key <AB09> {  [           period,     less                  ]     };
+    key <AB10> {  [            slash,     Arabic_question_mark     ]     };
+    
+};
+
 // EXTRAS:
 
 partial alphanumeric_keys