svn commit: r270229 - head/share/vt/keymaps

Stefan Esser se at FreeBSD.org
Wed Aug 20 17:00:54 UTC 2014


Author: se
Date: Wed Aug 20 17:00:47 2014
New Revision: 270229
URL: http://svnweb.freebsd.org/changeset/base/270229

Log:
  Another rpund of fixes, after checking keymaps for plausibility and with
  several updates to the converter tools. There is now support for hybrid
  source keymaps, which e.g. use ISO8859-1 (not -15) but still provide an
  Euro key (on the "E" key). ISO8859-1 currency symbols on other keys are
  still converted to that character, not the Euro sign. A similar hack was
  applied to the Japanese keyboards to add the Yen key, that could not be
  expressed in SYSCONS.
  
  Several modifications have been applied after the conversion (removal of
  unused accents tables, some reformatting, exchange of a few key symbols).
  
  The German keymap (de.kbd) is now using deadkeys only for those keys,
  that behave that way under Windows. There are now ".acc" and ".noacc"
  variants, which use deadkeys vs. nodeadkeys for all accent keys.
  
  I'm still in the process of comparing keymaps that existed in different
  encodings in SYSCONS. These are generally translated slightly differently,
  either because of mistakes, or because of different preferences, or due
  to limitations of the respective encoding.
  
  MFC after:	3 days

Added:
  head/share/vt/keymaps/centraleuropean.qwerty.kbd
     - copied, changed from r270200, head/share/vt/keymaps/centraleuropean.kbd
  head/share/vt/keymaps/de.noacc.kbd
     - copied, changed from r270210, head/share/vt/keymaps/de.kbd
Replaced:
  head/share/vt/keymaps/de.kbd
     - copied, changed from r270200, head/share/vt/keymaps/de.acc.kbd
Modified:
  head/share/vt/keymaps/INDEX.keymaps
  head/share/vt/keymaps/Makefile
  head/share/vt/keymaps/am.kbd
  head/share/vt/keymaps/be.acc.kbd
  head/share/vt/keymaps/ca-fr.kbd
  head/share/vt/keymaps/centraleuropean.kbd
  head/share/vt/keymaps/ch-fr.acc.kbd
  head/share/vt/keymaps/ch-fr.kbd
  head/share/vt/keymaps/de.acc.kbd
  head/share/vt/keymaps/dk.acc.kbd
  head/share/vt/keymaps/dk.kbd
  head/share/vt/keymaps/dk.macbook.kbd
  head/share/vt/keymaps/es.dvorak.kbd
  head/share/vt/keymaps/fi.kbd
  head/share/vt/keymaps/fr.acc.kbd
  head/share/vt/keymaps/fr.dvorak.acc.kbd
  head/share/vt/keymaps/fr.dvorak.kbd
  head/share/vt/keymaps/fr.macbook.kbd
  head/share/vt/keymaps/is.kbd
  head/share/vt/keymaps/it.kbd
  head/share/vt/keymaps/jp.pc98.iso.kbd
  head/share/vt/keymaps/jp.pc98.kbd
  head/share/vt/keymaps/no.dvorak.kbd
  head/share/vt/keymaps/no.kbd
  head/share/vt/keymaps/nordic.asus-eee.kbd
  head/share/vt/keymaps/se.kbd
  head/share/vt/keymaps/uk.capsctrl.kbd
  head/share/vt/keymaps/uk.kbd
  head/share/vt/keymaps/us.acc.kbd

Modified: head/share/vt/keymaps/INDEX.keymaps
==============================================================================
--- head/share/vt/keymaps/INDEX.keymaps	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/INDEX.keymaps	Wed Aug 20 17:00:47 2014	(r270229)
@@ -77,6 +77,11 @@ centraleuropean.kbd:de:Zentral Europäis
 centraleuropean.kbd:fr:Centre européen
 centraleuropean.kbd:es:Centroeuropeo
 
+centraleuropean.qwerty.kbd:en:Central European (QWERTY)
+centraleuropean.qwerty.kbd:de:Zentral Europäisch (QWERTY)
+centraleuropean.qwerty.kbd:fr:Centre européen (QWERTY)
+centraleuropean.qwerty.kbd:es:Centroeuropeo (QWERTY)
+
 colemak.kbd:en:Colemak ergonomic alternative
 
 cz.kbd:en:Czech (QWERTZ, accent keys)
@@ -89,6 +94,11 @@ cz.kbd.from-ce:de:Tschechisch
 cz.kbd.from-ce:fr:Tchèque
 cz.kbd.from-ce:es:Checo
 
+cz.qwerty.kbd.from-ce:en:Czech (QWERTY)
+cz.qwerty.kbd.from-ce:de:Tschechisch (QWERTY)
+cz.qwerty.kbd.from-ce:fr:Tchèquey (QWERTY)
+cz.qwerty.kbd.from-ce:es:Checo (QWERTY)
+
 dk.kbd:en:Danish
 dk.kbd:da:Dansk
 dk.kbd:de:Dänisch
@@ -208,6 +218,13 @@ de.acc.kbd:pt:Alemão (com acentos)
 de.acc.kbd:es:Alemán (con acentos)
 de.acc.kbd:uk:Німецька (accent keys)
 
+de.noacc.kbd:en:German (no accent keys)
+de.noacc.kbd:de:Deutsch (ohne Akzente)
+de.noacc.kbd:fr:Allemand (sans accents)
+de.noacc.kbd:pt:Alemão (no accent keys)
+de.noacc.kbd:es:Alemán (no accent keys)
+de.noacc.kbd:uk:Німецька (no accent keys)
+
 de.kbd.from-cp850:en:German
 de.kbd.from-cp850:de:Deutsch
 de.kbd.from-cp850:fr:Allemand
@@ -501,18 +518,6 @@ uk.capsctrl.kbd:de:Vereinigtes Königrei
 #uk.iso-ctrl.kbd:pt:Reino Unido (caps lock acts as Left Ctrl)
 #uk.iso-ctrl.kbd:es:Británico (caps lock acts as Left Ctrl)
 
-uk.kbd.from-cp850:en:United Kingdom
-uk.kbd.from-cp850:de:Vereinigtes Königreich
-uk.kbd.from-cp850:fr:Royaume Uni
-uk.kbd.from-cp850:pt:Reino Unido
-uk.kbd.from-cp850:es:Británico
-
-uk.capsctrl.kbd.from-cp850:en:United Kingdom (Caps Lock acts as Left Ctrl)
-uk.kbd.from-cp850:de:Vereinigtes Königreich (Caps Lock als linke Strg)
-#uk.cp850.kbd:fr:Royaume Uni (caps lock acts as Left Ctrl)
-#uk.cp850.kbd:pt:Reino Unido (caps lock acts as Left Ctrl)
-#uk.cp850.kbd:es:Británico (caps lock acts as Left Ctrl)
-
 uk.dvorak.kbd:en:United Kingdom Dvorak
 uk.dvorak.kbd:de:Vereinigtes Königreich Dvorak
 uk.dvorak.kbd:fr:Royaume Uni Dvorak

Modified: head/share/vt/keymaps/Makefile
==============================================================================
--- head/share/vt/keymaps/Makefile	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/Makefile	Wed Aug 20 17:00:47 2014	(r270229)
@@ -8,6 +8,7 @@ FILES=	INDEX.keymaps \
 	ca.kbd \
 	ca-fr.kbd \
 	centraleuropean.kbd \
+	centraleuropean.qwerty.kbd \
 	ch-fr.acc.kbd \
 	ch-fr.kbd \
 	ch.acc.kbd \

Modified: head/share/vt/keymaps/am.kbd
==============================================================================
--- head/share/vt/keymaps/am.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/am.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -10,58 +10,58 @@
 # ------------------------------------------------------------------
   000   nop    nop    nop    nop    nop    nop    nop    nop     O
   001   esc    esc    esc    esc    nop    nop    debug  esc     O
