luatexja-preset.sty: bugfix

[luatex-ja/luatexja.git] / src / ltj-jfont.lua

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index 98884e3..df596b5 100644 (file)
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -155,7 +155,7 @@ function define_jfm(t)
            if type(x)=='number' then
                v.kern[j] = {x, 0.5}
             elseif type(x)=='table' then
-               v.kern[j] = { x[1], ratio=x.ratio or (x[2] and 0.5*(1+x[2]) or 0.5) }
+               v.kern[j] = { x[1], (x.ratio or (x[2] and 0.5*(1+x[2]) or 0.5)) }
             end
         end
         t.char_type[i] = v
@@ -804,7 +804,13 @@ do
       return dest
    end
    prepare_fl_data = function (dest, id)
-      local fl = fontloader.open(id.filename)
+      local t = fontloader.info(id.filename)
+      local fl
+      if t.filename then
+        fl = fontloader.open(id.filename)
+      else
+        fl = fontloader.open(id.filename, id.fullname)
+      end
       local ind_to_uni, unicodes = {}, {}
       for i,v in pairs(id.characters) do
          ind_to_uni[v.index] = i