Overhaul keymaps

This commit reduces the set of keymaps to only two files, one for each
dialect. These appear to be the most commonly used mappings and have the
advantage of minimizing unnecessary differences while providing full
coverage of the alphabet and standard punctuation marks. The old set of
mappings will be maintained in a separate branch.

7 files changed, 10 insertions, 525 deletions

diff --git a/README.md b/README.md
index 2845610..d43b4fb 100644
--- a/README.md
+++ b/README.md
@@ -4,11 +4,13 @@ This is a set of Vim keymaps for the Armenian alphabet. The keymaps can be used
 to type Armenian characters in Insert mode while retaining standard
 functionality in Normal mode.
 
-Most of these mappings are based on the xkeyboard-config Armenian keymaps.
-`armenian-western-alt-utf-8.vim` is an experimental hybrid of the Western
-Armenian and phonetic keymaps that is subject to change.
+The `master` branch provides a pair of common mappings for the Western and
+Eastern dialects that cover the full alphabet and all standard punctuation
+marks. The `alt` branch provides an alternate set of mappings based on the
+xkeyboard-config Armenian keymaps.
 
-Please feel free to submit additional keymaps or corrections.
+Please feel free to submit additional keymaps or corrections as pull requests
+or patches sent to <vim@benlinskey.com>.
 
 ## Setup
 
diff --git a/armenian-eastern-alt_utf-8.vim b/armenian-eastern-alt_utf-8.vim
deleted file mode 100644
index 180257c..0000000
--- a/armenian-eastern-alt_utf-8.vim
+++ /dev/null
@@ -1,108 +0,0 @@
-" Maintainer: Benjamin Linskey <vim@benlinskey.com>
-" Last Changed: 2016 May 18
-" URL: https://github.com/blinskey/vim-armenian-keymaps
-
-let b:keymap_name = "hy"
-
-loadkeymap
-
-" Capital letters
-A   Ա
-B   Բ
-C   Գ
-D   Դ
-Y   Ե
-Z   Զ
-E   Է
-U   Ը
-:   Թ
-+   Ժ
-I   Ի
-L   Լ
-Q   Խ
-?   Ծ
-K   Կ
-H   Հ
-@   Ձ
->   Ղ
-J   Ճ
-M   Մ
-#   Յ
-N   Ն
-<   Շ
-O   Ո
-{   Չ
-P   Պ
-}   Ջ
-_   Ռ
-S   Ս
-V   Վ
-T   Տ
-R   Ր
-X   Ց
-W   Ւ
-\"  Փ
-G   Ք
-)   Օ
-F   Ֆ
-
-" Lowercase letters
-a   ա
-b   բ
-c   գ
-d   դ
-y   ե
-z   զ
-e   է
-u   ը
-;   թ
-=   ժ
-i   ի
-l   լ
-q   խ
-/   ծ
-k   կ
-h   հ
-2   ձ
-.   ղ
-j   ճ
-m   մ
-3   յ
-n   ն
-,   շ
-o   ո
-[   չ
-p   պ
-]   ջ
--   ռ
-s   ս
-v   վ
-t   տ
-r   ր
-x   ց
-w   ւ
-'   փ
-g   ք
-0   օ
-f   ֆ
-
-&   և
-
-" Punctuation
-~   ՜
-1   ։
-4   ՛
-5   ,
-6   -
-7   .
-8   «
-9   »
-*   (
-(   )
-\\  '
-|   ՞
-
-" Numbers
-!   1
-$   3
-%   4
diff --git a/armenian-eastern_utf-8.vim b/armenian-eastern_utf-8.vim
index 0092d6f..7b03c5a 100644
--- a/armenian-eastern_utf-8.vim
+++ b/armenian-eastern_utf-8.vim
@@ -9,7 +9,7 @@ loadkeymap
 " Capital letters
 A   Ա
 B   Բ
-G   Գ
+C   Գ
 D   Դ
 Y   Ե
 Z   Զ
@@ -42,14 +42,14 @@ R   Ր
 X   Ց
 W   Ւ
 \"  Փ
-C   Ք
+G   Ք
 )   Օ
 F   Ֆ
 
 " Lowercase letters
 a   ա
 b   բ
-g   գ
+c   գ
 d   դ
 y   ե
 z   զ
