updated ukeyboard port for fremantle
authorRoman Moravcik <roman.moravcik@gmail.com>
Mon, 26 Oct 2009 08:47:57 +0000 (09:47 +0100)
committerRoman Moravcik <roman.moravcik@gmail.com>
Mon, 26 Oct 2009 08:47:57 +0000 (09:47 +0100)
19 files changed:
debian/patches/02_ukeyboard_installonly_sk.dpatch
debian/rules
debian/slovak-l10n.postinst
debian/slovak-l10n.postrm
ukeyboard/Makefile
ukeyboard/cpanel/about.c
ukeyboard/cpanel/hw.c
ukeyboard/cpanel/lang.c
ukeyboard/cpanel/langset.c
ukeyboard/cpanel/langset.h
ukeyboard/cpanel/onscreen.c
ukeyboard/cpanel/prefs.c
ukeyboard/cpanel/prefs.h
ukeyboard/debian/ukeyboard.postinst
ukeyboard/debian/ukeyboard.postrm
ukeyboard/xkb/rx44/ukeyboard [deleted file]
ukeyboard/xkb/rx51/ukeyboard [deleted file]
ukeyboard/xkb/ukbdrx44 [new file with mode: 0644]
ukeyboard/xkb/ukbdrx51 [new file with mode: 0644]

index a761ccd..b1fd98c 100755 (executable)
@@ -38,5 +38,5 @@ diff -Naur slovak-l10n/ukeyboard/Makefile slovak-l10n/ukeyboard/Makefile
 -      install -d $(DESTDIR)/usr/share/icons/hicolor/26x26/apps
 -      install -m 0644 ukeyboard.png $(DESTDIR)/usr/share/icons/hicolor/26x26/apps/
        install -d $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr
- ifeq (,$(findstring HAVE_MAEMO5,$(CFLAGS)))
-       install -m 0644 xkb/rx44/ukeyboard $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr/
+       install -m 0644 xkb/ukbdrx44 $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr/
+       install -m 0644 xkb/ukbdrx51 $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr/
index 54a162e..504af1f 100755 (executable)
@@ -56,7 +56,8 @@ binary-indep: build install
 binary-arch: build install
        dh_testdir
        dh_testroot
-#      dh_installchangelogs 
+       dh_installchangelogs
+       dh_installdocs
        dh_fixperms
        dh_installdeb
        dh_gencontrol
index 813f837..a4c8d95 100755 (executable)
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 if ! grep -q ukeyboard /usr/share/X11/xkb/rules/base; then
-    sed -i 's/^.*nokiarx44.*$/\0\n  ukeyboard  *                       =       nokia_vndr\/ukeyboard(%l)/' /usr/share/X11/xkb/rules/base
+    sed -i 's/^.*nokiarx44.*$/\0\n  ukbdrx44   *                       =       nokia_vndr\/ukbdrx44(%l)/' /usr/share/X11/xkb/rules/base
+    sed -i 's/^.*nokiarx51.*$/\0\n  ukbdrx51   *                       =       nokia_vndr\/ukbdrx51(%l)/' /usr/share/X11/xkb/rules/base
 fi
     
 if [ -f /usr/share/applications/hildon-control-panel/cptextinput.desktop ]; then
index 53ebd3f..d47fe20 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-sed -ni '/ukeyboard/!p' /usr/share/X11/xkb/rules/base
+sed -ni '/ukbd/!p' /usr/share/X11/xkb/rules/base
 
 if [ -f /usr/share/applications/hildon-control-panel/cptextinput.desktop.removed ]; then
     mv -f /usr/share/applications/hildon-control-panel/cptextinput.desktop.removed /usr/share/applications/hildon-control-panel/cptextinput.desktop
index 80b7693..54ba2e3 100644 (file)
@@ -28,11 +28,8 @@ install:     ukeyboard-prefs keyboards-scv
        install -d $(DESTDIR)/usr/share/icons/hicolor/26x26/apps
        install -m 0644 ukeyboard.png $(DESTDIR)/usr/share/icons/hicolor/26x26/apps/
        install -d $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr
-ifeq (,$(findstring HAVE_MAEMO5,$(CFLAGS)))
-       install -m 0644 xkb/rx44/ukeyboard $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr/
-else
-       install -m 0644 xkb/rx51/ukeyboard $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr/
-endif
+       install -m 0644 xkb/ukbdrx44 $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr/
+       install -m 0644 xkb/ukbdrx51 $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr/
 
 clean:
        $(MAKE) -C cpanel clean
