Fix a few conversion problems (e.g. when a keymap is derived from ISO8859-1,

but shall provide an Euro sign - similar for Japanese Yen).

The Brazilian keymap "br.kbd" now has accents, by default - the no-accents
version has been renamed to "br.noacc.kbd".

MFC after:	3 days

13 files changed, 301 insertions, 96 deletions

diff --git a/share/vt/keymaps/INDEX.keymaps b/share/vt/keymaps/INDEX.keymaps
index aefd026..68f211d 100644
--- a/share/vt/keymaps/INDEX.keymaps
+++ b/share/vt/keymaps/INDEX.keymaps
@@ -56,35 +56,21 @@ bg.bds.kbd:de:Bulgarisch (BDS)
 bg.bds.ctrlcaps.kbd:en:Bulgarian (Phonetic)
 bg.bds.ctrlcaps.kbd:de:Bulgarisch (phonetisch)
 
-br.kbd:en:Brazilian
-br.kbd:de:Brasilianisch
-br.kbd:fr:Brésilien
-br.kbd:pt:Brasileiro
-br.kbd:es:Brasileño
-
-br.acc.kbd:en:Brazilian (accent keys)
-br.acc.kbd:de:Brasilianisch (mit Akzenten)
-br.acc.kbd:fr:Brésilien (avec accents)
-br.acc.kbd:pt:Brasileiro (com acentos)
-br.acc.kbd:es:Brasileño (con acentos)
-
-br.kbd.from-cp850:en:Brazilian
-br.kbd.from-cp850:de:Brasilianisch
-br.kbd.from-cp850:fr:Brésilien
-br.kbd.from-cp850:pt:Brasileiro
-br.kbd.from-cp850:es:Brasileño
-
-by.kbd.from-cp1131:en:Belarusian
-by.kbd.from-cp1131:de:Weißrussisch
-by.kbd.from-cp1131:fr:Biélorusse
-
-by.kbd.from-cp1251:en:Belarusian
-by.kbd.from-cp1251:de:Weißrussisch
-by.kbd.from-cp1251:fr:Biélorusse
-
-by.kbd.from-iso5:en:Belarusian
-by.kbd.from-iso5:de:Weißrussisch
-by.kbd.from-iso5:fr:Biélorusse
+br.kbd:en:Brazilian (accent keys)
+br.kbd:de:Brasilianisch (mit Akzenten)
+br.kbd:fr:Brésilien (avec accents)
+br.kbd:pt:Brasileiro (com acentos)
+br.kbd:es:Brasileño (con acentos)
+
+br.noacc.kbd:en:Brazilian (without accent keys)
+br.noacc.kbd:de:Brasilianisch (ohne Akzente)
+br.noacc.kbd:fr:Brésilien (sans accents)
+br.noacc.kbd:pt:Brasileiro (without accent keys)
+br.noacc.kbd:es:Brasileño (without accent keys)
+
+by.kbd:en:Belarusian
+by.kbd:de:Weißrussisch
+by.kbd:fr:Biélorusse
 
 centraleuropean.kbd:en:Central European
 centraleuropean.kbd:de:Zentral Europäisch
diff --git a/share/vt/keymaps/Makefile b/share/vt/keymaps/Makefile
index 4654e6d..fb7f70a 100644
--- a/share/vt/keymaps/Makefile
+++ b/share/vt/keymaps/Makefile
@@ -4,7 +4,6 @@ FILES=	INDEX.keymaps \
 	am.kbd \
 	bg.bds.ctrlcaps.kbd \
 	bg.bds.kbd \
-	br.acc.kbd \
 	br.kbd \
 	ca.kbd \
 	ca-fr.kbd \
diff --git a/share/vt/keymaps/br.kbd b/share/vt/keymaps/br.kbd
index 7e17de0..37e85ea 100644
--- a/share/vt/keymaps/br.kbd
+++ b/share/vt/keymaps/br.kbd
@@ -10,7 +10,7 @@
   004   '3'    '#'    nop    nop    0xb3   '#'    nop    nop     O
   005   '4'    '$'    nop    nop    0xa3   '$'    nop    nop     O
   006   '5'    '%'    nop    nop    0xa2   '%'    nop    nop     O
-  007   '6'    0xa8   rs     rs     0xac   0xa8   rs     rs      O
+  007   '6'    duml   rs     rs     0xac   duml   rs     rs      O
   008   '7'    '&'    nop    nop    '7'    '&'    nop    nop     O
   009   '8'    '*'    nop    nop    '8'    '*'    nop    nop     O
   010   '9'    '('    nop    nop    '9'    '('    nop    nop     O
@@ -29,7 +29,7 @@
   023   'i'    'I'    ht     ht     'i'    'I'    ht     ht      C
   024   'o'    'O'    si     si     'o'    'O'    si     si      C
   025   'p'    'P'    dle    dle    'p'    'P'    dle    dle     C
-  026   0xb4   '`'    nop    nop    0xb4   '`'    nop    nop     O
+  026   dacu   dgra   nop    nop    dacu   dgra   nop    nop     O
   027   '['    '{'    esc    esc    0xaa   '{'    esc    esc     O
   028   cr     cr     nl     nl     cr     cr     nl     nl      O
   029   lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl   O
@@ -43,7 +43,7 @@
   037   'k'    'K'    vt     vt     'k'    'K'    vt     vt      C
   038   'l'    'L'    ff     ff     'l'    'L'    ff     ff      C
   039   0xe7   0xc7   nop    nop    0xe7   0xc7   nop    nop     C
-  040   '~'    '^'    nop    nop    '~'    '^'    nop    nop     O
+  040   dtil   dcir   nop    nop    dtil   dcir   nop    nop     O
   041   '''    '"'    nop    nop    '''    '"'    nop    nop     O
   042   lshift lshift lshift lshift lshift lshift lshift lshift  O
   043   ']'    '}'    gs     gs     0xba   '}'    gs     gs      O
