From 990bc3f015a4f8fce2eb918375defcd44980a845 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 8 Jun 2012 09:33:13 +0200 Subject: Used synchronise script to update files --- .../xkeyboard-config/symbols/macintosh_vndr/ch | 202 ++++++++-------- .../xkeyboard-config/symbols/macintosh_vndr/de | 188 +++++++-------- .../xkeyboard-config/symbols/macintosh_vndr/fi | 34 +-- .../xkeyboard-config/symbols/macintosh_vndr/fr | 220 +++++++++--------- .../xkeyboard-config/symbols/macintosh_vndr/gb | 34 +-- .../xkeyboard-config/symbols/macintosh_vndr/is | 254 ++++++++++----------- .../xkeyboard-config/symbols/macintosh_vndr/it | 124 +++++----- .../xkeyboard-config/symbols/macintosh_vndr/latam | 74 +++--- .../xkeyboard-config/symbols/macintosh_vndr/nl | 30 +-- .../xkeyboard-config/symbols/macintosh_vndr/no | 100 ++++---- .../xkeyboard-config/symbols/macintosh_vndr/pt | 122 +++++----- .../xkeyboard-config/symbols/macintosh_vndr/se | 88 +++---- 12 files changed, 735 insertions(+), 735 deletions(-) (limited to 'xorg-server/xkeyboard-config/symbols/macintosh_vndr') diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch index 09c2fb32f..54b61d215 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch @@ -1,101 +1,101 @@ -// -// 03.01.2003 -// Andreas Tobler -// modified for Swiss German Apple Extended Keyboard II - -partial alphanumeric_keys -xkb_symbols "extended" { - - name[Group1]= "Switzerland - German, Mac"; - - // Alphanumeric section - - key { [ 1, plus, plusminus, infinity ] }; - key { [ 2, quotedbl, leftdoublequotemark, rightdoublequotemark ] }; - key { [ 3, asterisk, numbersign, leftcaret ] }; - // not displayed here - key { [ 4, ccedilla, Ccedilla, slash ] }; - key { [ 5, percent, bracketleft ] }; - key { [ 6, ampersand, bracketright ] }; - key { [ 7, slash, bar, backslash ] }; - key { [ 8, parenleft, braceleft, Ograve ] }; - key { [ 9, parenright, braceright, Ocircumflex ] }; - key { [ 0, equal, notequal, Uacute ] }; - key { [ apostrophe, question, questiondown, NoSymbol ] }; - key { [ dead_circumflex,dead_grave, dead_acute, asciicircum ] }; - key { [ q, Q, oe, OE ] }; - key { [ w, W, Greek_SIGMA, Aacute ] }; - key { [ e, E, EuroSign, Ediaeresis ] }; - key { [ r, R, registered, Egrave ] }; - key { [ t, T, dagger, Icircumflex ] }; - key { [ z, Z, Greek_OMEGA, Iacute ] }; - key { [ u, U, degree, Ugrave ] }; - key { [ i, I, exclamdown, idotless ] }; - key { [ o, O, oslash, Ooblique ] }; - key { [ p, P, Greek_pi, Greek_PI ] }; - key { [ udiaeresis, egrave, section, ydiaeresis ] }; - key { [ dead_diaeresis, exclam, grave, apostrophe ] }; - key { [ a, A, aring, Aring ] }; - key { [ s, S, ssharp, NoSymbol ] }; - // ligature fl - key { [ d, D, Greek_sigma, NoSymbol ] }; - // partialderivative is not available here att - key { [ f, F, function, doubledagger ] }; - key { [ g, G, at, comma ] }; - key { [ h, H, ordfeminine, periodcentered ] }; - key { [ j, J, masculine, eth ] }; - key { [ k, K, Greek_DELTA, macron ] }; - key { [ l, L, notsign, caret ] }; - key { [ odiaeresis, eacute, cent, breve ] }; - key { [ adiaeresis, agrave, ae, AE ] }; - key { [ y, Y, yen, Ydiaeresis ] }; - key { [ x, X, similarequal, trademark ] }; - key { [ c, C, copyright, NoSymbol ] }; - key { [ v, V, radical, diamond ] }; - key { [ b, B, integral, NoSymbol ] }; - key { [ n, N, dead_tilde, enopencircbullet ] }; - // to be fixed att - key { [ m, M, mu, dead_abovering ] }; - // not sure att - key { [ comma, semicolon, guillemotleft, guillemotright ] }; - key { [ period, colon, ellipsis, division ] }; - key { [ minus, underscore, hyphen, emdash ] }; - key { [ section, degree, NoSymbol, NoSymbol ] }; - // ligature fi // per mille - key { [ space, nobreakspace, nobreakspace ] }; - key { [ less, greater, lessthanequal, greaterthanequal ] }; - key { [ dollar, sterling, paragraph, enfilledcircbullet ] }; - - include "kpdl(comma)" - include "level3(ralt_switch)" -}; - -partial alphanumeric_keys -xkb_symbols "de" { - include "macintosh_vndr/ch(extended)" -}; - -partial alphanumeric_keys -xkb_symbols "fr" { - - // Describes the differences between a very simple US/ASCII - // keyboard and a very simple Swiss/French keybaord - - include "macintosh_vndr/ch(extended)" - name[Group1]= "Switzerland - French, Mac"; - - override key { - [ egrave, udiaeresis, bracketleft ] - }; - override key { - [ eacute, odiaeresis ] - }; - override key { - [ agrave, adiaeresis, braceleft ] - }; -}; - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - include "macintosh_vndr/ch(fr)" // for consistent naming -}; +// +// 03.01.2003 +// Andreas Tobler +// modified for Swiss German Apple Extended Keyboard II + +partial alphanumeric_keys +xkb_symbols "extended" { + + name[Group1]= "Switzerland - German, Mac"; + + // Alphanumeric section + + key { [ 1, plus, plusminus, infinity ] }; + key { [ 2, quotedbl, leftdoublequotemark, rightdoublequotemark ] }; + key { [ 3, asterisk, numbersign, leftcaret ] }; + // not displayed here + key { [ 4, ccedilla, Ccedilla, slash ] }; + key { [ 5, percent, bracketleft ] }; + key { [ 6, ampersand, bracketright ] }; + key { [ 7, slash, bar, backslash ] }; + key { [ 8, parenleft, braceleft, Ograve ] }; + key { [ 9, parenright, braceright, Ocircumflex ] }; + key { [ 0, equal, notequal, Uacute ] }; + key { [ apostrophe, question, questiondown, NoSymbol ] }; + key { [ dead_circumflex,dead_grave, dead_acute, asciicircum ] }; + key { [ q, Q, oe, OE ] }; + key { [ w, W, Greek_SIGMA, Aacute ] }; + key { [ e, E, EuroSign, Ediaeresis ] }; + key { [ r, R, registered, Egrave ] }; + key { [ t, T, dagger, Icircumflex ] }; + key { [ z, Z, Greek_OMEGA, Iacute ] }; + key { [ u, U, degree, Ugrave ] }; + key { [ i, I, exclamdown, idotless ] }; + key { [ o, O, oslash, Ooblique ] }; + key { [ p, P, Greek_pi, Greek_PI ] }; + key { [ udiaeresis, egrave, section, ydiaeresis ] }; + key { [ dead_diaeresis, exclam, grave, apostrophe ] }; + key { [ a, A, aring, Aring ] }; + key { [ s, S, ssharp, NoSymbol ] }; + // ligature fl + key { [ d, D, Greek_sigma, NoSymbol ] }; + // partialderivative is not available here att + key { [ f, F, function, doubledagger ] }; + key { [ g, G, at, comma ] }; + key { [ h, H, ordfeminine, periodcentered ] }; + key { [ j, J, masculine, eth ] }; + key { [ k, K, Greek_DELTA, macron ] }; + key { [ l, L, notsign, caret ] }; + key { [ odiaeresis, eacute, cent, breve ] }; + key { [ adiaeresis, agrave, ae, AE ] }; + key { [ y, Y, yen, Ydiaeresis ] }; + key { [ x, X, similarequal, trademark ] }; + key { [ c, C, copyright, NoSymbol ] }; + key { [ v, V, radical, diamond ] }; + key { [ b, B, integral, NoSymbol ] }; + key { [ n, N, dead_tilde, enopencircbullet ] }; + // to be fixed att + key { [ m, M, mu, dead_abovering ] }; + // not sure att + key { [ comma, semicolon, guillemotleft, guillemotright ] }; + key { [ period, colon, ellipsis, division ] }; + key { [ minus, underscore, hyphen, emdash ] }; + key { [ section, degree, NoSymbol, NoSymbol ] }; + // ligature fi // per mille + key { [ space, nobreakspace, nobreakspace ] }; + key { [ less, greater, lessthanequal, greaterthanequal ] }; + key { [ dollar, sterling, paragraph, enfilledcircbullet ] }; + + include "kpdl(comma)" + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "de" { + include "macintosh_vndr/ch(extended)" +}; + +partial alphanumeric_keys +xkb_symbols "fr" { + + // Describes the differences between a very simple US/ASCII + // keyboard and a very simple Swiss/French keybaord + + include "macintosh_vndr/ch(extended)" + name[Group1]= "Switzerland - French, Mac"; + + override key { + [ egrave, udiaeresis, bracketleft ] + }; + override key { + [ eacute, odiaeresis ] + }; + override key { + [ agrave, adiaeresis, braceleft ] + }; +}; + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + include "macintosh_vndr/ch(fr)" // for consistent naming +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de index 4c8bebdf4..da5bc7772 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de @@ -1,94 +1,94 @@ -// olh@suse.de very close to MacOS map - -default partial alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple US/ASCII - // keyboard and a very simple German keybaord - - include "latin" - name[Group1]= "Germany - Mac"; - - // Alphanumeric section - key { [ dead_circumflex, degree, notsign ] }; - key { [ 1, exclam, exclamdown, at ] }; - key { [ 2, quotedbl, twosuperior ] }; - key { [ 3, section, threesuperior,sterling ] }; - key { [ 4, dollar, onequarter, currency ] }; - key { [ 5, percent, bracketleft ] }; - key { [ 6, ampersand, bracketright ] }; - key { [ 7, slash, bar, backslash ] }; - key { [ 8, parenleft, braceleft, asciitilde ] }; - key { [ 9, parenright, braceright ] }; - key { [ 0, equal, braceright, degree ] }; - key { [ ssharp, question, backslash, questiondown ] }; - key { [ dead_acute, dead_grave, dead_cedilla ] }; - - key { [ q, Q, guillemotleft,guillemotright ] }; - key { [ e, E, EuroSign ] }; - key { [ r, R, registered ] }; - key { [ t, T ] }; - key { [ z, Z ] }; - key { [ u, U, diaeresis, Aacute ] }; - key { [ i, I, slash, Ucircumflex ] }; - key { [ o, O, oslash, Ooblique ] }; - key { [ udiaeresis, Udiaeresis, periodcentered, degree ] }; - key { [ plus, asterisk, asciitilde ] }; - key { [ a, A, aring, Aring ] }; - key { [ f, F ] }; - key { [ g, G, copyright ] }; - key { [ h, H, ordfeminine ] }; - key { [ l, L, at ] }; - key { [ odiaeresis, Odiaeresis, dead_acute ] }; - key { [ adiaeresis, Adiaeresis, dead_circumflex ] }; - - key { [ less, greater, bar ] }; - key { [ y, Y, guillemotleft,less ] }; - key { [ n, N, asciitilde ] }; - key { [ m, M, mu ] }; - key { [ comma, semicolon ] }; - key { [ period, colon, periodcentered, division ] }; - key { [ minus, underscore ] }; - key { [ numbersign, apostrophe, dead_grave ] }; - - include "kpdl(comma)" - include "level3(ralt_switch)" - -}; - -partial alphanumeric_keys -xkb_symbols "Sundeadkeys" { - // modify the default German layout to use Sun dead keys - include "macintosh_vndr/de(basic)" - name[Group1]= "Germany - Mac, Sun dead keys"; - - key { [ SunFA_Circum, degree, notsign ] }; - key { [ SunFA_Acute, SunFA_Grave, SunFA_Cedilla ] }; - key { [ udiaeresis, Udiaeresis, SunFA_Diaeresis ] }; - key { [ plus, asterisk, SunFA_Tilde, dead_macron ] }; - key { [ odiaeresis, Odiaeresis, SunFA_Acute ] }; - key { [ adiaeresis, Adiaeresis, SunFA_Circum ] }; - - key { [ numbersign, acute, SunFA_Grave ] }; -}; - -partial alphanumeric_keys -xkb_symbols "sundeadkeys" { - include "macintosh_vndr/de(Sundeadkeys)" -}; - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - // modify the default German layout to not have any dead keys - include "macintosh_vndr/de(basic)" - name[Group1]= "Germany - Mac, eliminate dead keys"; - - key { [ asciicircum, degree, notsign ] }; - key { [ acute, grave, cedilla ] }; - key { [ udiaeresis, Udiaeresis, diaeresis ] }; - key { [ plus, asterisk, asciitilde, macron ] }; - key { [ odiaeresis, Odiaeresis, acute ] }; - key { [ adiaeresis, Adiaeresis, asciicircum ] }; - - key { [ numbersign, apostrophe, grave ] }; -}; +// olh@suse.de very close to MacOS map + +default partial alphanumeric_keys +xkb_symbols "basic" { + + // Describes the differences between a very simple US/ASCII + // keyboard and a very simple German keybaord + + include "latin" + name[Group1]= "Germany - Mac"; + + // Alphanumeric section + key { [ dead_circumflex, degree, notsign ] }; + key { [ 1, exclam, exclamdown, at ] }; + key { [ 2, quotedbl, twosuperior ] }; + key { [ 3, section, threesuperior,sterling ] }; + key { [ 4, dollar, onequarter, currency ] }; + key { [ 5, percent, bracketleft ] }; + key { [ 6, ampersand, bracketright ] }; + key { [ 7, slash, bar, backslash ] }; + key { [ 8, parenleft, braceleft, asciitilde ] }; + key { [ 9, parenright, braceright ] }; + key { [ 0, equal, braceright, degree ] }; + key { [ ssharp, question, backslash, questiondown ] }; + key { [ dead_acute, dead_grave, dead_cedilla ] }; + + key { [ q, Q, guillemotleft,guillemotright ] }; + key { [ e, E, EuroSign ] }; + key { [ r, R, registered ] }; + key { [ t, T ] }; + key { [ z, Z ] }; + key { [ u, U, diaeresis, Aacute ] }; + key { [ i, I, slash, Ucircumflex ] }; + key { [ o, O, oslash, Ooblique ] }; + key { [ udiaeresis, Udiaeresis, periodcentered, degree ] }; + key { [ plus, asterisk, asciitilde ] }; + key { [ a, A, aring, Aring ] }; + key { [ f, F ] }; + key { [ g, G, copyright ] }; + key { [ h, H, ordfeminine ] }; + key { [ l, L, at ] }; + key { [ odiaeresis, Odiaeresis, dead_acute ] }; + key { [ adiaeresis, Adiaeresis, dead_circumflex ] }; + + key { [ less, greater, bar ] }; + key { [ y, Y, guillemotleft,less ] }; + key { [ n, N, asciitilde ] }; + key { [ m, M, mu ] }; + key { [ comma, semicolon ] }; + key { [ period, colon, periodcentered, division ] }; + key { [ minus, underscore ] }; + key { [ numbersign, apostrophe, dead_grave ] }; + + include "kpdl(comma)" + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys +xkb_symbols "Sundeadkeys" { + // modify the default German layout to use Sun dead keys + include "macintosh_vndr/de(basic)" + name[Group1]= "Germany - Mac, Sun dead keys"; + + key { [ SunFA_Circum, degree, notsign ] }; + key { [ SunFA_Acute, SunFA_Grave, SunFA_Cedilla ] }; + key { [ udiaeresis, Udiaeresis, SunFA_Diaeresis ] }; + key { [ plus, asterisk, SunFA_Tilde, dead_macron ] }; + key { [ odiaeresis, Odiaeresis, SunFA_Acute ] }; + key { [ adiaeresis, Adiaeresis, SunFA_Circum ] }; + + key { [ numbersign, acute, SunFA_Grave ] }; +}; + +partial alphanumeric_keys +xkb_symbols "sundeadkeys" { + include "macintosh_vndr/de(Sundeadkeys)" +}; + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + // modify the default German layout to not have any dead keys + include "macintosh_vndr/de(basic)" + name[Group1]= "Germany - Mac, eliminate dead keys"; + + key { [ asciicircum, degree, notsign ] }; + key { [ acute, grave, cedilla ] }; + key { [ udiaeresis, Udiaeresis, diaeresis ] }; + key { [ plus, asterisk, asciitilde, macron ] }; + key { [ odiaeresis, Odiaeresis, acute ] }; + key { [ adiaeresis, Adiaeresis, asciicircum ] }; + + key { [ numbersign, apostrophe, grave ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi index 177913737..7a865d2bc 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi @@ -1,17 +1,17 @@ -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple mac_US - // keyboard and a very simple Swedish(Finland) keybaord - - include "macintosh_vndr/se(basic)" // for consistent naming - name[Group1]= "Finland - Mac"; - -}; - - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - include "macintosh_vndr/se(basic)" // for consistent naming - name[Group1]= "Finland - Mac, eliminate dead keys"; -}; +partial default alphanumeric_keys +xkb_symbols "basic" { + + // Describes the differences between a very simple mac_US + // keyboard and a very simple Swedish(Finland) keybaord + + include "macintosh_vndr/se(basic)" // for consistent naming + name[Group1]= "Finland - Mac"; + +}; + + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + include "macintosh_vndr/se(basic)" // for consistent naming + name[Group1]= "Finland - Mac, eliminate dead keys"; +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr index 9a8f8de23..c76551d30 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/gb b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb index 5343673c1..a6bc48e8c 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb @@ -1,17 +1,17 @@ -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple en_US - // keyboard and a very simple U.K. keyboard layout - - include "latin" - - name[Group1]= "United Kingdom - Mac"; - - key { [ 2, at, EuroSign ] }; - key { [ 3, sterling, numbersign ] }; - - // End alphanumeric section - - include "level3(ralt_switch)" -}; +partial default alphanumeric_keys +xkb_symbols "basic" { + + // Describes the differences between a very simple en_US + // keyboard and a very simple U.K. keyboard layout + + include "latin" + + name[Group1]= "United Kingdom - Mac"; + + key { [ 2, at, EuroSign ] }; + key { [ 3, sterling, numbersign ] }; + + // End alphanumeric section + + include "level3(ralt_switch)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is index d16d92f61..b9870ffe8 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is @@ -1,127 +1,127 @@ -// -// This file describes the differences between a Macintosh US Extended -// keymap and an Icelandic keyboard layout in the style of Mac OS and Mac OS X -// -// Copyright (C) 2004, 2006 Ævar Arnfjörð Bjarmason -// -// Permission to use, copy, modify, distribute, and sell this software and its -// documentation for any purpose is hereby granted without fee, provided that -// the above copyright notice appear in all copies and that both that -// copyright notice and this permission notice appear in supporting -// documentation. -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -// IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -// OTHER DEALINGS IN THE SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder shall -// not be used in advertising or otherwise to promote the sale, use or -// other dealings in this Software without prior written authorization of -// the copyright holder. -// -// = HISTORY -// * 2004-09-28: -// Initial cleanroom writing of the keymap, I just booted Mac OS X, opened -// TextEdit.app and wrote down what the value produced by each key was when I -// pressed it, a for a, A for shift + a, Ã¥ for lalt + a etc and made the -// keymap from that information -// -// * 2006-01-14: -// Revised the comments in the file -// -// = NOTES -// * 20 characters in this keymap have no named character defined in -// include/keysymdef.h and as a result their Unicode code points in -// hexadecimal are listed here, these can be generated with the following -// perl command: -// $ perl -CA -e 'printf "U%x\n", ord shift' Æ -// and converted back like: -// $ perl -CO -le '$_=shift;s/[^a-f0-9]//ig;print chr hex' Uc6 -// * The Apple logo appears twice on this keymap like the Mac OS and Mac OS X -// keymaps. In the MacRoman encoding it has the code point 0xF0 (240) but it -// has no assigned code point in Unicode, the code point Apple uses for it is -// U+F8FF (63743) which is in the BMP's Private Use Area (U+E000–U+F8FF) -// * This keymap has only been tested on a PowerBook6,5 (iBook G4) but it -// should work on other Apple laptop models which use the same keyboard -// layout. It will probably work on standard sized keyboards with little or -// no modification but it might not support them fully, please report if -// you're able to get it running with such a keyboard - -partial default alphanumeric_keys -xkb_symbols "basic" { - name[Group1]= "Iceland - Mac"; - - //-- Row 5 (E) --// - key { [ sterling, section, UF8FF, apostrophe ] }; - key { [ 1, exclam, exclamdown, VoidSymbol ] }; - key { [ 2, quotedbl, at, VoidSymbol ] }; - key { [ 3, numbersign, U2122, sterling ] }; - key { [ 4, dollar, U00A2, EuroSign ] }; - key { [ 5, percent, U2030, infinity ] }; - key { [ 6, ampersand, asciicircum, U2044 ] }; - key { [ 7, slash, backslash, U00F7 ] }; - key { [ 8, parenleft, bracketleft, braceleft ] }; - key { [ 9, parenright, bracketright, braceright ] }; - key { [ 0, equal, U2260, U2248 ] }; - key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; - key { [ minus, underscore, endash, emdash ] }; - - - //-- Row 4 (D) --// - key { [ q, Q, paragraph, VoidSymbol ] }; - key { [ w, W, U2211, VoidSymbol ] }; - key { [ e, E, dead_grave, VoidSymbol ] }; - key { [ r, R, registered, VoidSymbol ] }; - key { [ t, T, degree, VoidSymbol ] }; - key { [ y, Y, yen, VoidSymbol ] }; - key { [ u, U, dead_diaeresis, VoidSymbol ] }; - key { [ i, I, U0131, U00AA ] }; - key { [ o, O, dead_circumflex,U00BA ] }; - key { [ p, P, Greek_pi, Greek_PI ] }; - key { [ eth, Eth, U201e, U201c ] }; - key { [ apostrophe, question, questiondown, U00B7 ] }; - - - //-- Row 3 (C) --// - key { [ a, A, aring, Aring ] }; - key { [ s, S, ssharp, abovedot ] }; - key { [ d, D, U2202, U2DA ] }; - key { [ f, F, U192, macron ] }; - key { [ g, G, copyright, breve ] }; - key { [ h, H, bar, VoidSymbol ] }; - key { [ j, J, U2206, U2dd ] }; - key { [ k, K, U00AC, VoidSymbol ] }; - key { [ l, L, U2026, caron ] }; - key { [ ae, AE, oe, OE ] }; - key { [ dead_acute, dead_diaeresis, U201A, U2018 ] }; - key { [ plus, asterisk, U2022, plusminus ] }; - - - //-- Row 2 (B) --// - key { [ less, greater, section, UF8FF ] }; - key { [ z, Z, U3A9, VoidSymbol ] }; - key { [ x, X, asciitilde, VoidSymbol ] }; - key { [ c, C, ccedilla, Ccedilla ] }; - key { [ v, V, U221A, U25CA ] }; - key { [ b, B, U222B, VoidSymbol ] }; - key { [ n, N, dead_tilde, VoidSymbol ] }; - key { [ m, M, U00B5, VoidSymbol ] }; - key { [ comma, semicolon, lessthanequal, guillemotleft ] }; - key { [ period, colon, greaterthanequal,guillemotright ] }; - key { [ thorn, Thorn, U2019, U201d ] }; - - include "level3(ralt_switch)" -}; - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - include "macintosh_vndr/is(basic)" // for consistent naming - name[Group1]= "Iceland - Mac, eliminate dead keys"; -}; +// +// This file describes the differences between a Macintosh US Extended +// keymap and an Icelandic keyboard layout in the style of Mac OS and Mac OS X +// +// Copyright (C) 2004, 2006 Ævar Arnfjörð Bjarmason +// +// Permission to use, copy, modify, distribute, and sell this software and its +// documentation for any purpose is hereby granted without fee, provided that +// the above copyright notice appear in all copies and that both that +// copyright notice and this permission notice appear in supporting +// documentation. +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +// OTHER DEALINGS IN THE SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder shall +// not be used in advertising or otherwise to promote the sale, use or +// other dealings in this Software without prior written authorization of +// the copyright holder. +// +// = HISTORY +// * 2004-09-28: +// Initial cleanroom writing of the keymap, I just booted Mac OS X, opened +// TextEdit.app and wrote down what the value produced by each key was when I +// pressed it, a for a, A for shift + a, Ã¥ for lalt + a etc and made the +// keymap from that information +// +// * 2006-01-14: +// Revised the comments in the file +// +// = NOTES +// * 20 characters in this keymap have no named character defined in +// include/keysymdef.h and as a result their Unicode code points in +// hexadecimal are listed here, these can be generated with the following +// perl command: +// $ perl -CA -e 'printf "U%x\n", ord shift' Æ +// and converted back like: +// $ perl -CO -le '$_=shift;s/[^a-f0-9]//ig;print chr hex' Uc6 +// * The Apple logo appears twice on this keymap like the Mac OS and Mac OS X +// keymaps. In the MacRoman encoding it has the code point 0xF0 (240) but it +// has no assigned code point in Unicode, the code point Apple uses for it is +// U+F8FF (63743) which is in the BMP's Private Use Area (U+E000–U+F8FF) +// * This keymap has only been tested on a PowerBook6,5 (iBook G4) but it +// should work on other Apple laptop models which use the same keyboard +// layout. It will probably work on standard sized keyboards with little or +// no modification but it might not support them fully, please report if +// you're able to get it running with such a keyboard + +partial default alphanumeric_keys +xkb_symbols "basic" { + name[Group1]= "Iceland - Mac"; + + //-- Row 5 (E) --// + key { [ sterling, section, UF8FF, apostrophe ] }; + key { [ 1, exclam, exclamdown, VoidSymbol ] }; + key { [ 2, quotedbl, at, VoidSymbol ] }; + key { [ 3, numbersign, U2122, sterling ] }; + key { [ 4, dollar, U00A2, EuroSign ] }; + key { [ 5, percent, U2030, infinity ] }; + key { [ 6, ampersand, asciicircum, U2044 ] }; + key { [ 7, slash, backslash, U00F7 ] }; + key { [ 8, parenleft, bracketleft, braceleft ] }; + key { [ 9, parenright, bracketright, braceright ] }; + key { [ 0, equal, U2260, U2248 ] }; + key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; + key { [ minus, underscore, endash, emdash ] }; + + + //-- Row 4 (D) --// + key { [ q, Q, paragraph, VoidSymbol ] }; + key { [ w, W, U2211, VoidSymbol ] }; + key { [ e, E, dead_grave, VoidSymbol ] }; + key { [ r, R, registered, VoidSymbol ] }; + key { [ t, T, degree, VoidSymbol ] }; + key { [ y, Y, yen, VoidSymbol ] }; + key { [ u, U, dead_diaeresis, VoidSymbol ] }; + key { [ i, I, U0131, U00AA ] }; + key { [ o, O, dead_circumflex,U00BA ] }; + key { [ p, P, Greek_pi, Greek_PI ] }; + key { [ eth, Eth, U201e, U201c ] }; + key { [ apostrophe, question, questiondown, U00B7 ] }; + + + //-- Row 3 (C) --// + key { [ a, A, aring, Aring ] }; + key { [ s, S, ssharp, abovedot ] }; + key { [ d, D, U2202, U2DA ] }; + key { [ f, F, U192, macron ] }; + key { [ g, G, copyright, breve ] }; + key { [ h, H, bar, VoidSymbol ] }; + key { [ j, J, U2206, U2dd ] }; + key { [ k, K, U00AC, VoidSymbol ] }; + key { [ l, L, U2026, caron ] }; + key { [ ae, AE, oe, OE ] }; + key { [ dead_acute, dead_diaeresis, U201A, U2018 ] }; + key { [ plus, asterisk, U2022, plusminus ] }; + + + //-- Row 2 (B) --// + key { [ less, greater, section, UF8FF ] }; + key { [ z, Z, U3A9, VoidSymbol ] }; + key { [ x, X, asciitilde, VoidSymbol ] }; + key { [ c, C, ccedilla, Ccedilla ] }; + key { [ v, V, U221A, U25CA ] }; + key { [ b, B, U222B, VoidSymbol ] }; + key { [ n, N, dead_tilde, VoidSymbol ] }; + key { [ m, M, U00B5, VoidSymbol ] }; + key { [ comma, semicolon, lessthanequal, guillemotleft ] }; + key { [ period, colon, greaterthanequal,guillemotright ] }; + key { [ thorn, Thorn, U2019, U201d ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + include "macintosh_vndr/is(basic)" // for consistent naming + name[Group1]= "Iceland - Mac, eliminate dead keys"; +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it index 889653f8e..2438231cd 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it @@ -1,62 +1,62 @@ -xkb_symbols "extended" { - - name[Group1]= "Italy - Mac"; - - // Alphanumeric section - key { [ less, greater ] }; - key { [ at, numbersign, periodcentered ] }; - key { [ ampersand, 1, guillemotleft,guillemotright ] }; - key { [ quotedbl, 2 ] }; - key { [ apostrophe, 3 ] }; - key { [ parenleft, 4, braceleft, bracketleft ] }; - key { [ ccedilla, 5, Ccedilla, Iacute ] }; - key { [ egrave, 6, paragraph, periodcentered] }; - key { [ parenright, 7, braceright, bracketright ] }; - key { [ sterling, 8, infinity ] }; - key { [ agrave, 9, acute, Ocircumflex ] }; - key { [ eacute, 0, grave, Oacute ] }; - key { [ minus, underscore ] }; - key { [ equal, plus, notequal, plusminus ] }; - - key { [ q, Q ] }; - key { [ z, Z ] }; - key { [ e, E, EuroSign ] }; - key { [ r, R, registered ] }; - key { [ t, T ] }; - key { [ y, Y, Uacute, ydiaeresis ] }; - key { [ u, U ] }; - key { [ i, I, icircumflex, idiaeresis ] }; - key { [ o, O ] }; - key { [ p, P ] }; - key { [ igrave, asciicircum ] }; - key { [ dollar, asterisk ] }; - key { [ section, degree, at, numbersign ] }; - - key { [ a, A, aring, Aring ] }; - key { [ s, S, ssharp ] }; - key { [ d, D ] }; - key { [ f, F ] }; - key { [ g, G ] }; - key { [ h, H, Igrave, Icircumflex ] }; - key { [ j, J, Idiaeresis, Iacute ] }; - key { [ k, K, Egrave, Ediaeresis ] }; - key { [ l, L, ssharp, bar ] }; - key { [ m, M, mu, Oacute ] }; - key { [ ugrave, percent, ae, AE ] }; - - key { [ w, W ] }; - key { [ x, X ] }; - key { [ c, C, copyright, copyright ] }; - key { [ v, V ] }; - key { [ b, B ] }; - key { [ n, N, dead_tilde ] }; - key { [ comma, question, questiondown ] }; - key { [ semicolon, period ] }; - key { [ colon, slash, bar, backslash ] }; - key { [ ograve, exclam, exclamdown ] }; - - // End alphanumeric section - - include "kpdl(dot)" - include "level3(ralt_switch)" -}; +xkb_symbols "extended" { + + name[Group1]= "Italy - Mac"; + + // Alphanumeric section + key { [ less, greater ] }; + key { [ at, numbersign, periodcentered ] }; + key { [ ampersand, 1, guillemotleft,guillemotright ] }; + key { [ quotedbl, 2 ] }; + key { [ apostrophe, 3 ] }; + key { [ parenleft, 4, braceleft, bracketleft ] }; + key { [ ccedilla, 5, Ccedilla, Iacute ] }; + key { [ egrave, 6, paragraph, periodcentered] }; + key { [ parenright, 7, braceright, bracketright ] }; + key { [ sterling, 8, infinity ] }; + key { [ agrave, 9, acute, Ocircumflex ] }; + key { [ eacute, 0, grave, Oacute ] }; + key { [ minus, underscore ] }; + key { [ equal, plus, notequal, plusminus ] }; + + key { [ q, Q ] }; + key { [ z, Z ] }; + key { [ e, E, EuroSign ] }; + key { [ r, R, registered ] }; + key { [ t, T ] }; + key { [ y, Y, Uacute, ydiaeresis ] }; + key { [ u, U ] }; + key { [ i, I, icircumflex, idiaeresis ] }; + key { [ o, O ] }; + key { [ p, P ] }; + key { [ igrave, asciicircum ] }; + key { [ dollar, asterisk ] }; + key { [ section, degree, at, numbersign ] }; + + key { [ a, A, aring, Aring ] }; + key { [ s, S, ssharp ] }; + key { [ d, D ] }; + key { [ f, F ] }; + key { [ g, G ] }; + key { [ h, H, Igrave, Icircumflex ] }; + key { [ j, J, Idiaeresis, Iacute ] }; + key { [ k, K, Egrave, Ediaeresis ] }; + key { [ l, L, ssharp, bar ] }; + key { [ m, M, mu, Oacute ] }; + key { [ ugrave, percent, ae, AE ] }; + + key { [ w, W ] }; + key { [ x, X ] }; + key { [ c, C, copyright, copyright ] }; + key { [ v, V ] }; + key { [ b, B ] }; + key { [ n, N, dead_tilde ] }; + key { [ comma, question, questiondown ] }; + key { [ semicolon, period ] }; + key { [ colon, slash, bar, backslash ] }; + key { [ ograve, exclam, exclamdown ] }; + + // End alphanumeric section + + include "kpdl(dot)" + include "level3(ralt_switch)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam index a588ab27c..dcb9db624 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam @@ -1,37 +1,37 @@ -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)" -}; +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)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl index 05034701e..5eb66c444 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl @@ -1,15 +1,15 @@ -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple mac_US - // keyboard and a very simple netherland keybaord - - include "latin" - - name[Group1]= "Netherlands - Mac"; - - include "level3(ralt_switch)" - -// do just nothing - -}; +partial default alphanumeric_keys +xkb_symbols "basic" { + + // Describes the differences between a very simple mac_US + // keyboard and a very simple netherland keybaord + + include "latin" + + name[Group1]= "Netherlands - Mac"; + + include "level3(ralt_switch)" + +// do just nothing + +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no index 442aee9af..fb0cb74a2 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no @@ -1,50 +1,50 @@ -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple en_US - // keyboard and a very simple Norwegian keybaord - - include "latin" - - name[Group1]= "Norway - Mac"; - - key { [ bar, section ] }; - key { [ 2, quotedbl, at, oneeighth ] }; - key { [ 4, currency, dollar, dollar ] }; - key { [ 3, numbersign, sterling, sterling ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash, bar, backslash ] }; - key { [ 8, parenleft, bracketleft, braceleft ] }; - key { [ 9, parenright, bracketright, braceright ] }; - key { [ 0, equal ] }; - - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ oslash, Ooblique, odiaeresis, Odiaeresis ] }; - key { [ plus, question ] }; - key { [ ae, AE ] }; - key { [ aring, Aring ] }; - key { [ dead_grave, dead_acute, acute, dead_ogonek ] }; - key { [ diaeresis, asciicircum, asciitilde, dead_macron ] }; - key { [ at, asterisk ] }; - key { [ less, greater ] }; - - // End alphanumeric section - - include "eurosign(e)" - include "level3(ralt_switch)" -}; - - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - - // Modifies the basic Norwegian layout to eliminate dead keys - include "macintosh_vndr/no(basic)" - name[Group1]= "Norway - Mac, eliminate dead keys"; - - key { [ grave, acute, acute, ogonek ] }; - key { [ diaeresis, asciicircum, asciitilde, macron ] }; - -}; +partial default alphanumeric_keys +xkb_symbols "basic" { + + // Describes the differences between a very simple en_US + // keyboard and a very simple Norwegian keybaord + + include "latin" + + name[Group1]= "Norway - Mac"; + + key { [ bar, section ] }; + key { [ 2, quotedbl, at, oneeighth ] }; + key { [ 4, currency, dollar, dollar ] }; + key { [ 3, numbersign, sterling, sterling ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash, bar, backslash ] }; + key { [ 8, parenleft, bracketleft, braceleft ] }; + key { [ 9, parenright, bracketright, braceright ] }; + key { [ 0, equal ] }; + + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + key { [ oslash, Ooblique, odiaeresis, Odiaeresis ] }; + key { [ plus, question ] }; + key { [ ae, AE ] }; + key { [ aring, Aring ] }; + key { [ dead_grave, dead_acute, acute, dead_ogonek ] }; + key { [ diaeresis, asciicircum, asciitilde, dead_macron ] }; + key { [ at, asterisk ] }; + key { [ less, greater ] }; + + // End alphanumeric section + + include "eurosign(e)" + include "level3(ralt_switch)" +}; + + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + + // Modifies the basic Norwegian layout to eliminate dead keys + include "macintosh_vndr/no(basic)" + name[Group1]= "Norway - Mac, eliminate dead keys"; + + key { [ grave, acute, acute, ogonek ] }; + key { [ diaeresis, asciicircum, asciitilde, macron ] }; + +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt index 8c3b7173c..01ac86d85 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt @@ -1,61 +1,61 @@ -// mac version from Ricardo Cabral - -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple en_US - // keyboard and a very simple Portuguese keybaord - - include "latin" - - name[Group1]= "Portugal - Mac"; - - key { [ less, greater, bar, brokenbar ] }; - key { [ 2, quotedbl, at, oneeighth ] }; - key { [ 4, dollar, section, dollar ] }; - key { [ 3, numbersign, sterling, sterling ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash ] }; - key { [ 8, parenleft, bracketleft, braceleft ] }; - key { [ 9, parenright, bracketright, braceright ] }; - key { [ 0, equal ] }; - key { [ apostrophe, question ] }; - key { [ plus, asterisk, dead_diaeresis ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ ccedilla, Ccedilla ] }; - key { [ dead_tilde, dead_circumflex ] }; - key { [ backslash, bar ] }; - key { [ masculine, ordfeminine ] }; - key { [ dead_acute, dead_grave ] }; - // End alphanumeric section - - include "eurosign(e)" - include "level3(ralt_switch)" -}; - -partial alphanumeric_keys -xkb_symbols "Sundeadkeys" { - include "macintosh_vndr/pt(basic)" // for consistent naming - name[Group1]= "Portugal - Mac, Sun dead keys"; - - key { [ plus, asterisk, SunFA_Diaeresis, SunFA_Diaeresis ] }; - key { [ SunFA_Tilde, SunFA_Circum ] }; - key { [ SunFA_Acute, SunFA_Grave ] }; -}; - -partial alphanumeric_keys -xkb_symbols "sundeadkeys" { - include "macintosh_vndr/pt(Sundeadkeys)" // for consistent naming -}; - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - include "macintosh_vndr/pt(basic)" // for consistent naming - name[Group1]= "Portugal - Mac, eliminate dead keys"; - - key { [ plus, asterisk, quotedbl, quotedbl ] }; - key { [ asciitilde, asciicircum ] }; - key { [ acute, grave ] }; -}; +// mac version from Ricardo Cabral + +partial default alphanumeric_keys +xkb_symbols "basic" { + + // Describes the differences between a very simple en_US + // keyboard and a very simple Portuguese keybaord + + include "latin" + + name[Group1]= "Portugal - Mac"; + + key { [ less, greater, bar, brokenbar ] }; + key { [ 2, quotedbl, at, oneeighth ] }; + key { [ 4, dollar, section, dollar ] }; + key { [ 3, numbersign, sterling, sterling ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash ] }; + key { [ 8, parenleft, bracketleft, braceleft ] }; + key { [ 9, parenright, bracketright, braceright ] }; + key { [ 0, equal ] }; + key { [ apostrophe, question ] }; + key { [ plus, asterisk, dead_diaeresis ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + key { [ ccedilla, Ccedilla ] }; + key { [ dead_tilde, dead_circumflex ] }; + key { [ backslash, bar ] }; + key { [ masculine, ordfeminine ] }; + key { [ dead_acute, dead_grave ] }; + // End alphanumeric section + + include "eurosign(e)" + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "Sundeadkeys" { + include "macintosh_vndr/pt(basic)" // for consistent naming + name[Group1]= "Portugal - Mac, Sun dead keys"; + + key { [ plus, asterisk, SunFA_Diaeresis, SunFA_Diaeresis ] }; + key { [ SunFA_Tilde, SunFA_Circum ] }; + key { [ SunFA_Acute, SunFA_Grave ] }; +}; + +partial alphanumeric_keys +xkb_symbols "sundeadkeys" { + include "macintosh_vndr/pt(Sundeadkeys)" // for consistent naming +}; + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + include "macintosh_vndr/pt(basic)" // for consistent naming + name[Group1]= "Portugal - Mac, eliminate dead keys"; + + key { [ plus, asterisk, quotedbl, quotedbl ] }; + key { [ asciitilde, asciicircum ] }; + key { [ acute, grave ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se index 56d77bd0f..d2d05f248 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se @@ -1,44 +1,44 @@ -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple en_US - // keyboard and a very simple Swedish(Sweden) keybaord - - include "latin" - - name[Group1]= "Sweden - Mac"; - - key { [ section, degree ] }; - - key { [ 1, exclam, copyright, exclamdown ] }; - key { [ 2, quotedbl, at, oneeighth ] }; - key { [ 3, numbersign, sterling, yen ] }; - key { [ 4, currency, dollar, cent ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash, bar, backslash ] }; - key { [ 8, parenleft, bracketleft, braceleft ] }; - key { [ 9, parenright, bracketright, braceright ] }; - key { [ comma, semicolon ] }; - key { [ 0, equal ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; - key { [ plus, question ] }; - key { [ adiaeresis, Adiaeresis, ae, AE ] }; - key { [ aring, Aring ] }; - key { [ acute, grave ] }; - key { [ diaeresis, asciicircum, asciitilde ] }; - key { [ apostrophe, asterisk, at ] }; - key { [ less, greater, bar, brokenbar ] }; - - include "kpdl(comma)" - include "eurosign(e)" - include "level3(ralt_switch)" -}; - - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - include "macintosh_vndr/se(basic)" // for consistent naming - name[Group1]= "Sweden - Mac, eliminate dead keys"; -}; +partial default alphanumeric_keys +xkb_symbols "basic" { + + // Describes the differences between a very simple en_US + // keyboard and a very simple Swedish(Sweden) keybaord + + include "latin" + + name[Group1]= "Sweden - Mac"; + + key { [ section, degree ] }; + + key { [ 1, exclam, copyright, exclamdown ] }; + key { [ 2, quotedbl, at, oneeighth ] }; + key { [ 3, numbersign, sterling, yen ] }; + key { [ 4, currency, dollar, cent ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash, bar, backslash ] }; + key { [ 8, parenleft, bracketleft, braceleft ] }; + key { [ 9, parenright, bracketright, braceright ] }; + key { [ comma, semicolon ] }; + key { [ 0, equal ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; + key { [ plus, question ] }; + key { [ adiaeresis, Adiaeresis, ae, AE ] }; + key { [ aring, Aring ] }; + key { [ acute, grave ] }; + key { [ diaeresis, asciicircum, asciitilde ] }; + key { [ apostrophe, asterisk, at ] }; + key { [ less, greater, bar, brokenbar ] }; + + include "kpdl(comma)" + include "eurosign(e)" + include "level3(ralt_switch)" +}; + + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + include "macintosh_vndr/se(basic)" // for consistent naming + name[Group1]= "Sweden - Mac, eliminate dead keys"; +}; -- cgit v1.2.3