summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2014-04-25 07:50:00 +0200
committerPhilipp Gesang <phg42.2a@gmail.com>2014-04-25 07:50:00 +0200
commit87a18b1385337140635efc843ed37746487f10f9 (patch)
tree404b4d3d1bd9466b6e0b30e3accf8a209a18a16d /src
parent35e7b448e25f9e51a1299dc5cc60d2427d1ba818 (diff)
downloadluaotfload-87a18b1385337140635efc843ed37746487f10f9.tar.gz
[tool] set up interface between the configuration system and the command line parser
Diffstat (limited to 'src')
-rwxr-xr-xsrc/luaotfload-tool.lua8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/luaotfload-tool.lua b/src/luaotfload-tool.lua
index acddcb6..ba05411 100755
--- a/src/luaotfload-tool.lua
+++ b/src/luaotfload-tool.lua
@@ -259,7 +259,6 @@ local help_msg = function (version)
iowrite(stringformat(template,
luaotfload.self,
--- names_plain,
names_gzip,
names_bin,
caches.getwritablepath (config.luaotfload.cache_dir)))
@@ -754,7 +753,10 @@ actions.config = function (job)
local defaults = luaotfload.default_config
local vars = config.actions.read (job.extra_config)
config.luaotfload = config.actions.apply (defaults, vars)
+ config.luaotfload = config.actions.apply (config.luaotfload, job.config)
+ --inspect(config.luaotfload)
+ --os.exit()
if not config.actions.reconfigure () then
return false, false
end
@@ -1390,6 +1392,7 @@ local process_cmdline = function ( ) -- unit -> jobspec
query = "",
log_level = 0, --- 2 is approx. the old behavior
bisect = nil,
+ config = { db = { }, misc = { }, run = { }, paths = { } },
}
local long_options = {
@@ -1508,7 +1511,8 @@ local process_cmdline = function ( ) -- unit -> jobspec
action_pending["diagnose"] = true
result.asked_diagnostics = optarg[n]
elseif v == "formats" then
- names.set_font_filter (optarg[n])
+ result.config.db.formats = optarg[n]
+ --names.set_font_filter (optarg[n])
elseif v == "n" then
config.luaotfload.db.update_live = false
elseif v == "S" then