@@ -130,3 +130,22 @@
   124   nop    nop    nop    nop    nop    nop    nop    nop     O
   125   nop    nop    nop    nop    nop    nop    nop    nop     O
   126   '.'    '.'    '.'    '.'    '.'    '.'    '.'    '.'     N
+
+  dgra '`'     ( 'a'    0xe0    ) ( 'A'    0xc0    ) ( 'e'    0xe8    ) ( 'E'    0xc8    )
+               ( 'i'    0xec    ) ( 'I'    0xcc    ) ( 'o'    0xf2    ) ( 'O'    0xd2    )
+               ( 'u'    0xf9    ) ( 'U'    0xd9    )
+
+  dacu 0xb4    ( 'a'    0xe1    ) ( 'A'    0xc1    ) ( 'e'    0xe9    ) ( 'E'    0xc9    )
+               ( 'i'    0xed    ) ( 'I'    0xcd    ) ( 'o'    0xf3    ) ( 'O'    0xd3    )
+               ( 'u'    0xfa    ) ( 'U'    0xda    ) ( 'y'    0xfd    ) ( 'Y'    0xdd    )
+
+  dcir '^'     ( 'a'    0xe2    ) ( 'A'    0xc2    ) ( 'e'    0xea    ) ( 'E'    0xca    )
+               ( 'i'    0xee    ) ( 'I'    0xce    ) ( 'o'    0xf4    ) ( 'O'    0xd4    )
+               ( 'u'    0xfb    ) ( 'U'    0xdb    )
+
+  dtil '~'     ( 'a'    0xe3    ) ( 'A'    0xc3    ) ( 'n'    0xf1    ) ( 'N'    0xd1    )
+               ( 'o'    0xf5    ) ( 'O'    0xd5    )
+
+  duml 0xa8    ( 'a'    0xe4    ) ( 'A'    0xc4    ) ( 'e'    0xeb    ) ( 'E'    0xcb    )
+               ( 'i'    0xef    ) ( 'I'    0xcf    ) ( 'o'    0xf6    ) ( 'O'    0xd6    )
+               ( 'u'    0xfc    ) ( 'U'    0xdc    ) ( 'y'    0xff    )
diff --git a/share/vt/keymaps/br.acc.kbd b/share/vt/keymaps/br.noacc.kbd
index 8f57683..103a081 100644
--- a/share/vt/keymaps/br.acc.kbd
+++ b/share/vt/keymaps/br.noacc.kbd
@@ -10,7 +10,7 @@
   004   '3'    '#'    nop    nop    0xb3   '#'    nop    nop     O
   005   '4'    '$'    nop    nop    0xa3   '$'    nop    nop     O
   006   '5'    '%'    nop    nop    0xa2   '%'    nop    nop     O
-  007   '6'    duml   rs     rs     0xac   duml   rs     rs      O
+  007   '6'    0xa8   rs     rs     0xac   0xbf   rs     rs      O
   008   '7'    '&'    nop    nop    '7'    '&'    nop    nop     O
   009   '8'    '*'    nop    nop    '8'    '*'    nop    nop     O
   010   '9'    '('    nop    nop    '9'    '('    nop    nop     O
@@ -29,7 +29,7 @@
   023   'i'    'I'    ht     ht     'i'    'I'    ht     ht      C
   024   'o'    'O'    si     si     'o'    'O'    si     si      C
   025   'p'    'P'    dle    dle    'p'    'P'    dle    dle     C
-  026   dacu   dgra   nop    nop    dacu   dgra   nop    nop     O
+  026   0xb4   '`'    nop    nop    0xb4   '`'    nop    nop     O
   027   '['    '{'    esc    esc    0xaa   '{'    esc    esc     O
   028   cr     cr     nl     nl     cr     cr     nl     nl      O
   029   lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl   O
@@ -43,7 +43,7 @@
   037   'k'    'K'    vt     vt     'k'    'K'    vt     vt      C
   038   'l'    'L'    ff     ff     'l'    'L'    ff     ff      C
   039   0xe7   0xc7   nop    nop    0xe7   0xc7   nop    nop     C
-  040   dtil   dcir   nop    nop    dtil   dcir   nop    nop     O
+  040   '~'    '^'    nop    nop    '~'    '^'    nop    nop     O
   041   '''    '"'    nop    nop    '''    '"'    nop    nop     O
   042   lshift lshift lshift lshift lshift lshift lshift lshift  O
   043   ']'    '}'    gs     gs     0xba   '}'    gs     gs      O
@@ -130,26 +130,3 @@
   124   nop    nop    nop    nop    nop    nop    nop    nop     O
   125   nop    nop    nop    nop    nop    nop    nop    nop     O
   126   '.'    '.'    '.'    '.'    '.'    '.'    '.'    '.'     N
