fig a bug in lltjext + array

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

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index d1ae0ee..df596b5 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)
@@ -87,7 +87,7 @@ function define_jfm(t)
            v.align = 'left' -- left
         end
         if type(v.width)~='number' then
-           v.width = (jfm_dir=='tate') and  1.0
+           v.width = nil
         end
         if type(v.height)~='number' then
            v.height = (jfm_dir=='tate') and  0.0
@@ -132,7 +132,21 @@ function define_jfm(t)
         for j,x in pairs(v.glue) do
            if v.kern[j] then defjfm_res= nil; return end
            x.ratio, x[5] = (x.ratio or (x[5] and 0.5*(1+x[5]) or 0.5)), nil
-           x.priority, x[4] = (x.priority or x[4] or 0), nil
+           do
+              local xp
+              xp, x[4] = (x.priority or x[4]), nil
+              if type(xp)=='table' and t.version>=2 then
+                 if type(xp[1])~='number' or xp[1]<-4 or xp[1]>3 then defjfm_res=nil end  -- stretch
+                 if type(xp[2])~='number' or xp[2]<-4 or xp[2]>3 then defjfm_res=nil end  -- shrink
+                 xp = (xp[1]+4)*8+(xp[2]+4)
+              elseif xp and type(xp)~='number' then
+                 defjfm_res = nil
+              else
+                 xp = (xp or 0)*9+36   
+                 if xp<0 or xp>=64 then defjfm_res=nil end 
+              end
+              x.priority = xp
+           end
            x.kanjiskip_natural = norm_val(x.kanjiskip_natural)
            x.kanjiskip_stretch = norm_val(x.kanjiskip_stretch)
            x.kanjiskip_shrink = norm_val(x.kanjiskip_shrink)
@@ -141,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
@@ -790,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
@@ -842,16 +862,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
@@ -939,9 +959,9 @@ luatexbase.add_to_callback(
       local subtables = {}
       if ft.specification then
         for feat_name,v in pairs(ft.specification.features.normal) do
-           if v==true then
+           if v==true and ft.resources then
               for _,i in pairs(ft.resources.sequences) do
-                 if i.order[1]== feat_name and i.type == 'gpos_single' then
+                 if i.order[1]== feat_name and i.type == 'gpos_single' and type(i.subtables)=='table' then
                     for _,st in pairs(i.subtables) do
                        subtables[st] = true
                     end
@@ -971,8 +991,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