X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-setwidth.lua;h=57db242c19f81120bbc7bd89201c6d7a27ccdbc5;hb=80bbcf52bf096105cf1797a4422a38d400b3fa05;hp=457ecd806ca4dbfe5f8d649a5a6385f9aba2b0b7;hpb=880636d81e9819b31dec8a5f897bbfaf1732d18b;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-setwidth.lua b/src/ltj-setwidth.lua index 457ecd8..57db242 100644 --- a/src/ltj-setwidth.lua +++ b/src/ltj-setwidth.lua @@ -3,8 +3,8 @@ -- luatexbase.provides_module({ name = 'luatexja.setwidth', - date = '2011/06/28', - version = '0.1', + date = '2012/07/19', + version = '0.2', description = '', }) module('luatexja.setwidth', package.seeall) @@ -23,6 +23,7 @@ local node_insert_before = node.insert_before local node_insert_after = node.insert_after local round = tex.round + local id_glyph = node.id('glyph') local id_kern = node.id('kern') local id_hlist = node.id('hlist') @@ -33,20 +34,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 PROCESSED_BEGIN_FLAG = 16 -char_data = {} -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) + return floor((has_attr(p, attr_icflag) or 0) + /PROCESSED_BEGIN_FLAG)*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) @@ -54,51 +61,37 @@ 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 h, box, q, fwidth - if char_data.width ~= 'prop' then - fwidth = char_data.width - else fwidth = p.width end - local fheight = char_data.height - local fdepth = char_data.depth + local char_data = met.size_cache.char_type[class] + if not char_data then return node_next(p) end + local fwidth = (char_data.width ~= 'prop') and char_data.width or p.width + local fheight, fdepth = char_data.height, char_data.depth fshift.down = char_data.down; fshift.left = char_data.left fshift = luatexbase.call_callback("luatexja.set_width", fshift, met, class) --- local ti = - p.xoffset= p.xoffset - fshift.left - if mode or p.width ~= fwidth or p.height ~= fheight or p.depth ~= fdepth then - local y_shift = - p.yoffset + (has_attr(p,attr_yablshift) or 0) - p.yoffset = -fshift.down - head, q = node.remove(head, p) - local total = fwidth - p.width - if total == 0 then - h = p; p.next = nil - else - h = node_new(id_kern); h.subtype = 0 - if char_data.align=='right' then - h.kern = total; p.next = nil; h.next = p - elseif char_data.align=='middle' then - h.kern = round(total/2); p.next = h - h = node_new(id_kern); h.subtype = 0 - h.kern = total - round(total/2); h.next = p - else -- left - h.kern = total; p.next = h; h = p - end - end - box = node_new(id_hlist); - box.width = fwidth; box.height = fheight; box.depth = fdepth - box.glue_set = 0; box.glue_order = 0; box.head = h - 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) + 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_ykblshift) or 0), fwidth - p.width + local q; head, q = node.remove(head, p) + p.yoffset, p.next = -fshift.down, nil + if total ~= 0 and char_data.align~='left' then + p.xoffset = p.xoffset - fshift.left + + (((char_data.align=='right') and total) or round(total*0.5)) else - head = node_insert_after(head, node_tail(head), box) + p.xoffset = p.xoffset - fshift.left end + local box = node_new(id_hlist); + box.width, box.height, box.depth = fwidth, fheight, fdepth + box.head, box.shift, box.dir = p, y_shift, (dir or 'TLT') + box.glue_set, box.glue_order = 0, 0 + 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 - p.yoffset = p.yoffset - (has_attr(p, attr_yablshift) or 0) - fshift.down + 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_ykblshift) or 0) - fshift.down return node_next(p) end end @@ -107,17 +100,13 @@ 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 then - if is_japanese_glyph_node(p) then - local met = ltjf_font_metric_table[p.font] - local class = has_attr(p, attr_jchar_class) - char_data = ltjf.metrics[met.jfm].size_cache[met.size].char_type[class] - if char_data then - p = capsule_glyph(p, dir, false, met, class) - else - p = node_next(p) - end - else + if (p.id==id_glyph) + and ((has_attr(p, attr_icflag) or 0)%PROCESSED_BEGIN_FLAG)<=0 then + if p.font == has_attr(p, attr_curjfnt) then + p = capsule_glyph(p, dir, false, ltjf_font_metric_table[p.font], + has_attr(p, attr_jchar_class)) + else + 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 @@ -135,6 +124,6 @@ function set_ja_width(ahead, dir) end end -- adjust attr_icflag - tex.attribute[attr_icflag] = -(0x7FFFFFFF) + tex.setattribute('global', attr_icflag, 0) return head end