index e2ddbf7..d8b21f3 100644 (file)
@@ -1,5 +1,6 @@
 /*
  *  Copyright (c) 2008 Jiri Benc <jbenc@upir.cz>
+ *  Copyright (c) 2009 Roman Moravcik <roman.moravcik@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
index 7e3e173..7118c06 100644 (file)
@@ -1,5 +1,6 @@
 /*
  *  Copyright (c) 2008 Jiri Benc <jbenc@upir.cz>
+ *  Copyright (c) 2009 Roman Moravcik <roman.moravcik@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -154,7 +155,7 @@ static GtkWidget *start(GConfClient *client, GtkWidget *win, void **data)
        omodel = get_str(client, "int_kb_model");
        olayout = get_str(client, "int_kb_layout");
        d->layouts = get_layouts("/usr/share/X11/xkb/symbols/nokia_vndr/rx-51", "nokiarx51", NULL);
-       d->layouts = get_layouts("/usr/share/X11/xkb/symbols/nokia_vndr/ukeyboard", "ukeyboard", d->layouts);
+       d->layouts = get_layouts("/usr/share/X11/xkb/symbols/nokia_vndr/ukbdrx51", "ukbdrx51", d->layouts);
 
        d->combo = HILDON_TOUCH_SELECTOR(hildon_touch_selector_new_text());
 
@@ -206,7 +207,7 @@ static GtkWidget *start(GConfClient *client, GtkWidget *win, void **data)
        omodel = get_str(client, "int_kb_model");
        olayout = get_str(client, "int_kb_layout");
        d->layouts = get_layouts("/usr/share/X11/xkb/symbols/nokia_vndr/rx-44", "nokiarx44", NULL);
-       d->layouts = get_layouts("/usr/share/X11/xkb/symbols/nokia_vndr/ukeyboard", "ukeyboard", d->layouts);
+       d->layouts = get_layouts("/usr/share/X11/xkb/symbols/nokia_vndr/ukbdrx44", "ukbdrx44", d->layouts);
 
        vbox = GTK_BOX(gtk_vbox_new(FALSE, 0));
        group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
index 346c935..c1364b4 100644 (file)
@@ -1,5 +1,6 @@
 /*
  *  Copyright (c) 2008 Jiri Benc <jbenc@upir.cz>
+ *  Copyright (c) 2009 Roman Moravcik <roman.moravcik@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
index 2c38e8e..32c88a3 100644 (file)
@@ -1,5 +1,6 @@
 /*
  *  Copyright (c) 2008 Jiri Benc <jbenc@upir.cz>
+ *  Copyright (c) 2009 Roman Moravcik <roman.moravcik@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
index 8ac2705..159a992 100644 (file)
@@ -1,5 +1,6 @@
 /*
  *  Copyright (c) 2008 Jiri Benc <jbenc@upir.cz>
+ *  Copyright (c) 2009 Roman Moravcik <roman.moravcik@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
index 24a5851..332a1ea 100644 (file)
@@ -1,5 +1,6 @@
 /*
  *  Copyright (c) 2008 Jiri Benc <jbenc@upir.cz>
+ *  Copyright (c) 2009 Roman Moravcik <roman.moravcik@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
index ca8e555..cb22ae8 100644 (file)
@@ -1,5 +1,6 @@
 /*
  *  Copyright (c) 2008 Jiri Benc <jbenc@upir.cz>
+ *  Copyright (c) 2009 Roman Moravcik <roman.moravcik@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
index b5e9826..1fd2e71 100644 (file)
@@ -1,5 +1,6 @@
 /*
  *  Copyright (c) 2008 Jiri Benc <jbenc@upir.cz>
+ *  Copyright (c) 2009 Roman Moravcik <roman.moravcik@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
index 4869db5..41210b8 100755 (executable)
@@ -1,6 +1,7 @@
 #!/bin/sh
 if ! grep -q ukeyboard /usr/share/X11/xkb/rules/base; then
-       sed -i 's/^.*nokiarx44.*$/\0\n  ukeyboard       *                       =       nokia_vndr\/ukeyboard(%l)/' /usr/share/X11/xkb/rules/base
+       sed -i 's/^.*nokiarx44.*$/\0\n  ukbdrx44        *                       =       nokia_vndr\/ukbdrx44(%l)/' /usr/share/X11/xkb/rules/base
+       sed -i 's/^.*nokiarx51.*$/\0\n  ukbdrx51        *                       =       nokia_vndr\/ukbdrx51(%l)/' /usr/share/X11/xkb/rules/base
 fi
 
 if [ -f /usr/share/applications/hildon-control-panel/cptextinput.desktop ]; then
index aae9521..6e1aecf 100755 (executable)
@@ -1,5 +1,5 @@
 #!/bin/sh
-sed -ni '/ukeyboard/!p' /usr/share/X11/xkb/rules/base
+sed -ni '/ukbd/!p' /usr/share/X11/xkb/rules/base
 
 if [ -f /usr/share/applications/hildon-control-panel/cptextinput.desktop.removed ]; then
        mv -f /usr/share/applications/hildon-control-panel/cptextinput.desktop.removed /usr/share/applications/hildon-control-panel/cptextinput.desktop
diff --git a/ukeyboard/xkb/rx44/ukeyboard b/ukeyboard/xkb/rx44/ukeyboard
deleted file mode 100644 (file)
index 76ef76f..0000000
+++ /dev/null
@@ -1,304 +0,0 @@
-partial default alphanumeric_keys
-xkb_symbols "base" {
-       include "nokia_vndr/rx-44(base)"
-
-       key <BKSP>      { [ BackSpace,  BackSpace,      Delete,         Delete          ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "cz-qwerty" {
-       name[Group1] = "Czech QWERTY (DE hw)";
-
-       include "nokia_vndr/ukeyboard(base)"
-
-       key <AC01>      { [ a,          A,              exclam,         section         ] };
-       key <AC02>      { [ s,          S,              quotedbl,       quotedbl        ] };
-       key <AC03>      { [ d,          D,              at,             at              ] };
-       key <AC04>      { [ f,          F,              numbersign,     numbersign      ] };
-       key <AC05>      { [ g,          G,              percent,        percent         ] };
-       key <AC06>      { [ h,          H,              backslash,      backslash       ] };
-       key <AC07>      { [ j,          J,              slash,          slash           ] };
-       key <AC08>      { [ k,          K,              parenleft,      bracketleft     ] };
-       key <AC09>      { [ l,          L,              parenright,     bracketright    ] };
-       key <AC11>      { [ uring,      Uring,          question,       asciicircum     ] };
-
-       key <AB01>      { [ z,          Z,              EuroSign,       dollar          ] };
-       key <AB02>      { [ x,          X,              asciitilde,     asciitilde      ] };
-       key <AB03>      { [ c,          C,              asterisk,       asterisk        ] };
-       key <AB04>      { [ v,          V,              ampersand,      ampersand       ] };
-       key <AB05>      { [ b,          B,              plus,           plus            ] };
-       key <AB06>      { [ n,          N,              less,           braceleft       ] };
-       key <AB07>      { [ m,          M,              greater,        braceright      ] };
-       key <AC10>      { [ dead_acute, dead_acute,     equal,          equal           ] };
-       key <AE11>      { [ dead_caron, dead_caron,     apostrophe,     grave           ] };
-       key <AE12>      { [ minus,      underscore,     endash,         emdash          ] };
-
-       key <AB08>      { [ comma,      semicolon,      Tab,            bar             ] };
-       key <AB09>      { [ period,     colon,          period,         colon           ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "cz-qwertz" {
-       name[Group1] = "Czech QWERTZ (DE hw)";
-
-       include "nokia_vndr/ukeyboard(cz-qwerty)"
-
-       key <AD06>      { [ z,          Z,              6,              6               ] };
-       key <AB01>      { [ y,          Y,              EuroSign,       dollar          ] };
-};
-
-// author: Michal Prihoda
-partial alphanumeric_keys
-xkb_symbols "cz-qwerty-us" {
-       name[Group1] = "Czech QWERTY (US hw)";
-
-       include "nokia_vndr/ukeyboard(base)"
-
-       key <AC01>      { [ a,          A,              exclam,         exclam          ] };
-       key <AC02>      { [ s,          S,              quotedbl,       quotedbl        ] };
-       key <AC03>      { [ d,          D,              at,             at              ] };
-       key <AC04>      { [ f,          F,              numbersign,     numbersign      ] };
-       key <AC05>      { [ g,          G,              backslash,      backslash       ] };
-       key <AC06>      { [ h,          H,              slash,          slash           ] };
-       key <AC07>      { [ j,          J,              parenleft,      parenleft       ] };
-       key <AC08>      { [ k,          K,              parenright,     parenright      ] };
-       key <AC09>      { [ l,          L,              asterisk,       asterisk        ] };
-       key <AC11>      { [ dead_acute, apostrophe,     question,       question        ] };
-
-       key <AB01>      { [ z,          Z,              yen,            yen             ] };
-       key <AB02>      { [ x,          X,              asciicircum,    asciicircum     ] };
-       key <AB03>      { [ c,          C,              asciitilde,     asciitilde      ] };
-       key <AB04>      { [ v,          V,              percent,        percent         ] };
-       key <AB05>      { [ b,          B,              ampersand,      ampersand       ] };
-       key <AB06>      { [ n,          N,              dollar,         dollar          ] };
-       key <AB07>      { [ m,          M,              EuroSign,       EuroSign        ] };
-       key <AC10>      { [ semicolon,  colon,          sterling,       sterling        ] };
-       key <AE11>      { [ minus,      uring,          underscore,     underscore      ] };
-       key <AE12>      { [ dead_caron, plus,           equal,          equal           ] };
-
-       key <AB08>      { [ comma,      less,           comma,          less            ] };
-       key <AB09>      { [ period,     greater,        period,         greater         ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "cz-qwertz-us" {
-       name[Group1] = "Czech QWERTZ (US hw)";
-
-       include "nokia_vndr/ukeyboard(cz-qwerty-us)"
-
-       key <AD06>      { [ z,          Z,              6,              6               ] };
-       key <AB01>      { [ y,          Y,              yen,            yen             ] };
-};
-
-// author: Roman Moravcik
-partial alphanumeric_keys
-xkb_symbols "sk-qwerty" {
-       name[Group1] = "Slovak QWERTY (DE hw)";
-
-       include "nokia_vndr/ukeyboard(base)"
-
-       key <AC01>      { [ a,          A,              exclam,         exclam          ] };
-       key <AC02>      { [ s,          S,              quotedbl,       quotedbl        ] };
-       key <AC03>      { [ d,          D,              at,             at              ] };
-       key <AC04>      { [ f,          F,              numbersign,     numbersign      ] };
-       key <AC05>      { [ g,          G,              percent,        percent         ] };
-       key <AC06>      { [ h,          H,              backslash,      backslash       ] };
-       key <AC07>      { [ j,          J,              slash,          slash           ] };
-       key <AC08>      { [ k,          K,              parenleft,      parenleft       ] };
-       key <AC09>      { [ l,          L,              parenright,     parenright      ] };
-       key <AC11>      { [ ocircumflex,adiaeresis,     question,       question        ] };
-
-       key <AB01>      { [ z,          Z,              EuroSign,       EuroSign        ] };
-       key <AB02>      { [ x,          X,              asciitilde,     asciitilde      ] };
-       key <AB03>      { [ c,          C,              asterisk,       asterisk        ] };
-       key <AB04>      { [ v,          V,              ampersand,      ampersand       ] };
-       key <AB05>      { [ b,          B,              plus,           plus            ] };
-       key <AB06>      { [ n,          N,              less,           less            ] };
-       key <AB07>      { [ m,          M,              greater,        greater         ] };
-       key <AC10>      { [ dead_acute, dead_acute,     equal,          equal           ] };
-       key <AE11>      { [ dead_caron, dead_caron,     apostrophe,     apostrophe      ] };
-       key <AE12>      { [ minus,      underscore,     endash,         endash          ] };
-
-       key <AB08>      { [ comma,      semicolon,      bar,            bar             ] };
-       key <AB09>      { [ period,     colon,          Tab,            Tab             ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "sk-qwertz" {
-       name[Group1] = "Slovak QWERTZ (DE hw)";
-
-       include "nokia_vndr/ukeyboard(sk-qwerty)"
-
-       key <AD06>      { [ z,          Z,              6,              6               ] };
-       key <AB01>      { [ y,          Y,              EuroSign,       EuroSign        ] };
-};
-
-
-// author: Marcin Juszkiewicz
-partial alphanumeric_keys
-xkb_symbols "pl" {
-       name[Group1] = "Polish (US hw)";
-
-       include "nokia_vndr/rx-44(us)"
-       include "nokia_vndr/ukeyboard(base)"
-
-       key <COMP>      { [ ISO_Level5_Shift,   ISO_Level5_Shift,       ISO_Level5_Shift,       ISO_Level5_Shift        ] };
-       modifier_map Mod3 { ISO_Level5_Shift };
-
-//                                             normal  Shift   Fn              Fn+Shift        Chr             S+Chr           Fn+Chr          Fn+Shift+Chr
-       key <SPCE>      { type="EIGHT_LEVEL", [ space,  space,  bar,            bar,            Tab,            Tab,            bar,            bar             ] };
-
-       key <AD03>      { type="EIGHT_LEVEL", [ e,      E,      3,              3,              eogonek,        Eogonek,        3,              3               ] };
-       key <AD09>      { type="EIGHT_LEVEL", [ o,      O,      9,              9,              oacute,         Oacute,         9,              9               ] };
-
-       key <AC01>      { type="EIGHT_LEVEL", [ a,      A,      exclam,         exclam,         aogonek,        Aogonek,        exclam,         exclam          ] };
-       key <AC02>      { type="EIGHT_LEVEL", [ s,      S,      quotedbl,       quotedbl,       sacute,         Sacute,         quotedbl,       quotedbl        ] };
-       key <AC07>      { type="EIGHT_LEVEL", [ j,      J,      parenleft,      parenleft,      bracketleft,    bracketleft,    parenleft,      parenleft       ] };
-       key <AC08>      { type="EIGHT_LEVEL", [ k,      K,      parenright,     parenright,     bracketright,   bracketright,   parenright,     parenright      ] };
-       key <AC09>      { type="EIGHT_LEVEL", [ l,      L,      asterisk,       asterisk,       lstroke,        Lstroke,        asterisk,       asterisk        ] };
-
-       key <AB01>      { type="EIGHT_LEVEL", [ z,      Z,      yen,            yen,            zabovedot,      Zabovedot,      yen,            yen             ] };
-       key <AB02>      { type="EIGHT_LEVEL", [ x,      X,      asciicircum,    asciicircum,    zacute,         Zacute,         asciicircum,    asciicircum     ] };
-       key <AB03>      { type="EIGHT_LEVEL", [ c,      C,      asciitilde,     asciitilde,     cacute,         Cacute,         asciitilde,     asciitilde      ] };
-       key <AB06>      { type="EIGHT_LEVEL", [ n,      N,      dollar,         dollar,         nacute,         Nacute,         dollar,         dollar          ] };
-};
-
-// author: Pawel Dys
-partial alphanumeric_keys
-xkb_symbols "pl-qwertz-de" {
-       name[Group1] = "Polish QWERTZ (DE hw)";
-
-       include "nokia_vndr/rx-44(de)"
-       include "nokia_vndr/ukeyboard(base)"
-
-       key <COMP>      { [ ISO_Level5_Shift,   ISO_Level5_Shift,       ISO_Level5_Shift,       ISO_Level5_Shift        ] };
-       modifier_map Mod3 { ISO_Level5_Shift };
-
-//                                             normal  Shift           Fn              Fn+Shift        Chr             S+Chr           Fn+Chr          Fn+Shift+Chr
-       key <SPCE>      { type="EIGHT_LEVEL", [ space,  space,          Tab,            Tab,            bar,            bar,            space,          space           ] };
-
-       key <AD03>      { type="EIGHT_LEVEL", [ e,      E,              3,              3,              eogonek,        Eogonek,        3,              3               ] };
-       key <AD06>      { type="EIGHT_LEVEL", [ z,      Z,              6,              6,              zabovedot,      Zabovedot,      6,              6               ] };
-       key <AD09>      { type="EIGHT_LEVEL", [ o,      O,              9,              9,              oacute,         Oacute,         9,              9               ] };
-
-       key <AC01>      { type="EIGHT_LEVEL", [ a,      A,              exclam,         exclam,         aogonek,        Aogonek,        exclam,         exclam          ] };    
-       key <AC02>      { type="EIGHT_LEVEL", [ s,      S,              quotedbl,       quotedbl,       sacute,         Sacute,         quotedbl,       quotedbl        ] };
-       key <AC05>      { type="EIGHT_LEVEL", [ g,      G,              percent,        percent,        dollar,         dollar,         percent,        percent         ] };    
-       key <AC06>      { type="EIGHT_LEVEL", [ h,      H,              backslash,      backslash,      bracketleft,    bracketleft,    backslash,      backslash       ] };
-       key <AC07>      { type="EIGHT_LEVEL", [ j,      J,              slash,          slash,          bracketright,   bracketright,   bracketright,   bracketright    ] };
-       key <AC09>      { type="EIGHT_LEVEL", [ l,      L,              parenright,     parenright,     lstroke,        Lstroke,        parenright,     parenright      ] };
-
-       key <AB01>      { type="EIGHT_LEVEL", [ y,      Y,              EuroSign,       EuroSign,       zabovedot,      Zabovedot,      EuroSign,       EuroSign        ] };    
-       key <AB02>      { type="EIGHT_LEVEL", [ x,      X,              asciitilde,     asciitilde,     zacute,         Zacute,         asciitilde,     asciitilde      ] };
-       key <AB03>      { type="EIGHT_LEVEL", [ c,      C,              asterisk,       asterisk,       cacute,         Cacute,         asterisk,       asterisk        ] };
-       key <AB06>      { type="EIGHT_LEVEL", [ n,      N,              less,           less,           nacute,         Nacute,         less,           less            ] };
-       key <AB07>      { type="EIGHT_LEVEL", [ m,      M,              greater,        greater,        dead_circumflex, dead_circumflex, greater,      greater         ] };
-       key <AB08>      { type="EIGHT_LEVEL", [ comma,  semicolon,      comma,          semicolon,      braceleft,      braceleft,      comma,          semicolon       ] };
-       key <AB09>      { type="EIGHT_LEVEL", [ period, colon,          period,         colon,          braceright,     braceright,     period,         colon           ] };
-
-       key <AE11>      { type="EIGHT_LEVEL", [ adiaeresis, Adiaeresis, apostrophe,     apostrophe,     quoteleft,      quoteleft,      adiaeresis,     Adiaeresis      ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "pl-qwerty-de" {
-       name[Group1] = "Polish QWERTY (DE hw)";
-
-       include "nokia_vndr/ukeyboard(pl-qwertz-de)"
-
-       key <AD06>      { type="EIGHT_LEVEL", [ y,      Y,              6,              6,              zabovedot,      Zabovedot,      6,              6               ] };
-       key <AB01>      { type="EIGHT_LEVEL", [ z,      Z,              EuroSign,       EuroSign,       zabovedot,      Zabovedot,      EuroSign,       EuroSign        ] };    
-};
-
-// author: Ognian Samokovliyski
-partial alphanumeric_keys
-xkb_symbols "bg-phonetic" {
-       name[Group1] = "Bulgarian Phonetic";
-
-       include "nokia_vndr/ukeyboard(base)"
-
-       key <COMP>      { [ ISO_Level5_Lock,    ISO_Level5_Lock,        ISO_Level5_Lock,        ISO_Level5_Lock         ] };
-       modifier_map Mod3 { ISO_Level5_Lock };
-
-       key <AD01>      { type="EIGHT_LEVEL", [ q,              Q,              1,              1,              Cyrillic_ya,            Cyrillic_YA,            1,              1               ] };
-       key <AD02>      { type="EIGHT_LEVEL", [ w,              W,              2,              2,              Cyrillic_ve,            Cyrillic_VE,            2,              2               ] };
-       key <AD03>      { type="EIGHT_LEVEL", [ e,              E,              3,              3,              Cyrillic_ie,            Cyrillic_IE,            3,              3               ] };
-       key <AD04>      { type="EIGHT_LEVEL", [ r,              R,              4,              4,              Cyrillic_er,            Cyrillic_ER,            4,              4               ] };
-       key <AD05>      { type="EIGHT_LEVEL", [ t,              T,              5,              5,              Cyrillic_te,            Cyrillic_TE,            5,              5               ] };
-       key <AD06>      { type="EIGHT_LEVEL", [ y,              Y,              6,              6,              Cyrillic_hardsign,      Cyrillic_HARDSIGN,      6,              6               ] };
-       key <AD07>      { type="EIGHT_LEVEL", [ u,              U,              7,              7,              Cyrillic_u,             Cyrillic_U,             7,              7               ] };
-       key <AD08>      { type="EIGHT_LEVEL", [ i,              I,              8,              8,              Cyrillic_i,             Cyrillic_I,             8,              8               ] };
-       key <AD09>      { type="EIGHT_LEVEL", [ o,              O,              9,              9,              Cyrillic_o,             Cyrillic_O,             9,              9               ] };
-       key <AD10>      { type="EIGHT_LEVEL", [ p,              P,              0,              0,              Cyrillic_pe,            Cyrillic_PE,            0,              0               ] };
-
-       key <AC01>      { type="EIGHT_LEVEL", [ a,              A,              exclam,         exclam,         Cyrillic_a,             Cyrillic_A,             exclam,         exclam          ] };
-       key <AC02>      { type="EIGHT_LEVEL", [ s,              S,              quotedbl,       quotedbl,       Cyrillic_es,            Cyrillic_ES,            quotedbl,       quotedbl        ] };
-       key <AC03>      { type="EIGHT_LEVEL", [ d,              D,              at,             at,             Cyrillic_de,            Cyrillic_DE,            at,             at              ] };
-       key <AC04>      { type="EIGHT_LEVEL", [ f,              F,              numbersign,     numbersign,     Cyrillic_ef,            Cyrillic_EF,            numbersign,     numbersign      ] };
-       key <AC05>      { type="EIGHT_LEVEL", [ g,              G,              backslash,      backslash,      Cyrillic_ghe,           Cyrillic_GHE,           backslash,      backslash       ] };
-       key <AC06>      { type="EIGHT_LEVEL", [ h,              H,              slash,          slash,          Cyrillic_ha,            Cyrillic_HA,            slash,          slash           ] };
-       key <AC07>      { type="EIGHT_LEVEL", [ j,              J,              parenleft,      parenleft,      Cyrillic_shorti,        Cyrillic_SHORTI,        parenleft,      parenleft       ] };
-       key <AC08>      { type="EIGHT_LEVEL", [ k,              K,              parenright,     parenright,     Cyrillic_ka,            Cyrillic_KA,            parenright,     parenright      ] };
-       key <AC09>      { type="EIGHT_LEVEL", [ l,              L,              asterisk,       asterisk,       Cyrillic_el,            Cyrillic_EL,            asterisk,       asterisk        ] };
-       key <AC11>      { type="EIGHT_LEVEL", [ apostrophe,     question,       question,       question,       Cyrillic_che,           Cyrillic_CHE,           apostrophe,     question        ] };
-
-       key <AB01>      { type="EIGHT_LEVEL", [ z,              Z,              yen,            yen,            Cyrillic_ze,            Cyrillic_ZE,            yen,            yen             ] };
-       key <AB02>      { type="EIGHT_LEVEL", [ x,              X,              asciicircum,    asciicircum,    Cyrillic_softsign,      Cyrillic_SOFTSIGN,      asciicircum,    asciicircum     ] };
-       key <AB03>      { type="EIGHT_LEVEL", [ c,              C,              asciitilde,     asciitilde,     Cyrillic_tse,           Cyrillic_TSE,           asciitilde,     asciitilde      ] };
-       key <AB04>      { type="EIGHT_LEVEL", [ v,              V,              percent,        percent,        Cyrillic_zhe,           Cyrillic_ZHE,           percent,        percent         ] };
-       key <AB05>      { type="EIGHT_LEVEL", [ b,              B,              ampersand,      ampersand,      Cyrillic_be,            Cyrillic_BE,            ampersand,      ampersand       ] };
-       key <AB06>      { type="EIGHT_LEVEL", [ n,              N,              dollar,         dollar,         Cyrillic_en,            Cyrillic_EN,            dollar,         dollar          ] };
-       key <AB07>      { type="EIGHT_LEVEL", [ m,              M,              EuroSign,       EuroSign,       Cyrillic_em,            Cyrillic_EM,            EuroSign,       EuroSign        ] };
-       key <AC10>      { type="EIGHT_LEVEL", [ semicolon,      colon,          colon,          colon,          Cyrillic_yu,            Cyrillic_YU,            minus,          minus           ] };
-       key <AE11>      { type="EIGHT_LEVEL", [ minus,          underscore,     minus,          underscore,     Cyrillic_sha,           Cyrillic_SHA,           minus,          underscore      ] };
-       key <AE12>      { type="EIGHT_LEVEL", [ plus,           equal,          equal,          equal,          Cyrillic_shcha,         Cyrillic_SHCHA,         plus,           equal           ] };
-       key <AB08>      { type="EIGHT_LEVEL", [ comma,          less,           comma,          less,           comma,                  less,                   comma,          less            ] };
-       key <AB09>      { type="EIGHT_LEVEL", [ period,         greater,        period,         greater,        period,                 greater,                period,         greater         ] };
-};
-
-
-// author: Porfyras <porfyras@gmail.com>
-partial alphanumeric_keys
-xkb_symbols "gr" {
-       name[Group1] = "Greek (US hw)";
-
-       include "nokia_vndr/ukeyboard(base)"
-
-       key <COMP>      { [ ISO_Level5_Lock,    ISO_Level5_Lock,        ISO_Level5_Lock,        ISO_Level5_Lock         ] };
-       modifier_map Mod3 { ISO_Level5_Lock };
-
-       key <SPCE>      { type="EIGHT_LEVEL", [ space,          space,          Tab,            Tab,            space,                  space,                  Tab,            Tab             ] };
-       key <AD01>      { type="EIGHT_LEVEL", [ q,              Q,              1,              1,              bar,                    bar,                    1,              1               ] };
-       key <AD02>      { type="EIGHT_LEVEL", [ w,              W,              2,              2,              Greek_finalsmallsigma,  Greek_SIGMA,            2,              2               ] };
-       key <AD03>      { type="EIGHT_LEVEL", [ e,              E,              3,              3,              Greek_epsilon,          Greek_EPSILON,          3,              3               ] };
-       key <AD04>      { type="EIGHT_LEVEL", [ r,              R,              4,              4,              Greek_rho,              Greek_RHO,              4,              4               ] };
-       key <AD05>      { type="EIGHT_LEVEL", [ t,              T,              5,              5,              Greek_tau,              Greek_TAU,              5,              5               ] };
-       key <AD06>      { type="EIGHT_LEVEL", [ y,              Y,              6,              6,              Greek_upsilon,          Greek_UPSILON,          6,              6               ] };
-       key <AD07>      { type="EIGHT_LEVEL", [ u,              U,              7,              7,              Greek_theta,            Greek_THETA,            7,              7               ] };
-       key <AD08>      { type="EIGHT_LEVEL", [ i,              I,              8,              8,              Greek_iota,             Greek_IOTA,             8,              8               ] };
-       key <AD09>      { type="EIGHT_LEVEL", [ o,              O,              9,              9,              Greek_omicron,          Greek_OMICRON,          9,              9               ] };
-       key <AD10>      { type="EIGHT_LEVEL", [ p,              P,              0,              0,              Greek_pi,               Greek_PI,               0,              0               ] };
-
-       key <AC01>      { type="EIGHT_LEVEL", [ a,              A,              exclam,         exclam,         Greek_alpha,            Greek_ALPHA,            exclam,         exclam          ] };
-       key <AC02>      { type="EIGHT_LEVEL", [ s,              S,              quotedbl,       quotedbl,       Greek_sigma,            Greek_SIGMA,            quotedbl,       quotedbl        ] };
-       key <AC03>      { type="EIGHT_LEVEL", [ d,              D,              at,             at,             Greek_delta,            Greek_DELTA,            at,             at              ] };
-       key <AC04>      { type="EIGHT_LEVEL", [ f,              F,              numbersign,     numbersign,     Greek_phi,              Greek_PHI,              numbersign,     numbersign      ] };
-       key <AC05>      { type="EIGHT_LEVEL", [ g,              G,              backslash,      backslash,      Greek_gamma,            Greek_GAMMA,            backslash,      backslash       ] };
-       key <AC06>      { type="EIGHT_LEVEL", [ h,              H,              slash,          slash,          Greek_eta,              Greek_ETA,              slash,          slash           ] };
-       key <AC07>      { type="EIGHT_LEVEL", [ j,              J,              parenleft,      parenleft,      Greek_xi,               Greek_XI,               parenleft,      parenleft       ] };
-       key <AC08>      { type="EIGHT_LEVEL", [ k,              K,              parenright,     parenright,     Greek_kappa,            Greek_KAPPA,            parenright,     parenright      ] };
-       key <AC09>      { type="EIGHT_LEVEL", [ l,              L,              asterisk,       asterisk,       Greek_lamda,            Greek_LAMDA,            asterisk,       asterisk        ] };
-       key <AC10>      { type="EIGHT_LEVEL", [ semicolon,      colon,          sterling,       sterling,       semicolon,              colon,                  sterling,       sterling        ] };
-       key <AC11>      { type="EIGHT_LEVEL", [ dead_acute,     dead_acute,     question,       question,       dead_acute,             dead_diaeresis,         question,       question        ] };
-
-       key <AB01>      { type="EIGHT_LEVEL", [ z,              Z,              yen,            yen,            Greek_zeta,             Greek_ZETA,             yen,            yen             ] };
-       key <AB02>      { type="EIGHT_LEVEL", [ x,              X,              asciicircum,    asciicircum,    Greek_chi,              Greek_CHI,              asciicircum,    asciicircum     ] };
-       key <AB03>      { type="EIGHT_LEVEL", [ c,              C,              asciitilde,     asciitilde,     Greek_psi,              Greek_PSI,              asciitilde,     asciitilde      ] };
-       key <AB04>      { type="EIGHT_LEVEL", [ v,              V,              percent,        percent,        Greek_omega,            Greek_OMEGA,            percent,        percent         ] };
-       key <AB05>      { type="EIGHT_LEVEL", [ b,              B,              ampersand,      ampersand,      Greek_beta,             Greek_BETA,             ampersand,      ampersand       ] };
-       key <AB06>      { type="EIGHT_LEVEL", [ n,              N,              dollar,         dollar,         Greek_nu,               Greek_NU,               dollar,         dollar          ] };
-       key <AB07>      { type="EIGHT_LEVEL", [ m,              M,              EuroSign,       EuroSign,       Greek_mu,               Greek_MU,               EuroSign,       EuroSign        ] };
-       key <AB08>      { type="EIGHT_LEVEL", [ comma,          less,           bracketleft,    bracketleft,    comma,                  less,                   bracketleft,    bracketleft     ] };
-       key <AB09>      { type="EIGHT_LEVEL", [ period,         greater,        bracketright,   bracketright,   period,                 greater,                bracketright,   bracketright    ] };
-       key <AE11>      { type="EIGHT_LEVEL", [ minus,          braceleft,      underscore,     underscore,     minus,                  braceleft,              underscore,     underscore      ] };
-       key <AE12>      { type="EIGHT_LEVEL", [ plus,           braceright,     equal,          equal,          plus,                   braceright,             equal,          equal           ] };
-};
diff --git a/ukeyboard/xkb/rx51/ukeyboard b/ukeyboard/xkb/rx51/ukeyboard
deleted file mode 100644 (file)
index b820c96..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-// author: Roman Moravcik
-xkb_symbols "sk" {
-    name[Group1] = "Slovak QWERTZ (CZ HW)";
-
-    include "nokia_vndr/rx-51(english_base)"
-    include "nokia_vndr/rx-51(arrows_2btns)"
-
-    // 1. row
-    key <AD06> { [     z,              Z,              6,              6               ] };
-    key <AB08> { [     dead_acute,     dead_acute,     sterling,       sterling        ] };
-
-    // 2. row
-    key <AC08> { [     k,              K,              semicolon,      semicolon       ] };
-    key <AC09> { [     l,              L,              colon,          colon           ] };
-    key <AB09> { [     ocircumflex,    adiaeresis,     EuroSign,       EuroSign        ] };
-    key <UP>   { [     dead_caron,     dead_caron,     dollar,         dollar          ] };
-
-    // 3. row
-    key <AB01> { [     y,              Y,              percent,        percent         ] };
-    key <AB02> { [     x,              X,              slash,          slash           ] };
-    key <AB03> { [     c,              C,              backslash,      backslash       ] };
-    key <AB04> { [     v,              V,              apostrophe,     apostrophe      ] };
-    key <AB05> { [     b,              B,              quotedbl,       quotedbl        ] };
-    key <AB06> { [     n,              N,              exclam,         exclam          ] };
-    key <AB07> { [     m,              M,              question,       question        ] };
-    key <LEFT> { [     period,         comma,          Tab,            bar             ] };
-};
-
-xkb_symbols "sk_qwerty" {
-    name[Group1] = "Slovak QWERTY (CZ hw)";
-
-    include "nokia_vndr/rx-51(sk)"
-
-    // 1. row
-    key <AD06> { [     y,              Y,              6,              6               ] };
-
-    // 3. row
-    key <AB01> { [     z,              Z,              percent,        percent         ] };
-};
-
diff --git a/ukeyboard/xkb/ukbdrx44 b/ukeyboard/xkb/ukbdrx44
new file mode 100644 (file)
index 0000000..98735a9
--- /dev/null
@@ -0,0 +1,304 @@
+partial default alphanumeric_keys
+xkb_symbols "base" {
+       include "nokia_vndr/rx-44(base)"
+
+       key <BKSP>      { [ BackSpace,  BackSpace,      Delete,         Delete          ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "cz-qwerty" {
+       name[Group1] = "Czech QWERTY (DE hw)";
+
+       include "nokia_vndr/ukbdrx44(base)"
+
+       key <AC01>      { [ a,          A,              exclam,         section         ] };
+       key <AC02>      { [ s,          S,              quotedbl,       quotedbl        ] };
+       key <AC03>      { [ d,          D,              at,             at              ] };
+       key <AC04>      { [ f,          F,              numbersign,     numbersign      ] };
+       key <AC05>      { [ g,          G,              percent,        percent         ] };
+       key <AC06>      { [ h,          H,              backslash,      backslash       ] };
+       key <AC07>      { [ j,          J,              slash,          slash           ] };
+       key <AC08>      { [ k,          K,              parenleft,      bracketleft     ] };
+       key <AC09>      { [ l,          L,              parenright,     bracketright    ] };
+       key <AC11>      { [ uring,      Uring,          question,       asciicircum     ] };
+
+       key <AB01>      { [ z,          Z,              EuroSign,       dollar          ] };
+       key <AB02>      { [ x,          X,              asciitilde,     asciitilde      ] };
+       key <AB03>      { [ c,          C,              asterisk,       asterisk        ] };
+       key <AB04>      { [ v,          V,              ampersand,      ampersand       ] };
+       key <AB05>      { [ b,          B,              plus,           plus            ] };
+       key <AB06>      { [ n,          N,              less,           braceleft       ] };
+       key <AB07>      { [ m,          M,              greater,        braceright      ] };
+       key <AC10>      { [ dead_acute, dead_acute,     equal,          equal           ] };
+       key <AE11>      { [ dead_caron, dead_caron,     apostrophe,     grave           ] };
+       key <AE12>      { [ minus,      underscore,     endash,         emdash          ] };
+
+       key <AB08>      { [ comma,      semicolon,      Tab,            bar             ] };
+       key <AB09>      { [ period,     colon,          period,         colon           ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "cz-qwertz" {
+       name[Group1] = "Czech QWERTZ (DE hw)";
+
+       include "nokia_vndr/ukbdrx44(cz-qwerty)"
+
+       key <AD06>      { [ z,          Z,              6,              6               ] };
+       key <AB01>      { [ y,          Y,              EuroSign,       dollar          ] };
+};
+
+// author: Michal Prihoda
+partial alphanumeric_keys
+xkb_symbols "cz-qwerty-us" {
+       name[Group1] = "Czech QWERTY (US hw)";
+
+       include "nokia_vndr/ukbdrx44(base)"
+
+       key <AC01>      { [ a,          A,              exclam,         exclam          ] };
+       key <AC02>      { [ s,          S,              quotedbl,       quotedbl        ] };
+       key <AC03>      { [ d,          D,              at,             at              ] };
+       key <AC04>      { [ f,          F,              numbersign,     numbersign      ] };
+       key <AC05>      { [ g,          G,              backslash,      backslash       ] };
+       key <AC06>      { [ h,          H,              slash,          slash           ] };
+       key <AC07>      { [ j,          J,              parenleft,      parenleft       ] };
+       key <AC08>      { [ k,          K,              parenright,     parenright      ] };
+       key <AC09>      { [ l,          L,              asterisk,       asterisk        ] };
+       key <AC11>      { [ dead_acute, apostrophe,     question,       question        ] };
+
+       key <AB01>      { [ z,          Z,              yen,            yen             ] };
+       key <AB02>      { [ x,          X,              asciicircum,    asciicircum     ] };
+       key <AB03>      { [ c,          C,              asciitilde,     asciitilde      ] };
+       key <AB04>      { [ v,          V,              percent,        percent         ] };
+       key <AB05>      { [ b,          B,              ampersand,      ampersand       ] };
+       key <AB06>      { [ n,          N,              dollar,         dollar          ] };
+       key <AB07>      { [ m,          M,              EuroSign,       EuroSign        ] };
+       key <AC10>      { [ semicolon,  colon,          sterling,       sterling        ] };
+       key <AE11>      { [ minus,      uring,          underscore,     underscore      ] };
+       key <AE12>      { [ dead_caron, plus,           equal,          equal           ] };
+
+       key <AB08>      { [ comma,      less,           comma,          less            ] };
+       key <AB09>      { [ period,     greater,        period,         greater         ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "cz-qwertz-us" {
+       name[Group1] = "Czech QWERTZ (US hw)";
+
+       include "nokia_vndr/ukbdrx44(cz-qwerty-us)"
+
+       key <AD06>      { [ z,          Z,              6,              6               ] };
+       key <AB01>      { [ y,          Y,              yen,            yen             ] };
+};
+
+// author: Roman Moravcik
+partial alphanumeric_keys
+xkb_symbols "sk-qwerty" {
+       name[Group1] = "Slovak QWERTY (DE hw)";
+
+       include "nokia_vndr/ukbdrx44(base)"
+
+       key <AC01>      { [ a,          A,              exclam,         exclam          ] };
+       key <AC02>      { [ s,          S,              quotedbl,       quotedbl        ] };
+       key <AC03>      { [ d,          D,              at,             at              ] };
+       key <AC04>      { [ f,          F,              numbersign,     numbersign      ] };
+       key <AC05>      { [ g,          G,              percent,        percent         ] };
+       key <AC06>      { [ h,          H,              backslash,      backslash       ] };
+       key <AC07>      { [ j,          J,              slash,          slash           ] };
+       key <AC08>      { [ k,          K,              parenleft,      parenleft       ] };
+       key <AC09>      { [ l,          L,              parenright,     parenright      ] };
+       key <AC11>      { [ ocircumflex,adiaeresis,     question,       question        ] };
+
+       key <AB01>      { [ z,          Z,              EuroSign,       EuroSign        ] };
+       key <AB02>      { [ x,          X,              asciitilde,     asciitilde      ] };
+       key <AB03>      { [ c,          C,              asterisk,       asterisk        ] };
+       key <AB04>      { [ v,          V,              ampersand,      ampersand       ] };
+       key <AB05>      { [ b,          B,              plus,           plus            ] };
+       key <AB06>      { [ n,          N,              less,           less            ] };
+       key <AB07>      { [ m,          M,              greater,        greater         ] };
+       key <AC10>      { [ dead_acute, dead_acute,     equal,          equal           ] };
+       key <AE11>      { [ dead_caron, dead_caron,     apostrophe,     apostrophe      ] };
+       key <AE12>      { [ minus,      underscore,     endash,         endash          ] };
+
+       key <AB08>      { [ comma,      semicolon,      bar,            bar             ] };
+       key <AB09>      { [ period,     colon,          Tab,            Tab             ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "sk-qwertz" {
+       name[Group1] = "Slovak QWERTZ (DE hw)";
+
+       include "nokia_vndr/ukbdrx44(sk-qwerty)"
+
+       key <AD06>      { [ z,          Z,              6,              6               ] };
+       key <AB01>      { [ y,          Y,              EuroSign,       EuroSign        ] };
+};
+
+
+// author: Marcin Juszkiewicz
+partial alphanumeric_keys
+xkb_symbols "pl" {
+       name[Group1] = "Polish (US hw)";
+
+       include "nokia_vndr/rx-44(us)"
+       include "nokia_vndr/ukbdrx44(base)"
+
+       key <COMP>      { [ ISO_Level5_Shift,   ISO_Level5_Shift,       ISO_Level5_Shift,       ISO_Level5_Shift        ] };
+       modifier_map Mod3 { ISO_Level5_Shift };
+
+//                                             normal  Shift   Fn              Fn+Shift        Chr             S+Chr           Fn+Chr          Fn+Shift+Chr
+       key <SPCE>      { type="EIGHT_LEVEL", [ space,  space,  bar,            bar,            Tab,            Tab,            bar,            bar             ] };
+
+       key <AD03>      { type="EIGHT_LEVEL", [ e,      E,      3,              3,              eogonek,        Eogonek,        3,              3               ] };
+       key <AD09>      { type="EIGHT_LEVEL", [ o,      O,      9,              9,              oacute,         Oacute,         9,              9               ] };
+
+       key <AC01>      { type="EIGHT_LEVEL", [ a,      A,      exclam,         exclam,         aogonek,        Aogonek,        exclam,         exclam          ] };
+       key <AC02>      { type="EIGHT_LEVEL", [ s,      S,      quotedbl,       quotedbl,       sacute,         Sacute,         quotedbl,       quotedbl        ] };
+       key <AC07>      { type="EIGHT_LEVEL", [ j,      J,      parenleft,      parenleft,      bracketleft,    bracketleft,    parenleft,      parenleft       ] };
+       key <AC08>      { type="EIGHT_LEVEL", [ k,      K,      parenright,     parenright,     bracketright,   bracketright,   parenright,     parenright      ] };
+       key <AC09>      { type="EIGHT_LEVEL", [ l,      L,      asterisk,       asterisk,       lstroke,        Lstroke,        asterisk,       asterisk        ] };
+
+       key <AB01>      { type="EIGHT_LEVEL", [ z,      Z,      yen,            yen,            zabovedot,      Zabovedot,      yen,            yen             ] };
+       key <AB02>      { type="EIGHT_LEVEL", [ x,      X,      asciicircum,    asciicircum,    zacute,         Zacute,         asciicircum,    asciicircum     ] };
+       key <AB03>      { type="EIGHT_LEVEL", [ c,      C,      asciitilde,     asciitilde,     cacute,         Cacute,         asciitilde,     asciitilde      ] };
+       key <AB06>      { type="EIGHT_LEVEL", [ n,      N,      dollar,         dollar,         nacute,         Nacute,         dollar,         dollar          ] };
+};
+
+// author: Pawel Dys
+partial alphanumeric_keys
+xkb_symbols "pl-qwertz-de" {
+       name[Group1] = "Polish QWERTZ (DE hw)";
+
+       include "nokia_vndr/rx-44(de)"
+       include "nokia_vndr/ukbdrx44(base)"
+
+       key <COMP>      { [ ISO_Level5_Shift,   ISO_Level5_Shift,       ISO_Level5_Shift,       ISO_Level5_Shift        ] };
+       modifier_map Mod3 { ISO_Level5_Shift };
+
+//                                             normal  Shift           Fn              Fn+Shift        Chr             S+Chr           Fn+Chr          Fn+Shift+Chr
+       key <SPCE>      { type="EIGHT_LEVEL", [ space,  space,          Tab,            Tab,            bar,            bar,            space,          space           ] };
+
+       key <AD03>      { type="EIGHT_LEVEL", [ e,      E,              3,              3,              eogonek,        Eogonek,        3,              3               ] };
+       key <AD06>      { type="EIGHT_LEVEL", [ z,      Z,              6,              6,              zabovedot,      Zabovedot,      6,              6               ] };
+       key <AD09>      { type="EIGHT_LEVEL", [ o,      O,              9,              9,              oacute,         Oacute,         9,              9               ] };
+
+       key <AC01>      { type="EIGHT_LEVEL", [ a,      A,              exclam,         exclam,         aogonek,        Aogonek,        exclam,         exclam          ] };    
+       key <AC02>      { type="EIGHT_LEVEL", [ s,      S,              quotedbl,       quotedbl,       sacute,         Sacute,         quotedbl,       quotedbl        ] };
+       key <AC05>      { type="EIGHT_LEVEL", [ g,      G,              percent,        percent,        dollar,         dollar,         percent,        percent         ] };    
+       key <AC06>      { type="EIGHT_LEVEL", [ h,      H,              backslash,      backslash,      bracketleft,    bracketleft,    backslash,      backslash       ] };
+       key <AC07>      { type="EIGHT_LEVEL", [ j,      J,              slash,          slash,          bracketright,   bracketright,   bracketright,   bracketright    ] };
+       key <AC09>      { type="EIGHT_LEVEL", [ l,      L,              parenright,     parenright,     lstroke,        Lstroke,        parenright,     parenright      ] };
+
+       key <AB01>      { type="EIGHT_LEVEL", [ y,      Y,              EuroSign,       EuroSign,       zabovedot,      Zabovedot,      EuroSign,       EuroSign        ] };    
+       key <AB02>      { type="EIGHT_LEVEL", [ x,      X,              asciitilde,     asciitilde,     zacute,         Zacute,         asciitilde,     asciitilde      ] };
+       key <AB03>      { type="EIGHT_LEVEL", [ c,      C,              asterisk,       asterisk,       cacute,         Cacute,         asterisk,       asterisk        ] };
+       key <AB06>      { type="EIGHT_LEVEL", [ n,      N,              less,           less,           nacute,         Nacute,         less,           less            ] };
+       key <AB07>      { type="EIGHT_LEVEL", [ m,      M,              greater,        greater,        dead_circumflex, dead_circumflex, greater,      greater         ] };
+       key <AB08>      { type="EIGHT_LEVEL", [ comma,  semicolon,      comma,          semicolon,      braceleft,      braceleft,      comma,          semicolon       ] };
+       key <AB09>      { type="EIGHT_LEVEL", [ period, colon,          period,         colon,          braceright,     braceright,     period,         colon           ] };
+
+       key <AE11>      { type="EIGHT_LEVEL", [ adiaeresis, Adiaeresis, apostrophe,     apostrophe,     quoteleft,      quoteleft,      adiaeresis,     Adiaeresis      ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "pl-qwerty-de" {
+       name[Group1] = "Polish QWERTY (DE hw)";
+
+       include "nokia_vndr/ukbdrx44(pl-qwertz-de)"
+
+       key <AD06>      { type="EIGHT_LEVEL", [ y,      Y,              6,              6,              zabovedot,      Zabovedot,      6,              6               ] };
+       key <AB01>      { type="EIGHT_LEVEL", [ z,      Z,              EuroSign,       EuroSign,       zabovedot,      Zabovedot,      EuroSign,       EuroSign        ] };    
+};
+
+// author: Ognian Samokovliyski
+partial alphanumeric_keys
+xkb_symbols "bg-phonetic" {
+       name[Group1] = "Bulgarian Phonetic";
+
+       include "nokia_vndr/ukbdrx44(base)"
+
+       key <COMP>      { [ ISO_Level5_Lock,    ISO_Level5_Lock,        ISO_Level5_Lock,        ISO_Level5_Lock         ] };
+       modifier_map Mod3 { ISO_Level5_Lock };
+
+       key <AD01>      { type="EIGHT_LEVEL", [ q,              Q,              1,              1,              Cyrillic_ya,            Cyrillic_YA,            1,              1               ] };
+       key <AD02>      { type="EIGHT_LEVEL", [ w,              W,              2,              2,              Cyrillic_ve,            Cyrillic_VE,            2,              2               ] };
+       key <AD03>      { type="EIGHT_LEVEL", [ e,              E,              3,              3,              Cyrillic_ie,            Cyrillic_IE,            3,              3               ] };
+       key <AD04>      { type="EIGHT_LEVEL", [ r,              R,              4,              4,              Cyrillic_er,            Cyrillic_ER,            4,              4               ] };
+       key <AD05>      { type="EIGHT_LEVEL", [ t,              T,              5,              5,              Cyrillic_te,            Cyrillic_TE,            5,              5               ] };
+       key <AD06>      { type="EIGHT_LEVEL", [ y,              Y,              6,              6,              Cyrillic_hardsign,      Cyrillic_HARDSIGN,      6,              6               ] };
+       key <AD07>      { type="EIGHT_LEVEL", [ u,              U,              7,              7,              Cyrillic_u,             Cyrillic_U,             7,              7               ] };
+       key <AD08>      { type="EIGHT_LEVEL", [ i,              I,              8,              8,              Cyrillic_i,             Cyrillic_I,             8,              8               ] };
+       key <AD09>      { type="EIGHT_LEVEL", [ o,              O,              9,              9,              Cyrillic_o,             Cyrillic_O,             9,              9               ] };
+       key <AD10>      { type="EIGHT_LEVEL", [ p,              P,              0,              0,              Cyrillic_pe,            Cyrillic_PE,            0,              0               ] };
+
+       key <AC01>      { type="EIGHT_LEVEL", [ a,              A,              exclam,         exclam,         Cyrillic_a,             Cyrillic_A,             exclam,         exclam          ] };
+       key <AC02>      { type="EIGHT_LEVEL", [ s,              S,              quotedbl,       quotedbl,       Cyrillic_es,            Cyrillic_ES,            quotedbl,       quotedbl        ] };
+       key <AC03>      { type="EIGHT_LEVEL", [ d,              D,              at,             at,             Cyrillic_de,            Cyrillic_DE,            at,             at              ] };
+       key <AC04>      { type="EIGHT_LEVEL", [ f,              F,              numbersign,     numbersign,     Cyrillic_ef,            Cyrillic_EF,            numbersign,     numbersign      ] };
+       key <AC05>      { type="EIGHT_LEVEL", [ g,              G,              backslash,      backslash,      Cyrillic_ghe,           Cyrillic_GHE,           backslash,      backslash       ] };
+       key <AC06>      { type="EIGHT_LEVEL", [ h,              H,              slash,          slash,          Cyrillic_ha,            Cyrillic_HA,            slash,          slash           ] };
+       key <AC07>      { type="EIGHT_LEVEL", [ j,              J,              parenleft,      parenleft,      Cyrillic_shorti,        Cyrillic_SHORTI,        parenleft,      parenleft       ] };
+       key <AC08>      { type="EIGHT_LEVEL", [ k,              K,              parenright,     parenright,     Cyrillic_ka,            Cyrillic_KA,            parenright,     parenright      ] };
+       key <AC09>      { type="EIGHT_LEVEL", [ l,              L,              asterisk,       asterisk,       Cyrillic_el,            Cyrillic_EL,            asterisk,       asterisk        ] };
+       key <AC11>      { type="EIGHT_LEVEL", [ apostrophe,     question,       question,       question,       Cyrillic_che,           Cyrillic_CHE,           apostrophe,     question        ] };
+
+       key <AB01>      { type="EIGHT_LEVEL", [ z,              Z,              yen,            yen,            Cyrillic_ze,            Cyrillic_ZE,            yen,            yen             ] };
+       key <AB02>      { type="EIGHT_LEVEL", [ x,              X,              asciicircum,    asciicircum,    Cyrillic_softsign,      Cyrillic_SOFTSIGN,      asciicircum,    asciicircum     ] };
+       key <AB03>      { type="EIGHT_LEVEL", [ c,              C,              asciitilde,     asciitilde,     Cyrillic_tse,           Cyrillic_TSE,           asciitilde,     asciitilde      ] };
+       key <AB04>      { type="EIGHT_LEVEL", [ v,              V,              percent,        percent,        Cyrillic_zhe,           Cyrillic_ZHE,           percent,        percent         ] };
+       key <AB05>      { type="EIGHT_LEVEL", [ b,              B,              ampersand,      ampersand,      Cyrillic_be,            Cyrillic_BE,            ampersand,      ampersand       ] };
+       key <AB06>      { type="EIGHT_LEVEL", [ n,              N,              dollar,         dollar,         Cyrillic_en,            Cyrillic_EN,            dollar,         dollar          ] };
+       key <AB07>      { type="EIGHT_LEVEL", [ m,              M,              EuroSign,       EuroSign,       Cyrillic_em,            Cyrillic_EM,            EuroSign,       EuroSign        ] };
+       key <AC10>      { type="EIGHT_LEVEL", [ semicolon,      colon,          colon,          colon,          Cyrillic_yu,            Cyrillic_YU,            minus,          minus           ] };
+       key <AE11>      { type="EIGHT_LEVEL", [ minus,          underscore,     minus,          underscore,     Cyrillic_sha,           Cyrillic_SHA,           minus,          underscore      ] };
+       key <AE12>      { type="EIGHT_LEVEL", [ plus,           equal,          equal,          equal,          Cyrillic_shcha,         Cyrillic_SHCHA,         plus,           equal           ] };
+       key <AB08>      { type="EIGHT_LEVEL", [ comma,          less,           comma,          less,           comma,                  less,                   comma,          less            ] };
+       key <AB09>      { type="EIGHT_LEVEL", [ period,         greater,        period,         greater,        period,                 greater,                period,         greater         ] };
+};
+
+
+// author: Porfyras <porfyras@gmail.com>
+partial alphanumeric_keys
+xkb_symbols "gr" {
+       name[Group1] = "Greek (US hw)";
+
+       include "nokia_vndr/ukbdrx44(base)"
+
+       key <COMP>      { [ ISO_Level5_Lock,    ISO_Level5_Lock,        ISO_Level5_Lock,        ISO_Level5_Lock         ] };
+       modifier_map Mod3 { ISO_Level5_Lock };
+
+       key <SPCE>      { type="EIGHT_LEVEL", [ space,          space,          Tab,            Tab,            space,                  space,                  Tab,            Tab             ] };
+       key <AD01>      { type="EIGHT_LEVEL", [ q,              Q,              1,              1,              bar,                    bar,                    1,              1               ] };
+       key <AD02>      { type="EIGHT_LEVEL", [ w,              W,              2,              2,              Greek_finalsmallsigma,  Greek_SIGMA,            2,              2               ] };
+       key <AD03>      { type="EIGHT_LEVEL", [ e,              E,              3,              3,              Greek_epsilon,          Greek_EPSILON,          3,              3               ] };
+       key <AD04>      { type="EIGHT_LEVEL", [ r,              R,              4,              4,              Greek_rho,              Greek_RHO,              4,              4               ] };
+       key <AD05>      { type="EIGHT_LEVEL", [ t,              T,              5,              5,              Greek_tau,              Greek_TAU,              5,              5               ] };
+       key <AD06>      { type="EIGHT_LEVEL", [ y,              Y,              6,              6,              Greek_upsilon,          Greek_UPSILON,          6,              6               ] };
+       key <AD07>      { type="EIGHT_LEVEL", [ u,              U,              7,              7,              Greek_theta,            Greek_THETA,            7,              7               ] };
+       key <AD08>      { type="EIGHT_LEVEL", [ i,              I,              8,              8,              Greek_iota,             Greek_IOTA,             8,              8               ] };
+       key <AD09>      { type="EIGHT_LEVEL", [ o,              O,              9,              9,              Greek_omicron,          Greek_OMICRON,          9,              9               ] };
+       key <AD10>      { type="EIGHT_LEVEL", [ p,              P,              0,              0,              Greek_pi,               Greek_PI,               0,              0               ] };
+
+       key <AC01>      { type="EIGHT_LEVEL", [ a,              A,              exclam,         exclam,         Greek_alpha,            Greek_ALPHA,            exclam,         exclam          ] };
+       key <AC02>      { type="EIGHT_LEVEL", [ s,              S,              quotedbl,       quotedbl,       Greek_sigma,            Greek_SIGMA,            quotedbl,       quotedbl        ] };
+       key <AC03>      { type="EIGHT_LEVEL", [ d,              D,              at,             at,             Greek_delta,            Greek_DELTA,            at,             at              ] };
+       key <AC04>      { type="EIGHT_LEVEL", [ f,              F,              numbersign,     numbersign,     Greek_phi,              Greek_PHI,              numbersign,     numbersign      ] };
+       key <AC05>      { type="EIGHT_LEVEL", [ g,              G,              backslash,      backslash,      Greek_gamma,            Greek_GAMMA,            backslash,      backslash       ] };
+       key <AC06>      { type="EIGHT_LEVEL", [ h,              H,              slash,          slash,          Greek_eta,              Greek_ETA,              slash,          slash           ] };
+       key <AC07>      { type="EIGHT_LEVEL", [ j,              J,              parenleft,      parenleft,      Greek_xi,               Greek_XI,               parenleft,      parenleft       ] };
+       key <AC08>      { type="EIGHT_LEVEL", [ k,              K,              parenright,     parenright,     Greek_kappa,            Greek_KAPPA,            parenright,     parenright      ] };
+       key <AC09>      { type="EIGHT_LEVEL", [ l,              L,              asterisk,       asterisk,       Greek_lamda,            Greek_LAMDA,            asterisk,       asterisk        ] };
+       key <AC10>      { type="EIGHT_LEVEL", [ semicolon,      colon,          sterling,       sterling,       semicolon,              colon,                  sterling,       sterling        ] };
+       key <AC11>      { type="EIGHT_LEVEL", [ dead_acute,     dead_acute,     question,       question,       dead_acute,             dead_diaeresis,         question,       question        ] };
+
+       key <AB01>      { type="EIGHT_LEVEL", [ z,              Z,              yen,            yen,            Greek_zeta,             Greek_ZETA,             yen,            yen             ] };
+       key <AB02>      { type="EIGHT_LEVEL", [ x,              X,              asciicircum,    asciicircum,    Greek_chi,              Greek_CHI,              asciicircum,    asciicircum     ] };
+       key <AB03>      { type="EIGHT_LEVEL", [ c,              C,              asciitilde,     asciitilde,     Greek_psi,              Greek_PSI,              asciitilde,     asciitilde      ] };
+       key <AB04>      { type="EIGHT_LEVEL", [ v,              V,              percent,        percent,        Greek_omega,            Greek_OMEGA,            percent,        percent         ] };
+       key <AB05>      { type="EIGHT_LEVEL", [ b,              B,              ampersand,      ampersand,      Greek_beta,             Greek_BETA,             ampersand,      ampersand       ] };
+       key <AB06>      { type="EIGHT_LEVEL", [ n,              N,              dollar,         dollar,         Greek_nu,               Greek_NU,               dollar,         dollar          ] };
+       key <AB07>      { type="EIGHT_LEVEL", [ m,              M,              EuroSign,       EuroSign,       Greek_mu,               Greek_MU,               EuroSign,       EuroSign        ] };
+       key <AB08>      { type="EIGHT_LEVEL", [ comma,          less,           bracketleft,    bracketleft,    comma,                  less,                   bracketleft,    bracketleft     ] };
+       key <AB09>      { type="EIGHT_LEVEL", [ period,         greater,        bracketright,   bracketright,   period,                 greater,                bracketright,   bracketright    ] };
+       key <AE11>      { type="EIGHT_LEVEL", [ minus,          braceleft,      underscore,     underscore,     minus,                  braceleft,              underscore,     underscore      ] };
+       key <AE12>      { type="EIGHT_LEVEL", [ plus,           braceright,     equal,          equal,          plus,                   braceright,             equal,          equal           ] };
+};
diff --git a/ukeyboard/xkb/ukbdrx51 b/ukeyboard/xkb/ukbdrx51
new file mode 100644 (file)
index 0000000..b820c96
--- /dev/null
@@ -0,0 +1,40 @@
+// author: Roman Moravcik
+xkb_symbols "sk" {
+    name[Group1] = "Slovak QWERTZ (CZ HW)";
+
+    include "nokia_vndr/rx-51(english_base)"
+    include "nokia_vndr/rx-51(arrows_2btns)"
+
+    // 1. row
+    key <AD06> { [     z,              Z,              6,              6               ] };
+    key <AB08> { [     dead_acute,     dead_acute,     sterling,       sterling        ] };
+
+    // 2. row
+    key <AC08> { [     k,              K,              semicolon,      semicolon       ] };
+    key <AC09> { [     l,              L,              colon,          colon           ] };
+    key <AB09> { [     ocircumflex,    adiaeresis,     EuroSign,       EuroSign        ] };
+    key <UP>   { [     dead_caron,     dead_caron,     dollar,         dollar          ] };
+
+    // 3. row
+    key <AB01> { [     y,              Y,              percent,        percent         ] };
+    key <AB02> { [     x,              X,              slash,          slash           ] };
+    key <AB03> { [     c,              C,              backslash,      backslash       ] };
+    key <AB04> { [     v,              V,              apostrophe,     apostrophe      ] };
+    key <AB05> { [     b,              B,              quotedbl,       quotedbl        ] };
+    key <AB06> { [     n,              N,              exclam,         exclam          ] };
+    key <AB07> { [     m,              M,              question,       question        ] };
+    key <LEFT> { [     period,         comma,          Tab,            bar             ] };
+};
+
+xkb_symbols "sk_qwerty" {
+    name[Group1] = "Slovak QWERTY (CZ hw)";
+
+    include "nokia_vndr/rx-51(sk)"
+
+    // 1. row
+    key <AD06> { [     y,              Y,              6,              6               ] };
+
+    // 3. row
+    key <AB01> { [     z,              Z,              percent,        percent         ] };
+};
+