-
-  dgra '`'     ( 'a'    0xe0    ) ( 'A'    0xc0    ) ( 'e'    0xe8    ) ( 'E'    0xc8    )
-               ( 'i'    0xec    ) ( 'I'    0xcc    ) ( 'o'    0xf2    ) ( 'O'    0xd2    )
-               ( 'u'    0xf9    ) ( 'U'    0xd9    )
-
-  dacu 0xb4    ( 'a'    0xe1    ) ( 'A'    0xc1    ) ( 'e'    0xe9    ) ( 'E'    0xc9    )
-               ( 'i'    0xed    ) ( 'I'    0xcd    ) ( 'o'    0xf3    ) ( 'O'    0xd3    )
-               ( 'u'    0xfa    ) ( 'U'    0xda    ) ( 'y'    0xfd    ) ( 'Y'    0xdd    )
-
-  dcir '^'     ( 'a'    0xe2    ) ( 'A'    0xc2    ) ( 'e'    0xea    ) ( 'E'    0xca    )
-               ( 'i'    0xee    ) ( 'I'    0xce    ) ( 'o'    0xf4    ) ( 'O'    0xd4    )
-               ( 'u'    0xfb    ) ( 'U'    0xdb    )
-
-  dtil '~'     ( 'a'    0xe3    ) ( 'A'    0xc3    ) ( 'n'    0xf1    ) ( 'N'    0xd1    )
-               ( 'o'    0xf5    ) ( 'O'    0xd5    )
-
-  duml 0xa8    ( 'a'    0xe4    ) ( 'A'    0xc4    ) ( 'e'    0xeb    ) ( 'E'    0xcb    )
-               ( 'i'    0xef    ) ( 'I'    0xcf    ) ( 'o'    0xf6    ) ( 'O'    0xd6    )
-               ( 'u'    0xfc    ) ( 'U'    0xdc    ) ( 'y'    0xff    )
-
-  drin 0xb0    ( 'a'    0xe5    ) ( 'A'    0xc5    )
-
-  dced 0xb8    ( 'c'    0xe7    ) ( 'C'    0xc7    )
diff --git a/share/vt/keymaps/by.kbd b/share/vt/keymaps/by.kbd
new file mode 100644
index 0000000..8de2ac4
--- /dev/null
+++ b/share/vt/keymaps/by.kbd
@@ -0,0 +1,224 @@
+# $FreeBSD$
+#                                                         alt
+# scan                       cntrl          alt    alt   cntrl lock
+# code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
+# ------------------------------------------------------------------
+  000   nop    nop    nop    nop    nop    nop    nop    nop     O
+  001   esc    esc    esc    esc    esc    esc    debug  esc     O
+  002   '1'    '!'    nop    nop    '1'    '!'    nop    nop     O
+  003   '2'    '@'    nul    nul    '2'    '@'    nul    nul     O
+  004   '3'    '#'    nop    nop    '3'    '#'    nop    nop     O
+  005   '4'    '$'    nop    nop    '4'    '$'    nop    nop     O
+  006   '5'    '%'    nop    nop    '5'    '%'    nop    nop     O
+  007   '6'    '^'    rs     rs     '6'    '^'    rs     rs      O
+  008   '7'    '&'    nop    nop    '7'    '&'    nop    nop     O
+  009   '8'    '*'    nop    nop    '8'    '*'    nop    nop     O
+  010   '9'    '('    nop    nop    '9'    '('    nop    nop     O
+  011   '0'    ')'    nop    nop    '0'    ')'    nop    nop     O
+  012   '-'    '_'    us     us     '-'    '_'    us     us      O
+  013   '='    '+'    nop    nop    '='    '+'    nop    nop     O
+  014   bs     bs     del    del    bs     bs     del    del     O
+  015   ht     btab   nop    nop    ht     btab   nop    nop     O
+  016   'q'    'Q'    dc1    dc1    'q'    'Q'    dc1    dc1     C
+  017   'w'    'W'    etb    etb    'w'    'W'    etb    etb     C
+  018   'e'    'E'    enq    enq    'e'    'E'    enq    enq     C
+  019   'r'    'R'    dc2    dc2    'r'    'R'    dc2    dc2     C
+  020   't'    'T'    dc4    dc4    't'    'T'    dc4    dc4     C
+  021   'y'    'Y'    em     em     'y'    'Y'    em     em      C
+  022   'u'    'U'    nak    nak    'u'    'U'    nak    nak     C
+  023   'i'    'I'    ht     ht     'i'    'I'    ht     ht      C
+  024   'o'    'O'    si     si     'o'    'O'    si     si      C
+  025   'p'    'P'    dle    dle    'p'    'P'    dle    dle     C
+  026   '['    '{'    esc    esc    '['    '{'    esc    esc     O
+  027   ']'    '}'    gs     gs     ']'    '}'    gs     gs      O
+  028   cr     cr     nl     nl     cr     cr     nl     nl      O
+  029   lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl   O
+  030   'a'    'A'    soh    soh    'a'    'A'    soh    soh     C
+  031   's'    'S'    dc3    dc3    's'    'S'    dc3    dc3     C
+  032   'd'    'D'    eot    eot    'd'    'D'    eot    eot     C
+  033   'f'    'F'    ack    ack    'f'    'F'    ack    ack     C
+  034   'g'    'G'    bel    bel    'g'    'G'    bel    bel     C
+  035   'h'    'H'    bs     bs     'h'    'H'    bs     bs      C
+  036   'j'    'J'    nl     nl     'j'    'J'    nl     nl      C
+  037   'k'    'K'    vt     vt     'k'    'K'    vt     vt      C
+  038   'l'    'L'    ff     ff     'l'    'L'    ff     ff      C
+  039   ';'    ':'    nop    nop    ';'    ':'    nop    nop     O
+  040   '''    '"'    nop    nop    '''    '"'    nop    nop     O
+  041   '`'    '~'    nop    nop    '`'    '~'    nop    nop     O
+  042   lshift lshift lshift lshift lshift lshift lshift lshift  O
+  043   '\'    '|'    fs     fs     '\'    '|'    fs     fs      O
+  044   'z'    'Z'    sub    sub    'z'    'Z'    sub    sub     C
+  045   'x'    'X'    can    can    'x'    'X'    can    can     C
+  046   'c'    'C'    etx    etx    'c'    'C'    etx    etx     C
+  047   'v'    'V'    syn    syn    'v'    'V'    syn    syn     C
+  048   'b'    'B'    stx    stx    'b'    'B'    stx    stx     C
+  049   'n'    'N'    so     so     'n'    'N'    so     so      C
+  050   'm'    'M'    cr     cr     'm'    'M'    cr     cr      C
+  051   ','    '<'    nop    nop    ','    '<'    nop    nop     O
+  052   '.'    '>'    nop    nop    '.'    '>'    nop    nop     O
+  053   '/'    '?'    nop    nop    '/'    '?'    nop    nop     O
+  054   rshift rshift rshift rshift rshift rshift rshift rshift  O
+  055   '*'    '*'    '*'    '*'    '*'    '*'    '*'    '*'     O
+  056   lalt   lalt   lalt   lalt   lalt   lalt   lalt   lalt    O
+  057   ' '    ' '    nul    ' '    ' '    ' '    susp   ' '     O
+  058   alock  clock  clock  clock  clock  clock  clock  clock   O
+  059   fkey01 fkey13 fkey25 fkey37 scr01  scr11  scr01  scr11   O
+  060   fkey02 fkey14 fkey26 fkey38 scr02  scr12  scr02  scr12   O
+  061   fkey03 fkey15 fkey27 fkey39 scr03  scr13  scr03  scr13   O
+  062   fkey04 fkey16 fkey28 fkey40 scr04  scr14  scr04  scr14   O
+  063   fkey05 fkey17 fkey29 fkey41 scr05  scr15  scr05  scr15   O
+  064   fkey06 fkey18 fkey30 fkey42 scr06  scr16  scr06  scr16   O
+  065   fkey07 fkey19 fkey31 fkey43 scr07  scr07  scr07  scr07   O
+  066   fkey08 fkey20 fkey32 fkey44 scr08  scr08  scr08  scr08   O
+  067   fkey09 fkey21 fkey33 fkey45 scr09  scr09  scr09  scr09   O
+  068   fkey10 fkey22 fkey34 fkey46 scr10  scr10  scr10  scr10   O
+  069   nlock  nlock  nlock  nlock  nlock  nlock  nlock  nlock   O
+  070   slock  slock  slock  slock  slock  slock  slock  slock   O
+  071   fkey49 '7'    '7'    '7'    '7'    '7'    '7'    '7'     N
+  072   fkey50 '8'    '8'    '8'    '8'    '8'    '8'    '8'     N
+  073   fkey51 '9'    '9'    '9'    '9'    '9'    '9'    '9'     N
+  074   fkey52 '-'    '-'    '-'    '-'    '-'    '-'    '-'     N
+  075   fkey53 '4'    '4'    '4'    '4'    '4'    '4'    '4'     N
+  076   fkey54 '5'    '5'    '5'    '5'    '5'    '5'    '5'     N
+  077   fkey55 '6'    '6'    '6'    '6'    '6'    '6'    '6'     N
+  078   fkey56 '+'    '+'    '+'    '+'    '+'    '+'    '+'     N
+  079   fkey57 '1'    '1'    '1'    '1'    '1'    '1'    '1'     N
+  080   fkey58 '2'    '2'    '2'    '2'    '2'    '2'    '2'     N
+  081   fkey59 '3'    '3'    '3'    '3'    '3'    '3'    '3'     N
+  082   fkey60 '0'    '0'    '0'    '0'    '0'    '0'    '0'     N
+  083   del    '.'    '.'    '.'    '.'    '.'    boot   boot    N
+  084   alock  alock  alock  alock  alock  alock  alock  alock   O
+  085   nop    nop    nop    nop    nop    nop    nop    nop     O
+  086   nop    nop    nop    nop    nop    nop    nop    nop     O
+  087   fkey11 fkey23 fkey35 fkey47 scr11  scr11  scr11  scr11   O
+  088   fkey12 fkey24 fkey36 fkey48 scr12  scr12  scr12  scr12   O
+  089   cr     cr     nl     nl     cr     cr     nl     nl      O
+  090   rctrl  rctrl  rctrl  rctrl  rctrl  rctrl  rctrl  rctrl   O
+  091   '/'    '/'    '/'    '/'    '/'    '/'    '/'    '/'     N
+  092   nscr   nscr   debug  debug  nop    nop    nop    nop     O
+  093   ralt   ralt   ralt   ralt   ralt   ralt   ralt   ralt    O
+  094   fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49  O
+  095   fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50  O
+  096   fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51  O
+  097   fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53  O
+  098   fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55  O
+  099   fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57  O
+  100   fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58  O
+  101   fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59  O
+  102   fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60  O
+  103   fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot   fkey61  O
+  104   slock  saver  slock  saver  susp   nop    susp   nop     O
+  105   fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62  O
+  106   fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63  O
+  107   fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64  O
+  108   nop    nop    nop    nop    nop    nop    nop    nop     O
+
+  128   nop    nop    nop    nop    nop    nop    nop    nop     O
+  129   esc    esc    esc    esc    esc    esc    debug  esc     O
+  130   '1'    '!'    nop    nop    '1'    '!'    nop    nop     O
+  131   '2'    '"'    nul    nul    '2'    '@'    nul    nul     O
+  132   '3'    0x2116 nop    nop    '3'    '#'    nop    nop     O
+  133   '4'    ';'    nop    nop    '4'    ';'    nop    nop     O
+  134   '5'    '%'    nop    nop    '5'    '%'    nop    nop     O
+  135   '6'    ':'    rs     rs     '6'    '^'    rs     rs      O
+  136   '7'    '?'    nop    nop    '7'    '&'    nop    nop     O
+  137   '8'    '*'    nop    nop    '8'    '*'    nop    nop     O
+  138   '9'    '('    nop    nop    '9'    '('    nop    nop     O
+  139   '0'    ')'    nop    nop    '0'    ')'    nop    nop     O
+  140   '-'    '_'    us     us     '-'    '_'    us     us      O
+  141   '='    '+'    nop    nop    '='    '+'    nop    nop     O
+  142   bs     bs     del    del    bs     bs     del    del     O
+  143   ht     btab   nop    nop    ht     btab   nop    nop     O
+  144   0x0439 0x0419 dc1    dc1    'q'    'Q'    dc1    dc1     C
+  145   0x0446 0x0426 etb    etb    'w'    'W'    etb    etb     C
+  146   0x0443 0x0423 enq    enq    'e'    'E'    enq    enq     C
+  147   0x043a 0x041a dc2    dc2    'r'    'R'    dc2    dc2     C
+  148   0x0435 0x0415 dc4    dc4    't'    'T'    dc4    dc4     C
+  149   0x043d 0x041d em     em     'y'    'Y'    em     em      C
+  150   0x0433 0x0413 nak    nak    'u'    'U'    nak    nak     C
+  151   0x0448 0x0428 ht     ht     'i'    'I'    ht     ht      C
+  152   0x045e 0x040e si     si     'o'    'O'    si     si      C
+  153   0x0437 0x0417 dle    dle    'p'    'P'    dle    dle     C
+  154   0x0445 0x0425 esc    esc    '['    '{'    esc    esc     C
+  155   '''    '''    gs     gs     ']'    '}'    gs     gs      O
+  156   cr     cr     nl     nl     cr     cr     nl     nl      O
+  157   lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl   O
+  158   0x0444 0x0424 soh    soh    'a'    'A'    soh    soh     C
+  159   0x044b 0x042b dc3    dc3    's'    'S'    dc3    dc3     C
+  160   0x0432 0x0412 eot    eot    'd'    'D'    eot    eot     C
+  161   0x0430 0x0410 ack    ack    'f'    'F'    ack    ack     C
+  162   0x043f 0x041f bel    bel    'g'    'G'    bel    bel     C
+  163   0x0440 0x0420 bs     bs     'h'    'H'    bs     bs      C
+  164   0x043e 0x041e nl     nl     'j'    'J'    nl     nl      C
+  165   0x043b 0x041b vt     vt     'k'    'K'    vt     vt      C
+  166   0x0434 0x0414 ff     ff     'l'    'L'    ff     ff      C
+  167   0x0436 0x0416 nop    nop    ';'    ':'    nop    nop     C
+  168   0x044d 0x042d nop    nop    '''    '"'    nop    nop     C
+  169   0x0451 0x0401 nop    nop    '`'    '~'    nop    nop     C
+  170   lshift lshift lshift lshift lshift lshift lshift lshift  O
+  171   '\'    '|'    fs     fs     '\'    '|'    fs     fs      O
+  172   0x044f 0x042f sub    sub    'z'    'Z'    sub    sub     C
+  173   0x0447 0x0427 can    can    'x'    'X'    can    can     C
+  174   0x0441 0x0421 etx    etx    'c'    'C'    etx    etx     C
+  175   0x043c 0x041c syn    syn    'v'    'V'    syn    syn     C
+  176   0x0456 0x0406 stx    stx    'b'    'B'    stx    stx     C
+  177   0x0442 0x0422 so     so     'n'    'N'    so     so      C
+  178   0x044c 0x042c cr     cr     'm'    'M'    cr     cr      C
+  179   0x0431 0x0411 nop    nop    ','    '<'    nop    nop     C
+  180   0x044e 0x042e nop    nop    '.'    '>'    nop    nop     C
+  181   '.'    ','    nop    nop    '/'    '?'    nop    nop     O
+  182   rshift rshift rshift rshift rshift rshift rshift rshift  O
+  183   '*'    '*'    '*'    '*'    '*'    '*'    '*'    '*'     O
+  184   lalt   lalt   lalt   lalt   lalt   lalt   lalt   lalt    O
+  185   ' '    ' '    nul    ' '    ' '    ' '    susp   ' '     O
+  186   alock  clock  clock  clock  clock  clock  clock  clock   O
+  187   fkey01 fkey13 fkey25 fkey37 scr01  scr11  scr01  scr11   O
+  188   fkey02 fkey14 fkey26 fkey38 scr02  scr12  scr02  scr12   O
+  189   fkey03 fkey15 fkey27 fkey39 scr03  scr13  scr03  scr13   O
+  190   fkey04 fkey16 fkey28 fkey40 scr04  scr14  scr04  scr14   O
+  191   fkey05 fkey17 fkey29 fkey41 scr05  scr15  scr05  scr15   O
+  192   fkey06 fkey18 fkey30 fkey42 scr06  scr16  scr06  scr16   O
+  193   fkey07 fkey19 fkey31 fkey43 scr07  scr07  scr07  scr07   O
+  194   fkey08 fkey20 fkey32 fkey44 scr08  scr08  scr08  scr08   O
+  195   fkey09 fkey21 fkey33 fkey45 scr09  scr09  scr09  scr09   O
+  196   fkey10 fkey22 fkey34 fkey46 scr10  scr10  scr10  scr10   O
+  197   nlock  nlock  nlock  nlock  nlock  nlock  nlock  nlock   O
+  198   slock  slock  slock  slock  slock  slock  slock  slock   O
+  199   fkey49 '7'    '7'    '7'    '7'    '7'    '7'    '7'     N
+  200   fkey50 '8'    '8'    '8'    '8'    '8'    '8'    '8'     N
+  201   fkey51 '9'    '9'    '9'    '9'    '9'    '9'    '9'     N
+  202   fkey52 '-'    '-'    '-'    '-'    '-'    '-'    '-'     N
+  203   fkey53 '4'    '4'    '4'    '4'    '4'    '4'    '4'     N
+  204   fkey54 '5'    '5'    '5'    '5'    '5'    '5'    '5'     N
+  205   fkey55 '6'    '6'    '6'    '6'    '6'    '6'    '6'     N
+  206   fkey56 '+'    '+'    '+'    '+'    '+'    '+'    '+'     N
+  207   fkey57 '1'    '1'    '1'    '1'    '1'    '1'    '1'     N
+  208   fkey58 '2'    '2'    '2'    '2'    '2'    '2'    '2'     N
+  209   fkey59 '3'    '3'    '3'    '3'    '3'    '3'    '3'     N
+  210   fkey60 '0'    '0'    '0'    '0'    '0'    '0'    '0'     N
+  211   del    '.'    '.'    '.'    '.'    '.'    boot   boot    N
+  212   alock  alock  alock  alock  alock  alock  alock  alock   O
+  213   nop    nop    nop    nop    nop    nop    nop    nop     O
+  214   nop    nop    nop    nop    nop    nop    nop    nop     O
+  215   fkey11 fkey23 fkey35 fkey47 scr11  scr11  scr11  scr11   O
+  216   fkey12 fkey24 fkey36 fkey48 scr12  scr12  scr12  scr12   O
+  217   cr     cr     nl     nl     cr     cr     nl     nl      O
+  218   rctrl  rctrl  rctrl  rctrl  rctrl  rctrl  rctrl  rctrl   O
+  219   '/'    '/'    '/'    '/'    '/'    '/'    '/'    '/'     N
+  220   nscr   nscr   debug  debug  nop    nop    nop    nop     O
+  221   ralt   ralt   ralt   ralt   ralt   ralt   ralt   ralt    O
+  222   fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49  O
+  223   fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50  O
+  224   fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51  O
+  225   fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53  O
+  226   fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55  O
+  227   fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57  O
+  228   fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58  O
+  229   fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59  O
+  230   fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60  O
+  231   fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot   fkey61  O
+  232   slock  saver  slock  saver  susp   nop    susp   nop     O
+  233   fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62  O
+  234   fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63  O
+  235   fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64  O
+  236   nop    nop    nop    nop    nop    nop    nop    nop     O
diff --git a/share/vt/keymaps/ch.acc.kbd b/share/vt/keymaps/ch.acc.kbd
index a1984ed..6791199 100644
--- a/share/vt/keymaps/ch.acc.kbd
+++ b/share/vt/keymaps/ch.acc.kbd
@@ -14,7 +14,7 @@
   005   '4'    0xe7   nop    nop    '4'    0xe7   nop    nop     O
   006   '5'    '%'    nop    nop    '5'    '%'    nop    nop     O
   007   '6'    '&'    nop    nop    0xac   0xac   nop    nop     O
-  008   '7'    '/'    nop    nop    0x0160 0x0160 nop    nop     O
+  008   '7'    '/'    nop    nop    0xa6   0xa6   nop    nop     O
   009   '8'    '('    esc    esc    0xde   0xde   esc    esc     O
   010   '9'    ')'    gs     gs     '9'    ')'    gs     gs      O
   011   '0'    '='    nop    nop    '0'    '='    nop    nop     O
diff --git a/share/vt/keymaps/ch.kbd b/share/vt/keymaps/ch.kbd
index 00bcb35..a39dc59 100644
--- a/share/vt/keymaps/ch.kbd
+++ b/share/vt/keymaps/ch.kbd
@@ -14,7 +14,7 @@
   005   '4'    0xe7   nop    nop    '4'    0xe7   nop    nop     O
   006   '5'    '%'    nop    nop    '5'    '%'    nop    nop     O
   007   '6'    '&'    nop    nop    0xac   0xac   nop    nop     O
-  008   '7'    '/'    nop    nop    0x0160 0x0160 nop    nop     O
+  008   '7'    '/'    nop    nop    0xa6   0xa6   nop    nop     O
   009   '8'    '('    esc    esc    0xde   0xde   esc    esc     O
   010   '9'    ')'    gs     gs     '9'    ')'    gs     gs      O
   011   '0'    '='    nop    nop    '0'    '='    nop    nop     O
@@ -33,7 +33,7 @@
   024   'o'    'O'    si     si     'o'    'O'    si     si      C
   025   'p'    'P'    dle    dle    'p'    'P'    dle    dle     C
   026   0xfc   0xe8   esc    esc    '['    0xdc   esc    esc     C
-  027   0x0161 '!'    gs     gs     ']'    ']'    gs     gs      O
+  027   0xa8   '!'    gs     gs     ']'    ']'    gs     gs      O
   028   cr     cr     nl     nl     cr     cr     nl     nl      O
   029   lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl   O
   030   'a'    'A'    soh    soh    'a'    'A'    soh    soh     C
diff --git a/share/vt/keymaps/cz.kbd b/share/vt/keymaps/cz.kbd
index 5fc2712..94ca39c 100644
--- a/share/vt/keymaps/cz.kbd
+++ b/share/vt/keymaps/cz.kbd
@@ -1,5 +1,5 @@
 # Czech Standard Typewriter QWERTZ Keyboard
-# by Rudolf Cejka <cejkar@dcse.fee.vutbr.cz>
+# by Rudolf Cejka <cejkar@fit.vutbr.cz>
 #
 # $FreeBSD$
 #
diff --git a/share/vt/keymaps/hr.kbd b/share/vt/keymaps/hr.kbd
index a8bff9c..69aa304 100644
--- a/share/vt/keymaps/hr.kbd
+++ b/share/vt/keymaps/hr.kbd
@@ -9,17 +9,17 @@
   000   nop    nop    nop    nop    nop    nop    nop    nop     O
   001   esc    esc    esc    esc    esc    esc    debug  esc     O
   002   '1'    '!'    nop    nop    '~'    '~'    nop    nop     O
-  003   '2'    '"'    nul    nul    183    183    nul    nul     O
+  003   '2'    '"'    nul    nul    0x02c7 0x02c7 nul    nul     O
   004   '3'    '#'    nop    nop    '^'    '^'    nop    nop     O
-  005   '4'    '$'    nop    nop    162    162    nop    nop     O
-  006   '5'    '%'    nop    nop    176    176    nop    nop     O
-  007   '6'    '&'    rs     rs     178    178    rs     rs      O
+  005   '4'    '$'    nop    nop    0x02d8 0x02d8 nop    nop     O
+  006   '5'    '%'    nop    nop    0xb0   0xb0   nop    nop     O
+  007   '6'    '&'    rs     rs     0x02db 0x02db rs     rs      O
   008   '7'    '/'    nop    nop    '`'    '`'    nop    nop     O
-  009   '8'    '('    nop    nop    255    255    nop    nop     O
+  009   '8'    '('    nop    nop    0x02d9 0x02d9 nop    nop     O
   010   '9'    ')'    nop    nop    '''    '''    nop    nop     O
-  011   '0'    '='    nop    nop    189    189    nop    nop     O
-  012   '''    '?'    us     us     168    168    us     us      O
-  013   '+'    '*'    nop    nop    184    184    nop    nop     O
+  011   '0'    '='    nop    nop    0x02dd 0x02dd nop    nop     O
+  012   '''    '?'    us     us     0xa8   0xa8   us     us      O
+  013   '+'    '*'    nop    nop    0xb8   0xb8   nop    nop     O
   014   bs     bs     del    del    bs     bs     del    del     O
   015   ht     btab   nop    nop    ht     btab   nop    nop     O
   016   'q'    'Q'    dc1    dc1    '\'    '\'    dc1    dc1     C
@@ -32,8 +32,8 @@
   023   'i'    'I'    ht     ht     'i'    'I'    ht     ht      C
   024   'o'    'O'    si     si     'o'    'O'    si     si      C
   025   'p'    'P'    dle    dle    'p'    'P'    dle    dle     C
-  026   185    169    esc    esc    247    247    esc    esc     C
-  027   240    208    gs     gs     215    215    gs     gs      C
+  026   0x0161 0x0160 esc    esc    0xf7   0xf7   esc    esc     C
+  027   0x0111 0x0110 gs     gs     0xd7   0xd7   gs     gs      C
   028   cr     cr     nl     nl     cr     cr     nl     nl      O
   029   lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl   O
   030   'a'    'A'    soh    soh    'a'    'A'    soh    soh     C
@@ -43,20 +43,20 @@
   034   'g'    'G'    bel    bel    ']'    ']'    bel    bel     C
   035   'h'    'H'    bs     bs     'h'    'H'    bs     bs      C
   036   'j'    'J'    nl     nl     'j'    'J'    nl     nl      C
-  037   'k'    'K'    vt     vt     179    179    vt     vt      C
-  038   'l'    'L'    ff     ff     163    163    ff     ff      C
-  039   232    200    nop    nop    232    200    nop    nop     C
-  040   230    198    nop    nop    223    223    nop    nop     C
-  041   184    168    nop    nop    184    168    nop    nop     O
+  037   'k'    'K'    vt     vt     0x0142 0x0142 vt     vt      C
+  038   'l'    'L'    ff     ff     0x0141 0x0141 ff     ff      C
+  039   0x010d 0x010c nop    nop    0x010d 0x010c nop    nop     C
+  040   0x0107 0x0106 nop    nop    0xdf   0xdf   nop    nop     C
+  041   0xb8   0xa8   nop    nop    0xb8   0xa8   nop    nop     O
   042   lshift lshift lshift lshift lshift lshift lshift lshift  O
-  043   190    174    fs     fs     8364   8364   fs     fs      C
+  043   0x017e 0x017d fs     fs     0xa4   0xa4   fs     fs      C
   044   'y'    'Y'    em     em     'y'    'Y'    em     em      C
   045   'x'    'X'    can    can    'x'    'X'    can    can     C
   046   'c'    'C'    etx    etx    'c'    'C'    etx    etx     C
   047   'v'    'V'    syn    syn    '@'    '@'    syn    syn     C
   048   'b'    'B'    stx    stx    '{'    '{'    stx    stx     C
   049   'n'    'N'    so     so     '}'    '}'    so     so      C
-  050   'm'    'M'    cr     cr     167    167    cr     cr      C
+  050   'm'    'M'    cr     cr     0xa7   0xa7   cr     cr      C
   051   ','    ';'    nop    nop    '<'    ';'    '<'    nop     O
   052   '.'    ':'    nop    nop    '>'    ':'    '>'    nop     O
   053   '-'    '_'    nop    nop    '-'    '_'    nop    nop     O
@@ -109,7 +109,7 @@
   100   fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58  O
   101   fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59  O
   102   fkey60 paste  fkey60 fkey60 fkey60 fkey60 fkey60 fkey60  O
-  103	fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot   fkey61  O
+  103   fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot   fkey61  O
   104   slock  saver  slock  saver  susp   nop    susp   nop     O
   105   fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62  O
   106   fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63  O
diff --git a/share/vt/keymaps/jp.capsctrl.kbd b/share/vt/keymaps/jp.capsctrl.kbd
index cca3a9e..294d531 100644
--- a/share/vt/keymaps/jp.capsctrl.kbd
+++ b/share/vt/keymaps/jp.capsctrl.kbd
@@ -117,4 +117,4 @@
   115   '\'    '_'    fs     us     '\'    '_'    fs     us      O
   121   ' '    ' '    nul    ' '    ' '    ' '    susp   ' '     O
   123   ' '    ' '    nul    ' '    ' '    ' '    susp   ' '     O
-  125   '\'    '|'    fs     fs     '\'    '|'    fs     fs      O
+  125   0xa5   '|'    fs     us     0xa5   '|'    fs     us      O
diff --git a/share/vt/keymaps/jp.kbd b/share/vt/keymaps/jp.kbd
index c12fbf5..1fbff5d 100644
--- a/share/vt/keymaps/jp.kbd
+++ b/share/vt/keymaps/jp.kbd
@@ -115,4 +115,4 @@
   115   '\'    '_'    fs     us     '\'    '_'    fs     us      O
   121   ' '    ' '    nul    ' '    ' '    ' '    susp   ' '     O
   123   ' '    ' '    nul    ' '    ' '    ' '    susp   ' '     O
-  125   '\'    '|'    fs     fs     '\'    '|'    fs     fs      O
+  125   0xa5   '|'    fs     us     0xa5   '|'    fs     us      O
diff --git a/share/vt/keymaps/si.kbd b/share/vt/keymaps/si.kbd
index 174a202..f20ba2c 100644
--- a/share/vt/keymaps/si.kbd
+++ b/share/vt/keymaps/si.kbd
@@ -9,15 +9,15 @@
   000   nop    nop    nop    nop    nop    nop    nop    nop     O
   001   esc    esc    esc    esc    esc    esc    debug  esc     O
   002   '1'    '!'    nop    nop    '~'    '~'    nop    nop     O
-  003   '2'    '"'    nul    nul    0xb7   0xb7   nul    nul     O
+  003   '2'    '"'    nul    nul    0x02c7 0x02c7 nul    nul     O
   004   '3'    '#'    nop    nop    '^'    '^'    nop    nop     O
-  005   '4'    '$'    nop    nop    0xa2   0xa2   nop    nop     O
+  005   '4'    '$'    nop    nop    0x02d8 0x02d8 nop    nop     O
   006   '5'    '%'    nop    nop    0xb0   0xb0   nop    nop     O
-  007   '6'    '&'    rs     rs     0xb2   0xb2   rs     rs      O
+  007   '6'    '&'    rs     rs     0x02db 0x02db rs     rs      O
   008   '7'    '/'    nop    nop    '`'    '`'    nop    nop     O
-  009   '8'    '('    nop    nop    0xff   0xff   nop    nop     O
+  009   '8'    '('    nop    nop    0x02d9 0x02d9 nop    nop     O
   010   '9'    ')'    nop    nop    '''    '''    nop    nop     O
-  011   '0'    '='    nop    nop    0x0266 0x0266 nop    nop     O
+  011   '0'    '='    nop    nop    0x02dd 0x02dd nop    nop     O
   012   '''    '?'    us     us     0xa8   0xa8   us     us      O
   013   '+'    '*'    nop    nop    0xb8   0xb8   nop    nop     O
   014   bs     bs     del    del    bs     bs     del    del     O
