missed part from b.fd.o#1576

7 files changed, 7 insertions, 36 deletions

diff --git a/symbols/macintosh_vndr/Makefile.am b/symbols/macintosh_vndr/Makefile.am
index e2375d6..d409eff 100644
--- a/symbols/macintosh_vndr/Makefile.am
+++ b/symbols/macintosh_vndr/Makefile.am
@@ -4,5 +4,5 @@ dist_symbols_DATA = \
 apple ch de dk \
 es fi fr \
 gb is it \
-nl no pt \
+latam nl no pt \
 se us
diff --git a/symbols/macintosh_vndr/dk b/symbols/macintosh_vndr/dk
index 79f3c8e..cbf2a81 100644
--- a/symbols/macintosh_vndr/dk
+++ b/symbols/macintosh_vndr/dk
@@ -29,7 +29,7 @@ xkb_symbols "basic" {
     key <AB10> {	[    minus,      underscore,           hyphen,          macron	]};
     key <AC01> {        [        a,               A,      ordfeminine,       masculine      ]};
     key <AC03> {        [        d,               D,              eth,             ETH      ]};
-    key <AD03> {        [        e,               E,         NoSymbol,            cent      ]};
+    key <AD03> {        [        e,               E,         EuroSign,            cent      ]};
     key <AD04> {        [        r,               R,       registered,        NoSymbol      ]};
     key <AD05> {        [        t,               T,            thorn,           THORN      ]};
     key <AD08> {        [        i,               I,         NoSymbol,        NoSymbol      ]};
diff --git a/symbols/macintosh_vndr/es b/symbols/macintosh_vndr/es
index f7112eb..61f1249 100644
--- a/symbols/macintosh_vndr/es
+++ b/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)"
 };
diff --git a/symbols/macintosh_vndr/it b/symbols/macintosh_vndr/it
index 21afcda..feadeb1 100644
--- a/symbols/macintosh_vndr/it
+++ b/symbols/macintosh_vndr/it
@@ -21,7 +21,7 @@ xkb_symbols "extended" {
 
     key <AD01> {	[           q,  Q 		]	};
     key <AD02> {	[	    z,  Z		]	};
-    key <AD03> {	[	    e,  E		]	};
+    key <AD03> {	[	    e,  E,     EuroSign		]	};
     key <AD04> {	[	    r,  R,   registered			] 	};
     key <AD05> {	[	    t,  T		]	};
     key <AD06> {	[	    y,  Y,       Uacute,	ydiaeresis      ] 	};
diff --git a/symbols/macintosh_vndr/no b/symbols/macintosh_vndr/no
index c264928..d8bf0d6 100644
--- a/symbols/macintosh_vndr/no
+++ b/symbols/macintosh_vndr/no
@@ -34,6 +34,7 @@ xkb_symbols "basic" {
 
     // End alphanumeric section
 
+    include "eurosign(e)"
     include "level3(ralt_switch)"
 };
 
diff --git a/symbols/macintosh_vndr/pt b/symbols/macintosh_vndr/pt
index db090f2..8f17857 100644
--- a/symbols/macintosh_vndr/pt
+++ b/symbols/macintosh_vndr/pt
@@ -33,6 +33,7 @@ xkb_symbols "basic" {
     key <AD12> {	[      dead_acute,      dead_grave 	]	};
     // End alphanumeric section
 
+    include "eurosign(e)"
     include "level3(ralt_switch)"
 };
 
diff --git a/symbols/macintosh_vndr/se b/symbols/macintosh_vndr/se
index 783748c..f46674a 100644
--- a/symbols/macintosh_vndr/se
+++ b/symbols/macintosh_vndr/se
@@ -34,6 +34,7 @@ xkb_symbols "basic" {
     key <LSGT> {        [            less,         greater,              bar,       brokenbar      ]       };
 
     include "keypad(comma)"
+    include "eurosign(e)"
     include "level3(ralt_switch)"
 };