xkbdesc/symbols ch, 1.10, 1.11 de, 1.13, 1.14 dk, 1.8, 1.9 es, 1.11, 1.12 no, 1.11, 1.12 pt, 1.9, 1.10 se, 1.13, 1.14 us, 1.20, 1.21
"Sergey V. Oudaltsov" <xlibs-commit-u7BhqnqprCWvj1b/[email protected]>
| Newsgroups | gmane.comp.freedesktop.xlibs.cvs |
|---|---|
| Message-ID | <[email protected]> |
Committed by: svu
Update of /cvs/xlibs/xkbdesc/symbols
In directory kemper:/tmp/cvs-serv2236/symbols
Modified Files:
ch de dk es no pt se us
Log Message:
improving mac variants, overwriting de and ch mac variants, b.fd.o#8491
Index: ch
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/ch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ch 4 Jul 2006 20:18:26 -0000 1.10
+++ ch 3 Oct 2006 22:47:43 -0000 1.11
@@ -116,90 +116,95 @@
key <AD12> { [ diaeresis, exclam, bracketright ] };
};
-// Macintosh layout (Swiss German)
-//
+// Copied from macintosh_vndr/ch
// 03.01.2003
// Andreas Tobler <[email protected]>
// modified for Swiss German Apple Extended Keyboard II
-//
-// 2006-05-25, 2006-06-08
-// Hanselmann Michael <xorg-at-hansmi.ch>
-// Fixed keys, reformatted, moved to symbols/ch
-partial alphanumeric_keys
+
+partial alphanumeric_keys
xkb_symbols "de_mac" {
- name[Group1]= "Switzerland - German (Macintosh)";
- // Alphanumeric section
- key <AE01> { [ 1, plus, plusminus, infinity ] };
- key <AE02> { [ 2, quotedbl, leftdoublequotemark, rightdoublequotemark ] };
- key <AE03> { [ 3, asterisk, numbersign, 0x01002039 ] };
- key <AE04> { [ 4, ccedilla, Ccedilla, 0x01002044 ] };
- key <AE05> { [ 5, percent, bracketleft, 0x01002039 ] };
- key <AE06> { [ 6, ampersand, bracketright, 0x0100203A ] };
- 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, leftsinglequotemark, rightsinglequotemark ] };
- key <AC01> { [ a, A, aring, Aring ] };
- // U+FB01 = ligature fi
- key <AC02> { [ s, S, ssharp, 0x0100fb01 ] };
- // U+2202 = partialderivative, U+FB02 = ligature fl
- key <AC03> { [ d, D, 0x01002202, 0x0100fb02 ] };
- key <AC04> { [ f, F, function, doubledagger ] };
- key <AC05> { [ g, G, at, comma ] };
- key <AC06> { [ h, H, ordfeminine, periodcentered ] };
- key <AC07> { [ j, J, masculine, 0x010002dc ] };
- 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, abovedot ] };
- // U+02DA = RING ABOVE
- key <AB07> { [ m, M, mu, 0x010002da ] };
- key <AB08> { [ comma, semicolon, guillemotleft, guillemotright ] };
- key <AB09> { [ period, colon, ellipsis, division ] };
- key <AB10> { [ minus, underscore, hyphen, emdash ] };
- // U+FB01 = ligature fi, U+2030 = per mille
- key <TLDE> { [ section, degree, 0x0100fb01, 0x01002030 ] };
- key <SPCE> { [ space, nobreakspace, nobreakspace ] };
- key <LSGT> { [ less, greater, lessthanequal, greaterthanequal ] };
- key <BKSL> { [ dollar, sterling, paragraph, enfilledcircbullet ] };
- // End alphanumeric section
+
+ name[Group1]= "Switzerland - German (Macintosh)";
- // Other keys
- key <KPDL> { [ KP_Delete, KP_Decimal ] };
- // End of other keys
+ // Alphanumeric section
+
+ 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 ] };
+ // ligature fl
+ 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 ] };
+ // to be fixed att
+ 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 ] };
+ // ligature fi // per mille
+ key <SPCE> { [ space, nobreakspace, nobreakspace ] };
+ key <LSGT> { [ less, greater, lessthanequal, greaterthanequal ] };
+ key <BKSL> { [ dollar, sterling, paragraph, enfilledcircbullet ] };
+
+ include "keypad(comma)"
+ include "level3(ralt_switch)"
};
-// Macintosh layout (Swiss French)
-//
-// Describes the differences between a Swiss German keyboard
-// and a Swiss French keyboard
partial alphanumeric_keys
xkb_symbols "fr_mac" {
- include "ch(de_mac)"
- name[Group1]= "Switzerland - French (Macintosh)";
- key <AD11> { [ egrave, udiaeresis, bracketleft ] };
- key <AC10> { [ eacute, odiaeresis ] };
- key <AC11> { [ agrave, adiaeresis, braceleft ] };
+
+ // Describes the differences between a very simple US/ASCII
+ // keyboard and a very simple Swiss/French keybaord
+
+ include "ch(de_mac)"
+ name[Group1]= "Switzerland - French (Macintosh)";
+
+ override key <AD11> {
+ [ egrave, udiaeresis, bracketleft ]
+ };
+ override key <AC10> {
+ [ eacute, odiaeresis ]
+ };
+ override key <AC11> {
+ [ agrave, adiaeresis, braceleft ]
+ };
};
-// vim: tabstop=8 syntax=c noexpandtab softtabstop=0 shiftwidth=8
Index: de
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/de,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- de 1 Oct 2006 21:35:25 -0000 1.13
+++ de 3 Oct 2006 22:47:43 -0000 1.14
@@ -84,7 +84,7 @@
xkb_symbols "ro" {
// add romanian-specific letters to the basic German layout.
// Romanian symbols are accessible with combination of <AltGr> and
- // 'a', 's', 't', 'i', 'ä (ä)' (+<Shift> for capital letters).
+ // 'a', 's', 't', 'i', 'ä (ä)' (+<Shift> for capital letters).
// To view romanian-specific symbols, add "export LC_CTYPE=ro_RO"
// or "export LC_CTYPE=de_DE.utf8" to your .profile.
@@ -297,86 +297,50 @@
include "level3(ralt_switch)"
};
-// Macintosh layout (german)
+// Copied from macintosh_vndr/de
+// [email protected] very close to MacOS map
partial alphanumeric_keys
xkb_symbols "mac" {
- // Alphanumeric section
+ include "de"
name[Group1]= "Germany - Macintosh";
- key <TLDE> { [ dead_circumflex, degree, doublelowquotemark, leftdoublequotemark ] };
- key <AE01> { [ 1, exclam, exclamdown, notsign ] };
- key <AE02> { [ 2, quotedbl, leftdoublequotemark, rightdoublequotemark ] };
- key <AE03> { [ 3, section, paragraph, numbersign ] };
- key <AE04> { [ 4, dollar, cent, sterling ] };
- key <AE05> { [ 5, percent, bracketleft, VoidSymbol ] };
- key <AE06> { [ 6, ampersand, bracketright, asciicircum ] };
- key <AE07> { [ 7, slash, bar, backslash ] };
- key <AE08> { [ 8, parenleft, braceleft, asciitilde ] };
- key <AE09> { [ 9, parenright, braceright, periodcentered ] };
- key <AE10> { [ 0, equal, notequal, overbar ] };
- key <AE11> { [ ssharp, question, questiondown, dead_abovedot ] };
- key <AE12> { [ dead_acute, dead_grave, apostrophe, dead_abovering ] };
-
- key <AD01> { [ q, Q, guillemotleft, guillemotright ] };
- key <AD02> { [ w, W, Greek_SIGMA, doublelowquotemark ] };
- key <AD03> { [ e, E, EuroSign, VoidSymbol ] };
- key <AD04> { [ r, R, registered, dead_cedilla ] };
- key <AD05> { [ t, T, dagger, dead_doubleacute ] };
- key <AD06> { [ z, Z, Greek_OMEGA, dead_caron ] };
- key <AD07> { [ u, U, dead_diaeresis, Aacute ] };
- key <AD08> { [ i, I, slash, Ucircumflex ] };
- key <AD09> { [ o, O, oslash, Oslash ] };
- key <AD10> { [ p, P, Greek_pi, Greek_PI ] };
- key <AD11> { [ udiaeresis, Udiaeresis, enfilledcircbullet, degree ] };
- key <AD12> { [ plus, asterisk, plusminus, VoidSymbol ] };
- key <AC01> { [ a, A, aring, Aring ] };
- key <AC02> { [ s, S, singlelowquotemark, Iacute ] };
- key <AC03> { [ d, D, partialderivative, trademark ] };
- key <AC04> { [ f, F, function, Idiaeresis ] };
- key <AC05> { [ g, G, copyright, Igrave ] };
- key <AC06> { [ h, H, ordfeminine, Oacute ] };
- key <AC07> { [ j, J, masculine, idotless ] };
- key <AC08> { [ k, K, Greek_DELTA, VoidSymbol ] };
- key <AC09> { [ l, L, at, VoidSymbol ] };
- key <AC10> { [ odiaeresis, Odiaeresis, oe, OE ] };
- key <AC11> { [ adiaeresis, Adiaeresis, ae, AE ] };
-
- key <LSGT> { [ less, greater, lessthanequal, greaterthanequal ] };
- key <AB01> { [ y, Y, yen, doubledagger ] };
- key <AB02> { [ x, X, approxeq, Ugrave ] };
- key <AB03> { [ c, C, ccedilla, Ccedilla ] };
- key <AB04> { [ v, V, radical, diamond ] };
- key <AB05> { [ b, B, integral, leftanglebracket ] };
- key <AB06> { [ n, N, dead_tilde, rightanglebracket ] };
- key <AB07> { [ m, M, mu, dead_breve ] };
- key <AB08> { [ comma, semicolon, infinity, dead_ogonek ] };
- key <AB09> { [ period, colon, ellipsis, division ] };
- key <AB10> { [ minus, underscore, endash, emdash ] };
- key <BKSL> { [ numbersign, apostrophe, leftsinglequotemark, rightsinglequotemark ] };
-
- // End alphanumeric section
+ // Alphanumeric section
+ key <AE01> { [ 1, exclam, exclamdown, at ] };
+ 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 <AD01> { [ q, Q, guillemotleft, guillemotright ] };
+ key <AD04> { [ r, R, registered ] };
+ key <AD07> { [ u, U, diaeresis, Aacute ] };
+ key <AD08> { [ i, I, slash, Ucircumflex ] };
+ key <AD11> { [ udiaeresis, Udiaeresis, periodcentered, degree ] };
+ key <AD12> { [ plus, asterisk, asciitilde ] };
+ key <AC01> { [ a, A, aring, Aring ] };
+ key <AC05> { [ g, G, copyright ] };
+ key <AC06> { [ h, H, ordfeminine ] };
+ key <AC09> { [ l, L, at ] };
+ key <AC10> { [ odiaeresis, Odiaeresis, dead_acute ] };
+ key <AB06> { [ n, N, asciitilde ] };
- include "keypad(comma)"
};
-// modify the basic German macintosh layout to not have any dead keys
partial alphanumeric_keys
xkb_symbols "mac_nodeadkeys" {
-
+ // modify the default German layout to not have any dead keys
include "de(mac)"
-
name[Group1]= "Germany - Macintosh, eliminate dead keys";
+ key <AE04> { [ 4, dollar, onequarter, currency ] };
- key <TLDE> { [ asciicircum, degree, doublelowquotemark, leftdoublequotemark ] };
- key <AE11> { [ ssharp, question, questiondown, abovedot ] };
- key <AE12> { [ acute, grave, apostrophe, degree ] };
- key <AD04> { [ r, R, registered, cedilla ] };
- key <AD05> { [ t, T, dagger, doubleacute ] };
- key <AD06> { [ z, Z, Greek_OMEGA, caron ] };
- key <AD07> { [ u, U, diaeresis, Aacute ] };
- key <AB06> { [ n, N, asciitilde, rightanglebracket ] };
- key <AB07> { [ m, M, mu, breve ] };
- key <AB08> { [ comma, semicolon, infinity, ogonek ] };
+ 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/dk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- dk 1 Oct 2006 21:35:25 -0000 1.8
+++ dk 3 Oct 2006 22:47:43 -0000 1.9
@@ -50,44 +50,12 @@
partial alphanumeric_keys
xkb_symbols "mac" {
- include "latin"
+ include "dk"
name[Group1]= "Denmark - Macintosh";
- 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)"
+ key <SPCE> { [ space, space, nobreakspace, nobreakspace ] };
+ key <AB10> { [ minus, underscore, hyphen, macron ] };
+ include "keypad(dot)"
};
@@ -96,6 +64,6 @@
include "dk(mac)"
name[Group1]= "Denmark - Macintosh, eliminate dead keys";
- key <AE12> { [ acute, grave, bar, ogonek ] };
- key <AD12> { [ diaeresis, asciicircum, asciitilde, dead_macron ] };
+ key <AE12> { [ acute, grave, bar, ogonek ] };
+ key <AD12> { [diaeresis, asciicircum, asciitilde, dead_macron ] };
};
Index: es
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/es,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- es 1 Oct 2006 21:35:25 -0000 1.11
+++ es 3 Oct 2006 22:47:43 -0000 1.12
@@ -143,34 +143,7 @@
// Describes the differences between a very simple mac_US
// keyboard and a very simple Spanish keybaord
- include "latin"
+ include "es"
name[Group1]= "Spain - Macintosh";
- 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 <AD11> { [ dead_grave, degree ] };
- 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 <AC11> { [ semicolon, colon ] };
- key <BKSL> { [ apostrophe, quotedbl ] };
-
- // End alphanumeric section
-
- include "level3(ralt_switch)"
};
Index: no
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/no,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- no 1 Oct 2006 21:35:25 -0000 1.11
+++ no 3 Oct 2006 22:47:43 -0000 1.12
@@ -190,35 +190,23 @@
// Describes the differences between a very simple en_US
// keyboard and a very simple Norwegian keybaord
- include "latin"
-
+ include "latin(type4)"
name[Group1]= "Norway - Macintosh";
- key <TLDE> { [ bar, section ] };
- 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 <AE10> { [ 0, equal ] };
-
- key <AB08> { [ comma, semicolon ] };
- key <AB09> { [ period, colon ] };
- key <AB10> { [ minus, underscore ] };
- 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 <BKSL> { [ at, asterisk ] };
- key <LSGT> { [ less, greater ] };
-
- // End alphanumeric section
-
- include "level3(ralt_switch)"
+ key <TLDE> { [ bar, section ] };
+ key <AE03> { [ 3, numbersign, sterling, sterling ] };
+ key <AE04> { [ 4, currency, dollar, dollar ] };
+ key <AE06> { [ 6, ampersand, threequarters, fiveeighths ] };
+ key <AE07> { [ 7, slash, bar, backslash ] };
+ key <AE08> { [ 8, parenleft, bracketleft, braceleft ] };
+ key <AE09> { [ 9, parenright, bracketright, braceright ] };
+ 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 <BKSL> { [ at, asterisk ] };
};
@@ -229,7 +217,6 @@
include "no(mac)"
name[Group1]= "Norway - Macintosh, eliminate dead keys";
- key <AE12> { [ grave, acute, acute, ogonek ] };
- key <AD12> { [ diaeresis, asciicircum, asciitilde, macron ] };
-
+ key <AE12> { [ grave, acute, acute, ogonek ] };
+ key <AD12> { [ diaeresis, asciicircum, asciitilde, macron ] };
};
Index: pt
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/pt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pt 1 Oct 2006 21:35:25 -0000 1.9
+++ pt 3 Oct 2006 22:47:43 -0000 1.10
@@ -70,32 +70,17 @@
// Describes the differences between a very simple en_US
// keyboard and a very simple Portuguese keybaord
- include "latin"
-
+ include "pt"
name[Group1]= "Portugal - Macintosh";
- 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 <AE10> { [ 0, equal ] };
- key <AE11> { [ apostrophe, question ] };
- key <AE12> { [ plus, asterisk, dead_diaeresis ] };
- key <AB08> { [ comma, semicolon ] };
- key <AB09> { [ period, colon ] };
- key <AB10> { [ minus, underscore ] };
- key <AC10> { [ ccedilla, Ccedilla ] };
- key <AC11> { [ dead_tilde, dead_circumflex ] };
- key <AC12> { [ backslash, bar ] };
- key <AD11> { [ masculine, ordfeminine ] };
- key <AD12> { [ dead_acute, dead_grave ] };
- // End alphanumeric section
-
- include "level3(ralt_switch)"
+ key <AE06> { [ 6, ampersand, threequarters, fiveeighths ] };
+ key <AE08> { [ 8, parenleft, bracketleft, braceleft ] };
+ key <AE09> { [ 9, parenright, bracketright, braceright ] };
+ key <AE12> { [ plus, asterisk, dead_diaeresis ] };
+ key <AC11> { [ dead_tilde, dead_circumflex ] };
+ key <AD11> { [ masculine, ordfeminine ] };
+ key <BKSL> { [ backslash, bar, dead_grave, dead_breve ] };
+ key <TLDE> { [ grave, asciitilde, notsign, notsign ] };
};
partial alphanumeric_keys
Index: se
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/se,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- se 1 Oct 2006 21:35:25 -0000 1.13
+++ se 3 Oct 2006 22:47:43 -0000 1.14
@@ -180,11 +180,9 @@
// keyboard and a very simple Swedish(Sweden) keybaord
include "latin"
-
name[Group1]= "Sweden - Macintosh";
key <TLDE> { [ section, degree ] };
-
key <AE01> { [ 1, exclam, copyright, exclamdown ] };
key <AE02> { [ 2, quotedbl, at, oneeighth ] };
key <AE03> { [ 3, numbersign, sterling, yen ] };
@@ -204,7 +202,6 @@
key <AE12> { [ acute, grave ] };
key <AD12> { [ diaeresis, asciicircum, asciitilde ] };
key <BKSL> { [ apostrophe, asterisk, at ] };
- key <LSGT> { [ less, greater, bar, brokenbar ] };
include "keypad(comma)"
include "level3(ralt_switch)"
Index: us
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/us,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- us 1 Oct 2006 21:35:25 -0000 1.20
+++ us 3 Oct 2006 22:47:43 -0000 1.21
@@ -488,72 +488,7 @@
partial alphanumeric_keys
xkb_symbols "mac" {
+ include "us"
name[Group1]= "U.S. English - Macintosh";
- key <ESC> { [ Escape ] };
-
- // Alphanumeric section
- key <TLDE> { [ quoteleft, asciitilde ] };
- key <AE01> { [ 1, exclam ] };
- key <AE02> { [ 2, at ] };
- key <AE03> { [ 3, numbersign ] };
- key <AE04> { [ 4, dollar ] };
- key <AE05> { [ 5, percent ] };
- key <AE06> { [ 6, asciicircum ] };
- key <AE07> { [ 7, ampersand ] };
- key <AE08> { [ 8, asterisk ] };
- key <AE09> { [ 9, parenleft ] };
- key <AE10> { [ 0, parenright ] };
- key <AE11> { [ minus, underscore ] };
- key <AE12> { [ equal, plus ] };
- key <BKSP> { [ BackSpace ] };
-
- key <TAB> { [ Tab, ISO_Left_Tab ] };
- key <AD01> { [ q, Q ] };
- key <AD02> { [ w, W ] };
- key <AD03> { [ e, E ] };
- key <AD04> { [ r, R ] };
- key <AD05> { [ t, T ] };
- key <AD06> { [ y, Y ] };
- key <AD07> { [ u, U ] };
- key <AD08> { [ i, I ] };
- key <AD09> { [ o, O ] };
- key <AD10> { [ p, P ] };
- key <AD11> { [ bracketleft, braceleft ] };
- key <AD12> { [ bracketright, braceright ] };
- key <BKSL> { [ backslash, bar ] };
-
- key <CAPS> { [ Caps_Lock ] };
- key <AC01> { [ a, A ] };
- key <AC02> { [ s, S ] };
- key <AC03> { [ d, D ] };
- key <AC04> { [ f, F ] };
- key <AC05> { [ g, G ] };
- key <AC06> { [ h, H ] };
- key <AC07> { [ j, J ] };
- key <AC08> { [ k, K ] };
- key <AC09> { [ l, L ] };
- key <AC10> { [ semicolon, colon ] };
- key <AC11> { [ quoteright, quotedbl ] };
- key <RTRN> { [ Return ] };
-
- key <AB01> { [ z, Z ] };
- key <AB02> { [ x, X ] };
- key <AB03> { [ c, C ] };
- key <AB04> { [ v, V ] };
- key <AB05> { [ b, B ] };
- key <AB06> { [ n, N ] };
- key <AB07> { [ m, M ] };
- key <AB08> { [ comma, less ] };
- key <AB09> { [ period, greater ] };
- key <AB10> { [ slash, question ] };
-
- key <SPCE> { [ space ] };
- // End alphanumeric section
-
- key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
-
- include "keypad"
-
- key <KPEQ> { [ equal ] };
};