From c6e5c892171b526c0bd283737a6207bf443765e2 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sat, 21 Nov 2015 22:20:25 +0100 Subject: [db] adapt log behavior of font path search --- src/luaotfload-database.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/luaotfload-database.lua') diff --git a/src/luaotfload-database.lua b/src/luaotfload-database.lua index 1bc2768..2bce001 100644 --- a/src/luaotfload-database.lua +++ b/src/luaotfload-database.lua @@ -2193,14 +2193,14 @@ local collect_font_filenames_texmf = function () local osfontdir = kpseexpand_path "$OSFONTDIR" if stringis_empty (osfontdir) then - logreport ("info", 1, "db", "Scanning TEXMF for fonts...") + logreport ("both", 1, "db", "Scanning TEXMF for fonts...") else - logreport ("info", 1, "db", "Scanning TEXMF and $OSFONTDIR for fonts...") + logreport ("both", 1, "db", "Scanning TEXMF and $OSFONTDIR for fonts...") if log.get_loglevel () > 3 then local osdirs = filesplitpath (osfontdir) - logreport ("info", 0, "db", "$OSFONTDIR has %d entries:", #osdirs) + logreport ("both", 0, "db", "$OSFONTDIR has %d entries:", #osdirs) for i = 1, #osdirs do - logreport ("info", 0, "db", "[%d] %s", i, osdirs[i]) + logreport ("both", 0, "db", "[%d] %s", i, osdirs[i]) end end end @@ -2214,14 +2214,14 @@ local collect_font_filenames_texmf = function () end local tasks = filter_out_pwd (filesplitpath (fontdirs)) - logreport ("info", 3, "db", + logreport ("both", 3, "db", "Initiating scan of %d directories.", #tasks) local files = { } for _, dir in next, tasks do files = tableappend (files, collect_font_filenames_dir (dir, "texmf")) end - logreport ("term", 3, "db", "Collected %d files.", #files) + logreport ("both", 3, "db", "Collected %d files.", #files) return files end -- cgit v1.2.3 From 91c97ddc438c225123cf50ae674931381c0fbf47 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 22 Nov 2015 00:37:26 +0100 Subject: [db] emit message when skipping PWD --- src/luaotfload-database.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/luaotfload-database.lua') diff --git a/src/luaotfload-database.lua b/src/luaotfload-database.lua index 2bce001..cc8549e 100644 --- a/src/luaotfload-database.lua +++ b/src/luaotfload-database.lua @@ -2166,7 +2166,11 @@ local filter_out_pwd = function (dirs) for i = 1, #dirs do --- better safe than sorry local dir = path_normalize (lpegmatch (stripslashes, dirs[i])) - if not (dir == "." or dir == pwd) then + if dir == "." or dir == pwd then + logreport ("both", 3, "db", + "Path “%s” matches $PWD (“%s”), skipping.", + dir, pwd) + else result[#result+1] = dir end end -- cgit v1.2.3 From 70eae49c13abe5f01222da49c1c3c93e493083e0 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 22 Nov 2015 00:28:33 +0100 Subject: [db] fix search path construction on Win hosts This seems to help with the examples from #165 that rely on setting ``$OPENTYPEFONTS`` via the environment. Referencing a non-existing value caused a branch to always pick Unix path separators. The affair was pretty insidious since the paths we received from kpse were sane so the behavior was only triggered with manual overrides. --- src/luaotfload-database.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/luaotfload-database.lua') diff --git a/src/luaotfload-database.lua b/src/luaotfload-database.lua index cc8549e..35450b5 100644 --- a/src/luaotfload-database.lua +++ b/src/luaotfload-database.lua @@ -2177,7 +2177,7 @@ local filter_out_pwd = function (dirs) return result end -local path_separator = ostype == "windows" and ";" or ":" +local path_separator = os.type == "windows" and ";" or ":" --[[doc-- -- cgit v1.2.3