-  002   '1'    '!'    nop    nop    0      0      nop    nop     O
-  003   '2'    '@'    nul    nul    0      0      nul    nul     O
-  004   '3'    '#'    nop    nop    0      0      nop    nop     O
-  005   '4'    '$'    nop    nop    0      0      nop    nop     O
-  006   '5'    '%'    nop    nop    0      0      nop    nop     O
-  007   '6'    '^'    rs     rs     0      0      rs     rs      O
-  008   '7'    '&'    nop    nop    0      '%'    nop    nop     O
-  009   '8'    '*'    nop    nop    0      0      nop    nop     O
-  010   '9'    '('    nop    nop    0      0      nop    nop     O
-  011   '0'    ')'    nop    nop    0      0      nop    nop     O
-  012   '-'    '_'    us     us     0      0      us     us      O
-  013   '='    '+'    nop    nop    0      0      nop    nop     O
+  002   '1'    '!'    nop    nop    0x0567 0x0537 nop    nop     O
+  003   '2'    '@'    nul    nul    0x0569 0x0539 nul    nul     O
+  004   '3'    '#'    nop    nop    0x0583 0x0553 nop    nop     O
+  005   '4'    '$'    nop    nop    0x0571 0x0541 nop    nop     O
+  006   '5'    '%'    nop    nop    0x057b 0x054b nop    nop     O
+  007   '6'    '^'    rs     rs     ')'    '('    rs     rs      O
+  008   '7'    '&'    nop    nop    0x0587 '%'    nop    nop     O
+  009   '8'    '*'    nop    nop    0x057c 0x054c nop    nop     O
+  010   '9'    '('    nop    nop    0x0579 0x0549 nop    nop     O
+  011   '0'    ')'    nop    nop    0x0573 0x0543 nop    nop     O
+  012   '-'    '_'    us     us     0x2014 '-'    us     us      O
+  013   '='    '+'    nop    nop    0x056a 0x053a 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    0      0      dc1    dc1     C
-  017   'w'    'W'    etb    etb    0      0      etb    etb     C
-  018   'e'    'E'    enq    enq    0      0      enq    enq     C
-  019   'r'    'R'    dc2    dc2    0      0      dc2    dc2     C
-  020   't'    'T'    dc4    dc4    0      0      dc4    dc4     C
-  021   'y'    'Y'    em     em     0      0      em     em      C
-  022   'u'    'U'    nak    nak    0      0      nak    nak     C
-  023   'i'    'I'    ht     ht     0      0      ht     ht      C
-  024   'o'    'O'    si     si     0      0      si     si      C
-  025   'p'    'P'    dle    dle    0      0      dle    dle     C
-  026   '['    '{'    esc    esc    0      0      esc    esc     O
-  027   ']'    '}'    gs     gs     0      0      gs     gs      O
+  016   'q'    'Q'    dc1    dc1    0x0584 0x0554 dc1    dc1     C
+  017   'w'    'W'    etb    etb    0x0578 0x0548 etb    etb     C
+  018   'e'    'E'    enq    enq    0x0565 0x0535 enq    enq     C
+  019   'r'    'R'    dc2    dc2    0x0580 0x0550 dc2    dc2     C
+  020   't'    'T'    dc4    dc4    0x057f 0x054f dc4    dc4     C
+  021   'y'    'Y'    em     em     0x0568 0x0538 em     em      C
+  022   'u'    'U'    nak    nak    0x0582 0x0552 nak    nak     C
+  023   'i'    'I'    ht     ht     0x056b 0x053b ht     ht      C
+  024   'o'    'O'    si     si     0x0585 0x0555 si     si      C
+  025   'p'    'P'    dle    dle    0x057a 0x054a dle    dle     C
+  026   '['    '{'    esc    esc    0x056d 0x053d esc    esc     O
+  027   ']'    '}'    gs     gs     0x056e 0x053e gs     gs      O
   028   cr     cr     nl     nl     cr     cr     nl     nl      O
   029   lctrl  lctrl  lctrl  lctrl  lctrl  alock  lctrl  alock   O
-  030   'a'    'A'    soh    soh    0      0      soh    soh     C
-  031   's'    'S'    dc3    dc3    0      0      dc3    dc3     C
-  032   'd'    'D'    eot    eot    0      0      eot    eot     C
-  033   'f'    'F'    ack    ack    0      0      ack    ack     C
-  034   'g'    'G'    bel    bel    0      0      bel    bel     C
-  035   'h'    'H'    bs     bs     0      0      bs     bs      C
-  036   'j'    'J'    nl     nl     0      0      nl     nl      C
-  037   'k'    'K'    vt     vt     0      0      vt     vt      C
-  038   'l'    'L'    ff     ff     0      0      ff     ff      C
-  039   ';'    ':'    nop    nop    0      0      nop    nop     O
-  040   '''    '"'    nop    nop    0      0      nop    nop     O
-  041   '`'    '~'    nop    nop    0      0      nop    nop     O
+  030   'a'    'A'    soh    soh    0x0561 0x0531 soh    soh     C
+  031   's'    'S'    dc3    dc3    0x057d 0x054d dc3    dc3     C
+  032   'd'    'D'    eot    eot    0x0564 0x0534 eot    eot     C
+  033   'f'    'F'    ack    ack    0x0586 0x0556 ack    ack     C
+  034   'g'    'G'    bel    bel    0x0563 0x0533 bel    bel     C
+  035   'h'    'H'    bs     bs     0x0570 0x0540 bs     bs      C
+  036   'j'    'J'    nl     nl     0x0575 0x0545 nl     nl      C
+  037   'k'    'K'    vt     vt     0x056f 0x053f vt     vt      C
+  038   'l'    'L'    ff     ff     0x056c 0x053c ff     ff      C
+  039   ';'    ':'    nop    nop    0x0589 0x2026 nop    nop     O
+  040   '''    '"'    nop    nop    0x055b 0x055a nop    nop     O
+  041   '`'    '~'    nop    nop    0x055d 0x055c nop    nop     O
   042   lshift lshift lshift lshift lshift lshift alock  alock   O
-  043   '\'    '|'    fs     fs     0      0      fs     fs      O
-  044   'z'    'Z'    sub    sub    0      0      sub    sub     C
-  045   'x'    'X'    can    can    0      0      can    can     C
-  046   'c'    'C'    etx    etx    0      0      etx    etx     C
-  047   'v'    'V'    syn    syn    0      0      syn    syn     C
-  048   'b'    'B'    stx    stx    0      0      stx    stx     C
-  049   'n'    'N'    so     so     0      0      so     so      C
-  050   'm'    'M'    cr     cr     0      0      cr     cr      C
-  051   ','    '<'    nop    nop    0      0      nop    nop     O
-  052   '.'    '>'    nop    nop    0      0      nop    nop     O
-  053   '/'    '?'    nop    nop    0      0      nop    nop     O
+  043   '\'    '|'    fs     fs     0x0577 0x0547 fs     fs      O
+  044   'z'    'Z'    sub    sub    0x0566 0x0536 sub    sub     C
+  045   'x'    'X'    can    can    0x0572 0x0542 can    can     C
+  046   'c'    'C'    etx    etx    0x0581 0x0551 etx    etx     C
+  047   'v'    'V'    syn    syn    0x057e 0x054e syn    syn     C
+  048   'b'    'B'    stx    stx    0x0562 0x0532 stx    stx     C
+  049   'n'    'N'    so     so     0x0576 0x0546 so     so      C
+  050   'm'    'M'    cr     cr     0x0574 0x0544 cr     cr      C
+  051   ','    '<'    nop    nop    ','    0xab   nop    nop     O
+  052   '.'    '>'    nop    nop    '.'    0xbb   nop    nop     O
+  053   '/'    '?'    nop    nop    0xe000 0x055e nop    nop     O
   054   rshift rshift rshift rshift rshift rshift rshift rshift  O
   055   '*'    '*'    '*'    '*'    nop    nop    '*'    '*'     O
   056   lalt   lalt   lalt   alock  lalt   lalt   lalt   alock   O
@@ -138,58 +138,58 @@
   127   nop    nop    nop    nop    nop    nop    nop    nop     O
   128   nop    nop    nop    nop    nop    nop    nop    nop     O
   129   nop    nop    esc    esc    esc    esc    debug  esc     O
-  130   0      0      nop    nop    '1'    '!'    nop    nop     O
-  131   0      0      nul    nul    '2'    '@'    nul    nul     O
-  132   0      0      nop    nop    '3'    '#'    nop    nop     O
-  133   0      0      nop    nop    '4'    '$'    nop    nop     O
-  134   0      0      nop    nop    '5'    '%'    nop    nop     O
-  135   0      0      rs     rs     '6'    '^'    rs     rs      O
-  136   0      '%'    nop    nop    '7'    '&'    nop    nop     O
-  137   0      0      nop    nop    '8'    '*'    nop    nop     O
-  138   0      0      nop    nop    '9'    '('    nop    nop     O
-  139   0      0      nop    nop    '0'    ')'    nop    nop     O
-  140   0      0      us     us     '-'    '_'    us     us      O
-  141   0      0      nop    nop    '='    '+'    nop    nop     O
+  130   0x0567 0x0537 nop    nop    '1'    '!'    nop    nop     O
+  131   0x0569 0x0539 nul    nul    '2'    '@'    nul    nul     O
+  132   0x0583 0x0553 nop    nop    '3'    '#'    nop    nop     O
+  133   0x0571 0x0541 nop    nop    '4'    '$'    nop    nop     O
+  134   0x057b 0x054b nop    nop    '5'    '%'    nop    nop     O
+  135   ')'    '('    rs     rs     '6'    '^'    rs     rs      O
+  136   0x0587 '%'    nop    nop    '7'    '&'    nop    nop     O
+  137   0x057c 0x054c nop    nop    '8'    '*'    nop    nop     O
+  138   0x0579 0x0549 nop    nop    '9'    '('    nop    nop     O
+  139   0x0573 0x0543 nop    nop    '0'    ')'    nop    nop     O
+  140   0x2014 '-'    us     us     '-'    '_'    us     us      O
+  141   0x056a 0x053a 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   0      0      dc1    dc1    'q'    'Q'    dc1    dc1     C
-  145   0      0      etb    etb    'w'    'W'    etb    etb     C
-  146   0      0      enq    enq    'e'    'E'    enq    enq     C
-  147   0      0      dc2    dc2    'r'    'R'    dc2    dc2     C
-  148   0      0      dc4    dc4    't'    'T'    dc4    dc4     C
-  149   0      0      em     em     'y'    'Y'    em     em      C
-  150   0      0      nak    nak    'u'    'U'    nak    nak     C
-  151   0      0      ht     ht     'i'    'I'    ht     ht      C
-  152   0      0      si     si     'o'    'O'    si     si      C
-  153   0      0      dle    dle    'p'    'P'    dle    dle     C
-  154   0      0      esc    esc    '['    '{'    esc    esc     O
-  155   0      0      gs     gs     ']'    '}'    gs     gs      O
+  144   0x0584 0x0554 dc1    dc1    'q'    'Q'    dc1    dc1     C
+  145   0x0578 0x0548 etb    etb    'w'    'W'    etb    etb     C
+  146   0x0565 0x0535 enq    enq    'e'    'E'    enq    enq     C
+  147   0x0580 0x0550 dc2    dc2    'r'    'R'    dc2    dc2     C
+  148   0x057f 0x054f dc4    dc4    't'    'T'    dc4    dc4     C
+  149   0x0568 0x0538 em     em     'y'    'Y'    em     em      C
+  150   0x0582 0x0552 nak    nak    'u'    'U'    nak    nak     C
+  151   0x056b 0x053b ht     ht     'i'    'I'    ht     ht      C
+  152   0x0585 0x0555 si     si     'o'    'O'    si     si      C
+  153   0x057a 0x054a dle    dle    'p'    'P'    dle    dle     C
+  154   0x056d 0x053d esc    esc    '['    '{'    esc    esc     O
+  155   0x056e 0x053e gs     gs     ']'    '}'    gs     gs      O
   156   cr     cr     nl     nl     cr     cr     nl     nl      O
   157   lctrl  lctrl  lctrl  lctrl  lctrl  alock  lctrl  alock   O
