diff options
| author | Philipp Gesang <phg42.2a@gmail.com> | 2014-07-13 20:18:52 +0200 |
|---|---|---|
| committer | Philipp Gesang <phg42.2a@gmail.com> | 2014-07-13 20:18:52 +0200 |
| commit | 94ca703483ba83a856a6206d188e68261abb1476 (patch) | |
| tree | 7b8e7a3f86cea2bf7a3b98c86513985ac04ae3ff | |
| parent | 1a2e7a02faa73856c665d0700303844c5219ef5e (diff) | |
| parent | 157c2ddfd56cb2a4bafb05a41a332431b7f2f837 (diff) | |
| download | luaotfload-94ca703483ba83a856a6206d188e68261abb1476.tar.gz | |
Merge pull request #231 from phi-gamma/master
[tool] fix references to config table in initialization
| -rwxr-xr-x | src/luaotfload-tool.lua | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/luaotfload-tool.lua b/src/luaotfload-tool.lua index 8cfcac0..4c55508 100755 --- a/src/luaotfload-tool.lua +++ b/src/luaotfload-tool.lua @@ -796,9 +796,10 @@ actions.blacklist = function (job) end actions.generate = function (job) - local fontnames = names.update(fontnames, job.force_reload, job.dry_run) - report ("info", 2, "db", "Fonts in the database: %i", #fontnames.mappings) - if names.data() then + local _ = names.update (fontnames, job.force_reload, job.dry_run) + local namedata = names.data () + if namedata then + report ("info", 2, "db", "Fonts in the database: %i", #namedata.mappings) return true, true end return false, false @@ -1504,7 +1505,7 @@ local process_cmdline = function ( ) -- unit -> jobspec action_pending["flush"] = true elseif v == "L" then action_pending["generate"] = true - config.luaotfload.db.scan_local = true + result.config.db.scan_local = true elseif v == "list" then action_pending["list"] = true result.criterion = optarg[n] @@ -1528,22 +1529,22 @@ local process_cmdline = function ( ) -- unit -> jobspec result.config.db.formats = optarg[n] --names.set_font_filter (optarg[n]) elseif v == "n" then - config.luaotfload.db.update_live = false + result.config.db.update_live = false elseif v == "S" then - config.luaotfload.misc.statistics = true + result.config.misc.statistics = true elseif v == "R" then --- dev only, undocumented - config.luaotfload.db.skip_read = true + result.config.db.skip_read = true elseif v == "c" then - config.luaotfload.db.compress = false + result.config.db.compress = false elseif v == "no-strip" then - config.luaotfload.db.strip = false + result.config.db.strip = false elseif v == "max-fonts" then local n = optarg[n] if n then n = tonumber(n) if n and n > 0 then - config.luaotfload.db.max_fonts = n + result.config.db.max_fonts = n end end elseif v == "bisect" then |