X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-otf.lua;h=090485497962996afed19e3c565913a3fe84ba5d;hb=a693b63eadfcabe5f4f513a4cc90302f2360b18b;hp=faef663d239eeba93273a649c3ead3e08bdb47b7;hpb=73f9bd4e6731b99d784f7d736692d51411ba3884;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-otf.lua b/src/ltj-otf.lua index faef663..0904854 100644 --- a/src/ltj-otf.lua +++ b/src/ltj-otf.lua @@ -1,39 +1,57 @@ -- --- luatexja/otf.lua +-- luatexja/ltj-otf.lua -- -luatexbase.provides_module({ - name = 'luatexja.otf', - date = '2013/05/11', - description = 'The OTF Lua module for LuaTeX-ja', -}) +require('unicode') +require('lualibs') luatexja.load_module('base'); local ltjb = luatexja.base luatexja.load_module('jfont'); local ltjf = luatexja.jfont luatexja.load_module('rmlgbm'); local ltjr = luatexja.rmlgbm +luatexja.load_module('charrange'); local ltjc = luatexja.charrange local id_glyph = node.id('glyph') local id_whatsit = node.id('whatsit') local sid_user = node.subtype('user_defined') -local node_new = node.new -local node_remove = node.remove -local node_next = node.next -local node_free = node.free -local has_attr = node.has_attribute -local set_attr = node.set_attribute -local unset_attr = node.unset_attribute -local node_insert_after = node.insert_after +local Dnode = node.direct or node + +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.getnext +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_jchar_class = luatexbase.attributes['ltj@charclass'] local attr_yablshift = luatexbase.attributes['ltj@yablshift'] local attr_ykblshift = luatexbase.attributes['ltj@ykblshift'] local ltjf_font_metric_table = ltjf.font_metric_table 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 -local OTF = luatexja.userid_table.OTF +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 function get_ucs_from_rmlgbm(c) local v = ltjr_cidfont_data["Adobe-Japan1"].resources.unicodes["Japan1." .. tostring(c)] @@ -63,14 +81,16 @@ end local function append_jglyph(char) local p = node_new(id_whatsit,sid_user) local v = tex.attribute[attr_curjfnt] - p.user_id=OTF; p.type=100; p.value=char + setfield(p, 'user_id', OTF) + setfield(p, 'type', 100) + setfield(p, 'value', char) set_attr(p, attr_yablshift, tex.attribute[attr_ykblshift]) - node.write(p) + node_write(p) end local function cid(key) if key==0 then return append_jglyph(char) end - local curjfnt = fonts.ids[tex.attribute[attr_curjfnt]] + local curjfnt = identifiers[tex.attribute[attr_curjfnt]] if not curjfnt.cidinfo or curjfnt.cidinfo.ordering ~= "Japan1" and curjfnt.cidinfo.ordering ~= "GB1" and @@ -94,37 +114,43 @@ local function cid(key) end local function extract(head) + head = to_direct(head) local p = head local v while p do - if p.id==id_whatsit then - if p.subtype==sid_user and p.user_id==OTF then - local g = node_new(id_glyph) - g.subtype = 0; g.char = p.value - v = has_attr(p, attr_curjfnt); g.font = v - set_attr(g, attr_curjfnt, v) - v = has_attr(p, attr_yablshift) - if v then - set_attr(g, attr_yablshift, v) - else - unset_attr(g, attr_yablshift) - end - head = node_insert_after(head, p, g) - head = node_remove(head, p) - node_free(p); p = g - end + 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 + local g = node_new(id_glyph) + setfield(g, 'subtype', 0) + setfield(g, 'char', getfield(p, 'value')) + v = has_attr(p, attr_curjfnt); setfield(g, 'font',v) + set_attr(g, attr_curjfnt, puid==OTF and v or -1) + -- VSR yields ALchar + v = has_attr(p, attr_yablshift) + if v then + set_attr(g, attr_yablshift, v) + else + unset_attr(g, attr_yablshift) + end + head = node_insert_after(head, p, g) + head = node_remove(head, p) + node_free(p); p = g + end + end end p = node_next(p) end - return head + return to_node(head) end -luatexbase.add_to_callback('hpack_filter', - function (head) return extract(head) end,'ltj.hpack_filter_otf', +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', - function (head) return extract(head) end, 'ltj.pre_linebreak_filter_otf', +luatexbase.add_to_callback('pre_linebreak_filter', extract, + 'ltj.pre_linebreak_filter_otf', luatexbase.priority_in_callback('pre_linebreak_filter', 'ltj.pre_linebreak_filter')) @@ -135,9 +161,9 @@ luatexbase.add_to_callback('pre_linebreak_filter', -- これらの文字指定は，和文フォント定義ごとに，それぞれのフォントの -- CID <-> グリフ 対応状況による変換テーブルが用意される． --- フォント読み込み時に，CID +-- 和文フォント読み込み時に，CID -> unicode 対応をとっておく． local function cid_to_char(fmtable, fn) - local fi = fonts.ids[fn] + local fi = identifiers[fn] if fi.cidinfo and fi.cidinfo.ordering == "Japan1" then fmtable.cid_char_type = {} for i, v in pairs(fmtable.chars) do @@ -170,9 +196,178 @@ end luatexbase.add_to_callback("luatexja.find_char_class", cid_set_char_class, "ltj.otf.find_char_class", 1) --------------------- all done +-------------------- 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) + set_attr(p, attr_curjfnt, pf) + set_attr(p, attr_yablshift, has_attr(bp, attr_ykblshift) or 0) + return p + end + + local function do_ivs_repr(head) + head = to_direct(head) + local p, r = head + 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 np = ivs_jglyph(pt, p, pf, + (has_attr(p,attr_curjfnt) or 0)==pf and OTF or VSR) + 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 + + -- font define + local function font_callback(name, size, id, fallback) + local d = fallback(name, size, id) + prepare_ivs_data(id, d) + return d + 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', 1) + luatexbase.add_to_callback('pre_linebreak_filter', + do_ivs_repr, 'do_ivs', 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('define_font',ivs_callback,"luatexja.ivs_font_callback", 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 +end + luatexja.otf = { append_jglyph = append_jglyph, + enable_ivs = enable_ivs, -- 隠し機能: IVS + font_ivs_table = font_ivs_table, cid = cid, }