-  158   0      0      soh    soh    'a'    'A'    soh    soh     C
-  159   0      0      dc3    dc3    's'    'S'    dc3    dc3     C
-  160   0      0      eot    eot    'd'    'D'    eot    eot     C
-  161   0      0      ack    ack    'f'    'F'    ack    ack     C
-  162   0      0      bel    bel    'g'    'G'    bel    bel     C
-  163   0      0      bs     bs     'h'    'H'    bs     bs      C
-  164   0      0      nl     nl     'j'    'J'    nl     nl      C
-  165   0      0      vt     vt     'k'    'K'    vt     vt      C
-  166   0      0      ff     ff     'l'    'L'    ff     ff      C
-  167   0      0      nop    nop    ';'    ':'    nop    nop     O
-  168   0      0      nop    nop    '''    '"'    nop    nop     O
-  169   0      0      nop    nop    '`'    '~'    nop    nop     O
+  158   0x0561 0x0531 soh    soh    'a'    'A'    soh    soh     C
+  159   0x057d 0x054d dc3    dc3    's'    'S'    dc3    dc3     C
+  160   0x0564 0x0534 eot    eot    'd'    'D'    eot    eot     C
+  161   0x0586 0x0556 ack    ack    'f'    'F'    ack    ack     C
+  162   0x0563 0x0533 bel    bel    'g'    'G'    bel    bel     C
+  163   0x0570 0x0540 bs     bs     'h'    'H'    bs     bs      C
+  164   0x0575 0x0545 nl     nl     'j'    'J'    nl     nl      C
+  165   0x056f 0x053f vt     vt     'k'    'K'    vt     vt      C
+  166   0x056c 0x053c ff     ff     'l'    'L'    ff     ff      C
+  167   0x0589 0x2026 nop    nop    ';'    ':'    nop    nop     O
+  168   0x055b 0x055a nop    nop    '''    '"'    nop    nop     O
+  169   0x055d 0x055c nop    nop    '`'    '~'    nop    nop     O
   170   lshift lshift lshift lshift lshift lshift alock  alock   O
-  171   0      0      fs     fs     '|'    '|'    fs     fs      O
-  172   0      0      sub    sub    'z'    'Z'    sub    sub     C
-  173   0      0      can    can    'x'    'X'    can    can     C
-  174   0      0      etx    etx    'c'    'C'    etx    etx     C
-  175   0      0      syn    syn    'v'    'V'    syn    syn     C
-  176   0      0      stx    stx    'b'    'B'    stx    stx     C
-  177   0      0      so     so     'n'    'N'    so     so      C
-  178   0      0      cr     cr     'm'    'M'    cr     cr      C
-  179   0      0      nop    nop    ','    '<'    nop    nop     O
-  180   0      0      nop    nop    '.'    '>'    nop    nop     O
-  181   0      0      nop    nop    '/'    '?'    nop    nop     O
+  171   0x0577 0x0547 fs     fs     '|'    '|'    fs     fs      O
+  172   0x0566 0x0536 sub    sub    'z'    'Z'    sub    sub     C
+  173   0x0572 0x0542 can    can    'x'    'X'    can    can     C
+  174   0x0581 0x0551 etx    etx    'c'    'C'    etx    etx     C
+  175   0x057e 0x054e syn    syn    'v'    'V'    syn    syn     C
+  176   0x0562 0x0532 stx    stx    'b'    'B'    stx    stx     C
+  177   0x0576 0x0546 so     so     'n'    'N'    so     so      C
+  178   0x0574 0x0544 cr     cr     'm'    'M'    cr     cr      C
+  179   ','    0xab   nop    nop    ','    '<'    nop    nop     O
+  180   '.'    0xbb   nop    nop    '.'    '>'    nop    nop     O
+  181   0xe000 0x055e nop    nop    '/'    '?'    nop    nop     O
   182   rshift rshift rshift rshift rshift rshift rshift rshift  O
   183   nop    nop    '*'    '*'    '*'    '*'    '*'    '*'     O
   184   lalt   lalt   lalt   alock  lalt   lalt   lalt   alock   O

Modified: head/share/vt/keymaps/be.acc.kbd
==============================================================================
--- head/share/vt/keymaps/be.acc.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/be.acc.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -128,7 +128,7 @@
   dtil '~'     ( 'a'    0xe3    ) ( 'A'    0xc3    ) ( 'n'    0xf1    ) ( 'N'    0xd1    )
                ( 'o'    0xf5    ) ( 'O'    0xd5    )
 
-  duml 0x0161  ( 'a'    0xe4    ) ( 'A'    0xc4    ) ( 'e'    0xeb    ) ( 'E'    0xcb    )
+  duml 0xa8    ( 'a'    0xe4    ) ( 'A'    0xc4    ) ( 'e'    0xeb    ) ( 'E'    0xcb    )
                ( 'i'    0xef    ) ( 'I'    0xcf    ) ( 'o'    0xf6    ) ( 'O'    0xd6    )
                ( 'u'    0xfc    ) ( 'U'    0xdc    ) ( 'y'    0xff    )
 

Modified: head/share/vt/keymaps/ca-fr.kbd
==============================================================================
--- head/share/vt/keymaps/ca-fr.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/ca-fr.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -15,14 +15,14 @@
   003   '2'    '"'    nul    nul    '@'    '"'    nul    nul     O
   004   '3'    '/'    nop    nop    0xa3   '/'    nop    nop     O
   005   '4'    '$'    nop    nop    0xa2   '$'    nop    nop     O
-  006   '5'    '%'    nop    nop    0x20ac '%'    nop    nop     O
+  006   '5'    '%'    nop    nop    0xa4   '%'    nop    nop     O
   007   '6'    '?'    nop    nop    0xac   '?'    nop    nop     O
   008   '7'    '&'    nop    nop    '|'    '&'    nop    nop     O
   009   '8'    '*'    nop    nop    0xb2   '*'    nop    nop     O
   010   '9'    '('    nop    nop    0xb3   '('    nop    nop     O
-  011   '0'    ')'    nop    nop    0x0152 ')'    nop    nop     O
-  012   '-'    '_'    nop    nop    0x0153 '_'    nop    nop     O
-  013   '='    '+'    nop    nop    0x0178 '+'    nop    nop     O
+  011   '0'    ')'    nop    nop    0xbc   ')'    nop    nop     O
+  012   '-'    '_'    nop    nop    0xbd   '_'    nop    nop     O
+  013   '='    '+'    nop    nop    0xbe   '+'    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

Modified: head/share/vt/keymaps/centraleuropean.kbd
==============================================================================
--- head/share/vt/keymaps/centraleuropean.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/centraleuropean.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -5,7 +5,7 @@
 #
 # $FreeBSD$
 #
-# This map uses the US QWERTY keyboard for its basic layout.
+# This map uses a QWERTZ keyboard for its basic layout.
 # It adds a "third row" to the top of the PC keyboard. To
 # access the third row, press and hold the Alt key, then
 # strike a key in the top row.
@@ -58,7 +58,7 @@
 # This layout offers access to the entire character set of
 # ISO 8859-2, used by Slovak, Czech, German, Polish, Croatian,
 # Slovenian, Rumanian, Hungarian, and probably other languages,
