X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/7e678eaffb1a57d300e8aa77078d93ab481f8006..d9d251ca5b512130cfb4cb9a3e03aa6748f67526:/Makefile

diff --git a/Makefile b/Makefile
index 6314e18..0780346 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:
@@ -18,69 +19,56 @@ 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
+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 digraphs.inc.pl unicode-age.inc.pl
+unicode-char.inc.pl: tools/mkcharinfo data/digraphs-rfc.inc.pl data/digraphs-shiar.inc.pl unicode-age.inc.pl
 	$< >$@
 
+ttfsupport/%.inc.pl: tools/mkttfinfo data/font/%.ttf
+	$< $(word 2,$^) $@ || true
+
+.SECONDARY:
+data/font/%.ttf:
+	find /usr/share/fonts/truetype/ ~/.fonts/ -iname "$(@F)" | head -1 | xargs -i ln -sf {} $@
+data/font/%.win95.ttf:
+	find /usr/share/fonts/truetype/msttcorefonts/ -iname "$(*F).ttf" | head -1 | xargs -i ln -sf {} $@
+data/font/dv%.ttf:
+	find /usr/share/fonts/truetype/dejavu/ -iname "DejaVu*$(*F).ttf" | head -1 | xargs -i ln -sf {} $@
+data/font/droid%.ttf:
+	find /usr/share/fonts/truetype/droid/ -iname "Droid*$(*F).ttf" | head -1 | xargs -i ln -sf {} $@
+data/font/droidserif.ttf:
+	ln -sf /usr/share/fonts/truetype/droid/DroidSerif-Regular.ttf $@
+data/font/roboto.ttf:
+	ln -sf /usr/share/fonts/truetype/roboto/Roboto-Regular.ttf $@
+data/font/noto%.ttf:
+	find /usr/share/fonts/truetype/noto/ -iname "Noto$(*F)-Regular.ttf" | head -1 | xargs -i ln -sf {} $@
+
 ttfsupport: tools/mkttfinfo
 	mkdir -p $@
 	$(MAKE) ttfsupport/all
 	touch $@
 
-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/verdana.inc.pl: tools/mkttfinfo
-	$< Verdana.ttf $@
-ttfsupport/times.inc.pl: tools/mkttfinfo
-	$< Times_New_Roman.ttf $@
-ttfsupport/arial.inc.pl: tools/mkttfinfo
-	$< Arial.ttf $@
-ttfsupport/courier.inc.pl: tools/mkttfinfo
-	$< Courier_New.ttf $@
-ttfsupport/comic.inc.pl: tools/mkttfinfo
-	$< Comic_Sans_MS.ttf $@
-ttfsupport/georgia.inc.pl: tools/mkttfinfo
-	$< Georgia.ttf $@
-ttfsupport/arialuni.inc.pl: tools/mkttfinfo
-	$< 'arial*uni*.ttf' $@
-
-ttfsupport/all-apple: ttfsupport/lucida.inc.pl ttfsupport/garamond.inc.pl
-ttfsupport/lucida.inc.pl: tools/mkttfinfo
-	$< Lucida\?Grande.ttf $@ || true
-ttfsupport/garamond.inc.pl: tools/mkttfinfo
-	$< AppleGaramond.ttf $@ || true
-
+ttfsupport/all: ttfsupport/all-win95 ttfsupport/all-dejavu ttfsupport/all-google ttfsupport/all-other
+ttfsupport/all-win95: ttfsupport/verdana.win95.inc.pl ttfsupport/times.win95.inc.pl ttfsupport/arial.win95.inc.pl ttfsupport/cour.win95.inc.pl ttfsupport/comic.win95.inc.pl ttfsupport/georgia.win95.inc.pl ttfsupport/arialuni.inc.pl
 ttfsupport/all-dejavu: ttfsupport/dvsans.inc.pl ttfsupport/dvserif.inc.pl ttfsupport/dvmono.inc.pl
-ttfsupport/dvsans.inc.pl: tools/mkttfinfo
-	$< DejaVuSans.ttf $@
-ttfsupport/dvserif.inc.pl: tools/mkttfinfo
-	$< DejaVuSerif.ttf $@
-ttfsupport/dvmono.inc.pl: tools/mkttfinfo
-	$< DejaVuSansMono.ttf $@
-
-ttfsupport/all-google: ttfsupport/droid.inc.pl ttfsupport/droidserif.inc.pl ttfsupport/droidmono.inc.pl ttfsupport/roboto.inc.pl ttfsupport/noto.inc.pl ttfsupport/notoserif.inc.pl
-ttfsupport/droid.inc.pl: tools/mkttfinfo
-	$< DroidSans.ttf $@
-ttfsupport/droidserif.inc.pl: tools/mkttfinfo
-	$< DroidSerif-Regular.ttf $@
-ttfsupport/droidmono.inc.pl: tools/mkttfinfo
-	$< DroidSansMono.ttf $@
-ttfsupport/roboto.inc.pl: tools/mkttfinfo
-	$< Roboto-Regular.ttf $@
-ttfsupport/noto.inc.pl: tools/mkttfinfo
-	$< NotoSans-Regular.ttf $@
-ttfsupport/notoserif.inc.pl: tools/mkttfinfo
-	$< NotoSerif-Regular.ttf $@
-
-ttfsupport/unifont.inc.pl: tools/mkttfinfo
-	$< unifont.ttf $@
-ttfsupport/c2k.inc.pl: tools/mkttfinfo
-	$< code2000.ttf $@
-
-unicode-cover.inc.pl: tools/mkfontinfo ttfsupport
+ttfsupport/all-google: ttfsupport/droidsans.inc.pl ttfsupport/droidserif.inc.pl ttfsupport/droidmono.inc.pl ttfsupport/roboto.inc.pl ttfsupport/notosans.inc.pl ttfsupport/notoserif.inc.pl
+ttfsupport/all-other: ttfsupport/unifont.inc.pl ttfsupport/code2000.inc.pl
+
+#ttfsupport/unifont.inc.pl: tools/mkttfinfo
+#	$< unifont.ttf $@
+#	$< --headless unifont_upper.ttf >>$@
+
+unicode-cover.inc.pl: tools/mkfontinfo ttfsupport $(patsubst data/font/%.ttf,ttfsupport/%.inc.pl,$(wildcard data/font/*.ttf))
 	$< >$@
 
 data/countryInfo.txt: