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
-local getfont = (Dnode ~= node) and Dnode.getfont or function(n) return n.font end
-local getlist = (Dnode ~= node) and Dnode.getlist or function(n) return n.head end
-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_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
-local set_attr = Dnode.set_attribute
-local node_insert_before = Dnode.insert_before
-local node_insert_after = Dnode.insert_after
+local setfield = node.direct.setfield
+local getfield = node.direct.getfield
+local getid = node.direct.getid
+local getfont = node.direct.getfont
+local getlist = node.direct.getlist
+local getchar = node.direct.getchar
+local getsubtype = node.direct.getsubtype
+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 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 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 node_traverse_id = node.direct.traverse_id
+local node_traverse = node.direct.traverse
+local node_new = node.direct.new
+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 set_attr = node.direct.set_attribute
+local node_insert_before = node.direct.insert_before
+local node_insert_after = node.direct.insert_after
local round = tex.round
local id_glyph = node.id('glyph')
local sid_matrix = node.subtype('pdf_setmatrix')
local dir_tate = luatexja.dir_table.dir_tate
-local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
local attr_ykblshift = luatexbase.attributes['ltj@ykblshift']
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_get_vert_glyph = ltjf.get_vert_glyph
+local ltjf_font_extra_info = ltjf.font_extra_info
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
local get_pr_begin_flag
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
luatexja.setwidth = ltjw
luatexbase.create_callback("luatexja.set_width", "data",
- function (fstable, fmtable, jchar_class)
+ function (fstable, fmtable, char_data)
return fstable
end)
local call_callback = luatexbase.call_callback
local fshift = { down = 0, left = 0}
-local min = math.min
-local function capsule_glyph_yoko(p, met, class, head, dir)
- local char_data = met.char_type[class]
+local min, max = math.min, math.max
+
+local rule_subtype = (status.luatex_version>=85) and 3 or 0
+
+-- 和文文字の位置補正(横)
+local function capsule_glyph_yoko(p, met, char_data, head, dir)
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
+ fshift = call_callback("luatexja.set_width", fshift, met, char_data)
local kbl = has_attr(p, attr_ykblshift) or 0
- --
- local need_hbox
+ --
+ -- f*: whd specified in JFM
+ local pwidth, pheight,pdepth = getwhd(p)
+ local fwidth = char_data.width or pwidth
+ local fheight= char_data.height or pheight
+ local fdepth = char_data.depth or pdepth
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', - kbl - fshift.down)
+ local ht_diff = fheight + fshift.down - pheight
+ local dp_diff = fdepth + kbl - pdepth - min(kbl + fshift.down, 0)
+ if ht_diff == 0 and dp_diff ==0 then -- offset only
+ set_attr(p, attr_icflag, PROCESSED)
+ local xo, yo = getoffsets(p)
+ setoffsets(p, xo - fshift.left, yo - 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', - kbl - fshift.down)
- setfield(box, 'width', 0)
- setfield(box, 'height', fheight - kbl)
- setfield(box, 'depth', fdepth + kbl)
- setfield(box, 'dir', dir)
+ local box = node_new(id_rule,rule_subtype)
+ local xo, yo = getoffsets(p)
+ setoffsets(p, xo, yo - kbl - fshift.down)
+ setwhd(box, 0, fheight - kbl, fdepth + kbl)
+ setdir(box, dir)
set_attr(box, attr_icflag, PACKED)
+ set_attr(p, attr_icflag, PROCESSED)
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(box, 'width', fwidth)
- setfield(box, 'height', fheight)
- setfield(box, 'depth', fdepth)
- setfield(box, 'head', p)
- 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, head, box
- end
+ local q
+ head, q = node_remove(head, p)
+ local xo, yo = getoffsets(p)
+ setoffsets(p, xo + char_data.align*(fwidth-pwidth) - fshift.left,
+ yo - fshift.down);
+ setnext(p, nil)
+ local box = node_new(id_hlist)
+ setwhd(box, fwidth, fheight, fdepth)
+ setfield(box, 'head', p)
+ setfield(box, 'shift', kbl)
+ setdir(box, 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, head, box
end
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]
+-- 和文文字の位置補正(縦)
+-- UTR#50 で R もしくは Tr と指定されているが,縦組用グリフがないもの
+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
+ -- f*: whd specified in JFM
+ local pwidth, pheight,pdepth = getwhd(p)
+ local fwidth = char_data.width or pwidth
+ local fheight= char_data.height or pheight
+ local fdepth = char_data.depth or pdepth
+ local q
+ head, q = node_remove(head, p)
+ local xo, yo = getoffsets(p)
+ setoffsets(p, xo + char_data.align*(fwidth-pwidth) - fshift.left,
+ yo - fshift.down - asc);
+ setnext(p, nil)
+ local box = node_new(id_hlist)
+ setwhd(box, fwidth, fheight, fdepth)
+ setfield(box, 'head', p)
+ setfield(box, 'shift', kbl)
+ setdir(box, 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, head, box
+end
+
+local function capsule_glyph_tate(p, met, char_data, head, dir)
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
- fwidth = (fwidth ~= 'prop') and fwidth or pwidth
+ local fwidth, pwidth = char_data.width
+ do
+ local pf = getfont(p)
+ local pc = getchar(p)
+ local cei = ltjf_font_extra_info[pf] and ltjf_font_extra_info[pf][pc]
+ if cei and met.vert_activated then
+ if cei.rotation then
+ return capsule_glyph_tate_rot(p, met, char_data, head, dir, 0.5*(ascent-descent))
+ end
+ end
+ local ident = fonts.hashes.identifiers[pf]
+ pwidth = (ident.descriptions and ident.descriptions[pc]
+ and (ident.descriptions[pc].vheight / ident.units * 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
+ print(fwidth, pwidth)
+ fwidth = 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', ltjf_get_vert_glyph(getfont(p), getchar(p)))
-
- local y_shift
- = - getfield(p, 'yoffset') + (has_attr(p,attr_tkblshift) or 0)
+ 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 xo, yo = getoffsets(p)
+ local y_shift = xo + (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)
+ setwhd(box, fwidth, fheight, fdepth)
setfield(box, 'shift', y_shift)
- setfield(box, 'dir', dir)
+ setdir(box, dir)
- setfield(p, 'xoffset', -fshift.down)
- setfield(p, 'yoffset', - (getfield(p, 'xoffset') + ascent
- + char_data.align*(fwidth-pwidth) - fshift.left) )
+ setoffsets(p, -fshift.down,
+ yo -(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 pwnh = - 0.5*getfield(p, 'width')
- local k2 = node_new(id_kern); setfield(k2, 'kern', - 0.5*getfield(p, 'width'))
- local k3 = node_copy(k2)
+ local pwnh = -round(0.5*getfield(p, 'width'))
+ local k2 = node_new(id_kern, 1); setfield(k2, 'kern', pwnh)
+ local k3 = node_new(id_kern, 1); setfield(k3, 'kern', -getfield(p, 'width')-pwnh)
local wr = node_new(id_whatsit, sid_restore)
setfield(box, 'head', ws)
- setfield(ws, 'next', wm); setfield(wm, 'next', k2);
- setfield(k2, 'next', p); setfield(p, 'next', k3);
- setfield(k3, 'next', wr);
+ setnext(ws, wm); setnext(wm, k2);
+ setnext(k2, p); setnext(p, k3);
+ setnext(k3, wr);
set_attr(box, attr_icflag, PACKED)
head = q and node_insert_before(head, q, 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]
+local function capsule_glyph_math(p, met, char_data)
if not char_data then return nil end
local fwidth, pwidth = char_data.width, getfield(p, 'width')
- fwidth = (fwidth ~= 'prop') and fwidth or pwidth
+ fwidth = fwidth or pwidth
fshift.down = char_data.down; fshift.left = char_data.left
- fshift = call_callback("luatexja.set_width", fshift, met, class)
+ fshift = call_callback("luatexja.set_width", fshift, met, char_data)
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
+ local y_shift
+ = - getfield(p, 'yoffset') + (has_attr(p,attr_ykblshift) 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);
- setfield(box, 'width', fwidth)
- setfield(box, 'height', fheight)
- setfield(box, 'depth', fdepth)
+ setwhd(box, fwidth, fheight, fdepth)
setfield(box, 'head', p)
setfield(box, 'shift', y_shift)
- setfield(box, 'dir', tex.mathdir)
+ setdir(box, tex.mathdir)
set_attr(box, attr_icflag, PACKED)
return box
end
function luatexja.setwidth.apply_ashift_math(head, last, attr_ablshift)
for p in node_traverse(head) do
local pid = getid(p)
- if p==last then
+ 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))
+ 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)
+ setfield(p, 'depth', getdepth(p)+v)
set_attr(p, attr_icflag, PROCESSED)
elseif pid==id_glyph then
-- 欧文文字; 和文文字は pid == id_hlist の場合で処理される
setfield(p, 'yoffset',
getfield(p, 'yoffset') - (has_attr(p,attr_ablshift) or 0))
end
+ set_attr(p, attr_icflag, PROCESSED)
end
end
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
+ 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
+ setfield(lp, 'yoffset', getfield(lp, 'yoffset') - y_adjust)
+ end
+ if adj_depth>node_depth then
+ local r = node_new(id_rule,rule_subtype)
+ setwhd(r, 0, 0, adj_depth); setdir(r, 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