-# while remaining fully compatible with the default US QWERTY
+# while remaining mostly compatible with the default US QWERTY
 # keyboard.
 #
 #                                                         alt
@@ -86,7 +86,7 @@
   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
+  021   'z'    'Z'    sub    sub    'z'    'Z'    sub    sub     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
@@ -109,7 +109,7 @@
   041   '`'    '~'    nop    nop    dogo   dced   nop    nop     O
   042   lshift lshift lshift lshift lshift lshift lshift lshift  O
   043   '\'    '|'    fs     fs     dsla   dsla   fs     fs      O
-  044   'z'    'Z'    sub    sub    'z'    'Z'    sub    sub     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    'v'    'V'    syn    syn     C
@@ -203,7 +203,7 @@
                ( 't'    0x0165  ) ( 'T'    0x0164  )
                ( 'z'    0x017e  ) ( 'Z'    0x017d  )
 
-  ddot 0x02d9  ( 'z'    0       ) ( 'Z'    0       )
+  ddot 0x02d9  ( 'z'    0x017c  ) ( 'Z'    0x017b  )
 
   duml 0xa8    ( 'a'    0xe4    ) ( 'A'    0xc4    )
                ( 'e'    0xeb    ) ( 'E'    0xcb    )

Copied and modified: head/share/vt/keymaps/centraleuropean.qwerty.kbd (from r270200, head/share/vt/keymaps/centraleuropean.kbd)
==============================================================================
--- head/share/vt/keymaps/centraleuropean.kbd	Wed Aug 20 07:48:09 2014	(r270200, copy source)
+++ head/share/vt/keymaps/centraleuropean.qwerty.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -203,7 +203,7 @@
                ( 't'    0x0165  ) ( 'T'    0x0164  )
                ( 'z'    0x017e  ) ( 'Z'    0x017d  )
 
-  ddot 0x02d9  ( 'z'    0       ) ( 'Z'    0       )
+  ddot 0x02d9  ( 'z'    0x017c  ) ( 'Z'    0x017b  )
 
   duml 0xa8    ( 'a'    0xe4    ) ( 'A'    0xc4    )
                ( 'e'    0xeb    ) ( 'E'    0xcb    )

Modified: head/share/vt/keymaps/ch-fr.acc.kbd
==============================================================================
--- head/share/vt/keymaps/ch-fr.acc.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/ch-fr.acc.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -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

Modified: head/share/vt/keymaps/ch-fr.kbd
==============================================================================
--- head/share/vt/keymaps/ch-fr.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/ch-fr.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -14,8 +14,8 @@
   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
-  009   '8'    '('    esc    esc    0xde   0xde   esc    esc     O
+  008   '7'    '/'    nop    nop    0xa6   0xa6   nop    nop     O
+  009   '8'    '('    esc    esc    0xa2   0xa2   esc    esc     O
   010   '9'    ')'    gs     gs     '9'    ')'    gs     gs      O
   011   '0'    '='    nop    nop    '0'    '='    nop    nop     O
   012   '''    '?'    fs     fs     0xb4   0xb4   fs     fs      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   0xe8   0xfc   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

Modified: head/share/vt/keymaps/de.acc.kbd
==============================================================================
--- head/share/vt/keymaps/de.acc.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/de.acc.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -49,7 +49,7 @@
   043   '#'    '''    nop    nop    '#'    '''    nop    nop     O
   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
+  046   'c'    'C'    etx    etx    0xa2   '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
@@ -89,7 +89,7 @@
   083   del    '.'    '.'    '.'    '.'    '.'    boot   boot    N
   084   nop    nop    nop    nop    nop    nop    nop    nop     O
   085   nop    nop    nop    nop    nop    nop    nop    nop     O
-  086   '<'    '>'    nop    nop    '|'    0x0160 nop    nop     O
+  086   '<'    '>'    nop    nop    '|'    0xa6   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

Copied and modified: head/share/vt/keymaps/de.kbd (from r270200, head/share/vt/keymaps/de.acc.kbd)
==============================================================================
--- head/share/vt/keymaps/de.acc.kbd	Wed Aug 20 07:48:09 2014	(r270200, copy source)
+++ head/share/vt/keymaps/de.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -30,7 +30,7 @@
   024   'o'    'O'    si     si     'o'    'O'    si     si      C
   025   'p'    'P'    dle    dle    'p'    'P'    dle    dle     C
   026   0xfc   0xdc   nop    nop    0xfc   0xdc   esc    nop     C
-  027   '+'    '*'    nop    nop    dtil   dtil   nop    nop     O
+  027   '+'    '*'    nop    nop    '~'    '~'    nop    nop     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
@@ -49,7 +49,7 @@
   043   '#'    '''    nop    nop    '#'    '''    nop    nop     O
   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
+  046   'c'    'C'    etx    etx    0xa2   '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
@@ -89,7 +89,7 @@
   083   del    '.'    '.'    '.'    '.'    '.'    boot   boot    N
   084   nop    nop    nop    nop    nop    nop    nop    nop     O
   085   nop    nop    nop    nop    nop    nop    nop    nop     O
-  086   '<'    '>'    nop    nop    '|'    0x0160 nop    nop     O
+  086   '<'    '>'    nop    nop    '|'    0xa6   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
@@ -124,14 +124,3 @@
   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    )

Copied and modified: head/share/vt/keymaps/de.noacc.kbd (from r270210, head/share/vt/keymaps/de.kbd)
==============================================================================
--- head/share/vt/keymaps/de.kbd	Wed Aug 20 13:54:27 2014	(r270210, copy source)
+++ head/share/vt/keymaps/de.noacc.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -49,7 +49,7 @@
   043   '#'    '''    nop    nop    '#'    '''    nop    nop     O
   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
+  046   'c'    'C'    etx    etx    0xa2   '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
@@ -87,9 +87,10 @@
   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
+# 083   del    ','    '.'    '.'    '.'    '.'    boot   boot    N
   084   nop    nop    nop    nop    nop    nop    nop    nop     O
   085   nop    nop    nop    nop    nop    nop    nop    nop     O
-  086   '<'    '>'    nop    nop    '|'    0x0160 nop    nop     O
+  086   '<'    '>'    nop    nop    '|'    0xa6   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

Modified: head/share/vt/keymaps/dk.acc.kbd
==============================================================================
--- head/share/vt/keymaps/dk.acc.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/dk.acc.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -33,7 +33,7 @@
   002   '1'    '!'    nop    nop    0xa1   0xb9   nop    nop     O
   003   '2'    '"'    nul    nul    '@'    0xb2   nul    nul     O
   004   '3'    '#'    nop    nop    0x9e   0xb3   nop    nop     O
-  005   '4'    0x20ac nop    nop    '$'    0x20ac nop    nop     O
+  005   '4'    0xa4   nop    nop    '$'    0xa4   nop    nop     O
   006   '5'    '%'    nop    nop    '5'    '%'    nop    nop     O
   007   '6'    '&'    nop    nop    '6'    '&'    nop    nop     O
   008   '7'    '/'    nop    nop    '{'    '/'    nop    nop     O
@@ -69,7 +69,7 @@
   038   'l'    'L'    ff     ff     'l'    'L'    ff     ff      C
   039   0xe6   0xc6   nop    nop    0x91   0x92   nop    nop     C
   040   0xf8   0xd8   nop    nop    0x9b   0x9d   nop    nop     C
-  041   0x0153 0xa7   nop    nop    0x0153 0xa7   nop    nop     O
+  041   0xbd   0xa7   nop    nop    0xbd   0xa7   nop    nop     O
   042   lshift lshift lshift lshift lshift lshift lshift lshift  O
   043   '''    '*'    nop    nop    '''    '*'    nop    nop     O
   044   'z'    'Z'    sub    sub    'z'    'Z'    sub    sub     C
@@ -153,7 +153,7 @@
                ( 'i'    0xec    ) ( 'I'    0xcc    ) ( 'o'    0xf2    ) ( 'O'    0xd2    )
                ( 'u'    0xf9    ) ( 'U'    0xd9    )
 
-  dacu 0xb4    ( 'a'    0xe1    ) ( 'A'    0xc1    ) ( 'e'    0xe9    ) ( 'E'    0xc9    )
+  dacu '''     ( 'a'    0xe1    ) ( 'A'    0xc1    ) ( 'e'    0xe9    ) ( 'E'    0xc9    )
                ( 'i'    0xed    ) ( 'I'    0xcd    ) ( 'o'    0xf3    ) ( 'O'    0xd3    )
                ( 'u'    0xfa    ) ( 'U'    0xda    ) ( 'y'    0xfd    ) ( 'Y'    0xdd    )
 

Modified: head/share/vt/keymaps/dk.kbd
==============================================================================
--- head/share/vt/keymaps/dk.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/dk.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -8,7 +8,7 @@
   002   '1'    '!'    nop    nop    '1'    '!'    nop    nop     O
   003   '2'    '"'    nul    nul    '@'    '@'    nul    nul     O
   004   '3'    '#'    nop    nop    0x9e   '#'    nop    nop     O
