X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/fce33dd3347984d52ab27fff3eb25dd324d7f587..2b249e3c605336c96f189266dc0db91998491449:/Makefile

diff --git a/Makefile b/Makefile
index b12614a..d062099 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
-all: unicode-char.inc.pl unicode-cover.inc.pl countries.inc.pl data/browser/support.inc.pl
+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:
@@ -12,10 +13,25 @@ unicode-age.inc.pl: tools/mkcharver data/DerivedAge.txt
 data/rfc1345.txt:
 	tools/wget-ifmodified http://www.ietf.org/rfc/$(@F) $@
 
-digraphs.inc.pl: tools/mkdigraphlist data/rfc1345.txt shiar.inc.txt
+data/digraphs-rfc.inc.pl: tools/mkdigraphs-rfc data/rfc1345.txt
 	$< $(word 2,$^) >$@
 
-unicode-char.inc.pl: tools/mkcharinfo digraphs.inc.pl unicode-age.inc.pl
+data/digraphs-shiar.inc.pl: tools/mkdigraphs-shiar shiar.inc.txt
+	$< $(word 2,$^) >$@
+
+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
 	$< >$@
 
 ttfsupport: tools/mkttfinfo
@@ -25,14 +41,14 @@ ttfsupport: tools/mkttfinfo
 
 ttfsupport/all: ttfsupport/all-ms ttfsupport/all-apple ttfsupport/all-dejavu ttfsupport/all-google ttfsupport/unifont.inc.pl ttfsupport/c2k.inc.pl
 
-ttfsupport/all-ms: ttfsupport/verdana.inc.pl ttfsupport/times.inc.pl ttfsupport/arial.inc.pl ttfsupport/courier.inc.pl ttfsupport/comic.inc.pl ttfsupport/georgia.inc.pl ttfsupport/arialuni.inc.pl
+ttfsupport/all-ms: ttfsupport/verdana.inc.pl ttfsupport/timesnew.inc.pl ttfsupport/arial.inc.pl ttfsupport/couriernew.inc.pl ttfsupport/comic.inc.pl ttfsupport/georgia.inc.pl ttfsupport/arialuni.inc.pl
 ttfsupport/verdana.inc.pl: tools/mkttfinfo
 	$< Verdana.ttf $@
-ttfsupport/times.inc.pl: tools/mkttfinfo
+ttfsupport/timesnew.inc.pl: tools/mkttfinfo
 	$< Times_New_Roman.ttf $@
 ttfsupport/arial.inc.pl: tools/mkttfinfo
 	$< Arial.ttf $@
-ttfsupport/courier.inc.pl: tools/mkttfinfo
+ttfsupport/couriernew.inc.pl: tools/mkttfinfo
 	$< Courier_New.ttf $@
 ttfsupport/comic.inc.pl: tools/mkttfinfo
 	$< Comic_Sans_MS.ttf $@
@@ -43,9 +59,11 @@ ttfsupport/arialuni.inc.pl: tools/mkttfinfo
 
 ttfsupport/all-apple: ttfsupport/lucida.inc.pl ttfsupport/garamond.inc.pl
 ttfsupport/lucida.inc.pl: tools/mkttfinfo
-	$< Lucida\?Grande.ttf $@
+	$< Lucida\?Grande.ttf $@ || true
 ttfsupport/garamond.inc.pl: tools/mkttfinfo
-	$< AppleGaramond.ttf $@
+	$< 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