diff options
| author | Philipp Gesang <phg42.2a@gmail.com> | 2013-04-25 18:35:50 +0200 |
|---|---|---|
| committer | Philipp Gesang <phg42.2a@gmail.com> | 2013-04-25 18:35:50 +0200 |
| commit | cd83d13014406c6e6dd8facf325c19bf0b51c432 (patch) | |
| tree | bb52899270127f87fe88a342ecda7d7d85ab6191 /luaotfload-database.lua | |
| parent | 3a645a338fc4297bc9a61dae1fece13533d2f3ee (diff) | |
| download | luaotfload-cd83d13014406c6e6dd8facf325c19bf0b51c432.tar.gz | |
scan fontconfig dirs even though ``$OSFONTDIR`` is set
This is essentially what this change to the TL2011 version does:
https://github.com/lualatex/luaotfload/commit/31530badb2681ff3423fe31f5eccf3d05fab1956#L2R657
in response to this issue:
https://github.com/lualatex/luaotfload/issues/11
Diffstat (limited to 'luaotfload-database.lua')
| -rw-r--r-- | luaotfload-database.lua | 19 |
1 files changed, 8 insertions, 11 deletions
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 |