Merge remote-tracking branch 'upstream/master' into colorcolcharcolorcolchar

4 files changed, 269 insertions, 118 deletions

diff --git a/runtime/keymap/accents.vim b/runtime/keymap/accents.vim
index fed94c5656..a97a280881 100644
--- a/runtime/keymap/accents.vim
+++ b/runtime/keymap/accents.vim
@@ -1,6 +1,6 @@
 " Vim Keymap file for latin1 accents through dead characters
-" Maintainer: Bram Moolenaar
-" Last Change: 2006 Mar 29
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 13
 
 " All characters are given literally, conversion to another encoding (e.g.,
 " UTF-8) should work.
diff --git a/runtime/keymap/arabic_utf-8.vim b/runtime/keymap/arabic_utf-8.vim
index aeb4a4f398..60fd05fc81 100644
--- a/runtime/keymap/arabic_utf-8.vim
+++ b/runtime/keymap/arabic_utf-8.vim
@@ -1,7 +1,7 @@
 " Vim Keymap file for Arabic
 " Maintainer   : Arabic Support group <support-at-arabeyes.org>
 " Created by   : Nadim Shaikli <nadim-at-arabeyes.org>
-" Last Updated : 2003 Apr 26
+" Last Updated : 2023-10-27
 " This is for a standard Microsoft Arabic keyboard layout.
 
 " Use this short name in the status line.
@@ -41,16 +41,6 @@ m	<char-0x0629>			" (1577)	- TEH MARBUTA
 ,	<char-0x0648>			" (1608)	- WAW
 .	<char-0x0632>			" (1586)	- ZAIN
 /	<char-0x0638>			" (1592)	- ZAH