-  005   '4'    0x20ac nop    nop    '$'    0x20ac nop    nop     O
+  005   '4'    0xa4   nop    nop    '$'    0xa4   nop    nop     O
   006   '5'    '%'    nop    nop    '5'    '%'    nop    nop     O
   007   '6'    '&'    nop    nop    '6'    '&'    nop    nop     O
   008   '7'    '/'    nop    nop    '{'    '/'    nop    nop     O
@@ -44,7 +44,7 @@
   038   'l'    'L'    ff     ff     'l'    'L'    ff     ff      C
   039   0xe6   0xc6   nop    nop    0x91   0x92   nop    nop     C
   040   0xf8   0xd8   nop    nop    0x9b   0x9d   nop    nop     C
-  041   0x0153 0xa7   nop    nop    0x0153 0xa7   nop    nop     O
+  041   0xbd   0xa7   nop    nop    0xbd   0xa7   nop    nop     O
   042   lshift lshift lshift lshift lshift lshift lshift lshift  O
   043   '''    '*'    nop    nop    '''    '*'    nop    nop     O
   044   'z'    'Z'    sub    sub    'z'    'Z'    sub    sub     C

Modified: head/share/vt/keymaps/dk.macbook.kbd
==============================================================================
--- head/share/vt/keymaps/dk.macbook.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/dk.macbook.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -33,7 +33,7 @@
   024   'o'    'O'    si     si     nop    nop    nop    nop     C
   025   'p'    'P'    dle    dle    nop    nop    nop    nop     C
   026   0xe5   nop    nop    nop    nop    nop    nop    nop     C
-  027   0x0161 '^'    nop    nop    '~'    '^'    '~'    '~'     O
+  027   0xa8   '^'    nop    nop    '~'    '^'    '~'    '~'     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    0xaa   nop    nop    nop     C
@@ -50,7 +50,7 @@
   041   '$'    0xa7   '0'    '0'    nop    '''    nop    nop     O
   042   lshift lshift lshift lshift lshift lshift lshift lshift  O
   043   '''    '*'    nop    nop    '@'    nop    nop    nop     O
-  044   'z'    'Z'    sub    sub    nop    0x017e nop    nop     C
+  044   'z'    'Z'    sub    sub    nop    0xb8   nop    nop     C
   045   'x'    'X'    can    can    nop    nop    nop    nop     C
   046   'c'    'C'    etx    etx    0xe7   nop    nop    nop     C
   047   'v'    'V'    syn    syn    'v'    'V'    nop    nop     C

Modified: head/share/vt/keymaps/es.dvorak.kbd
==============================================================================
--- head/share/vt/keymaps/es.dvorak.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/es.dvorak.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -130,7 +130,7 @@
   dtil '~'     ( 'a'    0xe3    ) ( 'A'    0xc3    ) ( 'n'    0xf1    ) ( 'N'    0xd1    )
                ( 'o'    0xf5    ) ( 'O'    0xd5    )
 
-  duml 0x0161  ( 'a'    0xe4    ) ( 'A'    0xc4    ) ( 'e'    0xeb    ) ( 'E'    0xcb    )
+  duml 0xa8    ( 'a'    0xe4    ) ( 'A'    0xc4    ) ( 'e'    0xeb    ) ( 'E'    0xcb    )
                ( 'i'    0xef    ) ( 'I'    0xcf    ) ( 'o'    0xf6    ) ( 'O'    0xd6    )
                ( 'u'    0xfc    ) ( 'U'    0xdc    ) ( 'y'    0xff    )
 

Modified: head/share/vt/keymaps/fi.kbd
==============================================================================
--- head/share/vt/keymaps/fi.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/fi.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -8,7 +8,7 @@
   002   '1'    '!'    nop    nop    nop    nop    nop    nop     O
   003   '2'    '"'    nul    nul    '@'    '@'    nul    nul     O
   004   '3'    '#'    nop    nop    0xa3   nop    nop    nop     O
-  005   '4'    0x20ac nop    nop    '$'    nop    nop    nop     O
+  005   '4'    0xa4   nop    nop    '$'    nop    nop    nop     O
   006   '5'    '%'    nop    nop    nop    nop    nop    nop     O
   007   '6'    '&'    nop    nop    nop    nop    nop    nop     O
   008   '7'    '/'    nop    nop    '{'    nop    nop    nop     O
@@ -30,7 +30,7 @@
   024   'o'    'O'    si     si     'o'    'O'    si     si      C
   025   'p'    'P'    dle    dle    'p'    'P'    dle    dle     C
   026   0xe5   0xc5   nop    nop    '}'    ']'    nop    nop     C
-  027   0x0161 '^'    nop    nop    '~'    nop    nop    nop     O
+  027   0xa8   '^'    nop    nop    '~'    nop    nop    nop     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
@@ -44,7 +44,7 @@
   038   'l'    'L'    ff     ff     'l'    'L'    ff     ff      C
   039   0xf6   0xd6   nop    nop    '|'    '\'    nop    nop     C
   040   0xe4   0xc4   nop    nop    '{'    '['    nop    nop     C
