From: Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Date: Sat, 23 Apr 2016 05:02:26 +0000 (+0900)
Subject: ltj-jfont.lua: use luatexbase.remove_from_callback to get fontloader
X-Git-Tag: 20160429.0~5
X-Git-Url: http://git.osdn.net/view?p=luatex-ja%2Fluatexja.git;a=commitdiff_plain;h=8a2a31e998f3c7d47c3f46b23a543eff191cc34e;hp=66b66a80ea895419ef4318c607ad9d2fff46ed64

ltj-jfont.lua: use luatexbase.remove_from_callback to get fontloader
---

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index 2bd7258..735d751 100644
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -367,18 +367,18 @@ do
    end
 
    -- define_font callback
-   local otfl_fdr = fonts.definers.read
+   local otfl_fdr
    local ltjr_font_callback = ltjr.font_callback
    function luatexja.font_callback(name, size, id)
       local new_name = is_def_jfont and extract_metric(name) or name
       is_def_jfont = false
-      --local res =  otfl_fdr(new_name, size, id)
       local res =  ltjr_font_callback(new_name, size, id, otfl_fdr)
       luatexbase.call_callback('luatexja.define_font', res, new_name, size, id)
       -- this callback processes variation selector, so we execute it always
       return res
    end
    luatexbase.create_callback('luatexja.define_font', 'simple', function (n) return n end)
+   otfl_fdr= luatexbase.remove_from_callback('define_font', 'luaotfload.define_font')
    luatexbase.add_to_callback('define_font',luatexja.font_callback,"luatexja.font_callback", 1)
 end