diff options
Diffstat (limited to 'macros/luatex/generic/luatexja/src/ltj-setwidth.lua')
-rw-r--r-- | macros/luatex/generic/luatexja/src/ltj-setwidth.lua | 94 |
1 files changed, 54 insertions, 40 deletions
diff --git a/macros/luatex/generic/luatexja/src/ltj-setwidth.lua b/macros/luatex/generic/luatexja/src/ltj-setwidth.lua index 0e8e39f071..dd83d7e3d5 100644 --- a/macros/luatex/generic/luatexja/src/ltj-setwidth.lua +++ b/macros/luatex/generic/luatexja/src/ltj-setwidth.lua @@ -15,21 +15,23 @@ local getfont = node.direct.getfont local getlist = node.direct.getlist local getchar = node.direct.getchar local getsubtype = node.direct.getsubtype -local getwidth = node.direct.getwidth or function(n) return getfield(n,'width') end -local getdepth = node.direct.getdepth or function(n) return getfield(n,'depth') end -local getwhd = node.direct.getwhd or function(n) - return getfield(n,'width'), getfield(n,'height'),getfield(n,'depth') end +local getwidth = node.direct.getwidth +local getshift = node.direct.getshift +local getoffsets = node.direct.getoffsets +local getheight = node.direct.getheight +local getdepth = node.direct.getdepth +local getwhd = node.direct.getwhd -local setwhd = node.direct.setwhd or function(n,w,h,d) - setfield(n,'width',w); setfield(n,'height',h); setfield(n,'depth',d) end -local setchar = node.direct.setchar or function(n,c) setfield(n,'char',c) end -local setnext = node.direct.setnext or function(n,c) setfield(n,'next',c) end -local setdir = node.direct.setdir or function(n,c) setfield(n,'dir',c) end -local setkern = node.direct.setkern or function(n,c) setfield(n,'kern',c) end -local setoffsets = node.direct.setoffsets or function(n,x,y) - setfield(n,'xoffset',x); setfield(n,'yoffset',y) end -local getoffsets = node.direct.getoffsets or function(n) - return getfield(n,'xoffset'), getfield(n,'yoffset') end +local setwhd = node.direct.setwhd +local setchar = node.direct.setchar +local setnext = node.direct.setnext +local setdir = node.direct.setdir +local setkern = node.direct.setkern +local setshift = node.direct.setshift +local setoffsets = node.direct.setoffsets +local setheight = node.direct.setheight +local setdepth = node.direct.setdepth +local setlist = node.direct.setlist local node_traverse_id = node.direct.traverse_id local node_traverse = node.direct.traverse @@ -37,7 +39,7 @@ local node_copy = node.direct.copy local node_remove = node.direct.remove local node_tail = node.direct.tail local node_next = node.direct.getnext -local has_attr = node.direct.has_attribute +local get_attr = node.direct.get_attribute local set_attr = node.direct.set_attribute local node_insert_before = node.direct.insert_before local node_insert_after = node.direct.insert_after @@ -56,6 +58,7 @@ local sid_restore = node.subtype 'pdf_restore' local sid_matrix = node.subtype 'pdf_setmatrix' local dir_tate = luatexja.dir_table.dir_tate +local attr_yablshift = luatexbase.attributes['ltj@yablshift'] local attr_ykblshift = luatexbase.attributes['ltj@ykblshift'] local attr_tkblshift = luatexbase.attributes['ltj@tkblshift'] local attr_icflag = luatexbase.attributes['ltj@icflag'] @@ -71,7 +74,7 @@ do local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG local floor = math.floor get_pr_begin_flag = function (p) - local i = has_attr(p, attr_icflag) or 0 + local i = get_attr(p, attr_icflag) or 0 return i - i%PROCESSED_BEGIN_FLAG end end @@ -97,7 +100,7 @@ local function capsule_glyph_yoko(p, met, char_data, head, dir) if not char_data then return node_next(p), head, p end fshift.down = char_data.down; fshift.left = char_data.left fshift = call_callback("luatexja.set_width", fshift, met, char_data) - local kbl = has_attr(p, attr_ykblshift) or 0 + local kbl = get_attr(p, attr_ykblshift) or 0 -- -- f*: whd specified in JFM local pwidth, pheight,pdepth = getwhd(p) @@ -142,8 +145,7 @@ local function capsule_glyph_yoko(p, met, char_data, head, dir) setnext(p, nil) local box = node_new(id_hlist, nil, p) setwhd(box, fwidth, fheight, fdepth) - setfield(box, 'head', p) - setfield(box, 'shift', kbl) + setlist(box, p); setshift(box, kbl) setdir(box, dir) set_attr(box, attr_icflag, PACKED) head = q and node_insert_before(head, q, box) @@ -158,7 +160,7 @@ luatexja.setwidth.capsule_glyph_yoko = capsule_glyph_yoko local function capsule_glyph_tate_rot(p, met, char_data, head, dir, asc) fshift.down = char_data.down; fshift.left = char_data.left fshift = call_callback("luatexja.set_width", fshift, met, char_data) - local kbl = has_attr(p, attr_tkblshift) or 0 + local kbl = get_attr(p, attr_tkblshift) or 0 -- f*: whd specified in JFM local pwidth, pheight,pdepth = getwhd(p) local fwidth = char_data.width or pwidth @@ -172,8 +174,7 @@ local function capsule_glyph_tate_rot(p, met, char_data, head, dir, asc) setnext(p, nil) local box = node_new(id_hlist, nil, p) setwhd(box, fwidth, fheight, fdepth) - setfield(box, 'head', p) - setfield(box, 'shift', kbl) + setlist(box, p); setshift(box, kbl) setdir(box, dir) set_attr(box, attr_icflag, PACKED) head = q and node_insert_before(head, q, box) @@ -192,8 +193,8 @@ local function capsule_glyph_tate(p, met, char_data, head, dir) if met.rotation and met.vert_activated then local f = font_getfont(pf) local r, l = met.rotation[pc], f.properties and f.properties.language - if ((r==true) or (type(r)=="table" and not r[l])) and (has_attr(p, attr_vert_ori) or 0)<=0 then - return capsule_glyph_tate_rot(p, met, char_data, head, dir, + if ((r==true) or (type(r)=="table" and not r[l])) and (get_attr(p, attr_vert_ori) or 0)<=0 then + return capsule_glyph_tate_rot(p, met, char_data, head, dir, 0.5*(get_ascender(pf)-get_descender(pf))) end end @@ -213,12 +214,11 @@ local function capsule_glyph_tate(p, met, char_data, head, dir) fshift = call_callback("luatexja.set_width", fshift, met, char_data) local fheight = char_data.height or 0 local fdepth = char_data.depth or 0 - local y_shift = xo + (has_attr(p,attr_tkblshift) or 0) + local y_shift = xo + (get_attr(p,attr_tkblshift) or 0) local q head, q = node_remove(head, p) local box = node_new(id_hlist, nil, p) - setwhd(box, fwidth, fheight, fdepth) - setfield(box, 'shift', y_shift) + setwhd(box, fwidth, fheight, fdepth); setshift(box, y_shift) setdir(box, dir) -- print(yo, ascender, char_data.align, fwidth-pwidth) setoffsets(p, -fshift.down, @@ -230,7 +230,7 @@ local function capsule_glyph_tate(p, met, char_data, head, dir) local k2 = node_new(id_kern, 1); setkern(k2, pwnh) local k3 = node_new(id_kern, 1); setkern(k3, -getwidth(p)-pwnh) local wr = node_new(id_whatsit, sid_restore) - setfield(box, 'head', ws) + setlist(box, ws) setnext(ws, wm); setnext(wm, k2); setnext(k2, p); setnext(p, k3); setnext(k3, wr); @@ -243,26 +243,41 @@ local function capsule_glyph_tate(p, met, char_data, head, dir) end luatexja.setwidth.capsule_glyph_tate = capsule_glyph_tate -local function capsule_glyph_math(p, met, char_data) +do +local font_getfont, famfont = font.getfont, node.family_font +local cap_math_aux = { + [-1]=function() return 1 end, [0]=function() return 1 end, + [1]=function() + local sf, tf = famfont(2,1), famfont(2,0) + return font_getfont(sf).size/font_getfont(tf).size + end, + [2]=function() + local ssf, tf = famfont(2,2), famfont(2,0) + return font_getfont(ssf).size/font_getfont(tf).size + end +} +setmetatable(cap_math_aux, {__index=function(t,k) return t[2] end}) +local function capsule_glyph_math(p, met, char_data, sty) if not char_data then return nil end local fwidth, pwidth = char_data.width, getwidth(p) fwidth = fwidth or pwidth fshift.down = char_data.down; fshift.left = char_data.left fshift = call_callback("luatexja.set_width", fshift, met, char_data) local fheight, fdepth = char_data.height, char_data.depth - local y_shift - = - getfield(p, 'yoffset') + (has_attr(p,attr_ykblshift) or 0) + local y_shift = - getfield(p, 'yoffset') + + cap_math_aux[sty]()* + ((get_attr(p,attr_ykblshift) or 0) - (get_attr(p,attr_yablshift) or 0)) setfield(p, 'yoffset', -fshift.down) setfield(p, 'xoffset', getfield(p, 'xoffset') + char_data.align*(fwidth-pwidth) - fshift.left) local box = node_new(id_hlist, nil, p); setwhd(box, fwidth, fheight, fdepth) - setfield(box, 'head', p) - setfield(box, 'shift', y_shift) + setlist(box, p); setshift(box, y_shift) setdir(box, tex.mathdir) set_attr(box, attr_icflag, PACKED) return box end luatexja.setwidth.capsule_glyph_math = capsule_glyph_math +end -- 数式の位置補正 function luatexja.setwidth.apply_ashift_math(head, last, attr_ablshift) @@ -270,19 +285,18 @@ function luatexja.setwidth.apply_ashift_math(head, last, attr_ablshift) local pid = getid(p) if p==last then return - elseif (has_attr(p, attr_icflag) or 0) ~= PROCESSED then + elseif (get_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)) + setshift(p, getshift(p) + (get_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', getdepth(p)+v) + local v = get_attr(p,attr_ablshift) or 0 + setheight(p, getheight(p)-v); setdepth(p, getdepth(p)+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)) + getfield(p, 'yoffset') - (get_attr(p,attr_ablshift) or 0)) end set_attr(p, attr_icflag, PROCESSED) end @@ -300,7 +314,7 @@ do 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 + y_adjust = get_attr(lp,attr_ablshift) or 0 local ld = getdepth(lp) node_depth = max(ld + min(y_adjust, 0), node_depth) adj_depth = (y_adjust>0) and max(ld + y_adjust, adj_depth) or adj_depth |