-  041   0xa7   0x0153 nop    nop    '\'    '|'    nop    nop     O
+  041   0xa7   0xbd   nop    nop    '\'    '|'    nop    nop     O
   042   lshift lshift lshift lshift lshift lshift lshift lshift  O
   043   '''    '*'    nop    nop    nop    nop    nop    nop     O
   044   'z'    'Z'    sub    sub    'z'    'Z'    sub    sub     C

Modified: head/share/vt/keymaps/fr.acc.kbd
==============================================================================
--- head/share/vt/keymaps/fr.acc.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/fr.acc.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -128,7 +128,7 @@
   dtil '~'     ( 'a'    0xe3    ) ( 'A'    0xc3    ) ( 'n'    0xf1    ) ( 'N'    0xd1    )
                ( 'o'    0xf5    ) ( 'O'    0xd5    )
 
-  duml 0x0161  ( 'a'    0xe4    ) ( 'A'    0xc4    ) ( 'e'    0xeb    ) ( 'E'    0xcb    )
+  duml 0xa8    ( 'a'    0xe4    ) ( 'A'    0xc4    ) ( 'e'    0xeb    ) ( 'E'    0xcb    )
                ( 'i'    0xef    ) ( 'I'    0xcf    ) ( 'o'    0xf6    ) ( 'O'    0xd6    )
                ( 'u'    0xfc    ) ( 'U'    0xdc    ) ( 'y'    0xff    )
 

Modified: head/share/vt/keymaps/fr.dvorak.acc.kbd
==============================================================================
--- head/share/vt/keymaps/fr.dvorak.acc.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/fr.dvorak.acc.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -4,6 +4,10 @@
 # according to Francis Leboutte on 
 # http://www.algo.be/ergo/dvorak-fr.html
 #
+# Note that letters with accents won't be correctly
+# displayed unless one uses the correct font:
+#   vidcontrol -f iso15-8x16.fnt
+#
 #   -Frédéric Praca <frederic.praca at freebsd-fr.org>
 #   -Clément Pillias <clement.pillias at free.fr> for accent keys
 #
@@ -122,28 +126,28 @@
   107   fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64  O
   108   nop    nop    nop    nop    nop    nop    nop    nop     O
 
-  dgra '`'     ( '/'    0xb1    ) ( '-'    0x0152  ) ( 0xe8   0x0153  ) ( '\'    0x0178  )
-               ( '?'    0xc6    ) ( 'C'    0xc7    )
-               ( ':'    0xe6    ) ( '`'    '$'     ) ( 0xe9   0xc9    ) ( 'g'    0x20ac  )
-               ( '.'    0xb0    ) ( 'c'    0xe7    ) ( 'm'    0xb5    )
-               ( 'O'    0xd2    ) ( 'A'    0xc0    ) ( 'U'    0xd9    ) ( 'E'    0xc8    )
-               ( 'o'    0xf2    ) ( 'a'    0xe0    ) ( 'u'    0xf9    ) ( 'e'    0xe8    )
-               ( 's'    0xab    ) ( 'n'    0xbb    )
-               ( 0xe7   0xc7    ) ( '|'    0x0152  ) ( 'I'    0xcc    )
-               ( 0xe0   0xc0    ) ( ';'    0x0153  ) ( 'q'    '{'     ) ( ','    '}'     )
-               ( 'i'    0xec    ) ( 'r'    0xba    ) ( 'p'    0xa7    )
-               ( '!'    0xa1    )
+  dgra '`' ( '/'  0xb1 ) ( '-' 0xbc ) ( 0xe8 0xbd ) ( '\' 0xbe )
+           ( '?'  0xc6 ) ( 'C' 0xc7 )
+           ( ':'  0xe6 ) ( '`' '$'  ) ( 0xe9 0xc9 ) ( 'g' 0xa4 )
+			 ( '.' 0xb0 ) ( 'c'  0xe7 ) ( 'm' 0xb5 )
+           ( 'O'  0xd2 ) ( 'A' 0xc0 ) ( 'U'  0xd9 ) ( 'E' 0xc8 )
+           ( 'o'  0xf2 ) ( 'a' 0xe0 ) ( 'u'  0xf9 ) ( 'e' 0xe8 )
+				      ( 's'  0xab ) ( 'n' 0xbb )
+           ( 0xe7 0xc7 ) ( '|' 0xbc ) ( 'I'  0xcc )
+           ( 0xe0 0xc0 ) ( ';' 0xbd ) ( 'q'  '{'  ) ( ',' '}'  )
+		         ( 'i' 0xec ) ( 'r'  0xba ) ( 'p' 0xa7 )
+           ( '!'  0xa1 )
 
-  dcir '^'     ( 'a'    0xe2    ) ( 'e'    0xea    ) ( 'i'    0xee    ) ( 'o'    0xf4    ) ( 'u'    0xfb    )
-               ( 'A'    0xc2    ) ( 'E'    0xca    ) ( 'I'    0xce    ) ( 'O'    0xd4    ) ( 'U'    0xdb    )
+  dcir '^' ( 'a'  0xe2 ) ( 'e' 0xea ) ( 'i'  0xee ) ( 'o' 0xf4 ) ( 'u' 0xfb )
+           ( 'A'  0xc2 ) ( 'E' 0xca ) ( 'I'  0xce ) ( 'O' 0xd4 ) ( 'U' 0xdb )
 
-  dtil '~'     ( 'n'    0xf1    ) ( 'N'    0xd1    )
-               ( 'a'    0xe3    ) ( 'A'    0xc3    ) ( 'o'    0xf5    ) ( 'O'    0xd5    )
+  dtil '~' ( 'n'  0xf1 ) ( 'N' 0xd1 )
+           ( 'a'  0xe3 ) ( 'A' 0xc3 ) ( 'o'  0xf5 ) ( 'O' 0xd5 )
 
-  ddia '"'     ( 'a'    0xe4    ) ( 'e'    0xeb    ) ( 'i'    0xef    ) ( 'o'    0xf6    ) ( 'u'    0xfc    )
-               ( 'A'    0xc4    ) ( 'E'    0xcb    ) ( 'I'    0xcf    ) ( 'O'    0xd6    ) ( 'U'    0xdc    )
-               ( 'y'    0xff    ) ( 'Y'    0x0178  )
+  ddia '"' ( 'a'  0xe4 ) ( 'e' 0xeb ) ( 'i'  0xef ) ( 'o' 0xf6 ) ( 'u' 0xfc )
+           ( 'A'  0xc4 ) ( 'E' 0xcb ) ( 'I'  0xcf ) ( 'O' 0xd6 ) ( 'U' 0xdc )
+           ( 'y'  0xff ) ( 'Y' 0xbe )
 
-  dacu 0x017d  ( 'a'    0xe1    ) ( 'e'    0xe9    ) ( 'i'    0xed    ) ( 'o'    0xf3    ) ( 'u'    0xfa    )
-               ( 'A'    0xc1    ) ( 'E'    0xc9    ) ( 'I'    0xcd    ) ( 'O'    0xd3    ) ( 'U'    0xda    )
-               ( 'Y'    0xdd    ) ( 'y'    0xfd    )
+  dacu 0xb4( 'a'  0xe1 ) ( 'e' 0xe9 ) ( 'i'  0xed ) ( 'o' 0xf3 ) ( 'u' 0xfa )
+           ( 'A'  0xc1 ) ( 'E' 0xc9 ) ( 'I'  0xcd ) ( 'O' 0xd3 ) ( 'U' 0xda )
+           ( 'Y'  0xdd ) ( 'y' 0xfd )

Modified: head/share/vt/keymaps/fr.dvorak.kbd
==============================================================================
--- head/share/vt/keymaps/fr.dvorak.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/fr.dvorak.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -1,7 +1,7 @@
 # A Dvorak keyboard for French
 #
 # This is a Dvorak-like layout for French
-# according to Francis Leboutte on
+# according to Francis Leboutte on 
 # http://www.algo.be/ergo/dvorak-fr.html
 #
 #   -Frédéric Praca <frederic.praca at freebsd-fr.org>
@@ -13,58 +13,58 @@
 # ------------------------------------------------------------------
   000   nop    nop    nop    nop    nop    nop    nop    nop     O
   001   esc    esc    esc    esc    esc    esc    debug  esc     O
-  002	'='    '1'    nop    ' '    '='    '1'    nop    nop     C
-  003	224    '2'    nop    '~'    'à'    '2'    nop    nop     C
-  004	'-'    '3'    nop    '#'    '-'    '3'    nop    nop     C
-  005	232    '4'    nop    '{'    'è'    '4'    nop    nop     C
-  006	'/'    '5'    nop    '['    '/'    '5'    nop    nop     C
-  007	'^'    '6'    nop    '|'    '^'    '6'    nop    nop     C
-  008	'('    '7'    nop    '`'    '('    '7'    nop    nop     C
-  009	'`'    '8'    nop    '\'    '`'    '8'    nop    nop     C
-  010	')'    '9'    nop    '^'    ')'    '9'    nop    nop     C
-  011	'"'    '0'    nop    '@'    '"'    '0'    nop    nop     C
-  012	'['    '|'    nop    ']'    '['    '|'    nop    nop     O
-  013	']'    '%'    nop    '}'    ']'    '%'    nop    nop     O
+  002   '='    '1'    nop    ' '    '='    '1'    nop    nop     C
+  003   0xe0   '2'    nop    '~'    0xe0   '2'    nop    nop     C
+  004   '-'    '3'    nop    '#'    '-'    '3'    nop    nop     C
+  005   0xe8   '4'    nop    '{'    0xe8   '4'    nop    nop     C
+  006   '/'    '5'    nop    '['    '/'    '5'    nop    nop     C
+  007   '^'    '6'    nop    '|'    '^'    '6'    nop    nop     C
+  008   '('    '7'    nop    '`'    '('    '7'    nop    nop     C
+  009   '`'    '8'    nop    '\'    '`'    '8'    nop    nop     C
+  010   ')'    '9'    nop    '^'    ')'    '9'    nop    nop     C
+  011   '"'    '0'    nop    '@'    '"'    '0'    nop    nop     C
+  012   '['    '|'    nop    ']'    '['    '|'    nop    nop     O
+  013   ']'    '%'    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	':'    '?'    nop    ' '    ':'    '?'    nop    nop     O
-  017	'''    '<'    nop    ' '    '''    '<'    nop    nop     C
-  018	233    '>'    nop    '?'    'é'    '>'    nop    nop     C
-  019	'g'    'G'    nop    ' '    'g'    'G'    nop    nop     C
-  020	'.'    '!'    nop    ' '    '.'    '!'    nop    nop     O
-  021	'h'    'H'    nop    ' '    'h'    'H'    nop    nop     C
-  022	'v'    'V'    nop    ' '    'v'    'V'    nop    nop     C
-  023	'c'    'C'    nop    ' '    'c'    'C'    nop    nop     C
-  024	'm'    'M'    nop    ' '    'm'    'M'    nop    nop     C
-  025	'k'    'K'    nop    ' '    'k'    'K'    nop    nop     C
-  026	'z'    'Z'    nop    ' '    'z'    'Z'    nop    nop     C
-  027	168    '&'    nop    '€'    'š'    '&'    nop    nop     C
+  016   ':'    '?'    nop    ' '    ':'    '?'    nop    nop     O
+  017   '''    '<'    nop    ' '    '''    '<'    nop    nop     C
+  018   0xe9   '>'    nop    '?'    0xe9   '>'    nop    nop     C
+  019   'g'    'G'    nop    ' '    'g'    'G'    nop    nop     C
+  020   '.'    '!'    nop    ' '    '.'    '!'    nop    nop     O
+  021   'h'    'H'    nop    ' '    'h'    'H'    nop    nop     C
+  022   'v'    'V'    nop    ' '    'v'    'V'    nop    nop     C
+  023   'c'    'C'    nop    ' '    'c'    'C'    nop    nop     C
+  024   'm'    'M'    nop    ' '    'm'    'M'    nop    nop     C
+  025   'k'    'K'    nop    ' '    'k'    'K'    nop    nop     C
+  026   'z'    'Z'    nop    ' '    'z'    'Z'    nop    nop     C
+  027   0xa8   '&'    nop    0xa4   0xa8   '&'    nop    nop     C
   028   cr     cr     nl     nl     cr     cr     nl     nl      O
   029   lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl   O
-  030	'o'    'O'    nop    ' '    'o'    'O'    nop    nop     C
-  031	'a'    'A'    nop    ' '    'a'    'A'    nop    nop     C
-  032	'u'    'U'    nop    ' '    'u'    'U'    nop    nop     C
-  033	'e'    'E'    nop    ' '    'e'    'E'    nop    nop     C
-  034	'b'    'B'    nop    ' '    'b'    'B'    nop    nop     C
-  035	'f'    'F'    nop    ' '    'f'    'F'    nop    nop     C
-  036	's'    'S'    nop    ' '    's'    'S'    nop    nop     C
-  037	't'    'T'    nop    ' '    't'    'T'    nop    nop     C
-  038	'n'    'N'    nop    ' '    'n'    'N'    nop    nop     C
-  039	'd'    'D'    nop    ' '    'd'    'D'    nop    nop     C
-  040	'w'    'W'    nop    ' '    'w'    'W'    nop    nop     C
-  041   178    nop    nop    nop    '|'    '|'    nop    nop     O
+  030   'o'    'O'    nop    ' '    'o'    'O'    nop    nop     C
+  031   'a'    'A'    nop    ' '    'a'    'A'    nop    nop     C
+  032   'u'    'U'    nop    ' '    'u'    'U'    nop    nop     C
+  033   'e'    'E'    nop    ' '    'e'    'E'    nop    nop     C
+  034   'b'    'B'    nop    ' '    'b'    'B'    nop    nop     C
+  035   'f'    'F'    nop    ' '    'f'    'F'    nop    nop     C
+  036   's'    'S'    nop    ' '    's'    'S'    nop    nop     C
+  037   't'    'T'    nop    ' '    't'    'T'    nop    nop     C
+  038   'n'    'N'    nop    ' '    'n'    'N'    nop    nop     C
+  039   'd'    'D'    nop    ' '    'd'    'D'    nop    nop     C
+  040   'w'    'W'    nop    ' '    'w'    'W'    nop    nop     C
+  041   0xb2   nop    nop    nop    '|'    '|'    nop    nop     O
   042   lshift lshift lshift lshift lshift lshift lshift lshift  O
-  043	126    '#'    nop    ' '    '~'    '#'    nop    nop     O
-  044	';'    '@'    nop    ' '    ';'    '@'    nop    nop     O
-  045	'q'    'Q'    nop    ' '    'q'    'Q'    nop    nop     C
-  046	','    '\'    nop    ' '    ','    '\'    nop    nop     O
-  047	'i'    'I'    nop    ' '    'i'    'I'    nop    nop     C
-  048	'y'    'Y'    nop    ' '    'y'    'Y'    nop    nop     C
-  049	'x'    'X'    nop    ' '    'x'    'X'    nop    nop     C
-  050	'r'    'R'    nop    ' '    'r'    'R'    nop    nop     C
-  051	'l'    'L'    nop    ' '    'l'    'L'    nop    nop     C
-  052	'p'    'P'    nop    ' '    'p'    'P'    nop    nop     C
-  053	'j'    'J'    nop    ' '    'j'    'J'    nop    nop     N
+  043   '~'    '#'    nop    ' '    '~'    '#'    nop    nop     O
+  044   ';'    '@'    nop    ' '    ';'    '@'    nop    nop     O
+  045   'q'    'Q'    nop    ' '    'q'    'Q'    nop    nop     C
+  046   ','    '\'    nop    ' '    ','    '\'    nop    nop     O
+  047   'i'    'I'    nop    ' '    'i'    'I'    nop    nop     C
+  048   'y'    'Y'    nop    ' '    'y'    'Y'    nop    nop     C
+  049   'x'    'X'    nop    ' '    'x'    'X'    nop    nop     C
+  050   'r'    'R'    nop    ' '    'r'    'R'    nop    nop     C
+  051   'l'    'L'    nop    ' '    'l'    'L'    nop    nop     C
+  052   'p'    'P'    nop    ' '    'p'    'P'    nop    nop     C
+  053   'j'    'J'    nop    ' '    'j'    'J'    nop    nop     N
   054   rshift rshift rshift rshift rshift rshift rshift rshift  O
   055   '*'    '*'    '*'    '*'    '*'    '*'    '*'    '*'     O
   056   lalt   lalt   lalt   lalt   lalt   lalt   lalt   lalt    O
@@ -97,7 +97,7 @@
   083   del    '.'    '.'    '.'    '.'    '.'    boot   boot    N
   084   nop    nop    nop    nop    nop    nop    nop    nop     O
   085   nop    nop    nop    nop    nop    nop    nop    nop     O
-  086	'+'    '*'    nop    ' '    '+'    '*'    nop    nop     O
+  086   '+'    '*'    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
@@ -114,7 +114,7 @@
   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
+  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

Modified: head/share/vt/keymaps/fr.macbook.kbd
==============================================================================
--- head/share/vt/keymaps/fr.macbook.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/fr.macbook.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -30,7 +30,7 @@
   024   'o'    'O'    si     si     0xbd   0xbc   si     si      C
   025   'p'    'P'    dle    dle    0xf7   0xe6   dle    dle     C
   026   dcir   duml   esc    esc    '['    '{'    esc    esc     O
-  027   '$'    '*'    gs     gs     0x20ac '}'    gs     gs      O
+  027   '$'    '*'    gs     gs     0xa4   '}'    gs     gs      O
   028   cr     cr     nl     nl     cr     cr     nl     nl      O
   029   lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl   O
   030   'q'    'Q'    dc1    dc1    'q'    'Q'    soh    soh     C
@@ -128,7 +128,7 @@
   dtil '~'     ( 'a'    0xe3    ) ( 'A'    0xc3    ) ( 'n'    0xf1    ) ( 'N'    0xd1    )
                ( 'o'    0xf5    ) ( 'O'    0xd5    )
 
-  duml 0x0161  ( 'a'    0xe4    ) ( 'A'    0xc4    ) ( 'e'    0xeb    ) ( 'E'    0xcb    )
+  duml 0xa8    ( 'a'    0xe4    ) ( 'A'    0xc4    ) ( 'e'    0xeb    ) ( 'E'    0xcb    )
                ( 'i'    0xef    ) ( 'I'    0xcf    ) ( 'o'    0xf6    ) ( 'O'    0xd6    )
                ( 'u'    0xfc    ) ( 'U'    0xdc    ) ( 'y'    0xff    )
 

Modified: head/share/vt/keymaps/is.kbd
==============================================================================
--- head/share/vt/keymaps/is.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/is.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -8,7 +8,7 @@
   002   '1'    '!'    nop    nop    nop    nop    nop    nop     O
   003   '2'    '"'    nul    nul    nop    nop    nul    nul     O
   004   '3'    '#'    nop    nop    0xa3   nop    nop    nop     O
-  005   '4'    '$'    nop    nop    0x20ac nop    nop    nop     O
+  005   '4'    '$'    nop    nop    0xa4   nop    nop    nop     O
   006   '5'    '%'    nop    nop    nop    nop    nop    nop     O
   007   '6'    '&'    nop    nop    nop    nop    nop    nop     O
   008   '7'    '/'    nop    nop    '{'    nop    nop    nop     O
@@ -44,7 +44,7 @@
   038   'l'    'L'    ff     ff     'l'    'L'    ff     ff      C
   039   0xe6   0xc6   nop    nop    '|'    '\'    nop    nop     C
   040   0xb4   0xb4   nop    nop    '~'    '['    nop    nop     C
-  041   0xb0   0x0161 nop    nop    '^'    '*'    nop    nop     O
+  041   0xb0   0xa8   nop    nop    '^'    '*'    nop    nop     O
   042   lshift lshift lshift lshift lshift lshift lshift lshift  O
   043   '+'    '*'    nop    nop    '`'    '*'    nop    nop     C
   044   'z'    'Z'    sub    sub    'z'    'Z'    sub    sub     C

Modified: head/share/vt/keymaps/it.kbd
==============================================================================
--- head/share/vt/keymaps/it.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/it.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -34,9 +34,9 @@
   002   '1'    '!'    nop    nop    0xb9   0xa1   nop    nop     O
   003   '2'    '"'    nul    duml   0xb2   nop    nul    nul     O
   004   '3'    0xa3   nop    nop    0xb3   0xa3   nop    nop     O
-  005   '4'    '$'    nop    nop    0x0152 '$'    nop    nop     O
-  006   '5'    '%'    nop    nop    0x0153 nop    nop    nop     O
-  007   '6'    '&'    rs     rs     0x0178 nop    rs     rs      O
+  005   '4'    '$'    nop    nop    0xbc   '$'    nop    nop     O
+  006   '5'    '%'    nop    nop    0xbd   nop    nop    nop     O
+  007   '6'    '&'    rs     rs     0xbe   nop    rs     rs      O
   008   '7'    '/'    nop    nop    '{'    nop    nop    nop     O
   009   '8'    '('    nop    nop    '['    nop    nop    nop     O
   010   '9'    ')'    nop    nop    ']'    0xb1   nop    nop     O
@@ -115,7 +115,7 @@
   083   del    '.'    '.'    '.'    '.'    '.'    boot   boot    N
   084   nop    nop    nop    nop    nop    nop    nop    nop     O
   085   nop    nop    nop    nop    nop    nop    nop    nop     O
-  086   '<'    '>'    nop    nop    '|'    0x0160 nop    nop     O
+  086   '<'    '>'    nop    nop    '|'    0xa6   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
@@ -142,7 +142,7 @@
                ( 'i'    0xec    ) ( 'I'    0xcc    ) ( 'o'    0xf2    ) ( 'O'    0xd2    )
                ( 'u'    0xf9    ) ( 'U'    0xd9    )
 
-  dacu 0xb4    ( 'a'    0xe1    ) ( 'A'    0xc1    ) ( 'e'    0xe9    ) ( 'E'    0xc9    )
+  dacu '''     ( 'a'    0xe1    ) ( 'A'    0xc1    ) ( 'e'    0xe9    ) ( 'E'    0xc9    )
                ( 'i'    0xed    ) ( 'I'    0xcd    ) ( 'o'    0xf3    ) ( 'O'    0xd3    )
                ( 'u'    0xfa    ) ( 'U'    0xda    ) ( 'y'    0xfd    ) ( 'Y'    0xdd    )
 

