From 7a93a037ea676157ced072b575b76b0893bf3a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20E=C3=9Fer?= Date: Thu, 21 Aug 2014 20:33:09 +0000 Subject: [PATCH] Next round of fixes. MFC after: 3 days --- share/vt/keymaps/INDEX.keymaps | 7 ++++--- share/vt/keymaps/Makefile | 12 ++++++++++-- .../keymaps/{bg.bds.ctrlcaps.kbd => bg.phonetic.kbd} | 0 share/vt/keymaps/ca-fr.kbd | 2 +- share/vt/keymaps/ca.kbd | 6 +++--- share/vt/keymaps/{colemak.kbd => colemak.acc.kbd} | 0 share/vt/keymaps/jp.pc98.kbd | 4 ++-- 7 files changed, 20 insertions(+), 11 deletions(-) rename share/vt/keymaps/{bg.bds.ctrlcaps.kbd => bg.phonetic.kbd} (100%) rename share/vt/keymaps/{colemak.kbd => colemak.acc.kbd} (100%) diff --git a/share/vt/keymaps/INDEX.keymaps b/share/vt/keymaps/INDEX.keymaps index 8ea54ac491be..8a33bc857783 100644 --- a/share/vt/keymaps/INDEX.keymaps +++ b/share/vt/keymaps/INDEX.keymaps @@ -53,8 +53,9 @@ be.acc.kbd:es:Belga (con acentos) bg.bds.kbd:en:Bulgarian (BDS) bg.bds.kbd:de:Bulgarisch (BDS) -bg.bds.ctrlcaps.kbd:en:Bulgarian (Phonetic) -bg.bds.ctrlcaps.kbd:de:Bulgarisch (phonetisch) + +bg.phonetic.kbd:en:Bulgarian (Phonetic) +bg.phonetic.kbd:de:Bulgarisch (phonetisch) br.kbd:en:Brazilian (accent keys) br.kbd:de:Brasilianisch (mit Akzenten) @@ -82,7 +83,7 @@ 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 +colemak.acc.kbd:en:Colemak ergonomic alternative cz.kbd:en:Czech (QWERTZ, accent keys) cz.kbd:de:Tschechisch (QWERTZ, mit Akzenten) diff --git a/share/vt/keymaps/Makefile b/share/vt/keymaps/Makefile index 30108f820ca1..4e0b64c5e1e3 100644 --- a/share/vt/keymaps/Makefile +++ b/share/vt/keymaps/Makefile @@ -2,9 +2,13 @@ FILES= INDEX.keymaps \ am.kbd \ - bg.bds.ctrlcaps.kbd \ + be.acc.kbd \ + be.kbd \ bg.bds.kbd \ + bg.phonetic.kbd \ br.kbd \ + br.noacc.kbd \ + by.kbd \ ca.kbd \ ca-fr.kbd \ centraleuropean.kbd \ @@ -14,9 +18,10 @@ FILES= INDEX.keymaps \ ch.acc.kbd \ ch.kbd \ ch.macbook.acc.kbd \ - colemak.kbd \ + colemak.acc.kbd \ cz.kbd \ de.acc.kbd \ + de.noacc.kbd \ de.kbd \ dk.acc.kbd \ dk.kbd \ @@ -26,6 +31,9 @@ FILES= INDEX.keymaps \ es.dvorak.kbd \ es.kbd \ fi.kbd \ + fr.dvorak.acc.kbd \ + fr.dvorak.kbd \ + fr.macbook.kbd \ gr.101.acc.kbd \ gr.elot.acc.kbd \ gr.kbd \ diff --git a/share/vt/keymaps/bg.bds.ctrlcaps.kbd b/share/vt/keymaps/bg.phonetic.kbd similarity index 100% rename from share/vt/keymaps/bg.bds.ctrlcaps.kbd rename to share/vt/keymaps/bg.phonetic.kbd diff --git a/share/vt/keymaps/ca-fr.kbd b/share/vt/keymaps/ca-fr.kbd index d632c39c8161..1d62e2cf1974 100644 --- a/share/vt/keymaps/ca-fr.kbd +++ b/share/vt/keymaps/ca-fr.kbd @@ -61,7 +61,7 @@ 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 nop O + 052 '.' '.' nop nop '.' '.' nop nop O 053 0xe9 0xc9 nop nop dacu 0xc9 nop nop C 054 rshift rshift rshift rshift rshift rshift rshift rshift O 055 '*' '*' '*' '*' '*' '*' '*' '*' O diff --git a/share/vt/keymaps/ca.kbd b/share/vt/keymaps/ca.kbd index 85332abe3252..de59f38cb041 100644 --- a/share/vt/keymaps/ca.kbd +++ b/share/vt/keymaps/ca.kbd @@ -46,7 +46,7 @@ 038 'l' 'L' ff ff 'l' 'L' ff ff C 039 ';' ':' nop nop '~' ':' nop nop O 040 ''' '"' nop nop dgra dgra nop nop O - 041 0x60 0x7e nop nop 0x60 0x7e nop nop O + 041 '`' '~' nop nop '`' '~' nop nop O 042 lshift lshift lshift lshift lshift lshift lshift lshift O 043 '\' '|' fs fs '<' '>' nop nop O 044 'z' 'Z' sub sub 'z' 'Z' sub sub C @@ -56,8 +56,8 @@ 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 ',' 0x3c nop nop 0x3c ''' nop nop O - 052 '.' 0x3e nop nop 0x3e '.' nop nop O + 051 ',' '<' nop nop '<' ''' nop nop O + 052 '.' '>' nop nop '>' '.' nop nop O 053 '/' '?' nop nop dacu 0xc9 nop nop C 054 rshift rshift rshift rshift rshift rshift rshift rshift O 055 '*' '*' '*' '*' '*' '*' '*' '*' O diff --git a/share/vt/keymaps/colemak.kbd b/share/vt/keymaps/colemak.acc.kbd similarity index 100% rename from share/vt/keymaps/colemak.kbd rename to share/vt/keymaps/colemak.acc.kbd diff --git a/share/vt/keymaps/jp.pc98.kbd b/share/vt/keymaps/jp.pc98.kbd index 8464258c4ce3..6c8a4d656fc8 100644 --- a/share/vt/keymaps/jp.pc98.kbd +++ b/share/vt/keymaps/jp.pc98.kbd @@ -16,7 +16,7 @@ 010 '0' nop '0' '0' '0' ')' ')' ')' O 011 '-' '=' '-' '-' '-' '_' us us O 012 '^' '`' rs rs '=' '+' '+' '+' O - 013 0xa5 '|' fs fs 0xa5 '|' fs fs O + 013 '\' '|' 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 '\' '_' us us '\' '|' fs fs O + 051 nop '_' 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