Add additional keymap files and update readme

9 files changed, 653 insertions, 44 deletions

diff --git a/README.md b/README.md
index 1c6e7db..4337818 100644
--- a/README.md
+++ b/README.md
@@ -2,42 +2,38 @@
 
 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.
+functionality in Normal mode. For more information on Vim keymaps, see
+`:help mbyte-keymap`.
 
-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. These are included in the [Vim source code][]. The `alt` branch provides
-an alternate set of mappings based on the xkeyboard-config Armenian keymaps.
+`armenian-eastern_utf-8.vim` and `armenian-western_utf-8.vim` are included in
+the [Vim source code][]. The `extra` directory contains additional alternate
+keymaps.
 
-Please feel free to submit additional keymaps or corrections as pull requests
-or patches sent to <vim@benlinskey.com>.
+Diagrams of the [Eastern][eastern-img] and [Western][western-img] are available
+on Wikimedia.
 
-## Setup
+## Requirements and Installation
 
-### Installing the keymap files
+Your Vim installation must be compiled with the `+keymap` feature. Use
+`:version` to check which features are available.
 
-You’ll first need to ensure that the Armenian keymap files are installed in
-Vim’s `keymap` directory. If you’re using Vim 8 or a late release of Vim 7.4,
-the keymaps on the `master` branch are included out of the box, so you can skip
-ahead to [Activating a keymap](#activating-a-keymap). If you’re using an older
-version of Vim that doesn’t include the keymaps or if you’d like to use a
-keymap from the `alt` branch, you’ll need to copy or link your desired keymap
-files to your Vim keymap directory (`/usr/share/vim/vim74/keymap` by default in
-Vim 7.4).
-
-### Activating a keymap
+Your version of Vim may come with the primary keymaps preinstalled. If they are
+not installed or you'd like to use one of the `extra` keymaps, copy or link
+your desired keymap(s) to `~/.vim/keymap/` or another location in Vim's runtime
+path (see `:h runtimepath`).
 
 To use a keymap, you’ll need to enable it in your `.vimrc` using the `keymap`
-option. For example, to use the Western Armenian keymap, copy or link
-`armenian-western_utf-8.vim` to the directory `/usr/share/vim/vim74/keymap/`,
-then enable the keymap in your `.vimrc`:
+option. For example, to use the Western Armenian keymap, ensure that
+`armenian-western_utf-8.vim` is in your Vim runtime path, then enable the
+keymap in your `.vimrc`:
 
 ```vim
 set keymap=armenian-western_utf-8
 ```
 
 You can switch between Armenian and Latin characters in Insert mode using
-<kbd>Ctrl-^</kbd>. To disable the keymap at Vim startup so that Insert mode
+<kbd>Ctrl-^</kbd> (i.e., <kbd>Ctrl-Shift-6</kbd> on a standard English keyboard
+layout). To disable the keymap at Vim startup so that Insert mode
 uses Latin characters by default, add the following lines to your `.vimrc`:
 
 ```vim
@@ -45,25 +41,6 @@ set iminsert=0
 set imsearch=0
 ```
 
-For more information on keymaps, see `:help mbyte-keymap`.
-
-## Layouts
-
-### Eastern Armenian
-
-![Eastern Armenian keyboard layout](img/KB_Eastern_Armenian.svg.png)
-
-*The original uploader was Pokajanje at English Wikipedia. (Transferred from
-en.wikipedia to Commons.) [[CC BY-SA 3.0][]],
-[via Wikimedia Commons](https://commons.wikimedia.org/wiki/File%3AKB_Eastern_Armenian.svg).*
-
-### Western Armenian
-
-![Western Armenian keyboard layout](img/KB_Western_Armenian.svg.png)
-
-*The original uploader was Pokajanje at English Wikipedia. (Transferred from
-en.wikipedia to Commons.) [[CC BY-SA 3.0][]],
-[via Wikimedia Commons](https://commons.wikimedia.org/wiki/File%3AKB_Western_Armenian.svg).*
-
 [Vim source code]: https://github.com/vim/vim
-[CC BY-SA 3.0]: http://creativecommons.org/licenses/by-sa/3.0
+[eastern-img]: https://commons.wikimedia.org/wiki/File:KB_Eastern_Armenian.svg
+[western-img]: https://commons.wikimedia.org/wiki/File:KB_Western_Armenian.svg
diff --git a/extra/armenian-eastern-alt_utf-8.vim b/extra/armenian-eastern-alt_utf-8.vim
new file mode 100644
index 0000000..180257c
--- /dev/null
+++ b/extra/armenian-eastern-alt_utf-8.vim
@@ -0,0 +1,108 @@
+" 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/extra/armenian-eastern_utf-8.vim b/extra/armenian-eastern_utf-8.vim
new file mode 100644
index 0000000..0092d6f
--- /dev/null
+++ b/extra/armenian-eastern_utf-8.vim
@@ -0,0 +1,108 @@
+" Maintainer: Benjamin Linskey <vim@benlinskey.com>
+" Last Changed: 2016 July 20
+" URL: https://github.com/blinskey/vim-armenian-keymaps
+
+let b:keymap_name = "hy"
+
+loadkeymap
+
+" Capital letters
+A   Ա
+B   Բ
+G   Գ
+D   Դ
+Y   Ե
+Z   Զ
+E   Է
+U   Ը
+:   Թ
++   Ժ
+I   Ի
+L   Լ
+Q   Խ
+?   Ծ
+K   Կ
+H   Հ
+@   Ձ
+>   Ղ
+J   Ճ
+M   Մ
+#   Յ
+N   Ն
+<   Շ
+O   Ո
+{   Չ
+P   Պ
+}   Ջ
+_   Ռ
+S   Ս
+V   Վ
+T   Տ
+R   Ր
+X   Ց
+W   Ւ
+\"  Փ
+C   Ք
+)   Օ
+F   Ֆ
+
+" Lowercase letters
+a   ա
+b   բ
+g   գ
+d   դ
+y   ե
+z   զ
+e   է
+u   ը
+;   թ
+=   ժ
+i   ի
+l   լ
+q   խ
+/   ծ
+k   կ
+h   հ
+2   ձ
+.   ղ
+j   ճ
+m   մ
+3   յ
+n   ն
+,   շ
+o   ո
+[   չ
+p   պ
+]   ջ
+-   ռ
+s   ս
+v   վ
+t   տ
+r   ր
+x   ց
+w   ւ
+'   փ
+c   ք
+0   օ
+f   ֆ
+
+&   և
+
+" Punctuation
+`   ՝
+~   ՜
+1   ։
+4   ՛
+5   ,
+6   -
+7   .
+8   «
+9   »
+\\  '
+|   ՞
+
+" Numbers
+!   1
+$   3
+%   4
+^   9
diff --git a/extra/armenian-phonetic-alt_utf-8.vim b/extra/armenian-phonetic-alt_utf-8.vim
new file mode 100644
index 0000000..32e76c3
--- /dev/null
+++ b/extra/armenian-phonetic-alt_utf-8.vim
@@ -0,0 +1,103 @@
+" 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/extra/armenian-phonetic_utf-8.vim b/extra/armenian-phonetic_utf-8.vim
new file mode 100644
index 0000000..9392002
--- /dev/null
+++ b/extra/armenian-phonetic_utf-8.vim
@@ -0,0 +1,103 @@
+" 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/extra/armenian-western_utf-8.vim b/extra/armenian-western_utf-8.vim
new file mode 100644
index 0000000..e02485e
--- /dev/null
+++ b/extra/armenian-western_utf-8.vim
@@ -0,0 +1,108 @@
+" Maintainer: Benjamin Linskey <vim@benlinskey.com>
+" Last Changed: 2016 July 20
+" URL: https://github.com/blinskey/vim-armenian-keymaps
+
+let b:keymap_name = "hy"
+
+loadkeymap
+
+" Capital letters
+A   Ա
+P   Բ
+C   Գ
+T   Դ
+Y   Ե
+Z   Զ
+E   Է
+U   Ը
+:   Թ
++   Ժ
+I   Ի
+L   Լ
+Q   Խ
+?   Ծ
+G   Կ
+H   Հ
+@   Ձ
+>   Ղ
+J   Ճ
+M   Մ
+#   Յ
+N   Ն
+<   Շ
+O   Ո
+{   Չ
+B   Պ
+}   Ջ
+_   Ռ
+S   Ս
+W   Վ
+D   Տ
+R   Ր
+X   Ց
+V   Ւ
+\"  Փ
+K   Ք
+)   Օ
+F   Ֆ
+
+" Lowercase letters
+a   ա
+p   բ
+c   գ
+t   դ
+y   ե
+z   զ
+e   է
+u   ը
+;   թ
+=   ժ
+i   ի
+l   լ
+q   խ
+/   ծ
+g   կ
+h   հ
+2   ձ
+.   ղ
+j   ճ
+m   մ
+3   յ
+n   ն
+,   շ
+o   ո
+[   չ
+b   պ
+]   ջ
+-   ռ
+s   ս
+w   վ
+d   տ
+r   ր
+x   ց
+v   ւ
+'   փ
+k   ք
+0   օ
+f   ֆ
+
+&   և
+
+" Punctuation
+`   ՝
+~   ՜
+1   ։
+4   ՛
+5   ,
+6   -
+7   .
+8   «
+9   »
+\\  '
+|   ՞
+
+" Numbers
+!   1
+$   3
+%   4
+^   9
diff --git a/extra/armenian_utf-8.vim b/extra/armenian_utf-8.vim
new file mode 100644
index 0000000..ad5e8bd
--- /dev/null
+++ b/extra/armenian_utf-8.vim
@@ -0,0 +1,102 @@
+" 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   ․
+\\  »
+|   «
diff --git a/img/KB_Eastern_Armenian.svg.png b/img/KB_Eastern_Armenian.svg.png
deleted file mode 100644
index cc5b910..0000000
--- a/img/KB_Eastern_Armenian.svg.png
+++ /dev/null
diff --git a/img/KB_Western_Armenian.svg.png b/img/KB_Western_Armenian.svg.png
deleted file mode 100644
index 897cdee..0000000
--- a/img/KB_Western_Armenian.svg.png
+++ /dev/null