Modified: head/share/vt/keymaps/jp.pc98.iso.kbd
==============================================================================
--- head/share/vt/keymaps/jp.pc98.iso.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/jp.pc98.iso.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -16,7 +16,7 @@
   010   '0'    ')'    ')'    ')'    '0'    nop    '0'    '0'     O
   011   '-'    '_'    us     us     '-'    '='    '-'    '-'     O
   012   '='    '+'    '+'    '+'    '^'    '`'    rs     rs      O
-  013   '\'    '|'    fs     fs     '\'    '|'    fs     fs      O
+  013   0xa5   '|'    fs     fs     0xa5   '|'    fs     fs      O
   014   bs     bs     bs     bs     bs     bs     bs     bs      O
   015   ht     btab   ht     btab   ht     btab   ht     btab    O
   016   'q'    'Q'    dc1    dc1    'q'    'Q'    dc1    dc1     C

Modified: head/share/vt/keymaps/jp.pc98.kbd
==============================================================================
--- head/share/vt/keymaps/jp.pc98.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/jp.pc98.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -16,7 +16,7 @@
   010   '0'    nop    '0'    '0'    '0'    ')'    ')'    ')'     O
   011   '-'    '='    '-'    '-'    '-'    '_'    us     us      O
   012   '^'    '`'    rs     rs     '='    '+'    '+'    '+'     O
