diff options
| author | Philipp Gesang <phg@phi-gamma.net> | 2016-05-18 07:51:00 +0200 |
|---|---|---|
| committer | Philipp Gesang <phg@phi-gamma.net> | 2016-05-18 08:20:48 +0200 |
| commit | e7b0a9520127d4b143ceaa1240bd199219f341e8 (patch) | |
| tree | feac9b295d1e90093b8ddccaead9e851b33ea353 /src | |
| parent | 5a833d339a50cdaf1eb76f42619a1cdbf3637215 (diff) | |
| download | luaotfload-e7b0a9520127d4b143ceaa1240bd199219f341e8.tar.gz | |
[featurs,loaders] adjust loader specifications to Context conventions
Diffstat (limited to 'src')
| -rw-r--r-- | src/luaotfload-features.lua | 7 | ||||
| -rw-r--r-- | src/luaotfload-loaders.lua | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/luaotfload-features.lua b/src/luaotfload-features.lua index d6531d3..ae4ac77 100644 --- a/src/luaotfload-features.lua +++ b/src/luaotfload-features.lua @@ -1122,7 +1122,6 @@ local import_values = { -- "style", "optsize",--> from slashed notation; handled otherwise { "lookup", false }, { "sub", false }, - { "mode", true }, } local lookup_types = { "anon" , "file", "kpse" @@ -1222,8 +1221,10 @@ local handle_request = function (specification) if name then if lookup == "file" then - specification.filename = name - name = file.removesuffix (name) + local suffix = file.suffix (name) + specification.forcedname = name + specification.forced = suffix + name = file.removesuffix (name) end specification.name = name specification.lookup = lookup or specification.lookup diff --git a/src/luaotfload-loaders.lua b/src/luaotfload-loaders.lua index c21c9eb..fd3e711 100644 --- a/src/luaotfload-loaders.lua +++ b/src/luaotfload-loaders.lua @@ -52,12 +52,9 @@ end local afm_reader = fonts.readers.afm local afm_loader = function (specification) - local name = specification.name - local filename = specification.filename - specification.forced = "afm" - specification.forcedname = filename - specification.filename = file.replacesuffix (filename, "afm") - return afm_reader (specification, "afm") + specification.forced = "afm" + specification.sub = false + return afm_reader (specification) end local afm_compat_message = function (specification) |