summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2015-11-22 00:46:04 +0100
committerPhilipp Gesang <phg@phi-gamma.net>2015-11-22 00:46:04 +0100
commit54f5f029605dd3030fcd1d834e447370ddd7823a (patch)
tree15c07a2617e85b6abed77139901e9216238bb252 /src
parent8e66c317251ad8efcfef34a40ac747435e37ed29 (diff)
parent70eae49c13abe5f01222da49c1c3c93e493083e0 (diff)
downloadluaotfload-54f5f029605dd3030fcd1d834e447370ddd7823a.tar.gz
Merge pull request #294 from phi-gamma/master
fixes
Diffstat (limited to 'src')
-rw-r--r--src/luaotfload-database.lua20
-rwxr-xr-xsrc/luaotfload-tool.lua2
2 files changed, 13 insertions, 9 deletions
diff --git a/src/luaotfload-database.lua b/src/luaotfload-database.lua
index 1bc2768..35450b5 100644
--- a/src/luaotfload-database.lua
+++ b/src/luaotfload-database.lua
@@ -2166,14 +2166,18 @@ 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
return result
end
-local path_separator = ostype == "windows" and ";" or ":"
+local path_separator = os.type == "windows" and ";" or ":"
--[[doc--
@@ -2193,14 +2197,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 +2218,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
diff --git a/src/luaotfload-tool.lua b/src/luaotfload-tool.lua
index e9a434a..ab025b3 100755
--- a/src/luaotfload-tool.lua
+++ b/src/luaotfload-tool.lua
@@ -129,7 +129,7 @@ local backup = {
}
texio.write, texio.write_nl = dummy_function, dummy_function
-require "luaotfload-basics-gen.lua"
+require "fontloader-basics-gen.lua"
texio.write, texio.write_nl = backup.write, backup.write_nl
utilities = backup.utilities