-  013   '\'    '|'    fs     fs     '\'    '|'    fs     fs      O
+  013   0xa5   '|'    fs     fs     0xa5   '|'    fs     fs      O
   014   bs     bs     bs     bs     bs     bs     bs     bs      O
   015   ht     btab   ht     btab   ht     btab   ht     btab    O
   016   'q'    'Q'    dc1    dc1    'q'    'Q'    dc1    dc1     C
@@ -54,7 +54,7 @@
   048   ','    '<'    '<'    '<'    ','    '<'    '<'    '<'     O
   049   '.'    '>'    '>'    '>'    '.'    '>'    '>'    '>'     O
   050   '/'    '?'    del    del    '/'    '?'    del    del     O
-  051   nop    '_'    us     us     '\'    '|'    fs     fs      O
+  051   '\'    '_'    us     us     '\'    '|'    fs     fs      O
   052   ' '    ' '    nul    nul    ' '    ' '    nul    nul     O
   053   esc    esc    esc    esc    esc    esc    esc    esc     O
   054   fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59  O

Modified: head/share/vt/keymaps/no.dvorak.kbd
==============================================================================
--- head/share/vt/keymaps/no.dvorak.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/no.dvorak.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -8,7 +8,7 @@
   002   '1'    '!'    nop    nop    '1'    '!'    nop    nop     O
   003   '2'    '"'    nul    nul    '@'    '@'    nul    nul     O
   004   '3'    '#'    nop    nop    0x9e   '#'    nop    nop     O
-  005   '4'    0x20ac nop    nop    '$'    0x20ac nop    nop     O
+  005   '4'    0xa4   nop    nop    '$'    0xa4   nop    nop     O
   006   '5'    '%'    nop    nop    '5'    '%'    nop    nop     O
   007   '6'    '&'    rs     rs     '6'    '&'    nop    nop     O
   008   '7'    '/'    nop    nop    '{'    '/'    nop    nop     O
@@ -30,7 +30,7 @@
   024   'r'    'R'    dc2    dc2    'r'    'R'    dc2    dc2     C
   025   'l'    'L'    ff     ff     'l'    'L'    ff     ff      C
   026   '''    '*'    nop    nop    '''    0xd7   nop    nop     O
-  027   0x0161 '^'    rs     rs     0xac   '^'    rs     rs      O
+  027   0xa8   '^'    rs     rs     0xac   '^'    rs     rs      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
@@ -44,7 +44,7 @@
   038   'n'    'N'    so     so     'n'    'N'    so     so      C
   039   's'    'S'    dc3    dc3    's'    'S'    dc3    dc3     C
   040   '-'    '_'    us     us     '-'    '_'    us     us      O
-  041   '|'    0xa7   nop    nop    0x0160 0xb6   nop    nop     O
+  041   '|'    0xa7   nop    nop    0xa6   0xb6   nop    nop     O
   042   lshift lshift lshift lshift lshift lshift lshift lshift  O
   043   '<'    '>'    nop    nop    '|'    '\'    nop    nop     C
   044   0xe6   0xc6   nop    nop    '{'    '['    nop    nop     C

Modified: head/share/vt/keymaps/no.kbd
==============================================================================
--- head/share/vt/keymaps/no.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/no.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -8,7 +8,7 @@
   002   '1'    '!'    nop    nop    '1'    '!'    nop    nop     O
   003   '2'    '"'    nul    nul    '@'    '@'    nul    nul     O
   004   '3'    '#'    nop    nop    0x9e   '#'    nop    nop     O
-  005   '4'    0x20ac nop    nop    '$'    0x20ac nop    nop     O
+  005   '4'    0xa4   nop    nop    '$'    0xa4   nop    nop     O
   006   '5'    '%'    nop    nop    '5'    '%'    nop    nop     O
   007   '6'    '&'    nop    nop    '6'    '&'    nop    nop     O
   008   '7'    '/'    nop    nop    '{'    '/'    nop    nop     O
@@ -44,7 +44,7 @@
   038   'l'    'L'    ff     ff     'l'    'L'    ff     ff      C
   039   0xf8   0xd8   nop    nop    '|'    '\'    nop    nop     C
   040   0xe6   0xc6   nop    nop    '{'    '['    nop    nop     C
-  041   '|'    0xa7   nop    nop    0x0160 0xb6   nop    nop     O
+  041   '|'    0xa7   nop    nop    0xa6   0xb6   nop    nop     O
   042   lshift lshift lshift lshift lshift lshift lshift lshift  O
   043   '''    '*'    nop    nop    '''    0xd7   nop    nop     O
   044   'z'    'Z'    sub    sub    'z'    'Z'    sub    sub     C
@@ -54,7 +54,7 @@
   048   'b'    'B'    stx    stx    'b'    'B'    stx    stx     C
   049   'n'    'N'    so     so     0xf1   0xd1   so     so      C
   050   'm'    'M'    cr     cr     0xb5   0xba   cr     cr      C
-  051   ','    ';'    nop    nop    0x017e 0xab   nop    nop     O
+  051   ','    ';'    nop    nop    0xb8   0xab   nop    nop     O
   052   '.'    ':'    nop    nop    0xb7   0xbb   nop    nop     O
   053   '-'    '_'    us     us     0xad   0xad   us     us      O
   054   rshift rshift rshift rshift rshift rshift rshift rshift  O

Modified: head/share/vt/keymaps/nordic.asus-eee.kbd
==============================================================================
--- head/share/vt/keymaps/nordic.asus-eee.kbd	Wed Aug 20 16:59:33 2014	(r270228)
+++ head/share/vt/keymaps/nordic.asus-eee.kbd	Wed Aug 20 17:00:47 2014	(r270229)
@@ -8,7 +8,7 @@
   002   '1'    '!'    nop    nop    nop    nop    nop    nop     O
   003   '2'    '"'    nul    nul    '@'    '@'    nul    nul     O
   004   '3'    '#'    nop    nop    0xa3   nop    nop    nop     O
-  005   '4'    0x20ac nop    nop    '$'    nop    nop    nop     O
+  005   '4'    0xa4   nop    nop    '$'    nop    nop    nop     O
   006   '5'    '%'    nop    nop    nop    nop    nop    nop     O
   007   '6'    '&'    nop    nop    nop    nop    nop    nop     O
 # Alt + Shift + 7 = ÷
@@ -23,16 +23,16 @@
   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
-# Alt + Ctrl + E = French e (as in café)
+# Alt + Ctrl + E = French e (as in café)
   018   'e'    'E'    enq    enq    0x20ac 'E'    0xe9   enq     C
-# Alt + R = Copyright sign
+# Alt + R = Registered sign
   019   'r'    'R'    dc2    dc2    0xae   'R'    dc2    dc2     C
   020   't'    'T'    dc4    dc4    't'    'T'    dc4    dc4     C
   021   'y'    'Y'    em     em     'y'    'Y'    em     em      C
-# Alt + U = Mikro,  Alt + Shift + U = German u
+# Alt + U = Mikro,  Alt + Shift + U = German U (???)
   022   'u'    'U'    nak    nak    0xb5   'U'    0xfc   0xdc    C
   023   'i'    'I'    ht     ht     'i'    'I'    ht     ht      C

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-all mailing list