From: Sergey V. Udaltsov Date: Thu, 13 May 2010 20:07:51 +0000 (+0100) Subject: Update symbols/fi X-Git-Tag: v_1_9~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2a71669ec77b0b5c2181cda7791355193940efc;p=platform%2Fupstream%2Fxkeyboard-config.git Update symbols/fi https://bugs.freedesktop.org/show_bug.cgi?id=27467 --- diff --git a/symbols/fi b/symbols/fi index 6c5a3e6..5f2081a 100644 --- a/symbols/fi +++ b/symbols/fi @@ -1,209 +1,186 @@ -// based on a keyboard map from an 'xkb/symbols/fi' file // // $XKeyboardConfig$ -// $XFree86: xc/programs/xkbcomp/symbols/fi,v 1.9 2003/01/29 17:17:31 dawes Exp $ - -// Troy Korjuslommi, -// Jan 6, 2006 -// May 5, 2006 -// May 6, 2006 -// May 12, 2006 -// Oct 10, 2007 -// Nov 11, 2008 -// Nov 29, 2008 -// Dec 31, 2008 -// Jan 22, 2009 // +// X keyboard maps for Finland // -// Jan 22, 2009 -// Submit requests to change all remaining Uxxxx values to named versions -// in keysymdef.h. -// ezh : U0292: LATIN SMALL LETTER EZH -// Ezh : U01B7: LATIN CAPITAL LETTER EZH -// permille : U2030: PER MILLE SIGN -// -// Dec 31, 2008 -// U0326 replaced with dead_belowcomma. -// -// Nov 29, 2008 -// dead_belowcomma has been added to keysymdef.h, so the U0326 can be replaced with -// it, as long as the version of X11 is built with the new keysymdef.h file. -// -// Nov 11, 2008. -// (a) Changed level 4 from Ooblique to Oslash. The two names are synonyms. Since level 3 is already -// specified as oslash, the change adds consistency. -// (b) The new Finnish keyboard standard (SFS 5966) reserves level 4 for U0326, the combining comma below. -// Removed the previous dead_abovedot entry there and replaced it with U0326, which can be replaced -// with dead_commabelow if that is added to keysymdef.h. -// -// Oct 10, 2007. -// -Changed space column 3 to nobreakspace (from space). -// -Changed UFE63 entries to dead_stroke. -// -// Nov 29, 2006. -// UFE63 can be changed to dead_stroke starting with version 7.0.7. of the X server. +// SFS 5966 / Kotoistus keymap created by Troy Korjuslommi +// Classic keymap based on traditional by Marko Myllynen +// Eliminate deadkeys alternative sent by Linus Torvalds // -// Dec 05, 2006. -// Changed instances of NoSymbol in columns 3 and 4 to characters in columns 1 and 2. -// This fixes a bug where the mappings couldn't be changed (with xmodmap for example). -// NoSymbol left in other positions, so nothing is output from those key presses. + +// +// Missing from X11/keysymdef.h as of 2010-05-13 +// +// U2030 # PER MILLE SIGN +// U0292 # LATIN SMALL LETTER EZH +// U01B7 # LATIN CAPITAL LETTER EZH // -// Dec 11, 2006. -// Changed all Uxxxx values to named versions. -// If you have problems, check these defines (when compiling X): -// XK_LATIN9: oe, OE. -// XK_CURRENCY: EuroSign. -// XK_LATIN2: caron. -// XK_LATIN3: idotless. -// XK_LATIN4: kra, eng, ENG. -// XK_CAUCASUS: schwa, SCHWA. -// XK_PUBLISHING: rightdoublequotemark, leftdoublequotemark, singlelowquotemark, doublelowquotemark, emdash, -// rightsinglequotemark, leftsinglequotemark, endash. -// -// Unnamed positions: -// UFE63: dead_stroke. Will be fixed, once the entry is in keysymdef.h. -// U0292: LATIN SMALL LETTER EZH. -// U01B7: LATIN CAPITAL LETTER EZH. -// U2030: PER MILLE SIGN. -// Comment: XK_MillSign is U+20A5 MILL SIGN. -// Per mille is a generic term for 1/1000. Mill is 1/1000 of a dollar. -// - -partial default alphanumeric_keys + +partial alphanumeric_keys default xkb_symbols "kotoistus" { + // Official keymap for Finland based on SFS 5966 standard + // + // This keymap implements all the functionality of Annex 1 + // of the standard and additionally defines the following to + // allow entering these characters with keyboars without LSGT. + // + // AE08+4, U+003C : LESS-THAN SIGN (less) + // AE09+4, U+003E : GREATER-THAN SIGN (greater) + // AD08+4, U+007C : VERTICAL LINE (bar) + // + // Annex 3 of the standard is implemented in fi_FI.UTF-8/Compose + name[Group1]="Finland"; - key { [ section, onehalf, dead_stroke, NoSymbol ] }; - key { [ 1, exclam, NoSymbol, exclamdown ] }; - key { [ 2, quotedbl, at, rightdoublequotemark ] }; - key { [ 3, numbersign, sterling, guillemotright ] }; - key { [ 4, currency, dollar, guillemotleft ] }; - key { [ 5, percent, U2030, leftdoublequotemark ] }; - key { [ 6, ampersand, singlelowquotemark, doublelowquotemark ] }; - key { [ 7, slash, braceleft, NoSymbol ] }; - key { [ 8, parenleft, bracketleft, less ] }; - key { [ 9, parenright, bracketright, greater ] }; - key { [ 0, equal, braceright, degree ] }; - key { [ plus, question, backslash, questiondown ] }; - key { [ dead_acute, dead_grave, dead_cedilla, dead_ogonek ] }; - key { [ q, Q, q, Q ] }; - key { [ w, W, w, W ] }; - key { [ e, E, EuroSign, NoSymbol ] }; - key { [ r, R, r, R ] }; - key { [ t, T, thorn, THORN ] }; - key { [ y, Y, y, Y ] }; - key { [ u, U, u, U ] }; - key { [ i, I, idotless, bar ] }; - key { [ o, O, oe, OE ] }; - key { [ p, P, dead_horn, dead_hook ] }; - key { [ aring, Aring, dead_doubleacute, dead_abovering ] }; - key { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_macron ] }; - key { [ a, A, schwa, SCHWA ] }; - key { [ s, S, ssharp, NoSymbol ] }; - key { [ d, D, eth, ETH ] }; - key { [ f, F, f, F ] }; - key { [ g, G, g, G ] }; - key { [ h, H, h, H ] }; - key { [ j, J, j, J ] }; - key { [ k, K, kra, NoSymbol ] }; - key { [ l, L, dead_stroke, NoSymbol ] }; - key { [ odiaeresis, Odiaeresis, oslash, Oslash ] }; - key { [ adiaeresis, Adiaeresis, ae, AE ] }; - key { [ apostrophe, asterisk, dead_caron, dead_breve ] }; - key { [ less, greater, bar, NoSymbol ] }; - key { [ z, Z, U0292, U01B7 ] }; - key { [ x, X, multiply, periodcentered ] }; - key { [ c, C, c, C ] }; - key { [ v, V, v, V ] }; - key { [ b, B, b, B ] }; - key { [ n, N, eng, ENG ] }; - key { [ m, M, mu, emdash ] }; - key { [ comma, semicolon, rightsinglequotemark, leftsinglequotemark ] }; - key { [ period, colon, dead_belowdot, dead_abovedot ] }; - key { [ minus, underscore, endash, dead_belowcomma ] }; + key { [ section, onehalf, dead_stroke, NoSymbol ] }; + key { [ 1, exclam, NoSymbol, exclamdown ] }; + key { [ 2, quotedbl, at, rightdoublequotemark ] }; + key { [ 3, numbersign, sterling, guillemotright ] }; + key { [ 4, currency, dollar, guillemotleft ] }; + key { [ 5, percent, U2030, leftdoublequotemark ] }; + key { [ 6, ampersand, singlelowquotemark, doublelowquotemark ] }; + key { [ 7, slash, braceleft, NoSymbol ] }; + key { [ 8, parenleft, bracketleft, less ] }; + key { [ 9, parenright, bracketright, greater ] }; + key { [ 0, equal, braceright, degree ] }; + key { [ plus, question, backslash, questiondown ] }; + key { [ dead_acute, dead_grave, dead_cedilla, dead_ogonek ] }; + + key { [ q, Q, q, Q ] }; + key { [ w, W, w, W ] }; + key { [ e, E, EuroSign, NoSymbol ] }; + key { [ r, R, r, R ] }; + key { [ t, T, thorn, THORN ] }; + key { [ y, Y, y, Y ] }; + key { [ u, U, u, U ] }; + key { [ i, I, idotless, bar ] }; + key { [ o, O, oe, OE ] }; + key { [ p, P, dead_horn, dead_hook ] }; + key { [ aring, Aring, dead_doubleacute, dead_abovering ] }; + key { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_macron ] }; + + key { [ a, A, schwa, SCHWA ] }; + key { [ s, S, ssharp, NoSymbol ] }; + key { [ d, D, eth, ETH ] }; + key { [ f, F, f, F ] }; + key { [ g, G, g, G ] }; + key { [ h, H, h, H ] }; + key { [ j, J, j, J ] }; + key { [ k, K, kra, NoSymbol ] }; + key { [ l, L, dead_stroke, NoSymbol ] }; + key { [ odiaeresis, Odiaeresis, oslash, Oslash ] }; + key { [ adiaeresis, Adiaeresis, ae, AE ] }; + key { [ apostrophe, asterisk, dead_caron, dead_breve ] }; + + key { [ less, greater, bar, NoSymbol ] }; + key { [ z, Z, U0292, U01B7 ] }; + key { [ x, X, multiply, periodcentered ] }; + key { [ c, C, c, C ] }; + key { [ v, V, v, V ] }; + key { [ b, B, b, B ] }; + key { [ n, N, eng, ENG ] }; + key { [ m, M, mu, emdash ] }; + key { [ comma, semicolon, rightsinglequotemark, leftsinglequotemark ] }; + key { [ period, colon, dead_belowdot, dead_abovedot ] }; + key { [ minus, underscore, endash, dead_belowcomma ] }; include "nbsp(level3)" - include "kpdl(comma)" - include "level3(ralt_switch)" - include "compose(rwin)" }; - partial alphanumeric_keys xkb_symbols "classic" { - include "latin(type2)" + include "fi(fi)" name[Group1]="Finland - Classic"; }; -hidden partial alphanumeric_keys +partial alphanumeric_keys hidden xkb_symbols "fi" { - // a Finnish keyboard with dead key support and all of - // ISO-8859-1 and ISO-8859-15 characters available. - - key { [ section, onehalf, onequarter, threequarters ] }; - key { [ less, greater, bar, brokenbar ] }; - // AltGr+ is pressed accidentally too often after AltGr+, - // hence AltGr+ produces now space, not nobreakspace. - key { [ space, space, space, nobreakspace ] }; - key { [ 1, exclam, exclamdown, onesuperior ] }; - key { [ 2, quotedbl, at, twosuperior ] }; - key { [ 3, numbersign, sterling, threesuperior ] }; - key { [ 4, currency, dollar, cent ] }; - key { [ 5, percent, EuroSign, masculine ] }; - key { [ 6, ampersand, yen, ordfeminine ] }; - key { [ 7, slash, braceleft, plusminus ] }; - key { [ 8, parenleft, bracketleft, guillemotleft ] }; - key { [ 9, parenright, bracketright, guillemotright ] }; - key { [ 0, equal, braceright, degree ] }; - key { [ period, colon, periodcentered, notsign ] }; - key { [ z, Z, zcaron, Zcaron ] }; - key { [ x, X, multiply, division ] }; - key { [ c, C, copyright, cent ] }; - key { [ b, B, ssharp, NoSymbol ] }; - key { [ n, N, ntilde, Ntilde ] }; - key { [ m, M, mu, NoSymbol ] }; - key { [ minus, underscore, hyphen, dead_macron ] }; - key { [ s, S, scaron, Scaron ] }; - key { [ d, D, eth, ETH ] }; - key { [ e, E, EuroSign, cent ] }; - key { [ r, R, registered, NoSymbol ] }; - key { [ t, T, thorn, THORN ] }; - key { [ p, P, paragraph, NoSymbol ] }; - key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; - key { [ plus, question, backslash, questiondown ] }; - key { [ adiaeresis, Adiaeresis, ae, AE ] }; - key { [ apostrophe, asterisk ] }; - key { [ aring, Aring, oe, OE ] }; - key { [ dead_acute, dead_grave ] }; - key { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ] }; - - // End alphanumeric section, begin "Keypad" + // Classic Finnish keyboard layout with dead keys support + // and all ISO-8859-1 and ISO-8859-15 characters available + + key { [ section, onehalf, onequarter, threequarters ] }; + key { [ 1, exclam, exclamdown, onesuperior ] }; + key { [ 2, quotedbl, at, twosuperior ] }; + key { [ 3, numbersign, sterling, threesuperior ] }; + key { [ 4, currency, dollar, cent ] }; + key { [ 5, percent, EuroSign, masculine ] }; + key { [ 6, ampersand, yen, ordfeminine ] }; + key { [ 7, slash, braceleft, plusminus ] }; + key { [ 8, parenleft, bracketleft, guillemotleft ] }; + key { [ 9, parenright, bracketright, guillemotright ] }; + key { [ 0, equal, braceright, degree ] }; + key { [ plus, question, backslash, questiondown ] }; + key { [ dead_acute, dead_grave, dead_cedilla, dead_ogonek ] }; + + key { [ q, Q, q, Q ] }; + key { [ w, W, w, W ] }; + key { [ e, E, EuroSign, cent ] }; + key { [ r, R, registered, NoSymbol ] }; + key { [ t, T, thorn, THORN ] }; + key { [ y, Y, y, Y ] }; + key { [ u, U, u, U ] }; + key { [ i, I, idotless, bar ] }; + key { [ o, O, o, O ] }; + key { [ p, P, paragraph, NoSymbol ] }; + key { [ aring, Aring, oe, OE ] }; + key { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ] }; + + key { [ a, A, schwa, SCHWA ] }; + key { [ s, S, scaron, Scaron ] }; + key { [ d, D, eth, ETH ] }; + key { [ f, F, f, F ] }; + key { [ g, G, eng, ENG ] }; + key { [ h, H, h, H ] }; + key { [ j, J, j, J ] }; + key { [ k, K, kra, NoSymbol ] }; + key { [ l, L, dead_stroke, NoSymbol ] }; + key { [ odiaeresis, Odiaeresis, oslash, Oslash ] }; + key { [ adiaeresis, Adiaeresis, ae, AE ] }; + key { [ apostrophe, asterisk, dead_caron, dead_breve ] }; + + key { [ less, greater, bar, brokenbar ] }; + key { [ z, Z, zcaron, Zcaron ] }; + key { [ x, X, multiply, division ] }; + key { [ c, C, copyright, cent ] }; + key { [ v, V, v, V ] }; + key { [ b, B, ssharp, NoSymbol ] }; + key { [ n, N, ntilde, Ntilde ] }; + key { [ m, M, mu, NoSymbol ] }; + key { [ comma, semicolon, dead_cedilla, dead_ogonek ] }; + key { [ period, colon, periodcentered, notsign ] }; + key { [ minus, underscore, hyphen, dead_macron ] }; + + include "nbsp(level4)" include "kpdl(comma)" - // End "Keypad" section - include "level3(ralt_switch)" + include "compose(rwin)" }; partial alphanumeric_keys xkb_symbols "nodeadkeys" { - include "latin(type2)" - include "latin(type2_nodeadkeys)" + + // Classic Finnish keyboard layout without dead keys + include "fi(fi)" name[Group1]="Finland - Classic, eliminate dead keys"; - key { [ acute, grave ] }; - key { [ diaeresis, asciicircum, asciitilde, caron ] }; - key { [ minus, underscore, hyphen, macron ] }; + key { [ acute, grave, cedilla, ogonek ] }; + key { [ diaeresis, asciicircum, asciitilde, caron ] }; + key { [ l, L, l, L ] }; + key { [ apostrophe, asterisk, caron, breve ] }; + key { [ comma, semicolon, cedilla, ogonek ] }; + key { [ minus, underscore, hyphen, macron ] }; }; +partial alphanumeric_keys xkb_symbols "smi" { // Describes the differences between a Norwegian Northern Sami @@ -213,19 +190,18 @@ xkb_symbols "smi" { include "no(smi)" - name[Group1]= "Finland - Northern Saami"; + name[Group1]="Finland - Northern Saami"; - key { [odiaeresis, Odiaeresis, oslash, Ooblique ] }; - key { [adiaeresis, Adiaeresis, ae, AE ] }; + key { [ odiaeresis, Odiaeresis, oslash, Oslash ] }; + key { [ adiaeresis, Adiaeresis, ae, AE ] }; }; -// Copied from macintosh_vndr/fi -partial alphanumeric_keys +partial alphanumeric_keys xkb_symbols "mac" { - // Describes the differences between a very simple mac_US - // keyboard and a very simple Swedish(Finland) keybaord + // Macintosh keyboard for Finland based on Swedish(Macintosh) keyboard include "se(mac)" - name[Group1]= "Finland - Macintosh"; + + name[Group1]="Finland - Macintosh"; };