From: Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Date: Mon, 3 Oct 2016 07:53:55 +0000 (+0900)
Subject: ltj-jfont.lua: moved cidinfo in recent luaotfload cache
X-Git-Tag: 20161017.0~8
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=4110d873473a41595013ac53be187d1d76c5909a;p=luatex-ja%2Fluatexja.git

ltj-jfont.lua: moved cidinfo in recent luaotfload cache
---

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index 84a6ead..5dd2bf5 100644
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -985,8 +985,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 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