X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-setwidth.lua;h=a3e9f23bf1c3475b735d42aa5c2459608a79e434;hb=71b90c7904b04549fca6522f9bcef1c59f9f0e0f;hp=d3e7c2e6ad0a576e7d61ede7f0c82a9469656b14;hpb=29d01d6b97bfa15d0aa5f8ee3ef2e6c407bf4b0b;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-setwidth.lua b/src/ltj-setwidth.lua index d3e7c2e..a3e9f23 100644 --- a/src/ltj-setwidth.lua +++ b/src/ltj-setwidth.lua @@ -3,8 +3,7 @@ -- luatexbase.provides_module({ name = 'luatexja.setwidth', - date = '2011/06/28', - version = '0.1', + date = '2013/12/05', description = '', }) module('luatexja.setwidth', package.seeall) @@ -33,21 +32,26 @@ local id_math = node.id('math') 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_icflag = luatexbase.attributes['ltj@icflag'] -local attr_uniqid = luatexbase.attributes['ltj@uniqid'] local ltjf_font_metric_table = ltjf.font_metric_table -local PACKED = 2 -local PROCESSED = 8 -local IC_PROCESSED = 9 +local PACKED = luatexja.icflag_table.PACKED +local PROCESSED = luatexja.icflag_table.PROCESSED +local IC_PROCESSED = luatexja.icflag_table.IC_PROCESSED +local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG -head = nil - --- return true if and only if p is a Japanese character node -local function is_japanese_glyph_node(p) - return p.font==has_attr(p, attr_curjfnt) +do + local floor = math.floor + function get_pr_begin_flag(p) + local i = has_attr(p, attr_icflag) or 0 + return i - i%PROCESSED_BEGIN_FLAG + end end +local get_pr_begin_flag = get_pr_begin_flag + +head = nil; luatexbase.create_callback("luatexja.set_width", "data", function (fstable, fmtable, jchar_class) @@ -55,41 +59,41 @@ luatexbase.create_callback("luatexja.set_width", "data", end) local fshift = { down = 0, left = 0} + -- mode: true iff p will be always encapsuled by a hbox function capsule_glyph(p, dir, mode, met, class) - local char_data = met.size_cache.char_type[class] + local char_data = met.char_type[class] if not char_data then return node_next(p) end - if char_data.width ~= 'prop' then - fwidth = char_data.width - else fwidth = p.width end - local fheight, fdepth = char_data.height, char_data.depth + local fwidth, pwidth = char_data.width, p.width + fwidth = (fwidth ~= 'prop') and fwidth or pwidth fshift.down = char_data.down; fshift.left = char_data.left fshift = luatexbase.call_callback("luatexja.set_width", fshift, met, class) - if (mode or p.width ~= fwidth or p.height ~= fheight or p.depth ~= fdepth) then - local y_shift, total = - p.yoffset + (has_attr(p,attr_yablshift) or 0), fwidth - p.width + local fheight, fdepth = char_data.height, char_data.depth + fheight = (fheight ~= 'prop') and fheight or p.height + fdepth = (fdepth ~= 'prop') and fdepth or p.depth + if (mode or pwidth ~= fwidth or p.height ~= fheight or p.depth ~= fdepth) then + local y_shift, ca + = - p.yoffset + (has_attr(p,attr_ykblshift) or 0), char_data.align local q; head, q = node.remove(head, p) p.yoffset, p.next = -fshift.down, nil - if total ~= 0 and char_data.align~='left' then + if ca~='left' then p.xoffset = p.xoffset - fshift.left - + (((char_data.align=='right') and total) or round(total*0.5)) + + (((ca=='right') and fwidth - pwidth) or round((fwidth - pwidth)*0.5)) else p.xoffset = p.xoffset - fshift.left end local box = node_new(id_hlist); box.width, box.height, box.depth = fwidth, fheight, fdepth - box.glue_set, box.glue_order, box.head = 0, 0, p - box.shift = y_shift; box.dir = dir or 'TLT' - set_attr(box, attr_icflag, PACKED) - set_attr(box, attr_uniqid, has_attr(p, attr_uniqid) or 0) - if q then - head = node_insert_before(head, q, box) - else - head = node_insert_after(head, node_tail(head), box) - end + box.head, box.shift, box.dir = p, y_shift, (dir or 'TLT') + --box.glue_set, box.glue_order = 0, 0 not needed + set_attr(box, attr_icflag, PACKED + get_pr_begin_flag(p)) + 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 + get_pr_begin_flag(p)) p.xoffset = p.xoffset - fshift.left - p.yoffset = p.yoffset - (has_attr(p, attr_yablshift) or 0) - fshift.down + p.yoffset = p.yoffset - (has_attr(p, attr_ykblshift) or 0) - fshift.down return node_next(p) end end @@ -98,23 +102,32 @@ function set_ja_width(ahead, dir) local p = ahead; head = ahead local m = false -- is in math mode? while p do - if (p.id==id_glyph) and (has_attr(p, attr_icflag, PROCESSED) or 0)<=0 then - if is_japanese_glyph_node(p) then - set_attr(p, attr_icflag, PROCESSED) - p = capsule_glyph(p, dir, false, ltjf_font_metric_table[p.font], has_attr(p, attr_jchar_class)) + local pid = p.id + if (pid==id_glyph) + and ((has_attr(p, attr_icflag) or 0)%PROCESSED_BEGIN_FLAG)<=0 then + local pf = p.font + if pf == has_attr(p, attr_curjfnt) then + p = capsule_glyph(p, dir, false, ltjf_font_metric_table[pf], + has_attr(p, attr_jchar_class)) else - set_attr(p, attr_icflag, PROCESSED) + set_attr(p, attr_icflag, PROCESSED + get_pr_begin_flag(p)) p.yoffset = p.yoffset - (has_attr(p,attr_yablshift) or 0); p = node_next(p) end elseif p.id==id_math then m = (p.subtype==0); p = node_next(p) else if m then - if p.id==id_hlist or p.id==id_vlist then - p.shift = p.shift + (has_attr(p,attr_yablshift) or 0) - elseif p.id==id_rule then - local v = has_attr(p,attr_yablshift) or 0 - p.height = p.height - v; p.depth = p.depth + v + -- 数式の位置補正 + if pid==id_hlist or pid==id_vlist then + if (has_attr(p, attr_icflag) or 0) ~= PROCESSED then + p.shift = p.shift + (has_attr(p,attr_yablshift) 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 + p.height = p.height - v; p.depth = p.depth + v + set_attr(p, attr_icflag, PROCESSED + get_pr_begin_flag(p)) + end end end p = node_next(p)