summaryrefslogtreecommitdiff
path: root/src/luaotfload-database.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2016-04-18 20:53:29 +0200
committerPhilipp Gesang <phg@phi-gamma.net>2016-04-18 20:53:29 +0200
commita119b257eb5ad1a9ce9a9015d082f28fd2a3527e (patch)
treebe6f43d38271684cd8f7e3ce855f69aef3db43ee /src/luaotfload-database.lua
parentc8734018b81eb2120372493a3767617eeaf0299c (diff)
parent0ed66c28f6f48c8250a903bed9abf6aee6d8dd39 (diff)
downloadluaotfload-a119b257eb5ad1a9ce9a9015d082f28fd2a3527e.tar.gz
Merge pull request #331 from phi-gamma/master
current progress on 2.7
Diffstat (limited to 'src/luaotfload-database.lua')
-rw-r--r--src/luaotfload-database.lua8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/luaotfload-database.lua b/src/luaotfload-database.lua
index fd806e0..4944de1 100644
--- a/src/luaotfload-database.lua
+++ b/src/luaotfload-database.lua
@@ -1437,14 +1437,12 @@ local get_raw_info = function (metadata, basename)
local fullname = metadata.fullname
local validation_state = metadata.validation_state
- if (validation_state and tablecontains (validation_state, "bad_ps_fontname"))
- or not fontname
- then
+ if not fontname or not fullname then
--- Broken names table, e.g. avkv.ttf with UTF-16 strings;
--- we put some dummies in place like the fontloader
--- (font-otf.lua) does.
logreport ("both", 3, "db",
- "%s has invalid postscript font names, using dummies.",
+ "invalid names table of font %s, using dummies.",
basename)
fontname = "bad-fontname-" .. basename
fullname = "bad-fullname-" .. basename
@@ -2955,7 +2953,7 @@ local collect_font_filenames = function ()
local bisect = config.luaotfload.misc.bisect
local max_fonts = config.luaotfload.db.max_fonts --- XXX revisit for lua 5.3 wrt integers
- --tableappend (filenames, collect_font_filenames_texmf ())
+ tableappend (filenames, collect_font_filenames_texmf ())
tableappend (filenames, collect_font_filenames_system ())
if config.luaotfload.db.scan_local == true then
tableappend (filenames, collect_font_filenames_local ())