ChangeLog | 110 +++++++++++++
NEWS | 1
configure | 20 +-
configure.in | 2
debian/changelog | 22 +-
geometry/Makefile.am | 2
geometry/Makefile.in | 2
geometry/hhk | 268 ++++++++++++++++++++++++++++++++
rules/base | 15 +
rules/base.lists.part | 2
rules/base.lst | 119 ++++++++------
rules/base.m_g.part | 1
rules/base.o_s.part | 12 +
rules/base.xml.in | 378 ++++++++++++++++++++++++++++++++++++++++------
rules/xfree98 | 6
rules/xkb.dtd | 4
symbols/Makefile.am | 8
symbols/Makefile.in | 8
symbols/be | 25 ---
symbols/br | 4
symbols/braille | 62 +++++++
symbols/ch | 4
symbols/cs | 4
symbols/de | 6
symbols/dk | 6
symbols/ee | 4
symbols/et | 67 ++++++++
symbols/fi | 6
symbols/ge | 12 +
symbols/gr | 11 -
symbols/hu | 18 +-
symbols/il | 4
symbols/in | 80 +++++++++
symbols/it | 4
symbols/jp | 14 +
symbols/keypad | 216 +++++++++++++++++++++-----
symbols/kpdl | 88 ++++++++++
symbols/lk | 35 +---
symbols/macintosh_vndr/ch | 4
symbols/macintosh_vndr/de | 2
symbols/macintosh_vndr/it | 2
symbols/macintosh_vndr/se | 2
symbols/mk | 4
symbols/nl | 4
symbols/no | 4
symbols/pl | 10 -
symbols/ro | 4
symbols/ru | 64 +++++++
symbols/se | 8
symbols/us | 71 ++++++++
xkeyboard-config.spec | 2
51 files changed, 1557 insertions(+), 274 deletions(-)
New commits:
commit c85f1c5d3311499ac4e352b9bf1ad7199ee42043
Author: Mohammed Adnene Trojette <[EMAIL PROTECTED]>
Date: Sat Jul 21 19:49:01 2007 +0200
New upstream CVS snapshot
* New upstream CVS snapshot from July 21st 2007:
+ include xkb files for the Happy Hacking keyboard. (Closes: #167370)
+ fix us layout. (Closes: #421532)
+ fix se layout. (Closes: #425304)
+ fix de+nodeadkey layout. (Closes: #432297)
* Patches refreshed:
+ fix FTBFS. (Closes: #424112)
* Patches to send upstream.
+ 002_add_asus6000.diff: add Asus A6000 series Keyboard support.
(Closes: #383953)
diff --git a/debian/changelog b/debian/changelog
index 6867400..3f872d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,21 @@
-xkeyboard-config (0.9+cvs.20070428-2) UNRELEASED; urgency=low
-
- * Patches to send upstream.
- + 002_add_asus6000.diff: add Asus A6000 series Keyboard
- support. (Closes: #383953)
- * Patches backported from upstream:
- + 001_fix_us.diff: fix us layout. (Closes: #421532)
+xkeyboard-config (1.0~cvs.20070721-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Fix watch file to look for tarballs at http://xlibs.fd.o/xkbdesc/
- -- Mohammed Adnène Trojette <[EMAIL PROTECTED]> Sun, 03 Jun 2007 18:32:13
+0200
+ [ Mohammed Adnène Trojette ]
+ * New upstream CVS snapshot from July 21st 2007:
+ + include xkb files for the Happy Hacking keyboard. (Closes: #167370)
+ + fix us layout. (Closes: #421532)
+ + fix se layout. (Closes: #425304)
+ + fix de+nodeadkey layout. (Closes: #432297)
+ * Patches refreshed:
+ + fix FTBFS. (Closes: #424112)
+ * Patches to send upstream.
+ + 002_add_asus6000.diff: add Asus A6000 series Keyboard support.
+ (Closes: #383953)
+
+ -- Mohammed Adnène Trojette <[EMAIL PROTECTED]> Sat, 21 Jul 2007 19:42:15
+0200
xkeyboard-config (0.9+cvs.20070428-1) experimental; urgency=low
commit 06770dd5e82baaacfe265f7ef61aa62844b82fde
Author: Mohammed Adnene Trojette <[EMAIL PROTECTED]>
Date: Sat Jul 21 19:40:17 2007 +0200
New upstream CVS snapshot
diff --git a/ChangeLog b/ChangeLog
index 38d3702..cfd027d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,111 @@
+2007-07-20 Sergey Udaltsov
+
+ * symbols/gr: adding pound sign,
+ https://bugs.freedesktop.org/show_bug.cgi?id=11608
+
+2007-07-16 Sergey Udaltsov
+
+ * rules/base.o_s.part, rules/base.xml.in, symbols/be, symbols/keypad:
+ modularized wang kbd,
+ https://bugs.freedesktop.org/show_bug.cgi?id=8852
+
+2007-07-15 Sergey Udaltsov
+
+ * symbols/kpdl, symbols/*, rules/base.xml.in, rules/base.o_s.part:
+ introducing separate KPDL handling,
+ https://bugs.freedesktop.org/show_bug.cgi?id=11611
+
+2007-07-12 Sergey Udaltsov
+
+ * NEWS: preparing release 1.0
+
+2007-07-10 Sergey Udaltsov
+
+ * geometry/hhk, rules/base.m_g.part, rules/base.xml.in,
+ geometry/Makefile.am: adding hhk geometry,
+ https://bugs.freedesktop.org/show_bug.cgi?id=11519
+
+2007-07-09 Sergey Udaltsov
+
+ * symbols/de: fixed AE12, closing
+ https://bugs.freedesktop.org/show_bug.cgi?id=11514
+
+2007-06-29 Sergey Udaltsov
+
+ * symbols/lk: another fix from
+ https://bugs.freedesktop.org/show_bug.cgi?id=11284
+ * symbols/us, rules/base.xml.in: added us(colemak),
+ https://bugs.freedesktop.org/show_bug.cgi?id=11416
+
+2007-06-25 Sergey Udaltsov
+
+ * symbols/Makefile.am, symbols/braille, rules/base.xml.in: added
+ Braille layout, https://bugs.freedesktop.org/show_bug.cgi?id=11356
+
+2007-06-18 Sergey Udaltsov
+
+ * symbols/Makefile.am, symbols/et, rules/base.xml.in: added
+ et(basic), part of the OLPC works
+
+2007-06-16 Sergey Udaltsov
+
+ * symbols/lk: fixed Sinhala, closing
+ https://bugs.freedesktop.org/show_bug.cgi?id=11284
+
+2007-06-15 Sergey Udaltsov
+
+ * symbols/ru, rules/base.xml.in: added ru(cv_latin), closing
+ https://bugs.freedesktop.org/show_bug.cgi?id=11246
+
+2007-06-13 Sergey Udaltsov
+
+ * symbols/ru, rules/base.xml.in: added ru(cv), closing
+ https://bugs.freedesktop.org/show_bug.cgi?id=11246
+ * symbols/ge, rules/base.xml.in: added ge(os), again closing
+ https://bugs.freedesktop.org/show_bug.cgi?id=8092
+ * symbols/ru, rules/base.xml.in: added ru(udm), closing
+ https://bugs.freedesktop.org/show_bug.cgi?id=11257
+
+2007-06-07 Sergey Udaltsov
+
+ * symbols/in, rules/base.xml.in: added Hindi phonetic,
+ https://bugs.freedesktop.org/show_bug.cgi?id=11195
+
+2007-06-06 Sergey Udaltsov
+
+ * rules/xfree98: fixed nec_vndr, closing
+ https://bugs.freedesktop.org/show_bug.cgi?id=11176
+
+2007-05-26 Sergey Udaltsov
+
+ * rules/base.o_s.part, rules/base.xml.in, symbols/jp: Add
+ "NICOLA-F style Backspace" to "Japanese keyboard options", closing
+ https://bugs.freedesktop.org/show_bug.cgi?id=11064
+
+2007-05-14 Sergey Udaltsov
+
+ * rules/base.xml.in, rules/xkb.dtd: introducing vendor into
+ configItem
+
+2007-05-13 Sergey Udaltsov
+
+ * symbols/il: replaced backslash with bar, reclosing
+ https://bugs.freedesktop.org/show_bug.cgi?id=6375
+
+2007-05-02 Sergey Udaltsov
+
+ * symbols/gr: using Unicode since it is more appropriate for polytonic
+ Greek, https://bugs.freedesktop.org/show_bug.cgi?id=10824
+
+2007-04-30 Sergey Udaltsov
+
+ * rules/base.xml.in: make descriptions less technical
+
+2007-04-29 Sergey Udaltsov
+
+ * symbols/us: adding explicit BKSL, closing
+ https://bugs.freedesktop.org/show_bug.cgi?id=10811
+
2007-04-27 Sergey Udaltsov
* geometry/microsoft: replacing non-defined AE00 with TLDE,
@@ -1440,7 +1548,7 @@
2004-09-13 22:39 svu
- * symbols/tj: new local cvs keyword seems to be ok - no more $Id:
ChangeLog,v 1.279 2007-04-27 19:15:42 svu Exp $
+ * symbols/tj: new local cvs keyword seems to be ok - no more $Id:
ChangeLog,v 1.302 2007-07-20 23:30:14 svu Exp $
2004-09-13 22:38 svu
diff --git a/NEWS b/NEWS
index b66082b..8da35c3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+1.0 Maintenance release. Bugfixes (72). Updated/new translations.
Updated/new layouts and models.
0.9 Maintenance release. Bugfixes (76). Updated/new translations.
Updated/new layouts.
0.8 Maintenance release. Bugfixes. Updated/new translations. Updated/new
layouts.
Massive patch from Sun Microsystems incorporated.
diff --git a/configure b/configure
index 2b1166f..c76da81 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xkeyboard-config 0.9.
+# Generated by GNU Autoconf 2.61 for xkeyboard-config 1.0.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xkeyboard-config'
PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='0.9'
-PACKAGE_STRING='xkeyboard-config 0.9'
+PACKAGE_VERSION='1.0'
+PACKAGE_STRING='xkeyboard-config 1.0'
PACKAGE_BUGREPORT=''
ac_unique_file="rules/base.xml.in"
@@ -1204,7 +1204,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xkeyboard-config 0.9 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 1.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1270,7 +1270,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xkeyboard-config 0.9:";;
+ short | recursive ) echo "Configuration of xkeyboard-config 1.0:";;
esac
cat <<\_ACEOF
@@ -1362,7 +1362,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xkeyboard-config configure 0.9
+xkeyboard-config configure 1.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1376,7 +1376,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xkeyboard-config $as_me 0.9, which was
+It was created by xkeyboard-config $as_me 1.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2047,7 +2047,7 @@ fi
# Define the identity of the package.
PACKAGE='xkeyboard-config'
- VERSION='0.9'
+ VERSION='1.0'
cat >>confdefs.h <<_ACEOF
@@ -4360,7 +4360,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xkeyboard-config $as_me 0.9, which was
+This file was extended by xkeyboard-config $as_me 1.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4407,7 +4407,7 @@ Report bugs to <[EMAIL PROTECTED]>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xkeyboard-config config.status 0.9
+xkeyboard-config config.status 1.0
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.in b/configure.in
index 191b1f0..a7871b2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(xkeyboard-config, 0.9)
+AC_INIT(xkeyboard-config, 1.0)
AC_CONFIG_SRCDIR(rules/base.xml.in)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
diff --git a/geometry/Makefile.am b/geometry/Makefile.am
index c54eb2b..d57d1b1 100644
--- a/geometry/Makefile.am
+++ b/geometry/Makefile.am
@@ -5,7 +5,7 @@ geomdir = $(xkb_base)/geometry
dist_geom_DATA = \
amiga ataritt chicony \
dell everex fujitsu \
-hp keytronic kinesis \
+hhk hp keytronic kinesis \
macintosh microsoft nec \
northgate pc sony thinkpad \
sun winbook README
diff --git a/geometry/Makefile.in b/geometry/Makefile.in
index 56d0989..35ac377 100644
--- a/geometry/Makefile.in
+++ b/geometry/Makefile.in
@@ -190,7 +190,7 @@ geomdir = $(xkb_base)/geometry
dist_geom_DATA = \
amiga ataritt chicony \
dell everex fujitsu \
-hp keytronic kinesis \
+hhk hp keytronic kinesis \
macintosh microsoft nec \
northgate pc sony thinkpad \
sun winbook README
diff --git a/geometry/hhk b/geometry/hhk
new file mode 100644
index 0000000..68f82d6
--- /dev/null
+++ b/geometry/hhk
@@ -0,0 +1,268 @@
+// $XKeyboardConfig: xkeyboard-config/geometry/hhk,v 1.2 2007-07-11
22:43:45 svu Exp $
+//
+// XKB geometry for the Happy Hacking Keyboard (Lite).
+// Different variants correspond to different switch
+// settings on the HHK.
+//
+// Copyright (c) Doug Palmer <[EMAIL PROTECTED]>, 2002
+//
+//Permission is hereby granted, free of charge, to any person obtaining a copy
+//of this software and associated documentation files (the "Software"), to deal
+//in the Software without restriction, including without limitation the rights
+//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//copies of the Software, and to permit persons to whom the Software is
+//furnished to do so, subject to the following conditions:
+//
+//The above copyright notice and this permission notice shall be included in
+//all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//THE SOFTWARE.
+
+// SW = 100 Default layout with windows keys
+default xkb_geometry "win1" {
+ include "hhk(basic)"
+
+ key.gap = 1;
+ section "Space" {
+ top = 86;
+ left = 30;
+ row {
+ top = 1;
+ keys {
+ <LALT>,
+ { <LWIN>, "DIAM" },
+ { <SPCE>, "SPCE" },
+ { <RWIN>, "DIAM" },
+ <RALT>
+ };
+ };
+ };
+};
+
+// SW = 101 Layout with windows and alt keys swapped
+xkb_geometry "win2" {
+ include "hhk(basic)"
+
+ key.gap = 1;
+ section "Space" {
+ top = 86;
+ left = 30;
+ row {
+ top = 1;
+ keys {
+ <LWIN>,
+ { <LALT>, "DIAM" },
+ { <SPCE>, "SPCE" },
+ { <RALT>, "DIAM" },
+ <RWIN>
+ };
+ };
+ };
+};
+
+// SW = 110 Default layout with windows keys, and left diamond = Fn key
+xkb_geometry "win3" {
+ include "hhk(basic)"
+
+ key.gap = 1;
+ section "Space" {
+ top = 86;
+ left = 30;
+ row {
+ top = 1;
+ keys {
+ <LALT>,
+ { <FN>, "DIAM" },
+ { <SPCE>, "SPCE" },
+ { <RWIN>, "DIAM" },
+ <RALT>
+ };
+ };
+ };
+};
+
+// SW = 101 Layout with windows and alt keys swapped and left-Alt = Fn key
+xkb_geometry "win4" {
+ include "hhk(basic)"
+
+ key.gap = 1;
+ section "Space" {
+ top = 86;
+ left = 30;
+ row {
+ top = 1;
+ keys {
+ <FN>,
+ { <LALT>, "DIAM" },
+ { <SPCE>, "SPCE" },
+ { <RALT>, "DIAM" },
+ <RWIN>
+ };
+ };
+ };
+};
+
+// SW = 000 Layout with Muhenkan and Henkan keys
+xkb_geometry "jp1" {
+ include "hhk(basic)"
+
+ key.gap = 1;
+ section "Space" {
+ top = 86;
+ left = 30;
+ row {
+ top = 1;
+ keys {
+ <LALT>,
+ { <NFER>, "DIAM" },
+ { <SPCE>, "SPCE" },
+ { <XFER>, "DIAM" },
+ <RALT>
+ };
+ };
+ };
+};
+
+// SW = 001 Layout with Muhenkan and Henkan keys swapped with Alt keys
+xkb_geometry "jp2" {
+ include "hhk(basic)"
+
+ key.gap = 1;
+ section "Space" {
+ top = 86;
+ left = 30;
+ row {
+ top = 1;
+ keys {
+ <NFER>,
+ { <LALT>, "DIAM" },
+ { <SPCE>, "SPCE" },
+ { <RALT>, "DIAM" },
+ <XFER>
+ };
+ };
+ };
+};
+
+// SW = 010 Layout with Henkan key and left-diamond as Fn
+xkb_geometry "jp3" {
+ include "hhk(basic)"
+
+ key.gap = 1;
+ section "Space" {
+ top = 86;
+ left = 30;
+ row {
+ top = 1;
+ keys {
+ <LALT>,
+ { <FN>, "DIAM" },
+ { <SPCE>, "SPCE" },
+ { <XFER>, "DIAM" },
+ <RALT>
+ };
+ };
+ };
+};
+
+// SW = 001 Layout with Henkan key swapped with Alt keys and left-Alt as Fn
+xkb_geometry "jp4" {
+ include "hhk(basic)"
+
+ key.gap = 1;
+ section "Space" {
+ top = 86;
+ left = 30;
+ row {
+ top = 1;
+ keys {
+ <FN>,
+ { <LALT>, "DIAM" },
+ { <SPCE>, "SPCE" },
+ { <RALT>, "DIAM" },
+ <XFER>
+ };
+ };
+ };
+};
+
+// Basic layout for non-swictchable keys
+partial hidden xkb_geometry "basic" {
+
+ description = "Happy Hacking Keyboard";
+ width = 290;
+ height = 106;
+
+ shape.cornerRadius = 1;
+ shape "NORM" { { [18, 18] }, { [2, 1], [14, 14] } };
+ shape "BKSP" { { [28, 18] }, { [2, 1], [24, 14] } };
+ shape "TABK" { { [28, 18] }, { [2, 1], [24, 14] } };
+ shape "CTRL" { { [32, 18] }, { [2, 1], [28, 14] } };
+ shape "RTRN" { { [42, 18] }, { [2, 1], [38, 14] } };
+ shape "LFSH" { { [42, 18] }, { [2, 1], [38, 14] } };
+ shape "RTSH" { { [32, 18] }, { [2, 1], [28, 14] } };
+ shape "DIAM" { { [28, 18] }, { [2, 1], [24, 14] } };
+ shape "SPCE" { { [114, 18] }, { [2, 1], [110, 14] } };
+
+ text.color = "black";
+ text "PFULabel" { left = 16; top = 2; fontsize = 20; text = "PFU"; };
+ text "HHKLabel" { left = 254; top = 90; text = "Happy
Hacking\nKeyboard"; };
+
+ section.left = 1;
+ row.left = 1;
+ key.shape = "NORM";
+ key.gap = 1;
+
+ section "Alphanumeric" {
+ top = 10;
+ row {
+ top = 1;
+ keys {
+ <ESC>,
+ <AE01>, <AE02>, <AE03>, <AE04>, <AE05>,
+ <AE06>, <AE07>, <AE08>, <AE09>, <AE10>,
+ <AE11>, <AE12>,
+ <BKSL>, <TLDE>
+ };
+ };
+ row {
+ top = 20;
+ keys {
+ { <TAB>, "TABK" },
+ <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
+ <AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
+ <AD11>, <AD12>,
+ { <BKSP>, "BKSP" }
+ };
+ };
+ row {
+ top = 39;
+ keys {
+ { <LCTL>, "CTRL" },
+ <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+ <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+ <AC11>,
+ { <RTRN>, "RTRN" }
+ };
+ };
+ row {
+ top = 58;
+ keys {
+ { <LFSH>, "LFSH" },
+ <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
+ <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+ { <RTSH>, "RTSH" },
+ { <FN>, color = "grey20" }
+ };
+ };
+ };
+
+ alias <AC00> = <LCTL>;
+};
+
diff --git a/rules/base b/rules/base
index 828b8b5..d069684 100644
--- a/rules/base
+++ b/rules/base
@@ -42,7 +42,7 @@
chicony chicony9885 \
compaqeak8 compaqik7 compaqik13 compaqik18 \
cymotionlinux \
- dell inspiron precision_m dellusbmm dtk2000 sk8125 sk8135 \
+ dell inspiron precision_m dellusbmm dtk2000 dell8125 dell8135 \
emachines ennyah_dkb1008 evdev \
genius geniuscomfy geniuscomfy2 geniuskb19e \
gyration honeywell_euroboard \
@@ -137,6 +137,7 @@
pc98 = nec(pc98)
$macbooks = macintosh(%m)
$macs = macintosh(macintosh)
+ hhk = hhk(basic)
* = pc(pc104)
! model layout variant = symbols
@@ -826,6 +827,9 @@
eurosign:2 = +eurosign(2)
keypad:oss = +keypad(oss)
keypad:legacy = +keypad(legacy)
+ keypad:legacy_wang = +keypad(legacy_wang)
+ keypad:oss_wang = +keypad(oss_wang)
+ keypad:future_wang = +keypad(future_wang)
nbsp:none = +nbsp(none)
nbsp:level2 = +nbsp(level2)
nbsp:level3 = +nbsp(level3)
@@ -833,6 +837,15 @@
nbsp:level3n = +nbsp(level3n)
nbsp:level4 = +nbsp(level4)
nbsp:level4n = +nbsp(level4n)
+ japan:nicola_f_bs = +jp(nicola_f_bs)
+ kpdl:dot = +kpdl(dot)
+ kpdl:comma = +kpdl(comma)
+ kpdl:dotoss = +kpdl(dotoss)
+ kpdl:dotoss_latin9 = +kpdl(dotoss_latin9)
+ kpdl:commaoss = +kpdl(commaoss)
+ kpdl:momayyezoss = +kpdl(momayyezoss)
+ kpdl:kposs = +kpdl(kposs)
+
! option = compat
grp_led:num = +lednum(group_lock)
diff --git a/rules/base.lists.part b/rules/base.lists.part
index b48818e..0d11e1e 100644
--- a/rules/base.lists.part
+++ b/rules/base.lists.part
@@ -33,7 +33,7 @@
chicony chicony9885 \
compaqeak8 compaqik7 compaqik13 compaqik18 \
cymotionlinux \
- dell inspiron precision_m dellusbmm dtk2000 sk8125 sk8135 \
+ dell inspiron precision_m dellusbmm dtk2000 dell8125 dell8135 \
emachines ennyah_dkb1008 evdev \
genius geniuscomfy geniuscomfy2 geniuskb19e \
gyration honeywell_euroboard \
diff --git a/rules/base.lst b/rules/base.lst
index 2986bc6..cd254f9 100644
--- a/rules/base.lst
+++ b/rules/base.lst
@@ -46,8 +46,8 @@
dellusbmm Dell USB Multimedia Keybard
inspiron Dell Laptop/notebook Inspiron 6xxx/8xxx
precision_m Dell Laptop/notebook Precision M series
- sk8125 Dell SK-8125 USB Multimedia Keybard
- sk8135 Dell SK-8135 USB Multimedia Keybard
+ dell8125 Dell SK-8125 USB Multimedia Keybard
+ dell8135 Dell SK-8135 USB Multimedia Keybard
dexxa Dexxa Wireless Desktop Keyboard
diamond Diamond 9801 / 9802 series
dtk2000 DTK2000
@@ -102,7 +102,7 @@
microsoftprose Microsoft Internet Keyboard Pro, Swedish
microsoftoffice Microsoft Office Keyboard
microsoftmult Microsoft Wireless Multimedia Keyboard 1.0A
- oretec Oretec MCK-800 MM/Internet keyboard
+ oretec Ortek MCK-800 MM/Internet keyboard
propeller Propeller Voyager (KTEZ-1000)
qtronix QTronix Scorpius 98N+
samsung4500 Samsung SDM 4500P
@@ -133,6 +133,7 @@
evdev Evdev-managed keyboard
benqx730 BenQ X-Touch 730
benqx800 BenQ X-Touch 800
+ hhk Happy Hacking Keyboard
! layout
us U.S. English
@@ -213,11 +214,14 @@
epo Esperanto
np Nepal
ng Nigeria
+ et Ethiopia
+ braille Braille
! variant
euro us: With EuroSign on 5
intl us: International (with dead keys)
alt-intl us: Alternative international (former us_intl)
+ colemak us: Colemak
dvorak us: Dvorak
dvorak-l us: Left handed Dvorak
dvorak-r us: Right handed Dvorak
@@ -258,6 +262,7 @@
tam in: Tamil
tel in: Telugu
urd in: Urdu
+ bolnagri in: Hindi Bolnagri
alternatequotes ba: Use guillemets for quotes
unicode ba: Use Bosnian digraphs
unicodeus ba: US keyboard with Bosnian digraphs
@@ -331,6 +336,7 @@
ergonomic ge: Ergonomic
mess ge: MESS
ru ge: Russian
+ os ge: Ossetian
deadacute de: Dead acute
deadgraveacute de: Dead grave acute
nodeadkeys de: Eliminate dead keys
@@ -409,6 +415,9 @@
tt ru: Tatar
os ru: Ossetian
os_winkeys ru: Ossetian, Winkeys
+ cv ru: Chuvash
+ cv_latin ru: Chuvash Latin
+ udm ru: Udmurt
yz cs: Z and ZHE swapped
latin cs: Latin
latinunicode cs: Latin Unicode
@@ -475,34 +484,36 @@
igbo ng: Igbo
yoruba ng: Yoruba
hausa ng: Hausa
+ left_hand braille: Left hand
+ right_hand braille: Right hand
! option
- grp Group Shift/Lock behavior
- grp:switch R-Alt switches group while pressed.
- grp:lswitch Left Alt key switches group while pressed.
- grp:lwin_switch Left Win-key switches group while pressed.
- grp:rwin_switch Right Win-key switches group while pressed.
- grp:win_switch Both Win-keys switch group while pressed.
- grp:rctrl_switch Right Ctrl key switches group while pressed.
- grp:toggle Right Alt key changes group.
- grp:lalt_toggle Left Alt key changes group.
- grp:caps_toggle CapsLock key changes group.
- grp:shift_caps_toggle Shift+CapsLock changes group.
- grp:alt_caps_toggle Alt+CapsLock changes group.
- grp:shifts_toggle Both Shift keys together change group.
- grp:alts_toggle Both Alt keys together change group.
- grp:ctrls_toggle Both Ctrl keys together change group.
- grp:ctrl_shift_toggle Ctrl+Shift changes group.
- grp:lctrl_lshift_toggle LCtrl+LShift changes group.
- grp:ctrl_alt_toggle Alt+Ctrl changes group.
- grp:alt_shift_toggle Alt+Shift changes group.
- grp:menu_toggle Menu key changes group.
- grp:lwin_toggle Left Win-key changes group.
- grp:rwin_toggle Right Win-key changes group.
- grp:lshift_toggle Left Shift key changes group.
- grp:rshift_toggle Right Shift key changes group.
- grp:lctrl_toggle Left Ctrl key changes group.
- grp:rctrl_toggle Right Ctrl key changes group.
+ grp Layout switching
+ grp:switch R-Alt switches layout while pressed.
+ grp:lswitch Left Alt key switches layout while pressed.
+ grp:lwin_switch Left Win-key switches layout while pressed.
+ grp:rwin_switch Right Win-key switches layout while pressed.
+ grp:win_switch Both Win-keys switch layout while pressed.
+ grp:rctrl_switch Right Ctrl key switches layout while pressed.
+ grp:toggle Right Alt key changes layout.
+ grp:lalt_toggle Left Alt key changes layout.
+ grp:caps_toggle CapsLock key changes layout.
+ grp:shift_caps_toggle Shift+CapsLock changes layout.
+ grp:alt_caps_toggle Alt+CapsLock changes layout.
+ grp:shifts_toggle Both Shift keys together change layout.
+ grp:alts_toggle Both Alt keys together change layout.
+ grp:ctrls_toggle Both Ctrl keys together change layout.
+ grp:ctrl_shift_toggle Ctrl+Shift change layout.
+ grp:lctrl_lshift_toggle LCtrl+LShift change layout.
+ grp:ctrl_alt_toggle Alt+Ctrl change layout.
+ grp:alt_shift_toggle Alt+Shift change layout.
+ grp:menu_toggle Menu key changes layout.
+ grp:lwin_toggle Left Win-key changes layout.
+ grp:rwin_toggle Right Win-key changes layout.
+ grp:lshift_toggle Left Shift key changes layout.
+ grp:rshift_toggle Right Shift key changes layout.
+ grp:lctrl_toggle Left Ctrl key changes layout.
+ grp:rctrl_toggle Right Ctrl key changes layout.
lv3 Third level choosers
lv3:switch Press Right Ctrl to choose 3rd level.
lv3:menu_switch Press Menu key to choose 3rd level.
@@ -520,13 +531,24 @@
ctrl:ctrl_ac Ctrl key at left of 'A'
ctrl:ctrl_aa Ctrl key at bottom left
ctrl:ctrl_ra Right Ctrl key works as Right Alt.
- grp_led Use keyboard LED to show alternative group.
- grp_led:num NumLock LED shows alternative group.
- grp_led:caps CapsLock LED shows alternative group.
- grp_led:scroll ScrollLock LED shows alternative group.
- keypad Keypad layout selection
- keypad:legacy Force standard legacy keypad
- keypad:oss Use keypad with unicode additions (arrows and math
operators)
+ grp_led Use keyboard LED to show alternative layout.
+ grp_led:num NumLock LED shows alternative layout.
+ grp_led:caps CapsLock LED shows alternative layout.
+ grp_led:scroll ScrollLock LED shows alternative layout.
+ keypad Numeric keypad layout selection
+ keypad:legacy Legacy keypad
+ keypad:oss Keypad with unicode additions (arrows and math
operators)
+ keypad:future Keypad with unicode additions (arrows and math
operators). Math operators on default level.
+ keypad:legacy_wang Legacy Wang 724 keypad
+ keypad:oss_wang Wang 724 keypad with unicode additions (arrows and math
operators)
+ keypad:future_wang Wang 724 keypad with unicode additions (arrows and math
operators). Math operators on default level.
+ kpdl Numeric keypad delete key behaviour
+ kpdl:dot Legacy key with dot
+ kpdl:comma Legacy key with comma
+ kpdl:dotoss Four-level key with dot
+ kpdl:commaoss Four-level key with comma
+ kpdl:momayyezoss Four-level key with momayyez
+ kpdl:kposs Four-level key with abstract separators
caps CapsLock key behavior
caps:internal CapsLock uses internal capitalization. Shift "pauses"
CapsLock.
caps:internal_nocancel CapsLock uses internal capitalization. Shift doesn't
affect CapsLock.
@@ -553,22 +575,23 @@
compose:rctrl Right Ctrl is Compose.
compose:caps Caps Lock is Compose.
compat Miscellaneous compatibility options
- numpad:pc Default numpad keys.
- numpad:mac Numpad keys work as with Mac.
- numpad:microsoft Shift with numpad keys works as in MS Windows.
+ numpad:pc Default numeric keypad keys.
+ numpad:mac Numeric keypad keys work as with Mac.
+ numpad:microsoft Shift with numeric keypad keys works as in MS Windows.
srvrkeys:none Special keys (Ctrl+Alt+<key>) handled in a server.
apple:badmap Swap keycodes of two keys when Mac keyboards are
misdetected by kernel.
eurosign Adding the EuroSign to certain keys
eurosign:e Add the EuroSign to the E key.
eurosign:5 Add the EuroSign to the 5 key.
eurosign:2 Add the EuroSign to the 2 key.
- nbsp Adding the nobreakspace keysym to space key
- nbsp:none Space key output space at any level.
- nbsp:level2 Space key output nobreakspace at second level.
- nbsp:level3 Space key output nobreakspace at third level.
- nbsp:level3s Space key output nobreakspace at third level, nothing
at fourth level.
- nbsp:level3n Space key output nobreakspace at third level, thin
nobreakspace at fourth level
- nbsp:level4 Space key output nobreakspace at fourth level.
- nbsp:level4n Space key output nobreakspace at fourth level, thin
nobreakspace at sixth level
- japan Japanese Keyboard Options
+ nbsp Using space key to input non-breakable space character
+ nbsp:none Space key outputs usual space at any level.
+ nbsp:level2 Space key outputs non-breakable space character at
second level.
+ nbsp:level3 Space key outputs non-breakable space character at
third level.
+ nbsp:level3s Space key outputs non-breakable space character at
third level, nothing at fourth level.
+ nbsp:level3n Space key outputs non-breakable space character at
third level, thin non-breakable space character at fourth level
+ nbsp:level4 Space key outputs non-breakable space character at
fourth level.
+ nbsp:level4n Space key outputs non-breakable space character at
fourth level, thin non-breakable space character at sixth level
+ japan Japanese keyboard options
japan:kana_lock Kana Lock key is locking
+ japan:nicola_f_bs NICOLA-F style Backspace
diff --git a/rules/base.m_g.part b/rules/base.m_g.part
index e8db61c..d6d6d34 100644
--- a/rules/base.m_g.part
+++ b/rules/base.m_g.part
@@ -10,4 +10,5 @@
pc98 = nec(pc98)
$macbooks = macintosh(%m)
$macs = macintosh(macintosh)
+ hhk = hhk(basic)
* = pc(pc104)
diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 38e6ea6..45ca2d3 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -61,6 +61,9 @@
eurosign:2 = +eurosign(2)
keypad:oss = +keypad(oss)
keypad:legacy = +keypad(legacy)
+ keypad:legacy_wang = +keypad(legacy_wang)
+ keypad:oss_wang = +keypad(oss_wang)
+ keypad:future_wang = +keypad(future_wang)
nbsp:none = +nbsp(none)
nbsp:level2 = +nbsp(level2)
nbsp:level3 = +nbsp(level3)
@@ -68,3 +71,12 @@
nbsp:level3n = +nbsp(level3n)
nbsp:level4 = +nbsp(level4)
nbsp:level4n = +nbsp(level4n)
+ japan:nicola_f_bs = +jp(nicola_f_bs)
+ kpdl:dot = +kpdl(dot)
+ kpdl:comma = +kpdl(comma)
+ kpdl:dotoss = +kpdl(dotoss)
+ kpdl:dotoss_latin9 = +kpdl(dotoss_latin9)
+ kpdl:commaoss = +kpdl(commaoss)
+ kpdl:momayyezoss = +kpdl(momayyezoss)
+ kpdl:kposs = +kpdl(kposs)
+
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 0a61d7e..cd02c0e 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -6,174 +6,203 @@
<configItem>
<name>pc101</name>
<_description>Generic 101-key PC</_description>
+ <vendor>Generic</vendor>
</configItem>
</model>
<model>
<configItem>
<name>pc102</name>
<_description>Generic 102-key (Intl) PC</_description>
+ <vendor>Generic</vendor>
</configItem>
</model>
<model>
<configItem>
<name>pc104</name>
<_description>Generic 104-key PC</_description>
+ <vendor>Generic</vendor>
</configItem>
</model>
<model>
<configItem>
<name>pc105</name>
<_description>Generic 105-key (Intl) PC</_description>
+ <vendor>Generic</vendor>
</configItem>
</model>
<model>
<configItem>
<name>dell101</name>
<_description>Dell 101-key PC</_description>
+ <vendor>Dell</vendor>
</configItem>
</model>
<model>
<configItem>
<name>latitude</name>
<_description>Dell Latitude series laptop</_description>
+ <vendor>Dell</vendor>
</configItem>
</model>
<model>
<configItem>
<name>everex</name>
<_description>Everex STEPnote</_description>
+ <vendor>Everex</vendor>
</configItem>
</model>
<model>
<configItem>
<name>flexpro</name>
<_description>Keytronic FlexPro</_description>
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
