diff options
| author | Philipp Gesang <phg42.2a@gmail.com> | 2014-02-10 21:49:38 +0100 |
|---|---|---|
| committer | Philipp Gesang <phg42.2a@gmail.com> | 2014-02-10 21:49:38 +0100 |
| commit | 9f7c9b2caba2bd85a03d8a95e3892dacef3cafca (patch) | |
| tree | 7b3ce644559c71b26a9a7eb6e6b2bb67dfd74a95 | |
| parent | 446596c46f495760b8c19d51bdfc3d210cd194bc (diff) | |
| parent | f874408006c90ba4ecdf96fb84a2a560fb30429f (diff) | |
| download | luaotfload-9f7c9b2caba2bd85a03d8a95e3892dacef3cafca.tar.gz | |
Merge pull request #195 from phi-gamma/texlive2014
update blacklist
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | luaotfload-blacklist.cnf | 8 | ||||
| -rw-r--r-- | luaotfload-database.lua | 13 |
3 files changed, 14 insertions, 17 deletions
@@ -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) 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 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 |