s/NoSymbol/VoidSymbol/,b.fd.o#9239

1 files changed, 80 insertions, 54 deletions

diff --git a/symbols/fi b/symbols/fi
index c7f6eea..1cd9d39 100644
--- a/symbols/fi
+++ b/symbols/fi
@@ -90,68 +90,94 @@ xkb_symbols "smi" {
     key <AC11>	{ [adiaeresis, Adiaeresis,           ae,           AE ]	};
 };
 
-// based on a keyboard map from an 'xkb/symbols/fi' file
-//
 // Troy Korjuslommi, 
 // Jan 6, 2006,
 // May 5, 2006.
 // May 6, 2006.
 // May 12, 2006.
+//
+// Nov 29, 2006.
+// UFE63 can be changed to dead_stroke starting with version 7.0.7. of the X server.
+//
+// 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.
+//
+// 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.
 // 
-partial alphanumeric_keys
+// 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.
+// 
+
 xkb_symbols "kotoistus" {
 
-    name[Group1]="Finland - Kotoistus";
-
-    key <SPCE> { [  space,           space,            space,             nobreakspace    ] };
-    key <TLDE> { [  section,         onehalf,          UFE63,             NoSymbol        ] };
-    key <AE01> { [  1,               exclam,           NoSymbol,          exclamdown      ] };
-    key <AE02> { [  2,               quotedbl,         at,                U201D           ] };
-    key <AE03> { [  3,               numbersign,       sterling,          U00BB           ] };
-    key <AE04> { [  4,               currency,         dollar,            U00AB           ] };
-    key <AE05> { [  5,               percent,          U2030,             U201C           ] };
-    key <AE06> { [  6,               ampersand,        U201A,             U201E           ] };
-    key <AE07> { [  7,               slash,            braceleft,         NoSymbol        ] };
-    key <AE08> { [  8,               parenleft,        bracketleft,       NoSymbol        ] };
-    key <AE09> { [  9,               parenright,       bracketright,      NoSymbol        ] };
-    key <AE10> { [  0,               equal,            braceright,        degree          ] };
-    key <AE11> { [  plus,            question,         backslash,         questiondown    ] };
-    key <AE12> { [  dead_acute,      dead_grave,       dead_cedilla,      dead_ogonek     ] };
-    key <AD01> { [  q,               Q,                NoSymbol,          NoSymbol        ] };
-    key <AD02> { [  w,               W,                NoSymbol,          NoSymbol        ] };
-    key <AD03> { [  e,               E,                EuroSign,          NoSymbol        ] };
-    key <AD04> { [  r,               R,                NoSymbol,          NoSymbol        ] };
-    key <AD05> { [  t,               T,                thorn,             THORN           ] };
-    key <AD06> { [  y,               Y,                NoSymbol,          NoSymbol        ] };
-    key <AD07> { [  u,               U,                NoSymbol,          NoSymbol        ] };
-    key <AD08> { [  i,               I,                idotless,          NoSymbol        ] };
-    key <AD09> { [  o,               O,                U0153,             U0152           ] };
-    key <AD10> { [  p,               P,                dead_horn,         dead_hook       ] };
-    key <AD11> { [  aring,           Aring,            dead_doubleacute,  dead_abovering  ] };
-    key <AD12> { [  dead_diaeresis,  dead_circumflex,  dead_tilde,        dead_macron     ] };
-    key <AC01> { [  a,               A,                U0259,             U018F           ] };
-    key <AC02> { [  s,               S,                ssharp,            NoSymbol        ] };
-    key <AC03> { [  d,               D,                eth,               ETH             ] };
-    key <AC04> { [  f,               F,                NoSymbol,          NoSymbol        ] };
-    key <AC05> { [  g,               G,                NoSymbol,          NoSymbol        ] };
-    key <AC06> { [  h,               H,                NoSymbol,          NoSymbol        ] };
-    key <AC07> { [  j,               J,                NoSymbol,          NoSymbol        ] };
-    key <AC08> { [  k,               K,                kra,               NoSymbol        ] };
-    key <AC09> { [  l,               L,                UFE63,             NoSymbol        ] };
-    key <AC10> { [  odiaeresis,      Odiaeresis,       oslash,            Ooblique        ] };
-    key <AC11> { [  adiaeresis,      Adiaeresis,       ae,                AE              ] };
-    key <BKSL> { [  apostrophe,      asterisk,         dead_caron,        dead_breve      ] };
-    key <LSGT> { [  less,            greater,          bar,               NoSymbol        ] };
-    key <AB01> { [  z,               Z,                U0292,             U01B7           ] };
-    key <AB02> { [  x,               X,                multiply,          U00B7           ] };
-    key <AB03> { [  c,               C,                NoSymbol,          NoSymbol        ] };
-    key <AB04> { [  v,               V,                NoSymbol,          NoSymbol        ] };
-    key <AB05> { [  b,               B,                NoSymbol,          NoSymbol        ] };
-    key <AB06> { [  n,               N,                U014B,             U014A           ] };
-    key <AB07> { [  m,               M,                U00B5,             U2014           ] };
-    key <AB08> { [  comma,           semicolon,        U2019,             U2018           ] };
-    key <AB09> { [  period,          colon,            dead_belowdot,     dead_abovedot   ] };
-    key <AB10> { [  minus,           underscore,       U2013,             dead_abovedot   ] };
+    name[Group1]="Finnish";
+
+    key <SPCE> { [  space,           space,            space,                nobreakspace         ] };
+    key <TLDE> { [  section,         onehalf,          UFE63,                NoSymbol             ] };
+    key <AE01> { [  1,               exclam,           NoSymbol,             exclamdown           ] };
+    key <AE02> { [  2,               quotedbl,         at,                   rightdoublequotemark ] };
+    key <AE03> { [  3,               numbersign,       sterling,             guillemotright       ] };
+    key <AE04> { [  4,               currency,         dollar,               guillemotleft        ] };
+    key <AE05> { [  5,               percent,          U2030,                leftdoublequotemark  ] };
+    key <AE06> { [  6,               ampersand,        singlelowquotemark,   doublelowquotemark   ] };
+    key <AE07> { [  7,               slash,            braceleft,            NoSymbol             ] };
+    key <AE08> { [  8,               parenleft,        bracketleft,          NoSymbol             ] };
+    key <AE09> { [  9,               parenright,       bracketright,         NoSymbol             ] };
+    key <AE10> { [  0,               equal,            braceright,           degree               ] };
+    key <AE11> { [  plus,            question,         backslash,            questiondown         ] };
+    key <AE12> { [  dead_acute,      dead_grave,       dead_cedilla,         dead_ogonek          ] };
+    key <AD01> { [  q,               Q,                q,                    Q                    ] };
+    key <AD02> { [  w,               W,                w,                    W                    ] };
+    key <AD03> { [  e,               E,                EuroSign,             NoSymbol             ] };
+    key <AD04> { [  r,               R,                r,                    R                    ] };
+    key <AD05> { [  t,               T,                thorn,                THORN                ] };
+    key <AD06> { [  y,               Y,                y,                    Y                    ] };
+    key <AD07> { [  u,               U,                u,                    U                    ] };
+    key <AD08> { [  i,               I,                idotless,             NoSymbol             ] };
+    key <AD09> { [  o,               O,                oe,                   OE                   ] };
+    key <AD10> { [  p,               P,                dead_horn,            dead_hook            ] };
+    key <AD11> { [  aring,           Aring,            dead_doubleacute,     dead_abovering       ] };
+    key <AD12> { [  dead_diaeresis,  dead_circumflex,  dead_tilde,           dead_macron          ] };
+    key <AC01> { [  a,               A,                schwa,                SCHWA                ] };
+    key <AC02> { [  s,               S,                ssharp,               NoSymbol             ] };
+    key <AC03> { [  d,               D,                eth,                  ETH                  ] };
+    key <AC04> { [  f,               F,                f,                    F                    ] };
+    key <AC05> { [  g,               G,                g,                    G                    ] };
+    key <AC06> { [  h,               H,                h,                    H                    ] };
+    key <AC07> { [  j,               J,                j,                    J                    ] };
+    key <AC08> { [  k,               K,                kra,                  NoSymbol             ] };
+    key <AC09> { [  l,               L,                UFE63,                NoSymbol             ] };
+    key <AC10> { [  odiaeresis,      Odiaeresis,       oslash,               Ooblique             ] };
+    key <AC11> { [  adiaeresis,      Adiaeresis,       ae,                   AE                   ] };
+    key <BKSL> { [  apostrophe,      asterisk,         dead_caron,           dead_breve           ] };
+    key <LSGT> { [  less,            greater,          bar,                  NoSymbol             ] };
+    key <AB01> { [  z,               Z,                U0292,                U01B7                ] };
+    key <AB02> { [  x,               X,                multiply,             periodcentered       ] };
+    key <AB03> { [  c,               C,                c,                    C                    ] };
+    key <AB04> { [  v,               V,                v,                    V                    ] };
+    key <AB05> { [  b,               B,                b,                    B                    ] };
+    key <AB06> { [  n,               N,                eng,                  ENG                  ] };
+    key <AB07> { [  m,               M,                mu,                   emdash               ] };
+    key <AB08> { [  comma,           semicolon,        rightsinglequotemark, leftsinglequotemark  ] };
+    key <AB09> { [  period,          colon,            dead_belowdot,        dead_abovedot        ] };
+    key <AB10> { [  minus,           underscore,       endash,               dead_abovedot        ] };
 
     include "keypad(comma)"