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-15 16:37:14.000000000 +0200 +++ xkeyboard-config-20070715/rules/base.xml.in 2007-07-15 16:38:51.000000000 +0200 @@ -3556,13 +3556,66 @@ + + + + + + kpdl + <_description>Numeric keypad delete key behaviour + + + + + + + diff -uNr xkeyboard-config-20070715.orig/symbols/br xkeyboard-config-20070715/symbols/br --- xkeyboard-config-20070715.orig/symbols/br 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/br 2007-07-15 16:38:51.000000000 +0200 @@ -46,7 +46,7 @@ key { [ 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 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/ch 2007-07-15 16:38:51.000000000 +0200 @@ -184,7 +184,7 @@ key { [ less, greater, lessthanequal, greaterthanequal ] }; key { [ 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 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/cs 2007-07-15 16:38:51.000000000 +0200 @@ -75,7 +75,7 @@ key { [ period, colon, any,any ] }; // key { [ 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-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/de 2007-07-15 16:38:51.000000000 +0200 @@ -29,7 +29,7 @@ key { [numbersign, apostrophe, dead_grave, dead_breve ] }; key { [ 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 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/dk 2007-07-15 16:38:51.000000000 +0200 @@ -23,7 +23,7 @@ key { [ less, greater, backslash, notsign ] }; - include "keypad(comma)" + include "kpdl(comma)" include "level3(ralt_switch)" }; @@ -55,7 +55,7 @@ key { [ space, space, nobreakspace, nobreakspace ] }; key { [ 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 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/ee 2007-07-15 16:38:51.000000000 +0200 @@ -75,5 +75,5 @@ key { [ 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-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/fi 2007-07-15 16:38:51.000000000 +0200 @@ -56,7 +56,7 @@ key { [ 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 { [ period, colon, dead_belowdot, dead_abovedot ] }; key { [ 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-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/gr 2007-07-15 16:38:51.000000000 +0200 @@ -41,7 +41,7 @@ key { [ slash, question ] }; key { [ 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 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/hu 2007-07-15 16:38:51.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 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/it 2007-07-15 16:38:51.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 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/keypad 2007-07-15 16:38:51.000000000 +0200 @@ -126,54 +126,56 @@ key { [ KP_Delete, KP_Decimal ] }; }; -// Some national standards use comma on the keypad instead of decimal dot -partial keypad_keys -xkb_symbols "comma" { - key { [ KP_Delete, KP_Separator ] }; -}; - -// Default is decimal dot -partial keypad_keys -xkb_symbols "dot" { - key { [ KP_Delete, KP_Decimal ] }; -}; - // Legacy PC keypad definition -// Copyright © 2006 Nicolas Mailhot +// Copyright © 2006-2007 Nicolas Mailhot 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 +// Copyright © 2006-2007 Nicolas Mailhot 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 +// Copyright © 2006-2007 Nicolas Mailhot 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 +keypad_keys +xkb_symbols "future" { - key { type="FOUR_LEVEL_MIXED_KEYPAD", - [ KP_Delete, period, comma, nobreakspace ] }; // . , ⍽ (no-break space) + include "keypad(core)" + include "keypad(futuremath)" + include "keypad(ossnumber)" + include "kpdl(commaoss)" }; + // Keypad keys nobody changes // Copyright © 2006 Nicolas Mailhot 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 +// +// ┏━━━━━┱─────┬─────┬─────┐ +// ┃Num ┃ / ₁ │ * ₂ │ - ₃ │ ₁ +// ┃Lock⇭┃ ∕ ÷ │ . × │ − − │ ₂ +// ┡━━━━━╃─────┼─────┼─────┤ ₃ +// │ + ₄ │ ₄ +// │ │ +// ┤ │ 1 None +// │ │ 2 Level3 ⇮ +// │ + + │ 3 Shift+Level3 ⇧⇮ +// ╆━━━━━┪ 4 Ctrl+Alt +partial keypad_keys +xkb_symbols "futuremath" { + + key.type[Group1]="FOUR_LEVEL_X" ; + + key { [ 0x1002215, KP_Divide, 0x10000F7, XF86_Ungrab ] }; // ∕ / ÷ + key { [ 0x10022C5, KP_Multiply, 0x10000D7, XF86_ClearGrab ] }; // ⋅ * × + key { [ 0x1002212, KP_Subtract, 0x1002212, XF86_Prev_VMode ] }; // − - − + + key { [ 0x100002B, KP_Add, 0x100002B, XF86_Next_VMode ] }; // + + + +}; + + // Keypad math area with non-CS operators, restricted to latin9 // Copyright © 2006 Nicolas Mailhot // @@ -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 { [ KP_Next, KP_3 ] }; // 3 key { [ KP_Insert, KP_0 ] }; // 0 - key { [ KP_Delete, KP_Decimal ] }; // . }; @@ -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 { [ KP_Next, KP_3, 0x1002198, 0x10021D8 ] }; // 3 ↘ ⇘ key { [ KP_Insert, KP_0, 0x1002195, 0x10021D5 ] }; // 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 { [ KP_Delete, period, comma, 0x100202F ] }; // . , ⍽ (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 16:38:51.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 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 + + +// Legacy #1 +// This assumes KP_Decimal will be translated in a dot +partial keypad_keys +xkb_symbols "dot" { + + key.type[Group1]="KEYPAD" ; + + key { [ KP_Delete, KP_Decimal ] }; // +}; + + +// Legacy #2 +// This assumes KP_Separator will be translated in a comma +partial keypad_keys +xkb_symbols "comma" { + + key.type[Group1]="KEYPAD" ; + + key { [ KP_Delete, KP_Separator ] }; // +}; + + +// Period , usual keyboard serigraphy in most countries +partial keypad_keys +xkb_symbols "dotoss" { + + key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; + + key { [ KP_Delete, period, comma, 0x100202F ] }; // . , ⍽ (narrow no-break space) +}; + + +// Period , usual keyboard serigraphy in most countries, latin-9 restriction +partial keypad_keys +xkb_symbols "dotoss_latin9" { + + key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; + + key { [ KP_Delete, period, comma, nobreakspace ] }; // . , ⍽ (no-break space) +}; + + +// Comma , what most non anglo-saxon people consider the real separator +partial keypad_keys +xkb_symbols "commaoss" { + + key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; + + key { [ KP_Delete, comma, period, 0x100202F ] }; // , . ⍽ (narrow no-break space) +}; + + +// Momayyez : Bahrain, Iran, Iraq, Kuwait, Oman, Qatar, Saudi Arabia, Syria, UAE +partial keypad_keys +xkb_symbols "momayyezoss" { + + key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; + + key { [ KP_Delete, 0x100066B, comma, 0x100202F ] }; // ? , ⍽ (narrow no-break space) +}; + + +// Abstracted , pray everything will work out (it usually does not) +partial keypad_keys +xkb_symbols "kposs" { + + key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; + + key { [ KP_Delete, KP_Decimal, KP_Separator, 0x100202F ] }; // ? ? ⍽ (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 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/macintosh_vndr/ch 2007-07-15 16:38:51.000000000 +0200 @@ -67,7 +67,7 @@ key { [ less, greater, lessthanequal, greaterthanequal ] }; key { [ 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 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/macintosh_vndr/de 2007-07-15 16:38:51.000000000 +0200 @@ -54,7 +54,7 @@ key { [ minus, underscore ] }; key { [ 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 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/macintosh_vndr/it 2007-07-15 16:38:51.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 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/macintosh_vndr/se 2007-07-15 16:38:51.000000000 +0200 @@ -33,7 +33,7 @@ key { [ apostrophe, asterisk, at ] }; key { [ less, greater, bar, brokenbar ] }; - include "keypad(comma)" + include "kpdl(comma)" include "eurosign(e)" include "level3(ralt_switch)" }; diff -uNr xkeyboard-config-20070715.orig/symbols/Makefile xkeyboard-config-20070715/symbols/Makefile --- xkeyboard-config-20070715.orig/symbols/Makefile 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/Makefile 2007-07-15 16:39:44.000000000 +0200 @@ -210,7 +210,7 @@ tj tr ua \ us uz vn \ za \ -altwin capslock compose ctrl group inet keypad level3 level5 nbsp srvr_ctrl \ +altwin capslock compose ctrl group inet keypad kpdl level3 level5 nbsp srvr_ctrl \ eurosign dist_dir_DATA = $(subdir).dir diff -uNr xkeyboard-config-20070715.orig/symbols/Makefile.am xkeyboard-config-20070715/symbols/Makefile.am --- xkeyboard-config-20070715.orig/symbols/Makefile.am 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/Makefile.am 2007-07-15 16:48:00.000000000 +0200 @@ -27,7 +27,7 @@ tj tr ua \ us uz vn \ za \ -altwin capslock compose ctrl group inet keypad level3 level5 nbsp srvr_ctrl \ +altwin capslock compose ctrl group inet keypad kpdl level3 level5 nbsp srvr_ctrl \ eurosign include $(top_srcdir)/xkbrules.am diff -uNr xkeyboard-config-20070715.orig/symbols/Makefile.in xkeyboard-config-20070715/symbols/Makefile.in --- xkeyboard-config-20070715.orig/symbols/Makefile.in 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/Makefile.in 2007-07-15 16:47:29.000000000 +0200 @@ -210,7 +210,7 @@ tj tr ua \ us uz vn \ za \ -altwin capslock compose ctrl group inet keypad level3 level5 nbsp srvr_ctrl \ +altwin capslock compose ctrl group inet keypad kpdl level3 level5 nbsp srvr_ctrl \ eurosign dist_dir_DATA = $(subdir).dir diff -uNr xkeyboard-config-20070715.orig/symbols/mk xkeyboard-config-20070715/symbols/mk --- xkeyboard-config-20070715.orig/symbols/mk 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/mk 2007-07-15 16:38:51.000000000 +0200 @@ -56,7 +56,7 @@ key { [ period, colon ] }; key { [ 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 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/no 2007-07-15 16:38:51.000000000 +0200 @@ -26,7 +26,7 @@ key { [apostrophe, asterisk, dead_doubleacute, multiply ] }; key { [ 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 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/pl 2007-07-15 16:38:51.000000000 +0200 @@ -22,7 +22,7 @@ key { [ c, C, cacute, Cacute ] }; key { [ n, N, nacute, Nacute ] }; - include "keypad(comma)" + include "kpdl(comma)" include "level3(ralt_switch)" }; @@ -66,7 +66,7 @@ key { [ c, C, cent, copyright ] }; key { [ minus, underscore, dead_belowdot, dead_abovedot ] }; - include "keypad(comma)" + include "kpdl(comma)" include "level3(ralt_switch)" }; @@ -97,7 +97,7 @@ key { [ v, V, zacute, Zacute ] }; key { [ 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 { [ z, Z, zabovedot, Zabovedot ] }; key { [ 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 2007-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/ro 2007-07-15 16:38:51.000000000 +0200 @@ -186,7 +186,7 @@ key { [ 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-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/ru 2007-07-15 16:38:51.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-07-15 16:37:13.000000000 +0200 +++ xkeyboard-config-20070715/symbols/se 2007-07-15 16:38:51.000000000 +0200 @@ -28,7 +28,7 @@ key { [ space, space, space, nobreakspace ] }; - include "keypad(comma)" + include "kpdl(comma)" include "level3(ralt_switch)" }; @@ -203,7 +203,7 @@ key { [ diaeresis, asciicircum, asciitilde ] }; key { [ apostrophe, asterisk, at ] }; - include "keypad(comma)" + include "kpdl(comma)" include "level3(ralt_switch)" };