From 728f8e0b66b127ceef9aa537939e64e721499aad Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Mon, 10 Feb 2014 08:24:08 +0100
Subject: =?UTF-8?q?[*]=20don=E2=80=99t=20hardcode=20name=20of=20gmake=20ex?=
 =?UTF-8?q?ecutable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 97a733a..3ed893c 100644
--- a/Makefile
+++ b/Makefile
@@ -80,13 +80,13 @@ pdf: $(DOCPDF)
 manual: $(MANPAGE)
 
 $(DOTPDF):
-	@make -C $(DOCSRCDIR) graph
+	@$(MAKE) -C $(DOCSRCDIR) graph
 
 $(DOCPDF):
-	@make -C $(DOCSRCDIR) doc
+	@$(MAKE) -C $(DOCSRCDIR) doc
 
 $(MANPAGE):
-	@make -C $(DOCSRCDIR) manual
+	@$(MAKE) -C $(DOCSRCDIR) manual
 
 $(GLYPHS): /dev/null
 	$(DO_GLYPHS)
@@ -143,11 +143,11 @@ manifest:
 	@for f in $(GENERATED); do echo $$f; done
 
 clean:
-	make -C $(DOCSRCDIR) $@
+	$(MAKE) -C $(DOCSRCDIR) $@
 	@$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg *.out
 
 mrproper: clean
-	make -C $(DOCSRCDIR) $@
+	$(MAKE) -C $(DOCSRCDIR) $@
 	@$(RM) -- $(GENERATED) $(ZIPS) $(GLYPHSOURCE)
 	@$(RM) -r -- $(DISTDIR)
 
-- 
cgit v1.2.3


From c3b803956524b0b5afb873a054556d0cdb89d063 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Mon, 10 Feb 2014 21:33:34 +0100
Subject: [db] remove four fonts from blacklist
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* remove ``Skia.ttf`` cause the buggy AAT support was removed as of
  r4647.
* remove ``Diablindall.ttf`` is now read fine probably due to lazy
  loading (no idea if that means that the font actually works, it just
  stopped making Luatex crap itself in ``fontloader.open()``).
* ``LastResort.ttf`` supposedly works now as well.
* ``lingoes.ttf`` no longer crashes, cf.
  http://tracker.luatex.org/view.php?id=826.

There’s still a couple fonts left that I’ve never seen and which we
might remove from the blocklist as well.

Signed-off-by: Philipp Gesang <phg42.2a@gmail.com>
---
 luaotfload-blacklist.cnf | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/luaotfload-blacklist.cnf b/luaotfload-blacklist.cnf
index 5c03dc2..e82669b 100644
--- a/luaotfload-blacklist.cnf
+++ b/luaotfload-blacklist.cnf
@@ -1,12 +1,4 @@
-% Takes ages to load
-LastResort.ttf % a MacOSX font, but also available for free from unicode.org 
-% Segfaults under LuaTeX 0.76
-lingoes.ttf
-% http://tug.org/pipermail/luatex/2013-May/004239.html
-Diablindall.ttf
 spltfgbd.ttf
 spltfgbi.ttf
 spltfgit.ttf
 spltfgrg.ttf
-% Buggy Max OS font, see https://github.com/lualatex/luaotfload/issues/139
-Skia.ttf
-- 
cgit v1.2.3


From f874408006c90ba4ecdf96fb84a2a560fb30429f Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Mon, 10 Feb 2014 21:43:30 +0100
Subject: [db] display name of the blacklist file a font is blacklisted in

---
 luaotfload-database.lua | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/luaotfload-database.lua b/luaotfload-database.lua
index c69fc03..a3f3718 100644
--- a/luaotfload-database.lua
+++ b/luaotfload-database.lua
@@ -1986,13 +1986,16 @@ read_blacklist = function ()
     local whitelist = { }
 
     if files and type(files) == "table" then
-        for _,v in next, files do
-            for line in iolines(v) do
+        for _, path in next, files do
+            for line in iolines (path) do
                 line = stringstrip(line) -- to get rid of lines like " % foo"
-                local first_chr = stringsub(line, 1, 1) --- faster than find
+                local first_chr = stringsub(line, 1, 1)
                 if first_chr == "%" or stringis_empty(line) then
                     -- comment or empty line
                 elseif first_chr == "-" then
+                    report ("both", 3, "db",
+                            "Whitelisted file %q via %q.",
+                            line, path)
                     whitelist[#whitelist+1] = stringsub(line, 2, -1)
                 else
                     local cmt = stringfind(line, "%%")
@@ -2000,7 +2003,9 @@ read_blacklist = function ()
                         line = stringsub(line, 1, cmt - 1)
                     end
                     line = stringstrip(line)
-                    report("log", 2, "db", "Blacklisted file %q.", line)
+                    report ("both", 3, "db",
+                            "Blacklisted file %q via %q.",
+                            line, path)
                     blacklist[#blacklist+1] = line
                 end
             end
-- 
cgit v1.2.3