smi to no, fi, se

5 files changed, 112 insertions, 91 deletions

diff --git a/symbols/Makefile.am b/symbols/Makefile.am
index 8b9d8fe8..ef29101b 100644
--- a/symbols/Makefile.am
+++ b/symbols/Makefile.am
@@ -3,10 +3,10 @@ SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr son
 symbols_DATA = \
 al am ara \
 az be bd \
-bg br ba \
+bg br ba bt \
 by ca ch \
 cz de \
-div dk dzo \
+div dk \
 ee es fi \
 fo fr gb \
 ge gr \
@@ -20,7 +20,7 @@ mkd mm mn \
 mt nl no \
 pc pk pl pt \
 ro ru se \
-si sk smi \
+si sk \
 srp sy \
 th tj \
 tr ua us \
diff --git a/symbols/dzo b/symbols/dzo
deleted file mode 100644
index bf0bd1ba..00000000
--- a/symbols/dzo
+++ /dev/null
@@ -1,88 +0,0 @@
-// $XKeyboardConfig$
-//
-// Dzongkha / Tibetan layout for Bhutanese keyboard
-//
-/////////////////////////////////////////////////////////////////
-//
-//   Based on the official layout for Dzongkha
-//   approved by the Department of Information Technology &
-//   Dzongkha Development Authority of the Government of Bhutan
-//
-//   Copyright (C) 2004, Gregory Mokhin <mokhin@bog.msu.ru>
-//   Layout map provided by Chris Fynn
-///////////////////////////////////////////////////////////////// 
-//   Version 0.97.     Last modified: 09 Jan 2004
-/////////////////////////////////////////////////////////////////
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-      name[Group1]= "Dzongkha";
-
-      key <TLDE> { [      U0F09, U0F0A, U0F6C, U0F6B ]	};
-      
-// numbers e.a.
-      key <AE01> { [      U0F21, U0F04, 1, exclam ]	};
-      key <AE02> { [      U0F22, U0F05, 2, at     ]	};
-      key <AE03> { [      U0F23, U0F06, 3, numbersign ]	};
-      key <AE04> { [      U0F24, U0F24, 4, dollar  ]	};
-      key <AE05> { [      U0F25, U0F25, 5, percent ]	};
-      key <AE06> { [      U0F26, U0F08, 6, U0F01 ]	};
-      key <AE07> { [      U0F27, U0F38, 7, ampersand ]	};
-      key <AE08> { [      U0F28, U0F34, 8, asterisk ]	};
-      key <AE09> { [      U0F29, U0F3C, 9, parenleft ]	};
-      key <AE10> { [      U0F20, U0F3D, 0, parenright ]	};
-      key <AE11> { [      U0F14, U0F7F, minus, underscore ]	};
-      key <AE12> { [      U0F0D, U0F11, equal, plus ]	};
-
-// consonants ( ka kha ga nga )
-      key <AD01> { [      U0F40, U0F90, U0F88  ]	};
-      key <AD02> { [      U0F41, U0F91, U0F89  ]	};
-      key <AD03> { [      U0F42, U0F92 ]	};
-      key <AD04> { [      U0F44, U0F94, U0F83, U0F82  ]	};
-
-// vowels ( i u e o )
-      key <AD05> { [      U0F72, U0F80, U0F1A  ]	};
-      key <AD06> { [      U0F74, U0F84, U0F1B  ]	};
-      key <AD07> { [      U0F7A, U0F7B, U0F1C  ]	};
-      key <AD08> { [      U0F7C, U0F7D, U0F1D, U0F17  ]	};
-
-// consonants ( ca cha ja nya )
-      key <AD09> { [      U0F45, U0F95, U0F1E, U0F18   ]	};
-      key <AD10> { [      U0F46, U0F96, U0F1F, U0F19   ]	};
-      key <AD11> { [      U0F47, U0F97, bracketleft, U0F3E ]	};
-      key <AD12> { [      U0F49, U0F99, bracketright, U0F3F  ]	};
-
-// consonants ( ta tha da na pa pha ba ma tsa tsha dza wa )
-      key <AC01> { [      U0F4F, U0F9F, U0F4A, U0F9A ]	};
-      key <AC02> { [      U0F50, U0FA0, U0F4B, U0F9B ]	};
-      key <AC03> { [      U0F51, U0FA1, U0F4C, U0F9C ]	};
-      key <AC04> { [      U0F53, U0FA3, U0F4E, U0F9E ]	};
-      key <AC05> { [      U0F54, U0FA4, U2039, U00AB ]	};
-      key <AC06> { [      U0F55, U0FA5, U203A, U00BB ]	};
-      key <AC07> { [      U0F56, U0FA6, U0F37, U0F35 ]	};
-      key <AC08> { [      U0F58, U0FA8, U0F7E ]	};
-      key <AC09> { [      U0F59, U0FA9, U0F39 ]	};
-      key <AC10> { [      U0F5A, U0FAA, colon, semicolon ]	};
-      key <AC11> { [      U0F5B, U0FAB, apostrophe, quotedbl ]	};
-      
-// TODO: BKSL and LSGT are from gb layout, are there any variants?
-      key <BKSL> { [      U0F5D, U0FAD, backslash, U0FBA ]	};
-      key <LSGT> { [      U0F0D, U0F11, U0F10, U0F0F ]	};
-
-// consonants ( zha za 'a ya ra la sha sa ha a )
-      key <AB01> { [      U0F5E, U0FAE, U0F13, U0F36 ]	};
-      key <AB02> { [      U0F5F, U0FAF, U0FBE, U0FBF ]	};
-      key <AB03> { [      U0F60, U0F71, U0F03, U0FB0 ]	};
-      key <AB04> { [      U0F61, U0FB1, U0F12, U0FBB ]	};
-      key <AB05> { [      U0F62, U0FB2, U0F6A, U0FBC ]	};
-      key <AB06> { [      U0F63, U0FB3, U0F8A, U0F88 ]	};
-      key <AB07> { [      U0F64, U0FB4, U0F65, U0FB5 ]	};
-      key <AB08> { [      U0F66, U0FB6, comma, less ]	};
-      key <AB09> { [      U0F67, U0FB7, period, greater ]	};
-      key <AB10> { [      U0F68, U0FB8, slash, question ]	};
-
-// space
-      key <SPCE> { [ U0F0B, space, U0F0C, U00A0 ] };
-
-    include "level3(ralt_switch)"
-};
diff --git a/symbols/fi b/symbols/fi
index 73f33fe6..e3a9e849 100644
--- a/symbols/fi
+++ b/symbols/fi
@@ -74,3 +74,17 @@ xkb_symbols "nodeadkeys" {
     key <AD12> { [ diaeresis, asciicircum, asciitilde, caron ] };
 };
 
