local function get_ucs_from_rmlgbm(c)
- local v = (ivd_aj1 and ivd_aj1.table_ivd_aj1[c])
- if v==true then
- for i,w in pairs(ltjr_cidfont_data["Adobe-Japan1"].descriptions) do
- if w.index==v then v = i; break end
- end
- end
- v = v or 0
+ local v = (ivd_aj1 and ivd_aj1.table_ivd_aj1[c]
+ or ltjr_cidfont_data["Adobe-Japan1"].resources.unicodes["Japan1." .. tostring(c)])
+ or 0
if v>=0x200000 then -- table
local curjfnt_num = tex_get_attr((ltjd_get_dir_count()==dir_tate)
and attr_curtfnt or attr_curjfnt)
-- ..curjfnt.psname..'" is not a CID-Keyed font (Adobe-Japan1 etc.)')
return append_jglyph(get_ucs_from_rmlgbm(key))
else
- local char = nil
- for i,v in pairs(curjfnt.shared.rawdata.descriptions) do
- if v.index==key then char = i; break end
- end
+ local char = ltjf_font_extra_info[curjfnt_num].ind_to_uni[key]
if not char then
- ltjb.package_warning('luatexja-otf',
- 'Current Japanese font (or other CJK font) "'
- ..curjfnt.psname..'" does not have the specified CID character ('
- ..tostring(key)..')',
- 'Use a font including the specified CID character.')
+-- ltjb.package_warning('luatexja-otf',
+-- '"' ..curjfnt.psname..'" does not have CID character '
+-- ..tostring(key),
+-- 'Use a font including the specified CID character.')
char = 0
end
return append_jglyph(char)
-- additional callbacks
-- 以下は,LuaTeX-ja に用意された callback のサンプルになっている.
-- JFM の文字クラスの指定の所で,"AJ1-xxx" 形式での指定を可能とした.
--- これらの文字指定は,和文フォント定義ごとに,それぞれのフォントの
--- CID <-> グリフ 対応状況による変換テーブルが用意される.
--- 和文フォント読み込み時に,CID -> unicode 対応をとっておく.
-local function cid_to_char(fmtable, fn)
+-- 和文フォント読み込み時に,ind -> unicode 対応をとっておく.
+local function ind_to_uni(fmtable, fn)
local fi = identifiers[fn]
- local fe = ltjf_font_extra_info[fn]
- if (fi.resources and fi.resources.cidinfo and fi.resources.cidinfo.ordering == "Japan1" )
- and (fe and fe.unicodes) then
+ local t = ltjf_font_extra_info[fn].ind_to_uni
+ if t and fi.resources and fi.resources.cidinfo
+ and fi.resources.cidinfo.ordering == "Japan1" then
for i, v in pairs(fmtable.chars) do
local j = string.match(i, "^AJ1%-([0-9]*)")
if j then
- j = tonumber(fe.unicodes['Japan1.'..tostring(j)])
+ j = t[i]
if j then
fmtable.cid_char_type = fmtable.cid_char_type or {}
fmtable.cid_char_type[j] = v
return fmtable
end
luatexbase.add_to_callback("luatexja.define_jfont",
- cid_to_char, "ltj.otf.define_jfont", 1)
+ ind_to_uni, "ltj.otf.define_jfont", 1)
-- 既に読み込まれているフォントに対しても,同じことをやらないといけない
for fn, v in pairs(ltjf_font_metric_table) do
- ltjf_font_metric_table[fn] = cid_to_char(v, fn)
+ ltjf_font_metric_table[fn] = ind_to_uni(v, fn)
end