summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/font-tfm.lua
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/context/base/font-tfm.lua')
-rw-r--r--Master/texmf-dist/tex/context/base/font-tfm.lua19
1 files changed, 9 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/context/base/font-tfm.lua b/Master/texmf-dist/tex/context/base/font-tfm.lua
index b1ec7c1dec2..316b947a36b 100644
--- a/Master/texmf-dist/tex/context/base/font-tfm.lua
+++ b/Master/texmf-dist/tex/context/base/font-tfm.lua
@@ -15,22 +15,21 @@ local trace_features = false trackers.register("tfm.features", func
local report_defining = logs.reporter("fonts","defining")
local report_tfm = logs.reporter("fonts","tfm loading")
+local findbinfile = resolvers.findbinfile
+
local fonts = fonts
local handlers = fonts.handlers
local readers = fonts.readers
local constructors = fonts.constructors
local encodings = fonts.encodings
-local tfm = { }
-handlers.tfm = tfm
-
-constructors.resolvevirtualtoo = false -- wil be set in font-ctx.lua
-
-local findbinfile = resolvers.findbinfile
+local tfm = constructors.newhandler("tfm")
-local tfmfeatures = fonts.constructors.newfeatures("tfm")
+local tfmfeatures = constructors.newfeatures("tfm")
local registertfmfeature = tfmfeatures.register
+constructors.resolvevirtualtoo = false -- wil be set in font-ctx.lua
+
fonts.formats.tfm = "type1" -- we need to have at least a value here
--[[ldx--
@@ -58,7 +57,7 @@ local function read_from_tfm(specification)
local filename = specification.filename
local size = specification.size
if trace_defining then
- report_defining("loading tfm file %s at size %s",filename,size)
+ report_defining("loading tfm file %a at size %s",filename,size)
end
local tfmdata = font.read_tfm(filename,size) -- not cached, fast enough
if tfmdata then
@@ -92,7 +91,7 @@ local function read_from_tfm(specification)
constructors.enhanceparameters(parameters) -- official copies for us
--
if constructors.resolvevirtualtoo then
- fonts.loggers.register(tfmdata,file.extname(filename),specification) -- strange, why here
+ fonts.loggers.register(tfmdata,file.suffix(filename),specification) -- strange, why here
local vfname = findbinfile(specification.name, 'ovf')
if vfname and vfname ~= "" then
local vfdata = font.read_vf(vfname,size) -- not cached, fast enough
@@ -133,7 +132,7 @@ local function check_tfm(specification,fullname) -- we could split up like afm/o
specification.format = "ofm"
return read_from_tfm(specification)
elseif trace_defining then
- report_defining("loading tfm with name %s fails",specification.name)
+ report_defining("loading tfm with name %a fails",specification.name)
end
end