xkbdesc/symbols/macintosh_vndr apple, 1.1, 1.2 ch, 1.5, 1.6 de, 1.3,
1.4 dk, 1.2, 1.3 es, 1.2, 1.3 fi, 1.3, 1.4 fr, 1.3, 1.4 gb,
1.1, 1.2 is, 1.3, 1.4 it, 1.2, 1.3 nl, 1.2, 1.3 no, 1.2,
1.3 pt, 1.2, 1.3 se, 1.3, 1.4 us, 1.2, 1.3
Sergey V. Oudaltsov
xlibs-commit at pdx.freedesktop.org
Sun Sep 17 13:03:36 PDT 2006
- Previous message: xkbdesc/symbols keypad,1.2,1.3 pc,1.4,1.5 us,1.17,1.18
- Next message: xkbdesc/rules base.m_t.part, 1.3, 1.4 base.ml1_s.part, 1.7,
1.8 base.ml_s.part, 1.10, 1.11 base.o_t.part, 1.3,
1.4 base.xml.in, 1.148, 1.149 merge.sh, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: svu
Update of /cvs/xlibs/xkbdesc/symbols/macintosh_vndr
In directory kemper:/tmp/cvs-serv18470/symbols/macintosh_vndr
Modified Files:
apple ch de dk es fi fr gb is it nl no pt se us
Log Message:
b.fd.o#8280,b.fd.o#8312
Index: apple
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/macintosh_vndr/apple,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apple 6 May 2004 00:05:33 -0000 1.1
+++ apple 17 Sep 2006 20:03:34 -0000 1.2
@@ -42,19 +42,13 @@
// the fn-keypad, so use the Enter key (right of <SPC>) for Mode_switch,
// and use fn+Enter (Apple's code for Menu) for KP_Enter.
replace key <KPEN> { [ ISO_Level3_Shift ] };
- modifier_map Mod2 { ISO_Level3_Shift };
+ modifier_map Mod5 { ISO_Level3_Shift };
// Linux kernel bug with Menu on macs means this doesn't work yet
// replace key <MENU> { [ KP_Enter ] }; // should be keycode 117
};
partial modifier_keys
xkb_symbols "laptop_bad_switch" {
+ // Kept for backward compatibility
include "macintosh_vndr/apple(laptop)"
-
- // Before XFree86 4.3, most keymaps were configured to generate the
- // third-level shift from the second group as opposed to the third-level
- // of the first group. These keymaps require this mapping to work as
- // expected.
- replace key <KPEN> { [ Mode_switch ] };
- modifier_map Mod2 { Mode_switch };
};
Index: ch
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/macintosh_vndr/ch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ch 19 Apr 2006 22:23:15 -0000 1.5
+++ ch 17 Sep 2006 20:03:34 -0000 1.6
@@ -7,116 +7,68 @@
partial alphanumeric_keys
xkb_symbols "extended" {
- name[Group1]= "Swiss German Apple Extended Keyboard II";
+ name[Group1]= "Switzerland - German, Mac";
// Alphanumeric section
- key <AE01> { [ 1, plus ],
- [ plusminus, infinity ] };
- key <AE02> { [ 2, quotedbl ],
- [leftdoublequotemark, rightdoublequotemark ] };
- key <AE03> { [ 3, asterisk ],
- [ numbersign, leftcaret ] };
+ key <AE01> { [ 1, plus, plusminus, infinity ] };
+ key <AE02> { [ 2, quotedbl, leftdoublequotemark, rightdoublequotemark ] };
+ key <AE03> { [ 3, asterisk, numbersign, leftcaret ] };
// not displayed here
- key <AE04> { [ 4, ccedilla ],
- [ Ccedilla, slash ] };
- key <AE05> { [ 5, percent ],
- [ bracketleft ] };
- key <AE06> { [ 6, ampersand ],
- [ bracketright ] };
- key <AE07> { [ 7, slash ],
- [ bar, backslash ] };
- key <AE08> { [ 8, parenleft ],
- [ braceleft, Ograve ] };
- key <AE09> { [ 9, parenright ],
- [ braceright, Ocircumflex ] };
- key <AE10> { [ 0, equal ],
- [ notequal, Uacute ] };
- key <AE11> { [ apostrophe, question ],
- [ questiondown, NoSymbol ] };
- key <AE12> { [ dead_circumflex,dead_grave ],
- [ dead_acute, asciicircum ] };
- key <AD01> { [ q, Q ],
- [ oe, OE ] };
- key <AD02> { [ w, W ],
- [ Greek_SIGMA, Aacute ] };
- key <AD03> { [ e, E ],
- [ EuroSign, Ediaeresis ] };
- key <AD04> { [ r, R ],
- [ registered, Egrave ] };
- key <AD05> { [ t, T ],
- [ dagger, Icircumflex ] };
- key <AD06> { [ z, Z ],
- [ Greek_OMEGA, Iacute ] };
- key <AD07> { [ u, U ],
- [ degree, Ugrave ] };
- key <AD08> { [ i, I ],
- [ exclamdown, idotless ] };
- key <AD09> { [ o, O ],
- [ oslash, Ooblique ] };
- key <AD10> { [ p, P ],
- [ Greek_pi, Greek_PI ] };
- key <AD11> { [ udiaeresis, egrave ],
- [ section, ydiaeresis ] };
- key <AD12> { [ dead_diaeresis, exclam ],
- [ grave, apostrophe ] };
- key <AC01> { [ a, A ],
- [ aring, Aring ] };
- key <AC02> { [ s, S ],
- [ ssharp, NoSymbol ] };
+ key <AE04> { [ 4, ccedilla, Ccedilla, slash ] };
+ key <AE05> { [ 5, percent, bracketleft ] };
+ key <AE06> { [ 6, ampersand, bracketright ] };
+ key <AE07> { [ 7, slash, bar, backslash ] };
+ key <AE08> { [ 8, parenleft, braceleft, Ograve ] };
+ key <AE09> { [ 9, parenright, braceright, Ocircumflex ] };
+ key <AE10> { [ 0, equal, notequal, Uacute ] };
+ key <AE11> { [ apostrophe, question, questiondown, NoSymbol ] };
+ key <AE12> { [ dead_circumflex,dead_grave, dead_acute, asciicircum ] };
+ key <AD01> { [ q, Q, oe, OE ] };
+ key <AD02> { [ w, W, Greek_SIGMA, Aacute ] };
+ key <AD03> { [ e, E, EuroSign, Ediaeresis ] };
+ key <AD04> { [ r, R, registered, Egrave ] };
+ key <AD05> { [ t, T, dagger, Icircumflex ] };
+ key <AD06> { [ z, Z, Greek_OMEGA, Iacute ] };
+ key <AD07> { [ u, U, degree, Ugrave ] };
+ key <AD08> { [ i, I, exclamdown, idotless ] };
+ key <AD09> { [ o, O, oslash, Ooblique ] };
+ key <AD10> { [ p, P, Greek_pi, Greek_PI ] };
+ key <AD11> { [ udiaeresis, egrave, section, ydiaeresis ] };
+ key <AD12> { [ dead_diaeresis, exclam, grave, apostrophe ] };
+ key <AC01> { [ a, A, aring, Aring ] };
+ key <AC02> { [ s, S, ssharp, NoSymbol ] };
// ligature fl
- key <AC03> { [ d, D ],
- [ Greek_sigma, NoSymbol ] };
+ key <AC03> { [ d, D, Greek_sigma, NoSymbol ] };
// partialderivative is not available here att
- key <AC04> { [ f, F ],
- [ function, doubledagger ] };
- key <AC05> { [ g, G ],
- [ at, comma ] };
- key <AC06> { [ h, H ],
- [ ordfeminine, periodcentered ] };
- key <AC07> { [ j, J ],
- [ masculine, eth ] };
- key <AC08> { [ k, K ],
- [ Greek_DELTA, macron ] };
- key <AC09> { [ l, L ],
- [ notsign, caret ] };
- key <AC10> { [ odiaeresis, eacute ],
- [ cent, breve ] };
- key <AC11> { [ adiaeresis, agrave ],
- [ ae, AE ] };
- key <AB01> { [ y, Y ],
- [ yen, Ydiaeresis ] };
- key <AB02> { [ x, X ],
- [ similarequal, trademark ] };
- key <AB03> { [ c, C ],
- [ copyright, NoSymbol ] };
- key <AB04> { [ v, V ],
- [ radical, diamond ] };
- key <AB05> { [ b, B ],
- [ integral, NoSymbol ] };
- key <AB06> { [ n, N ],
- [ dead_tilde, enopencircbullet ] };
+ key <AC04> { [ f, F, function, doubledagger ] };
+ key <AC05> { [ g, G, at, comma ] };
+ key <AC06> { [ h, H, ordfeminine, periodcentered ] };
+ key <AC07> { [ j, J, masculine, eth ] };
+ key <AC08> { [ k, K, Greek_DELTA, macron ] };
+ key <AC09> { [ l, L, notsign, caret ] };
+ key <AC10> { [ odiaeresis, eacute, cent, breve ] };
+ key <AC11> { [ adiaeresis, agrave, ae, AE ] };
+ key <AB01> { [ y, Y, yen, Ydiaeresis ] };
+ key <AB02> { [ x, X, similarequal, trademark ] };
+ key <AB03> { [ c, C, copyright, NoSymbol ] };
+ key <AB04> { [ v, V, radical, diamond ] };
+ key <AB05> { [ b, B, integral, NoSymbol ] };
+ key <AB06> { [ n, N, dead_tilde, enopencircbullet ] };
// to be fixed att
- key <AB07> { [ m, M ],
- [ mu, dead_abovering ] };
+ key <AB07> { [ m, M, mu, dead_abovering ] };
// not sure att
- key <AB08> { [ comma, semicolon ],
- [ guillemotleft, guillemotright ] };
- key <AB09> { [ period, colon ],
- [ ellipsis, division ] };
- key <AB10> { [ minus, underscore ],
- [ hyphen, emdash ] };
- key <TLDE> { [ section, degree ],
- [ NoSymbol, NoSymbol ] };
+ key <AB08> { [ comma, semicolon, guillemotleft, guillemotright ] };
+ key <AB09> { [ period, colon, ellipsis, division ] };
+ key <AB10> { [ minus, underscore, hyphen, emdash ] };
+ key <TLDE> { [ section, degree, NoSymbol, NoSymbol ] };
// ligature fi // per mille
- key <SPCE> { [ space ],
- [ nobreakspace, nobreakspace ] };
- key <LSGT> { [ less, greater ],
- [ lessthanequal, greaterthanequal ] };
- key <BKSL> { [ dollar, sterling ],
- [ paragraph, enfilledcircbullet ] };
+ key <SPCE> { [ space, nobreakspace, nobreakspace ] };
+ key <LSGT> { [ less, greater, lessthanequal, greaterthanequal ] };
+ key <BKSL> { [ dollar, sterling, paragraph, enfilledcircbullet ] };
include "keypad(comma)"
+ include "level3(ralt_switch)"
};
partial alphanumeric_keys
@@ -131,22 +83,20 @@
// keyboard and a very simple Swiss/French keybaord
include "macintosh_vndr/ch(extended)"
- name[Group1]= "Swiss French";
+ name[Group1]= "Switzerland - French, Mac";
override key <AD11> {
- [ egrave, udiaeresis ],
- [ bracketleft ]
+ [ egrave, udiaeresis, bracketleft ]
};
override key <AC10> {
[ eacute, odiaeresis ]
};
override key <AC11> {
- [ agrave, adiaeresis ],
- [ braceleft ]
+ [ agrave, adiaeresis, braceleft ]
};
};
partial alphanumeric_keys
xkb_symbols "nodeadkeys" {
- include "macintosh_vndr/fr_CH" // for consistent naming
+ include "macintosh_vndr/ch(fr)" // for consistent naming
};
Index: de
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/macintosh_vndr/de,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- de 19 Apr 2006 22:23:15 -0000 1.3
+++ de 17 Sep 2006 20:03:34 -0000 1.4
@@ -9,110 +9,70 @@
// Describes the differences between a very simple US/ASCII
// keyboard and a very simple German keybaord
+ include "latin"
+ name[Group1]= "Germany - Mac";
+
// Alphanumeric section
- name[Group1]= "German";
- key <TLDE> { [ dead_circumflex, degree ],
- [ notsign ] };
- key <AE01> { [ 1, exclam ],
- [ exclamdown, at ] };
- key <AE02> { [ 2, quotedbl ],
- [ twosuperior ] };
- key <AE03> { [ 3, section ],
- [ threesuperior,sterling ] };
- key <AE04> { [ 4, dollar ],
- [ onequarter, currency ] };
- key <AE05> { [ 5, percent ],
- [ bracketleft ] };
- key <AE06> { [ 6, ampersand ],
- [ bracketright ] };
- key <AE07> { [ 7, slash ],
- [ bar, backslash ] };
- key <AE08> { [ 8, parenleft ],
- [ braceleft, asciitilde ] };
- key <AE09> { [ 9, parenright ],
- [braceright ] };
- key <AE10> { [ 0, equal ],
- [ braceright, degree ] };
- key <AE11> { [ ssharp, question ],
- [ backslash, questiondown ] };
- key <AE12> { [ dead_acute, dead_grave ],
- [ dead_cedilla ] };
+ key <TLDE> { [ dead_circumflex, degree, notsign ] };
+ key <AE01> { [ 1, exclam, exclamdown, at ] };
+ key <AE02> { [ 2, quotedbl, twosuperior ] };
+ key <AE03> { [ 3, section, threesuperior,sterling ] };
+ key <AE04> { [ 4, dollar, onequarter, currency ] };
+ key <AE05> { [ 5, percent, bracketleft ] };
+ key <AE06> { [ 6, ampersand, bracketright ] };
+ key <AE07> { [ 7, slash, bar, backslash ] };
+ key <AE08> { [ 8, parenleft, braceleft, asciitilde ] };
+ key <AE09> { [ 9, parenright, braceright ] };
+ key <AE10> { [ 0, equal, braceright, degree ] };
+ key <AE11> { [ ssharp, question, backslash, questiondown ] };
+ key <AE12> { [ dead_acute, dead_grave, dead_cedilla ] };
- key <AD01> { [ q, Q ],
- [guillemotleft,guillemotright ] };
- key <AD03> { [ e, E ],
- [ EuroSign ] };
- key <AD04> { [ r, R ],
- [ registered ] };
+ key <AD01> { [ q, Q, guillemotleft,guillemotright ] };
+ key <AD03> { [ e, E, EuroSign ] };
+ key <AD04> { [ r, R, registered ] };
key <AD05> { [ t, T ] };
key <AD06> { [ z, Z ] };
- key <AD07> { [ u, U ],
- [diaeresis, Aacute ] };
- key <AD08> { [ i, I ],
- [ slash, Ucircumflex ] };
- key <AD09> { [ o, O ],
- [ oslash, Ooblique ] };
- key <AD11> { [ udiaeresis, Udiaeresis ],
- [ periodcentered, degree ] };
- key <AD12> { [ plus, asterisk ],
- [ asciitilde ] };
- key <AC01> { [ a, A ],
- [ aring, Aring ] };
+ key <AD07> { [ u, U, diaeresis, Aacute ] };
+ key <AD08> { [ i, I, slash, Ucircumflex ] };
+ key <AD09> { [ o, O, oslash, Ooblique ] };
+ key <AD11> { [ udiaeresis, Udiaeresis, periodcentered, degree ] };
+ key <AD12> { [ plus, asterisk, asciitilde ] };
+ key <AC01> { [ a, A, aring, Aring ] };
key <AC04> { [ f, F ] };
- key <AC05> { [ g, G ],
- [ copyright ] };
- key <AC06> { [ h, H ],
- [ ordfeminine ] };
- key <AC09> { [ l, L ],
- [ at ] };
- key <AC10> { [ odiaeresis, Odiaeresis ],
- [ dead_acute ] };
- key <AC11> { [ adiaeresis, Adiaeresis ],
- [ dead_circumflex ] };
+ key <AC05> { [ g, G, copyright ] };
+ key <AC06> { [ h, H, ordfeminine ] };
+ key <AC09> { [ l, L, at ] };
+ key <AC10> { [ odiaeresis, Odiaeresis, dead_acute ] };
+ key <AC11> { [ adiaeresis, Adiaeresis, dead_circumflex ] };
- key <LSGT> { [ less, greater ],
- [ bar ] };
- key <AB01> { [ y, Y ],
- [ guillemotleft,less ] };
- key <AB06> { [ n, N ],
- [asciitilde ] };
- key <AB07> { [ m, M ],
- [ mu ] };
+ key <LSGT> { [ less, greater, bar ] };
+ key <AB01> { [ y, Y, guillemotleft,less ] };
+ key <AB06> { [ n, N, asciitilde ] };
+ key <AB07> { [ m, M, mu ] };
key <AB08> { [ comma, semicolon ] };
- key <AB09> { [ period, colon ],
- [ periodcentered, division ] };
+ key <AB09> { [ period, colon, periodcentered, division ] };
key <AB10> { [ minus, underscore ] };
- key <BKSL> { [ numbersign, apostrophe ],
- [ dead_grave ] };
+ key <BKSL> { [ numbersign, apostrophe, dead_grave ] };
include "keypad(comma)"
+ include "level3(ralt_switch)"
- // begin modifier mappings
-// modifier_map Shift { Shift_L };
-// modifier_map Lock { Caps_Lock };
-// modifier_map Control{ Control_L };
-// modifier_map Mod3 { Mode_switch };
};
partial alphanumeric_keys
xkb_symbols "Sundeadkeys" {
// modify the default German layout to use Sun dead keys
include "macintosh_vndr/de(basic)"
- key <TLDE> { [ SunFA_Circum, degree ],
- [ notsign ] };
- key <AE12> { [ SunFA_Acute, SunFA_Grave ],
- [ SunFA_Cedilla ] };
- key <AD11> { [ udiaeresis, Udiaeresis ],
- [ SunFA_Diaeresis ] };
- key <AD12> { [ plus, asterisk ],
- [ SunFA_Tilde, dead_macron ] };
- key <AC10> { [ odiaeresis, Odiaeresis ],
- [ SunFA_Acute ] };
- key <AC11> { [ adiaeresis, Adiaeresis ],
- [ SunFA_Circum ] };
+ name[Group1]= "Germany - Mac, Sun dead keys";
- key <BKSL> { [ numbersign, acute ],
- [ SunFA_Grave ] };
+ key <TLDE> { [ SunFA_Circum, degree, notsign ] };
+ key <AE12> { [ SunFA_Acute, SunFA_Grave, SunFA_Cedilla ] };
+ key <AD11> { [ udiaeresis, Udiaeresis, SunFA_Diaeresis ] };
+ key <AD12> { [ plus, asterisk, SunFA_Tilde, dead_macron ] };
+ key <AC10> { [ odiaeresis, Odiaeresis, SunFA_Acute ] };
+ key <AC11> { [ adiaeresis, Adiaeresis, SunFA_Circum ] };
+
+ key <BKSL> { [ numbersign, acute, SunFA_Grave ] };
};
partial alphanumeric_keys
@@ -124,19 +84,14 @@
xkb_symbols "nodeadkeys" {
// modify the default German layout to not have any dead keys
include "macintosh_vndr/de(basic)"
- key <TLDE> { [ asciicircum, degree ],
- [ notsign ] };
- key <AE12> { [ acute, grave ],
- [ cedilla ] };
- key <AD11> { [ udiaeresis, Udiaeresis ],
- [ diaeresis ] };
- key <AD12> { [ plus, asterisk ],
- [ asciitilde, macron ] };
- key <AC10> { [ odiaeresis, Odiaeresis ],
- [ acute ] };
- key <AC11> { [ adiaeresis, Adiaeresis ],
- [ asciicircum ] };
+ name[Group1]= "Germany - Mac, eliminate dead keys";
- key <BKSL> { [ numbersign, apostrophe ],
- [ grave ] };
+ key <TLDE> { [ asciicircum, degree, notsign ] };
+ key <AE12> { [ acute, grave, cedilla ] };
+ key <AD11> { [ udiaeresis, Udiaeresis, diaeresis ] };
+ key <AD12> { [ plus, asterisk, asciitilde, macron ] };
+ key <AC10> { [ odiaeresis, Odiaeresis, acute ] };
+ key <AC11> { [ adiaeresis, Adiaeresis, asciicircum ] };
+
+ key <BKSL> { [ numbersign, apostrophe, grave ] };
};
Index: dk
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/macintosh_vndr/dk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dk 6 May 2004 00:05:33 -0000 1.2
+++ dk 17 Sep 2006 20:03:34 -0000 1.3
@@ -7,71 +7,44 @@
// keyboard and a Danish keyboard with dead key support
// and all of ISO-8859-1 characters available.
- name[Group1]= "Danish";
-
- key <TLDE> { [ onehalf, section ],
- [ threequarters, paragraph ]};
- key <LSGT> { [ less, greater ],
- [ backslash, notsign ]};
- key <SPCE> { [ space, space ],
- [ nobreakspace, nobreakspace ]};
- key <AE01> { [ 1, exclam ],
- [ exclamdown, onesuperior ]};
- key <AE02> { [ 2, quotedbl ],
- [ at, twosuperior ]};
- key <AE03> { [ 3, numbersign ],
- [ sterling, threesuperior ]};
- key <AE04> { [ 4, currency ],
- [ dollar, onequarter ]};
- key <AE05> { [ 5, percent ],
- [ NoSymbol, cent ]};
- key <AE06> { [ 6, ampersand ],
- [ yen, NoSymbol ]};
- key <AE07> { [ 7, slash ],
- [ braceleft, division ]};
- key <AE08> { [ 8, parenleft ],
- [ bracketleft, guillemotleft ]};
- key <AE09> { [ 9, parenright ],
- [ bracketright, guillemotright ]};
- key <AE10> { [ 0, equal ],
- [ braceright, degree ]};
- key <AB08> { [ comma, semicolon ],
- [ dead_cedilla, dead_ogonek ]};
- key <AB09> { [ period, colon ],
- [ periodcentered, dead_abovedot ]};
- key <AB03> { [ c, C ],
- [ copyright, NoSymbol ]};
- 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 <AD04> { [ r, R ],
- [ registered, NoSymbol ]};
- key <AD05> { [ t, T ],
- [ thorn, THORN ]};
- key <AD08> { [ i, I ],
- [ NoSymbol, NoSymbol ]};
- key <AD09> { [ o, O ],
- [ oe, OE ]};
- key <AC10> { [ ae, AE ]};
- key <AE11> { [ plus, question ],
- [ plusminus, questiondown ]};
- key <AC11> { [ oslash, Ooblique ]};
- key <BKSL> { [ apostrophe, asterisk ],
- [dead_doubleacute, multiply ]};
- key <AD11> { [ aring, Aring ]};
- key <AE12> { [ dead_acute, dead_grave ],
- [ bar, brokenbar ]};
- key <AD12> { [ dead_diaeresis, dead_circumflex ],
- [ dead_tilde, dead_caron ]};
+ include "latin"
+ name[Group1]= "Denmark - Mac";
+ key <TLDE> { [ onehalf, section, threequarters, paragraph ]};
+ key <LSGT> { [ less, greater, backslash, notsign ]};
+ key <SPCE> { [ space, space, nobreakspace, nobreakspace ]};
+ key <AE01> { [ 1, exclam, exclamdown, onesuperior ]};
+ key <AE02> { [ 2, quotedbl, at, twosuperior ]};
+ key <AE03> { [ 3, numbersign, sterling, threesuperior ]};
+ key <AE04> { [ 4, currency, dollar, onequarter ]};
+ key <AE05> { [ 5, percent, NoSymbol, cent ]};
+ key <AE06> { [ 6, ampersand, yen, NoSymbol ]};
+ key <AE07> { [ 7, slash, braceleft, division ]};
+ key <AE08> { [ 8, parenleft, bracketleft, guillemotleft ]};
+ key <AE09> { [ 9, parenright, bracketright, guillemotright ]};
+ key <AE10> { [ 0, equal, braceright, degree ]};
+ key <AB08> { [ comma, semicolon, dead_cedilla, dead_ogonek ]};
+ key <AB09> { [ period, colon, periodcentered, dead_abovedot ]};
+ key <AB03> { [ c, C, copyright, NoSymbol ]};
+ 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 <AD04> { [ r, R, registered, NoSymbol ]};
+ key <AD05> { [ t, T, thorn, THORN ]};
+ key <AD08> { [ i, I, NoSymbol, NoSymbol ]};
+ key <AD09> { [ o, O, oe, OE ]};
+ key <AC10> { [ ae, AE ]};
+ key <AE11> { [ plus, question, plusminus, questiondown ]};
+ key <AC11> { [ oslash, Ooblique ]};
+ key <BKSL> { [ apostrophe, asterisk, dead_doubleacute, multiply ]};
+ key <AD11> { [ aring, Aring ]};
+ key <AE12> { [ dead_acute, dead_grave, bar, brokenbar ]};
+ key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ]};
// End alphanumeric section
+ include "level3(ralt_switch)"
};
@@ -85,8 +58,8 @@
partial alphanumeric_keys
xkb_symbols "nodeadkeys" {
include "macintosh_vndr/dk(basic)"
- key <AE12> { [ acute, grave ],
- [ bar, ogonek ] };
- key <AD12> { [ diaeresis, asciicircum ],
- [ asciitilde, dead_macron ] };
+ name[Group1]= "Denmark - Mac, eliminate dead keys";
+
+ key <AE12> { [ acute, grave, bar, ogonek ] };
+ key <AD12> { [ diaeresis, asciicircum, asciitilde, dead_macron ] };
};
Index: es
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/macintosh_vndr/es,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- es 13 Sep 2004 18:49:30 -0000 1.2
+++ es 17 Sep 2006 20:03:34 -0000 1.3
@@ -5,44 +5,34 @@
// Describes the differences between a very simple mac_US
// keyboard and a very simple Spanish keybaord
- name[Group1]= "Spanish";
+ include "latin"
+ 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 <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 <AE12> { [ equal, plus, plusminus ] };
key <AD11> { [ dead_grave, degree ] };
- key <AD12> { [ dead_acute, dead_diaeresis ],
- [ bar ] };
+ 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 <AC10> { [ ntilde, Ntilde, asciitilde, dead_doubleacute ] };
key <AC11> { [ semicolon, colon ] };
key <BKSL> { [ apostrophe, quotedbl ] };
// End alphanumeric section
+ include "level3(ralt_switch)"
};
Index: fi
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/macintosh_vndr/fi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fi 13 Sep 2004 18:49:30 -0000 1.3
+++ fi 17 Sep 2006 20:03:34 -0000 1.4
@@ -5,8 +5,8 @@
// Describes the differences between a very simple mac_US
// keyboard and a very simple Swedish(Finland) keybaord
- name[Group1]= "Finnish";
include "macintosh_vndr/se(basic)" // for consistent naming
+ name[Group1]= "Finland - Mac";
};
@@ -14,4 +14,5 @@
partial alphanumeric_keys
xkb_symbols "nodeadkeys" {
include "macintosh_vndr/se(basic)" // for consistent naming
+ name[Group1]= "Finland - Mac, eliminate dead keys";
};
Index: fr
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/macintosh_vndr/fr,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fr 10 Oct 2005 17:30:39 -0000 1.3
+++ fr 17 Sep 2006 20:03:34 -0000 1.4
@@ -22,197 +22,68 @@
xkb_symbols "extended" {
- name[Group1]= "FR-1";
- key <ESC> { [ Escape ] };
+ name[Group1]= "France - Mac";
// Alphanumeric section
- key <TLDE> { [ at, numbersign ],
- [periodcentered, Ydiaeresis ] }; // MISSING: Ydiaeresis; eherlent : ok in Latin9
- key <ENTR> { [ KP_Enter ] };
- 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 ] };
- key <AE06> { [ section, 6 ], // CHECK section
- [ 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 <BKSP> { [ BackSpace, VoidSymbol ],
- [ Delete, VoidSymbol ] };
+ 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 <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 ],
- [ 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
+ 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
- key <CAPS> { [ Caps_Lock ] };
- 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 <RTRN> { [ Return ] };
+ 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 <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, 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 <SPCE> { [ space, space ],
- [nobreakspace, nobreakspace ] };
+ key <SPCE> { [ space, space, nobreakspace, nobreakspace ] };
// End alphanumeric section
- // Begin modifier mappings
- key <LWIN> { [ Alt_L, Meta_L ] };
- key <LFSH> { [ Shift_L ] };
- key <LCTL> { [ Control_L ] };
- key <LALT> { [ Mode_switch ] };
- key <RMTA> { [ Meta_R ] };
- key <RTSH> { [ Shift_R ] };
- key <RCTL> { [ Control_R ] };
- key <RALT> { [ script_switch ] };
- // End modifier mappings
-
- // Begin "Function" section
- key <FK01> { [ F1 ] };
- key <FK02> { [ F2 ] };
- key <FK03> { [ F3 ] };
- key <FK04> { [ F4 ] };
- key <FK05> { [ F5 ] };
- key <FK06> { [ F6 ] };
- key <FK07> { [ F7 ] };
- key <FK08> { [ F8 ] };
- key <FK09> { [ F9 ] };
- key <FK10> { [ F10 ] };
- key <FK11> { [ F11 ] };
- key <FK12> { [ F12 ] };
- key <FK13> { [ F13, Print ] };
- key <FK14> { [ F14, Scroll_Lock ] };
- key <FK15> { [ F15, Pause ] };
- // End "Function" section
-
- // Begin "Editing" section
- key <INS> { [ Insert ] };
- key <HOME> { [ Home ] };
- key <PGUP> { [ Prior ] };
- key <DELE> { [ Delete ] };
- key <END> { [ End ] };
- key <PGDN> { [ Next ] };
-
- key <UP> { [ Up ] };
- key <LEFT> { [ Left ] };
- key <DOWN> { [ Down ] };
- key <RGHT> { [ Right ] };
- // End "Editing" section
-
- // Begin "Keypad" section
- key <KPCL> { [ Clear ] };
- key <KPEQ> { [ KP_Equal ] };
- key <KPDV> { [ KP_Divide ] };
- key <KPMU> { [ KP_Multiply ] };
-
- key <KP7> { [ KP_7 ] };
- key <KP8> { [ KP_8 ] };
- key <KP9> { [ KP_9 ] };
- key <KPSU> { [ KP_Subtract ] };
-
- key <KP4> { [ KP_4 ] };
- key <KP5> { [ KP_5 ] };
- key <KP6> { [ KP_6 ] };
- key <KPAD> { [ KP_Add ] };
-
- key <KP1> { [ KP_1 ] };
- key <KP2> { [ KP_2 ] };
- key <KP3> { [ KP_3 ] };
- key <KPEN> { [ KP_Enter ] };
-
- key <KP0> { [ KP_0 ] };
key <KPDL> { [ comma,KP_Decimal ] };
- // End "Keypad" section
-
- // begin modifier mappings
- modifier_map Shift { Shift_L, Shift_R };
- modifier_map Lock { Caps_Lock };
- modifier_map Control{ Control_L, Control_R };
- modifier_map Mod1 { Meta_L, Meta_R };
- modifier_map Mod2 { Alt_L, Alt_R };
- modifier_map Mod3 { Mode_switch };
- // end modifier mappings
+ include "level3(ralt_switch)"
};
Index: gb
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/macintosh_vndr/gb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gb 5 May 2004 22:32:41 -0000 1.1
+++ gb 17 Sep 2006 20:03:34 -0000 1.2
@@ -6,14 +6,15 @@
// Describes the differences between a very simple en_US
// keyboard and a very simple U.K. keyboard layout
+ include "latin"
- name[Group1]= "Great Britain";
+ name[Group1]= "United Kingdom - Mac";
- key <AE03> { [ 3, sterling ],
- [ numbersign ] };
+ key <AE03> { [ 3, sterling, numbersign ] };
// End alphanumeric section
+ include "level3(ralt_switch)"
};
Index: is
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/macintosh_vndr/is,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- is 14 Jan 2006 22:28:55 -0000 1.3
+++ is 17 Sep 2006 20:03:34 -0000 1.4
@@ -57,135 +57,72 @@
partial default alphanumeric_keys
xkb_symbols "basic" {
- name[Group1]= "Icelandic";
+ name[Group1]= "Iceland - Mac";
//-- Row 5 (E) --//
- key <TLDE> { [ sterling, section ],
- [ UF8FF, apostrophe ] };
- key <AE01> { [ 1, exclam ],
- [ exclamdown, VoidSymbol ] };
- key <AE02> { [ 2, quotedbl ],
- [ at, VoidSymbol ] };
- key <AE03> { [ 3, numbersign ],
- [ U2122, sterling ] };
- key <AE04> { [ 4, dollar ],
- [ U00A2, EuroSign ] };
- key <AE05> { [ 5, percent ],
- [ U2030, infinity ] };
- key <AE06> { [ 6, ampersand ],
- [ asciicircum, U2044 ] };
- key <AE07> { [ 7, slash ],
- [ backslash, U00F7 ] };
- key <AE08> { [ 8, parenleft ],
- [ bracketleft, braceleft ] };
- key <AE09> { [ 9, parenright ],
- [ bracketright, braceright ] };
- key <AE10> { [ 0, equal ],
- [ U2260, U2248 ] };
- key <AE11> { [ odiaeresis, Odiaeresis ],
- [ oslash, Ooblique ] };
- key <AE12> { [ minus, underscore ],
- [ endash, emdash ] };
+ key <TLDE> { [ sterling, section, UF8FF, apostrophe ] };
+ key <AE01> { [ 1, exclam, exclamdown, VoidSymbol ] };
+ key <AE02> { [ 2, quotedbl, at, VoidSymbol ] };
+ key <AE03> { [ 3, numbersign, U2122, sterling ] };
+ key <AE04> { [ 4, dollar, U00A2, EuroSign ] };
+ key <AE05> { [ 5, percent, U2030, infinity ] };
+ key <AE06> { [ 6, ampersand, asciicircum, U2044 ] };
+ key <AE07> { [ 7, slash, backslash, U00F7 ] };
+ key <AE08> { [ 8, parenleft, bracketleft, braceleft ] };
+ key <AE09> { [ 9, parenright, bracketright, braceright ] };
+ key <AE10> { [ 0, equal, U2260, U2248 ] };
+ key <AE11> { [ odiaeresis, Odiaeresis, oslash, Ooblique ] };
+ key <AE12> { [ minus, underscore, endash, emdash ] };
//-- Row 4 (D) --//
- key <AD01> { [ q, Q ],
- [ paragraph, VoidSymbol ] };
- key <AD02> { [ w, W ],
- [ U2211, VoidSymbol ] };
- key <AD03> { [ e, E ],
- [ dead_grave, VoidSymbol ] };
- key <AD04> { [ r, R ],
- [ registered, VoidSymbol ] };
- key <AD05> { [ t, T ],
- [ degree, VoidSymbol ] };
- key <AD06> { [ y, Y ],
- [ yen, VoidSymbol ] };
- key <AD07> { [ u, U ],
- [ dead_diaeresis, VoidSymbol ] };
- key <AD08> { [ i, I ],
- [ U0131, U00AA ] };
- key <AD09> { [ o, O ],
- [ dead_circumflex,U00BA ] };
- key <AD10> { [ p, P ],
- [ Greek_pi, Greek_PI ] };
- key <AD11> { [ eth, Eth ],
- [ U201e, U201c ] };
- key <AD12> { [ apostrophe, question ],
- [ questiondown, U00B7 ] };
+ key <AD01> { [ q, Q, paragraph, VoidSymbol ] };
+ key <AD02> { [ w, W, U2211, VoidSymbol ] };
+ key <AD03> { [ e, E, dead_grave, VoidSymbol ] };
+ key <AD04> { [ r, R, registered, VoidSymbol ] };
+ key <AD05> { [ t, T, degree, VoidSymbol ] };
+ key <AD06> { [ y, Y, yen, VoidSymbol ] };
+ key <AD07> { [ u, U, dead_diaeresis, VoidSymbol ] };
+ key <AD08> { [ i, I, U0131, U00AA ] };
+ key <AD09> { [ o, O, dead_circumflex,U00BA ] };
+ key <AD10> { [ p, P, Greek_pi, Greek_PI ] };
+ key <AD11> { [ eth, Eth, U201e, U201c ] };
+ key <AD12> { [ apostrophe, question, questiondown, U00B7 ] };
//-- Row 3 (C) --//
- key <AC01> { [ a, A ],
- [ aring, Aring ] };
- key <AC02> { [ s, S ],
- [ ssharp, abovedot ] };
- key <AC03> { [ d, D ],
- [ U2202, U2DA ] };
- key <AC04> { [ f, F ],
- [ U192, macron ] };
- key <AC05> { [ g, G ],
- [ copyright, breve ] };
- key <AC06> { [ h, H ],
- [ bar, VoidSymbol ] };
- key <AC07> { [ j, J ],
- [ U2206, U2dd ] };
- key <AC08> { [ k, K ],
- [ U00AC, VoidSymbol ] };
- key <AC09> { [ l, L ],
- [ U2026, caron ] };
- key <AC10> { [ ae, AE ],
- [ oe, OE ] };
- key <AC11> { [ dead_acute, dead_diaeresis ],
- [ U201A, U2018 ] };
- key <BKSL> { [ plus, asterisk ],
- [ U2022, plusminus ] };
+ key <AC01> { [ a, A, aring, Aring ] };
+ key <AC02> { [ s, S, ssharp, abovedot ] };
+ key <AC03> { [ d, D, U2202, U2DA ] };
+ key <AC04> { [ f, F, U192, macron ] };
+ key <AC05> { [ g, G, copyright, breve ] };
+ key <AC06> { [ h, H, bar, VoidSymbol ] };
+ key <AC07> { [ j, J, U2206, U2dd ] };
+ key <AC08> { [ k, K, U00AC, VoidSymbol ] };
+ key <AC09> { [ l, L, U2026, caron ] };
+ key <AC10> { [ ae, AE, oe, OE ] };
+ key <AC11> { [ dead_acute, dead_diaeresis, U201A, U2018 ] };
+ key <BKSL> { [ plus, asterisk, U2022, plusminus ] };
//-- Row 2 (B) --//
- key <LSGT> { [ less, greater ],
- [ section, UF8FF ] };
- key <AB01> { [ z, Z ],
- [ U3A9, VoidSymbol ] };
- key <AB02> { [ x, X ],
- [ asciitilde, VoidSymbol ] };
- key <AB03> { [ c, C ],
- [ ccedilla, Ccedilla ] };
- key <AB04> { [ v, V ],
- [ U221A, U25CA ] };
- key <AB05> { [ b, B ],
- [ U222B, VoidSymbol ] };
- key <AB06> { [ n, N ],
- [ dead_tilde, VoidSymbol ] };
- key <AB07> { [ m, M ],
- [ U00B5, VoidSymbol ] };
- key <AB08> { [ comma, semicolon ],
- [ lessthanequal, guillemotleft ] };
- key <AB09> { [ period, colon ],
- [ greaterthanequal,guillemotright ] };
- key <AB10> { [ thorn, Thorn ],
- [ U2019, U201d ] };
-
- // Special keys and modifiers
- key <LWIN> { [ Alt_L, Meta_L ] };
- key <LFSH> { [ Shift_L ] };
- key <LCTL> { [ Control_L ] };
- key <LALT> { [ Mode_switch ] };
- key <RMTA> { [ Meta_R ] };
- key <RTSH> { [ Shift_R ] };
- key <RCTL> { [ Control_R ] };
- key <RALT> { [ script_switch ] };
+ key <LSGT> { [ less, greater, section, UF8FF ] };
+ key <AB01> { [ z, Z, U3A9, VoidSymbol ] };
+ key <AB02> { [ x, X, asciitilde, VoidSymbol ] };
+ key <AB03> { [ c, C, ccedilla, Ccedilla ] };
+ key <AB04> { [ v, V, U221A, U25CA ] };
+ key <AB05> { [ b, B, U222B, VoidSymbol ] };
+ key <AB06> { [ n, N, dead_tilde, VoidSymbol ] };
+ key <AB07> { [ m, M, U00B5, VoidSymbol ] };
+ key <AB08> { [ comma, semicolon, lessthanequal, guillemotleft ] };
+ key <AB09> { [ period, colon, greaterthanequal,guillemotright ] };
+ key <AB10> { [ thorn, Thorn, U2019, U201d ] };
- // And now to map those modifiers ...
- modifier_map Shift { Shift_L, Shift_R };
- modifier_map Lock { Caps_Lock };
- modifier_map Control { Control_L, Control_R };
- modifier_map Mod1 { Meta_L, Meta_R };
- //modifier_map Mod2 { Alt_L, Alt_R };
- modifier_map Mod3 { Mode_switch };
+ include "level3(ralt_switch)"
};
partial alphanumeric_keys
xkb_symbols "nodeadkeys" {
- include "macintosh_vndr/is(basic)" // for consistent naming
+ include "macintosh_vndr/is(basic)" // for consistent naming
+ name[Group1]= "Iceland - Mac, eliminate dead keys";
};
Index: it
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/macintosh_vndr/it,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- it 13 Sep 2004 18:49:30 -0000 1.2
+++ it 17 Sep 2006 20:03:34 -0000 1.3
@@ -1,92 +1,64 @@
xkb_symbols "extended" {
- name[Group1]= "italian";
+ name[Group1]= "Italy - Mac";
// Alphanumeric section
- key <LSGT> { [ less, greater ] };
- key <TLDE> { [ at, numbersign ],
- [ periodcentered ] };
- key <AE01> { [ ampersand, 1 ],
- [guillemotleft,guillemotright ] };
- key <AE02> { [ quotedbl, 2 ] };
- key <AE03> { [ apostrophe, 3 ] };
- key <AE04> { [ parenleft, 4 ],
- [ braceleft, bracketleft ] };
- key <AE05> { [ ccedilla, 5 ],
- [ Ccedilla, Iacute ] };
- key <AE06> { [ egrave, 6 ],
- [ paragraph, periodcentered] };
- key <AE07> { [ parenright, 7 ],
- [ braceright, bracketright ] };
- key <AE08> { [ sterling, 8 ],
- [ infinity ] };
- key <AE09> { [ agrave, 9 ],
- [ acute, Ocircumflex ] };
- key <AE10> { [ eacute, 0 ],
- [ grave, Oacute ] };
- key <AE11> { [ minus, underscore ] };
- key <AE12> { [ equal, plus ],
- [ notequal, plusminus ] };
+ key <LSGT> { [ less, greater ] };
+ key <TLDE> { [ at, numbersign, periodcentered ] };
+ key <AE01> { [ ampersand, 1, guillemotleft,guillemotright ] };
+ key <AE02> { [ quotedbl, 2 ] };
+ key <AE03> { [ apostrophe, 3 ] };
+ key <AE04> { [ parenleft, 4, braceleft, bracketleft ] };
+ key <AE05> { [ ccedilla, 5, Ccedilla, Iacute ] };
+ key <AE06> { [ egrave, 6, paragraph, periodcentered] };
+ key <AE07> { [ parenright, 7, braceright, bracketright ] };
+ key <AE08> { [ sterling, 8, infinity ] };
+ key <AE09> { [ agrave, 9, acute, Ocircumflex ] };
+ key <AE10> { [ eacute, 0, grave, Oacute ] };
+ key <AE11> { [ minus, underscore ] };
+ key <AE12> { [ equal, plus, notequal, plusminus ] };
- key <AD01> { [ q, Q ] };
- key <AD02> { [ z, Z ] };
- key <AD03> { [ e, E ] };
- key <AD04> { [ r, R ],
- [ registered ] };
- key <AD05> { [ t, T ] };
- key <AD06> { [ y, Y ],
- [ Uacute, ydiaeresis ] };
- key <AD07> { [ u, U ] };
- key <AD08> { [ i, I ],
- [ icircumflex, idiaeresis ] };
- key <AD09> { [ o, O ] };
- key <AD10> { [ p, P ] };
+ key <AD01> { [ q, Q ] };
+ key <AD02> { [ z, Z ] };
+ key <AD03> { [ e, E ] };
+ key <AD04> { [ r, R, registered ] };
+ key <AD05> { [ t, T ] };
+ key <AD06> { [ y, Y, Uacute, ydiaeresis ] };
+ key <AD07> { [ u, U ] };
+ key <AD08> { [ i, I, icircumflex, idiaeresis ] };
+ key <AD09> { [ o, O ] };
+ key <AD10> { [ p, P ] };
key <AD11> { [ igrave, asciicircum ] };
key <AD12> { [ dollar, asterisk ] };
- key <BKSL> { [ section, degree ],
- [ at, numbersign ] };
+ key <BKSL> { [ section, degree, at, numbersign ] };
- key <AC01> { [ a, A ] ,
- [ aring, Aring ] };
- key <AC02> { [ s, S ],
- [ ssharp ] };
+ key <AC01> { [ a, A, aring, Aring ] };
+ key <AC02> { [ s, S, ssharp ] };
key <AC03> { [ d, D ] };
key <AC04> { [ f, F ] };
key <AC05> { [ g, G ] };
- key <AC06> { [ h, H ],
- [ Igrave, Icircumflex ] };
- key <AC07> { [ j, J ],
- [ Idiaeresis, Iacute ] };
- key <AC08> { [ k, K ],
- [ Egrave, Ediaeresis ] };
- key <AC09> { [ l, L ],
- [ ssharp, bar ] };
- key <AC10> { [ m, M ],
- [ mu, Oacute ] };
- key <AC11> { [ ugrave, percent ],
- [ ae, AE ] };
+ key <AC06> { [ h, H, Igrave, Icircumflex ] };
+ key <AC07> { [ j, J, Idiaeresis, Iacute ] };
+ key <AC08> { [ k, K, Egrave, Ediaeresis ] };
+ key <AC09> { [ l, L, ssharp, bar ] };
+ key <AC10> { [ m, M, mu, Oacute ] };
+ key <AC11> { [ ugrave, percent, ae, AE ] };
key <AB01> { [ w, W ] };
key <AB02> { [ x, X ] };
- key <AB03> { [ c, C ],
- [ copyright, copyright ] };
+ key <AB03> { [ c, C, copyright, copyright ] };
key <AB04> { [ v, V ] };
key <AB05> { [ b, B ] };
- key <AB06> { [ n, N ],
- [ dead_tilde ] };
- key <AB07> { [ comma, question ],
- [ questiondown ] };
+ key <AB06> { [ n, N, dead_tilde ] };
+ key <AB07> { [ comma, question, questiondown ] };
key <AB08> { [ semicolon, period ] };
- key <AB09> { [ colon, slash ],
- [ bar, backslash ] };
- key <AB10> { [ ograve, exclam ],
- [ exclamdown ] };
+ key <AB09> { [ colon, slash, bar, backslash ] };
+ key <AB10> { [ ograve, exclam, exclamdown ] };
// End alphanumeric section
- key <KPDL> { [ KP_Decimal , KP_Delete ] };
- // End "Keypad" section
-
+ include "keypad(dot)"
+ include "level3(ralt_switch)"
};
Index: nl
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/macintosh_vndr/nl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nl 13 Sep 2004 18:49:30 -0000 1.2
+++ nl 17 Sep 2006 20:03:34 -0000 1.3
@@ -5,7 +5,11 @@
// Describes the differences between a very simple mac_US
// keyboard and a very simple netherland keybaord
- name[Group1]= "Netherland";
+ include "latin"
+
+ name[Group1]= "Netherlands - Mac";
+
+ include "level3(ralt_switch)"
// do just nothing
Index: no
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/macintosh_vndr/no,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- no 6 May 2004 00:05:33 -0000 1.2
+++ no 17 Sep 2006 20:03:34 -0000 1.3
@@ -6,41 +6,35 @@
// Describes the differences between a very simple en_US
// keyboard and a very simple Norwegian keybaord
- name[Group1]= "Norwegian";
+ include "latin"
+
+ name[Group1]= "Norway - Mac";
key <TLDE> { [ bar, section ] };
- key <AE02> { [ 2, quotedbl ],
- [ at, oneeighth ] };
- key <AE04> { [ 4, currency ],
- [ dollar, dollar ] };
- key <AE03> { [ 3, numbersign ],
- [ sterling, sterling ] };
+ key <AE02> { [ 2, quotedbl, at, oneeighth ] };
+ key <AE04> { [ 4, currency, dollar, dollar ] };
+ key <AE03> { [ 3, numbersign, sterling, sterling ] };
key <AE06> { [ 6, ampersand ] };
- key <AE07> { [ 7, slash ],
- [ bar, backslash ] };
- key <AE08> { [ 8, parenleft ],
- [ bracketleft, braceleft ] };
- key <AE09> { [ 9, parenright ],
- [ bracketright, braceright ] };
+ key <AE07> { [ 7, slash, bar, backslash ] };
+ key <AE08> { [ 8, parenleft, bracketleft, braceleft ] };
+ key <AE09> { [ 9, parenright, bracketright, braceright ] };
key <AE10> { [ 0, equal ] };
key <AB08> { [ comma, semicolon ] };
key <AB09> { [ period, colon ] };
key <AB10> { [ minus, underscore ] };
- key <AC10> { [ oslash, Ooblique ],
- [ odiaeresis, Odiaeresis ] };
+ key <AC10> { [ oslash, Ooblique, odiaeresis, Odiaeresis ] };
key <AE11> { [ plus, question ] };
key <AC11> { [ ae, AE ] };
key <AD11> { [ aring, Aring ] };
- key <AE12> { [ dead_grave, dead_acute ],
- [ acute, dead_ogonek ] };
- key <AD12> { [ diaeresis, asciicircum ],
- [ asciitilde, dead_macron ] };
+ key <AE12> { [ dead_grave, dead_acute, acute, dead_ogonek ] };
+ key <AD12> { [ diaeresis, asciicircum, asciitilde, dead_macron ] };
key <BKSL> { [ at, asterisk ] };
key <LSGT> { [ less, greater ] };
// End alphanumeric section
+ include "level3(ralt_switch)"
};
@@ -48,11 +42,10 @@
xkb_symbols "nodeadkeys" {
// Modifies the basic Norwegian layout to eliminate dead keys
-
include "macintosh_vndr/no(basic)"
- key <AE12> { [ grave, acute ],
- [ acute, ogonek ] };
- key <AD12> { [ diaeresis, asciicircum ],
- [ asciitilde, macron ] };
+ name[Group1]= "Norway - Mac, eliminate dead keys";
+
+ key <AE12> { [ grave, acute, acute, ogonek ] };
+ key <AD12> { [ diaeresis, asciicircum, asciitilde, macron ] };
};
Index: pt
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/macintosh_vndr/pt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pt 6 May 2004 00:05:33 -0000 1.2
+++ pt 17 Sep 2006 20:03:34 -0000 1.3
@@ -8,26 +8,21 @@
// Describes the differences between a very simple en_US
// keyboard and a very simple Portuguese keybaord
- name[Group1]= "Portuguese";
+ include "latin"
- key <LSGT> { [ less, greater ],
- [ bar, brokenbar ] };
- key <AE02> { [ 2, quotedbl ],
- [ at, oneeighth ] };
- key <AE04> { [ 4, dollar ],
- [ section, dollar ] };
- key <AE03> { [ 3, numbersign ],
- [ sterling, sterling ] };
+ name[Group1]= "Portugal - Mac";
+
+ key <LSGT> { [ less, greater, bar, brokenbar ] };
+ key <AE02> { [ 2, quotedbl, at, oneeighth ] };
+ key <AE04> { [ 4, dollar, section, dollar ] };
+ key <AE03> { [ 3, numbersign, sterling, sterling ] };
key <AE06> { [ 6, ampersand ] };
key <AE07> { [ 7, slash ] };
- key <AE08> { [ 8, parenleft ],
- [ bracketleft, braceleft ] };
- key <AE09> { [ 9, parenright ],
- [ bracketright, braceright ] };
+ key <AE08> { [ 8, parenleft, bracketleft, braceleft ] };
+ key <AE09> { [ 9, parenright, bracketright, braceright ] };
key <AE10> { [ 0, equal ] };
key <AE11> { [ apostrophe, question ] };
- key <AE12> { [ plus, asterisk ],
- [ dead_diaeresis ] };
+ key <AE12> { [ plus, asterisk, dead_diaeresis ] };
key <AB08> { [ comma, semicolon ] };
key <AB09> { [ period, colon ] };
key <AB10> { [ minus, underscore ] };
@@ -38,14 +33,15 @@
key <AD12> { [ dead_acute, dead_grave ] };
// End alphanumeric section
+ 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 <AE12> { [ plus, asterisk ],
- [ SunFA_Diaeresis, SunFA_Diaeresis ] };
+ key <AE12> { [ plus, asterisk, SunFA_Diaeresis, SunFA_Diaeresis ] };
key <AC11> { [ SunFA_Tilde, SunFA_Circum ] };
key <AD12> { [ SunFA_Acute, SunFA_Grave ] };
};
@@ -58,9 +54,9 @@
partial alphanumeric_keys
xkb_symbols "nodeadkeys" {
include "macintosh_vndr/pt(basic)" // for consistent naming
+ name[Group1]= "Portugal - Mac, eliminate dead keys";
- key <AE12> { [ plus, asterisk ],
- [ quotedbl, quotedbl ] };
+ key <AE12> { [ plus, asterisk, quotedbl, quotedbl ] };
key <AC11> { [ asciitilde, asciicircum ] };
key <AD12> { [ acute, grave ] };
};
Index: se
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/macintosh_vndr/se,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- se 19 Apr 2006 22:23:15 -0000 1.3
+++ se 17 Sep 2006 20:03:34 -0000 1.4
@@ -6,48 +6,40 @@
// Describes the differences between a very simple en_US
// keyboard and a very simple Swedish(Sweden) keybaord
- name[Group1]= "Swedish";
+ include "latin"
+
+ name[Group1]= "Sweden - Mac";
key <TLDE> { [ section, degree ] };
- key <AE01> { [ 1, exclam ],
- [ copyright, exclamdown ] };
- key <AE02> { [ 2, quotedbl ],
- [ at, oneeighth ] };
- key <AE03> { [ 3, numbersign ],
- [ sterling, yen ] };
- key <AE04> { [ 4, currency ],
- [ dollar, cent ] };
+ key <AE01> { [ 1, exclam, copyright, exclamdown ] };
+ key <AE02> { [ 2, quotedbl, at, oneeighth ] };
+ key <AE03> { [ 3, numbersign, sterling, yen ] };
+ key <AE04> { [ 4, currency, dollar, cent ] };
key <AE06> { [ 6, ampersand ] };
- key <AE07> { [ 7, slash ],
- [ bar, backslash ] };
- key <AE08> { [ 8, parenleft ],
- [ bracketleft, braceleft ] };
- key <AE09> { [ 9, parenright ],
- [ bracketright, braceright ] };
+ key <AE07> { [ 7, slash, bar, backslash ] };
+ key <AE08> { [ 8, parenleft, bracketleft, braceleft ] };
+ key <AE09> { [ 9, parenright, bracketright, braceright ] };
key <AB08> { [ comma, semicolon ] };
key <AE10> { [ 0, equal ] };
key <AB09> { [ period, colon ] };
key <AB10> { [ minus, underscore ] };
- key <AC10> { [ odiaeresis, Odiaeresis ],
- [ oslash, Ooblique ] };
+ key <AC10> { [ odiaeresis, Odiaeresis, oslash, Ooblique ] };
key <AE11> { [ plus, question ] };
- key <AC11> { [ adiaeresis, Adiaeresis ],
- [ ae, AE ] };
+ key <AC11> { [ adiaeresis, Adiaeresis, ae, AE ] };
key <AD11> { [ aring, Aring ] };
key <AE12> { [ acute, grave ] };
- key <AD12> { [ diaeresis, asciicircum ],
- [ asciitilde ] };
- key <BKSL> { [ apostrophe, asterisk ],
- [ at ] };
- key <LSGT> { [ less, greater ],
- [ bar, brokenbar ] };
+ key <AD12> { [ diaeresis, asciicircum, asciitilde ] };
+ key <BKSL> { [ apostrophe, asterisk, at ] };
+ key <LSGT> { [ less, greater, bar, brokenbar ] };
include "keypad(comma)"
+ 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";
};
Index: us
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/macintosh_vndr/us,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- us 6 May 2004 00:05:33 -0000 1.2
+++ us 17 Sep 2006 20:03:34 -0000 1.3
@@ -5,7 +5,7 @@
xkb_symbols "extended" {
- name[Group1]= "US/ASCII";
+ name[Group1]= "U.S. English";
key <ESC> { [ Escape ] };
// Alphanumeric section
@@ -67,6 +67,18 @@
key <SPCE> { [ space ] };
// End alphanumeric section
+ key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
+
+ include "keypad"
+
+ key <KPEQ> { [ equal ] };
+};
+
+hidden
+xkb_symbols "oldmac" {
+
+ include "macintosh_vndr/us(extended)"
+
// Begin "Function" section
key <FK01> { [ F1 ] };
key <FK02> { [ F2 ] };
@@ -99,31 +111,6 @@
key <RGHT> { [ Right ] };
// End "Editing" section
- // Begin "Keypad" section
- key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
- key <KPEQ> { [ equal ] };
- key <KPDV> { [ KP_Divide ] };
- key <KPMU> { [ KP_Multiply ] };
-
- key <KP7> { [ KP_7, KP_Home ] };
- key <KP8> { [ KP_8, KP_Up ] };
- key <KP9> { [ KP_9, KP_Prior ] };
- key <KPSU> { [ KP_Subtract ] };
-
- key <KP4> { [ KP_4, KP_Left ] };
- key <KP5> { [ KP_5, KP_Begin ] };
- key <KP6> { [ KP_6, KP_Right ] };
- key <KPAD> { [ KP_Add ] };
-
- key <KP1> { [ KP_1, KP_End ] };
- key <KP2> { [ KP_2, KP_Down ] };
- key <KP3> { [ KP_3, KP_Next ] };
- key <KPEN> { [ KP_Enter ] };
-
- key <KP0> { [ KP_0, KP_Insert ] };
- key <KPDL> { [ KP_Decimal, KP_Delete ] };
- // End "Keypad" section
-
// Begin "Modifier" section
key <LFSH> { [ Shift_L ] };
key <RTSH> { [ Shift_R ] };
@@ -136,69 +123,27 @@
// End "Modifier" section
// begin modifier mappings
- modifier_map Shift { Shift_L , Shift_R };
- modifier_map Lock { Caps_Lock };
+ modifier_map Shift { Shift_L, Shift_R };
+ modifier_map Lock { Caps_Lock, ISO_Lock };
modifier_map Control{ Control_L, Control_R };
- modifier_map Mod1 { Alt_L, Alt_R, Meta_L, Meta_R };
modifier_map Mod2 { Num_Lock };
- modifier_map Mod4 { Super_L, Super_R };
- modifier_map Mod5 { Scroll_Lock };
- // end modifier mappings
- include "compose(rwin)"
- include "macintosh_vndr/apple(extended)"
+ // Fake keys for virtual<->real modifiers mapping
+ key <LVL3> { [ ISO_Level3_Shift ] };
+ key <MDSW> { [ Mode_switch ] };
+ modifier_map Mod5 { <LVL3>, <MDSW> };
-// *** FIXME
-// key <LSGT> { [ quoteleft, asciitilde ] };
-// key <AE01> { [ 1, exclam ],
-// [exclamdown, slash ] };
-// key <AE02> { [ 2, at ],
-// [ trademark, eth ] };
-// key <AE03> { [ 3, numbersign ],
-// [ sterling ] };
-// key <AE04> { [ 4, dollar ],
-// [ cent ] };
-// key <AE05> { [ 5, percent ],
-// [ infinity ] };
-// key <AE06> { [ 6, asciicircum ],
-// [ section ] };
-// key <AE07> { [ 7, ampersand ],
-// [ paragraph ] };
-// key <AE08> { [ 8, asterisk ],
-// [periodcentered ] };
-// key <AE09> { [ 9, parenleft ],
-// [ordfeminine ] };
-// key <AE12> { [ equal, plus ],
-// [ notequal, plusminus ] };
-// key <AD01> { [ q, Q ],
-// [ oe, OE ] };
-// key <AD04> { [ r, R ],
-// [registered ] };
-// key <AD05> { [ t, T ],
-// [ dagger ] };
-// key <BKSL> { [ backslash, bar ],
-// [guillemotleft,guillemotright ] };
-// key <AC01> { [ a, A ],
-// [ aring, Aring ] };
-// key <AC02> { [ s, S ],
-// [ ssharp, Iacute ] };
-// key <AC03> { [ d, D ],
-// eth, Icircumflex ] };
-// key <AC04> { [ f, F ],
-// [ Idiaeresis ] };
-// key <AC05> { [ g, G ],
-// [ copyright ] };
-// key <AC09> { [ l, L ],
-// [ notsign, Ograve ] };
-// key <AC11> { [ quoteright, quotedbl ],
-// [ ae, AE ] };
-// key <AB03> { [ c, C ],
-// [ ccedilla, Ccedilla ] };
-// key <AB06> { [ n, N ],
-// [asciitilde ] };
-// key <AB07> { [ m, M ],
-// [ mu, Acircumflex ] };
-// key <RALT> { [ Mode_switch, Multi_key ] };
-// modifier_map Mod3 { Mode_switch };
+ key <ALT> { [ NoSymbol, Alt_L ] };
+ modifier_map Mod1 { <ALT>, <LALT> };
+
+ key <META> { [ NoSymbol, Meta_L ] };
+ modifier_map Mod1 { <META> };
+
+ key <SUPR> { [ NoSymbol, Super_L ] };
+ modifier_map Mod4 { <SUPR> };
+
+ key <HYPR> { [ NoSymbol, Hyper_L ] };
+ modifier_map Mod4 { <HYPR> };
+ // end modifier mappings
};
- Previous message: xkbdesc/symbols keypad,1.2,1.3 pc,1.4,1.5 us,1.17,1.18
- Next message: xkbdesc/rules base.m_t.part, 1.3, 1.4 base.ml1_s.part, 1.7,
1.8 base.ml_s.part, 1.10, 1.11 base.o_t.part, 1.3,
1.4 base.xml.in, 1.148, 1.149 merge.sh, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xlibs-commit
mailing list