From: Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Date: Sun, 3 Sep 2017 21:02:38 +0000 (+0900)
Subject: ltj=jfont.lua: fix a regression that some ttc can't be loaded
X-Git-Tag: 20170904.0~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8da1180d4a348991f819dc33d616ef1660813fc1;p=luatex-ja%2Fluatexja.git

ltj=jfont.lua: fix a regression that some ttc can't be loaded
---

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index 40042ec..b9c9492 100644
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -860,11 +860,19 @@ do
    prepare_fl_data = function (dest, id)
       local t = fontloader.info(id.filename)
       local fl
-      if t.filename then
+      if t.fontname then
         fl = fontloader.open(id.filename)
       else
-        fl = fontloader.open(id.filename, id.fullname)
+	local index
+	for i,v in ipairs(t) do
+          if v.fontname == id.fontname then index=i; break end
+        end  
+	fl = fontloader.open(id.filename, index)
+	if not fl then
+	    fl = fontloader.open(id.filename, index) -- マニュアルにはこっちで書いてあるが？
+        end
       end
+      if not fl then fontloader.close(fl); return dest end
       local ind_to_uni, unicodes = {}, {}
       for i,v in pairs(id.characters) do
 	  ind_to_uni[v.index] = i