end
end
function get_dir_count()
- for i=tex_nest.ptr, 1, -1 do
- local h = tex_nest[i].head.next
- if h then
- local t = get_dir_count_inner(h)
- if t~=0 then return t end
- end
- end
- return page_direction
+ for i=tex_nest.ptr, 1, -1 do
+ local h = tex_nest[i].head.next
+ if h then
+ local t = get_dir_count_inner(h)
+ if t~=0 then return t end
+ end
+ end
+ return page_direction
end
function get_adjust_dir_count()
for i=tex_nest.ptr, 1, -1 do
elseif v=='adj' then
v,name = get_adjust_dir_count(), nil
end
+ local current_nest = tex_nest[lv]
if tex.currentgrouptype==6 then
ltjb.package_error(
'luatexja',
"You can't use `\\" .. name .. "' in an align",
- "To change direction in an align, \n"
- .. "you shold use \\hbox or \\vbox.")
+ "To change the direction in an align, \n"
+ .. "you shold use \\hbox or \\vbox.")
+ elseif current_nest.mode == ltjs.hmode or abs(current_nest.mode) == ltjs.mmode then
+ ltjb.package_error(
+ 'luatexja',
+ "Improper `\\" .. name .. "'",
+ 'You cannot change the direction in unrestricted horizontal mode \n'
+ .. 'nor math modes.')
else
- local h = (lv==0) and tex.lists.page_head or tex_nest[lv].head.next
+ local h = (lv==0) and tex.lists.page_head or current_nest.head.next
local flag,w = test_list(h,lv)
if flag==0 then
if lv==0 and not page_direction then
elseif lv==0 then
page_direction = v
else -- flag == 2: need to create dir whatsit.
- local h = tex_nest[lv].head
+ local h = current_nest.head
local hn = node.next(h)
hn = (hn and hn.id==id_local) and hn or h
local w = to_node(dir_pool[v]())
insert_after_node(h,hn,w)
- tex_nest[lv].tail = node_tail_node(w)
+ current_nest.tail = node_tail_node(w)
end
ensure_tex_attr(attr_icflag, 0)
end
-- hpack_filter, vpack_filter, post_line_break_filter
-- の結果を組方向を明示するため,先頭に dir_node を設置
+local get_box_dir
do
local function create_dir_whatsit_hpack(h, gc)
local hd = to_direct(h)
- if gc=='fin_row' or gc == 'preamble' then
+ if gc=='fin_row' then
if hd then
+ for p in traverse_id(15, hd) do -- unset
+ if get_box_dir(p, 0)==0 then
+ setfield(p, 'head', create_dir_whatsit(getlist(p), 'fin_row', ltjs.list_dir))
+ end
+ end
set_attr(hd, attr_icflag, PROCESSED_BEGIN_FLAG)
ensure_tex_attr(attr_icflag, 0)
end
return h
+ elseif gc == 'preamble' then
else
adjust_badness(hd)
return to_node(create_dir_whatsit(hd, gc, ltjs.list_dir))
do
local function create_dir_whatsit_parbox(h, gc)
- stop_time_measure('tex_linebreak')
+ stop_time_measure('tex_linebreak');
-- start 側は ltj-debug.lua に
local new_dir = ltjs.list_dir
for line in traverse_id(id_hlist, to_direct(h)) do
-- 1st ret val: b の組方向
-- 2nd ret val はその DIR whatsit
-local function get_box_dir(b, default)
+function get_box_dir(b, default)
start_time_measure('get_box_dir')
local dir = has_attr(b, attr_dir) or 0
local bh = getfield(b,'head')
start_time_measure('box_primitive_hook')
local list_dir = get_dir_count()%dir_math_mod
local b = getbox(tex_getcount('ltj@tempcnta'))
- if b then
+ if b and getlist(to_direct(b)) then
local box_dir = get_box_dir(to_direct(b), dir_yoko)
if box_dir%dir_math_mod ~= list_dir then
ltjb.package_error(
local bh = getlist(b)
local box_dir, dn = get_box_dir(b, ltjs.list_dir)
-- 既に b の中身にあるwhatsit
-
+ if (box_dir<dir_node_auto) and (not dn) then
+ bh = create_dir_whatsit(bh, 'make_dir_whatsit', dir_yoko)
+ dn = bh; setfield(b, 'head', bh)
+ end
if box_dir%dir_math_mod==new_dir then
if box_dir>=dir_node_auto then
-- dir_node としてカプセル化されている
-- lastbox
local node_prev = (node.direct~=node) and node.direct.getprev or node.prev
+ local id_glue = node.id('glue')
local function lastbox_hook()
start_time_measure('box_primitive_hook')
local bn = tex_nest[tex_nest.ptr].tail
local b, head = to_direct(bn), to_direct(tex_nest[tex_nest.ptr].head)
local bid = getid(b)
if bid==id_hlist or bid==id_vlist then
+ local p = getlist(b)
+ -- alignment の各行の中身が入ったボックス
+ if p and getid(p)==id_glue and getsubtype(p)==12 then -- tabskip
+ local np = node_next(p); local npid = getid(np)
+ if npid==id_hlist or npid==id_vlist then
+ setfield(b, 'head', create_dir_whatsit(p, 'align', get_box_dir(np, 0)))
+ end
+ end
local box_dir = get_box_dir(b, 0)
if box_dir>= dir_node_auto then -- unwrap dir_node
local p = node_prev(b)
local list_dir = get_dir_count()
local a = tex_nest[tex_nest.ptr].tail
local ad = to_direct(a)
+ if (not a) or getid(ad)~=id_ins then
+ a = node.tail(tex.lists.page_head); ad = to_direct(a)
+ end
if a and getid(ad)==id_ins then
local h = getfield(ad, 'head')
if getid(h)==id_whatsit and
-- vsplit
do
- local split_dir_whatsit
+ local split_dir_whatsit, split_dir_head
+ local cat_lp = luatexbase.catcodetables['latex-package']
+ local sprint, scan_int, tex_getbox = tex.sprint, token.scan_int, tex.getbox
+ function luatexja.direction.vsplit()
+ local n = scan_int();
+ local p = to_direct(tex_getbox(n))
+ split_dir_head = nil
+ if p then
+ local bh = getlist(p)
+ if getid(bh)==id_whatsit and getsubtype(bh)==sid_user and getfield(bh, 'user_id')==DIR
+ and node_next(bh) then
+ ltjs.list_dir = has_attr(bh, attr_dir)
+ local q = node_next(p)
+ setfield(p, 'head', node_remove(bh,bh,bh))
+ split_dir_head = bh
+ end
+ end
+ sprint(cat_lp, '\\ltj@@orig@vsplit' .. tostring(n))
+ end
local function dir_adjust_vpack(h, gc)
start_time_measure('direction_vpack')
local hd = to_direct(h)
hd = create_dir_whatsit_vbox(hd, gc)
split_dir_whatsit = hd
elseif gc=='split_off' 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
+ if split_dir_head then
+ list_dir = has_attr(split_dir_head, attr_dir)
+ hd = insert_before(hd, hd, split_dir_head)
+ split_dir_head=nil
end
if split_dir_whatsit then
-- adjust direction of 'split_keep'
end
end
--- append_to_vlist filter
-do
- local id_glue = node.id('glue')
- local getglue = node.direct.getglue or
- function(g)
- return getfield(g,'width'), getfield(g,'stretch'), getfield(g,'shrink'),
- getfield(g,'stretch_order'), getfield(g,'shrink_order')
- end
-local setglue = luatexja.setglue
- local function copy_glue (new_glue, old_glue, subtype, new_w)
- setfield(new_glue, 'subtype', subtype)
- local w,st,sp,sto,spo = getglue(to_direct(old_glue))
- setglue(new_glue, new_w or w, st, sp, sto, spo)
- end
- local node_write = node.direct.write
- local function dir_adjust_append_vlist(b, loc, prev, mirrored)
- local old_b = to_direct(b)
- local new_b = loc=='box' and
- make_dir_whatsit(old_b, old_b, get_dir_count(), 'append_vlist') or old_b
-
- if prev > -65536000 then
- local d = tex.baselineskip.width - prev
- - getfield(new_b, mirrored and 'depth' or 'height')
- local g = node_new(id_glue)
- if d < tex.lineskiplimit then
- copy_glue(g, tex.lineskip, 1)
- else
- copy_glue(g, tex.baselineskip, 2, d);
- end
- node_write(g)
- end
- node_write(new_b)
- tex.prevdepth = getfield(new_b, mirrored and 'height' or 'depth')
- return nil -- do nothing on tex side
- end
- ltjb.add_to_callback('append_to_vlist_filter',
- dir_adjust_append_vlist,
- 'ltj.direction', 10000)
-end
+-- append_to_vlist filter: done in ltj-lineskip.lua
-- finalize (executed just before \shipout)
-- we supply correct pdfsavematrix nodes etc. inside dir_node
local finalize_inner
local function finalize_dir_node(db,new_dir)
local b = getlist(db)
+ if getid(b)==id_whatsit and getsubtype(b)==sid_user
+ and getfield(b, 'user_id')==DIR then
+ local ob = b; b = node_remove(b,b); setfield(db, 'head', b);
+ node_free(ob)
+ end
finalize_inner(b)
local w = getfield(b, 'width')
local h = getfield(b, 'height')
local dn_h = getfield(db, 'height')
local dn_d = getfield(db, 'depth')
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 t = dir_node_aux[get_box_dir(b, dir_yoko)%dir_math_mod][new_dir]
+ t = t and t[getid(b)]; if not t then return end
+ for _,v in ipairs(t) do
local cmd, arg, nn = v[1], v[2]
if cmd=='kern' then
- nn = node_new(id_kern)
+ nn = node_new(id_kern, 1)
setfield(nn, 'kern', arg(w, h, d, dn_w, dn_h, dn_d))
elseif cmd=='whatsit' then
nn = node_new(id_whatsit, arg)
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