diff options
| author | Philipp Gesang <phg@phi-gamma.net> | 2015-06-18 23:01:44 +0200 |
|---|---|---|
| committer | Philipp Gesang <phg@phi-gamma.net> | 2015-06-18 23:01:44 +0200 |
| commit | 4252a41ffc8e6851cd634f3ae38b4ed38b52ff80 (patch) | |
| tree | 0633f3bd95e4c0dc368737f404649587824567ed | |
| parent | 7c2e8d69c755e05044a214dcefca164fd62d4727 (diff) | |
| download | luaotfload-4252a41ffc8e6851cd634f3ae38b4ed38b52ff80.tar.gz | |
[parsers] check fontconfig includes at another part of the scanner and add more verbose messages
| -rw-r--r-- | src/luaotfload-parsers.lua | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/src/luaotfload-parsers.lua b/src/luaotfload-parsers.lua index 2ef32c3..a52b5d4 100644 --- a/src/luaotfload-parsers.lua +++ b/src/luaotfload-parsers.lua @@ -295,6 +295,9 @@ read_fonts_conf_indeed = function (depth, --- distributions (e.g. Context minimals) installed --- separately? if not (stringfind(path, "texmf") or dirs_done[path]) then + logreport ("log", 5, "db", + "New fontconfig path at %s.", + path) acc[#acc+1] = path dirs_done[path] = true end @@ -316,8 +319,8 @@ read_fonts_conf_indeed = function (depth, and kpsereadable_file(path) then if done[path] then - logreport("log", 3, "load", - "Skipping file at %s, already included.", opt) + logreport("log", 3, "db", + "Skipping file at %s, already included.", path) else done[path] = true acc = read_fonts_conf_indeed(depth + 1, @@ -334,15 +337,21 @@ read_fonts_conf_indeed = function (depth, local config_files = find_files (path, conf_filter) for _, filename in next, config_files do if not done[filename] then - acc = read_fonts_conf_indeed(depth + 1, - filename, - home, - xdg_config_home, - xdg_data_home, - acc, - done, - dirs_done, - find_files) + if done[path] then + logreport ("log", 3, "db", + "Skipping file at %s, already included.", path) + else + done[path] = true + acc = read_fonts_conf_indeed(depth + 1, + filename, + home, + xdg_config_home, + xdg_data_home, + acc, + done, + dirs_done, + find_files) + end end end end --- match “kind” |