X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-otf.lua;h=fdb308348f590657abfa2cceff5e12ded1c08ab6;hb=3fae82d64b193c794fdf2f1262d80bddc98ce5a8;hp=991fc4edc6a5fa631f6336ee9f07852712b086ba;hpb=89845b5c5116bf7fc9ebb54bdfc373b554acf5e0;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-otf.lua b/src/ltj-otf.lua index 991fc4e..fdb3083 100644 --- a/src/ltj-otf.lua +++ b/src/ltj-otf.lua @@ -15,32 +15,27 @@ 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 to_node = node.direct.tonode +local to_direct = node.direct.todirect + +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 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 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 = luatexja.Dnode_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 identifiers = fonts.hashes.identifiers local attr_curjfnt = luatexbase.attributes['ltj@curjfnt'] local attr_curtfnt = luatexbase.attributes['ltj@curtfnt'] @@ -48,9 +43,11 @@ local attr_yablshift = luatexbase.attributes['ltj@yablshift'] local attr_ykblshift = luatexbase.attributes['ltj@ykblshift'] local attr_tablshift = luatexbase.attributes['ltj@tablshift'] local attr_tkblshift = luatexbase.attributes['ltj@tkblshift'] -local lang_ja = token.create('ltj@@japanese')[2] +local lang_ja = luatexja.lang_ja +local identifiers = fonts.hashes.identifiers local ltjf_font_metric_table = ltjf.font_metric_table +local ltjf_font_extra_info = ltjf.font_extra_info local ltjf_find_char_class = ltjf.find_char_class local ltjr_cidfont_data = ltjr.cidfont_data local ltjc_is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char @@ -58,16 +55,33 @@ 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 + else -- privete use area local w = ltjr_cidfont_data["Adobe-Japan1"].characters[v]. tounicode -- must be non-nil! local i = string.len(w) @@ -96,22 +110,26 @@ 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 + 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) "' @@ -127,7 +145,6 @@ end local function extract(head) head = to_direct(head) local p = head - local v 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 @@ -136,17 +153,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')) - v = has_attr(p, attr_curfnt); setfield(g, 'font',v) - if puid==OTF then + local v = has_attr(p, attr_curfnt); setfield(g, 'font',v) + --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,16 +176,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,13 +189,15 @@ 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 - fmtable.cid_char_type = {} + 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 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 end end @@ -209,187 +223,19 @@ end luatexbase.add_to_callback("luatexja.find_char_class", cid_set_char_class, "ltj.otf.find_char_class", 1) --------------------- IVS -local font_ivs_table = {} -- key: fontnumber -local enable_ivs -do - local is_ivs_enabled = false - local ivs -- temp table - local sort = table.sort - local uniq_flag - local function add_ivs_table(tg, unitable, glyphmax) - for i = 0, glyphmax-1 do - if tg[i] then - local gv = tg[i] - if gv.altuni then - for _,at in pairs(gv.altuni) do - local bu, vsel = at.unicode, at.variant - if vsel then - if vsel>=0xE0100 then vsel = vsel - 0xE0100 end - if not ivs[bu] then ivs[bu] = {} end - uniq_flag = true - for i,_ in pairs(ivs[bu]) do - if i==vs then uniq_flag = false; break end - end - if uniq_flag then - ivs[bu][vsel] = unitable[gv.name] - end - end - end - end - end - end - end - local function make_ivs_table(id, fname) - ivs = {} - local fl = fontloader.open(fname) - local unicodes = id.resources.unicodes - if fl.glyphs then - add_ivs_table(fl.glyphs, id.resources.unicodes, fl.glyphmax) - end - if fl.subfonts then - for _,v in pairs(fl.subfonts) do - add_ivs_table(v.glyphs, id.resources.unicodes, v.glyphmax) - end - end - fontloader.close(fl) - return ivs - end - --- loading and saving - local font_ivs_basename = {} -- key: basename - local cache_ver = 4 - local checksum = file.checksum - - local function prepare_ivs_data(n, id) - -- test if already loaded - if type(id)=='number' then -- sometimes id is an integer - font_ivs_table[n] = font_ivs_table[id]; return - elseif not id then return - end - local fname = id.filename - local bname = file.basename(fname) - if not fname then - font_ivs_table[n] = {}; return - elseif font_ivs_basename[bname] then - font_ivs_table[n] = font_ivs_basename[bname]; return - end - - -- if the cache is present, read it - local newsum = checksum(fname) -- MD5 checksum of the fontfile - local v = "ivs_" .. string.lower(file.nameonly(fname)) - local dat = ltjb.load_cache(v, - function (t) return (t.version~=cache_ver) or (t.chksum~=newsum) end - ) - -- if the cache is not found or outdated, save the cache - if dat then - font_ivs_basename[bname] = dat[1] or {} - else - dat = make_ivs_table(id, fname) - font_ivs_basename[bname] = dat or {} - ltjb.save_cache( v, - { - chksum = checksum(fname), - version = cache_ver, - dat, - }) - end - font_ivs_table[n] = font_ivs_basename[bname] - end - --- 組版時 - 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(head) - head = to_direct(head) - 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 = font_ivs_table[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,'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) - local ivs_callback = function (name, size, id) - return font_callback( - name, size, id, - function (name, size, id) return luatexja.font_callback(name, size, id) end - ) - end - luatexbase.add_to_callback('luatexja.define_font', - function (res, name, size, id) - prepare_ivs_data(id, res) - end, - 'prepare_ivs_data', 1) - for i=1,font.nextid()-1 do - if identifiers[i] then prepare_ivs_data(i, identifiers[i]) end - end - 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 - font_ivs_table = font_ivs_table, + disable_ivs = disable_ivs, -- 隠し機能: IVS cid = cid, } + -- EOF