lltjext.sty: baselineshift of JAchar may be not zero

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

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index 84a6ead..ac75cc1 100644 (file)
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -3,7 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.jfont',
-  date = '2016/04/03',
+  date = '2017/05/05',
   description = 'Loader for Japanese fonts',
 })
 module('luatexja.jfont', package.seeall)
@@ -155,13 +155,22 @@ 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
         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
@@ -856,16 +871,16 @@ end
 
 --
 do
-   local cache_ver = 11
+   local cache_ver = 12
    local checksum = file.checksum
 
    local function prepare_extra_data_base(id)
       if (not id) or (not id.filename) then return end
-      local bname = file.nameonly(id.filename)
+      local bname = id.psname or file.nameonly(id.filename)
       if not font_extra_basename[bname] then
         -- if the cache is present, read it
         local newsum = checksum(id.filename) -- MD5 checksum of the fontfile
-        local v = "extra_" .. string.lower(file.nameonly(id.filename))
+        local v = "extra_" .. string.lower(bname)
         local dat = ltjb.load_cache(
            v,
            function (t) return (t.version~=cache_ver) or (t.chksum~=newsum) end
@@ -985,8 +1000,9 @@ do
   luatexbase.add_to_callback(
      'luaotfload.patch_font',
      function (tfmdata)
-       if tfmdata.cidinfo then
-          local rd = ltjr_prepare_cid_font(tfmdata.cidinfo.registry, tfmdata.cidinfo.ordering)
+       local cidinfo = tfmdata.cidinfo or tfmdata.resources.cidinfo
+       if cidinfo and cidinfo.registry and cidinfo.ordering then
+          local rd = ltjr_prepare_cid_font(cidinfo.registry, cidinfo.ordering)
           if rd then
              local ru, rc = rd.resources.unicodes, rd.characters
              for i,v in pairs(tfmdata.characters) do