X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-otf.lua;h=0e542102270222df272c6de50572152d0e55960b;hb=f078ac2f7998a102c7ec765e725f2269eed9f872;hp=ea92d60192e2fd1ba96509d0d1f3f46d3d85f0c8;hpb=8e5baa9c35d3bb21591f7b77fef9016fa6b64d94;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-otf.lua b/src/ltj-otf.lua index ea92d60..0e54210 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'] @@ -59,29 +55,76 @@ local ltjd_get_dir_count = ltjd.get_dir_count local dir_tate = luatexja.dir_table.dir_tate luatexja.userid_table.OTF = luatexbase.newuserwhatsitid('char_by_cid', 'luatexja') -luatexja.userid_table.VSR = luatexbase.newuserwhatsitid('replace_vs', 'luatexja') -local OTF, VSR = luatexja.userid_table.OTF, luatexja.userid_table.VSR +local OTF = luatexja.userid_table.OTF +local tex_get_attr = tex.getattribute + +local cache_var = 2 +local cache_outdate_fn = function (t) return t.version~=cache_ver end +local ivd_aj1 = ltjb.load_cache('ltj-ivd_aj1',cache_outdate_fn) +if not ivd_aj1 then -- make cache + ivd_aj1 = require('ltj-ivd_aj1.lua') + ltjb.save_cache_luc('ltj-ivd_aj1', ivd_aj1) +end + local function get_ucs_from_rmlgbm(c) - local v = ltjr_cidfont_data["Adobe-Japan1"].resources.unicodes["Japan1." .. tostring(c)] - if not v then -- AJ1 範囲外 - return 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) + local curjfnt = identifiers[curjfnt_num].resources + local base, ivs = v % 0x200000, 0xE00FF + math.floor(v/0x200000) + curjfnt = curjfnt and curjfnt.variants + curjfnt = curjfnt and curjfnt[ivs] + return curjfnt and curjfnt[base] or base elseif v<0xF0000 then -- 素直に Unicode にマップ可能 return v - else - local w = ltjr_cidfont_data["Adobe-Japan1"].characters[v]. tounicode - -- must be non-nil! - local i = string.len(w) - if i==4 then -- UCS2 - return tonumber(w,16) - elseif i==8 then - i,w = tonumber(string.sub(w,1,4),16), tonumber(string.sub(w,-4),16) - if (w>=0xD800) and (w<=0xDB7F) and (i>=0xDC00) and (i<=0xDFFF) then -- Surrogate pair - return (w-0xD800)*0x400 + (i-0xDC00) - else - return 0 + else -- privete use area + local r, aj = nil, ltjr_cidfont_data["Adobe-Japan1"] + -- 先に ltj_vert_table を見る + for i,w in pairs(aj.shared.ltj_vert_table) do + if w==v then r=i; break end + end + if not r then + -- なければ ToUnicode から引く + local w = aj.characters[v].tounicode -- must be non-nil! + local i = string.len(w) + if i==4 then -- UCS2 + r = tonumber(w,16) + elseif i==8 then + i,w = tonumber(string.sub(w,1,4),16), tonumber(string.sub(w,-4),16) + if (w>=0xD800) and (w<=0xDB7F) and (i>=0xDC00) and (i<=0xDFFF) then -- Surrogate pair + r = (w-0xD800)*0x400 + (i-0xDC00) + else + r = 0 + end + end + end + if aj.shared.ltj_vert_table[r] then + -- CID が縦組用字形だった場合 + local curjfnt_num = tex_get_attr((ltjd_get_dir_count()==dir_tate) + and attr_curtfnt or attr_curjfnt) + local t = identifiers[curjfnt_num] + if t.resources.sequences then + for _,i in pairs(t.resources.sequences) do + if (i.order[1]=='vert' or i.order[1]=='vrt2') + and i.type == 'gsub_single' and i.steps then + for _,j in pairs(i.steps) do + if type(j)=='table' then + if type(j.coverage)=='table' then + for i,k in pairs(j.coverage) do + if i==r then return k end + end + end + end + end + end + end end end + return r end end @@ -95,33 +138,64 @@ local function append_jglyph(char) node_write(p) end +local utf +do + utf = function (ucs) + local char = ucs + if ltjd_get_dir_count()==dir_tate then + local curjfnt_num = tex_get_attr((ltjd_get_dir_count()==dir_tate) + and attr_curtfnt or attr_curjfnt) + local t = identifiers[curjfnt_num] + if t.resources.sequences then + for _,i in pairs(t.resources.sequences) do + if (i.order[1]=='vert' or i.order[1]=='vrt2') + and i.type == 'gsub_single' and i.steps then + for _,j in pairs(i.steps) do + if type(j)=='table' then + if type(j.coverage)=='table' then + for i,k in pairs(j.coverage) do + if i==char then return append_jglyph(k) end + end + end + end + end + end + end + end + end + return append_jglyph(char) + end +end + local cid 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 + if key==0 then return append_jglyph(0) end + 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" and + cidinfo.ordering ~= "KR" 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)] - 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.') + else + local char = ltjf_font_extra_info[curjfnt_num].ind_to_uni[key] + if not char then +-- 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) end - return append_jglyph(char) end end @@ -136,17 +210,18 @@ local function extract(head) if getid(p)==id_whatsit then if getsubtype(p)==sid_user then local puid = getfield(p, 'user_id') - if puid==OTF or puid==VSR then + if puid==OTF then + --if puid==OTF or puid==VSR then local g = node_new(id_glyph) setfield(g, 'subtype', 0) setfield(g, 'char', getfield(p, 'value')) local v = has_attr(p, attr_curfnt); setfield(g, 'font',v) - if puid==OTF then + --if puid==OTF then setfield(g, 'lang', lang_ja) set_attr(g, attr_kblshift, has_attr(p, attr_kblshift)) - else - set_attr(g, attr_ablshift, has_attr(p, attr_ablshift)) - end + --else + -- set_attr(g, attr_ablshift, has_attr(p, attr_ablshift)) + --end head = node_insert_after(head, p, g) head = node_remove(head, p) node_free(p); p = g @@ -158,29 +233,24 @@ local function extract(head) return to_node(head) end -luatexbase.add_to_callback('hpack_filter', extract, - 'ltj.otf', - luatexbase.priority_in_callback('pre_linebreak_filter', - 'ltj.main')) -luatexbase.add_to_callback('pre_linebreak_filter', extract, - 'ltj.otf', - luatexbase.priority_in_callback('pre_linebreak_filter', - 'ltj.main')) - +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" 形式での指定を可能とした． --- これらの文字指定は，和文フォント定義ごとに，それぞれのフォントの --- CID <-> グリフ 対応状況による変換テーブルが用意される． --- 和文フォント読み込み時に，CID -> unicode 対応をとっておく． -local function cid_to_char(fmtable, fn) +-- 和文フォント読み込み時に，ind -> unicode 対応をとっておく． +local function ind_to_uni(fmtable, fn) local fi = identifiers[fn] - if fi.cidinfo and fi.cidinfo.ordering == "Japan1" 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(fi.resources.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 @@ -191,10 +261,10 @@ local function cid_to_char(fmtable, fn) 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 @@ -208,88 +278,19 @@ end luatexbase.add_to_callback("luatexja.find_char_class", cid_set_char_class, "ltj.otf.find_char_class", 1) --------------------- IVS -local enable_ivs -do - local is_ivs_enabled = false --- 組版時 - local function ivs_jglyph(char, bp, pf, uid) - local p = node_new(id_whatsit,sid_user) - setfield(p, 'user_id', uid) - setfield(p, 'type', 100) - setfield(p, 'value', char) - return p - end - - 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 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 - if qc>=0xE0100 then qc = qc - 0xE0100 end - local pt = ltjf_font_extra_info[pf] - pt = pt and pt[getchar(p)]; pt = pt and pt[qc] - head, r = node_remove(head,q) - node_free(q) - if pt then - local is_jachar = (getfield(p, 'lang')==lang_ja) - local np = ivs_jglyph(pt, p, pf, - is_jachar and OTF or VSR) - if is_jachar then - set_attr(np, attr_curfnt, pf) - set_attr(np, attr_kblshift, has_attr(p, attr_kblshift)) - end - head = node_insert_after(head, p, np) - head = node_remove(head,p) - node_free(p) - end - p = r - else - p = q - end - else - p = node_next(p) - end - else - p = node_next(p) - end - end - return to_node(head) - end - - enable_ivs = function () - if is_ivs_enabled then - 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, 'ltj.do_ivs', - luatexbase.priority_in_callback('hpack_filter', - 'ltj.set_stack_level')+1) - luatexbase.add_to_callback('pre_linebreak_filter', - do_ivs_repr, 'ltj.do_ivs', - luatexbase.priority_in_callback('pre_linebreak_filter', - 'ltj.set_stack_level')+1) - is_ivs_enabled = true - end - end +--IVS +local function enable_ivs() + ltjb.package_warning('luatexja-otf', + 'luatexja.otf.enable_ivs() has now no effect.') end +local disable_ivs = enable_ivs luatexja.otf = { append_jglyph = append_jglyph, enable_ivs = enable_ivs, -- 隠し機能: IVS - cid = cid, + disable_ivs = disable_ivs, -- 隠し機能: IVS + cid = cid, utf = utf, } + -- EOF