diff options
Diffstat (limited to 'Master/texmf-dist/tex/luatex')
5 files changed, 16 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-features.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-features.lua index 1fb6d7c6785..9b895ce47e3 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-features.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/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,14 +771,14 @@ local set_default_features = function (speclist) end for feat, state in next, requested do - if not speclist[feat] 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 @@ -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 diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-fontloader.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-fontloader.lua index 660524e6fd7..12b68a57d9f 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-fontloader.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-fontloader.lua @@ -8310,7 +8310,7 @@ actions["reorganize glyph anchors"]=function(data,filename,raw) for tag,specification in next,data do for i=1,#specification do local si=specification[i] - specification[i]={ si.x or 0,si.y or 0 } + specification[i]={ si and si.x or 0,si and si.y or 0 } end end else diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua index 0b32dbb319b..ed88f791186 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua @@ -4,7 +4,7 @@ -- REQUIREMENTS: luatex v.0.79 or later; packages lualibs, luatexbase -- AUTHOR: Élie Roux, Khaled Hosny, Philipp Gesang -- VERSION: same as Luaotfload --- MODIFIED: 2014-08-03 10:13:55+0200 +-- MODIFIED: 2014-08-10 23:12:07+0200 ----------------------------------------------------------------------- -- --- Note: @@ -48,12 +48,12 @@ local initial_log_level = 0 luaotfload = luaotfload or { } local luaotfload = luaotfload luaotfload.log = luaotfload.log or { } -luaotfload.version = "2.5-3" -- FIXME version belongs in common init +luaotfload.version = "2.5-4" -- FIXME version belongs in common init luaotfload.module = { name = "luaotfload-main", - version = 2.50002, - date = "2014/08/03", + version = 2.50003, + date = "2014/08/10", description = "OpenType layout system.", author = "Elie Roux & Hans Hagen", copyright = "Elie Roux", diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua index 4e7a2a3ef58..1a6a9f2fb62 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua @@ -3,11 +3,11 @@ return { { "mkstatus", "38dd7ee3f5b372550e9d5e47466ac6c4" }, { "mkglyphlist", "62bc2c915a0fc936f9249deb0eddcaf3" }, { "mkcharacters", "ec694a87f77067912eb73402ec99040d" }, - { "luaotfload-tool.lua", "bdd144181a175fbb67593102d74102d1" }, + { "luaotfload-tool.lua", "c48f1995e9e74155aad6a745db16bcab" }, { "luaotfload-parsers.lua", "cc86ac664ce5aedd81218e59b7180e83" }, { "luaotfload-override.lua", "e6f67a268fa9362d5ebc5cbecad1a900" }, - { "luaotfload-fontloader.lua", "e5b6468df3b0c17feabed1fc65063782" }, - { "luaotfload-main.lua", "20c69949cf37b928f0e4b55fb5adb0ab" }, + { "luaotfload-fontloader.lua", "5bce3c40d6841694d6be5ad3680d5b10" }, + { "luaotfload-main.lua", "4a3ac1af4af76b6a7ba60246d90a08c0" }, { "luaotfload-log.lua", "1f8aee13a8b8a7a20cd8b03285ab425a" }, { "luaotfload-loaders.lua", "c364151f603514433fa3128939825d16" }, { "luaotfload-letterspace.lua", "06cfb1e742d496b99c8980fdfd3f29f4" }, @@ -18,7 +18,7 @@ return { { "luaotfload-fonts-enc.lua", "32775266bfc9eb6bbd9a16e3a7de398d" }, { "luaotfload-fonts-def.lua", "8dc05f2aa96d2fd0245242c8fd3320eb" }, { "luaotfload-fonts-cbk.lua", "c1b7a4e5508d68f45a99cdc38c2d0885" }, - { "luaotfload-features.lua", "6c3e33f4bd1090883851b7f63d45e7fc" }, + { "luaotfload-features.lua", "9a0414d3bcd26497f8082c7803b38676" }, { "luaotfload-diagnostics.lua", "273afde55dff486fb222a50981b3b1d7" }, { "luaotfload-database.lua", "3392acc5a193a4988c156d794ed6933f" }, { "luaotfload-colors.lua", "99878378ef0954d0b67f13db8456dea7" }, @@ -29,7 +29,7 @@ return { }, ["notes"]={ ["committer"]="Philipp Gesang <phg42.2a@gmail.com>", - ["revision"]="ce16cb6589e9bf6793e1e978a38613ff41429784", - ["timestamp"]="2014-08-03 10:17:33 +0200", + ["revision"]="fa525b6b60f23a95f550aa737d07b9919720e7fc", + ["timestamp"]="2014-08-10 23:15:22 +0200", }, }
\ No newline at end of file diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty index c0b88d04ef9..79a9360eb5d 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty @@ -40,7 +40,7 @@ \ProvidesPackage{luaotfload}% %% FIXME The date is meaningless, we need to find a way to %% use the git revision instead. - [2014/08/03 v2.5-3 OpenType layout system] + [2014/08/10 v2.5-4 OpenType layout system] \RequirePackage{luatexbase} \fi \RequireLuaModule{luaotfload-main} |