X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/e81df0ef9f0d7b5d22b0829f0a89a380a8e310ab..e5ad6046eceee35635afa188230707a5ae14caa9:/Makefile

diff --git a/Makefile b/Makefile
index c945996..f674f3f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 all: digraphs.inc.pl unicode-cover.inc.pl countries.inc.pl data/browser/support.inc.pl
+more: all data/digraphs-xorg.inc.pl
 
-download: data/DerivedAge.txt data/rfc1345.txt data/countryInfo.txt data/caniuse.json
+download: data/DerivedAge.txt data/rfc1345.txt data/xorg-compose data/countryInfo.txt data/caniuse.json
 .PHONY: download
 
 data/DerivedAge.txt:
@@ -18,7 +19,16 @@ data/digraphs-rfc.inc.pl: tools/mkdigraphs-rfc data/rfc1345.txt
 data/digraphs-shiar.inc.pl: tools/mkdigraphs-shiar shiar.inc.txt
 	$< $(word 2,$^) >$@
 
-digraphs.inc.pl: tools/mkdigraphlist data/digraphs-rfc.inc.pl data/digraphs-shiar.inc.pl unicode-char.inc.pl
+data/xorg-compose:
+	tools/wget-ifmodified http://cgit.freedesktop.org/xorg/lib/libX11/plain/nls/en_US.UTF-8/Compose.pre $@
+
+data/digraphs-xorg.inc.pl: tools/mkdigraphs-xorg data/xorg-compose
+	$< $(word 2,$^) >$@
+
+data/digraphs-vim.inc.pl: tools/mkdigraphs-vim
+	$< >$@
+
+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
@@ -52,6 +62,8 @@ ttfsupport/lucida.inc.pl: tools/mkttfinfo
 	$< Lucida\?Grande.ttf $@ || true
 ttfsupport/garamond.inc.pl: tools/mkttfinfo
 	$< AppleGaramond.ttf $@ || true
+ttfsupport/opensans.inc.pl: tools/mkttfinfo
+	$< opensans.ttf $@ || true
 
 ttfsupport/all-dejavu: ttfsupport/dvsans.inc.pl ttfsupport/dvserif.inc.pl ttfsupport/dvmono.inc.pl
 ttfsupport/dvsans.inc.pl: tools/mkttfinfo