X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-setwidth.lua;h=d92a4c667d65ab2f0c6d2f6e272bf2bf1daef4bf;hb=1379fbf6aae445cdce3906e7b83cc1c8550e78d5;hp=6e65fd3a16a3e20715fdca22d55e3db5d3c89171;hpb=72ac1fbce6745896b98e48ead84394aaabfe68e8;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-setwidth.lua b/src/ltj-setwidth.lua index 6e65fd3..d92a4c6 100644 --- a/src/ltj-setwidth.lua +++ b/src/ltj-setwidth.lua @@ -3,10 +3,11 @@ -- luatexja.load_module('base'); local ltjb = luatexja.base +luatexja.load_module('stack'); local ltjs = luatexja.stack luatexja.load_module('jfont'); local ltjf = luatexja.jfont +luatexja.load_module('direction'); local ltjd = luatexja.direction 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 @@ -17,9 +18,9 @@ local getsubtype = (Dnode ~= node) and Dnode.getsubtype or function(n) return n. local node_traverse = Dnode.traverse local node_new = Dnode.new -local node_remove = Dnode.remove +local node_remove = luatexja.Dnode_remove -- Dnode.remove local node_tail = Dnode.tail -local node_next = Dnode.getnext +local node_next = (Dnode ~= node) and Dnode.getnext or node.next local has_attr = Dnode.has_attribute local set_attr = Dnode.set_attribute local node_insert_before = Dnode.insert_before @@ -32,11 +33,18 @@ local id_hlist = node.id('hlist') local id_vlist = node.id('vlist') local id_rule = node.id('rule') local id_math = node.id('math') +local id_whatsit = node.id('whatsit') +local sid_save = node.subtype('pdf_save') +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 @@ -55,19 +63,19 @@ do end end -local ltjw = {} +local head, dir +local ltjw = {} --export luatexja.setwidth = ltjw -luatexbase.create_callback("luatexja.set_width", "data", - function (fstable, fmtable, jchar_class) - return fstable +luatexbase.create_callback("luatexja.set_width", "data", + function (fstable, fmtable, jchar_class) + return fstable end) local call_callback = luatexbase.call_callback local fshift = { down = 0, left = 0} --- mode: true iff p will be always encapsuled by a hbox -local function capsule_glyph(p, dir, mode, met, class) +local function capsule_glyph_yoko(p, met, class) local char_data = met.char_type[class] if not char_data then return node_next(p) end local fwidth, pwidth = char_data.width, getfield(p, 'width') @@ -75,53 +83,122 @@ local function capsule_glyph(p, dir, mode, met, class) 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 (mode or pwidth ~= fwidth or getfield(p, 'height') ~= fheight or getfield(p, 'depth') ~= fdepth) then - local y_shift, ca - = - getfield(p, 'yoffset') + (has_attr(p,attr_ykblshift) or 0), char_data.align + 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 q - ltjw.head, q = node_remove(ltjw.head, p) + head, q = node_remove(head, p) setfield(p, 'yoffset', -fshift.down); setfield(p, 'next', nil) - if ca~='left' then - setfield(p, 'xoffset', getfield(p, 'xoffset') - fshift.left - + (((ca=='right') and fwidth - pwidth) or round((fwidth - pwidth)*0.5))) - else - setfield(p, 'xoffset', getfield(p, 'xoffset') - fshift.left) - end - local box = node_new(id_hlist); + 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, 'dir', dir or 'TLT') - set_attr(box, attr_icflag, PACKED + get_pr_begin_flag(p)) - ltjw.head = q and node_insert_before(ltjw.head, q, box) - or node_insert_after(ltjw.head, node_tail(ltjw.head), box) + 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 + get_pr_begin_flag(p)) + 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) + setfield(p, 'yoffset', getfield(p, 'yoffset') + - (has_attr(p, attr_ykblshift) or 0) - fshift.down) return node_next(p) end end -luatexja.setwidth.capsule_glyph = capsule_glyph +local function capsule_glyph_tate(p, met, class) + local char_data = met.char_type[class] + if not char_data then return node_next(p) end + local ascent, descent = met.ascent, met.descent + local fwidth, pwidth = char_data.width, ascent + descent + 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) + local q + head, q = node_remove(head, p) + local box = node_new(id_hlist) + setfield(box, 'width', fwidth) + setfield(box, 'height', fheight) + setfield(box, 'depth', fdepth) + 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) + 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 wr = node_new(id_whatsit, sid_restore) + setfield(box, 'head', k1); setfield(k1, 'next', ws) + setfield(ws, 'next', wm); setfield(wm, 'next', k2); + setfield(k2, 'next', p); setfield(p, 'next', k3); + setfield(k3, 'next', wr); + + 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 +end + +local function capsule_glyph_math(p, met, class) + local char_data = met.char_type[class] + if not char_data then return nil end + 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 + local y_shift, ca + = - getfield(p, 'yoffset') + (has_attr(p,attr_ykblshift) or 0), char_data.align + setfield(p, 'yoffset', -fshift.down) + 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, 'dir', tex.mathdir) + set_attr(box, attr_icflag, PACKED) + return box +end +luatexja.setwidth.capsule_glyph_math = capsule_glyph_math -function luatexja.setwidth.set_ja_width(ahead, dir) - local p = ahead; ltjw.head = p +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 local pid = getid(p) - if (pid==id_glyph) + 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, dir, false, ltjf_font_metric_table[pf], + p = capsule_glyph(p, ltjf_font_metric_table[pf], has_attr(p, attr_jchar_class)) else - set_attr(p, attr_icflag, PROCESSED + get_pr_begin_flag(p)) + -- TODO: neg. offset does not increase depth + --local d = getfield(p, 'yoffset') - (has_attr(p,attr_ablshift) or 0) + set_attr(p, attr_icflag, PROCESSED) setfield(p, 'yoffset', - getfield(p, 'yoffset') - (has_attr(p,attr_yablshift) or 0)) + getfield(p, 'yoffset') - (has_attr(p,attr_ablshift) or 0)) p = node_next(p) end elseif pid==id_math then @@ -131,14 +208,14 @@ function luatexja.setwidth.set_ja_width(ahead, dir) -- 数式の位置補正 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_yablshift) or 0)) + 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 + get_pr_begin_flag(p)) + set_attr(p, attr_icflag, PROCESSED) end end end @@ -147,6 +224,6 @@ function luatexja.setwidth.set_ja_width(ahead, dir) end -- adjust attr_icflag tex.setattribute('global', attr_icflag, 0) - return ltjw.head + return head end