summaryrefslogtreecommitdiff
path: root/tex/generic
diff options
context:
space:
mode:
authorContext Git Mirror Bot <phg42.2a@gmail.com>2014-10-29 16:15:03 +0100
committerContext Git Mirror Bot <phg42.2a@gmail.com>2014-10-29 16:15:03 +0100
commit8b2d210bded556395191e66f360a5ef35e5e1f8d (patch)
tree5270689333a371b518535e802ea73bab4efb7443 /tex/generic
parente4d37ac8b9848292f1af2de118258a093b104cc8 (diff)
downloadcontext-8b2d210bded556395191e66f360a5ef35e5e1f8d.tar.gz
2014-10-29 15:23:00
Diffstat (limited to 'tex/generic')
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua7
1 files changed, 4 insertions, 3 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 891650e5c..5b9fc4f45 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 10/29/14 00:18:00
+-- merge date : 10/29/14 15:20:43
do -- begin closure to overcome local limits and interference
@@ -5744,6 +5744,7 @@ local function read_from_tfm(specification)
properties.fontname=tfmdata.fontname
properties.psname=tfmdata.psname
properties.filename=specification.filename
+ properties.format=fonts.formats.tfm
parameters.size=size
shared.rawdata={}
shared.features=features
@@ -14090,8 +14091,8 @@ function definers.read(specification,size,id)
elseif trace_defining and type(tfmdata)=="table" then
local properties=tfmdata.properties or {}
local parameters=tfmdata.parameters or {}
- report_defining("using %s font with id %a, name %a, size %a, bytes %a, encoding %a, fullname %a, filename %a",
- properties.format,id,properties.name,parameters.size,properties.encodingbytes,
+ report_defining("using %a font with id %a, name %a, size %a, bytes %a, encoding %a, fullname %a, filename %a",
+ properties.format or "unknown",id,properties.name,parameters.size,properties.encodingbytes,
properties.encodingname,properties.fullname,file.basename(properties.filename))
end
statistics.stoptiming(fonts)