merge from in xen-unstable tip (17318:b5fea3aeb04b): merge keymap changes in xen...

diff --git a/keymaps/hu b/keymaps/hu
index 8aba444417b464bf38c51b6d050addfccbae4b83..74783a771c68a9f455d6bb46241973060a2e23ed 100644 (file)
--- a/keymaps/hu
+++ b/keymaps/hu
@@ -7,29 +7,27 @@ map 0x40e
 
 # AltGr keys:
 notsign 0x29 altgr
-asciitilde 0x02 altgr
-caron 0x03 altgr
-asciicircum 0x04 altgr
-breve 0x05 altgr
-degree 0x06 altgr
-ogonek 0x07 altgr
-grave 0x08 altgr
-abovedot 0x09 altgr
-acute 0x0a altgr
-doubleacute 0x0b altgr
-diaeresis 0x0c altgr
-cedilla 0x0d altgr
+dead_tilde 0x02 altgr
+dead_caron 0x03 altgr
+dead_circumflex 0x04 altgr
+dead_breve 0x05 altgr
+dead_degree 0x06 altgr
+dead_ogonek 0x07 altgr
+dead_grave 0x08 altgr
+dead_abovedot 0x09 altgr
+dead_acute 0x0a altgr
+dead_doubleacute 0x0b altgr
+dead_diaeresis 0x0c altgr
+dead_cedilla 0x0d altgr
 backslash 0x10 altgr
 bar 0x11 altgr
 EuroSign 0x12 altgr
-Iacute 0x17 altgr
 division 0x1a altgr
 multiply 0x1b altgr
 dstroke 0x1f altgr
 Dstroke 0x20 altgr
 bracketleft 0x21 altgr
 bracketright 0x22 altgr
-iacute 0x24 altgr
 lstroke 0x25 altgr
 Lstroke 0x26 altgr
 dollar 0x27 altgr
@@ -82,7 +80,7 @@ F21 0x43 shift
 F22 0x44 shift
 F23 0x57 shift
 F24 0x58 shift
-
+Iacute 0x56 shift
 
 # Ctrl keys:
 F25 0x3b ctrl
@@ -113,3 +111,4 @@ y 0x2c
 comma 0x33
 period 0x34
 minus 0x35
+iacute 0x56

diff --git a/keymaps/ja b/keymaps/ja
index 6947cb124c6bad08166760fbfe183e962c304c83..9d90a78c81efa242e812bdd21e36abb5758063e2 100644 (file)
--- a/keymaps/ja
+++ b/keymaps/ja
@@ -101,6 +101,7 @@ yen 0x7d
 bar 0x7d shift
 underscore 0x73 shift
 Henkan_Mode 0x79
+Katakana_Real 0x70
 Katakana 0x70
 Muhenkan 0x7b
 Henkan_Mode_Real 0x79

diff --git a/keymaps/modifiers b/keymaps/modifiers
index 84a04d651edc3cb2c276b167f381944967c0d1f1..309ab27de64df13fdccf071508718d9b54320059 100644 (file)
--- a/keymaps/modifiers
+++ b/keymaps/modifiers
@@ -3,6 +3,7 @@ Shift_L 0x2a
 
 Alt_R 0xb8
 Mode_switch 0xb8
+ISO_Level3_Shift 0xb8
 Alt_L 0x38
 
 Control_R 0x9d

diff --git a/keymaps/nl-be b/keymaps/nl-be
index 34fc881ad048d21389018e056edb5078e2da5e86..cd162486d045224238a76cab788fcbacc4eff0a2 100644 (file)
--- a/keymaps/nl-be
+++ b/keymaps/nl-be
@@ -1,3 +1,69 @@
 # Dutch (Belgium)
 map 0x813
 include common
+ampersand 0x02
+1 0x02 shift
+bar 0x02 altgr
+eacute 0x03
+2 0x03 shift
+at 0x03 altgr
+quotedbl 0x04
+3 0x04 shift
+numbersign 0x04 altgr
+apostrophe 0x05
+4 0x05 shift
+parenleft 0x06
+5 0x06 shift
+section 0x07
+6 0x07 shift
+circumflex 0x07 altgr
+egrave 0x08
+7 0x08 shift
+exclam 0x09
+8 0x09 shift
+bracketleft 0x09 altgr
+ccedilla 0x0a
+9 0x0a shift
+braceleft 0x0a altgr
+agrave 0x0b
+0 0x0b shift
+braceright 0x0b altgr
+parenright 0x0c
+degree 0x0c shift
+minus 0x0d
+underscore 0x0d shift
+a 0x10 addupper
+z 0x11 addupper
+EuroSign 0x12 altgr
+dead_circumflex 0x1a
+dead_diaeresis 0x1a shift
+bracketleft 0x1a altgr
+dollar 0x1b
+asterisk 0x1b shift
+bracketright 0x1b altgr
+q 0x1e addupper
+m 0x27 addupper
+ugrave 0x28
+percent 0x28 shift
+dead_acute 0x28 altgr
+twosuperior 0x29
+threesuperior 0x29 shift
+mu 0x2b
+sterling 0x2b shift
+dead_grave 0x2b altgr
+w 0x2c addupper
+comma 0x32
+question 0x32 shift
+semicolon 0x33
+period 0x33 shift
+colon 0x34
+slash 0x34 shift
+periodcentered 0x34 altgr
+equal 0x35
+plus 0x35 shift
+tilde 0x35 altgr
+dead_tilde 0x35 shift altgr
+less 0x56
+greater 0x56 shift
+backslash 0x56 altgr
+