updated for version 7.2b-000v7.2b.000

1 files changed, 58 insertions, 25 deletions

diff --git a/runtime/keymap/bulgarian-phonetic.vim b/runtime/keymap/bulgarian-phonetic.vim
index feec587b7c..bac2e7ebee 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 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.
 "
-" 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 €
+" 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 @@ C       Ц       CYRILLIC CAPITAL LETTER TSE
 {       Ш       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 @@ c       ц       CYRILLIC SMALL LETTER TSE
 [       ш       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)