-0	<char-0x0660>			" (1632)	- Arabic 0
-1	<char-0x0661>			" (1633)	- Arabic 1
-2	<char-0x0662>			" (1634)	- Arabic 2
-3	<char-0x0663>			" (1635)	- Arabic 3
-4	<char-0x0664>			" (1636)	- Arabic 4
-5	<char-0x0665>			" (1637)	- Arabic 5
-6	<char-0x0666>			" (1638)	- Arabic 6
-7	<char-0x0667>			" (1639)	- Arabic 7
-8	<char-0x0668>			" (1640)	- Arabic 8
-9	<char-0x0669>			" (1641)	- Arabic 9
 `	<char-0x0630>			" (1584)	- THAL
 ~	<char-0x0651>			" (1617)	- Tanween -- SHADDA
 Q	<char-0x064e>			" (1614)	- Tanween -- FATHA
diff --git a/runtime/keymap/greek_utf-8.vim b/runtime/keymap/greek_utf-8.vim
index 17564542d9..c6cc32563e 100644
--- a/runtime/keymap/greek_utf-8.vim
+++ b/runtime/keymap/greek_utf-8.vim
@@ -34,7 +34,7 @@
 " without having to combine them with letters (usufull for grammarians
 " in particular) (especially for dasia and psiln we use ' for psili
 " (that is apostrophe) and ;' for dasia. This is done in order to
-" preserve the posibility to write a plain < or >.
+" preserve the possibility to write a plain < or >.
 
 " Ypogegrammeni is | following the character (the originally proposed
 " i after the character is problematic: can't write easily ai or vi) :
diff --git a/runtime/keymap/russian-typograph.vim b/runtime/keymap/russian-typograph.vim
index e0fbf22884..7c5aed6089 100644
--- a/runtime/keymap/russian-typograph.vim
+++ b/runtime/keymap/russian-typograph.vim
@@ -1,54 +1,140 @@
 " Vim Keymap file for Russian characters
-" layout English-US standard 104 key 'QWERTY', 'JCUKEN'
+" layout English-US 104 key 'QWERTY'
 "
-" Maintainer:	Restorer <restorers@users.sourceforge.net>
-" Last Changed: 20 Jan 2019
-" Description:  Раскладка сделана на основе раскладки «русская машинопись»
-" (KBDRU1.DLL), поставляемой в составе ОС MS Windows. Эта раскладка позволяет
-" печать практически все знаки препинания используя цифровой ряд и не требуя при
-" этом нажатия дополнительных клавиш, ну и также удобное расположение буквы «Ё».
-" Однако были внесены некоторые дополнения (улучшения?), в частности:
-" ‐ раздельные символы круглых скобок (), расположены на тех же позициях, что и
-" в US-International;
-" ‐ раздельные символы типографских кавычек «», расположены на клавишах «3» и
-" «4» соответственно;
-" ‐ на этих же клавишах находятся внутренние кавычки “лапки”, набираемые при
-" нажатой клавише «ALT»;
-" ‐ возможность набирать символы, отсутствующие в русской раскладке клавиатуры,
-" а именно @#$^&*{}[]"'`~<>, которые расположены на тех же местах, что и раньше.
-" Для этого не требуется переключаться в латинскую раскладку клавиатуры, а
-" оставаясь в русской, использовать для этого дополнительные клавиши «SHIFT» и
-" «ALT»;
-" ‐ и ещё несколько удобств, которые позволяют быстро и с минимальными усилиями
-" набирать текст.
-
-scriptencoding utf-8
-
-" Переключение языка ввода со стандартного сочетания <CTRL+^> на указанные ниже
-" Для режимов вставки и замены
-""или SHIFT+SPACE
-"        inoremap <S-Space> <C-^>
-""или CTRL+SPACE"
-"        inoremap <C-Space> <C-^>
-" Для режима командной строки
-""или SHIFT+SPACE
-"        cnoremap <S-Space> <C-^>
-""или CTRL+SPACE"
-"        cnoremap <C-Space> <C-^>
-" Одной командой для режимов вставки, замены и командной строки
-"        noremap! <S-Space> <C-^>
-"        noremap! <C-Space> <C-^>
+" Maintainer:	 Restorer <restorer@mail2k.ru>
+" Last Changed:	 25 Apr 2023
+" Version:	 3.3
+" Description:	 описание дано после изображений клавиатуры
+
+" Расположение символов для русского языка при подключенном файле с раскладкой
+" клавиатуры «русская типографская» (russian-typograph.vim). Версия 3.3
+
+
+"		  Ни одна из клавиш модификаторов не нажата
+
+"	  ,---,---,---,---,---,---,---,---,---,---,---,---,---,-------,
+"	  | % | ! | — | « | » | : | , | . | ? | ( | ) | ‐ | ; | <---  |
+"	  |---'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-----|
+"	  | ->| | й | ц | у | к | е | н | г | ш | щ | з | х | ъ |  /  |
+"	  |-----',--',--',--',--',--',--',--',--',--',--',--',--'-----|
+"	  | Caps | ф | ы | в | а | п | р | о | л | д | ж | э |  Enter |
+"	  |------'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'--------|
+"	  | Shift  | я | ч | с | м | и | т | ь | б | ю | ё |  Shift   |
+"	  |------,-',--'--,'---'---'---'---'---'---'-,-'---',--,------|
+"	  | Ctrl |  | Alt |                          | Alt  |  | Ctrl |
+"	  '------'  '-----'--------------------------'------'  '------'
+
+
+"			    Нажата клавиша SHIFT
+
+"	  ,---,---,---,---,---,---,---,---,---,---,---,---,---,-------,
+"	  | = | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | + | <---  |
+"	  |---'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-----|
+"	  | ->| | Й | Ц | У | К | Е | Н | Г | Ш | Щ | З | Х | Ъ |  §  |
+"	  |-----',--',--',--',--',--',--',--',--',--',--',--',--'-----|
+"	  | Caps | Ф | Ы | В | А | П | Р | О | Л | Д | Ж | Э |  Enter |
+"	  |------'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'--------|
+"	  | SHIFT  | Я | Ч | С | М | И | Т | Ь | Б | Ю | Ё |   SHIFT  |
+"	  |------,-',--'--,'---'---'---'---'---'---'-,-'---',--,------|
+"	  | Ctrl |  | Alt |                          | Alt  |  | Ctrl |
+"	  '------'  '-----'--------------------------'------'  '------'
+
+
+"			     Нажата клавиша ALT
+
+"	  ,---,---,---,---,---,---,---,---,---,---,---,---,---,-------,
+"	  | ` | № | – | „ | “ |   |   | … |   |   |   | ‑ | ± | <---  |
+"	  |---'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-----|
+"	  | ->| |   |   |   |   |   |   |   |   |   |   | [ | ] |  \  |
+"	  |-----',--',--',--',--',--',--',--',--',--',--',--',--'-----|
+"	  | Caps |   |   |   |   |   | ₽ |   |   |   |   | ' |  Enter |
+"	  |------'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'--------|
+"	  | Shift  |   |   |   |   |   |   |   |   |   |   |  Shift   |
+"	  |------,-',--'--,'---'---'---'---'---'---'-,-'---',--,------|
+"	  | Ctrl |  | ALT |          NNBSP           | ALT  |  | Ctrl |
+"	  '------'  '-----'--------------------------'------'  '------'
+
+
+"			 Нажаты клавиши SHIFT и ALT
+
+"	  ,---,---,---,---,---,---,---,---,---,---,---,---,---,-------,
+"	  | ~ |   | @ | # | $ |   | ^ | & | * |   |   | _ |   | <---  |
+"	  |---'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-----|
+"	  | ->| |   |   |   |   |   |   |   |   |   |   | { | } |  |  |
+"	  |-----',--',--',--',--',--',--',--',--',--',--',--',--'-----|
+"	  | Caps |   |   |   |   |   |   |   |   |   |   | " |  Enter |
+"	  |------'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'--------|
+"	  | SHIFT  |   |   |   |   |   |   |   | < | > |   |  SHIFT   |
+"	  |------,-',--'--,'---'---'---'---'---'---'-,-'---',--,------|
+"	  | Ctrl |  | ALT |                          | ALT  |  | Ctrl |
+"	  '------'  '-----'--------------------------'------'  '------'
+
+
+"			 Нажаты клавиши SHIFT и CTRL
+
+"	  ,---,---,---,---,---,---,---,---,---,---,---,---,---,-------,
+"	  |   |   |   |   |   |   |   |   |   |   |   |   |   | <---  |
+"	  |---'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-----|
+"	  | ->| |   |   |   |   |   |   |   |   |   |   |   |   |     |
+"	  |-----',--',--',--',--',--',--',--',--',--',--',--',--'-----|
+"	  | Caps |   |   |   |   |   |   |   |   |   |   |   |  Enter |
+"	  |------'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'--------|
+"	  | SHIFT  |   |   |   |   |   |   |   |   |   |   |  SHIFT   |
+"	  |------,-',--'--,'---'---'---'---'---'---'-,-'---',--,------|
+"	  | CTRL |  | Alt |          NBSP            | Alt  |  | CTRL |
+"	  '------'  '-----'--------------------------'------'  '------'
+
+
+"			 Нажаты клавиши ALT и CTRL
+
+"	  ,---,---,---,---,---,---,---,---,---,---,---,---,---,-------,
+"	  |   |   |   |   |   |   |   |   |   |   |   |   |   | <---  |
+"	  |---'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-----|
+"	  | ->| |   |   | у́ |   | е́ |   |   |   |   |   |   |   |     |
+"	  |-----',--',--',--',--',--',--',--',--',--',--',--',--'-----|
+"	  | Caps |   | ы́ |   | а́ |   |   | о́ |   |   |   | э́ |  Enter |
+"	  |------'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'--------|
+"	  | Shift  | я́ |   |   |   | и́ |   |   |   | ю́ |   |  Shift   |
+"	  |------,-',--'--,'---'---'---'---'---'---'-,-'---',--,------|
+"	  | CTRL |  | ALT |                          | ALT  |  | CTRL |
+"	  '------'  '-----'--------------------------'------'  '------'
+
+
+"			 Нажаты клавиши SHIFT, ALT и CTRL
+
+"	  ,---,---,---,---,---,---,---,---,---,---,---,---,---,-------,
+"	  |   |   |   |   |   |   |   |   |   |   |   |   |   | <---  |
+"	  |---'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-----|
+"	  | ->| |   |   | У́ |   | Е́ |   |   |   |   |   |   |   |     |
+"	  |-----',--',--',--',--',--',--',--',--',--',--',--',--'-----|
+"	  | Caps |   | Ы́ |   | А́ |   |   | О́ |   |   |   | Э́ |  Enter |
+"	  |------'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'--------|
+"	  | SHIFT  | Я́ |   |   |   | И́ |   |   |   | Ю́ |   |  SHIFT   |
+"	  |------,-',--'--,'---'---'---'---'---'---'-,-'---',--,------|
+"	  | CTRL |  | ALT |                          | ALT  |  | CTRL |
+"	  '------'  '-----'--------------------------'------'  '------'
+
+
+" Раскладка сделана на основе раскладки «русская машинопись» (KBDRU1.DLL),
+" поставляемой в составе ОС MS Windows.
 "
