X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-setwidth.lua;h=0a5c6785ea74c23f086e70c954a2cdb4952a4797;hb=ad7590c6e540c91f572cdfcb79fda80d10590d7a;hp=d92a4c667d65ab2f0c6d2f6e272bf2bf1daef4bf;hpb=1e9507b6cac6749442636bff9ec9f1d7db08d63d;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-setwidth.lua b/src/ltj-setwidth.lua index d92a4c6..0a5c678 100644 --- a/src/ltj-setwidth.lua +++ b/src/ltj-setwidth.lua @@ -16,9 +16,11 @@ local getlist = (Dnode ~= node) and Dnode.getlist or function(n) return n.head e 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 node_traverse_id = Dnode.traverse_id local node_traverse = Dnode.traverse local node_new = Dnode.new -local node_remove = luatexja.Dnode_remove -- Dnode.remove +local node_copy = Dnode.copy +local node_remove = Dnode.remove local node_tail = Dnode.tail local node_next = (Dnode ~= node) and Dnode.getnext or node.next local has_attr = Dnode.has_attribute @@ -39,15 +41,12 @@ local sid_restore = node.subtype('pdf_restore') local sid_matrix = node.subtype('pdf_setmatrix') local dir_tate = luatexja.dir_table.dir_tate -local attr_jchar_class = luatexbase.attributes['ltj@charclass'] -local attr_curjfnt = luatexbase.attributes['ltj@curjfnt'] -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 attr_icflag = luatexbase.attributes['ltj@icflag'] local ltjf_font_metric_table = ltjf.font_metric_table +local ltjf_font_extra_info = ltjf.font_extra_info local PACKED = luatexja.icflag_table.PACKED local PROCESSED = luatexja.icflag_table.PROCESSED @@ -63,7 +62,6 @@ do end end -local head, dir local ltjw = {} --export luatexja.setwidth = ltjw @@ -75,54 +73,97 @@ local call_callback = luatexbase.call_callback local fshift = { down = 0, left = 0} -local function capsule_glyph_yoko(p, met, class) +local min, max = math.min, math.max + +-- 和文文字の位置補正（横） +local function capsule_glyph_yoko(p, met, class, head, dir) local char_data = met.char_type[class] - if not char_data then return node_next(p) end + if not char_data then return node_next(p), head, p end + -- f*: whd specified in JFM local fwidth, pwidth = char_data.width, getfield(p, 'width') fwidth = (fwidth ~= 'prop') and fwidth or pwidth fshift.down = char_data.down; fshift.left = char_data.left fshift = call_callback("luatexja.set_width", fshift, met, class) local fheight, fdepth = char_data.height, char_data.depth - if (pwidth ~= fwidth or getfield(p, 'height') ~= fheight or getfield(p, 'depth') ~= fdepth) then - local y_shift - = - getfield(p, 'yoffset') + (has_attr(p,attr_ykblshift) or 0) + local kbl = has_attr(p, attr_ykblshift) or 0 + -- + local need_hbox + if pwidth==fwidth then + -- 補正後glyph node は ht: p.height - kbl - down, dp: p.depth + min(0, kbl+down) を持つ + -- 設定されるべき寸法: ht: fheight - kbl, dp: fdepth + kbl + local ht_diff = fheight + fshift.down - getfield(p, 'height') + local dp_diff = fdepth + kbl - getfield(p, 'depth') - min(kbl + fshift.down, 0) + if ht_diff == 0 and dp_diff ==0 then -- offset only + set_attr(p, attr_icflag, PROCESSED) + setfield(p, 'xoffset', getfield(p, 'xoffset') - fshift.left) + setfield(p, 'yoffset', getfield(p, 'yoffset') - kbl - fshift.down) + return node_next(p), head, p + elseif ht_diff >= 0 and dp_diff >=0 then -- rule + local box = node_new(id_rule) + setfield(p, 'yoffset', getfield(p, 'yoffset') - kbl - fshift.down) + setfield(box, 'width', 0) + setfield(box, 'height', fheight - kbl) + setfield(box, 'depth', fdepth + kbl) + setfield(box, 'dir', dir) + set_attr(box, attr_icflag, PACKED) + set_attr(p, attr_icflag, PACKED) + head = p and node_insert_before(head, p, box) + or node_insert_after(head, node_tail(head), box) + return node_next(p), head, p, box + else + need_hbox = true + end + else + need_hbox = true + end + + if need_hbox then local q head, q = node_remove(head, p) - setfield(p, 'yoffset', -fshift.down); setfield(p, 'next', nil) - setfield(p, 'xoffset', getfield(p, 'xoffset') + char_data.align*(fwidth-pwidth) - fshift.left) + local box = node_new(id_hlist) + setfield(p, 'yoffset', getfield(p, 'yoffset') -fshift.down); + setfield(p, 'next', nil) + setfield(p, 'xoffset', getfield(p, 'xoffset') + + char_data.align*(fwidth-pwidth) - fshift.left) local box = node_new(id_hlist) setfield(box, 'width', fwidth) setfield(box, 'height', fheight) setfield(box, 'depth', fdepth) setfield(box, 'head', p) - setfield(box, 'shift', y_shift) + setfield(box, 'shift', kbl) setfield(box, 'dir', dir) set_attr(box, attr_icflag, PACKED) head = q and node_insert_before(head, q, box) or node_insert_after(head, node_tail(head), box) - return q - else - set_attr(p, attr_icflag, PROCESSED) - setfield(p, 'xoffset', getfield(p, 'xoffset') - fshift.left) - setfield(p, 'yoffset', getfield(p, 'yoffset') - - (has_attr(p, attr_ykblshift) or 0) - fshift.down) - return node_next(p) + return q, head, box end end -local function capsule_glyph_tate(p, met, class) + +luatexja.setwidth.capsule_glyph_yoko = capsule_glyph_yoko + +-- 和文文字の位置補正（縦） +local function capsule_glyph_tate(p, met, class, head, dir) local char_data = met.char_type[class] - if not char_data then return node_next(p) end + if not char_data then return node_next(p), head end local ascent, descent = met.ascent, met.descent - local fwidth, pwidth = char_data.width, ascent + descent + local fwidth, pwidth = char_data.width + do + local pf = getfont(p) + local pc = getchar(p) + setfield(p, 'char', pc) + pwidth = ltjf_font_extra_info[pf] and ltjf_font_extra_info[pf][pc] + and ltjf_font_extra_info[pf][pc].vwidth + and ltjf_font_extra_info[pf][pc].vwidth * met.size or (ascent+descent) + pwidth = pwidth + (met.v_advance[pc] or 0) + ascent = met.v_origin[pc] and ascent - met.v_origin[pc] or ascent + end fwidth = (fwidth ~= 'prop') and fwidth or pwidth fshift.down = char_data.down; fshift.left = char_data.left fshift = call_callback("luatexja.set_width", fshift, met, class) local fheight, fdepth = char_data.height, char_data.depth - setfield(p, 'char', ltjd.get_vert_glyph(getfont(p), getchar(p))) - local y_shift - = - getfield(p, 'yoffset') + (has_attr(p,attr_tkblshift) or 0) + = getfield(p, 'xoffset') + (has_attr(p,attr_tkblshift) or 0) local q head, q = node_remove(head, p) local box = node_new(id_hlist) @@ -132,19 +173,17 @@ local function capsule_glyph_tate(p, met, class) setfield(box, 'shift', y_shift) setfield(box, 'dir', dir) - local k1 = node_new(id_kern) - setfield(k1, 'kern', - getfield(p, 'xoffset') + ascent - + char_data.align*(fwidth-pwidth) - fshift.left) + setfield(p, 'xoffset', - fshift.down) + setfield(p, 'yoffset', getfield(p, 'yoffset') -(ascent + + char_data.align*(fwidth-pwidth) - fshift.left) ) local ws = node_new(id_whatsit, sid_save) local wm = node_new(id_whatsit, sid_matrix) setfield(wm, 'data', '0 1 -1 0') - local k2 = node_new(id_kern) - setfield(k2, 'kern', -fshift.down - fdepth) - local k3 = node_new(id_kern) - setfield(k3, 'kern', - getfield(p, 'width') +fshift.down + fdepth) + local pwnh = -round(0.5*getfield(p, 'width')) + local k2 = node_new(id_kern); setfield(k2, 'kern', pwnh) + local k3 = node_new(id_kern); setfield(k3, 'kern', -getfield(p, 'width')-pwnh) local wr = node_new(id_whatsit, sid_restore) - setfield(box, 'head', k1); setfield(k1, 'next', ws) + setfield(box, 'head', ws) setfield(ws, 'next', wm); setfield(wm, 'next', k2); setfield(k2, 'next', p); setfield(p, 'next', k3); setfield(k3, 'next', wr); @@ -152,8 +191,9 @@ local function capsule_glyph_tate(p, met, class) set_attr(box, attr_icflag, PACKED) head = q and node_insert_before(head, q, box) or node_insert_after(head, node_tail(head), box) - return q + return q, head, box end +luatexja.setwidth.capsule_glyph_tate = capsule_glyph_tate local function capsule_glyph_math(p, met, class) local char_data = met.char_type[class] @@ -179,51 +219,63 @@ local function capsule_glyph_math(p, met, class) end luatexja.setwidth.capsule_glyph_math = capsule_glyph_math -function luatexja.setwidth.set_ja_width(ahead, adir) - local p = ahead; head = p; dir = adir or 'TLT' - local m = false -- is in math mode? - local is_dir_tate = ltjs.list_dir==dir_tate - local capsule_glyph = is_dir_tate and capsule_glyph_tate or capsule_glyph_yoko - local attr_ablshift = is_dir_tate and attr_tablshift or attr_yablshift - while p do +-- 数式の位置補正 +function luatexja.setwidth.apply_ashift_math(head, last, attr_ablshift) + for p in node_traverse(head) do local pid = getid(p) - if (pid==id_glyph) - and ((has_attr(p, attr_icflag) or 0)%PROCESSED_BEGIN_FLAG)<=0 then - local pf = getfont(p) - if pf == has_attr(p, attr_curjfnt) then - p = capsule_glyph(p, ltjf_font_metric_table[pf], - has_attr(p, attr_jchar_class)) - else - -- TODO: neg. offset does not increase depth - --local d = getfield(p, 'yoffset') - (has_attr(p,attr_ablshift) or 0) + if p==last then + return + elseif (has_attr(p, attr_icflag) or 0) ~= PROCESSED then + if pid==id_hlist or pid==id_vlist then + setfield(p, 'shift', getfield(p, 'shift') + (has_attr(p,attr_ablshift) or 0)) + elseif pid==id_rule then + local v = has_attr(p,attr_ablshift) or 0 + setfield(p, 'height', getfield(p, 'height')-v) + setfield(p, 'depth', getfield(p, 'depth')+v) set_attr(p, attr_icflag, PROCESSED) + elseif pid==id_glyph then + -- 欧文文字; 和文文字は pid == id_hlist の場合で処理される + -- (see conv_jchar_to_hbox_A in ltj-math.lua) setfield(p, 'yoffset', getfield(p, 'yoffset') - (has_attr(p,attr_ablshift) or 0)) - p = node_next(p) - end - elseif pid==id_math then - m = (getsubtype(p)==0); p = node_next(p) - else - if m then - -- 数式の位置補正 - if pid==id_hlist or pid==id_vlist then - if (has_attr(p, attr_icflag) or 0) ~= PROCESSED then - setfield(p, 'shift', getfield(p, 'shift') + (has_attr(p,attr_ablshift) or 0)) - end - elseif pid==id_rule then - if (has_attr(p, attr_icflag) or 0) ~= PROCESSED then - local v = has_attr(p,attr_yablshift) or 0 - setfield(p, 'height', getfield(p, 'height')-v) - setfield(p, 'depth', getfield(p, 'depth')+v) - set_attr(p, attr_icflag, PROCESSED) - end - end end - p = node_next(p) end end - -- adjust attr_icflag - tex.setattribute('global', attr_icflag, 0) - return head end +-- discretionary の位置補正 +do + local attr_yablshift = luatexbase.attributes['ltj@yablshift'] + local attr_tablshift = luatexbase.attributes['ltj@tablshift'] + local attr_ablshift + local disc, tex_dir + local function ashift_disc_inner(field) + local head = getfield(disc, field) + if not head then return end + local y_adjust, node_depth, adj_depth = 0, 0, 0 + for lp in node_traverse_id(id_glyph, head) do + y_adjust = has_attr(lp,attr_ablshift) or 0 + node_depth = max(getfield(lp, 'depth') + min(y_adjust, 0), node_depth) + adj_depth = (y_adjust>0) and max(getfield(lp, 'depth') + y_adjust, adj_depth) or adj_depth + setfield(lp, 'yoffset', getfield(lp, 'yoffset') - y_adjust) + end + if adj_depth>node_depth then + local r = node_new(id_rule) + setfield(r, 'width', 0); setfield(r, 'height', 0) + setfield(r, 'depth', adj_depth); setfield(r, 'dir', tex_dir) + set_attr(r, attr_icflag, PROCESSED) + if field=='post' then + node_insert_after(head, head, r) + else + setfield(disc, field, (node_insert_before(head, head, r))) + end + end + end + function luatexja.setwidth.apply_ashift_disc(d, is_dir_tate, dir) + attr_ablshift = is_dir_tate and attr_tablshift or attr_yablshift + disc, tex_dir = d, dir + ashift_disc_inner('pre') + ashift_disc_inner('post') + ashift_disc_inner('replace') + end +end