summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--otfl-font-def.lua4
-rw-r--r--otfl-font-nms.lua6
2 files changed, 5 insertions, 5 deletions
diff --git a/otfl-font-def.lua b/otfl-font-def.lua
index 533d1ec..2c780ad 100644
--- a/otfl-font-def.lua
+++ b/otfl-font-def.lua
@@ -170,7 +170,7 @@ end
function resolvers.name(specification)
local resolve = fonts.names.resolve
if resolve then
- local resolved, sub = fonts.names.resolve(specification.name,specification.sub)
+ local resolved, sub = fonts.names.resolve(specification.name,specification.sub,specification)
specification.resolved, specification.sub = resolved, sub
if resolved then
local suffix = file.suffix(resolved)
@@ -189,7 +189,7 @@ end
function resolvers.spec(specification)
local resolvespec = fonts.names.resolvespec
if resolvespec then
- specification.resolved, specification.sub = fonts.names.resolvespec(specification.name,specification.sub)
+ specification.resolved, specification.sub = fonts.names.resolvespec(specification.name,specification.sub,specification)
if specification.resolved then
specification.forced = file.extname(specification.resolved)
specification.name = file.removesuffix(specification.resolved)
diff --git a/otfl-font-nms.lua b/otfl-font-nms.lua
index dcd75d3..ec0dc91 100644
--- a/otfl-font-nms.lua
+++ b/otfl-font-nms.lua
@@ -97,7 +97,7 @@ local synonyms = {
local loaded = false
local reloaded = false
-function names.resolve(specification)
+function names.resolve(_,_,specification)
local name = sanitize(specification.name)
local style = sanitize(specification.style) or "regular"
@@ -221,7 +221,7 @@ function names.resolve(specification)
names.data = names.update(names.data)
names.save(names.data)
reloaded = true
- return names.resolve(specification)
+ return names.resolve(_,_,specification)
else
-- else, fallback to filename
-- XXX: specification.name is empty with absolute paths, looks
@@ -234,7 +234,7 @@ function names.resolve(specification)
names.data = names.update()
names.save(names.data)
reloaded = true
- return names.resolve(specification)
+ return names.resolve(_,_,specification)
else
return specification.name, false
end