diff options
| author | Philipp Gesang <phg@phi-gamma.net> | 2015-10-29 07:14:40 +0100 |
|---|---|---|
| committer | Philipp Gesang <phg@phi-gamma.net> | 2015-10-29 07:14:40 +0100 |
| commit | 4f053696e1813fde4bd6cebbb77ff2a1e1f6800b (patch) | |
| tree | 308ec3223eec7744136e95c40284602ba35efacc /src/fontloader/misc/fontloader-font-def.lua | |
| parent | d7a36a33d8d57a5aec9232364cf0bd307523281c (diff) | |
| download | luaotfload-4f053696e1813fde4bd6cebbb77ff2a1e1f6800b.tar.gz | |
[fontloader] sync with Context as of 2015-10-29
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) |