xkeyboard-config/symbols fi,1.16,1.17
Sergey V. Oudaltsov
xlibs-commit at pdx.freedesktop.org
Thu Nov 1 15:31:20 PDT 2007
Committed by: svu
Update of /cvs/xkeyboard-config/xkeyboard-config/symbols
In directory kemper:/tmp/cvs-serv7562/symbols
Modified Files:
fi
Log Message:
making fi(kotoistus) default, moving fi(basic) to fi(classic)
Index: fi
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/fi,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- fi 15 Oct 2007 20:38:13 -0000 1.16
+++ fi 1 Nov 2007 22:31:18 -0000 1.17
@@ -3,93 +3,6 @@
// $XKeyboardConfig$
// $XFree86: xc/programs/xkbcomp/symbols/fi,v 1.9 2003/01/29 17:17:31 dawes Exp $
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
- include "latin(type2)"
- include "fi(fi)"
-};
-
-hidden partial alphanumeric_keys
-xkb_symbols "fi" {
-
- // a Finnish keyboard with dead key support and all of
- // ISO-8859-1 and ISO-8859-15 characters available.
-
- name[Group1]="Finland";
-
- key <TLDE> { [ section, onehalf, onequarter, threequarters ] };
- key <LSGT> { [ less, greater, bar, brokenbar ] };
- // AltGr+<SPCE> is pressed accidentally too often after AltGr+<LSGT>,
- // hence AltGr+<SPCE> produces now space, not nobreakspace.
- key <SPCE> { [ space, space, space, nobreakspace ] };
- key <AE01> { [ 1, exclam, exclamdown, onesuperior ] };
- key <AE02> { [ 2, quotedbl, at, twosuperior ] };
- key <AE03> { [ 3, numbersign, sterling, threesuperior ] };
- key <AE04> { [ 4, currency, dollar, cent ] };
- key <AE05> { [ 5, percent, EuroSign, masculine ] };
- key <AE06> { [ 6, ampersand, yen, ordfeminine ] };
- key <AE07> { [ 7, slash, braceleft, plusminus ] };
- key <AE08> { [ 8, parenleft, bracketleft, guillemotleft ] };
- key <AE09> { [ 9, parenright, bracketright, guillemotright ] };
- key <AE10> { [ 0, equal, braceright, degree ] };
- key <AB09> { [ period, colon, periodcentered, notsign ] };
- key <AB01> { [ z, Z, zcaron, Zcaron ] };
- key <AB02> { [ x, X, multiply, division ] };
- key <AB03> { [ c, C, copyright, cent ] };
- key <AB05> { [ b, B, ssharp, NoSymbol ] };
- key <AB06> { [ n, N, ntilde, Ntilde ] };
- key <AB07> { [ m, M, mu, NoSymbol ] };
- key <AB10> { [ minus, underscore, hyphen, dead_macron ] };
- key <AC02> { [ s, S, scaron, Scaron ] };
- key <AC03> { [ d, D, eth, ETH ] };
- key <AD03> { [ e, E, EuroSign, cent ] };
- key <AD04> { [ r, R, registered, NoSymbol ] };
- key <AD05> { [ t, T, thorn, THORN ] };
- key <AD10> { [ p, P, paragraph, NoSymbol ] };
- key <AC10> { [ odiaeresis, Odiaeresis, oslash, Ooblique ] };
- key <AE11> { [ plus, question, backslash, questiondown ] };
- key <AC11> { [ adiaeresis, Adiaeresis, ae, AE ] };
- key <BKSL> { [ apostrophe, asterisk ] };
- key <AD11> { [ aring, Aring, oe, OE ] };
- key <AE12> { [ dead_acute, dead_grave ] };
- key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ] };
-
- // End alphanumeric section, begin "Keypad"
- include "kpdl(comma)"
- // End "Keypad" section
-
- include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
- include "latin(type2)"
- include "latin(type2_nodeadkeys)"
- include "fi(fi)"
-
- name[Group1]="Finland - Eliminate dead keys";
-
- key <AE12> { [ acute, grave ] };
- key <AD12> { [ diaeresis, asciicircum, asciitilde, caron ] };
- key <AB10> { [ minus, underscore, hyphen, macron ] };
-};
-
-xkb_symbols "smi" {
-
- // Describes the differences between a Norwegian Northern Sami
- // (keyboard with dead key support) and a Swedish/Finnish Sami
- // keyboard according to the specs at:
- // http://www.hum.uit.no/a/trond/se-lat9-sefi-keys.html
-
- include "no(smi)"
-
- name[Group1]= "Finland - Northern Saami";
-
- key <AC10> { [odiaeresis, Odiaeresis, oslash, Ooblique ] };
- key <AC11> { [adiaeresis, Adiaeresis, ae, AE ] };
-};
-
// Troy Korjuslommi,
// Jan 6, 2006,
// May 5, 2006.
@@ -130,9 +43,10 @@
// Per mille is a generic term for 1/1000. Mill is 1/1000 of a dollar.
//
+partial default alphanumeric_keys
xkb_symbols "kotoistus" {
- name[Group1]="Finland - Kotoistus";
+ name[Group1]="Finland";
key <SPCE> { [ space, space, nobreakspace, nobreakspace ] };
key <TLDE> { [ section, onehalf, dead_stroke, NoSymbol ] };
@@ -191,6 +105,93 @@
include "compose(rwin)"
};
+
+partial alphanumeric_keys
+xkb_symbols "classic" {
+ include "latin(type2)"
+ include "fi(fi)"
+
+ name[Group1]="Finland - Classic";
+};
+
+hidden partial alphanumeric_keys
+xkb_symbols "fi" {
+
+ // a Finnish keyboard with dead key support and all of
+ // ISO-8859-1 and ISO-8859-15 characters available.
+
+ key <TLDE> { [ section, onehalf, onequarter, threequarters ] };
+ key <LSGT> { [ less, greater, bar, brokenbar ] };
+ // AltGr+<SPCE> is pressed accidentally too often after AltGr+<LSGT>,
+ // hence AltGr+<SPCE> produces now space, not nobreakspace.
+ key <SPCE> { [ space, space, space, nobreakspace ] };
+ key <AE01> { [ 1, exclam, exclamdown, onesuperior ] };
+ key <AE02> { [ 2, quotedbl, at, twosuperior ] };
+ key <AE03> { [ 3, numbersign, sterling, threesuperior ] };
+ key <AE04> { [ 4, currency, dollar, cent ] };
+ key <AE05> { [ 5, percent, EuroSign, masculine ] };
+ key <AE06> { [ 6, ampersand, yen, ordfeminine ] };
+ key <AE07> { [ 7, slash, braceleft, plusminus ] };
+ key <AE08> { [ 8, parenleft, bracketleft, guillemotleft ] };
+ key <AE09> { [ 9, parenright, bracketright, guillemotright ] };
+ key <AE10> { [ 0, equal, braceright, degree ] };
+ key <AB09> { [ period, colon, periodcentered, notsign ] };
+ key <AB01> { [ z, Z, zcaron, Zcaron ] };
+ key <AB02> { [ x, X, multiply, division ] };
+ key <AB03> { [ c, C, copyright, cent ] };
+ key <AB05> { [ b, B, ssharp, NoSymbol ] };
+ key <AB06> { [ n, N, ntilde, Ntilde ] };
+ key <AB07> { [ m, M, mu, NoSymbol ] };
+ key <AB10> { [ minus, underscore, hyphen, dead_macron ] };
+ key <AC02> { [ s, S, scaron, Scaron ] };
+ key <AC03> { [ d, D, eth, ETH ] };
+ key <AD03> { [ e, E, EuroSign, cent ] };
+ key <AD04> { [ r, R, registered, NoSymbol ] };
+ key <AD05> { [ t, T, thorn, THORN ] };
+ key <AD10> { [ p, P, paragraph, NoSymbol ] };
+ key <AC10> { [ odiaeresis, Odiaeresis, oslash, Ooblique ] };
+ key <AE11> { [ plus, question, backslash, questiondown ] };
+ key <AC11> { [ adiaeresis, Adiaeresis, ae, AE ] };
+ key <BKSL> { [ apostrophe, asterisk ] };
+ key <AD11> { [ aring, Aring, oe, OE ] };
+ key <AE12> { [ dead_acute, dead_grave ] };
+ key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ] };
+
+ // End alphanumeric section, begin "Keypad"
+ include "kpdl(comma)"
+ // End "Keypad" section
+
+ include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+ include "latin(type2)"
+ include "latin(type2_nodeadkeys)"
+ include "fi(fi)"
+
+ name[Group1]="Finland - Eliminate dead keys";
+
+ key <AE12> { [ acute, grave ] };
+ key <AD12> { [ diaeresis, asciicircum, asciitilde, caron ] };
+ key <AB10> { [ minus, underscore, hyphen, macron ] };
+};
+
+xkb_symbols "smi" {
+
+ // Describes the differences between a Norwegian Northern Sami
+ // (keyboard with dead key support) and a Swedish/Finnish Sami
+ // keyboard according to the specs at:
+ // http://www.hum.uit.no/a/trond/se-lat9-sefi-keys.html
+
+ include "no(smi)"
+
+ name[Group1]= "Finland - Northern Saami";
+
+ key <AC10> { [odiaeresis, Odiaeresis, oslash, Ooblique ] };
+ key <AC11> { [adiaeresis, Adiaeresis, ae, AE ] };
+};
+
// Copied from macintosh_vndr/fi
partial alphanumeric_keys
xkb_symbols "mac" {
More information about the xlibs-commit
mailing list