-" Стандартное переключение по CTRL+^ после этих переназначений также сохраняется
+" Как видите, принцип достаточно простой, — при наборе русского текста все
+" буквы, знаки пунктуации и большинство специальных символов находятся под
+" пальцами и их набор не требует нажатия каких-то дополнительных клавиш.  При
+" наборе символов, которые отсутствуют в русской раскладке, но есть в раскладке
+" US-International, требуется нажать или клавишу <ALT>, если в английской
+" раскладке они набираются без модификаторов, или нажать <ALT>+<SHIFT>, если они
+" набираются с модификатором <SHIFT>.
+
+" scriptencoding utf-8
 
 let b:keymap_name ="RUS"
 
 loadkeymap
 
-"	    DIGITAL ROW
+"		DIGITAL ROW
 
-"	The Shift key is not pressed
-"
+"	None of the modifier keys are pressed
 <char-0x0060>	    <char-0x0025>	" PERCENT SIGN
 <char-0x0031>	    <char-0x0021>	" EXCLAMATION MARK
 <char-0x0032>	    <char-0x2014>	" EM DASH
@@ -63,8 +149,7 @@ loadkeymap
 <char-0x002d>	    <char-0x2010>	" HYPHEN
 <char-0x003d>	    <char-0x003b>	" SEMICOLON
 
