From 8da1180d4a348991f819dc33d616ef1660813fc1 Mon Sep 17 00:00:00 2001
From: Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Date: Mon, 4 Sep 2017 06:02:38 +0900
Subject: [PATCH] ltj=jfont.lua: fix a regression that some ttc can't be loaded

---
 src/ltj-jfont.lua | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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
-- 
2.11.0