xkbdesc/symbols br, 1.4, 1.5 de, 1.3, 1.4 dk, 1.3, 1.4 fi, 1.3, 1.4 hr, 1.4, 1.5 hu, 1.2, 1.3 keypad, 1.1, 1.2 no, 1.4, 1.5 pl, 1.4, 1.5 ro, 1.4, 1.5 se, 1.4, 1.5 si, 1.3, 1.4

Sergey V. Oudaltsov xlibs-commit at pdx.freedesktop.org
Tue Sep 14 19:14:38 UTC 2004


Committed by: svu

Update of /cvs/xlibs/xkbdesc/symbols
In directory gabe:/tmp/cvs-serv28008

Modified Files:
	br de dk fi hr hu keypad no pl ro se si 
Log Message:
keymap(comma) introduced by Frank

Index: br
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/br,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- br	7 Sep 2004 19:56:57 -0000	1.4
+++ br	14 Sep 2004 19:14:36 -0000	1.5
@@ -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 @@
 
     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)"
 };

Index: de
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/de,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- de	7 Sep 2004 19:56:57 -0000	1.3
+++ de	14 Sep 2004 19:14:36 -0000	1.4
@@ -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 @@
     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)"
 };

Index: dk
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/dk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dk	7 Sep 2004 19:56:57 -0000	1.3
+++ dk	14 Sep 2004 19:14:36 -0000	1.4
@@ -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 @@
 
     key <LSGT>	{ [      less,    greater,    backslash,      notsign ]	};
 
-    key <KPDL>  { [ KP_Delete, KP_Separator                           ]	};
+    include "keypad(comma)"
 
     include "level3(ralt_switch)"
 };

Index: fi
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/fi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fi	7 Sep 2004 19:56:57 -0000	1.3
+++ fi	14 Sep 2004 19:14:36 -0000	1.4
@@ -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 @@
     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)"

Index: hr
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/hr,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hr	7 Sep 2004 19:56:57 -0000	1.4
+++ hr	14 Sep 2004 19:14:36 -0000	1.5
@@ -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 @@
 
     key <BKSL>	{ [    zcaron,     Zcaron,     currency,   dead_breve ]	};
 
-    key <KPDL>	{ [ KP_Delete,  KP_Seprator                           ]	};
+    include "keypad(comma)"
 
     include "level3(ralt_switch)"
 };

Index: hu
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/hu,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hu	7 Sep 2004 19:56:57 -0000	1.2
+++ hu	14 Sep 2004 19:14:36 -0000	1.3
@@ -2,6 +2,7 @@
 //
 // Based on old style 'xkb/symbols/hu"
 //
+// $XKeyboardConfig$
 // (C) 2002-2004 Soós Péter <sp at osb.hu>
 //
 // Permission is granted to anyone to use, distribute and modify
@@ -55,7 +56,7 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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

Index: keypad
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/keypad,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- keypad	19 Apr 2004 22:57:26 -0000	1.1
+++ keypad	14 Sep 2004 19:14:36 -0000	1.2
@@ -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 @@
     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 @@
     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 ] };
+};

Index: no
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/no,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- no	7 Sep 2004 19:56:57 -0000	1.4
+++ no	14 Sep 2004 19:14:36 -0000	1.5
@@ -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 @@
     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)"
 };

Index: pl
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pl	3 Jul 2004 02:32:47 -0000	1.4
+++ pl	14 Sep 2004 19:14:36 -0000	1.5
@@ -21,6 +21,8 @@
     key <AB03>	{ [         c,          C,       cacute,       Cacute ]	};
     key <AB06>	{ [         n,          N,       nacute,       Nacute ]	};
 
+    include "keypad(comma)"
+
     include "level3(ralt_switch)"
 };
 
@@ -62,6 +64,8 @@
     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 @@
     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)"
 

Index: ro
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/ro,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ro	7 Sep 2004 19:56:57 -0000	1.4
+++ ro	14 Sep 2004 19:14:36 -0000	1.5
@@ -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 @@
     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)"

Index: se
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/se,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- se	7 Sep 2004 19:56:57 -0000	1.4
+++ se	14 Sep 2004 19:14:36 -0000	1.5
@@ -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 @@
 
     key <SPCE>	{ [     space,      space,        space, nobreakspace ]	};
 
-    key <KPDL>  { [ KP_Delete, KP_Separator                           ]	};
+    include "keypad(comma)"
 
     include "level3(ralt_switch)"
 };

Index: si
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/si,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- si	7 Sep 2004 19:56:57 -0000	1.3
+++ si	14 Sep 2004 19:14:36 -0000	1.4
@@ -4,6 +4,7 @@
 // by Marko Samastur (markos at elite.org) and
 // Primoz Peterlin (primoz.peterlin at 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 @@
 
     key <BKSL>	{ [    zcaron,     Zcaron,     currency,   dead_breve ]	};
 
-    key <KPDL>	{ [ KP_Delete, KP_Separator ]	};
+    include "keypad(comma)"
 
     include "level3(ralt_switch)"
 };



More information about the xlibs-commit mailing list