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 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
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
+ --luatexja.ext_show_node_list(h, 'GDR'.. i .. '> ', print)
+ if 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
+end
+
+-- \ifydir etc.
+do
+ local cs_true, cs_false = '\\iftrue', '\\iffalse'
+ luatexja.direction.dir_conditional = function(v)
+ local d = get_dir_count()
+ tex.sprint(cat_lp, (d==v) and cs_true or cs_false )
+ end
+end
+-- \tate, \yoko
+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)
- end
+ local lv, w = tex_nest.ptr, tex.lists.page_head
+ if not v then v,name = get_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)
+ luatexja.ext_show_node_list(w, 'set_dir', print)
+ 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)
else
ltjb.package_error(
'luatexja',
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)
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
-- 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 to_node(create_dir_whatsit(hd, gc, new_dir))
+ return h
end
luatexbase.add_to_callback('post_linebreak_filter',
create_dir_whatsit_parbox, 'ltj.create_dir_whatsit', 10000)
tex_set_attr('global', attr_icflag, 0)
end
return 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 hd
else
- return create_dir_whatsit(hd, gc, ltjs.list_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
end
end
}
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')
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
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
- --print('unbox', reg_num, box_dir, list_dir)
+ luatexja.ext_show_node_list(tex.nest[tex.nest.ptr].head, 'LIST> ', print)
+ luatexja.ext_show_node_list(b, 'BOX> ', print)
ltjb.package_error(
'luatexja',
"Incompatible direction list can't be unboxed",
-- is_manual: 寸法変更に伴うものか？
local function create_dir_node(b, b_dir, new_dir, is_manual)
+ --print('create new node', b_dir, new_dir)
local info = dir_node_aux[b_dir][new_dir]
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))
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
+ -- 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
set_attr(b, attr_dir, box_dir%dir_node_auto + dir_node_auto)
return head, node_next(b), b, true
else
+ --luatexja.ext_show_node_list(to_node(b), 'mkd> ', print)
+ -- 組方向を合わせる必要あり
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==new_dir then
+ -- dir_node の中身が周囲の組方向とあっている
return head, nb, b, false
else box_dir = b_dir end
end
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
+ 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)
+ 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
if s then
local l_dir = get_dir_count()
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
if s then
local l_dir = get_dir_count()
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
+ -- 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)
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 info = dir_node_aux[get_box_dir(b,dir_yoko)][b_dir%dir_node_auto]
local shift_old
for _,v in ipairs(info[sid]) do
if v[1]=='box' then
-- \ifydir, \iftdir, \ifddir
do
- local cat_lp = luatexbase.catcodetables['latex-package']
local getbox = tex.getbox
- local function dir_conditional(n, mode)
+ local function box_dir_conditional(n, mode)
local s = getbox(n)
local res = false
if s then
end
tex.sprint(cat_lp, '\\if' .. tostring(res))
end
- luatexja.direction.dir_conditional = dir_conditional
+ luatexja.direction.box_dir_conditional = box_dir_conditional
end
-- 縦書き用字形への変換テーブル
if split_dir_whatsit then
-- adjust direction of 'split_keep'
set_attr(split_dir_whatsit, attr_dir, ltjs.list_dir)
- tex_set_attr('global', attr_dir, 0)
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',
+ 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',
+ 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