+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 ]	};
+};
diff --git a/symbols/no b/symbols/no
index 70d32130..7f2fa973 100644
--- a/symbols/no
+++ b/symbols/no
@@ -97,3 +97,86 @@ xkb_symbols "dvorak" {
     key <LSGT> { [	oslash,	Ooblique,  bar,	backslash	 ] };
 
 };
+
+// based on
+// Northern Sami keyboards for Finland, Norway and Sweden
+//
+// Describes the differences between a very simple en_US
+// keyboard and a Norwegian Northern Sami keyboard (with
+// dead key support) according to the spec on
+// http://www.hum.uit.no/a/trond/se-lat9-no-keys.html
+// Written by Børre Gaup <boerre.gaup@pc.nu>
+//
+// $XFree86: xc/programs/xkbcomp/symbols/sapmi,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial alphanumeric_keys
+xkb_symbols "smi" {
+    include "latin"
+
+    name[Group1]= "Norway - Northern Saami";
+
+    key <AE01>	{ [         1,     exclam,    copyright,   exclamdown ]	};
+    key <AE02>	{ [         2,   quotedbl,           at,   registered ]	};
+    key <AE03>	{ [         3, numbersign,     sterling,         less ]	};
+    key <AE04>	{ [         4,     dollar,       dollar,      greater ]	};
+    key <AE05>	{ [         5,    percent,        U2022,        U2030 ]	};
+    key <AE06>	{ [         6,  ampersand,      section,    paragraph ]	};
+    key <AE07>	{ [         7,      slash,    braceleft,          bar ]	};
+    key <AE08>	{ [         8,  parenleft,  bracketleft,    braceleft ]	};
+    key <AE09>	{ [         9, parenright, bracketright,   braceright ]	};
+    key <AE10>	{ [         0,      equal,   braceright,     notequal ]	};
+    key <AE11>	{ [      plus,   question,     division, questiondown ]	};
+    key <AE12>	{ [ backslash,      grave,        acute,   asciitilde ]	};
+
+    key <AD01>	{ [    aacute,     Aacute,            q,            Q ]	};
+    key <AD02>	{ [    scaron,     Scaron,            w,            W ]	};
+    key <AD03>	{ [         e,          E,       eacute,       Eacute ]	};
+    key <AD04>	{ [         r,          R,   registered,    trademark ]	};
+    key <AD06>	{ [         y,          Y,       yacute,       Yacute ]	};
+    key <AD07>	{ [         u,          U,   udiaeresis,   Udiaeresis ]	};
+    key <AD08>	{ [         i,          I,   idiaeresis,   Idiaeresis ]	};
+    key <AD09>	{ [         o,          O,           oe,           OE ]	};
+    key <AD11>	{ [     aring,      Aring,  acircumflex,  Acircumflex ]	};
+    key <AD12>	{ [       eng,        ENG,     quotedbl,  asciicircum ]	};
+
+    key <AC01>	{ [         a,          A,       agrave,       Agrave ]	};
+    key <AC02>	{ [         s,          S,       ssharp,   apostrophe ]	};
+    key <AC04>	{ [         f,          F,  ordfeminine,  ordfeminine ]	};
+    key <AC05>	{ [         g,          G,       gcaron,       Gcaron ]	};
+    key <AC06>	{ [         h,          H,        U01E5,        U01E4 ]	};
+    key <AC07>	{ [         j,          J,      notsign,     multiply ]	};
+    key <AC08>	{ [         k,          K,        U01E9,        U01E8 ]	};
+    key <AC09>	{ [         l,          L,       degree,       hyphen ]	};
+    key <AC10>	{ [    oslash,   Ooblique,   odiaeresis,   Odiaeresis ]	};
+    key <AC11>	{ [        ae,         AE,   adiaeresis,   Adiaeresis ]	};
+    key <TLDE>	{ [       bar,    section,    brokenbar,    paragraph ]	};
+
+    key <BKSL>	{ [   dstroke,    Dstroke,   apostrophe,     asterisk ]	};
+    key <AB01>	{ [         z,          Z,        U0292,        U01B7 ]	};
+    key <AB02>	{ [    ccaron,     Ccaron,            x,            X ]	};
+    key <AB03>	{ [         c,          C,     ccedilla,     Ccedilla ]	};
+    key <AB04>	{ [         v,          V, lessthanequal, guillemotleft ] };
+    key <AB05>	{ [         b,          B, greaterthanequal, guillemotright ] };
+    key <AB06>	{ [         n,          N, leftsinglequotemark, leftdoublequotemark ] };
+    key <AB07>	{ [         m,          M, rightsinglequotemark, rightdoublequotemark ]	};
+    key <AB08>	{ [     comma,  semicolon, singlelowquotemark, doublelowquotemark ] };
+    key <AB09>	{ [    period,      colon,     ellipsis, periodcentered ] };
+    key <AB10>	{ [     minus, underscore,       endash,       emdash ]	};
+
+    key <LSGT>	{ type[Group1] = "FOUR_LEVEL",
+                  [    zcaron,     Zcaron,        U01EF,        U01EE ]	};
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "smi_nodeadkeys" {
+
+    // Modifies the basic Norwegian layout to eliminate dead keys
+
+    include "no(smi)"
+
+    name[Group1]= "Norway - Northern Saami, eliminate dead keys";
+
+    key <AE12>	{ [ backslash,      grave,        acute,       ogonek ]	};
+};
diff --git a/symbols/se b/symbols/se
index d1ae2c48..7738f902 100644
--- a/symbols/se
+++ b/symbols/se
@@ -141,3 +141,15 @@ xkb_symbols "rus_nodeadkeys" {
 
     key <AE12> {	[ Cyrillic_hardsign, Cyrillic_HARDSIGN ]	};
 };
+
+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 "fi(smi)"
+
+    name[Group1]= "Sweden - Northern Saami";
+};