-"	The Shift key is pressed
-
+"	The SHIFT key is pressed
 <char-0x007e>	    <char-0x003d>	" EQUALS SIGN
 <char-0x0021>	    <char-0x0031>	" DIGIT ONE
 <char-0x0040>	    <char-0x0032>	" DIGIT TWO
@@ -79,112 +164,188 @@ loadkeymap
 <char-0x005f>	    <char-0x002d>	" HYPHEN-MINUS
 <char-0x002b>	    <char-0x002b>	" PLUS SIGN
 
-"	    ALPHABETICAL 1st ROW
+"	The ALT key pressed
+<A-char-0x0060>	    <char-0x0060>	" GRAVE ACCENT 
+<A-char-0x0031>	    <char-0x2116>       " NUMERO SIGN
+<A-char-0x0032>	    <char-0x2013>	" EN DASH
+<A-char-0x0033>	    <char-0x201e>	" DOUBLE LOW-9 QUOTATION MARK
+<A-char-0x0034>	    <char-0x201c>	" LEFT DOUBLE QUOTATION MARK
+<A-char-0x0037>	    <char-0x2026>	" HORIZONTAL ELLIPSIS
+<A-char-0x002d>	    <char-0x2011>	" NON-BREAKING HYPHEN
+<A-char-0x003d>	    <char-0x00b1>	" PLUS-MINUS SIGN
+
+"	The SHIFT and ALT keys pressed
+<A-char-0x007e>	    <char-0x007e>	" TILDE
+<A-char-0x0040>	    <char-0x0040>	" COMMERCIAL AT
+<A-char-0x0023>	    <char-0x0023>	" NUMBER SIGN
+<A-char-0x0024>	    <char-0x0024>	" DOLLAR SIGN
+<A-char-0x005e>	    <char-0x005e>	" CIRCUMFLEX ACCENT
+<A-char-0x0026>	    <char-0x0026>	" AMPERSAND
+<A-char-0x002a>	    <char-0x002a>	" ASTERISK
+<A-char-0x005f>	    <char-0x005f>	" LOW LINE
 
+
+"		ALPHABETICAL 1st ROW
+
+"	None of the modifier keys are pressed
 <char-0x0071>	    <char-0x0439>	" CYRILLIC SMALL LETTER SHORT I
-<char-0x0051>	    <char-0x0419>	" CYRILLIC CAPITAL LETTER SHORT I
 <char-0x0077>	    <char-0x0446>	" CYRILLIC SMALL LETTER TSE
-<char-0x0057>	    <char-0x0426>	" CYRILLIC CAPITAL LETTER TSE
 <char-0x0065>	    <char-0x0443>	" CYRILLIC SMALL LETTER U
-<char-0x0045>	    <char-0x0423>	" CYRILLIC CAPITAL LETTER U
 <char-0x0072>	    <char-0x043a>	" CYRILLIC SMALL LETTER KA
-<char-0x0052>	    <char-0x041a>	" CYRILLIC CAPITAL LETTER KA
 <char-0x0074>	    <char-0x0435>	" CYRILLIC SMALL LETTER IE
-<char-0x0054>	    <char-0x0415>	" CYRILLIC CAPITAL LETTER IE
 <char-0x0079>	    <char-0x043d>	" CYRILLIC SMALL LETTER EN
-<char-0x0059>	    <char-0x041d>	" CYRILLIC CAPITAL LETTER EN
 <char-0x0075>	    <char-0x0433>	" CYRILLIC SMALL LETTER GHE
-<char-0x0055>	    <char-0x0413>	" CYRILLIC CAPITAL LETTER GHE
 <char-0x0069>	    <char-0x0448>	" CYRILLIC SMALL LETTER SHA
-<char-0x0049>	    <char-0x0428>	" CYRILLIC CAPITAL LETTER SHA
 <char-0x006f>	    <char-0x0449>	" CYRILLIC SMALL LETTER SHCHA
-<char-0x004f>	    <char-0x0429>	" CYRILLIC CAPITAL LETTER SHCHA
 <char-0x0070>	    <char-0x0437>	" CYRILLIC SMALL LETTER ZE
-<char-0x0050>	    <char-0x0417>	" CYRILLIC CAPITAL LETTER ZE
 <char-0x005b>	    <char-0x0445>	" CYRILLIC SMALL LETTER HA
-<char-0x007b>	    <char-0x0425>	" CYRILLIC CAPITAL LETTER HA
 <char-0x005d>	    <char-0x044a>	" CYRILLIC SMALL LETTER HARD SIGN
+
+"	The SHIFT key is pressed
+<char-0x0051>	    <char-0x0419>	" CYRILLIC CAPITAL LETTER SHORT I
+<char-0x0057>	    <char-0x0426>	" CYRILLIC CAPITAL LETTER TSE
+<char-0x0045>	    <char-0x0423>	" CYRILLIC CAPITAL LETTER U
+<char-0x0052>	    <char-0x041a>	" CYRILLIC CAPITAL LETTER KA
+<char-0x0054>	    <char-0x0415>	" CYRILLIC CAPITAL LETTER IE
+<char-0x0059>	    <char-0x041d>	" CYRILLIC CAPITAL LETTER EN
+<char-0x0055>	    <char-0x0413>	" CYRILLIC CAPITAL LETTER GHE
+<char-0x0049>	    <char-0x0428>	" CYRILLIC CAPITAL LETTER SHA
+<char-0x004f>	    <char-0x0429>	" CYRILLIC CAPITAL LETTER SHCHA
+<char-0x0050>	    <char-0x0417>	" CYRILLIC CAPITAL LETTER ZE
+<char-0x007b>	    <char-0x0425>	" CYRILLIC CAPITAL LETTER HA
 <char-0x007d>	    <char-0x042a>	" CYRILLIC CAPITAL LETTER HARD SIGN
 
-"	    ALPHABETIC 2nd ROW
+"	The ALT key pressed
+<A-char-0x005b>	    <char-0x005b>       " LEFT SQUARE BRACKET
+<A-char-0x005d>	    <char-0x005d>       " RIGHT SQUARE BRACKET
+
+"	The SHIFT and ALT keys pressed
+<A-char-0x007b>	    <char-0x007b>       " LEFT CURLY BRACKET
+<A-char-0x007d>	    <char-0x007d>       " RIGHT CURLY BRACKET
 
+"	The ALT and CTRL key pressed
+<A-C-char-0x0065>    <char-0x0443><char-0x0301>	" CYRILLIC SMALL LETTER U with COMBINING ACUTE ACCENT
+<A-C-char-0x0074>    <char-0x0435><char-0x0301>	" CYRILLIC SMALL LETTER IE with COMBINING ACUTE ACCENT
+
+"	The SHIFT and ALT and CTRL keys pressed
+<S-A-C-char-0x0045>    <char-0x0423><char-0x0301>   " CYRILLIC CAPITAL LETTER U with COMBINING ACUTE ACCENT
+<S-A-C-char-0x0054>    <char-0x0415><char-0x0301>   " CYRILLIC CAPITAL LETTER IE with COMBINING ACUTE ACCENT
+
+
+"		ALPHABETIC 2st ROW
+
+"	None of the modifier keys are pressed
 <char-0x0061>	    <char-0x0444>	" CYRILLIC SMALL LETTER EF
