diff options
author | Philipp Gesang <phg42.2a@gmail.com> | 2014-12-29 23:38:05 +0100 |
---|---|---|
committer | Philipp Gesang <phg42.2a@gmail.com> | 2014-12-29 23:38:05 +0100 |
commit | 08e3b858401b56d97ff101295a3236fc8e0d47ef (patch) | |
tree | b67456b1dbcefc44e1f3256afe3e492ecf736849 /src/fontloader/misc/fontloader-font-afm.lua | |
parent | 694b07871f9af14f2cde2c25b1ed5c5e996fae19 (diff) | |
download | luaotfload-08e3b858401b56d97ff101295a3236fc8e0d47ef.tar.gz |
[fontloader] sync with Context as of 2014-12-29
Diffstat (limited to 'src/fontloader/misc/fontloader-font-afm.lua')
-rw-r--r-- | src/fontloader/misc/fontloader-font-afm.lua | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/fontloader/misc/fontloader-font-afm.lua b/src/fontloader/misc/fontloader-font-afm.lua index ca5616a..a96c668 100644 --- a/src/fontloader/misc/fontloader-font-afm.lua +++ b/src/fontloader/misc/fontloader-font-afm.lua @@ -48,6 +48,11 @@ local definers = fonts.definers local readers = fonts.readers local constructors = fonts.constructors +local fontloader = fontloader +local font_to_table = fontloader.to_table +local open_font = fontloader.open +local close_font = fontloader.close + local afm = constructors.newhandler("afm") local pfb = constructors.newhandler("pfb") @@ -222,10 +227,10 @@ end local function get_indexes(data,pfbname) data.resources.filename = resolvers.unresolve(pfbname) -- no shortcut - local pfbblob = fontloader.open(pfbname) + local pfbblob = open_font(pfbname) if pfbblob then local characters = data.characters - local pfbdata = fontloader.to_table(pfbblob) + local pfbdata = font_to_table(pfbblob) if pfbdata then local glyphs = pfbdata.glyphs if glyphs then @@ -251,7 +256,7 @@ local function get_indexes(data,pfbname) elseif trace_loading then report_afm("no data in pfb file %a",pfbname) end - fontloader.close(pfbblob) + close_font(pfbblob) elseif trace_loading then report_afm("invalid pfb file %a",pfbname) end |