updated for version 7.2b-000
diff --git a/runtime/keymap/bulgarian-bds.vim b/runtime/keymap/bulgarian-bds.vim
index bb789a9..bf837c8 100644
--- a/runtime/keymap/bulgarian-bds.vim
+++ b/runtime/keymap/bulgarian-bds.vim
@@ -1,31 +1,39 @@
-" Vim keymap file for Bulgarian and Russian characters, `bds' layout.
-" Can be used with utf-8 or cp1251 file encodings.
-" This file itself is in utf-8
+" Vim keymap file for Bulgarian and Russian characters, "bds" layout.
+" Most of it can be used with both utf-8 and cp1251 file encodings, except
+" the accented vowels which can only be stored in utf-8.
+" This file itself is in utf-8.
" Maintainer: Boyko Bantchev <boykobb@gmail.com>
-" URI: http://www.math.bas.bg/softeng/bantchev/misc/vim/bulgarian-bds.vim
-" Last Changed: 2006 Oct 18
+" URI: http://www.math.bas.bg/bantchev/vim/bulgarian-bds.vim
+" Last Changed: 2008 June 28
-" This keymap corresponds to what is called Bulgarian standard,
-" or BDS (БДС) typewriter keyboard layout.
-" In addition to the Bulgarian alphabet, BDS prescribes the presence
-" of the following characters:
-" — The Cyrillic letters Э (capital), and ы and э (small)
-" (these are present in the Russian alphabet).
-" — The latin capital letters I and V (these are used to type
-" Roman numerals without having to leave Cyrillic mode).
-" — „ and “ (Bulgarian quotation style), and « and » (Russian quotation
-" style).
-" — §, №, —, •, ·, ±, ¬, ¤, and €
+" This keymap corresponds to what is called Bulgarian standard typewriter
+" keyboard layout (BDS, БДС).
"
-" Some punctuation characters that are present in ascii are mapped in BDS
-" to keys different from the ones they occupy in the qwerty layout, because
-" the latter are used to type other characters.
+" Note that, in addition to the Bulgarian alphabet, the BDS layout prescribes
+" the presence of the following characters:
+" — The Russian letters ы (small), and Э and э (capital and small).
+" — The latin capital letters I and V – used to type Roman numerals
+" without having to leave Cyrillic mode.
"
-" In this keymap also defined (not in BDS) are the Russian letters Ё (capital)
-" and ё (small), as well as the Russian capital letter Ы (see above the small
-" counterpart). This way, using the bulgarian-bds keymap, one can access both
-" the Bulgarian and the Russian alphabets.
+" Some punctuation characters present in ascii are mapped in BDS to keys
+" different from the ones they occupy in the qwerty layout, because the latter
+" keys are used to type other characters.
+"
+" In this keymap, also defined (besides BDS) are:
+" — The Russian letters Ё and ё (capital and small), as well as the
+" Russian capital letter Ы (see above for the small counterpart).
+" This way, using the bulgarian-bds keymap, one can access both
+" the Bulgarian and the Russian alphabets.
+" — The quotation marks „ “ ” ‘ ’ (used in the Bulgarian and English
+" quotation styles), as well as « » (Russian quotation style).
+" — The characters §, №, – (en-dash), — (em-dash), …, •, ·, ±, °, ¬,
+" ¤, and €.
+"
+" The keymap also defines key combinations for accented vowels in Bulgarian.
+"
+" For details of what key or key combination maps to what character, please
+" see below the map table itself.
scriptencoding utf-8
@@ -114,14 +122,38 @@
@ ? QUESTION MARK
} § SECTION SIGN (PARAGRAPH SIGN)
) № NUMERO SIGN
--- — EM DASH
+-- – EN DASH
+--- — EM DASH
+.. … HORIZONTAL ELLIPSIS
+`` “ LEFT DOUBLE QUOTATION MARK
+'' ” RIGHT DOUBLE QUOTATION MARK
,, „ DOUBLE LOW-9 QUOTATION MARK
-`` “ LEFT DOUBLE QUOTATION MARK
+`. ‘ LEFT SINGLE QUOTATION MARK
+'. ’ RIGHT SINGLE QUOTATION MARK
<< « LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
>> » RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-00 • BULLET
-.. · MIDDLE DOT
+** • BULLET
+,. · MIDDLE DOT
+- ± PLUS-MINUS SIGN
+^o ° DEGREE SIGN
~~ ¬ NOT SIGN
@@ ¤ CURRENCY SIGN
$$ € EURO SIGN
+
+" accented vowels cannot map onto cp1251 – use utf-8 file encoding
+`D А̀ CYRILLIC CAPITAL LETTER A + GRAVE ACCENT (COMPOSED)
+`d а̀ CYRILLIC SMALL LETTER A + GRAVE ACCENT (COMPOSED)
+`E Ѐ CYRILLIC CAPITAL LETTER IE + GRAVE ACCENT (COMPOSED)
+`e ѐ CYRILLIC SMALL LETTER IE + GRAVE ACCENT (COMPOSED)
+`R Ѝ CYRILLIC CAPITAL LETTER I + GRAVE ACCENT (COMPOSED)
+`r ѝ CYRILLIC SMALL LETTER I + GRAVE ACCENT (COMPOSED)
+`F О̀ CYRILLIC CAPITAL LETTER O + GRAVE ACCENT (COMPOSED)
+`f о̀ CYRILLIC SMALL LETTER O + GRAVE ACCENT (COMPOSED)
+`W У̀ CYRILLIC CAPITAL LETTER U + GRAVE ACCENT (COMPOSED)
+`w у̀ CYRILLIC SMALL LETTER U + GRAVE ACCENT (COMPOSED)
+`C Ъ̀ CYRILLIC CAPITAL LETTER HARD SIGN + GRAVE ACCENT (COMPOSED)
+`c ъ̀ CYRILLIC SMALL LETTER HARD SIGN + GRAVE ACCENT (COMPOSED)
+`Z Ю̀ CYRILLIC CAPITAL LETTER YU + GRAVE ACCENT (COMPOSED)
+`z ю̀ CYRILLIC SMALL LETTER YU + GRAVE ACCENT (COMPOSED)
+`S Я̀ CYRILLIC CAPITAL LETTER YA + GRAVE ACCENT (COMPOSED)
+`s я̀ CYRILLIC SMALL LETTER YA + GRAVE ACCENT (COMPOSED)
diff --git a/runtime/keymap/bulgarian-phonetic.vim b/runtime/keymap/bulgarian-phonetic.vim
index feec587..bac2e7e 100644
--- a/runtime/keymap/bulgarian-phonetic.vim
+++ b/runtime/keymap/bulgarian-phonetic.vim
@@ -1,26 +1,35 @@
-" Vim keymap file for Bulgarian and Russian characters, `phonetic' layout.
-" Can be used with utf-8 or cp1251 file encodings.
-" This file itself is in utf-8
+" Vim keymap file for Bulgarian and Russian characters, "phonetic" layout.
+" Most of it can be used with both utf-8 and cp1251 file encodings, except
+" the accented vowels which can only be stored in utf-8.
+" This file itself is in utf-8.
" Maintainer: Boyko Bantchev <boykobb@gmail.com>
-" URI: http://www.math.bas.bg/softeng/bantchev/misc/vim/bulgarian-phonetic.vim
-" Last Changed: 2006 Oct 18
+" URI: http://www.math.bas.bg/bantchev/vim/bulgarian-phonetic.vim
+" Last Changed: 2008 June 28
-" This keymap corresponds to what is called `phonetic layout' in Bulgaria:
-" Cyrillic letters homophonous with Latin letters tend to take the same
-" places as the latter ones. Most of the keys corresponding to punctuation
-" characters are left unmapped, so they retain their usual (qwerty) meanings
-" while typing in Cyrillic.
+" For a rationale for the layout and additional info on typing in Bulgarian
+" using Unicode Cyrillic please see:
+
+" This keymap corresponds to what is called "phonetic layout" in Bulgaria:
+" Cyrillic letters tend to be mapped to their Latin homophones, if present.
+" Most keys corresponding to punctuation characters are left unmapped, so
+" they retain their usual (qwerty) meanings in Cyrillic typing.
"
-" In addition to the Bulgarian alphabet, the keymap defines the following
-" characters:
-" — The Cyrillic letters Ё and ё, Э and э, and Ы and ы (in pairs of
-" capital and small). These are the letters in the Russian alphabet
-" that are not present in Bulgarian, so using the bulgarian-phonetic
-" keymap one can type in Russian, too.
-" — „ and “ (Bulgarian quotation style), and « and » (Russian quotation
-" style).
-" — §, №, —, •, ·, ±, ¬, ¤, and €
+" In addition to the Bulgarian alphabet, the keymap makes accessible the
+" following characters:
+" — The letters Ё and ё, Э and э, and Ы and ы (in pairs of capital and
+" small). These are the letters in the Russian alphabet that are not
+" present in Bulgarian, so using the bulgarian-phonetic keymap one can
+" type in Russian, too.
+" — The quotation marks „ “ ” ‘ ’ (used in the Bulgarian and English
+" quotation styles), as well as « » (Russian quotation style).
+" — The characters §, №, – (en-dash), — (em-dash), …, •, ·, ±, °, ¬,
+" ¤, and €.
+"
+" The keymap also defines key combinations for accented vowels in Bulgarian.
+"
+" For details of what key or key combination maps to what character, please
+" see below the map table itself.
scriptencoding utf-8
@@ -55,7 +64,7 @@
{ Ш CYRILLIC CAPITAL LETTER SHA
} Щ CYRILLIC CAPITAL LETTER SHCHA
Y Ъ CYRILLIC CAPITAL LETTER HARD SIGN
-YJ Ы CYRILLIC CAPITAL LETTER YERU
+YI Ы CYRILLIC CAPITAL LETTER YERU
X Ь CYRILLIC CAPITAL LETTER SOFT SIGN
YE Э CYRILLIC CAPITAL LETTER REVERSED E
| Ю CYRILLIC CAPITAL LETTER YU
@@ -88,21 +97,45 @@
[ ш CYRILLIC SMALL LETTER SHA
] щ CYRILLIC SMALL LETTER SHCHA
y ъ CYRILLIC SMALL LETTER HARD SIGN
-yj ы CYRILLIC SMALL LETTER YERU
+yi ы CYRILLIC SMALL LETTER YERU
x ь CYRILLIC SMALL LETTER SOFT SIGN
ye э CYRILLIC SMALL LETTER REVERSED E
\\ ю CYRILLIC SMALL LETTER YU
q я CYRILLIC SMALL LETTER YA
!! § SECTION SIGN (PARAGRAPH SIGN)
## № NUMERO SIGN
--- — EM DASH
-,, „ DOUBLE LOW-9 QUOTATION MARK
+-- – EN DASH
+--- — EM DASH
+.. … HORIZONTAL ELLIPSIS
`` “ LEFT DOUBLE QUOTATION MARK
+'' ” RIGHT DOUBLE QUOTATION MARK
+,, „ DOUBLE LOW-9 QUOTATION MARK
+`. ‘ LEFT SINGLE QUOTATION MARK
+'. ’ RIGHT SINGLE QUOTATION MARK
<< « LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
>> » RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-00 • BULLET
-.. · MIDDLE DOT
+** • BULLET
+,. · MIDDLE DOT
+- ± PLUS-MINUS SIGN
+^o ° DEGREE SIGN
~~ ¬ NOT SIGN
@@ ¤ CURRENCY SIGN
$$ € EURO SIGN
+
+" accented vowels cannot map onto cp1251 – use utf-8 file encoding
+'A А̀ CYRILLIC CAPITAL LETTER A + GRAVE ACCENT (COMPOSED)
+'a а̀ CYRILLIC SMALL LETTER A + GRAVE ACCENT (COMPOSED)
+'E Ѐ CYRILLIC CAPITAL LETTER IE + GRAVE ACCENT (COMPOSED)
+'e ѐ CYRILLIC SMALL LETTER IE + GRAVE ACCENT (COMPOSED)
+'I Ѝ CYRILLIC CAPITAL LETTER I + GRAVE ACCENT (COMPOSED)
+'i ѝ CYRILLIC SMALL LETTER I + GRAVE ACCENT (COMPOSED)
+'O О̀ CYRILLIC CAPITAL LETTER O + GRAVE ACCENT (COMPOSED)
+'o о̀ CYRILLIC SMALL LETTER O + GRAVE ACCENT (COMPOSED)
+'U У̀ CYRILLIC CAPITAL LETTER U + GRAVE ACCENT (COMPOSED)
+'u у̀ CYRILLIC SMALL LETTER U + GRAVE ACCENT (COMPOSED)
+'Y Ъ̀ CYRILLIC CAPITAL LETTER HARD SIGN + GRAVE ACCENT (COMPOSED)
+'y ъ̀ CYRILLIC SMALL LETTER HARD SIGN + GRAVE ACCENT (COMPOSED)
+'| Ю̀ CYRILLIC CAPITAL LETTER YU + GRAVE ACCENT (COMPOSED)
+'\\ ю̀ CYRILLIC SMALL LETTER YU + GRAVE ACCENT (COMPOSED)
+'Q Я̀ CYRILLIC CAPITAL LETTER YA + GRAVE ACCENT (COMPOSED)
+'q я̀ CYRILLIC SMALL LETTER YA + GRAVE ACCENT (COMPOSED)
diff --git a/runtime/keymap/bulgarian.vim b/runtime/keymap/bulgarian.vim
deleted file mode 100644
index 3c80c9f..0000000
--- a/runtime/keymap/bulgarian.vim
+++ /dev/null
@@ -1,90 +0,0 @@
-" Vim Keymap file for russian characters, phonetic layout 'yawerty'
-" Useful mainly with utf-8 but may work with other encodings
-
-" Maintainer: Alberto Mardegan <mardy@despammed.com>
-" Last Changed: 2004 Oct 17
-
-" All characters are given literally, conversion to another encoding (e.g.,
-" UTF-8) should work.
-scriptencoding utf-8
-
-let b:keymap_name = "bg"
-
-loadkeymap
-A А CYRILLIC CAPITAL LETTER A
-B Б CYRILLIC CAPITAL LETTER BE
-W В CYRILLIC CAPITAL LETTER VE
-V В CYRILLIC CAPITAL LETTER VE
-G Г CYRILLIC CAPITAL LETTER GHE
-D Д CYRILLIC CAPITAL LETTER DE
-E Е CYRILLIC CAPITAL LETTER IE
-Zh Ж CYRILLIC CAPITAL LETTER ZHE
-ZH Ж CYRILLIC CAPITAL LETTER ZHE
-Z З CYRILLIC CAPITAL LETTER ZE
-I И CYRILLIC CAPITAL LETTER I
-J Й CYRILLIC CAPITAL LETTER SHORT I
-K К CYRILLIC CAPITAL LETTER KA
-L Л CYRILLIC CAPITAL LETTER EL
-M М CYRILLIC CAPITAL LETTER EM
-N Н CYRILLIC CAPITAL LETTER EN
-O О CYRILLIC CAPITAL LETTER O
-P П CYRILLIC CAPITAL LETTER PE
-R Р CYRILLIC CAPITAL LETTER ER
-S С CYRILLIC CAPITAL LETTER ES
-T Т CYRILLIC CAPITAL LETTER TE
-U У CYRILLIC CAPITAL LETTER U
-F Ф CYRILLIC CAPITAL LETTER EF
-H Х CYRILLIC CAPITAL LETTER HA
-C Ц CYRILLIC CAPITAL LETTER TSE
-Ch Ч CYRILLIC CAPITAL LETTER CHE
-CH Ч CYRILLIC CAPITAL LETTER CHE
-Sh Ш CYRILLIC CAPITAL LETTER SHA
-SH Ш CYRILLIC CAPITAL LETTER SHA
-Sht Щ CYRILLIC CAPITAL LETTER SHCHA
-SHt Щ CYRILLIC CAPITAL LETTER SHCHA
-SHT Щ CYRILLIC CAPITAL LETTER SHCHA
-Sj Щ CYRILLIC CAPITAL LETTER SHCHA
-SJ Щ CYRILLIC CAPITAL LETTER SHCHA
-Y Ъ CYRILLIC CAPITAL LETTER HARD SIGN
-X Ь CYRILLIC CAPITAL LETTER SOFT SIGN
-~ Ю CYRILLIC CAPITAL LETTER YU
-Ju Ю CYRILLIC CAPITAL LETTER YU
-JU Ю CYRILLIC CAPITAL LETTER YU
-Q Я CYRILLIC CAPITAL LETTER YA
-Ja Я CYRILLIC CAPITAL LETTER YA
-JA Я CYRILLIC CAPITAL LETTER YA
-a а CYRILLIC SMALL LETTER A
-b б CYRILLIC SMALL LETTER BE
-w в CYRILLIC SMALL LETTER VE
-v в CYRILLIC SMALL LETTER VE
-g г CYRILLIC SMALL LETTER GHE
-d д CYRILLIC SMALL LETTER DE
-e е CYRILLIC SMALL LETTER IE
-zh ж CYRILLIC SMALL LETTER ZHE
-w ж CYRILLIC SMALL LETTER ZHE
-z з CYRILLIC SMALL LETTER ZE
-i и CYRILLIC SMALL LETTER I
-j й CYRILLIC SMALL LETTER SHORT I
-k к CYRILLIC SMALL LETTER KA
-l л CYRILLIC SMALL LETTER EL
-m м CYRILLIC SMALL LETTER EM
-n н CYRILLIC SMALL LETTER EN
-o о CYRILLIC SMALL LETTER O
-p п CYRILLIC SMALL LETTER PE
-r р CYRILLIC SMALL LETTER ER
-s с CYRILLIC SMALL LETTER ES
-t т CYRILLIC SMALL LETTER TE
-u у CYRILLIC SMALL LETTER U
-f ф CYRILLIC SMALL LETTER EF
-h х CYRILLIC SMALL LETTER HA
-c ц CYRILLIC SMALL LETTER TSE
-ch ч CYRILLIC SMALL LETTER CHE
-sh ш CYRILLIC SMALL LETTER SHA
-sht щ CYRILLIC SMALL LETTER SHCHA
-sj щ CYRILLIC SMALL LETTER SHCHA
-y ъ CYRILLIC SMALL LETTER HARD SIGN
-x ь CYRILLIC SMALL LETTER SOFT SIGN
-` ю CYRILLIC SMALL LETTER YU
-ju ю CYRILLIC SMALL LETTER YU
-q я CYRILLIC SMALL LETTER YA
-ja я CYRILLIC SMALL LETTER YA