Merge pull request #1 from phi-gamma/master

Updating with current master

1 files changed, 41 insertions, 23 deletions

diff --git a/Makefile b/Makefile
index 69c5ede..4821619 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,34 @@
 # Makefile for luaotfload
 
-NAME = luaotfload
-DOC = $(NAME).pdf
-DTX = $(NAME).dtx
-OTFL = $(wildcard otfl-*.lua) otfl-blacklist.cnf font-age.lua
-SCRIPT = mkluatexfontdb.lua
+NAME         = luaotfload
+DOC          = $(NAME).pdf
+DTX          = $(NAME).dtx
+OTFL         = $(wildcard otfl-*.lua) otfl-blacklist.cnf font-age.lua
+SCRIPT       = fontdbutil
+
+GLYPHSCRIPT  = mkglyphlist
+GLYPHSOURCE  = glyphlist.txt
+
+GRAPH  = filegraph
+DOTPDF = $(GRAPH).pdf
+DOT    = $(GRAPH).dot
 
 # Files grouped by generation mode
-COMPILED = $(DOC)
-UNPACKED = luaotfload.sty luaotfload.lua
-GENERATED = $(COMPILED) $(UNPACKED)
-SOURCE = $(DTX) $(OTFL) README Makefile NEWS $(SCRIPT)
+GLYPHS      = font-age.lua
+GRAPHED     = $(DOTPDF)
+COMPILED    = $(DOC)
+UNPACKED    = luaotfload.sty luaotfload.lua
+GENERATED   = $(GRAPHED) $(COMPILED) $(UNPACKED) $(GLYPHS)
+SOURCE 		= $(DTX) $(OTFL) README Makefile NEWS $(SCRIPT) $(GLYPHSCRIPT)
 
 # test files
-TESTDIR = tests
-TESTFILES = $(wildcard $(TESTDIR)/*.tex)
-TESTFILES_SYS = $(TESTDIR)/systemfonts.tex $(TESTDIR)/fontconfig_conf_reading.tex
-TESTFILES_TL = $(filter-out $(TESTFILES_SYS), $(TESTFILES))
-TESTENV = env TEXINPUTS='.;..;$$TEXMF/tex/{luatex,plain,generic,}//' TEXMFVAR='../var'
+TESTDIR 		= tests
+TESTFILES 		= $(wildcard $(TESTDIR)/*.tex $(TESTDIR)/*.ltx)
+TESTFILES_SYS 	= $(TESTDIR)/systemfonts.tex $(TESTDIR)/fontconfig_conf_reading.tex
+TESTFILES_TL 	= $(filter-out $(TESTFILES_SYS), $(TESTFILES))
 
 # Files grouped by installation location
-SCRIPTFILES = $(SCRIPT)
+SCRIPTFILES = $(SCRIPT) $(GLYPHSCRIPT)
 RUNFILES    = $(UNPACKED) $(OTFL)
 DOCFILES    = $(DOC) README NEWS
 SRCFILES    = $(DTX) Makefile
@@ -38,19 +46,29 @@ SRCDIR    = $(TEXMFROOT)/source/$(FORMAT)/$(NAME)
 TEXMFROOT = $(shell kpsewhich --var-value TEXMFHOME)
 
 CTAN_ZIP = $(NAME).zip
-TDS_ZIP = $(NAME).tds.zip
-ZIPS = $(CTAN_ZIP) $(TDS_ZIP)
+TDS_ZIP  = $(NAME).tds.zip
+ZIPS 	 = $(CTAN_ZIP) $(TDS_ZIP)
 
-DO_TEX = tex --interaction=batchmode $< >/dev/null
-DO_LATEX = latexmk -pdf -pdflatex=lualatex -silent $< >/dev/null
+DO_TEX 			= tex --interaction=batchmode $< >/dev/null
+DO_LATEX 		= latexmk -pdf -pdflatex=lualatex -silent $< >/dev/null
+DO_GRAPHVIZ 	= dot -Tpdf -o $@ $< > /dev/null
+DO_GLYPHLIST 	= texlua ./mkglyphlist > /dev/null
 
 all: $(GENERATED)
-doc: $(COMPILED)
+graph: $(GRAPHED)
+doc: $(GRAPHED) $(COMPILED)
 unpack: $(UNPACKED)
+glyphs: $(GLYPHS)
 ctan: check $(CTAN_ZIP)
 tds: $(TDS_ZIP)
 world: all ctan
 
+$(GLYPHS): /dev/null
+	$(DO_GLYPHLIST)
+
+$(GRAPHED): $(DOT)
+	$(DO_GRAPHVIZ)
+
 $(COMPILED): $(DTX)
 	$(DO_LATEX)
 
@@ -85,9 +103,9 @@ install: $(ALL_FILES)
 
 check: $(RUNFILES) $(TESTFILES_TL)
 	@rm -rf var
-	@cd $(TESTDIR); for f in $(TESTFILES_TL); do \
+	@for f in $(TESTFILES_TL); do \
 	    echo "check: luatex $$f"; \
-	    $(TESTENV) luatex --interaction=batchmode ../$$f \
+	    luatex --interaction=batchmode $$f \
 	    > /dev/null || exit $$?; \
 	    done
 
@@ -109,5 +127,5 @@ clean:
 	@$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg *.out $(TESTDIR)/*.log
 
 mrproper: clean
-	@$(RM) -- $(GENERATED) $(ZIPS) $(TESTDIR)/*.pdf
+	@$(RM) -- $(GENERATED) $(ZIPS) $(GLYPHSOURCE) $(TESTDIR)/*.pdf