summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2014-05-14 22:34:48 +0200
committerPhilipp Gesang <phg42.2a@gmail.com>2014-05-14 22:35:02 +0200
commit12547b5d6f57b0c8032b1029ed90352f5ac39bdb (patch)
tree16c1c8bc4e11124938d7376f630c591e06de64f4
parentde38f10275c160589d0cbbcac4d9141dd6a3ab72 (diff)
downloadluaotfload-12547b5d6f57b0c8032b1029ed90352f5ac39bdb.tar.gz
[conf,tool] move status import to configuration
-rw-r--r--src/luaotfload-configuration.lua4
-rwxr-xr-xsrc/luaotfload-tool.lua11
2 files changed, 8 insertions, 7 deletions
diff --git a/src/luaotfload-configuration.lua b/src/luaotfload-configuration.lua
index 9c634d4..535db30 100644
--- a/src/luaotfload-configuration.lua
+++ b/src/luaotfload-configuration.lua
@@ -21,6 +21,9 @@ luaotfload = luaotfload or { }
config = config or { }
config.luaotfload = { }
+local status_file = "luaotfload-status"
+local luaotfloadstatus = require (status_file)
+
local string = string
local stringsub = string.sub
local stringexplode = string.explode
@@ -421,6 +424,7 @@ apply = function (old, new)
end
end
end
+ result.status = luaotfloadstatus
return result
end
diff --git a/src/luaotfload-tool.lua b/src/luaotfload-tool.lua
index df19ca1..d2b6800 100755
--- a/src/luaotfload-tool.lua
+++ b/src/luaotfload-tool.lua
@@ -150,9 +150,6 @@ require "luaotfload-database"
require "alt_getopt"
local names = fonts.names
-local status_file = "luaotfload-status"
-local luaotfloadstatus = require (status_file)
-config.luaotfload.status = luaotfloadstatus
local sanitize_fontname = names.sanitize_fontname
local log = luaotfload.log
@@ -759,10 +756,10 @@ actions.loglevel = function (job)
end
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)
+ 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()