xkeyboard-config/symbols/macintosh_vndr fr,1.4,1.5
"Sergey V. Oudaltsov" <xlibs-commit-u7BhqnqprCWvj1b/[email protected]>
| Newsgroups | gmane.comp.freedesktop.xlibs.cvs |
|---|---|
| Message-ID | <[email protected]> |
Committed by: svu Update of /cvs/xkeyboard-config/xkeyboard-config/symbols/macintosh_vndr In directory kemper:/tmp/cvs-serv32093/symbols/macintosh_vndr Modified Files: fr Log Message: updated mac French layout, b.fd.o#9865 Index: fr =================================================================== RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/macintosh_vndr/fr,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- fr 17 Sep 2006 20:03:34 -0000 1.4 +++ fr 3 Feb 2007 23:14:46 -0000 1.5 @@ -2,9 +2,15 @@ // modifications : Etienne Herlent <[email protected]> june 2000 // adapted to the new input layer : // Martin Costabel <[email protected]> 3-jan-2001 -// adapted for Latin9 alphabet (ISO-8859-15): -// Etienne Herlent <[email protected]> march 2005 - +////////////////////////////////////////////////////////////////// +// Petites Modification le juillet 2005 par Bin Zhang <[email protected]> : +// 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 @@ -24,65 +30,68 @@ name[Group1]= "France - Mac"; - // Alphanumeric section - key <TLDE> { [ at, numbersign, periodcentered, Ydiaeresis ] }; // MISSING: Ydiaeresis; eherlent : ok in Latin9 - key <AE01> { [ ampersand, 1, VoidSymbol, dead_acute ] }; // MISSING: Apple - key <AE02> { [ eacute, 2, ediaeresis, Eacute ] }; - key <AE03> { [ quotedbl, 3, VoidSymbol, VoidSymbol ] }; // CHECK all quotemarks - key <AE04> { [ apostrophe, 4, VoidSymbol, VoidSymbol ] }; - key <AE05> { [ parenleft, 5, braceleft, bracketleft ] }; - // CHECK section - key <AE06> { [ section, 6, paragraph, aring ] }; - key <AE07> { [ egrave, 7, guillemotleft, guillemotright ] }; - key <AE08> { [ exclam, 8, exclamdown, Ucircumflex ] }; - key <AE09> { [ ccedilla, 9, Ccedilla, Aacute ] }; - key <AE10> { [ agrave, 0, oslash, VoidSymbol ] }; // MISSING: Oslash - key <AE11> { [ parenright, degree, braceright, bracketright ] }; - key <AE12> { [ minus, underscore, emdash, endash ] }; // CHECK dashes + key <ESC> { [ Escape ] }; - key <AD01> { [ a, A, ae, AE ] }; - key <AD02> { [ z, Z, Acircumflex, Aring ] }; - key <AD03> { [ e, E, ecircumflex, Ecircumflex ] }; - key <AD04> { [ r, R, registered, currency ] }; - key <AD05> { [ t, T, VoidSymbol, VoidSymbol ] }; - key <AD06> { [ y, Y, Uacute, Ydiaeresis ] }; // MISSING: Ydiaeresis; eherlent : ok in Latin9 - key <AD07> { [ u, U, VoidSymbol, ordfeminine ] }; // MISSING: ordmasculine? - key <AD08> { [ i, I, icircumflex, idiaeresis ] }; - key <AD09> { [ o, O, oe, OE ] }; // MISSING: oe, OE lacking in Latin1; eherlent ok in Latin9 - key <AD10> { [ p, P, VoidSymbol, VoidSymbol ] }; - key <AD11> { [dead_circumflex,dead_diaeresis, ocircumflex, Ocircumflex ] }; - key <AD12> { [ dollar, asterisk, EuroSign, yen ] }; // eherlent : EuroSign in Latin9 + // Alphanumeric section + key <TLDE> { [ at, numbersign, periodcentered, Ydiaeresis ] }; + key <ENTR> { [ KP_Enter ] }; + key <AE01> { [ ampersand, 1, VoidSymbol, dead_acute ] }; // MISSING: Apple + key <AE02> { [ eacute, 2, ediaeresis, Eacute ] }; + key <AE03> { [ quotedbl, 3, leftdoublequotemark, rightdoublequotemark ] }; + key <AE04> { [ apostrophe, 4, leftsinglequotemark, rightsinglequotemark ] }; + key <AE05> { [ parenleft, 5, braceleft, bracketleft ] }; + key <AE06> { [ section, 6, paragraph, aring ] }; + key <AE07> { [ egrave, 7, guillemotleft, guillemotright] }; + key <AE08> { [ exclam, 8, exclamdown, Ucircumflex ] }; + key <AE09> { [ ccedilla, 9, Ccedilla, Aacute ] }; + key <AE10> { [ agrave, 0, oslash, Oslash ] }; + key <AE11> { [ parenright, degree, braceright, bracketright ] }; + key <AE12> { [ minus, underscore, emdash, endash ] }; + key <BKSP> { [ BackSpace, VoidSymbol, Delete, VoidSymbol ] }; - key <AC01> { [ q, Q, acircumflex, Agrave ] }; - key <AC02> { [ s, S, Ograve, VoidSymbol ] }; - key <AC03> { [ d, D, VoidSymbol, VoidSymbol ] }; - key <AC04> { [ f, F, VoidSymbol, periodcentered ] }; // MISSING: oblong script f?? - key <AC05> { [ g, G, VoidSymbol, VoidSymbol ] }; // MISSING: kerned fi, fl - key <AC06> { [ h, H, Igrave, Icircumflex ] }; - key <AC07> { [ j, J, Idiaeresis, Iacute ] }; - key <AC08> { [ k, K, Egrave, Ediaeresis ] }; - key <AC09> { [ l, L, notsign, bar ] }; - key <AC10> { [ m, M, mu, Oacute ] }; - key <AC11> { [ ugrave,percent, Ugrave, ucircumflex ] }; // MISSING: per-mille - key <BKSL> { [ dead_grave, sterling, at, numbersign ] }; + key <TAB> { [ Tab, ISO_Left_Tab ] }; + key <AD01> { [ a, A, ae, AE ] }; + key <AD02> { [ z, Z, Acircumflex, Aring ] }; + key <AD03> { [ e, E, ecircumflex, Ecircumflex ] }; + key <AD04> { [ r, R, registered, currency ] }; + key <AD05> { [ t, T, dagger, trademark ] }; + key <AD06> { [ y, Y, Uacute, Ydiaeresis ] }; + key <AD07> { [ u, U, masculine, ordfeminine ] }; + key <AD08> { [ i, I, icircumflex, idiaeresis ] }; + key <AD09> { [ o, O, oe, OE ] }; + key <AD10> { [ p, P, Greek_pi, Greek_PI ] }; + key <AD11> { [dead_circumflex,dead_diaeresis,ocircumflex, Ocircumflex ] }; + key <AD12> { [ dollar, asterisk, EuroSign, yen ] }; + key <CAPS> { [ Caps_Lock ] }; + key <AC01> { [ q, Q, doubledagger, Greek_OMEGA ] }; + key <AC02> { [ s, S, Ograve, Greek_SIGMA ] }; + key <AC03> { [ d, D, Greek_delta, Greek_DELTA ] }; + key <AC04> { [ f, F, VoidSymbol, periodcentered ] }; + key <AC05> { [ g, G, VoidSymbol, VoidSymbol ] }; // MISSING: ligature fi,fl + key <AC06> { [ h, H, Igrave, Icircumflex ] }; + key <AC07> { [ j, J, Idiaeresis, Iacute ] }; + key <AC08> { [ k, K, Egrave, Ediaeresis ] }; + key <AC09> { [ l, L, notsign, bar ] }; + key <AC10> { [ m, M, mu, Oacute ] }; + key <AC11> { [ ugrave, percent, Ugrave, 0x1002030 ] }; + key <BKSL> { [ dead_grave, sterling, at, numbersign ] }; + key <RTRN> { [ Return ] }; - key <LSGT> { [ less, greater, VoidSymbol, VoidSymbol ] }; - key <AB01> { [ w, W, VoidSymbol, VoidSymbol ] }; // MISSING: half-guillemot (single angle bracket) - key <AB02> { [ x, X, VoidSymbol, VoidSymbol ] }; // CHECK similarequal; MISSING: extra-slanted slash - key <AB03> { [ c, C, copyright, cent ] }; - key <AB04> { [ v, V, diamond, leftradical ] }; // CHECK diamond, leftradical - key <AB05> { [ b, B, ssharp, VoidSymbol ] }; // CHECK: Greek_beta or ssharp?; MISSING: oblong script s - key <AB06> { [ n, N, dead_tilde, asciitilde ] }; - key <AB07> { [ comma, question, VoidSymbol, questiondown ] }; - key <AB08> { [ semicolon, period, VoidSymbol, periodcentered ] }; - key <AB09> { [ colon, slash, division, backslash ] }; - key <AB10> { [ equal, plus, VoidSymbol, plusminus ] }; + key <LSGT> { [ less, greater, lessthanequal, greaterthanequal ] }; + key <AB01> { [ w, W, guilsinglleft, guilsinglright ] }; // MISSING: half-guillemot (single angle bracket) + key <AB02> { [ x, X, VoidSymbol, VoidSymbol ] }; // CHECK: similarequal; MISSING: extra-slanted slash + key <AB03> { [ c, C, copyright, cent ] }; + key <AB04> { [ v, V, diamond, radical ] }; // CHECK diamond + key <AB05> { [ b, B, ssharp, integral ] }; + key <AB06> { [ n, N, dead_tilde, asciitilde ] }; + key <AB07> { [ comma, question, infinity, questiondown ] }; + key <AB08> { [ semicolon, period, ellipsis, periodcentered ] }; + key <AB09> { [ colon, slash, division, backslash ] }; + key <AB10> { [ equal, plus, notequal, plusminus ] }; - key <SPCE> { [ space, space, nobreakspace, nobreakspace ] }; + key <SPCE> { [ space, space, nobreakspace, nobreakspace ] }; // End alphanumeric section - key <KPDL> { [ comma,KP_Decimal ] }; - include "level3(ralt_switch)" };