-<char-0x0041>	    <char-0x0424>	" CYRILLIC CAPITAL LETTER EF
 <char-0x0073>	    <char-0x044b>	" CYRILLIC SMALL LETTER YERU
-<char-0x0053>	    <char-0x042b>	" CYRILLIC CAPITAL LETTER YERU
 <char-0x0064>	    <char-0x0432>	" CYRILLIC SMALL LETTER VE
-<char-0x0044>	    <char-0x0412>	" CYRILLIC CAPITAL LETTER VE
 <char-0x0066>	    <char-0x0430>	" CYRILLIC SMALL LETTER A
-<char-0x0046>	    <char-0x0410>	" CYRILLIC CAPITAL LETTER A
 <char-0x0067>	    <char-0x043f>	" CYRILLIC SMALL LETTER PE
-<char-0x0047>	    <char-0x041f>	" CYRILLIC CAPITAL LETTER PE
 <char-0x0068>	    <char-0x0440>	" CYRILLIC SMALL LETTER ER
-<char-0x0048>	    <char-0x0420>	" CYRILLIC CAPITAL LETTER ER
 <char-0x006a>	    <char-0x043e>	" CYRILLIC SMALL LETTER O
-<char-0x004a>	    <char-0x041e>	" CYRILLIC CAPITAL LETTER O
 <char-0x006b>	    <char-0x043b>	" CYRILLIC SMALL LETTER EL
-<char-0x004b>	    <char-0x041b>	" CYRILLIC CAPITAL LETTER EL
 <char-0x006c>	    <char-0x0434>	" CYRILLIC SMALL LETTER DE
-<char-0x004c>	    <char-0x0414>	" CYRILLIC CAPITAL LETTER DE
 <char-0x003b>	    <char-0x0436>	" CYRILLIC SMALL LETTER ZHE
-<char-0x003a>	    <char-0x0416>	" CYRILLIC CAPITAL LETTER ZHE
 <char-0x0027>	    <char-0x044d>	" CYRILLIC SMALL LETTER E
+
+"	The SHIFT key is pressed
+<char-0x0041>	    <char-0x0424>	" CYRILLIC CAPITAL LETTER EF
+<char-0x0053>	    <char-0x042b>	" CYRILLIC CAPITAL LETTER YERU
+<char-0x0044>	    <char-0x0412>	" CYRILLIC CAPITAL LETTER VE
+<char-0x0046>	    <char-0x0410>	" CYRILLIC CAPITAL LETTER A
+<char-0x0047>	    <char-0x041f>	" CYRILLIC CAPITAL LETTER PE
+<char-0x0048>	    <char-0x0420>	" CYRILLIC CAPITAL LETTER ER
+<char-0x004a>	    <char-0x041e>	" CYRILLIC CAPITAL LETTER O
+<char-0x004b>	    <char-0x041b>	" CYRILLIC CAPITAL LETTER EL
+<char-0x004c>	    <char-0x0414>	" CYRILLIC CAPITAL LETTER DE
+<char-0x003a>	    <char-0x0416>	" CYRILLIC CAPITAL LETTER ZHE
 <char-0x0022>	    <char-0x042d>	" CYRILLIC CAPITAL LETTER E
 
