From 821603def308b0e1c7b45da84afe2108ea3b25e3 Mon Sep 17 00:00:00 2001
From: Yuriy Skalko <yuriy.skalko@gmail.com>
Date: Wed, 16 Sep 2020 10:21:07 +0300
Subject: [PATCH] Fix Cyrillic keyboard map files

---
 lib/kbd/{bg-bds-1251.kmap => bulgarian.kmap} |  2 +-
 lib/kbd/{koi8-r.kmap => russian.kmap}        | 33 +++++++++++---------
 lib/kbd/{koi8-u.kmap => ukrainian.kmap}      |  2 +-
 3 files changed, 20 insertions(+), 17 deletions(-)
 rename lib/kbd/{bg-bds-1251.kmap => bulgarian.kmap} (95%)
 rename lib/kbd/{koi8-r.kmap => russian.kmap} (71%)
 rename lib/kbd/{koi8-u.kmap => ukrainian.kmap} (96%)

diff --git a/lib/kbd/bg-bds-1251.kmap b/lib/kbd/bulgarian.kmap
similarity index 95%
rename from lib/kbd/bg-bds-1251.kmap
rename to lib/kbd/bulgarian.kmap
index 28974c124a..ea75200096 100644
--- a/lib/kbd/bg-bds-1251.kmap
+++ b/lib/kbd/bulgarian.kmap
@@ -1,4 +1,4 @@
-# keyboad mapping for BDS, code table 1251
+# Bulgarian keyboard mapping for BDS
 # by George Tellalov, 2001 <gtellalov@bigfoot.com>
 
 \kmap ` (
diff --git a/lib/kbd/koi8-r.kmap b/lib/kbd/russian.kmap
similarity index 71%
rename from lib/kbd/koi8-r.kmap
rename to lib/kbd/russian.kmap
index c06e29f77f..c1b8c0de35 100644
--- a/lib/kbd/koi8-r.kmap
+++ b/lib/kbd/russian.kmap
@@ -1,6 +1,7 @@
-# keyboad mapping for Koi8-r
+# Russian keyboard mapping
 # by Nick Slussar, 1999 <nick@slu.spb.ru>
-# added by Vitaly Lipatov, 2001 (standart russian layout) <vitlav@mail.ru>
+# added by Vitaly Lipatov, 2001 <vitlav@mail.ru>
+# fixed by Yuriy Skalko, 2020 <yuriy.skalko@gmail.com>
 
 \kmap q й
 \kmap w ц
@@ -32,16 +33,8 @@
 \kmap b и
 \kmap n т
 \kmap m ь
-\kmap "," б
-\kmap "." ю
-\kmap "/" .
-\kmap "@" \"
-\kmap "^" :
-\kmap "&" ?
-\kmap "`" ё
-\kmap "~" Ё
-\kmap "$" ;
-
+\kmap \, б
+\kmap . ю
 
 \kmap Q Й
 \kmap W Ц
@@ -73,6 +66,16 @@
 \kmap B И
 \kmap N Т
 \kmap M Ь
-\kmap "<" Б
-\kmap ">" Ю
-\kmap "?" ","
+\kmap < Б
+\kmap > Ю
+
+\kmap / .
+\kmap ? \,
+\kmap ` ё
+\kmap ~ Ё
+\kmap @ \"
+\kmap \# №
+\kmap $ ;
+\kmap ^ :
+\kmap & ?
+\kmap | /
diff --git a/lib/kbd/koi8-u.kmap b/lib/kbd/ukrainian.kmap
similarity index 96%
rename from lib/kbd/koi8-u.kmap
rename to lib/kbd/ukrainian.kmap
index 3402852206..a21c288ac0 100644
--- a/lib/kbd/koi8-u.kmap
+++ b/lib/kbd/ukrainian.kmap
@@ -1,4 +1,4 @@
-# keyboad mapping for koi8-u
+# Ukrainian keyboard mapping
 # by Volodymyr Lisivka, 2000 <lvm_ukr@yahoo.com>
 
 \kmap q й