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
node_set_attr(w, attr_dir, v)
if lv==0 then page_direction = v end
else
- Dnode.write(dir_pool[v]())
if lv==0 then page_direction = v end
end
ensure_tex_attr(attr_icflag, 0)
local function create_dir_whatsit_parbox(h, gc)
stop_time_measure('tex_linebreak')
-- start 側は ltj-debug.lua に
- local new_dir = ltjs.list_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
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
insert_after(db_head, db_tail, nn)
db_tail = nn
else
- setfield(db, 'head', nn)
- db_head, db_tail = nn, nn
+ setfield(db, 'head', nn)
+ db_head, db_tail = nn, nn
end
end
end