summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/font-afm.lua
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/context/base/font-afm.lua')
-rw-r--r--Master/texmf-dist/tex/context/base/font-afm.lua14
1 files changed, 8 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/context/base/font-afm.lua b/Master/texmf-dist/tex/context/base/font-afm.lua
index b719a9b3156..9d3d8ddd759 100644
--- a/Master/texmf-dist/tex/context/base/font-afm.lua
+++ b/Master/texmf-dist/tex/context/base/font-afm.lua
@@ -28,6 +28,7 @@ local next, type, tonumber = next, type, tonumber
local format, match, gmatch, lower, gsub, strip = string.format, string.match, string.gmatch, string.lower, string.gsub, string.strip
local abs = math.abs
local P, S, C, R, lpegmatch, patterns = lpeg.P, lpeg.S, lpeg.C, lpeg.R, lpeg.match, lpeg.patterns
+local derivetable = table.derive
local fonts = fonts
local afm = { }
@@ -251,7 +252,7 @@ local function readafm(filename)
creator = "context mkiv",
},
properties = {
- italic_correction = false,
+ hasitalics = false,
},
goodies = {
},
@@ -768,9 +769,9 @@ local function copytotfm(data)
if data and data.descriptions then
local metadata = data.metadata
local resources = data.resources
- local properties = table.derive(data.properties)
- local descriptions = table.derive(data.descriptions)
- local goodies = table.derive(data.goodies)
+ local properties = derivetable(data.properties)
+ local descriptions = derivetable(data.descriptions)
+ local goodies = derivetable(data.goodies)
local characters = { }
local parameters = { }
local unicodes = resources.unicodes
@@ -967,7 +968,8 @@ local function read_from_afm(specification)
if tfmdata then
tfmdata.properties.name = specification.name
tfmdata = constructors.scale(tfmdata, specification)
- constructors.applymanipulators("afm",tfmdata,specification.features.normal,trace_features,report_afm)
+ local allfeatures = tfmdata.shared.features or specification.features.normal
+ constructors.applymanipulators("afm",tfmdata,allfeatures,trace_features,report_afm)
fonts.loggers.register(tfmdata,'afm',specification)
end
return tfmdata
@@ -1102,7 +1104,7 @@ fonts.formats.pfb = "type1"
local function check_afm(specification,fullname)
local foundname = findbinfile(fullname, 'afm') or "" -- just to be sure
if foundname == "" then
- foundname = fonts.names.getfilename(fullname,"afm")
+ foundname = fonts.names.getfilename(fullname,"afm") or ""
end
if foundname == "" and afm.autoprefixed then
local encoding, shortname = match(fullname,"^(.-)%-(.*)$") -- context: encoding-name.*