Attachment 10737 Details for Bug 11611 – Proposed patch

[patch] Proposed patch

xkeyboard-config-1.0-kpdl.patch (text/plain), 25.12 KB, created by Nicolas Mailhot on 2007-07-15 06:11:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas Mailhot

Created: 2007-07-15 06:11:36 UTC

Size: 25.12 KB

patch

obsolete

>diff -uNr xkeyboard-config-20070715.orig/rules/base.xml.in xkeyboard-config-20070715/rules/base.xml.in
>--- xkeyboard-config-20070715.orig/rules/base.xml.in	2007-07-12 01:17:59.000000000 +0200
>+++ xkeyboard-config-20070715/rules/base.xml.in	2007-07-15 13:50:16.000000000 +0200
>@@ -3556,13 +3556,66 @@
>       <option>
>         <configItem>
>           <name>keypad:legacy</name>
>-          <_description>Force standard legacy keypad</_description>
>+          <_description>Legacy keypad</_description>
>        </configItem>
>       </option>
>       <option>
>         <configItem>
>           <name>keypad:oss</name>
>-          <_description>Use keypad with unicode additions (arrows and math operators)</_description>
>+          <_description>Keypad with unicode additions (arrows and math operators)</_description>
>+       </configItem>
>+      </option>
>+      <option>
>+        <configItem>
>+          <name>keypad:future</name>
>+          <_description>Keypad with unicode additions (arrows and math operators). Math operators on default level.</_description>
>+       </configItem>
>+      </option>
>+    </group>
>+    <group allowMultipleSelection="false">
>+      
>+      <configItem>
>+        <name>kpdl</name>
>+        <_description>Numeric keypad delete key behaviour</_description>
>+      </configItem>
>+      <option>
>+        <configItem>
>+          
>+          <name>kpdl:dot</name>
>+          <_description>Legacy key with dot</_description>
>+       </configItem>
>+      </option>
>+      <option>
>+        <configItem>
>+          <name>kpdl:comma</name>
>+          
>+          <_description>Legacy key with comma</_description>
>+       </configItem>
>+      </option>
>+      <option>
>+        <configItem>
>+          <name>kpdl:dotoss</name>
>+          <_description>Four-level key with dot</_description>
>+       </configItem>
>+      </option>
>+      <option>
>+        <configItem>
>+          <name>kpdl:commaoss</name>
>+          <_description>Four-level key with comma</_description>
>+       </configItem>
>+      </option>
>+      <option>
>+        <configItem>
>+          <name>kpdl:momayyezoss</name>
>+          <_description>Four-level key with momayyez</_description>
>+       </configItem>
>+      </option>
>+      <option>
>+        <configItem>
>+          <name>kpdl:kposs</name>
>+          
>+          <_description>Four-level key with abstract separators</_description>
>        </configItem>
>       </option>
>     </group>
>diff -uNr xkeyboard-config-20070715.orig/symbols/br xkeyboard-config-20070715/symbols/br
>--- xkeyboard-config-20070715.orig/symbols/br	2006-11-20 20:18:02.000000000 +0100
>+++ xkeyboard-config-20070715/symbols/br	2007-07-15 13:58:44.000000000 +0200
>@@ -46,7 +46,7 @@
> 
>     key <KPPT>	{ [ KP_Decimal ]	};
> 
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
> 
>     include "level3(ralt_switch)"
> };
>diff -uNr xkeyboard-config-20070715.orig/symbols/ch xkeyboard-config-20070715/symbols/ch
>--- xkeyboard-config-20070715.orig/symbols/ch	2006-10-04 00:47:43.000000000 +0200
>+++ xkeyboard-config-20070715/symbols/ch	2007-07-15 13:58:44.000000000 +0200
>@@ -184,7 +184,7 @@
>     key <LSGT> { [	less,	greater, 	lessthanequal,	greaterthanequal	]  	};
>     key <BKSL> { [	dollar,	sterling, 	paragraph,	enfilledcircbullet	]	};
> 
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
>     include "level3(ralt_switch)"
> };
> 
>diff -uNr xkeyboard-config-20070715.orig/symbols/cs xkeyboard-config-20070715/symbols/cs
>--- xkeyboard-config-20070715.orig/symbols/cs	2006-09-18 16:22:30.000000000 +0200
>+++ xkeyboard-config-20070715/symbols/cs	2007-07-15 13:58:44.000000000 +0200
>@@ -75,7 +75,7 @@
>   key <AB09> {   [ period,              colon,         any,any ]   }; //
>   key <AB10> {   [ minus,               underscore,    any,any ]   }; //
> 
>-  include "keypad(comma)"
>+  include "kpdl(comma)"
> };
> 
> partial hidden alphanumeric_keys
>diff -uNr xkeyboard-config-20070715.orig/symbols/de xkeyboard-config-20070715/symbols/de
>--- xkeyboard-config-20070715.orig/symbols/de	2007-07-10 00:15:04.000000000 +0200
>+++ xkeyboard-config-20070715/symbols/de	2007-07-15 13:58:44.000000000 +0200
>@@ -29,7 +29,7 @@
>     key <BKSL>	{ [numbersign, apostrophe,   dead_grave,   dead_breve ]	};
>     key <AB01>	{ [         y,          Y, guillemotleft,        less ]	};
> 
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
> 
>     include "level3(ralt_switch)"
> };
>diff -uNr xkeyboard-config-20070715.orig/symbols/dk xkeyboard-config-20070715/symbols/dk
>--- xkeyboard-config-20070715.orig/symbols/dk	2006-10-04 00:47:43.000000000 +0200
>+++ xkeyboard-config-20070715/symbols/dk	2007-07-15 13:58:44.000000000 +0200
>@@ -23,7 +23,7 @@
> 
>     key <LSGT>	{ [      less,    greater,    backslash,      notsign ]	};
> 
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
> 
>     include "level3(ralt_switch)"
> };
>@@ -55,7 +55,7 @@
> 
>     key <SPCE>	{ [    space,       space, nobreakspace, nobreakspace ]	};
>     key <AB10>	{ [    minus,  underscore,       hyphen,       macron ]	};
>-    include "keypad(dot)"
>+    include "kpdl(dot)"
> };
> 
> 
>diff -uNr xkeyboard-config-20070715.orig/symbols/ee xkeyboard-config-20070715/symbols/ee
>--- xkeyboard-config-20070715.orig/symbols/ee	2006-03-16 23:58:05.000000000 +0100
>+++ xkeyboard-config-20070715/symbols/ee	2007-07-15 13:58:44.000000000 +0200
>@@ -75,5 +75,5 @@
>     key <AB10>	{ [         z,          Z,     zcaron,     Zcaron ]	};
> 
>     include "level3(ralt_switch)"
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
> };
>diff -uNr xkeyboard-config-20070715.orig/symbols/fi xkeyboard-config-20070715/symbols/fi
>--- xkeyboard-config-20070715.orig/symbols/fi	2007-01-11 23:57:32.000000000 +0100
>+++ xkeyboard-config-20070715/symbols/fi	2007-07-15 13:58:44.000000000 +0200
>@@ -56,7 +56,7 @@
>     key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ] };
> 
>     // End alphanumeric section, begin "Keypad"
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
>     // End "Keypad" section
> 
>     include "level3(ralt_switch)"
>@@ -179,7 +179,7 @@
>     key <AB09> { [  period,          colon,            dead_belowdot,        dead_abovedot        ] };
>     key <AB10> { [  minus,           underscore,       endash,               dead_abovedot        ] };
> 
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
> 
>     include "level3(ralt_switch)"
> 
>diff -uNr xkeyboard-config-20070715.orig/symbols/gr xkeyboard-config-20070715/symbols/gr
>--- xkeyboard-config-20070715.orig/symbols/gr	2007-05-02 23:48:13.000000000 +0200
>+++ xkeyboard-config-20070715/symbols/gr	2007-07-15 13:58:44.000000000 +0200
>@@ -41,7 +41,7 @@
>     key <AB10> {	[     slash,	question	]	};
>     key <BKSL> {	[ backslash,	bar		]	};
> 
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
> };
> 
> hidden partial alphanumeric_keys alternate_group
>diff -uNr xkeyboard-config-20070715.orig/symbols/hu xkeyboard-config-20070715/symbols/hu
>--- xkeyboard-config-20070715.orig/symbols/hu	2005-12-21 01:40:06.000000000 +0100
>+++ xkeyboard-config-20070715/symbols/hu	2007-07-15 13:58:44.000000000 +0200
>@@ -60,7 +60,7 @@
>     include "latin"
>     include "hu(def_101)"
>     include "hu(def_qwertz)"
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
>     include "hu(def_dead)"
>     include "hu(def_common)"
>     include "level3(ralt_switch)"
>@@ -76,7 +76,7 @@
>     include "latin"
>     include "hu(def_101)"
>     include "hu(def_qwertz)"
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
>     include "hu(def_nodead)"
>     include "hu(def_common)"
>     include "level3(ralt_switch)"
>@@ -124,7 +124,7 @@
>     include "latin"
>     include "hu(def_101)"
>     include "hu(def_qwerty)"
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
>     include "hu(def_dead)"
>     include "hu(def_common)"
>     include "level3(ralt_switch)"
>@@ -140,7 +140,7 @@
>     include "latin"
>     include "hu(def_101)"
>     include "hu(def_qwerty)"
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
>     include "hu(def_nodead)"
>     include "hu(def_common)"
>     include "level3(ralt_switch)"
>@@ -188,7 +188,7 @@
>     include "latin"
>     include "hu(def_102)"
>     include "hu(def_qwertz)"
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
>     include "hu(def_dead)"
>     include "hu(def_common)"
>     include "level3(ralt_switch)"
>@@ -204,7 +204,7 @@
>     include "latin"
>     include "hu(def_102)"
>     include "hu(def_qwertz)"
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
>     include "hu(def_nodead)"
>     include "hu(def_common)"
>     include "level3(ralt_switch)"
>@@ -252,7 +252,7 @@
>     include "latin"
>     include "hu(def_102)"
>     include "hu(def_qwerty)"
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
>     include "hu(def_dead)"
>     include "hu(def_common)"
>     include "level3(ralt_switch)"
>@@ -268,7 +268,7 @@
>     include "latin"
>     include "hu(def_102)"
>     include "hu(def_qwerty)"
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
>     include "hu(def_nodead)"
>     include "hu(def_common)"
>     include "level3(ralt_switch)"
>diff -uNr xkeyboard-config-20070715.orig/symbols/it xkeyboard-config-20070715/symbols/it
>--- xkeyboard-config-20070715.orig/symbols/it	2006-10-15 23:17:04.000000000 +0200
>+++ xkeyboard-config-20070715/symbols/it	2007-07-15 13:58:44.000000000 +0200
>@@ -126,7 +126,7 @@
> 
>     // End alphanumeric section
> 
>-    include "keypad(dot)"
>+    include "kpdl(dot)"
>     include "level3(ralt_switch)"
> };
> 
>diff -uNr xkeyboard-config-20070715.orig/symbols/keypad xkeyboard-config-20070715/symbols/keypad
>--- xkeyboard-config-20070715.orig/symbols/keypad	2006-09-24 22:07:00.000000000 +0200
>+++ xkeyboard-config-20070715/symbols/keypad	2007-07-15 13:39:39.000000000 +0200
>@@ -126,54 +126,56 @@
>     key <KPDL> {  	[  KP_Delete,	KP_Decimal ]	};
> };
> 
>-// Some national standards use comma on the keypad instead of decimal dot
>-partial keypad_keys
>-xkb_symbols "comma" {
>-    key <KPDL> {       [ KP_Delete, KP_Separator ] };
>-};
>-
>-// Default is decimal dot
>-partial keypad_keys
>-xkb_symbols "dot" {
>-    key <KPDL> {       [ KP_Delete, KP_Decimal ] };
>-};
>-
> 
> // Legacy PC keypad definition
>-// Copyright Â© 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
>+// Copyright Â© 2006-2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
> keypad_keys
> xkb_symbols "legacy" {
> 
>     include "keypad(core)"
>     include "keypad(legacymath)"
>     include "keypad(legacynumber)"
>+    include "kpdl(dot)"
> };
> 
> 
> // Complete new keypad definition
>-// Copyright Â© 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
>+// Copyright Â© 2006-2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
> keypad_keys
> xkb_symbols "oss" {
> 
>     include "keypad(core)"
>     include "keypad(ossmath)"
>     include "keypad(ossnumber)"
>+    include "kpdl(dotoss)"
> };
> 
> 
> // Latin9 restriction of new keypad definition
>-// Copyright Â© 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
>+// Copyright Â© 2006-2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
> keypad_keys
> xkb_symbols "oss_latin9" {
> 
>     include "keypad(core)"
>     include "keypad(ossmath_latin9)"
>     include "keypad(legacynumber)"
>+    include "kpdl(dotoss_latin9)"
>+};
>+
>+
>+// Forward-looking keypad definition
>+// Won't work with applications that make ASCII assumptions
>+// Copyright Â© 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
>+keypad_keys
>+xkb_symbols "future" {
> 
>-    key <KPDL> { type="FOUR_LEVEL_MIXED_KEYPAD",
>-                 [ KP_Delete,             period, comma, nobreakspace ] }; // <delete> . , â½ (no-break space)
>+    include "keypad(core)"
>+    include "keypad(futuremath)"
>+    include "keypad(ossnumber)"
>+    include "kpdl(commaoss)"
> };
> 
>+
> // Keypad keys nobody changes
> // Copyright Â© 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
> partial keypad_keys
>@@ -241,6 +243,33 @@
> };
> 
> 
>+// Keypad math area with non-CS operators in first levels
>+// As demanded by users not interested in legacy pre-unicode junk
>+// Copyright Â© 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
>+//
>+// âââââââ±ââââââ¬ââââââ¬ââââââ
>+// âNum  â / â â * â â - â â â <XF86_Ungrab>
>+// âLockââ â Ã· â . Ã â â â â â <XF86_ClearGrab>
>+// â¡ââââââââââââ¼ââââââ¼ââââââ¤ â <XF86_Prev_VMode>
>+//                   â + â â â <XF86_Next_VMode>
>+//                   â     â
>+//                   â¤     â 1 None
>+//                   â     â 2 Level3 â®
>+//                   â + + â 3 Shift+Level3 â§â®
>+//                   âââââââª 4 Ctrl+Alt
>+partial keypad_keys
>+xkb_symbols "futuremath" {
>+
>+    key.type[Group1]="FOUR_LEVEL_X" ;
>+
>+    key <KPDV> { [ 0x1002215,   KP_Divide, 0x10000F7,     XF86_Ungrab ] }; // â / Ã·     <XF86_Ungrab>
>+    key <KPMU> { [ 0x10022C5, KP_Multiply, 0x10000D7,  XF86_ClearGrab ] }; // â * Ã  <XF86_ClearGrab>
>+    key <KPSU> { [ 0x1002212, KP_Subtract, 0x1002212, XF86_Prev_VMode ] }; // â - â <XF86_Prev_VMode>
>+
>+    key <KPAD> { [ 0x100002B,      KP_Add, 0x100002B, XF86_Next_VMode ] }; // + + + <XF86_Next_VMode>
>+};
>+
>+
> // Keypad math area with non-CS operators, restricted to latin9
> // Copyright Â© 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
> //
>@@ -279,13 +308,13 @@
> // âââââââ¼ââââââ¼ââââââ¤       â¥ Delete
> // â 4   â 5   â 6   â       â¦â§â¨â© Directions
> // â â¦   â     â â¨   â
>-// âââââââ¼ââââââ¼ââââââââââââª
>-// â 1   â 2   â 3   âEnterâ
>-// â â²   â â©   â â   â  â  â 1 None
>-// âââââââ´ââââââ¼ââââââ¨     â 2 Num Lock â
>-// â 0         â .   â     â
>-// â â         â â¥   â     â
>-// âââââââââââââ´ââââââºââââââ
>+// âââââââ¼ââââââ¼ââââââ
>+// â 1   â 2   â 3   â
>+// â â²   â â©   â â   â        1 None
>+// âââââââ´ââââââ¼ââââââ¨        2 Num Lock â
>+// â 0         â
>+// â â         â
>+// âââââââââââââ´
> partial keypad_keys
> xkb_symbols "legacynumber" {
> 
>@@ -304,7 +333,6 @@
>     key <KP3>  { [   KP_Next,       KP_3 ] }; //   <next> 3
> 
>     key <KP0>  { [ KP_Insert,       KP_0 ] }; // <insert> 0
>-    key <KPDL> { [ KP_Delete, KP_Decimal ] }; // <delete> .
> };
> 
> 
>@@ -320,13 +348,13 @@
> // âââââââ¼ââââââ¼ââââââ¤       â¥ Delete
> // â 4 â â 5 â â 6 â â       â¦â§â¨â© Directions
> // â â¦ â â   â â â¨ â â       â½ narrow no-break space
>-// âââââââ¼ââââââ¼ââââââââââââª
>-// â 1 â â 2 â â 3 â âEnterâ
>-// â â² â â â© â â â â â  â  â 1 None
>-// âââââââ´ââââââ¼ââââââ¨     â 2 Num Lock â
>-// â 0       â â . â½ â     â 3 Level3 â®
>-// â â       â â â¥ , â     â 4 Shift+Level3 â§â®
>-// âââââââââââââ´ââââââºââââââ
>+// âââââââ¼ââââââ¼ââââââ
>+// â 1 â â 2 â â 3 â â
>+// â â² â â â© â â â â â       1 None
>+// âââââââ´ââââââ¼ââââââ¨       2 Num Lock â
>+// â 0       â â             3 Level3 â®
>+// â â       â â             4 Shift+Level3 â§â®
>+// âââââââââââââ´
> partial keypad_keys
> xkb_symbols "ossnumber" {
> 
>@@ -345,7 +373,4 @@
>     key <KP3>  { [   KP_Next,   KP_3, 0x1002198, 0x10021D8 ] }; //   <next> 3 â â
> 
>     key <KP0>  { [ KP_Insert,   KP_0, 0x1002195, 0x10021D5 ] }; // <insert> 0 â â
>-    // We could use KP_Decimal and KP_Separator but we do not want the locale
>-    // decimal and separator symbol but locale-insensitive dot and comma
>-    key <KPDL> { [ KP_Delete, period,     comma, 0x100202F ] }; // <delete> . , â½ (narrow no-break space)
> };
>diff -uNr xkeyboard-config-20070715.orig/symbols/kpdl xkeyboard-config-20070715/symbols/kpdl
>--- xkeyboard-config-20070715.orig/symbols/kpdl	1970-01-01 01:00:00.000000000 +0100
>+++ xkeyboard-config-20070715/symbols/kpdl	2007-07-15 13:40:50.000000000 +0200
>@@ -0,0 +1,88 @@
>+// $XKeyboardConfig: xkeyboard-config/symbols/keypad,v 1.4 2006-09-24 20:07:00 svu Exp $
>+// $Xorg: keypad,v 1.3 2000/08/17 19:54:43 cpqbld Exp $
>+
>+// The <KPDL> key is a mess.
>+// It was probably originally meant to be a decimal separator.
>+// Except since it was declared by USA people it didn't use the original
>+// SI separator "," but a "." (since then the USA managed to f-up the SI
>+// by making "." an accepted alternative, but standards still use "," as
>+// default)
>+// As a result users of SI-abiding countries expect either a "." or a ","
>+// or a "decimal_separator" which may or may not be translated in one of the
>+// above depending on applications.
>+// It's not possible to define a default per-country since user expectations
>+// depend on the conflicting choices of their most-used applications,
>+// operating system, etc. Therefore it needs to be a configuration setting
>+// Copyright Â© 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
>+
>+
>+// Legacy <KPDL> #1
>+// This assumes KP_Decimal will be translated in a dot
>+partial keypad_keys
>+xkb_symbols "dot" {
>+
>+    key.type[Group1]="KEYPAD" ;
>+
>+    key <KPDL> { [ KP_Delete, KP_Decimal ] }; // <delete> <separator>
>+};
>+
>+
>+// Legacy <KPDL> #2
>+// This assumes KP_Separator will be translated in a comma
>+partial keypad_keys
>+xkb_symbols "comma" {
>+
>+    key.type[Group1]="KEYPAD" ;
>+
>+    key <KPDL> { [ KP_Delete, KP_Separator ] }; // <delete> <separator>
>+};
>+
>+
>+// Period <KPDL>, usual keyboard serigraphy in most countries
>+partial keypad_keys
>+xkb_symbols "dotoss" {
>+
>+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
>+
>+    key <KPDL> { [ KP_Delete, period, comma, 0x100202F ] }; // <delete> . , â½ (narrow no-break space)
>+};
>+
>+
>+// Period <KPDL>, usual keyboard serigraphy in most countries, latin-9 restriction
>+partial keypad_keys
>+xkb_symbols "dotoss_latin9" {
>+
>+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
>+
>+    key <KPDL> { [ KP_Delete, period, comma, nobreakspace ] }; // <delete> . , â½ (no-break space)
>+};
>+
>+
>+// Comma <KPDL>, what most non anglo-saxon people consider the real separator
>+partial keypad_keys
>+xkb_symbols "commaoss" {
>+
>+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
>+
>+    key <KPDL> { [ KP_Delete, comma, period, 0x100202F ] }; // <delete> , . â½ (narrow no-break space)
>+};
>+
>+
>+// Momayyez <KPDL>: Bahrain, Iran, Iraq, Kuwait, Oman, Qatar, Saudi Arabia, Syria, UAE
>+partial keypad_keys
>+xkb_symbols "momayyezoss" {
>+
>+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
>+
>+    key <KPDL> { [ KP_Delete, 0x100066B, comma, 0x100202F ] }; // <delete> ? , â½ (narrow no-break space)
>+};
>+
>+
>+// Abstracted <KPDL>, pray everything will work out (it usually does not)
>+partial keypad_keys
>+xkb_symbols "kposs" {
>+
>+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
>+
>+    key <KPDL> { [ KP_Delete, KP_Decimal, KP_Separator, 0x100202F ] }; // <delete> ? ? â½ (narrow no-break space)
>+};
>diff -uNr xkeyboard-config-20070715.orig/symbols/macintosh_vndr/ch xkeyboard-config-20070715/symbols/macintosh_vndr/ch
>--- xkeyboard-config-20070715.orig/symbols/macintosh_vndr/ch	2006-09-17 22:03:34.000000000 +0200
>+++ xkeyboard-config-20070715/symbols/macintosh_vndr/ch	2007-07-15 13:58:44.000000000 +0200
>@@ -67,7 +67,7 @@
>     key <LSGT> { [	less,	greater, 	lessthanequal,	greaterthanequal	]  	};
>     key <BKSL> { [	dollar,	sterling, 	paragraph,	enfilledcircbullet	]	};
> 
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
>     include "level3(ralt_switch)"
> };
> 
>diff -uNr xkeyboard-config-20070715.orig/symbols/macintosh_vndr/de xkeyboard-config-20070715/symbols/macintosh_vndr/de
>--- xkeyboard-config-20070715.orig/symbols/macintosh_vndr/de	2006-09-17 22:03:34.000000000 +0200
>+++ xkeyboard-config-20070715/symbols/macintosh_vndr/de	2007-07-15 13:58:44.000000000 +0200
>@@ -54,7 +54,7 @@
>     key <AB10> {	[     minus,	underscore	]	};
>     key <BKSL> {	[ numbersign,	apostrophe,  dead_grave			]	};
> 
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
>     include "level3(ralt_switch)"
> 
> };
>diff -uNr xkeyboard-config-20070715.orig/symbols/macintosh_vndr/it xkeyboard-config-20070715/symbols/macintosh_vndr/it
>--- xkeyboard-config-20070715.orig/symbols/macintosh_vndr/it	2006-10-18 20:28:01.000000000 +0200
>+++ xkeyboard-config-20070715/symbols/macintosh_vndr/it	2007-07-15 13:58:44.000000000 +0200
>@@ -58,7 +58,7 @@
> 
>     // End alphanumeric section
> 
>-    include "keypad(dot)"
>+    include "kpdl(dot)"
>     include "level3(ralt_switch)"
> };
> 
>diff -uNr xkeyboard-config-20070715.orig/symbols/macintosh_vndr/se xkeyboard-config-20070715/symbols/macintosh_vndr/se
>--- xkeyboard-config-20070715.orig/symbols/macintosh_vndr/se	2006-10-18 20:28:01.000000000 +0200
>+++ xkeyboard-config-20070715/symbols/macintosh_vndr/se	2007-07-15 13:58:44.000000000 +0200
>@@ -33,7 +33,7 @@
>     key <BKSL> {	[      apostrophe,        asterisk,               at			]	};
>     key <LSGT> {        [            less,         greater,              bar,       brokenbar      ]       };
> 
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
>     include "eurosign(e)"
>     include "level3(ralt_switch)"
> };
>diff -uNr xkeyboard-config-20070715.orig/symbols/mk xkeyboard-config-20070715/symbols/mk
>--- xkeyboard-config-20070715.orig/symbols/mk	2005-09-20 23:10:47.000000000 +0200
>+++ xkeyboard-config-20070715/symbols/mk	2007-07-15 13:58:44.000000000 +0200
>@@ -56,7 +56,7 @@
>     key <AB09> { [          period,           colon	]	};
>     key <AB10> { [           slash,        question	]	};
>  
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
> };
> 
> partial alphanumeric_keys
>diff -uNr xkeyboard-config-20070715.orig/symbols/no xkeyboard-config-20070715/symbols/no
>--- xkeyboard-config-20070715.orig/symbols/no	2006-10-04 00:47:43.000000000 +0200
>+++ xkeyboard-config-20070715/symbols/no	2007-07-15 13:58:44.000000000 +0200
>@@ -26,7 +26,7 @@
>     key <BKSL>	{ [apostrophe,   asterisk, dead_doubleacute, multiply ]	};
>     key <LSGT>	{ [      less,    greater,      onehalf, threequarters]	};
> 
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
> 
>     include "level3(ralt_switch)"
> };
>diff -uNr xkeyboard-config-20070715.orig/symbols/pl xkeyboard-config-20070715/symbols/pl
>--- xkeyboard-config-20070715.orig/symbols/pl	2006-07-30 21:28:56.000000000 +0200
>+++ xkeyboard-config-20070715/symbols/pl	2007-07-15 13:58:44.000000000 +0200
>@@ -22,7 +22,7 @@
>     key <AB03>	{ [         c,          C,       cacute,       Cacute ]	};
>     key <AB06>	{ [         n,          N,       nacute,       Nacute ]	};
> 
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
> 
>     include "level3(ralt_switch)"
> };
>@@ -66,7 +66,7 @@
>     key <AB03>	{ [         c,          C,         cent,    copyright ]	};
>     key <AB10>  { [     minus, underscore, dead_belowdot, dead_abovedot ] };
> 
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
> 
>     include "level3(ralt_switch)"
> };
>@@ -97,7 +97,7 @@
>     key <AB09> { [	    v,	V,      zacute, Zacute		]	};
>     key <AB10> { [	    z,	Z,   zabovedot, Zabovedot	]	};
>     
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
> 
>     // this to allow writing ALL CAPS with a Shift key
>     include "level3(ralt_switch)"
>@@ -151,7 +151,7 @@
>     key <AB01>	{ [         z,          Z,    zabovedot,    Zabovedot ]	};
>     key <AB06>	{ [         n,          N,       nacute,       Nacute ]	};
> 
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
> 
>     include "level3(ralt_switch)"
> };
>diff -uNr xkeyboard-config-20070715.orig/symbols/ro xkeyboard-config-20070715/symbols/ro
>--- xkeyboard-config-20070715.orig/symbols/ro	2006-07-02 23:05:20.000000000 +0200
>+++ xkeyboard-config-20070715/symbols/ro	2007-07-15 13:58:44.000000000 +0200
>@@ -186,7 +186,7 @@
>     key <BKSL> { [ acircumflex, Acircumflex             ]       };
> 
>     // End alphanumeric section, begin "Keypad"
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
>     // End "Keypad" section
> 
>     include "level3(ralt_switch)"
>diff -uNr xkeyboard-config-20070715.orig/symbols/ru xkeyboard-config-20070715/symbols/ru
>--- xkeyboard-config-20070715.orig/symbols/ru	2007-06-15 22:39:29.000000000 +0200
>+++ xkeyboard-config-20070715/symbols/ru	2007-07-15 13:58:44.000000000 +0200
>@@ -65,7 +65,7 @@
> 
>     key.type[group1]="TWO_LEVEL";
> 
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
> };
> 
> partial alphanumeric_keys
>diff -uNr xkeyboard-config-20070715.orig/symbols/se xkeyboard-config-20070715/symbols/se
>--- xkeyboard-config-20070715.orig/symbols/se	2007-06-01 00:20:45.000000000 +0200
>+++ xkeyboard-config-20070715/symbols/se	2007-07-15 13:58:44.000000000 +0200
>@@ -28,7 +28,7 @@
> 
>     key <SPCE>	{ [     space,      space,        space, nobreakspace ]	};
> 
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
> 
>     include "level3(ralt_switch)"
> };
>@@ -203,7 +203,7 @@
>     key <AD12> {	[       diaeresis,     asciicircum, 	asciitilde			]	};
>     key <BKSL> {	[      apostrophe,        asterisk,               at			]	};
> 
>-    include "keypad(comma)"
>+    include "kpdl(comma)"
>     include "level3(ralt_switch)"
> };
>

Actions: View | Splinter Review

Attachments on bug 11611: 10737 | 10742

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.