digraphs: account for vim extensions in proposals

diff --git a/Makefile b/Makefile
index b9be7330c2e45f4eed61f71c53f3909702525039..ac5df6607c35ac2496ad29e34c4f3eb1e132c594 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ data/digraphs-shiar.inc.pl: tools/mkdigraphs-shiar shiar.inc.txt
 data/digraphs-vim.inc.pl: tools/mkdigraphs-vim
        $< >$@
 
-digraphs.inc.pl: tools/mkdigraphlist data/digraphs-rfc.inc.pl data/digraphs-shiar.inc.pl unicode-char.inc.pl
+digraphs.inc.pl: tools/mkdigraphlist data/digraphs-rfc.inc.pl data/digraphs-vim.inc.pl data/digraphs-shiar.inc.pl unicode-char.inc.pl
        $< >$@
 
 unicode-char.inc.pl: tools/mkcharinfo data/digraphs-rfc.inc.pl data/digraphs-shiar.inc.pl unicode-age.inc.pl

diff --git a/shiar.inc.txt b/shiar.inc.txt
index e149248ef0ea0f3ca82f2f1902b941073bce5e5c..7076780020d2d6fdb1257e8bad09da4da1677eba 100644 (file)
--- a/shiar.inc.txt
+++ b/shiar.inc.txt
@@ -42,11 +42,12 @@
 
 
 # currency
-=e €  # as found in vim
-Eu €  # as found in zsh
+#=e €  # in vim
+#Eu €  # in zsh and vim
+#=R ₽  # in vim
 =d ₫
-=N ₦  #XXX =n for consistency?
-=P ₱  #XXX =p?
+=N ₦
+=P ₱  # conflicts with vim alternative for =R
 =t ₮
 K/ ₭
 Rs ₨

diff --git a/tools/mkdigraphlist b/tools/mkdigraphlist
index 7a201a11edcbba198bbd54874bdd747dd936b800..17b26a441810cf4b954074f2e7611bacfeb77713 100755 (executable)
--- a/tools/mkdigraphlist
+++ b/tools/mkdigraphlist
@@ -16,7 +16,9 @@ my $di = do 'data/digraphs-rfc.inc.pl'
 # personal addendums
 my $extra = do 'data/digraphs-shiar.inc.pl'
        or warn "could not include shiar proposals: ", $@ // $!;
-$di = { %{$di}, %{$extra // {}} };
+my $vim = do 'data/digraphs-vim.inc.pl'
+       or warn "could not include vim extensions ", $@ // $!;
+$di = { %{$vim // {}}, %{$di}, %{$extra // {}} };
 
 # optionally get unicode character information
 my $uninfo = do 'unicode-char.inc.pl'