local attr_dir = luatexbase.attributes['ltj@dir']
local attr_icflag = luatexbase.attributes['ltj@icflag']
+local cat_lp = luatexbase.catcodetables['latex-package']
local Dnode = node.direct or node
local nullfunc = function (n) return n end
local to_node = (Dnode ~= node) and Dnode.tonode or nullfunc
local traverse_id = Dnode.traverse_id
local start_time_measure, stop_time_measure
= ltjb.start_time_measure, ltjb.stop_time_measure
+local abs = math.abs
local id_kern = node.id('kern')
local id_hlist = node.id('hlist')
local sid_matrix = node.subtype('pdf_setmatrix')
local sid_user = node.subtype('user_defined')
+local tex_nest = tex.nest
local tex_getcount = tex.getcount
local tex_set_attr = tex.setattribute
local PROCESSED = luatexja.icflag_table.PROCESSED
local dir_tate = luatexja.dir_table.dir_tate
local dir_yoko = luatexja.dir_table.dir_yoko
local dir_dtou = luatexja.dir_table.dir_dtou
+local dir_utod = luatexja.dir_table.dir_utod
+local dir_math_mod = luatexja.dir_table.dir_math_mod
local dir_node_auto = luatexja.dir_table.dir_node_auto
local dir_node_manual = luatexja.dir_table.dir_node_manual
+local page_direction
+--
+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
+ -- avoid double whatsit
+ luatexja.global_temp=tex.globaldefs; tex.globaldefs=0
+ luatexja.hbadness_temp=tex.hbadness; tex.hbadness=10000
+ luatexja.vbadness_temp=tex.vbadness; tex.vbadness=10000
+ else
+ luatexja.global_temp = nil
+ luatexja.hbadness_temp=nil
+ luatexja.vbadness_temp=nil
+ end
+end
-local get_dir_count
--- \tate, \yoko
+local get_dir_count, get_adjust_dir_count
do
+ local function get_dir_count_inner(h)
+ if h then
+ if h.id==id_whatsit and h.subtype==sid_user and h.user_id==DIR then
+ local ic = node.has_attribute(h, attr_icflag)
+ return (ic<PROCESSED_BEGIN_FLAG)
+ and (node.has_attribute(h,attr_dir)%dir_node_auto) or 0
+ else
+ return 0
+ end
+ else
+ return 0
+ end
+ end
function get_dir_count()
- return tex_getcount('ltj@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
+ end
+ function get_adjust_dir_count()
+ for i=tex_nest.ptr, 1, -1 do
+ local v = tex_nest[i]
+ local h, m = v.head.next, v.mode
+ if abs(m)== ltjs.vmode and h then
+ local t = get_dir_count_inner(h)
+ if t~=0 then return t end
+ end
+ end
+ return page_direction
end
- luatexja.direction.get_dir_count = get_dir_count
+ luatexja.direction.get_dir_count = get_dir_count
+ luatexja.direction.get_adjust_dir_count = get_adjust_dir_count
+end
+
+-- \tate, \yoko，\dtou, \utod
+do
local node_next = node.next
local node_set_attr = node.set_attribute
local function set_list_direction(v, name)
- local lv, w = tex.nest[tex.nest.ptr], tex.lists.page_head
- if lv.mode == 1 and w then
- if w.id==id_whatsit and w.subtype==sid_user
- and w.user_id==DIR then
- node_set_attr(w, attr_dir, v)
+ local lv, w = tex_nest.ptr, tex.lists.page_head
+ if not v then
+ v,name = get_dir_count(), nil
+ if lv>=1 and abs(tex_nest[lv-1].mode) == ltjs.mmode and v == dir_tate then
+ v = dir_utod
end
+ elseif v=='adj' then
+ v,name = get_adjust_dir_count(), nil
+ end
+ 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.")
else
- local w = node_next(lv.head)
+ local w = (lv==0) and tex.lists.page_head or tex_nest[lv].head.next
if w then
- w = to_direct(w)
- if getid(w)==id_whatsit and getsubtype(w)==sid_user
- and getfield(w, 'user_id')==DIR then
- set_attr(w, attr_dir, v)
+ if (not w.next) and
+ w.id==id_whatsit and w.subtype==sid_user and w.user_id==DIR then
+ node_set_attr(w, attr_dir, v)
+ if lv==0 then page_direction = v end
+ elseif lv==0 and not page_direction then
+ page_direction = v -- for first call of \yoko (in luatexja-core.sty)
else
ltjb.package_error(
'luatexja',
- "Use `\\" .. name .. "' at top of list",
+ "Use `\\" .. tostring(name) .. "' at top of list",
'Direction change command by LuaTeX-ja is available\n'
.. 'only when the current list is null.')
end
else
local w = node_new(id_whatsit, sid_user)
- setfield(w, 'next', hd)
+ 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)
+ tex_set_attr('global', attr_icflag, 0)
end
tex_set_attr('global', attr_dir, 0)
end
luatexja.direction.set_list_direction = set_list_direction
end
-function luatexja.direction.freeze_list_dir()
- local w = to_direct(tex.nest[tex.nest.ptr].tail)
- set_attr(w, attr_dir, -has_attr(w, attr_dir))
-end
-
-- ボックスに dir whatsit を追加
local function create_dir_whatsit(hd, gc, new_dir)
+ if getid(hd)==id_whatsit and
+ getsubtype(hd)==sid_user and getfield(hd, 'user_id')==DIR then
+ set_attr(hd, attr_icflag,
+ (has_attr(hd, attr_icflag) or 0)%PROCESSED_BEGIN_FLAG
+ + PROCESSED_BEGIN_FLAG)
+ tex_set_attr('global', attr_icflag, 0)
+ return hd
+ else
local w = node_new(id_whatsit, sid_user)
setfield(w, 'next', hd)
setfield(w, 'user_id', DIR)
setfield(w, 'type', 110)
set_attr(w, attr_dir, new_dir)
- tex_set_attr('global', attr_dir, 0)
set_attr(w, attr_icflag, PROCESSED_BEGIN_FLAG)
- set_attr(hd, attr_icflag, (has_attr(hd, attr_icflag) or 0) + 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)
return w
+ end
end
-- hpack_filter, vpack_filter, post_line_break_filter
end
return h
else
+ adjust_badness(hd)
return to_node(create_dir_whatsit(hd, gc, ltjs.list_dir))
end
end
luatexbase.add_to_callback('hpack_filter',
create_dir_whatsit_hpack, 'ltj.create_dir_whatsit', 10000)
+end
+do
+ 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)
+ end
+ tex_set_attr('global', attr_dir, 0)
+ return h
+ end
+ luatexbase.add_to_callback('post_linebreak_filter',
+ create_dir_whatsit_parbox, 'ltj.create_dir_whatsit', 10000)
+end
+
+local create_dir_whatsit_vbox
+do
local wh = {}
local id_glue, sid_parskip = node.id('glue'), 3
- local function create_dir_whatsit_vbox(h, gc)
- local hd = to_direct(h)
+ create_dir_whatsit_vbox = function (hd, gc)
ltjs.list_dir = get_dir_count()
-- remove dir whatsit
for x in traverse_id(id_whatsit, hd) do
node_remove(hd,x); node_free(x)
end
end
- for i=1,#wh do hd = node_remove(hd, wh[i]); node_free(wh[i]); wh[i] = nil end
- if gc=='fin_row' or gc == 'preamble' then
+ for i=1,#wh do
+ hd = node_remove(hd, wh[i]); node_free(wh[i]); wh[i] = nil
+ end
+ 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)
end
- return to_node(hd)
- elseif gc=='vtop' then
- local w = create_dir_whatsit(hd, gc, ltjs.list_dir)
- -- move dir whatsit after hd
- local n = getfield(hd, 'next')
- setfield(hd, 'next', w); setfield(w, 'next', n)
- return to_node(hd)
+ return hd
else
- return to_node(create_dir_whatsit(hd, gc, ltjs.list_dir))
- end
- end
- luatexbase.add_to_callback('vpack_filter',
- create_dir_whatsit_vbox, 'ltj.create_dir_whatsit', 1)
-
- 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
- set_attr(line, attr_dir, new_dir)
+ local n =node_next(hd)
+ if gc=='vtop' then
+ local w = create_dir_whatsit(hd, gc, ltjs.list_dir)
+ -- move dir whatsit after hd
+ setfield(hd, 'next', w); setfield(w, 'next', n)
+ return hd
+ else
+ hd = create_dir_whatsit(hd, gc, ltjs.list_dir)
+ return hd
+ end
end
- tex_set_attr('global', attr_dir, 0)
- return to_node(create_dir_whatsit(hd, gc, new_dir))
end
- luatexbase.add_to_callback('post_linebreak_filter',
- create_dir_whatsit_parbox, 'ltj.create_dir_whatsit', 10000)
-
end
-- dir_node に包む方法を書いたテーブル
local dir_node_aux
do
+ local floor = math.floor
local get_h =function (w,h,d) return h end
local get_d =function (w,h,d) return d end
local get_h_d =function (w,h,d) return h+d end
local get_h_d_neg =function (w,h,d) return -h-d end
local get_h_neg =function (w,h,d) return -h end
local get_d_neg =function (w,h,d) return -d end
- local get_w_half =function (w,h,d) return 0.5*w end
- local get_w_neg_half =function (w,h,d) return -0.5*w end
+ local get_w_half =function (w,h,d) return floor(0.5*w) end
+ local get_w_neg_half =function (w,h,d) return floor(-0.5*w) end
+ local get_w_half_rem =function (w,h,d) return w-floor(0.5*w) end
+ local get_w_neg_half_rem =function (w,h,d) return -w-floor(-0.5*w) end
local get_w_neg =function (w,h,d) return -w end
local get_w =function (w,h,d) return w end
local zero = function() return 0 end
[dir_tate] = { -- tate 中で組む
width = get_h_d,
height = get_w_half,
- depth = get_w_half,
+ depth = get_w_half_rem,
[id_hlist] = {
{ 'whatsit', sid_save },
{ 'rotate', '0 1 -1 0' },
{ 'kern', get_w_neg_half },
{ 'box' , get_h },
- { 'kern', get_w_neg_half },
+ { 'kern', get_w_neg_half_rem },
{ 'whatsit', sid_restore },
},
[id_vlist] = {
}
end
--- b に DIR whatsit があればその内容を attr_dir にうつす (1st ret val)
+-- 1st ret val: b の組方向
-- 2nd ret val はその DIR whatsit
local 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')
-- b は insert node となりうるので getlist() は使えない
if bh and getid(bh)==id_whatsit
and getsubtype(bh)==sid_user and getfield(bh, 'user_id')==DIR then
c = bh
- if dir==0 then
- dir = has_attr(bh, attr_dir)
- set_attr(b, attr_dir, dir)
- tex_set_attr('global', attr_dir, 0)
- end
+ 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
-function luatexja.direction.check_dir(reg_num)
- local list_dir = get_dir_count()
- local b = tex.getbox(reg_num)
- if b then
- local box_dir = get_box_dir(to_direct(b), dir_yoko)
- if box_dir%dir_node_auto ~= list_dir%dir_node_auto then
- ltjb.package_error(
- 'luatexja',
- "Incompatible direction list can't be unboxed",
- 'I refuse to unbox a box in differrent direction.')
+do
+ local getbox = tex.getbox
+ local function check_dir(reg_num)
+ 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
+ local box_dir = get_box_dir(to_direct(b), dir_yoko)
+ if box_dir%dir_math_mod ~= list_dir then
+ -- print('NEST', tex_nest.ptr, tex_getcount('ltj@tempcnta'))
+ -- luatexja.ext_show_node_list(
+ -- (tex_nest.ptr==0) and tex.lists.page_head or tex_nest[tex_nest.ptr].head,
+ -- 'LIST' .. tostring(list_dir) .. '> ', print)
+ -- luatexja.ext_show_node_list(b, 'BOX' .. tostring(box_dir) .. '> ', print)
+ ltjb.package_error(
+ 'luatexja',
+ "Incompatible direction list can't be unboxed",
+ 'I refuse to unbox a box in differrent direction.')
+ end
end
+ if luatexja.global_temp and tex.globaldefs~=luatexja.global_temp then
+ tex.globaldefs = luatexja.global_temp
+ end
+ stop_time_measure('box_primitive_hook')
end
+ luatexja.direction.check_dir = check_dir
end
-- dir_node に包まれている「本来の中身」を取り出し，
setfield(wh, 'value', nil)
end
-- recalc. info
- local info = dir_node_aux[b_dir][box_dir%dir_node_auto][getid(bc)]
+ local info = dir_node_aux[b_dir%dir_math_mod][box_dir%dir_math_mod][getid(bc)]
for _,v in ipairs(info) do
if v[1]=='box' then
shift_old = v[2](
-- is_manual: 寸法変更に伴うものか？
local function create_dir_node(b, b_dir, new_dir, is_manual)
- local info = dir_node_aux[b_dir][new_dir]
+ local info = dir_node_aux[b_dir%dir_math_mod][new_dir%dir_math_mod]
local w = getfield(b, 'width')
local h = getfield(b, 'height')
local d = getfield(b, 'depth')
- local db = node_new(getid(b))
+ local db = node_new(getid(b)) -- dir_node
set_attr(db, attr_dir,
new_dir + (is_manual and dir_node_manual or dir_node_auto))
- tex_set_attr('global', attr_dir, 0)
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)
setfield(db, 'dir', getfield(b, 'dir'))
setfield(db, 'shift', 0)
setfield(db, 'width', info.width(w,h,d))
end
-- 異方向のボックスの処理
-local make_dir_whatsit
+local make_dir_whatsit, process_dir_node
do
make_dir_whatsit = function (head, b, new_dir, origin)
+ new_dir = new_dir%dir_math_mod
-- head: list head, b: box
-- origin: コール元 (for debug)
-- return value: (new head), (next of b), (new b), (is_b_dir_node)
local bh = getlist(b)
local box_dir, dn = get_box_dir(b, ltjs.list_dir)
-- 既に b の中身にあるwhatsit
- if box_dir==new_dir then
- return head, node_next(b), b, false
- elseif box_dir%dir_node_auto == new_dir then
- local bc = node_next(node_next(node_next(bh)))
- local _, dnc = get_box_dir(b, 0)
- if dnc then -- free all other dir_node
- Dnode.flush_list(getfield(dnc, 'value'))
- setfield(dnc, 'value', nil)
+
+ if box_dir%dir_math_mod==new_dir then
+ if box_dir>=dir_node_auto then
+ -- dir_node としてカプセル化されている
+ local bc = node_next(node_next(node_next(bh)))
+ local _, dnc = get_box_dir(b, 0)
+ if dnc then -- free all other dir_node
+ Dnode.flush_list(getfield(dnc, 'value'))
+ setfield(dnc, 'value', nil)
+ end
+ set_attr(b, attr_dir, box_dir%dir_math_mod + dir_node_auto)
+ return head, node_next(b), b, true
+ else
+ -- 組方向が一緒 (up to math dir) のボックスなので，何もしなくて良い
+ return head, node_next(b), b, false
end
- set_attr(b, attr_dir, box_dir%dir_node_auto + dir_node_auto)
- return head, node_next(b), b, true
else
+ -- 組方向を合わせる必要あり
local nh, nb, ret, flag
if box_dir>= dir_node_auto then -- unwrap
local b_dir
head, nb, b, b_dir = unwrap_dir_node(b, head, box_dir)
bh = getlist(b)
- if b_dir==new_dir then -- no need to create new dir_node
+ if b_dir%dir_math_mod==new_dir then
+ -- dir_node の中身が周囲の組方向とあっている
return head, nb, b, false
else box_dir = b_dir end
end
- local db
- local dnh = getfield(dn, 'value')
- for x in traverse(dnh) do
- if has_attr(x, attr_dir)%dir_node_auto == new_dir then
- setfield(dn, 'value', to_node(node_remove(dnh, x)))
- db=x; break
- end
- end
- Dnode.flush_list(dnh)
- db = db or create_dir_node(b, box_dir, new_dir, false)
- local w = getfield(b, 'width')
- local h = getfield(b, 'height')
- local d = getfield(b, 'depth')
- nh, nb = insert_before(head, b, db), nil
- nh, nb = node_remove(nh, b)
- local db_head, db_tail = nil
- for _,v in ipairs(dir_node_aux[box_dir][new_dir][getid(b)]) do
- local cmd, arg, nn = v[1], v[2]
- if cmd=='kern' then
- nn = node_new(id_kern)
- setfield(nn, 'kern', arg(w, h, d))
- elseif cmd=='whatsit' then
- nn = node_new(id_whatsit, arg)
- elseif cmd=='rotate' then
- nn = node_new(id_whatsit, sid_matrix)
- setfield(nn, 'data', arg)
- elseif cmd=='box' then
- nn = b; setfield(b, 'next', nil)
- setfield(nn, 'shift', getfield(nn, 'shift') + arg(w,h,d))
- end
- if db_head then
- insert_after(db_head, db_tail, nn)
- db_tail = nn
- else
- db_head, db_tail = nn, nn
- end
- --end
+ box_dir = box_dir%dir_math_mod
+ local db
+ local dnh = getfield(dn, 'value')
+ for x in traverse(dnh) do
+ if has_attr(x, attr_dir)%dir_math_mod == new_dir then
+ setfield(dn, 'value', to_node(node_remove(dnh, x)))
+ db=x; break
+ end
+ end
+ Dnode.flush_list(getfield(dn, 'value'))
+ db = db or create_dir_node(b, box_dir, new_dir, false)
+ local w = getfield(b, 'width')
+ local h = getfield(b, 'height')
+ local d = getfield(b, 'depth')
+ nh, nb = insert_before(head, b, db), nil
+ nh, nb = node_remove(nh, b)
+ local db_head, db_tail = nil
+ for _,v in ipairs(dir_node_aux[box_dir][new_dir][getid(b)]) do
+ local cmd, arg, nn = v[1], v[2]
+ if cmd=='kern' then
+ nn = node_new(id_kern)
+ setfield(nn, 'kern', arg(w, h, d))
+ elseif cmd=='whatsit' then
+ nn = node_new(id_whatsit, arg)
+ elseif cmd=='rotate' then
+ nn = node_new(id_whatsit, sid_matrix)
+ setfield(nn, 'data', arg)
+ elseif cmd=='box' then
+ nn = b; setfield(b, 'next', nil)
+ setfield(nn, 'shift', getfield(nn, 'shift') + arg(w,h,d))
+ end
+ if db_head then
+ insert_after(db_head, db_tail, nn)
+ db_tail = nn
+ else
+ db_head, db_tail = nn, nn
+ end
setfield(db, 'head', db_head)
ret, flag = db, true
end
return nh, nb, ret, flag
end
end
- local function process_dir_node(head, gc)
- start_time_measure('direction_vpack')
- local h = to_direct(head)
- local x, new_dir = h, ltjs.list_dir or dir_yoko
+ process_dir_node = function (hd, gc)
+ local x, new_dir = hd, ltjs.list_dir or dir_yoko
while x do
local xid = getid(x)
if (xid==id_hlist and has_attr(x, attr_icflag)%PROCESSED_BEGIN_FLAG~=PACKED)
or xid==id_vlist then
- h, x = make_dir_whatsit(h, x, new_dir, 'process_dir_node:' .. gc)
+ hd, x = make_dir_whatsit(hd, x, new_dir, 'process_dir_node:' .. gc)
else
x = node_next(x)
end
end
- stop_time_measure('direction_vpack')
- return to_node(h)
+ return hd
end
+
+ -- lastbox
+ local node_prev = (Dnode~=node) and Dnode.getprev or node.prev
+ local function lastbox_hook()
+ start_time_measure('box_primitive_hook')
+ local bn = tex_nest[tex_nest.ptr].tail
+ if bn then
+ 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 box_dir = get_box_dir(b, 0)
+ if box_dir>= dir_node_auto then -- unwrap dir_node
+ local p = node_prev(b)
+ local dummy1, dummy2, nb = unwrap_dir_node(b, nil, box_dir)
+ setfield(p, 'next', nb); tex_nest[tex_nest.ptr].tail = to_node(nb)
+ setfield(b, 'next', nil); setfield(b, 'head', nil)
+ node_free(b); b = nb
+ end
+ local _, wh = get_box_dir(b, 0) -- clean dir_node attached to the box
+ if wh then
+ Dnode.flush_list(getfield('value', wh))
+ setfield(wh, 'value', nil)
+ end
+ end
+ end
+ stop_time_measure('box_primitive_hook')
+ end
+
luatexja.direction.make_dir_whatsit = make_dir_whatsit
- luatexbase.add_to_callback('vpack_filter',
- process_dir_node, 'ltj.dir_whatsit', 10001)
+ luatexja.direction.lastbox_hook = lastbox_hook
end
-- \wd, \ht, \dp の代わり
do
local getbox, setdimen = tex.getbox, tex.setdimen
local function get_box_dim_common(key, s, l_dir)
+ -- s: not dir_node.
local s_dir, wh = get_box_dir(s, dir_yoko)
+ s_dir = s_dir%dir_math_mod
if s_dir ~= l_dir then
local not_found = true
for x in traverse(getfield(wh, 'value')) do
local gt = tex.globaldefs; tex.globaldefs = 0
local s = getbox(n)
if s then
- local l_dir = get_dir_count()
+ local l_dir = (get_dir_count())%dir_math_mod
s = to_direct(s)
- local b_dir = has_attr(s, attr_dir) or 0
+ local b_dir = get_box_dir(s,dir_yoko)
if b_dir<dir_node_auto then
get_box_dim_common(key, s, l_dir)
- elseif b_dir%dir_node_auto==l_dir then
+ elseif b_dir%dir_math_mod==l_dir then
setdimen('ltj@tempdima', getfield(s, key))
else
get_box_dim_common(key,
-- return value: (changed dimen of box itself?)
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
if s_dir ~= l_dir then
if not wh then
wh = create_dir_whatsit(getlist(s), 'set_box_dim', s_dir)
local n = tex_getcount('ltj@tempcnta')
local s = getbox(n)
if s then
- local l_dir = get_dir_count()
+ local l_dir = (get_dir_count())%dir_math_mod
s = to_direct(s)
- local b_dir = has_attr(s, attr_dir) or 0
+ local b_dir = get_box_dir(s,dir_yoko)
if b_dir<dir_node_auto then
set_box_dim_common(key, s, l_dir)
- elseif b_dir%dir_node_auto == l_dir then
+ elseif b_dir%dir_math_mod == l_dir then
+ -- s is dir_node
setfield(s, key, tex.getdimen('ltj@tempdima'))
if b_dir<dir_node_manual then
set_attr(s, attr_dir, b_dir%dir_node_auto + dir_node_manual)
end
else
local sid, sl = getid(s), getlist(s)
- local b = node_next(node_next(node_next(sl)))
- local info = dir_node_aux[get_box_dir(b)][b_dir%dir_node_auto]
+ local b = node_next(node_next(node_next(sl))) -- 本来の box
+ local info = dir_node_aux[get_box_dir(b,dir_yoko)%dir_math_mod][b_dir%dir_node_auto]
local shift_old
for _,v in ipairs(info[sid]) do
if v[1]=='box' then
luatexja.direction.set_box_dim = set_box_dim
end
--- \ifydir, \iftdir, \ifddir
do
- local cat_lp = luatexbase.catcodetables['latex-package']
local getbox = tex.getbox
- local function dir_conditional(n, mode)
+ local function get_register_dir(n)
local s = getbox(n)
- local res = false
if s then
s = to_direct(s)
local b_dir = get_box_dir(s, dir_yoko)
if b_dir<dir_node_auto then
- res = (b_dir==mode)
+ return b_dir
else
local b_dir = get_box_dir(
node_next(node_next(node_next(getlist(s)))), dir_yoko)
- res = (b_dir==mode)
+ return b_dir
end
+ else
+ return 0
end
- tex.sprint(cat_lp, '\\if' .. tostring(res))
end
- luatexja.direction.dir_conditional = dir_conditional
+ luatexja.direction.get_register_dir = get_register_dir
+end
+
+do
+ local getbox, setbox, copy_list = tex.getbox, tex.setbox, Dnode.copy_list
+ -- raise, lower
+ function luatexja.direction.raise_box()
+ start_time_measure('box_primitive_hook')
+ local list_dir = get_dir_count()
+ local s = getbox('ltj@afbox')
+ if s then
+ local sd = to_direct(s)
+ local box_dir = get_box_dir(sd, dir_yoko)
+ if box_dir%dir_math_mod ~= list_dir then
+ setbox(
+ 'ltj@afbox',
+ to_node(
+ copy_list(make_dir_whatsit(sd, sd, list_dir, 'box_move'))
+ -- without copy_list, we get a segfault
+ )
+ )
+ end
+ end
+ stop_time_measure('box_primitive_hook')
+ end
end
-- 縦書き用字形への変換テーブル
-- adjust and insertion
local id_adjust = node.id('adjust')
function luatexja.direction.check_adjust_direction()
- local list_dir = tex_getcount('ltj@adjdir@count')
- local a = tex.nest[tex.nest.ptr].tail
+ 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)
Dnode.last_node()
end
end
+ stop_time_measure('box_primitive_hook')
+end
+
+-- vsplit
+do
+ local split_dir_whatsit
+ local function dir_adjust_vpack(h, gc)
+ start_time_measure('direction_vpack')
+ local hd = to_direct(h)
+ if gc=='split_keep' then
+ -- supply dir_whatsit
+ 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
+ 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)
+ end
+ split_dir_whatsit=nil
+ elseif gc=='preamble' then
+ split_dir_whatsit=nil
+ else
+ adjust_badness(hd)
+ hd = process_dir_node(create_dir_whatsit_vbox(hd, gc), gc)
+ split_dir_whatsit=nil
+ end
+ stop_time_measure('direction_vpack')
+ return to_node(hd)
+ end
+ luatexbase.add_to_callback('vpack_filter',
+ dir_adjust_vpack,
+ 'ltj.direction', 10000)
+end
+
+do
+ -- supply direction whatsit to the main vertical list "of the next page"
+ local function dir_adjust_pre_output(h, gc)
+ return to_node(create_dir_whatsit_vbox(to_direct(h), gc))
+ end
+ luatexbase.add_to_callback('pre_output_filter',
+ dir_adjust_pre_output,
+ 'ltj.direction', 10000)
+
+ function luatexja.direction.remove_end_whatsit()
+ local h=tex.lists.page_head
+ if (not h.next) and
+ h.id==id_whatsit and h.subtype==sid_user and
+ h.user_id == DIR then
+ tex.lists.page_head = nil
+ node.free(h)
+ end
+ end
+end
+
+--
+do
+ 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,
+ node_tail(head),
+ get_dir_count(),
+ 'buildpage')
+ tex.lists.contrib_head = to_node(head)
+ end
+ end
+ end
+ luatexbase.add_to_callback('buildpage_filter',
+ dir_adjust_buildpage,
+ 'ltj.direction', 10000)
end
OSDN Git Service