@@ -32,8 +32,8 @@
   023   'i'    'I'    ht     ht     'i'    'I'    ht     ht      C
   024   'o'    'O'    si     si     'o'    'O'    si     si      C
   025   'p'    'P'    dle    dle    'p'    'P'    dle    dle     C
-  026   0xb9   0xa9   esc    esc    0xf7   0xf7   esc    esc     C
-  027   0xf0   0xd0   gs     gs     0xd7   0xd7   gs     gs      C
+  026   0x0161 0x0160 esc    esc    0xf7   0xf7   esc    esc     C
+  027   0x0111 0x0110 gs     gs     0xd7   0xd7   gs     gs      C
   028   cr     cr     nl     nl     cr     cr     nl     nl      O
   029   lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl   O
   030   'a'    'A'    soh    soh    'a'    'A'    soh    soh     C
@@ -43,13 +43,13 @@
   034   'g'    'G'    bel    bel    ']'    ']'    bel    bel     C
   035   'h'    'H'    bs     bs     'h'    'H'    bs     bs      C
   036   'j'    'J'    nl     nl     'j'    'J'    nl     nl      C
-  037   'k'    'K'    vt     vt     0xb3   0xb3   vt     vt      C
-  038   'l'    'L'    ff     ff     0xa3   0xa3   ff     ff      C
-  039   0xe8   0xc8   nop    nop    0xe8   0xc8   nop    nop     C
-  040   0xe6   0xc6   nop    nop    0xdf   0xdf   nop    nop     C
+  037   'k'    'K'    vt     vt     0x0142 0x0142 vt     vt      C
+  038   'l'    'L'    ff     ff     0x0141 0x0141 ff     ff      C
+  039   0x010d 0x010c nop    nop    0x010d 0x010c nop    nop     C
+  040   0x0107 0x0106 nop    nop    0xdf   0xdf   nop    nop     C
   041   0xb8   0xa8   nop    nop    0xb8   0xa8   nop    nop     O
   042   lshift lshift lshift lshift lshift lshift lshift lshift  O
