diff options
| author | Philipp Gesang <phg42.2a@gmail.com> | 2014-08-07 22:09:14 +0200 |
|---|---|---|
| committer | Philipp Gesang <phg42.2a@gmail.com> | 2014-08-07 22:09:14 +0200 |
| commit | cad0cd07c802056e731d793413efb1781d0c39a0 (patch) | |
| tree | ab422eba169887e4e84a0067cb246624ac47fbc1 | |
| parent | 4aecc2d439c857b6021c3d3b1450bb619553ca2f (diff) | |
| parent | 3cf26fc9d8307fe780634b3876e13327d17e6ec5 (diff) | |
| download | luaotfload-cad0cd07c802056e731d793413efb1781d0c39a0.tar.gz | |
Merge pull request #244 from phi-gamma/master
bugfix and news update
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | src/luaotfload-features.lua | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,6 +1,11 @@ Change History -------------- +2014/XX/XX, luaotfload v2.6 + * Add ``sign`` target to makefile for automated package signing + * Add ``--dumpconf`` option to luaotfload-tool for generating configuration + files + 2014/07/13, luaotfload v2.5 * Remove legacy code. * Remove compatibility with the old mkluatexfontdb script. diff --git a/src/luaotfload-features.lua b/src/luaotfload-features.lua index 1fb6d7c..f01c45b 100644 --- a/src/luaotfload-features.lua +++ b/src/luaotfload-features.lua @@ -723,7 +723,7 @@ local support_incomplete = tabletohash({ --doc]]-- --- (string, string) dict -> (string, string) dict -local set_default_features = function (speclist) +local apply_default_features = function (speclist) local default_features = luaotfload.features speclist = speclist or { } @@ -771,7 +771,7 @@ local set_default_features = function (speclist) end for feat, state in next, requested do - if not speclist[feat] then speclist[feat] = state end + if not speclist[feat] == nil then speclist[feat] = state end end for feat, state in next, default_features.global do @@ -877,7 +877,7 @@ local handle_request = function (specification) return specification end local lookup, name = select_lookup(request) - request.features = set_default_features(request.features) + request.features = apply_default_features(request.features) if name then specification.name = name |