From ca62681c4174dae59d0f45f6432d5ab60d4207f3 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Wed, 27 Jul 2016 23:09:58 +0200
Subject: [loaders] take tfm path directly where appropriate

The AFM one is still preferable when passed a PFB because of the extra
checking it does.
---
 src/luaotfload-loaders.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/luaotfload-loaders.lua b/src/luaotfload-loaders.lua
index d7be31e..87275ef 100644
--- a/src/luaotfload-loaders.lua
+++ b/src/luaotfload-loaders.lua
@@ -50,6 +50,7 @@ local unsupported_reader = function (format)
 end
 
 local type1_reader = fonts.readers.afm
+local tfm_reader   = fonts.readers.tfm
 
 local install_formats = function ()
   local fonts = fonts
@@ -82,9 +83,9 @@ local install_formats = function ()
      and aux ("lua", lua_reader)
      and aux ("pfa", unsupported_reader "pfa")
      and aux ("afm", type1_reader)
-     and aux ("tfm", type1_reader)
      and aux ("pfb", type1_reader)
-     and aux ("ofm", readers.tfm)
+     and aux ("tfm", tfm_reader)
+     and aux ("ofm", tfm_reader)
      and aux ("dfont", unsupported_reader "dfont")
 end
 
-- 
cgit v1.2.3