-  043   0x017e 0x017d  fs     fs     0xa4   0xa4   fs     fs      C
+  043   0x017e 0x017d fs     fs     0xa4   0xa4   fs     fs      C
   044   'y'    'Y'    em     em     'y'    'Y'    em     em      C
   045   'x'    'X'    can    can    'x'    'X'    can    can     C
   046   'c'    'C'    etx    etx    'c'    'C'    etx    etx     C
diff --git a/share/vt/keymaps/uk.capsctrl.kbd b/share/vt/keymaps/uk.capsctrl.kbd
index 3f7c788..d91b71c 100644
--- a/share/vt/keymaps/uk.capsctrl.kbd
+++ b/share/vt/keymaps/uk.capsctrl.kbd
@@ -46,7 +46,7 @@
   040   '''    '@'    nul    nul    '''    '@'    nul    nul     O
   041   '`'    0xac   nop    nop    '|'    '|'    nop    nop     O
   042   lshift lshift lshift lshift lshift lshift lshift lshift  O
-  043   '#'    '~'    nop    nop    '~'    '~'    nop    nop     O
+  043   '#'    '~'    nop    nop    '#'    '~'    nop    nop     O
   044   'z'    'Z'    sub    sub    'z'    'Z'    sub    sub     C
   045   'x'    'X'    can    can    'x'    'X'    can    can     C
   046   'c'    'C'    etx    etx    'c'    'C'    etx    etx     C