-"	    ALPHABETIC 3rd ROW
+"	The ALT key pressed
+<A-char-0x0027>	    <char-0x0027>       " APOSTROPHE
+<A-char-0x0068>	    <char-0x20bd>	" RUBLE SIGN
+
+"	The SHIFT and ALT keys pressed
+<A-char-0x0022>	    <char-0x0022>       " QUOTATION MARK
+
+"	The ALT and CTRL key pressed
+<A-C-char-0x0073>    <char-0x044b><char-0x0301>	" CYRILLIC SMALL LETTER YERU with COMBINING ACUTE ACCENT
+<A-C-char-0x0066>    <char-0x0430><char-0x0301>	" CYRILLIC SMALL LETTER A with COMBINING ACUTE ACCENT
+<A-C-char-0x006a>    <char-0x043e><char-0x0301>	" CYRILLIC SMALL LETTER O with COMBINING ACUTE ACCENT
+<A-C-char-0x0027>    <char-0x044d><char-0x0301>	" CYRILLIC SMALL LETTER E with COMBINING ACUTE ACCENT
+
+"	The SHIFT and ALT and CTRL keys pressed
+<S-A-C-char-0x0053>    <char-0x042b><char-0x0301>   " CYRILLIC CAPITAL LETTER YERU with COMBINING ACUTE ACCENT
+<S-A-C-char-0x0046>    <char-0x0410><char-0x0301>   " CYRILLIC CAPITAL LETTER A with COMBINING ACUTE ACCENT
+<S-A-C-char-0x004a>    <char-0x041e><char-0x0301>   " CYRILLIC CAPITAL LETTER O with COMBINING ACUTE ACCENT
+<S-A-C-char-0x0022>    <char-0x042d><char-0x0301>   " CYRILLIC CAPITAL LETTER E with COMBINING ACUTE ACCENT
 
+
+"		ALPHABETIC 3st ROW
+
+"	None of the modifier keys are pressed
 <char-0x007a>	    <char-0x044f>	" CYRILLIC SMALL LETTER YA
-<char-0x005a>	    <char-0x042f>	" CYRILLIC CAPITAL LETTER YA
 <char-0x0078>	    <char-0x0447>	" CYRILLIC SMALL LETTER CHE
-<char-0x0058>	    <char-0x0427>	" CYRILLIC CAPITAL LETTER CHE
 <char-0x0063>	    <char-0x0441>	" CYRILLIC SMALL LETTER ES
-<char-0x0043>	    <char-0x0421>	" CYRILLIC CAPITAL LETTER ES
 <char-0x0076>	    <char-0x043c>	" CYRILLIC SMALL LETTER EM
-<char-0x0056>	    <char-0x041c>	" CYRILLIC CAPITAL LETTER EM
 <char-0x0062>	    <char-0x0438>	" CYRILLIC SMALL LETTER I
-<char-0x0042>	    <char-0x0418>	" CYRILLIC CAPITAL LETTER I
 <char-0x006e>	    <char-0x0442>	" CYRILLIC SMALL LETTER TE
-<char-0x004e>	    <char-0x0422>	" CYRILLIC CAPITAL LETTER TE
 <char-0x006d>	    <char-0x044c>	" CYRILLIC SMALL LETTER SOFT SIGN
-<char-0x004d>	    <char-0x042c>	" CYRILLIC CAPITAL LETTER SOFT SIGN
 <char-0x002c>	    <char-0x0431>	" CYRILLIC SMALL LETTER BE
-<char-0x003c>	    <char-0x0411>	" CYRILLIC CAPITAL LETTER BE
 <char-0x002e>	    <char-0x044e>	" CYRILLIC SMALL LETTER YU
-<char-0x003e>	    <char-0x042e>	" CYRILLIC CAPITAL LETTER YU
 <char-0x002f>	    <char-0x0451>	" CYRILLIC SMALL LETTER IO
+
+"	The SHIFT key is pressed
+<char-0x005a>	    <char-0x042f>	" CYRILLIC CAPITAL LETTER YA
+<char-0x0058>	    <char-0x0427>	" CYRILLIC CAPITAL LETTER CHE
+<char-0x0043>	    <char-0x0421>	" CYRILLIC CAPITAL LETTER ES
+<char-0x0056>	    <char-0x041c>	" CYRILLIC CAPITAL LETTER EM
+<char-0x0042>	    <char-0x0418>	" CYRILLIC CAPITAL LETTER I
+<char-0x004e>	    <char-0x0422>	" CYRILLIC CAPITAL LETTER TE
+<char-0x004d>	    <char-0x042c>	" CYRILLIC CAPITAL LETTER SOFT SIGN
+<char-0x003c>	    <char-0x0411>	" CYRILLIC CAPITAL LETTER BE
+<char-0x003e>	    <char-0x042e>	" CYRILLIC CAPITAL LETTER YU
 <char-0x003f>	    <char-0x0401>	" CYRILLIC CAPITAL LETTER IO
 
-"	    VK_OEM_5 key (scan code 2b)
+"	The ALT key pressed
 
