ltj-jfmglue.lua: renaming subroutine

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

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index 98884e3..272b03c 100644 (file)
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -162,6 +162,15 @@ function define_jfm(t)
         t[i] = nil
       end
    end
+   if t.version<3 then
+      -- In version 3, 'jcharbdd' is divided into 
+      -- 'alchar': ALchar (or math boundary) 
+      -- 'nox_alchar': ALchar (or math boundary), where xkanjiskip won't inserted
+      -- 'glue': glue/kern, 'jcharbdd': other cases (和文B, rule, ...)
+      t.chars.alchar = t.chars.jcharbdd
+      t.chars.nox_alchar = t.chars.jcharbdd
+      t.chars.glue = t.chars.jcharbdd
+   end
    t = luatexbase.call_callback("luatexja.load_jfm", t, jfm_file_name)
    t.size_cache = {}
    defjfm_res = t
@@ -804,7 +813,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