summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--symbols/br6
-rw-r--r--symbols/de3
-rw-r--r--symbols/dk3
-rw-r--r--symbols/fi3
-rw-r--r--symbols/hr3
-rw-r--r--symbols/hu16
-rw-r--r--symbols/keypad18
-rw-r--r--symbols/no3
-rw-r--r--symbols/pl6
-rw-r--r--symbols/ro3
-rw-r--r--symbols/se3
-rw-r--r--symbols/si3
12 files changed, 44 insertions, 26 deletions
diff --git a/symbols/br b/symbols/br
index b289f387..d16bdbf5 100644
--- a/symbols/br
+++ b/symbols/br
@@ -5,6 +5,7 @@
// Adds suport for dead-keys in I18N applications
// by Conectiva (http://www.conectiva.com.br)"
//
+// $XKeyboardConfig$
// $XdotOrg: xc/programs/xkbcomp/symbols/br,v 1.1.4.3 2004/03/05 13:41:32 eich Exp $
// $XFree86: xc/programs/xkbcomp/symbols/br,v 1.3 2003/04/19 12:22:11 pascal Exp $
@@ -41,8 +42,9 @@ xkb_symbols "abnt2" {
key <AB11> { [ slash, question, degree, questiondown ] };
- key <KPPT> { [KP_Decimal ] };
- key <KPDL> { [ KP_Delete, KP_Separator ] };
+ key <KPPT> { [ KP_Decimal ] };
+
+ include "keypad(comma)"
include "level3(ralt_switch)"
};
diff --git a/symbols/de b/symbols/de
index cfc3b70d..e6229856 100644
--- a/symbols/de
+++ b/symbols/de
@@ -1,6 +1,7 @@
// based on a keyboard map from an 'xkb/symbols/de' file
//
+// $XKeyboardConfig$
// $XFree86: xc/programs/xkbcomp/symbols/de,v 1.6 2003/09/08 13:12:51 pascal Exp $
xkb_symbols "basic" {
@@ -27,7 +28,7 @@ xkb_symbols "basic" {
key <BKSL> { [numbersign, apostrophe, dead_grave, dead_breve ] };
key <AB01> { [ y, Y, guillemotleft, less ] };
- key <KPDL> { [ KP_Delete, KP_Separator ] };
+ include "keypad(comma)"
include "level3(ralt_switch)"
};
diff --git a/symbols/dk b/symbols/dk
index 3e50e7c1..744c8875 100644
--- a/symbols/dk
+++ b/symbols/dk
@@ -1,6 +1,7 @@
// based on a keyboard map from an 'xkb/symbols/dk' file
//
+// $XKeyboardConfig$
// $XFree86: xc/programs/xkbcomp/symbols/dk,v 1.3 2002/12/19 01:07:56 dawes Exp $
partial default alphanumeric_keys
@@ -22,7 +23,7 @@ xkb_symbols "basic" {
key <LSGT> { [ less, greater, backslash, notsign ] };
- key <KPDL> { [ KP_Delete, KP_Separator ] };
+ include "keypad(comma)"
include "level3(ralt_switch)"
};
diff --git a/symbols/fi b/symbols/fi
index 20d2896c..1ca956f7 100644
--- a/symbols/fi
+++ b/symbols/fi
@@ -1,5 +1,6 @@
// based on a keyboard map from an 'xkb/symbols/fi' file
//
+// $XKeyboardConfig$
// $XFree86: xc/programs/xkbcomp/symbols/fi,v 1.9 2003/01/29 17:17:31 dawes Exp $
@@ -55,7 +56,7 @@ xkb_symbols "fi" {
key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ] };
// End alphanumeric section, begin "Keypad"
- key <KPDL> { [ KP_Delete, KP_Separator ] };
+ include "keypad(comma)"
// End "Keypad" section
include "level3(ralt_switch)"
diff --git a/symbols/hr b/symbols/hr
index 50d19957..d1256f45 100644
--- a/symbols/hr
+++ b/symbols/hr
@@ -11,6 +11,7 @@
// 2003-04-03 Added <KPDL> (Delete/Separator)
// 2000-02-06 Initial version
//
+// $XKeyboardConfig$
// $XFree86: xc/programs/xkbcomp/symbols/hr,v 1.3 2003/04/13 18:22:21 dawes Exp $
default partial alphanumeric_keys
@@ -43,7 +44,7 @@ xkb_symbols "basic" {
key <BKSL> { [ zcaron, Zcaron, currency, dead_breve ] };
- key <KPDL> { [ KP_Delete, KP_Seprator ] };
+ include "keypad(comma)"
include "level3(ralt_switch)"
};
diff --git a/symbols/hu b/symbols/hu
index ff3a75d6..21c9b72f 100644
--- a/symbols/hu
+++ b/symbols/hu
@@ -2,6 +2,7 @@
//
// Based on old style 'xkb/symbols/hu"
//
+// $XKeyboardConfig$
// (C) 2002-2004 Soós Péter <sp@osb.hu>
//
// Permission is granted to anyone to use, distribute and modify
@@ -55,7 +56,7 @@ xkb_symbols "101_qwertz_comma_dead" {
include "latin"
include "hu(def_101)"
include "hu(def_qwertz)"
- include "hu(def_comma)"
+ include "keypad(comma)"
include "hu(def_dead)"
include "hu(def_common)"
include "level3(ralt_switch)"
@@ -71,7 +72,7 @@ xkb_symbols "101_qwertz_comma_nodead" {
include "latin"
include "hu(def_101)"
include "hu(def_qwertz)"
- include "hu(def_comma)"
+ include "keypad(comma)"
include "hu(def_nodead)"
include "hu(def_common)"
include "level3(ralt_switch)"
@@ -119,7 +120,7 @@ xkb_symbols "101_qwerty_comma_dead" {
include "latin"
include "hu(def_101)"
include "hu(def_qwerty)"
- include "hu(def_comma)"
+ include "keypad(comma)"
include "hu(def_dead)"
include "hu(def_common)"
include "level3(ralt_switch)"
@@ -135,7 +136,7 @@ xkb_symbols "101_qwerty_comma_nodead" {
include "latin"
include "hu(def_101)"
include "hu(def_qwerty)"
- include "hu(def_comma)"
+ include "keypad(comma)"
include "hu(def_nodead)"
include "hu(def_common)"
include "level3(ralt_switch)"
@@ -337,13 +338,6 @@ xkb_symbols "def_qwerty" {
key <AB01> { [ z, Z, greater ] };
};
-// def_comma:
-// The Hungarian standard is the comma on the keypad not decimal dot
-hidden partial keypad_keys
-xkb_symbols "def_comma" {
- key <KPDL> { [ KP_Delete, KP_Separator ] };
-};
-
// def_dot:
// The Hungarian standard is the comma on the keypad not decimal dot,
// but programmers hate it
diff --git a/symbols/keypad b/symbols/keypad
index 4e34346b..d71b45d7 100644
--- a/symbols/keypad
+++ b/symbols/keypad
@@ -1,11 +1,12 @@
+// $XKeyboardConfig$
// $Xorg: keypad,v 1.3 2000/08/17 19:54:43 cpqbld Exp $
-partial hidden keypad_keys
+partial hidden keypad_keys
xkb_symbols "overlay" {
include "keypad(overlay1)"
};
-partial hidden keypad_keys
+partial hidden keypad_keys
xkb_symbols "overlay1" {
// Begin "Keypad" section
@@ -38,11 +39,12 @@ xkb_symbols "overlay1" {
key <KO3> { [ KP_3 ] };
key <KO0> { [ KP_0 ] };
- key <KODL> { [ KP_Decimal ] };
+ key <KODL> { [ KP_Decimal ] };
// End "Keypad" section
};
-partial hidden keypad_keys
+
+partial hidden keypad_keys
xkb_symbols "overlay2" {
// Begin "Keypad" section
@@ -75,7 +77,13 @@ xkb_symbols "overlay2" {
key <KO3> { [ KP_3 ] };
key <KO0> { [ KP_0 ] };
- key <KODL> { [ KP_Decimal ] };
+ key <KODL> { [ KP_Decimal ] };
// End "Keypad" section
};
+
+// Some national standards use comma on the keypad instead of decimal dot
+partial keypad_keys
+xkb_symbols "comma" {
+ key <KPDL> { [ KP_Delete, KP_Separator ] };
+};
diff --git a/symbols/no b/symbols/no
index 6c3df207..72b16558 100644
--- a/symbols/no
+++ b/symbols/no
@@ -1,6 +1,7 @@
// based on a keyboard map from an 'xkb/symbols/no' file
//
+// $XKeyboardConfig$
// $XFree86: xc/programs/xkbcomp/symbols/no,v 1.3 2002/12/19 01:07:56 dawes Exp $
partial alphanumeric_keys
@@ -25,7 +26,7 @@ xkb_symbols "basic" {
key <BKSL> { [apostrophe, asterisk, dead_doubleacute, multiply ] };
key <LSGT> { [ less, greater, onehalf, threequarters] };
- key <KPDL> { [ KP_Delete, KP_Separator ] };
+ include "keypad(comma)"
include "level3(ralt_switch)"
};
diff --git a/symbols/pl b/symbols/pl
index 2230c115..c429256c 100644
--- a/symbols/pl
+++ b/symbols/pl
@@ -21,6 +21,8 @@ xkb_symbols "basic" {
key <AB03> { [ c, C, cacute, Cacute ] };
key <AB06> { [ n, N, nacute, Nacute ] };
+ include "keypad(comma)"
+
include "level3(ralt_switch)"
};
@@ -62,6 +64,8 @@ xkb_symbols "qwertz" {
key <BKSL> { [ oacute, zacute, dead_grave, dead_breve ] };
key <AB03> { [ c, C, cent, copyright ] };
+ include "keypad(comma)"
+
include "level3(ralt_switch)"
};
@@ -91,6 +95,8 @@ xkb_symbols "dvorak" {
key <AB09> { [ v, V, zacute, Zacute ] };
key <AB10> { [ z, Z, zabovedot, Zabovedot ] };
+ include "keypad(comma)"
+
// this to allow writing ALL CAPS with a Shift key
include "level3(ralt_switch)"
diff --git a/symbols/ro b/symbols/ro
index c24243a5..c7930d92 100644
--- a/symbols/ro
+++ b/symbols/ro
@@ -1,3 +1,4 @@
+// $XKeyboardConfig$
// $XFree86: xc/programs/xkbcomp/symbols/ro,v 1.6 2003/09/08 13:12:51 pascal Exp $
default partial alphanumeric_keys
@@ -53,7 +54,7 @@ xkb_symbols "basic" {
key <BKSL> { [ acircumflex, Acircumflex ] };
// End alphanumeric section, begin "Keypad"
- key <KPDL> { [ KP_Delete, KP_Separator ] };
+ include "keypad(comma)"
// End "Keypad" section
include "level3(ralt_switch)"
diff --git a/symbols/se b/symbols/se
index d62f8880..e6818a27 100644
--- a/symbols/se
+++ b/symbols/se
@@ -1,6 +1,7 @@
// based on a keyboard map from an 'xkb/symbols/se' file
//
+// $XKeyboardConfig$
// $XFree86: xc/programs/xkbcomp/symbols/se,v 1.5 2003/01/26 02:01:48 dawes Exp $
partial alphanumeric_keys
@@ -27,7 +28,7 @@ xkb_symbols "se" {
key <SPCE> { [ space, space, space, nobreakspace ] };
- key <KPDL> { [ KP_Delete, KP_Separator ] };
+ include "keypad(comma)"
include "level3(ralt_switch)"
};
diff --git a/symbols/si b/symbols/si
index 9ec3ef0b..d66565bf 100644
--- a/symbols/si
+++ b/symbols/si
@@ -4,6 +4,7 @@
// by Marko Samastur (markos@elite.org) and
// Primoz Peterlin (primoz.peterlin@biofiz.mf.uni-lj.si)
//
+// $XKeyboardConfig$
// $XFree86: xc/programs/xkbcomp/symbols/si,v 1.3 2003/02/05 01:38:36 dawes Exp $
default partial alphanumeric_keys
@@ -39,7 +40,7 @@ xkb_symbols "basic" {
key <BKSL> { [ zcaron, Zcaron, currency, dead_breve ] };
- key <KPDL> { [ KP_Delete, KP_Separator ] };
+ include "keypad(comma)"
include "level3(ralt_switch)"
};