-"	The Shift key is not pressed
-<char-0x005c>	    <char-0x002f>	" SOLIDUS
-"	The Shift key is pressed
-<char-0x007c>	    <char-0x005c>	" REVERSE SOLIDUS
 
-"	    Alt key pressed
+"	The SHIFT and ALT keys pressed
+<A-char-0x003c>	    <char-0x003c>       " LESS-THAN SIGN
+<A-char-0x003e>	    <char-0x003e>       " GREATER-THAN SIGN
 
-<A-char-0x0060>	    <char-0x0060>	" GRAVE ACCENT 
-<A-char-0x0031>	    <char-0x2116>       " NUMERO SIGN
-<A-char-0x0033>	    <char-0x201c>	" LEFT DOUBLE QUOTATION MARK
-<A-char-0x0034>	    <char-0x201d>	" RIGHT DOUBLE QUOTATION MARK
-<A-char-0x005b>	    <char-0x005b>       " LEFT SQUARE BRACKET
-<A-char-0x005d>	    <char-0x005d>       " RIGHT SQUARE BRACKET
-<A-char-0x0027>	    <char-0x0027>       " APOSTROPHE
+"	The ALT and CTRL key pressed
+<A-C-char-0x007a>    <char-0x044f><char-0x0301>	" CYRILLIC SMALL LETTER YA with COMBINING ACUTE ACCENT
+<A-C-char-0x0062>    <char-0x0438><char-0x0301>	" CYRILLIC SMALL LETTER I with COMBINING ACUTE ACCENT
+<A-C-char-0x002e>    <char-0x044e><char-0x0301>	" CYRILLIC SMALL LETTER YU with COMBINING ACUTE ACCENT
 
-"	    Alt and Shift keys pressed
+"	The SHIFT and ALT and CTRL keys pressed
+<S-A-C-char-0x005a>    <char-0x042f><char-0x0301>   " CYRILLIC CAPITAL LETTER YA with COMBINING ACUTE ACCENT
+<S-A-C-char-0x0042>    <char-0x0418><char-0x0301>   " CYRILLIC CAPITAL LETTER I with COMBINING ACUTE ACCENT
+<S-A-C-char-0x003e>    <char-0x042e><char-0x0301>   " CYRILLIC CAPITAL LETTER Y with COMBINING ACUTE ACCENT
 
-<A-char-0x007e>	    <char-0x007e>	" TILDE
-<A-char-0x0040>	    <char-0x0040>       " COMMERCIAL AT
-<A-char-0x0023>	    <char-0x0023>       " NUMBER SIGN
-<A-char-0x0024>	    <char-0x0024>       " DOLLAR SIGN
-<A-char-0x005e>	    <char-0x005e>       " CIRCUMFLEX ACCENT
-<A-char-0x0026>	    <char-0x0026>       " AMPERSAND
-<A-char-0x002a>	    <char-0x002a>       " ASTERISK
-<A-char-0x005f>	    <char-0x005f>       " LOW LINE
-<A-char-0x007b>	    <char-0x007b>       " LEFT CURLY BRACKET
-<A-char-0x007d>	    <char-0x007d>       " RIGHT CURLY BRACKET
-<A-char-0x0022>	    <char-0x0022>       " QUOTATION MARK
-<A-char-0x003c>	    <char-0x003c>       " LESS-THAN SIGN
-<A-char-0x003e>	    <char-0x003e>       " GREATER-THAN SIGN
+
+"		VK_OEM_5 key (scan code 2b)
+
+"	None of the modifier keys are pressed
+<char-0x005c>	    <char-0x002f>	" SOLIDUS
+
+"	The SHIFT key is pressed
+<char-0x007c>	    <char-0x00a7>	" SECTION SIGN
+
+"	The ALT key is pressed
+<A-char-0x005c>	    <char-0x005c>	" REVERSE SOLIDUS
+
+"	The SHIFT and ALT keys pressed
 <A-char-0x007c>	    <char-0x007c>       " VERTICAL LINE
 
+
+"		SPACE BAR key
+
+"	The ALT key pressed
+<A-char-0x0020>	    <char-0x202f>	" NARROW NO-BREAK SPACE
+
+"	The SHIFT and CTRL keys pressed
+<S-C-char-0x0020>   <char-0x00A0>	" NO-BREAK SPACE
+
+"	    \///\\
+