diff options
| -rw-r--r-- | README | 5 | ||||
| -rw-r--r-- | src/luaotfload-database.lua | 20 | ||||
| -rwxr-xr-x | src/luaotfload-tool.lua | 2 |
3 files changed, 18 insertions, 9 deletions
@@ -33,6 +33,11 @@ Will Robertson <will.robertson@latex-project.org> Philipp Gesang <philipp.gesang@alumni.uni-heidelberg.de> Dohyun Kim <nomosnomos@gmail.com> Reuben Thomas <https://github.com/rrthomas> +Joseph Wright <joseph.wright@morningstar2.co.uk> +Manuel Pégourié-Gonnard <mpg@elzevir.fr> +Olof-Joachim Frahm <olof@macrolet.net> +Patrick Gundlach <gundlach@speedata.de> +Philipp Stephani <st_philipp@yahoo.de> Installation 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 |