diff options
| author | David Carlisle <d.p.carlisle@gmail.com> | 2015-11-21 21:45:03 +0000 |
|---|---|---|
| committer | David Carlisle <d.p.carlisle@gmail.com> | 2015-11-21 21:45:03 +0000 |
| commit | b46f13e0949e310b46e97e791fd4e9e38635a491 (patch) | |
| tree | 415c893c82e7f55ed630a10033885f1b5781ab56 /src/fontloader/misc/fontloader-font-def.lua | |
| parent | a472b6fd5461318ec1e5d2899af2ef57f0fb14e8 (diff) | |
| parent | 6c3d70e21b100c6c7ffa11e1c6d9260b32ccc781 (diff) | |
| download | luaotfload-b46f13e0949e310b46e97e791fd4e9e38635a491.tar.gz | |
for 2.6
Diffstat (limited to 'src/fontloader/misc/fontloader-font-def.lua')
| -rw-r--r-- | src/fontloader/misc/fontloader-font-def.lua | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/fontloader/misc/fontloader-font-def.lua b/src/fontloader/misc/fontloader-font-def.lua index fdded3c..add42ee 100644 --- a/src/fontloader/misc/fontloader-font-def.lua +++ b/src/fontloader/misc/fontloader-font-def.lua @@ -183,10 +183,11 @@ end function resolvers.name(specification) local resolve = fonts.names.resolve if resolve then - local resolved, sub = resolve(specification.name,specification.sub,specification) -- we pass specification for overloaded versions + local resolved, sub, subindex = resolve(specification.name,specification.sub,specification) -- we pass specification for overloaded versions if resolved then specification.resolved = resolved specification.sub = sub + specification.subindex = subindex local suffix = lower(suffixonly(resolved)) if fonts.formats[suffix] then specification.forced = suffix @@ -204,10 +205,11 @@ end function resolvers.spec(specification) local resolvespec = fonts.names.resolvespec if resolvespec then - local resolved, sub = resolvespec(specification.name,specification.sub,specification) -- we pass specification for overloaded versions + local resolved, sub, subindex = resolvespec(specification.name,specification.sub,specification) -- we pass specification for overloaded versions if resolved then specification.resolved = resolved specification.sub = sub + specification.subindex = subindex specification.forced = lower(suffixonly(resolved)) specification.forcedname = resolved specification.name = removesuffix(resolved) |