diff options
| author | Hans Hagen <pragma@wxs.nl> | 2017-04-16 13:20:40 +0200 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2017-04-16 13:20:40 +0200 |
| commit | 218228536ed709be8ab2dde4a00dc27249ceed8a (patch) | |
| tree | 71b331e3d99ebd89fefcc1cb369d233c5c7fbdc1 /tex/context/base/mkiv/font-ctx.lua | |
| parent | ea2466fe69bd082d379e95e1567f3de0b76de243 (diff) | |
| download | context-218228536ed709be8ab2dde4a00dc27249ceed8a.tar.gz | |
2017-04-16 12:47:00
Diffstat (limited to 'tex/context/base/mkiv/font-ctx.lua')
| -rw-r--r-- | tex/context/base/mkiv/font-ctx.lua | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/tex/context/base/mkiv/font-ctx.lua b/tex/context/base/mkiv/font-ctx.lua index 0e64511e2..9e53b2c25 100644 --- a/tex/context/base/mkiv/font-ctx.lua +++ b/tex/context/base/mkiv/font-ctx.lua @@ -156,16 +156,17 @@ end helpers.name = getfontname +local addformatter = utilities.strings.formatters.add + if _LUAVERSION < 5.2 then - formatters.add(formatters,"font:name", [["'"..fontname(%s).."'"]], "local fontname = fonts.helpers.name") - formatters.add(formatters,"font:features",[["'"..sequenced(%s," ",true).."'"]],"local sequenced = table.sequenced") + addformatter(formatters,"font:name", [["'"..fontname(%s).."'"]], "local fontname = fonts.helpers.name") + addformatter(formatters,"font:features",[["'"..sequenced(%s," ",true).."'"]],"local sequenced = table.sequenced") else - -- somehow can fail: - formatters.add(formatters,"font:name", [["'"..fontname(%s).."'"]], { fontname = helpers.name }) - formatters.add(formatters,"font:features",[["'"..sequenced(%s," ",true).."'"]],{ sequenced = table.sequenced }) + addformatter(formatters,"font:name", [["'"..fontname(%s).."'"]], { fontname = helpers.name }) + addformatter(formatters,"font:features",[["'"..sequenced(%s," ",true).."'"]],{ sequenced = table.sequenced }) end @@ -183,12 +184,12 @@ do local shares = { } local hashes = { } -local nofinstances = 0 -local instances = table.setmetatableindex(function(t,k) - nofinstances = nofinstances + 1 - t[k] = nofinstances - return nofinstances -end) + local nofinstances = 0 + local instances = table.setmetatableindex(function(t,k) + nofinstances = nofinstances + 1 + t[k] = nofinstances + return nofinstances + end) function constructors.trytosharefont(target,tfmdata) constructors.noffontsloaded = constructors.noffontsloaded + 1 @@ -347,21 +348,13 @@ otftables.scripts.auto = "automatic fallback to latn when no dflt present" -- setmetatableindex(otffeatures.descriptions,otftables.features) -local privatefeatures = { -- this can go away - tlig = true, - trep = true, - anum = true, -} - local function checkedscript(tfmdata,resources,features) local latn = false local script = false if resources.features then for g, list in next, resources.features do for f, scripts in next, list do - if privatefeatures[f] then - -- skip - elseif scripts.dflt then + if scripts.dflt then script = "dflt" break elseif scripts.latn then |