From: Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Date: Sat, 23 Apr 2016 11:39:34 +0000 (+0900)
Subject: ltj-jfont.lua: id.filename may be nil in luaotfload v2.7
X-Git-Tag: 20160429.0~4
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=c3e2159efa02485ded571ccb62b2bde80233150d;p=luatex-ja%2Fluatexja.git

ltj-jfont.lua: id.filename may be nil in luaotfload v2.7
---

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index 735d751..16ba9d9 100644
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -781,8 +781,8 @@ do
    local checksum = file.checksum
 
    local function prepare_extra_data_base(id)
-      if not id then return end
-      local bname = file.nameonly(id.filename or '')
+      if (not id) or (not id.filename) then return end
+      local bname = 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
@@ -809,7 +809,7 @@ do
       end
    end
    local function prepare_extra_data_font(id, res)
-      if type(res)=='table' and res.shared then
+      if type(res)=='table' and res.shared and res.filename then
 	 font_extra_info[id] = font_extra_basename[file.nameonly(res.filename)]
       end
    end