From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 21 Feb 2015 05:03:37 +0000 (+0100)
Subject: digraphs: account for vim extensions in proposals
X-Git-Tag: v1.7~114
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/bb7ea258d3ba6867c8059326e4888178843e0a6a

digraphs: account for vim extensions in proposals
---

diff --git a/Makefile b/Makefile
index b9be733..ac5df66 100644
--- 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 e149248..7076780 100644
--- 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 7a201a1..17b26a4 100755
--- 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'