local tex_nest = tex.nest
local tex_getcount = tex.getcount
+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 ensure_tex_attr
+local dir_pool
do
- local tex_set_attr = tex.setattribute
- local tex_get_attr = tex.getattribute
- function ensure_tex_attr(a, v)
- if tex_get_attr(a)~=v then
- tex_set_attr('global', a, v)
- end
+ 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
v = get_adjust_dir_count()
end
local h = to_direct(tex_nest[lv].head)
- 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)
+ 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)
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
ensure_tex_attr(attr_icflag, 0)
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,
get_attr_icflag(hd) + PROCESSED_BEGIN_FLAG)
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
ensure_tex_attr(attr_dir, 0)
return h
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
end
for box_rule in traverse(h) do
if getid(box_rule)<id_rule then
- 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, list_dir)
- h = insert_before(h, box_rule, w)
+ h = insert_before(h, box_rule, dir_pool[list_dir]())
end
end
ensure_tex_attr(attr_dir, 0)
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
end
local getbox = tex.getbox
local setbox, copy = Dnode.setbox, Dnode.copy
+ local lua_mem_kb = 0
function luatexja.direction.finalize()
local a = to_direct(tex.getbox("AtBeginShipoutBox"))
local a_dir = get_box_dir(a, dir_yoko)
finalize_inner(shipout_temp)
setbox('global', "AtBeginShipoutBox", copy(getlist(shipout_temp)))
setfield(shipout_temp, 'head',nil)
- --print('MM', collectgarbage('count'))
+
+ -- 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