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
