summaryrefslogtreecommitdiff
path: root/src/luaotfload-main.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2014-03-24 07:57:09 +0100
committerPhilipp Gesang <phg42.2a@gmail.com>2014-03-24 07:57:09 +0100
commit2d9d2b43c13b24a71e54796fa15166c97be64fbc (patch)
treefdf6aa12e4ffc178aa0d64a60ee8feb9e1a30516 /src/luaotfload-main.lua
parentd5d47a03f73afd6b1743636b20f4064b0643ba20 (diff)
parent2d555b40fc580e3ef9328a1f47544d4286b8b860 (diff)
downloadluaotfload-2d9d2b43c13b24a71e54796fa15166c97be64fbc.tar.gz
Merge pull request #208 from phi-gamma/texlive2014
add bisect mode
Diffstat (limited to 'src/luaotfload-main.lua')
-rw-r--r--src/luaotfload-main.lua34
1 files changed, 18 insertions, 16 deletions
diff --git a/src/luaotfload-main.lua b/src/luaotfload-main.lua
index 3c4c770..fe4e792 100644
--- a/src/luaotfload-main.lua
+++ b/src/luaotfload-main.lua
@@ -49,20 +49,22 @@ luaotfload.log = luaotfload.log or { }
config = config or { }
config.luaotfload = config.luaotfload or { }
-------.luaotfload.resolver = config.luaotfload.resolver or "normal"
-config.luaotfload.resolver = config.luaotfload.resolver or "cached"
-config.luaotfload.definer = config.luaotfload.definer or "patch"
-config.luaotfload.loglevel = config.luaotfload.loglevel or 2
-config.luaotfload.color_callback = config.luaotfload.color_callback or "pre_linebreak_filter"
-config.luaotfload.prioritize = config.luaotfload.prioritize or "sys"
-config.luaotfload.names_dir = config.luaotfload.names_dir or "names"
-config.luaotfload.cache_dir = config.luaotfload.cache_dir or "fonts"
-config.luaotfload.index_file = config.luaotfload.index_file or "luaotfload-names.lua"
-config.luaotfload.formats = config.luaotfload.formats or "otf,ttf,ttc,dfont"
-config.luaotfload.scan_local = config.luaotfload.scan_local == true
-
-if config.luaotfload.strip == nil then
- config.luaotfload.strip = true
+local luaotfloadconfig = config.luaotfload
+----------------.resolver = luaotfloadconfig.resolver or "normal"
+luaotfloadconfig.resolver = luaotfloadconfig.resolver or "cached"
+luaotfloadconfig.definer = luaotfloadconfig.definer or "patch"
+luaotfloadconfig.bisect = false --- useless when running TeX
+luaotfloadconfig.loglevel = luaotfloadconfig.loglevel or 2
+luaotfloadconfig.color_callback = luaotfloadconfig.color_callback or "pre_linebreak_filter"
+luaotfloadconfig.prioritize = luaotfloadconfig.prioritize or "sys"
+luaotfloadconfig.names_dir = luaotfloadconfig.names_dir or "names"
+luaotfloadconfig.cache_dir = luaotfloadconfig.cache_dir or "fonts"
+luaotfloadconfig.index_file = luaotfloadconfig.index_file or "luaotfload-names.lua"
+luaotfloadconfig.formats = luaotfloadconfig.formats or "otf,ttf,ttc,dfont"
+luaotfloadconfig.scan_local = luaotfloadconfig.scan_local == true
+
+if luaotfloadconfig.strip == nil then
+ luaotfloadconfig.strip = true
end
luaotfload.module = {
@@ -151,7 +153,7 @@ loadmodule "log.lua" --- messages; used to be part of -override
local log = luaotfload.log
local report = log.report
-log.set_loglevel(config.luaotfload.loglevel)
+log.set_loglevel(luaotfloadconfig.loglevel)
--[[doc--
@@ -689,7 +691,7 @@ reset_callback "define_font"
--doc]]--
-local font_definer = config.luaotfload.definer
+local font_definer = luaotfloadconfig.definer
if font_definer == "generic" then
add_to_callback("define_font",