summaryrefslogtreecommitdiff
path: root/src/luaotfload-main.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2014-09-26 18:53:11 +0200
committerPhilipp Gesang <phg42.2a@gmail.com>2014-09-26 18:53:11 +0200
commit1fcdcfc9c7b1f84f8da1b2ea287b29a7989670a2 (patch)
tree78256eb8b062114d6c259aa775871b4d635b31da /src/luaotfload-main.lua
parent5a04743e26573976feb4d176bc71f361423f96d2 (diff)
parent245fe7f679148f4f268109cc702497126610fbc0 (diff)
downloadluaotfload-1fcdcfc9c7b1f84f8da1b2ea287b29a7989670a2.tar.gz
Merge pull request #255 from phi-gamma/master
update state of affairs
Diffstat (limited to 'src/luaotfload-main.lua')
-rw-r--r--src/luaotfload-main.lua21
1 files changed, 13 insertions, 8 deletions
diff --git a/src/luaotfload-main.lua b/src/luaotfload-main.lua
index 26d1515..93256ee 100644
--- a/src/luaotfload-main.lua
+++ b/src/luaotfload-main.lua
@@ -691,18 +691,23 @@ do
local mk_info = function (name)
local definer = name == "patch" and patch or read
return function (specification, size, id)
- logreport ("both", 0, "main",
- "active font definer: %q", name)
- logreport ("both", 0, "main", " > defining font no. %d", id)
+ logreport ("both", 0, "main", "defining font no. %d", id)
+ logreport ("both", 0, "main", " > active font definer: %q", name)
logreport ("both", 0, "main", " > spec %q", specification)
logreport ("both", 0, "main", " > at size %.2f pt", size / 2^16)
- local tfmdata = definer (specification, size, id)
- if not tfmdata then
- logreport ("both", 0, "main", "font definition failed")
+ local result = definer (specification, size, id)
+ if not result then
+ logreport ("both", 0, "main", " > font definition failed")
return
+ elseif type (result) == "number" then
+ logreport ("both", 0, "main", " > font definition yielded id %d", result)
+ return result
end
- logreport ("both", 0, "main", "font definition successful")
- return tfmdata
+ logreport ("both", 0, "main", " > font definition successful")
+ logreport ("both", 0, "main", " > name %q", result.name or "<nil>")
+ logreport ("both", 0, "main", " > fontname %q", result.fontname or "<nil>")
+ logreport ("both", 0, "main", " > fullname %q", result.fullname or "<nil>")
+ return result
end
end