[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: xkb-data: Help needed for Macintosh keyboards



On Tue, Aug 29, 2006 at 01:26:09PM +0200, Gabriel Paubert wrote:
> Another point, the es layout for Macintosh is actually 
> latin american. Apple makes both es and latin american
> and they are very different: simply look at the differences
> between latam and es in the symbols directory.

There is indeed an old bugreport upstream
  https://bugs.freedesktop.org/show_bug.cgi?id=1576
which contains a patch.  Can you please test the attached
patch?  The "es" layout is renamed into "latam" and keys 1
and 2 are modified, and a new "es" layout is created for
Spain.

Denis
--- symbols.orig/macintosh_vndr/es
+++ symbols/macintosh_vndr/es
@@ -1,38 +1,6 @@
 
 partial default alphanumeric_keys 
 xkb_symbols "basic" {
-
-    // Describes the differences between a very simple mac_US
-    // keyboard and a very simple Spanish keybaord
-
-    include "latin"
+    include "es"
     name[Group1]= "Spain - Mac";
-
-    key <TLDE> {	[     bracketleft,    bracketright,        braceleft,      braceright	]	};
-    key <LSGT> {	[            less,         greater,      bracketleft,       braceleft	]	};
-    key <AE01> {	[               1,          exclam 	]	};
-    key <AE02> {	[               2,      exclamdown,               at,       oneeighth	]	};
-    key <AE03> {	[               3,      numbersign,    guillemotleft,  guillemotright	]	};
-    key <AE04> {	[               4,          dollar,              yen,     Icircumflex	]	};
-    key <AE05> {	[               5,         percent	]	};
-    key <AE06> {	[               6,           slash,        backslash,      Idiaeresis	]	};
-    key <AE07> {	[               7,       ampersand,              bar,          Iacute	]	};
-    key <AE08> {	[               8,        asterisk,           degree	]	};
-    key <AE09> {	[               9,       parenleft,         sterling,     Ocircumflex	]	};
-    key <AE10> {	[               0,      parenright     	]	};
-    key <AE11> {	[           minus,      underscore	]	};
-    key <AE12> {	[           equal,            plus,        plusminus	]	};
-    key <AD11> {	[      dead_grave,          degree 	]	};
-    key <AD12> {	[      dead_acute,  dead_diaeresis,              bar	]	};
-
-    key <AB08> {	[           comma,    questiondown   	]	};
-    key <AB09> {	[          period,        question     	]	};
-    key <AB10> {	[        ccedilla,        Ccedilla     	]	};
-    key	<AC10> {	[	   ntilde,          Ntilde,       asciitilde, dead_doubleacute	]	};
-    key <AC11> {	[       semicolon,    	     colon 	]	};
-    key <BKSL> {	[      apostrophe,        quotedbl	]	};
-
-    // End alphanumeric section
-
-    include "level3(ralt_switch)"
 };
--- /dev/null
+++ symbols/macintosh_vndr/latam
@@ -0,0 +1,38 @@
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple Spanish keybaord
+
+    include "latin"
+    name[Group1]= "Latin American - Mac";
+
+    key <TLDE> {	[     bracketleft,    bracketright,        braceleft,      braceright	]	};
+    key <LSGT> {	[            less,         greater,      bracketleft,       braceleft	]	};
+    key <AE01> {	[               1,      exclamdown 	]	};
+    key <AE02> {	[               2,          exclam,               at,       oneeighth	]	};
+    key <AE03> {	[               3,      numbersign,    guillemotleft,  guillemotright	]	};
+    key <AE04> {	[               4,          dollar,              yen,     Icircumflex	]	};
+    key <AE05> {	[               5,         percent	]	};
+    key <AE06> {	[               6,           slash,        backslash,      Idiaeresis	]	};
+    key <AE07> {	[               7,       ampersand,              bar,          Iacute	]	};
+    key <AE08> {	[               8,        asterisk,           degree	]	};
+    key <AE09> {	[               9,       parenleft,         sterling,     Ocircumflex	]	};
+    key <AE10> {	[               0,      parenright     	]	};
+    key <AE11> {	[           minus,      underscore	]	};
+    key <AE12> {	[           equal,            plus,        plusminus	]	};
+    key <AD11> {	[      dead_grave,          degree 	]	};
+    key <AD12> {	[      dead_acute,  dead_diaeresis,              bar	]	};
+
+    key <AB08> {	[           comma,    questiondown   	]	};
+    key <AB09> {	[          period,        question     	]	};
+    key <AB10> {	[        ccedilla,        Ccedilla     	]	};
+    key	<AC10> {	[	   ntilde,          Ntilde,       asciitilde, dead_doubleacute	]	};
+    key <AC11> {	[       semicolon,    	     colon 	]	};
+    key <BKSL> {	[      apostrophe,        quotedbl	]	};
+
+    // End alphanumeric section
+
+    include "level3(ralt_switch)"
+};
--- rules.orig/base	2006-09-23 01:18:22.000000000 +0200
+++ rules/base	2006-09-24 00:13:29.000000000 +0200
@@ -27,7 +27,7 @@
 ! $maclaptop = ibook powerbook macbook78 macbook79
 ! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79
 
-! $macvendorlayouts = ch de dk es fi fr gb is it nl no pt se us
+! $macvendorlayouts = ch de dk es fi fr gb is it latam nl no pt se us
 
 ! $azerty = be fr
 ! $qwertz = al cz de hr hu ro si sk 

Reply to: