diff options
| -rwxr-xr-x | fontdbutil.lua | 2 | ||||
| -rw-r--r-- | luaotfload-database.lua | 19 |
2 files changed, 9 insertions, 12 deletions
diff --git a/fontdbutil.lua b/fontdbutil.lua index d76678f..3c60eec 100755 --- a/fontdbutil.lua +++ b/fontdbutil.lua @@ -269,7 +269,7 @@ actions.query = function (job) logs.names_report(false, 1, "resolve", "Font “%s” found!", query) logs.names_report(false, 1, - "resolve", "Resolved file name “%s”:", foundname) + "resolve", "Resolved file name “%s”", foundname) if job.show_info then show_font_info(foundname) end diff --git a/luaotfload-database.lua b/luaotfload-database.lua index bd664a6..1b13f69 100644 --- a/luaotfload-database.lua +++ b/luaotfload-database.lua @@ -1188,19 +1188,16 @@ update_names = function (fontnames, force) end local newfontnames = fontnames_init() read_blacklist() - --installed_fonts_scanned = false - --scan_installed_fonts(fontnames, newfontnames) --- see fixme above - local scanned, new = scan_texmf_fonts(fontnames, newfontnames) + + local scanned, new + scanned, new = scan_texmf_fonts(fontnames, newfontnames) n_scanned = n_scanned + scanned n_new = n_new + new - --if not installed_fonts_scanned - --and stringis_empty(kpseexpand_path("$OSFONTDIR")) - if stringis_empty(kpseexpand_path("$OSFONTDIR")) - then - local scanned, new = scan_os_fonts(fontnames, newfontnames) - n_scanned = n_scanned + scanned - n_new = n_new + new - end + + scanned, new = scan_os_fonts(fontnames, newfontnames) + n_scanned = n_scanned + scanned + n_new = n_new + new + --- stats: --- before rewrite | after rewrite --- partial: 804 ms | 701 ms |