local tex_nest = tex.nest
local tex_getcount = tex.getcount
-local tex_set_attr = tex.setattribute
+local ensure_tex_attr = ltjb.ensure_tex_attr
local PROCESSED = luatexja.icflag_table.PROCESSED
local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
local PACKED = luatexja.icflag_table.PACKED
local page_direction
--
+local dir_pool
+do
+ local node_copy = Dnode.copy
+ dir_pool = {}
+ for _,i in pairs({dir_tate, dir_yoko, dir_dtou, dir_utod}) do
+ local w = node_new(id_whatsit, sid_user)
+ set_attr(w, attr_dir, i)
+ setfield(w, 'user_id', DIR)
+ setfield(w, 'type', 110)
+ setfield(w, 'next', nil)
+ dir_pool[i] = function () return node_copy(w) end
+ end
+end
+
+--
local function adjust_badness(hd)
if not node_next(hd) and getid(hd)==id_whatsit and getsubtype(hd)==sid_user
and getfield(hd, 'user_id')==DIR then
local node_traverse = node.traverse
local STCK = luatexja.userid_table.STCK
local IHB = luatexja.userid_table.IHB
+ local sid_local = node.subtype('local_par')
local function test_list(h, lv)
if not h then
local w
for p in node_traverse(h) do
if p.id==id_whatsit then
- if p.subtype==sid_user then
+ local ps = p.subtype
+ if ps==sid_user then
local uid= p.user_id
if uid==DIR then
flag = 1; w = w or p -- found
elseif not(uid==IHB or uid==STCK) then
flag = 0; break -- error
end
- else
+ elseif ps~=sid_local then
flag = 0; break
end
else
flag = 0; break
end
end
- if flag==1 then -- move dir_whatsit w
- return 1,w -- TODO
+ if flag==1 then -- dir_whatsit already exists
+ return 1,w
else
return flag
end
end
end
+ function luatexja.direction.set_list_direction_hook(v)
+ local lv = tex_nest.ptr -- must be >= 1
+ if not v then
+ v = get_dir_count()
+ if abs(tex_nest[lv-1].mode) == ltjs.mmode and v == dir_tate then
+ v = dir_utod
+ end
+ elseif v=='adj' then
+ v = get_adjust_dir_count()
+ end
+ local h = to_direct(tex_nest[lv].head)
+ local w = dir_pool[v]()
+ insert_after(h, h, w)
+ tex_nest[lv].tail = to_node(node_tail(w))
+ ensure_tex_attr(attr_icflag, 0)
+ ensure_tex_attr(attr_dir, 0)
+ end
+
local function set_list_direction(v, name)
local lv = tex_nest.ptr
if not v then
node_set_attr(w, attr_dir, v)
if lv==0 then page_direction = v end
else
- local w = node_new(id_whatsit, sid_user)
- setfield(w, 'next', nil)
- setfield(w, 'user_id', DIR)
- setfield(w, 'type', 110)
- set_attr(w, attr_dir, v)
- Dnode.write(w)
if lv==0 then page_direction = v end
end
- tex_set_attr('global', attr_icflag, 0)
+ ensure_tex_attr(attr_icflag, 0)
end
- tex_set_attr('global', attr_dir, 0)
+ ensure_tex_attr(attr_dir, 0)
end
luatexja.direction.set_list_direction = set_list_direction
end
getsubtype(hd)==sid_user and getfield(hd, 'user_id')==DIR then
set_attr(hd, attr_icflag,
get_attr_icflag(hd) + PROCESSED_BEGIN_FLAG)
- tex_set_attr('global', attr_icflag, 0)
+ local n = node_next(hd)
+ if n then
+ set_attr(n, attr_icflag,
+ get_attr_icflag(n) + PROCESSED_BEGIN_FLAG)
+ end
+ ensure_tex_attr(attr_icflag, 0)
return hd
else
- local w = node_new(id_whatsit, sid_user)
+ local w = dir_pool[new_dir]()
setfield(w, 'next', hd)
- setfield(w, 'user_id', DIR)
- setfield(w, 'type', 110)
- set_attr(w, attr_dir, new_dir)
set_attr(w, attr_icflag, PROCESSED_BEGIN_FLAG)
set_attr(hd, attr_icflag,
- (has_attr(hd, attr_icflag) or 0)%PROCESSED_BEGIN_FLAG
- + PROCESSED_BEGIN_FLAG)
- tex_set_attr('global', attr_dir, 0)
- tex_set_attr('global', attr_icflag, 0)
+ get_attr_icflag(hd) + PROCESSED_BEGIN_FLAG)
+ ensure_tex_attr(attr_icflag, 0)
+ ensure_tex_attr(attr_dir, 0)
return w
end
end
if gc=='fin_row' or gc == 'preamble' then
if hd then
set_attr(hd, attr_icflag, PROCESSED_BEGIN_FLAG)
- tex_set_attr('global', attr_icflag, 0)
+ ensure_tex_attr(attr_icflag, 0)
end
return h
else
local function create_dir_whatsit_parbox(h, gc)
stop_time_measure('tex_linebreak')
-- start 側は ltj-debug.lua に
- local new_dir, hd = ltjs.list_dir, to_direct(h)
- for line in traverse_id(id_hlist, hd) do
- local nh = getlist(line)
- setfield(line, 'head', create_dir_whatsit(nh, gc, new_dir) )
- --set_attr(line, attr_dir, new_dir)
+ local new_dir = ltjs.list_dir
+ for line in traverse_id(id_hlist, to_direct(h)) do
+ setfield(line, 'head', create_dir_whatsit(getlist(line), gc, new_dir) )
end
- tex_set_attr('global', attr_dir, 0)
+ ensure_tex_attr(attr_dir, 0)
return h
end
luatexbase.add_to_callback('post_linebreak_filter',
if gc=='fin_row' then -- gc == 'preamble' case is treated in dir_adjust_vpack
if hd then
set_attr(hd, attr_icflag, PROCESSED_BEGIN_FLAG)
- tex_set_attr('global', attr_icflag, 0)
+ ensure_tex_attr(attr_icflag, 0)
end
return hd
else
local bh = getfield(b,'head')
-- b は insert node となりうるので getlist() は使えない
local c
- for i=1,2 do
- if bh and getid(bh)==id_whatsit
- and getsubtype(bh)==sid_user and getfield(bh, 'user_id')==DIR then
+ for bh in traverse_id(id_whatsit, bh) do
+ if getsubtype(bh)==sid_user and getfield(bh, 'user_id')==DIR then
c = bh
- dir = (dir==0) and has_attr(bh, attr_dir) or dir
+ dir = (dir==0) and has_attr(bh, attr_dir) or dir
end
- bh = node_next(bh)
end
+ -- for i=1,2 do
+ -- if bh and getid(bh)==id_whatsit
+ -- and getsubtype(bh)==sid_user and getfield(bh, 'user_id')==DIR then
+ -- c = bh
+ -- dir = (dir==0) and has_attr(bh, attr_dir) or dir
+ -- end
+ -- bh = node_next(bh)
+ -- end
stop_time_measure('get_box_dir')
return (dir==0 and default or dir), c
end
new_dir + (is_manual and dir_node_manual or dir_node_auto))
set_attr(db, attr_icflag, PROCESSED)
set_attr(b, attr_icflag, PROCESSED)
- tex_set_attr('global', attr_dir, 0)
- tex_set_attr('global', attr_icflag, 0)
+ ensure_tex_attr(attr_dir, 0)
+ ensure_tex_attr(attr_icflag, 0)
setfield(db, 'dir', getfield(b, 'dir'))
setfield(db, 'shift', 0)
setfield(db, 'width', info.width(w,h,d))
else
setdimen('ltj@tempdima', 0)
end
+ tex.sprint(cat_lp, '\\ltj@tempdima')
tex.globaldefs = gt
end
luatexja.direction.get_box_dim = get_box_dim
-- return value: (changed dimen of box itself?)
+ local scan_dimen, scan_int = luatexja.token.scan_dimen, luatexja.token.scan_int
+ local scan_keyword = luatexja.token.scan_keyword
local function set_box_dim_common(key, s, l_dir)
local s_dir, wh = get_box_dir(s, dir_yoko)
s_dir = s_dir%dir_math_mod
setfield(db, 'next', dnh)
setfield(wh, 'value',to_node(db))
end
- setfield(db, key, tex.getdimen('ltj@tempdima'))
+ setfield(db, key, scan_dimen())
return false
else
- setfield(s, key, tex.getdimen('ltj@tempdima'))
+ setfield(s, key, scan_dimen())
if wh then
-- change dimension of dir_nodes which are created "automatically"
local bw, bh, bd
end
end
local function set_box_dim(key)
- local n = tex_getcount('ltj@tempcnta')
- local s = getbox(n)
+ local s = getbox(scan_int()); scan_keyword('=')
if s then
local l_dir = (get_dir_count())%dir_math_mod
s = to_direct(s)
set_box_dim_common(key, s, l_dir)
elseif b_dir%dir_math_mod == l_dir then
-- s is dir_node
- setfield(s, key, tex.getdimen('ltj@tempdima'))
+ setfield(s, key, scan_dimen())
if b_dir<dir_node_manual then
set_attr(s, attr_dir, b_dir%dir_node_auto + dir_node_manual)
end
local box_dir = get_box_dir(sd, dir_yoko)
if box_dir%dir_math_mod ~= list_dir then
setbox(
- 'ltj@afbox',
+ 'ltj@afbox',
to_node(copy_list(make_dir_whatsit(sd, sd, list_dir, 'box_move')))
-- copy_list しないとリストの整合性が崩れる……？
)
local function glyph_from_packed(h)
local b = getlist(h)
return (getid(b)==id_kern or (getid(b)==id_whatsit and getsubtype(b)==sid_save) )
- and node_next(node_next(node_next(node_next(b)))) or b
+ and node_next(node_next(node_next(b))) or b
end
luatexja.direction.glyph_from_packed = glyph_from_packed
end
--- adjust and insertion
-local id_adjust = node.id('adjust')
-function luatexja.direction.check_adjust_direction()
- start_time_measure('box_primitive_hook')
- local list_dir = get_adjust_dir_count()
- local a = tex_nest[tex_nest.ptr].tail
- local ad = to_direct(a)
- if a and getid(ad)==id_adjust then
- local adj_dir = get_box_dir(ad)
- if list_dir~=adj_dir then
- ltjb.package_error(
- 'luatexja',
- 'Direction Incompatible',
- "\\vadjust's argument and outer vlist must have same direction.")
- Dnode.last_node()
+-- adjust
+do
+ local id_adjust = node.id('adjust')
+ function luatexja.direction.check_adjust_direction()
+ start_time_measure('box_primitive_hook')
+ local list_dir = get_adjust_dir_count()
+ local a = tex_nest[tex_nest.ptr].tail
+ local ad = to_direct(a)
+ if a and getid(ad)==id_adjust then
+ local adj_dir = get_box_dir(ad)
+ if list_dir~=adj_dir then
+ ltjb.package_error(
+ 'luatexja',
+ 'Direction Incompatible',
+ "\\vadjust's argument and outer vlist must have same direction.")
+ Dnode.last_node()
+ end
end
+ stop_time_measure('box_primitive_hook')
+ end
+end
+
+-- insert
+do
+ local id_ins = node.id('ins')
+ local id_rule = node.id('rule')
+ function luatexja.direction.populate_insertion_dir_whatsit()
+ start_time_measure('box_primitive_hook')
+ local list_dir = get_dir_count()
+ local a = tex_nest[tex_nest.ptr].tail
+ local ad = to_direct(a)
+ if a and getid(ad)==id_ins then
+ local h = getfield(ad, 'head')
+ if getid(h)==id_whatsit and
+ getsubtype(h)==sid_user and getfield(h, 'user_id')==DIR then
+ local n = h; h = node_remove(h,h)
+ node_free(n)
+ end
+ for box_rule in traverse(h) do
+ if getid(box_rule)<id_rule then
+ h = insert_before(h, box_rule, dir_pool[list_dir]())
+ end
+ end
+ ensure_tex_attr(attr_dir, 0)
+ setfield(ad, 'head', h)
+ end
+ stop_time_measure('box_primitive_hook')
end
- stop_time_measure('box_primitive_hook')
end
-- vsplit
hd = create_dir_whatsit_vbox(hd, gc)
split_dir_whatsit = hd
elseif gc=='split_off' then
- local bh=hd
- for i=1,2 do
- if bh and getid(bh)==id_whatsit
- and getsubtype(bh)==sid_user and getfield(bh, 'user_id')==DIR then
+ for bh in traverse_id(id_whatsit, hd) do
+ if getsubtype(bh)==sid_user and getfield(bh, 'user_id')==DIR then
ltjs.list_dir = has_attr(bh, attr_dir); break
end
- bh = node_next(bh)
end
+ -- local bh=hd
+ -- for i=1,2 do
+ -- if bh and getid(bh)==id_whatsit
+ -- and getsubtype(bh)==sid_user and getfield(bh, 'user_id')==DIR then
+ -- ltjs.list_dir = has_attr(bh, attr_dir); break
+ -- end
+ -- bh = node_next(bh)
+ -- end
if split_dir_whatsit then
-- adjust direction of 'split_keep'
set_attr(split_dir_whatsit, attr_dir, ltjs.list_dir)
local function dir_adjust_buildpage(info)
if info=='box' then
local head = to_direct(tex.lists.contrib_head)
- local nb
if head then
- head, _, nb
- = make_dir_whatsit(head,
+ head = make_dir_whatsit(head,
node_tail(head),
get_dir_count(),
'buildpage')
local function finalize_dir_node(db,new_dir)
local b = getlist(db)
finalize_inner(b)
- local box_dir = get_box_dir(b, dir_yoko)%dir_math_mod
- setfield(db, 'head', nil)
local w = getfield(b, 'width')
local h = getfield(b, 'height')
local d = getfield(b, 'depth')
local dn_w = getfield(db, 'width')
local dn_h = getfield(db, 'height')
local dn_d = getfield(db, 'depth')
- local db_head, db_tail = nil
- for _,v in ipairs(dir_node_aux[box_dir][new_dir][getid(b)]) do
+ local db_head, db_tail
+ for _,v in ipairs(dir_node_aux
+ [get_box_dir(b, dir_yoko)%dir_math_mod][new_dir][getid(b)]) do
local cmd, arg, nn = v[1], v[2]
if cmd=='kern' then
nn = node_new(id_kern)
insert_after(db_head, db_tail, nn)
db_tail = nn
else
- db_head, db_tail = nn, nn
+ setfield(db, 'head', nn)
+ db_head, db_tail = nn, nn
end
- setfield(db, 'head', db_head)
end
end
+
+ tex.setattribute(attr_dir, dir_yoko)
+ local shipout_temp = node_new(id_hlist)
+ tex.setattribute(attr_dir, 0)
+
finalize_inner = function (box)
for n in traverse(getlist(box)) do
local nid = getid(n)
else
finalize_inner(n)
end
- end
+ end
end
end
local getbox = tex.getbox
+ local setbox, copy = Dnode.setbox, Dnode.copy
+ local lua_mem_kb = 0
function luatexja.direction.finalize()
- finalize_inner(to_direct(tex.getbox("AtBeginShipoutBox")))
+ local a = to_direct(tex.getbox("AtBeginShipoutBox"))
+ local a_dir = get_box_dir(a, dir_yoko)
+ if a_dir~=dir_yoko then
+ local b = create_dir_node(a, a_dir, dir_yoko, false)
+ setfield(b, 'head', a); a = b
+ end
+ setfield(shipout_temp, 'head', a)
+ finalize_inner(shipout_temp)
+ setbox('global', "AtBeginShipoutBox", copy(getlist(shipout_temp)))
+ setfield(shipout_temp, 'head',nil)
+
+ -- garbage collect
+ --local m = collectgarbage('count')
+ --if m>lua_mem_kb+20480 then
+ -- collectgarbage(); lua_mem_kb = collectgarbage('count')
+ --end
+ --print('Lua Memory Usage', lua_mem_kb)
end
end
OSDN Git Service
