From 3744281b9ae8aa0ab86ceaee1afe8a603e3aeb2c Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 19 Nov 2012 10:16:38 +0100 Subject: dos -> unix --- .../symbols/macintosh_vndr/Makefile.am | 16 +- .../xkeyboard-config/symbols/macintosh_vndr/fr | 220 ++++++++++----------- .../xkeyboard-config/symbols/macintosh_vndr/jp | 70 +++---- 3 files changed, 153 insertions(+), 153 deletions(-) (limited to 'xorg-server/xkeyboard-config/symbols/macintosh_vndr') diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/Makefile.am index 1d43f40c2..f39662e4c 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/Makefile.am @@ -1,8 +1,8 @@ -symbolsdir = $(xkb_base)/symbols/macintosh_vndr - -dist_symbols_DATA = \ -apple ch de dk \ -fi fr \ -gb is it jp \ -latam nl no pt \ -se us +symbolsdir = $(xkb_base)/symbols/macintosh_vndr + +dist_symbols_DATA = \ +apple ch de dk \ +fi fr \ +gb is it jp \ +latam nl no pt \ +se us diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr index c76551d30..9a8f8de23 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr @@ -1,110 +1,110 @@ -// Marc.Shapiro@inria.fr 19-sep-1998 -// modifications : Etienne Herlent june 2000 -// adapted to the new input layer : -// Martin Costabel 3-jan-2001 -////////////////////////////////////////////////////////////////// -// Petites Modification le juillet 2005 par Bin Zhang : -// 1) La ligne 83 : remplacer les deux "VoidSymbol" par oe et OE -// 2) La ligne 89 : remplacer "VoidSymbol" par "EuroSign" -// ( 1) et 2) fonctionnent sous UTF-8, mais pas sous iso-8859-1. ) -// 3) Remplacer la ligne 148 par la ligne 149 pour que la touche Alt_L -// (la touche Apple-Pomme) fonctionne correctement sous Xorg, une idée -// motivée par http://www.linux-france.org/macintosh/clavier_gentoo.html -////////////////////////////////////////////////////////////////// -// This map is an almost-complete mapping of the standard French -// MacIntosh keyboard under Xwindows. I tried to remain as faithful -// as possible to the Mac meaning of each key. I did this entirely by -// hand and by intuition, relying on the Clavier (Keyboard?) Desktop -// Accessory for the Mac meaning of keys, and on reading keysymdef.h -// to intuit the corresponding X names. Lacking proper documentation, -// I may have made some mistakes. - -// Entries marked CHECK are particularly uncertain - -// Entries marked MISSING mark Mac characters for which I was unable -// to find a corresponding keysym. (Some for sure don't: e.g. the -// Apple mark and the oe/OE character; others I may have simply not -// found.) - -default -xkb_symbols "extended" { - - name[Group1]= "France - Mac"; - - key { [ Escape ] }; - - // Alphanumeric section - key { [ at, numbersign, periodcentered, Ydiaeresis ] }; - key { [ KP_Enter ] }; - key { [ ampersand, 1, VoidSymbol, dead_acute ] }; // MISSING: Apple - key { [ eacute, 2, ediaeresis, Eacute ] }; - key { [ quotedbl, 3, leftdoublequotemark, rightdoublequotemark ] }; - key { [ apostrophe, 4, leftsinglequotemark, rightsinglequotemark ] }; - key { [ parenleft, 5, braceleft, bracketleft ] }; - key { [ section, 6, paragraph, aring ] }; - key { [ egrave, 7, guillemotleft, guillemotright] }; - key { [ exclam, 8, exclamdown, Ucircumflex ] }; - key { [ ccedilla, 9, Ccedilla, Aacute ] }; - key { [ agrave, 0, oslash, Oslash ] }; - key { [ parenright, degree, braceright, bracketright ] }; - key { [ minus, underscore, emdash, endash ] }; - key { [ BackSpace, VoidSymbol, Delete, VoidSymbol ] }; - - key { [ Tab, ISO_Left_Tab ] }; - key { [ a, A, ae, AE ] }; - key { [ z, Z, Acircumflex, Aring ] }; - key { [ e, E, ecircumflex, Ecircumflex ] }; - key { [ r, R, registered, currency ] }; - key { [ t, T, dagger, trademark ] }; - key { [ y, Y, Uacute, Ydiaeresis ] }; - key { [ u, U, masculine, ordfeminine ] }; - key { [ i, I, icircumflex, idiaeresis ] }; - key { [ o, O, oe, OE ] }; - key { [ p, P, Greek_pi, Greek_PI ] }; - key { [dead_circumflex,dead_diaeresis,ocircumflex, Ocircumflex ] }; - key { [ dollar, asterisk, EuroSign, yen ] }; - key { [ Caps_Lock ] }; - key { [ q, Q, doubledagger, Greek_OMEGA ] }; - key { [ s, S, Ograve, Greek_SIGMA ] }; - key { [ d, D, Greek_delta, Greek_DELTA ] }; - key { [ f, F, VoidSymbol, periodcentered ] }; - key { [ g, G, VoidSymbol, VoidSymbol ] }; // MISSING: ligature fi,fl - key { [ h, H, Igrave, Icircumflex ] }; - key { [ j, J, Idiaeresis, Iacute ] }; - key { [ k, K, Egrave, Ediaeresis ] }; - key { [ l, L, notsign, bar ] }; - key { [ m, M, mu, Oacute ] }; - key { [ ugrave, percent, Ugrave, 0x1002030 ] }; - key { [ dead_grave, sterling, at, numbersign ] }; - key { [ Return ] }; - - key { [ less, greater, lessthanequal, greaterthanequal ] }; - key { [ w, W, guilsinglleft, guilsinglright ] }; // MISSING: half-guillemot (single angle bracket) - key { [ x, X, VoidSymbol, VoidSymbol ] }; // CHECK: similarequal; MISSING: extra-slanted slash - key { [ c, C, copyright, cent ] }; - key { [ v, V, diamond, radical ] }; // CHECK diamond - key { [ b, B, ssharp, integral ] }; - key { [ n, N, dead_tilde, asciitilde ] }; - key { [ comma, question, infinity, questiondown ] }; - key { [ semicolon, period, ellipsis, periodcentered ] }; - key { [ colon, slash, division, backslash ] }; - key { [ equal, plus, notequal, plusminus ] }; - - key { [ space, space, nobreakspace, nobreakspace ] }; - // End alphanumeric section - - include "level3(ralt_switch)" -}; - - - -xkb_symbols "nodeadkeys" { -include "macintosh_vndr/fr(extended)" - name[Group1]= "France - Mac, eliminate dead keys"; - - key { [ ampersand, 1, VoidSymbol, acute ] }; // MISSING: Apple - key { [asciicircum,diaeresis,ocircumflex, Ocircumflex ] }; - key { [ grave, sterling, at, numbersign ] }; - - key { [ n, N, asciitilde, dead_tilde ] }; -}; +// Marc.Shapiro@inria.fr 19-sep-1998 +// modifications : Etienne Herlent june 2000 +// adapted to the new input layer : +// Martin Costabel 3-jan-2001 +////////////////////////////////////////////////////////////////// +// Petites Modification le juillet 2005 par Bin Zhang : +// 1) La ligne 83 : remplacer les deux "VoidSymbol" par oe et OE +// 2) La ligne 89 : remplacer "VoidSymbol" par "EuroSign" +// ( 1) et 2) fonctionnent sous UTF-8, mais pas sous iso-8859-1. ) +// 3) Remplacer la ligne 148 par la ligne 149 pour que la touche Alt_L +// (la touche Apple-Pomme) fonctionne correctement sous Xorg, une idée +// motivée par http://www.linux-france.org/macintosh/clavier_gentoo.html +////////////////////////////////////////////////////////////////// +// This map is an almost-complete mapping of the standard French +// MacIntosh keyboard under Xwindows. I tried to remain as faithful +// as possible to the Mac meaning of each key. I did this entirely by +// hand and by intuition, relying on the Clavier (Keyboard?) Desktop +// Accessory for the Mac meaning of keys, and on reading keysymdef.h +// to intuit the corresponding X names. Lacking proper documentation, +// I may have made some mistakes. + +// Entries marked CHECK are particularly uncertain + +// Entries marked MISSING mark Mac characters for which I was unable +// to find a corresponding keysym. (Some for sure don't: e.g. the +// Apple mark and the oe/OE character; others I may have simply not +// found.) + +default +xkb_symbols "extended" { + + name[Group1]= "France - Mac"; + + key { [ Escape ] }; + + // Alphanumeric section + key { [ at, numbersign, periodcentered, Ydiaeresis ] }; + key { [ KP_Enter ] }; + key { [ ampersand, 1, VoidSymbol, dead_acute ] }; // MISSING: Apple + key { [ eacute, 2, ediaeresis, Eacute ] }; + key { [ quotedbl, 3, leftdoublequotemark, rightdoublequotemark ] }; + key { [ apostrophe, 4, leftsinglequotemark, rightsinglequotemark ] }; + key { [ parenleft, 5, braceleft, bracketleft ] }; + key { [ section, 6, paragraph, aring ] }; + key { [ egrave, 7, guillemotleft, guillemotright] }; + key { [ exclam, 8, exclamdown, Ucircumflex ] }; + key { [ ccedilla, 9, Ccedilla, Aacute ] }; + key { [ agrave, 0, oslash, Oslash ] }; + key { [ parenright, degree, braceright, bracketright ] }; + key { [ minus, underscore, emdash, endash ] }; + key { [ BackSpace, VoidSymbol, Delete, VoidSymbol ] }; + + key { [ Tab, ISO_Left_Tab ] }; + key { [ a, A, ae, AE ] }; + key { [ z, Z, Acircumflex, Aring ] }; + key { [ e, E, ecircumflex, Ecircumflex ] }; + key { [ r, R, registered, currency ] }; + key { [ t, T, dagger, trademark ] }; + key { [ y, Y, Uacute, Ydiaeresis ] }; + key { [ u, U, masculine, ordfeminine ] }; + key { [ i, I, icircumflex, idiaeresis ] }; + key { [ o, O, oe, OE ] }; + key { [ p, P, Greek_pi, Greek_PI ] }; + key { [dead_circumflex,dead_diaeresis,ocircumflex, Ocircumflex ] }; + key { [ dollar, asterisk, EuroSign, yen ] }; + key { [ Caps_Lock ] }; + key { [ q, Q, doubledagger, Greek_OMEGA ] }; + key { [ s, S, Ograve, Greek_SIGMA ] }; + key { [ d, D, Greek_delta, Greek_DELTA ] }; + key { [ f, F, VoidSymbol, periodcentered ] }; + key { [ g, G, VoidSymbol, VoidSymbol ] }; // MISSING: ligature fi,fl + key { [ h, H, Igrave, Icircumflex ] }; + key { [ j, J, Idiaeresis, Iacute ] }; + key { [ k, K, Egrave, Ediaeresis ] }; + key { [ l, L, notsign, bar ] }; + key { [ m, M, mu, Oacute ] }; + key { [ ugrave, percent, Ugrave, 0x1002030 ] }; + key { [ dead_grave, sterling, at, numbersign ] }; + key { [ Return ] }; + + key { [ less, greater, lessthanequal, greaterthanequal ] }; + key { [ w, W, guilsinglleft, guilsinglright ] }; // MISSING: half-guillemot (single angle bracket) + key { [ x, X, VoidSymbol, VoidSymbol ] }; // CHECK: similarequal; MISSING: extra-slanted slash + key { [ c, C, copyright, cent ] }; + key { [ v, V, diamond, radical ] }; // CHECK diamond + key { [ b, B, ssharp, integral ] }; + key { [ n, N, dead_tilde, asciitilde ] }; + key { [ comma, question, infinity, questiondown ] }; + key { [ semicolon, period, ellipsis, periodcentered ] }; + key { [ colon, slash, division, backslash ] }; + key { [ equal, plus, notequal, plusminus ] }; + + key { [ space, space, nobreakspace, nobreakspace ] }; + // End alphanumeric section + + include "level3(ralt_switch)" +}; + + + +xkb_symbols "nodeadkeys" { +include "macintosh_vndr/fr(extended)" + name[Group1]= "France - Mac, eliminate dead keys"; + + key { [ ampersand, 1, VoidSymbol, acute ] }; // MISSING: Apple + key { [asciicircum,diaeresis,ocircumflex, Ocircumflex ] }; + key { [ grave, sterling, at, numbersign ] }; + + key { [ n, N, asciitilde, dead_tilde ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/jp b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/jp index a4af79f35..331257a82 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/jp +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/jp @@ -1,35 +1,35 @@ -// JIS symbol mapping for Apple Aluminium Keyboard -// (Damien Ciabrini ) -// -// The JIS version of the Aluminium Keyboard is made of -// QWERTY-like map for the latin part -// PC98-like map for the kana part -// EISU and KANA keys found on other Apple keyboards - -partial default alphanumeric_keys -xkb_symbols "usmac" { - name[Group1] = "Japan - Macintosh, US map"; - include "jp(common)" - - key { [ KP_Separator ] }; - key { [ yen, bar ] }; - replace key { [ 0 ] }; - replace key { [ underscore ] }; - replace key { [ Caps_Lock ] }; -}; - -partial alphanumeric_keys -xkb_symbols "mac" { - name[Group1] = "Japan - Macintosh"; - include "jp(kana)" - - replace key { [ Caps_Lock ] }; -}; - -partial alphanumeric_keys -xkb_symbols "alujiskeys" { - // On JIS USB keyboard, EISU and KANA replace Hangul and Hanja - // see keycodes macintosh(jisevdev) - replace key { [ Hiragana_Katakana ] }; - replace key { [ Eisu_toggle ] }; -}; +// JIS symbol mapping for Apple Aluminium Keyboard +// (Damien Ciabrini ) +// +// The JIS version of the Aluminium Keyboard is made of +// QWERTY-like map for the latin part +// PC98-like map for the kana part +// EISU and KANA keys found on other Apple keyboards + +partial default alphanumeric_keys +xkb_symbols "usmac" { + name[Group1] = "Japan - Macintosh, US map"; + include "jp(common)" + + key { [ KP_Separator ] }; + key { [ yen, bar ] }; + replace key { [ 0 ] }; + replace key { [ underscore ] }; + replace key { [ Caps_Lock ] }; +}; + +partial alphanumeric_keys +xkb_symbols "mac" { + name[Group1] = "Japan - Macintosh"; + include "jp(kana)" + + replace key { [ Caps_Lock ] }; +}; + +partial alphanumeric_keys +xkb_symbols "alujiskeys" { + // On JIS USB keyboard, EISU and KANA replace Hangul and Hanja + // see keycodes macintosh(jisevdev) + replace key { [ Hiragana_Katakana ] }; + replace key { [ Eisu_toggle ] }; +}; -- cgit v1.2.3