X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-otf.lua;h=bdaf8ad7908912c5cdcac6d16446797e08382fd0;hb=0d0e4748aca67aa2294b3a8cdec575e1e414d918;hp=94f4c613342ef6219bce5050c81bce300d62fbb1;hpb=9af4f04e3123548ad4a1f4bada4177e09abeb285;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-otf.lua b/src/ltj-otf.lua index 94f4c61..bdaf8ad 100644 --- a/src/ltj-otf.lua +++ b/src/ltj-otf.lua @@ -15,30 +15,26 @@ local id_glyph = node.id('glyph') local id_whatsit = node.id('whatsit') local sid_user = node.subtype('user_defined') -local Dnode = node.direct or node +local setfield = node.direct.setfield +local getfield = node.direct.getfield +local getid = node.direct.getid +local getfont = node.direct.getfont +local getchar = node.direct.getchar +local getsubtype = node.direct.getsubtype -local setfield = (Dnode ~= node) and Dnode.setfield or function(n, i, c) n[i] = c end -local getfield = (Dnode ~= node) and Dnode.getfield or function(n, i) return n[i] end -local getid = (Dnode ~= node) and Dnode.getid or function(n) return n.id end -local getfont = (Dnode ~= node) and Dnode.getfont or function(n) return n.font end ---local getlist = (Dnode ~= node) and Dnode.getlist or function(n) return n.head end -local getchar = (Dnode ~= node) and Dnode.getchar or function(n) return n.char end -local getsubtype = (Dnode ~= node) and Dnode.getsubtype or function(n) return n.subtype end +local to_node = node.direct.tonode +local to_direct = node.direct.todirect -local nullfunc = function(n) return n end -local to_node = (Dnode ~= node) and Dnode.tonode or nullfunc -local to_direct = (Dnode ~= node) and Dnode.todirect or nullfunc - -local node_new = Dnode.new -local node_remove = Dnode.remove -local node_next = (Dnode ~= node) and Dnode.getnext or node.next -local node_free = Dnode.free -local has_attr = Dnode.has_attribute -local set_attr = Dnode.set_attribute -local unset_attr = Dnode.unset_attribute -local node_insert_after = Dnode.insert_after -local node_write = Dnode.write -local node_traverse_id = Dnode.traverse_id +local node_new = node.direct.new +local node_remove = node.direct.remove +local node_next = node.direct.getnext +local node_free = node.direct.free +local has_attr = node.direct.has_attribute +local set_attr = node.direct.set_attribute +local unset_attr = node.direct.unset_attribute +local node_insert_after = node.direct.insert_after +local node_write = node.direct.write +local node_traverse_id = node.direct.traverse_id local attr_curjfnt = luatexbase.attributes['ltj@curjfnt'] @@ -100,19 +96,24 @@ do local tex_get_attr = tex.getattribute cid = function (key) if key==0 then return append_jglyph(char) end - local curjfnt = identifiers[tex_get_attr((ltjd_get_dir_count()==dir_tate) - and attr_curtfnt or attr_curjfnt)] - if not curjfnt.cidinfo or - curjfnt.cidinfo.ordering ~= "Japan1" and - curjfnt.cidinfo.ordering ~= "GB1" and - curjfnt.cidinfo.ordering ~= "CNS1" and - curjfnt.cidinfo.ordering ~= "Korea1" then + local curjfnt_num = tex_get_attr((ltjd_get_dir_count()==dir_tate) + and attr_curtfnt or attr_curjfnt) + local curjfnt = identifiers[curjfnt_num] + local cidinfo = curjfnt.resources.cidinfo + if not cidinfo or + cidinfo.ordering ~= "Japan1" and + cidinfo.ordering ~= "GB1" and + cidinfo.ordering ~= "CNS1" and + cidinfo.ordering ~= "Korea1" then -- ltjb.package_warning('luatexja-otf', -- 'Current Japanese font (or other CJK font) "' -- ..curjfnt.psname..'" is not a CID-Keyed font (Adobe-Japan1 etc.)') return append_jglyph(get_ucs_from_rmlgbm(key)) end - local char = curjfnt.resources.unicodes[curjfnt.cidinfo.ordering..'.'..tostring(key)] + local fe, char = ltjf_font_extra_info[curjfnt_num], nil + if fe and fe.unicodes then + char = fe.unicodes[cidinfo.ordering..'.'..tostring(key)] + end if not char then ltjb.package_warning('luatexja-otf', 'Current Japanese font (or other CJK font) "' @@ -158,16 +159,10 @@ local function extract(head) return to_node(head) end -luatexbase.add_to_callback('hpack_filter', extract, - 'ltj.hpack_filter_otf', - luatexbase.priority_in_callback('pre_linebreak_filter', - 'ltj.pre_linebreak_filter')) -luatexbase.add_to_callback('pre_linebreak_filter', extract, - 'ltj.pre_linebreak_filter_otf', - luatexbase.priority_in_callback('pre_linebreak_filter', - 'ltj.pre_linebreak_filter')) - - +ltjb.add_to_callback('hpack_filter', extract,'ltj.otf', + luatexbase.priority_in_callback('hpack_filter', 'ltj.main')) +ltjb.add_to_callback('pre_linebreak_filter', extract,'ltj.otf', + luatexbase.priority_in_callback('pre_linebreak_filter', 'ltj.main')) -- additional callbacks -- 以下は，LuaTeX-ja に用意された callback のサンプルになっている． -- JFM の文字クラスの指定の所で，"AJ1-xxx" 形式での指定を可能とした． @@ -177,11 +172,12 @@ luatexbase.add_to_callback('pre_linebreak_filter', extract, -- 和文フォント読み込み時に，CID -> unicode 対応をとっておく． local function cid_to_char(fmtable, fn) local fi = identifiers[fn] - if fi.cidinfo and fi.cidinfo.ordering == "Japan1" then + local fe = ltjf_font_extra_info[fn] + if fi.cidinfo and fi.cidinfo.ordering == "Japan1" and fe then for i, v in pairs(fmtable.chars) do local j = string.match(i, "^AJ1%-([0-9]*)") if j then - j = tonumber(fi.resources.unicodes['Japan1.'..tostring(j)]) + j = tonumber(fe.unicodes['Japan1.'..tostring(j)]) if j then fmtable.cid_char_type = fmtable.cid_char_type or {} fmtable.cid_char_type[j] = v @@ -210,7 +206,7 @@ luatexbase.add_to_callback("luatexja.find_char_class", cid_set_char_class, "ltj.otf.find_char_class", 1) -------------------- IVS -local enable_ivs +local enable_ivs, disable_ivs do local is_ivs_enabled = false -- 組版時 @@ -222,23 +218,23 @@ do return p end - local function do_ivs_repr(head) - head = to_direct(head) + local function do_ivs_repr(h) + local head = to_direct(h) local p, r = head - local is_dir_tate = ltjs.list_dir == dir_tate + local is_dir_tate = (ltjs.list_dir == dir_tate) local attr_ablshift = is_dir_tate and attr_tablshift or attr_yablshift local attr_kblshift = is_dir_tate and attr_tkblshift or attr_ykblshift local attr_curfnt = is_dir_tate and attr_curtfnt or attr_curjfnt while p do local pid = getid(p) if pid==id_glyph then - local pf = getfont(p) local q = node_next(p) -- the next node of p if q and getid(q)==id_glyph then local qc = getchar(q) if (qc>=0xFE00 and qc<=0xFE0F) or (qc>=0xE0100 and qc<0xE01F0) then - -- q is a variation selector + -- q is a variation selector if qc>=0xE0100 then qc = qc - 0xE0100 end + local pf = getfont(p) local pt = ltjf_font_extra_info[pf] pt = pt and pt[getchar(p)]; pt = pt and pt[qc] head, r = node_remove(head,q) @@ -254,7 +250,7 @@ do head = node_insert_after(head, p, np) head = node_remove(head,p) node_free(p) - end + end p = r else p = q @@ -265,8 +261,8 @@ do else p = node_next(p) end - end - return to_node(head) + end + return to_node(head) end enable_ivs = function () @@ -274,22 +270,26 @@ do ltjb.package_warning('luatexja-otf', 'luatexja.otf.enable_ivs() was already called, so this call is ignored', '') else - luatexbase.add_to_callback('hpack_filter', - do_ivs_repr,'do_ivs', - luatexbase.priority_in_callback('hpack_filter', - 'ltj.hpack_filter_pre')+1) - luatexbase.add_to_callback('pre_linebreak_filter', - do_ivs_repr, 'do_ivs', - luatexbase.priority_in_callback('pre_linebreak_filter', - 'ltj.pre_linebreak_filter_pre')+1) + ltjb.add_to_callback('hpack_filter', do_ivs_repr, 'ltj.do_ivs', + luatexbase.priority_in_callback('hpack_filter', 'luaotfload.node_processor')) + ltjb.add_to_callback('pre_linebreak_filter', do_ivs_repr, 'ltj.do_ivs', + luatexbase.priority_in_callback('pre_linebreak_filter', 'luaotfload.node_processor')) is_ivs_enabled = true end end + disable_ivs = function () + if is_ivs_enabled then + luatexbase.remove_from_callback('hpack_filter', 'ltj.do_ivs') + luatexbase.remove_from_callback('pre_linebreak_filter', 'ltj.do_ivs') + is_ivs_enabled = false + end + end end luatexja.otf = { append_jglyph = append_jglyph, enable_ivs = enable_ivs, -- 隠し機能: IVS + disable_ivs = disable_ivs, -- 隠し機能: IVS cid = cid, }