diff options
| -rw-r--r-- | src/luaotfload-configuration.lua | 26 | ||||
| -rw-r--r-- | src/luaotfload-features.lua | 4 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/luaotfload-configuration.lua b/src/luaotfload-configuration.lua index bf841f7..ec38d90 100644 --- a/src/luaotfload-configuration.lua +++ b/src/luaotfload-configuration.lua @@ -483,6 +483,18 @@ local option_spec = { --- FORMATTERS ------------------------------------------------------------------------------- +local commented = function (str) + return ";" .. str +end + +local underscore_replacer = lpeg.replacer ("_", "-", true) + +local dashed = function (var) + --- INI spec dictates that dashes are valid in variable names, not + --- underscores. + return underscore_replacer (var) or var +end + local indent = " " local format_string = function (var, val) return stringformat (indent .. "%s = %s", var, val) @@ -516,19 +528,7 @@ local format_keyval = function (var, val) end local format_section = function (title) - return stringformat ("[%s]", title) -end - -local commented = function (str) - return ";" .. str -end - -local underscore_replacer = lpeg.replacer ("_", "-", true) - -local dashed = function (var) - --- INI spec dictates that dashes are valid in variable names, not - --- underscores. - return underscore_replacer (var) or var + return stringformat ("[%s]", dashed (title)) end local conf_header = [==[ diff --git a/src/luaotfload-features.lua b/src/luaotfload-features.lua index f01c45b..9b895ce 100644 --- a/src/luaotfload-features.lua +++ b/src/luaotfload-features.lua @@ -771,14 +771,14 @@ local apply_default_features = function (speclist) end for feat, state in next, requested do - if not speclist[feat] == nil then speclist[feat] = state end + if speclist[feat] == nil then speclist[feat] = state end end for feat, state in next, default_features.global do --- This is primarily intended for setting node --- mode unless “base” is requested, as stated --- in the manual. - if not speclist[feat] then speclist[feat] = state end + if speclist[feat] == nil then speclist[feat] = state end end return speclist end |