Index: xkb-data/rules/base.lists.part =================================================================== --- xkb-data.orig/rules/base.lists.part +++ xkb-data/rules/base.lists.part @@ -18,7 +18,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 Index: xkb-data/symbols/macintosh_vndr/Makefile.am =================================================================== --- xkb-data.orig/symbols/macintosh_vndr/Makefile.am +++ xkb-data/symbols/macintosh_vndr/Makefile.am @@ -4,5 +4,5 @@ apple ch de dk \ es fi fr \ gb is it \ -nl no pt \ +latam nl no pt \ se us Index: xkb-data/symbols/macintosh_vndr/dk =================================================================== --- xkb-data.orig/symbols/macintosh_vndr/dk +++ xkb-data/symbols/macintosh_vndr/dk @@ -29,7 +29,7 @@ key { [ minus, underscore, hyphen, macron ]}; key { [ a, A, ordfeminine, masculine ]}; key { [ d, D, eth, ETH ]}; - key { [ e, E, NoSymbol, cent ]}; + key { [ e, E, EuroSign, cent ]}; key { [ r, R, registered, NoSymbol ]}; key { [ t, T, thorn, THORN ]}; key { [ i, I, NoSymbol, NoSymbol ]}; Index: xkb-data/symbols/macintosh_vndr/es =================================================================== --- xkb-data.orig/symbols/macintosh_vndr/es +++ xkb-data/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 { [ bracketleft, bracketright, braceleft, braceright ] }; - key { [ less, greater, bracketleft, braceleft ] }; - key { [ 1, exclam ] }; - key { [ 2, exclamdown, at, oneeighth ] }; - key { [ 3, numbersign, guillemotleft, guillemotright ] }; - key { [ 4, dollar, yen, Icircumflex ] }; - key { [ 5, percent ] }; - key { [ 6, slash, backslash, Idiaeresis ] }; - key { [ 7, ampersand, bar, Iacute ] }; - key { [ 8, asterisk, degree ] }; - key { [ 9, parenleft, sterling, Ocircumflex ] }; - key { [ 0, parenright ] }; - key { [ minus, underscore ] }; - key { [ equal, plus, plusminus ] }; - key { [ dead_grave, degree ] }; - key { [ dead_acute, dead_diaeresis, bar ] }; - - key { [ comma, questiondown ] }; - key { [ period, question ] }; - key { [ ccedilla, Ccedilla ] }; - key { [ ntilde, Ntilde, asciitilde, dead_doubleacute ] }; - key { [ semicolon, colon ] }; - key { [ apostrophe, quotedbl ] }; - - // End alphanumeric section - - include "level3(ralt_switch)" }; Index: xkb-data/symbols/macintosh_vndr/it =================================================================== --- xkb-data.orig/symbols/macintosh_vndr/it +++ xkb-data/symbols/macintosh_vndr/it @@ -21,7 +21,7 @@ key { [ q, Q ] }; key { [ z, Z ] }; - key { [ e, E ] }; + key { [ e, E, EuroSign ] }; key { [ r, R, registered ] }; key { [ t, T ] }; key { [ y, Y, Uacute, ydiaeresis ] }; Index: xkb-data/symbols/macintosh_vndr/latam =================================================================== --- /dev/null +++ xkb-data/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 { [ bracketleft, bracketright, braceleft, braceright ] }; + key { [ less, greater, bracketleft, braceleft ] }; + key { [ 1, exclamdown ] }; + key { [ 2, exclam, at, oneeighth ] }; + key { [ 3, numbersign, guillemotleft, guillemotright ] }; + key { [ 4, dollar, yen, Icircumflex ] }; + key { [ 5, percent ] }; + key { [ 6, slash, backslash, Idiaeresis ] }; + key { [ 7, ampersand, bar, Iacute ] }; + key { [ 8, asterisk, degree ] }; + key { [ 9, parenleft, sterling, Ocircumflex ] }; + key { [ 0, parenright ] }; + key { [ minus, underscore ] }; + key { [ equal, plus, plusminus ] }; + key { [ dead_grave, degree ] }; + key { [ dead_acute, dead_diaeresis, bar ] }; + + key { [ comma, questiondown ] }; + key { [ period, question ] }; + key { [ ccedilla, Ccedilla ] }; + key { [ ntilde, Ntilde, asciitilde, dead_doubleacute ] }; + key { [ semicolon, colon ] }; + key { [ apostrophe, quotedbl ] }; + + // End alphanumeric section + + include "level3(ralt_switch)" +}; Index: xkb-data/symbols/macintosh_vndr/no =================================================================== --- xkb-data.orig/symbols/macintosh_vndr/no +++ xkb-data/symbols/macintosh_vndr/no @@ -34,6 +34,7 @@ // End alphanumeric section + include "eurosign(e)" include "level3(ralt_switch)" }; Index: xkb-data/symbols/macintosh_vndr/pt =================================================================== --- xkb-data.orig/symbols/macintosh_vndr/pt +++ xkb-data/symbols/macintosh_vndr/pt @@ -33,6 +33,7 @@ key { [ dead_acute, dead_grave ] }; // End alphanumeric section + include "eurosign(e)" include "level3(ralt_switch)" }; Index: xkb-data/symbols/macintosh_vndr/se =================================================================== --- xkb-data.orig/symbols/macintosh_vndr/se +++ xkb-data/symbols/macintosh_vndr/se @@ -34,6 +34,7 @@ key { [ less, greater, bar, brokenbar ] }; include "keypad(comma)" + include "eurosign(e)" include "level3(ralt_switch)" };