@@ -82,7 +82,7 @@ r   ր
 x   ց
 w   ւ
 '   փ
-c   ք
+g   ք
 0   օ
 f   ֆ
 
diff --git a/armenian-phonetic-alt_utf-8.vim b/armenian-phonetic-alt_utf-8.vim
deleted file mode 100644
index 32e76c3..0000000
--- a/armenian-phonetic-alt_utf-8.vim
+++ /dev/null
@@ -1,103 +0,0 @@
-" Maintainer: Benjamin Linskey <vim@benlinskey.com>
-" Last Changed: 2016 May 18
-" URL: https://github.com/blinskey/vim-armenian-keymaps
-
-let b:keymap_name = "hy"
-
-loadkeymap
-
-" Capital letters
-A   Ա
-B   Բ
-G   Գ
-D   Դ
-E   Ե
-Z   Զ
-!   Է
-Y   Ը
-@   Թ
-+   Ժ
-I   Ի
-L   Լ
-{   Խ
-}   Ծ
-K   Կ
-H   Հ
-$   Ձ
-X   Ղ
-)   Ճ
-M   Մ
-J   Յ
-N   Ն
-|   Շ
-W   Ո
-(   Չ
-P   Պ
-%   Ջ
-R   Ռ
-S   Ս
-V   Վ
-T   Տ
-*   Ր
-C   Ց
-U   Ւ
-^   Ւ
-#   Փ
-Q   Ք
-O   Օ
-F   Ֆ
-
-" Lowercase letters
-a   ա
-b   բ
-g   գ
-d   դ
-e   ե
-z   զ
-1   է
-y   ը
-2   թ
-=   ժ
-i   ի
-l   լ
-[   խ
-]   ծ
-k   կ
-h   հ
-4   ձ
-x   ղ
-0   ճ
-m   մ
-j   յ
-n   ն
-\\  շ
-w   ո
-9   չ
-p   պ
-%   ջ
-r   ռ
-s   ս
-v   վ
-t   տ
-8   ր
-c   ց
-u   ւ
-6   ւ
-3   փ
-q   ք
-o   օ
-f   ֆ
-
-&   և
-
-" Punctuation
-~   ՜
-:   ։
-'   ՛
-,   ,
--   -
-_   ―
-.   .
-<   «
->   »
-?   ՞
diff --git a/armenian-phonetic_utf-8.vim b/armenian-phonetic_utf-8.vim
deleted file mode 100644
index 9392002..0000000
--- a/armenian-phonetic_utf-8.vim
+++ /dev/null
@@ -1,103 +0,0 @@
-" Maintainer: Benjamin Linskey <vim@benlinskey.com>
-" Last Changed: 2016 May 18
-" URL: https://github.com/blinskey/vim-armenian-keymaps
-
-let b:keymap_name = "hy"
-
-loadkeymap
-
-" Capital letters
-A   Ա
-B   Բ
-G   Գ
-D   Դ
-E   Ե
-Z   Զ
-!   Է
-Y   Ը
-@   Թ
-+   Ժ
-I   Ի
-L   Լ
-{   Խ
-}   Ծ
-K   Կ
-H   Հ
-$   Ձ
-X   Ղ
-)   Ճ
-M   Մ
-J   Յ
-N   Ն
-|   Շ
-W   Ո
-(   Չ
-P   Պ
-%   Ջ
-*   Ռ
-S   Ս
-V   Վ
-T   Տ
-R   Ր
-C   Ց
-U   Ւ
-^   Ւ
-#   Փ
-Q   Ք
-O   Օ
-F   Ֆ
-
-" Lowercase letters
-a   ա
-b   բ
-g   գ
-d   դ
-e   ե
-z   զ
-1   է
-y   ը
-@   թ
-=   ժ
-i   ի
-l   լ
-[   խ
-]   ծ
-k   կ
-h   հ
-$   ձ
-x   ղ
-0   ճ
-m   մ
-j   յ
-n   ն
-\\  շ
-w   ո
-9   չ
-p   պ
-5   ջ
-8   ռ
-s   ս
-v   վ
-t   տ
-r   ր
-c   ց
-u   ւ
-6   ւ
-3   փ
-q   ք
-o   օ
-f   ֆ
-
-&   և
-
-" Punctuation
-~   ՜
-:   ։
-'   ՛
-,   ,
--   -
-_   ―
-.   .
-<   «
->   »
-?   ՞
diff --git a/armenian-western-alt_utf-8.vim b/armenian-western-alt_utf-8.vim
deleted file mode 100644
index a4abebe..0000000
--- a/armenian-western-alt_utf-8.vim
+++ /dev/null
@@ -1,101 +0,0 @@
-" Maintainer: Benjamin Linskey <vim@benlinskey.com>
-" Last Changed: 2016 May 18
-" URL: https://github.com/blinskey/vim-armenian-keymaps
-
-let b:keymap_name = "hy"
-
-loadkeymap
-
-" Capital letters
-A   Ա
-B   Բ
-C   Գ
-T   Դ
-Y   Ե
-Z   Զ
-E   Է
-U   Ը
-@   Թ
-+   Ժ
-I   Ի
-L   Լ
-{   Խ
-}   Ծ
-G   Կ
-H   Հ
-$   Ձ
-X   Ղ
-)   Ճ
-M   Մ
-J   Յ
-N   Ն
-|   Շ
-W   Ո
-(   Չ
-P   Պ
-%   Ջ
-*   Ռ
-S   Ս
-V   Վ
-D   Տ
-R   Ր
-K   Ց
-^   Ւ
-#   Փ
-Q   Ք
-O   Օ
-F   Ֆ
-
-" Lowercase letters
-a   ա
-b   բ
-c   գ
-t   դ
-y   ե
-z   զ
-e   է
-u   ը
-2   թ
-=   ժ
-i   ի
-l   լ
-[   խ
-]   ծ
-g   կ
-h   հ
-4   ձ
-x   ղ
-0   ճ
-m   մ
-j   յ
-n   ն
-\\  շ
-w   ո
-9   չ
-p   պ
-5   ջ
-8   ռ
-s   ս
-v   վ
-d   տ
-r   ր
-k   ց
-6   ւ
-3   փ
-q   ք
-o   օ
-f   ֆ
-
-&   և
-
-" Punctuation
-~   ՜
-:   ։
-'   ՛
-,   ,
--   -
-_   ―
-.   .
-<   «
->   »
-?   ՞
diff --git a/armenian_utf-8.vim b/armenian_utf-8.vim
deleted file mode 100644
index ad5e8bd..0000000
--- a/armenian_utf-8.vim
+++ /dev/null
@@ -1,102 +0,0 @@
-" Maintainer: Benjamin Linskey <vim@benlinskey.com>
-" Last Changed: 2016 May 12
-" URL: https://github.com/blinskey/vim-armenian-keymaps
-
-let b:keymap_name = "hy"
-
-loadkeymap
-
-" Capital letters
-G   Ա
-E   Բ
-D   Գ
-X   Դ
-F   Ե
-B   Զ
--   Է
-O   Ը
-P   Թ
-Z   Ժ
-J   Ի
-N   Լ
-<   Խ
-?   Ծ
-I   Կ
-L   Հ
-@   Ձ
-+   Ղ
-Q   Ճ
-T   Մ
-V   Յ
-H   Ն
-<   Շ
-Y   Ո
-C   Չ
-:   Պ
-A   Ջ
-?   Ռ
-R   Ս
-S   Վ
-K   Տ
-\"  Ր
-X   Ց
-U   Ւ
-W   Փ
-M   Ք
-)   Օ
-!   Ֆ
-
-" Lowercase letters
-g   ա
-e   բ
-d   գ
-x   դ
-f   ե
-b   զ
--   է
-o   ը
-p   թ
-z   ժ
-j   ի
-n   լ
-<   խ
-?   ծ
-i   կ
-l   հ
-@   ձ
-+   ղ
-q   ճ
-t   մ
-v   յ
-h   ն
-<   շ
-y   ո
-c   չ
-:   պ
-a   ջ
-?   ռ
-r   ս
-s   վ
-k   տ
-'   ր
-x   ց
-u   ւ
-w   փ
-m   ք
-)   օ
-!   ֆ
-
-&   և
-
-" Punctuation
-~   ՜
-3   ֊
-#   —
-4   ,
-5   ։
-%   …
-6   ՞
-^   %
-7   ․
-\\  »
-|   «