X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fltj-direction.lua;h=f26d9c562574ad0d12ee892744f8448bc6a1fc66;hb=cab73095d7d9dd76c9973688474da279a9311d63;hp=040ce926b6bcdeb26800112163ff6b270523114e;hpb=4ddd887dccbc5598e2340b023576f474c2887398;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-direction.lua b/src/ltj-direction.lua
index 040ce92..f26d9c5 100644
--- a/src/ltj-direction.lua
+++ b/src/ltj-direction.lua
@@ -4,35 +4,33 @@
 
 luatexja.load_module('base');      local ltjb = luatexja.base
 luatexja.load_module('stack');     local ltjs = luatexja.stack
-luatexja.load_module('rmlgbm');    local ltjr = luatexja.rmlgbm
 luatexja.direction = {}
 
 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 to_direct = (Dnode ~= node) and Dnode.todirect or nullfunc
-local has_attr = Dnode.has_attribute
-local set_attr = Dnode.set_attribute
-local insert_before = Dnode.insert_before
-local insert_after = Dnode.insert_after
-local getid = (Dnode ~= node) and Dnode.getid or function(n) return n.id end
-local getsubtype = (Dnode ~= node) and Dnode.getsubtype or function(n) return n.subtype end
-local getlist = (Dnode ~= node) and Dnode.getlist or function(n) return n.head end
-local setfield = (Dnode ~= node) and Dnode.setfield or function(n, i, c) n[i] = c end
-local getfield = (Dnode ~= node) and Dnode.getfield or function(n, i) return n[i] end
-local node_new = Dnode.new
-local node_tail = Dnode.tail
-local node_free = Dnode.free
-local node_remove = Dnode.remove
-local node_next = (Dnode ~= node) and Dnode.getnext or node.next
-local traverse = Dnode.traverse
-local traverse_id = Dnode.traverse_id
-local start_time_measure, stop_time_measure 
+local to_node = node.direct.tonode
+local to_direct = node.direct.todirect
+local has_attr = node.direct.has_attribute
+local set_attr = node.direct.set_attribute
+local insert_before = node.direct.insert_before
+local insert_after = node.direct.insert_after
+local getid = node.direct.getid
+local getsubtype = node.direct.getsubtype
+local getlist = node.direct.getlist
+local setfield = node.direct.setfield
+local getfield = node.direct.getfield
+local node_new = node.direct.new
+local node_tail = node.direct.tail
+local node_free = node.direct.free
+local node_remove = node.direct.remove
+local node_next = node.direct.getnext
+local traverse = node.direct.traverse
+local traverse_id = node.direct.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')
@@ -45,20 +43,39 @@ local sid_user = node.subtype('user_defined')
 
 local tex_nest = tex.nest
 local tex_getcount = tex.getcount
-local tex_set_attr = tex.setattribute
+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 STCK = luatexja.userid_table.STCK
 local DIR  = luatexja.userid_table.DIR
 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 function get_attr_icflag(p)
+   return (has_attr(p, attr_icflag) or 0) % PROCESSED_BEGIN_FLAG
+end
 
 local page_direction
 --
+local dir_pool
+do
+   local node_copy = node.direct.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
@@ -78,8 +95,8 @@ 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) 
+	       local ic = node.has_attribute(h, attr_icflag) or 0
+	       return (ic<PROCESSED_BEGIN_FLAG)
 		  and (node.has_attribute(h,attr_dir)%dir_node_auto) or 0
 	 else
 	    return 0
@@ -89,17 +106,15 @@ do
       end
    end
    function get_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
+       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
-   local abs = math.abs
    function get_adjust_dir_count()
       for i=tex_nest.ptr, 1, -1 do
          local v = tex_nest[i]
@@ -116,14 +131,72 @@ do
 end
 
 
--- \tate, \yoko
+-- \tate, \yoko，\dtou, \utod
 do
    local node_next = node.next
    local node_set_attr = node.set_attribute
+   local node_traverse = node.traverse
+   local STCK = luatexja.userid_table.STCK
+   local IHB = luatexja.userid_table.IHB
+   local id_local = node.id('local_par')
+
+   local function test_list(h, lv)
+      if not h then
+	 return 2 -- need to create dir_whatsit
+      else
+	 local flag = 2 -- need to create dir_whatsit
+	 local w
+	 for p in node_traverse(h) do
+	    if p.id==id_whatsit 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
+	       end
+	    elseif p.id~=id_local then
+	       flag = 0; break
+	    end
+	 end
+	 if flag==1 then -- dir_whatsit already exists
+	    return 1,w
+	 else
+	    return flag
+	 end
+      end
+   end
+   local node_next_node, node_tail_node = node.next, node.tail
+   local insert_after_node = node.insert_after
+   function luatexja.direction.set_list_direction_hook(v)
+      local lv = tex_nest.ptr -- must be >= 1
+      if not v then
+         v = get_dir_count()
+	 if abs(tex_nest[lv].mode) == ltjs.mmode and v == dir_tate then
+	    v = dir_utod
+	 end
+      elseif v=='adj' then
+         v = get_adjust_dir_count()
+      end
+      local h = tex_nest[lv].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)
+      ensure_tex_attr(attr_icflag, 0)
+      ensure_tex_attr(attr_dir, 0)
+   end
+
    local function set_list_direction(v, name)
-      local lv, w = tex_nest.ptr, tex.lists.page_head
-      if not v then 
-         v,name  = get_dir_count(), nil 
+      local lv = tex_nest.ptr
+      if not v then
+         v,name  = get_dir_count(), nil
+	 if abs(tex_nest[lv].mode) == ltjs.mmode and v == dir_tate then
+	    v = dir_utod
+	 end
       elseif v=='adj' then
          v,name = get_adjust_dir_count(), nil
       end
@@ -134,97 +207,103 @@ do
 		 "To change direction in an align, \n"
 		    .. "you shold use \\hbox or \\vbox.")
       else
-	 local w = (lv==0) and tex.lists.page_head or tex_nest[lv].head.next
-	 if w then
-	    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
+ 	 local h = (lv==0) and tex.lists.page_head or tex_nest[lv].head.next
+	 local flag,w = test_list(h,lv)
+	 if flag==0 then
+	    if 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', nil)
-	    setfield(w, 'user_id', DIR)
-	    setfield(w, 'type', 110)
-	    set_attr(w, attr_dir, v)
-	    Dnode.write(w)
+	 elseif flag==1 then
+	    node_set_attr(w, attr_dir, v)
 	    if lv==0 then page_direction = v end
+	 elseif lv==0 then
+	    page_direction = v
+	 else -- flag == 2: need to create dir whatsit.
+	    local h = tex_nest[lv].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)
 	 end
-         tex_set_attr('global', attr_icflag, 0)
+         ensure_tex_attr(attr_icflag, 0)
       end
-      tex_set_attr('global', attr_dir, 0)
+      ensure_tex_attr(attr_dir, 0)
    end
    luatexja.direction.set_list_direction = set_list_direction
 end
 
 -- ボックスに dir whatsit を追加
 local function create_dir_whatsit(hd, gc, new_dir)
-   if getid(hd)==id_whatsit and 
+   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)
+      set_attr(hd, attr_icflag,
+	       get_attr_icflag(hd) + PROCESSED_BEGIN_FLAG)
+      local n =node_next(hd)
+      if n then
+	 set_attr(n, attr_icflag,
+		  get_attr_icflag(n) + PROCESSED_BEGIN_FLAG)
+      end
+      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, 
-	       (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)
+      set_attr(hd, attr_icflag,
+	       get_attr_icflag(hd) + PROCESSED_BEGIN_FLAG)
+      ensure_tex_attr(attr_icflag, 0)
+      ensure_tex_attr(attr_dir, 0)
       return w
    end
 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)
-	    tex_set_attr('global', attr_icflag, 0)
+	    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))
       end
    end
 
-   luatexbase.add_to_callback('hpack_filter', 
+   ltjb.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')
+      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
-      tex_set_attr('global', attr_dir, 0)
-      return h 
+      ensure_tex_attr(attr_dir, 0)
+      return h
    end
-   luatexbase.add_to_callback('post_linebreak_filter', 
+   ltjb.add_to_callback('post_linebreak_filter',
 			      create_dir_whatsit_parbox, 'ltj.create_dir_whatsit', 10000)
 end
 
@@ -247,13 +326,13 @@ 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 
+      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
+      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)
+	    ensure_tex_attr(attr_icflag, 0)
 	 end
 	 return hd
       else
@@ -274,36 +353,36 @@ 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_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_node_aux = {
-      [dir_yoko] = { -- yoko を 
+      [dir_yoko] = { -- yoko を
 	 [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', function(w,h,d,nw,nh,nd) return -nd end },
+	       { 'box' , get_h},
+	       { 'kern', function(w,h,d,nw,nh,nd) return nd-w end },
 	       { 'whatsit', sid_restore },
 	    },
 	    [id_vlist] = {
 	       { 'whatsit', sid_save },
 	       { 'rotate', '0 1 -1 0' },
 	       { 'kern' , zero },
-	       { 'box' , get_w_neg },
+	       { 'box' , function(w,h,d,nw,nh,nd) return -nh-nd end },
 	       { 'kern', get_h_d_neg},
 	       { 'whatsit', sid_restore },
 	    },
@@ -315,8 +394,9 @@ do
 	    [id_hlist] = {
 	       { 'whatsit', sid_save },
 	       { 'rotate', '0 -1 1 0' },
-	       { 'kern', get_w_neg },
+	       { 'kern', function(w,h,d,nw,nh,nd) return -nh end },
 	       { 'box', get_d_neg },
+	       { 'kern', function(w,h,d,nw,nh,nd) return nh-w end },
 	       { 'whatsit', sid_restore },
 	    },
 	    [id_vlist] = {
@@ -336,8 +416,9 @@ do
 	    [id_hlist] = {
 	       { 'whatsit', sid_save },
 	       { 'rotate', '0 -1 1 0' },
-	       { 'kern', get_w_neg },
+	       { 'kern', function (w,h,d,nw,nh,nd) return -nh end },
 	       { 'box' , get_d_neg },
+	       { 'kern', function (w,h,d,nw,nh,nd) return nh-w end },
 	       { 'whatsit', sid_restore },
 	    },
 	    [id_vlist] = {
@@ -356,7 +437,7 @@ do
 	       { 'whatsit', sid_save },
 	       { 'rotate', '-1 0 0 -1' },
 	       { 'kern', get_w_neg },
-	       { 'box', zero },
+	       { 'box',  function (w,h,d,nw,nh,nd) return h-nd end },
 	       { 'whatsit', sid_restore },
 	    },
 	    [id_vlist] = {
@@ -371,21 +452,21 @@ do
       [dir_dtou] = { -- dtou を
 	 [dir_yoko] = { -- yoko 中で組む
 	    width  = get_h_d,
-	    height = get_w, 
+	    height = get_w,
 	    depth  = zero,
 	    [id_hlist] = {
 	       { 'whatsit', sid_save },
 	       { 'rotate', '0 1 -1 0' },
-	       { 'kern', zero },
+	       { 'kern', function (w,h,d,nw,nh,nd) return -nd end },
 	       { 'box', get_h },
-	       { 'kern', get_w_neg },
+	       { 'kern', function (w,h,d,nw,nh,nd) return nd-w end },
 	       { 'whatsit', sid_restore },
 	    },
 	    [id_vlist] = {
                { 'kern', zero },
 	       { 'whatsit', sid_save },
 	       { 'rotate', '0 1 -1 0' },
-	       { 'box', get_w_neg },
+	       { 'box', function (w,h,d,nw,nh,nd) return -nd-nh end },
 	       { 'kern', get_h_d_neg },
 	       { 'whatsit', sid_restore },
 	    },
@@ -398,14 +479,15 @@ do
 	       { 'whatsit', sid_save },
 	       { 'rotate', '-1 0 0 -1' },
 	       { 'kern', get_w_neg },
-	       { 'box', zero },
+	       { 'box', function (w,h,d,nw,nh,nd) return h-nd end },
 	       { 'whatsit', sid_restore },
 	    },
 	    [id_vlist] = {
 	       { 'whatsit', sid_save },
 	       { 'rotate', ' -1 0 0 -1' },
-	       { 'kern', get_h_d_neg }, 
+	       { 'kern', function (w,h,d,nw,nh,nd) return -nh-nd end },
 	       { 'box', get_w_neg },
+	       { 'kern', function (w,h,d,nw,nh,nd) return nh+nd-h-d end },
 	       { 'whatsit', sid_restore },
 	    },
 	 },
@@ -415,99 +497,122 @@ end
 
 -- 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') 
+   local bh = getfield(b,'head')
    -- b は insert node となりうるので getlist() は使えない
    local c
-   for i=1,2 do
-      if bh and getid(bh)==id_whatsit
-      and getsubtype(bh)==sid_user and getfield(bh, 'user_id')==DIR then
-	 c = bh
-	 dir = (dir==0) and has_attr(bh, attr_dir) or dir
+   if bh~=0 then -- bh != nil
+      for bh in traverse_id(id_whatsit, bh) do
+         if getsubtype(bh)==sid_user and getfield(bh, 'user_id')==DIR then
+            c = bh
+           dir = (dir==0) and has_attr(bh, attr_dir) or dir
+         end
       end
-      bh = node_next(bh)
    end
+   -- for i=1,2 do
+   --    if bh and getid(bh)==id_whatsit
+   --    and getsubtype(bh)==sid_user and getfield(bh, 'user_id')==DIR then
+   -- 	 c = bh
+   -- 	 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
 
 do
    local getbox = tex.getbox
-   local function check_dir(reg_num)
+   local dir_backup
+   function luatexja.direction.unbox_check_dir(is_copy)
       start_time_measure('box_primitive_hook')
-      local list_dir = get_dir_count()
-      local b = tex.getbox(tex_getcount('ltj@tempcnta'))
-      if b then
+      local list_dir = get_dir_count()%dir_math_mod
+      local b = getbox(tex_getcount('ltj@tempcnta'))
+      if b and getlist(to_direct(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('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)
+	 if box_dir%dir_math_mod ~= list_dir then
 	    ltjb.package_error(
 	       'luatexja',
 	       "Incompatible direction list can't be unboxed",
 	       'I refuse to unbox a box in differrent direction.')
+            tex.sprint(cat_lp, '\\@gobbletwo')
+	 else
+	    dir_backup = nil
+	    local bd = to_direct(b)
+	    local hd = getlist(bd)
+	    local nh = hd
+	    while hd do
+	       if getid(hd)==id_whatsit and getsubtype(hd)==sid_user
+		  and getfield(hd, 'user_id')==DIR then
+		     local d = hd
+		     nh, hd = node_remove(nh, hd)
+		     if is_copy and (not dir_backup) then
+			dir_backup = d
+			setfield(dir_backup, 'next', nil)
+		     else
+			node_free(d)
+		     end
+	       else
+		  hd = node_next(hd)
+	       end
+	    end
+	    setfield(bd, 'head', nh)
 	 end
       end
-      tex.globaldefs = luatexja.global_temp
+      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
+   function luatexja.direction.uncopy_restore_whatsit()
+      local b = getbox(tex_getcount('ltj@tempcnta'))
+      if b then
+	 local bd = to_direct(b)
+	 if dir_backup then
+	    setfield(dir_backup, 'next', getlist(bd))
+	    setfield(bd, 'head', dir_backup)
+	    dir_backup = nil
+	 end
+      end
+   end
 end
 
 -- dir_node に包まれている「本来の中身」を取り出し，
 -- dir_node を全部消去
 local function unwrap_dir_node(b, head, box_dir)
-   -- b: dir_node, head: the head of list, box_dir: 
+   -- b: dir_node, head: the head of list, box_dir:
    -- return values are (new head), (next of b), (contents), (dir of contents)
    local bh = getlist(b)
-   local bc = node_next(node_next(node_next(bh)))
    local nh, nb
-   node_remove(bh, bc); 
-   Dnode.flush_list(bh)
    if head then
-      nh = insert_before(head, b, bc)
+      nh = insert_before(head, b, bh)
       nh, nb = node_remove(nh, b)
       setfield(b, 'next', nil)
-      setfield(b, 'head', nil)
       node_free(b)
    end
-   local shift_old, b_dir, wh = nil, get_box_dir(bc, 0)
+   local shift_old, b_dir, wh = nil, get_box_dir(bh, 0)
    if wh then
-      Dnode.flush_list(getfield(wh, 'value'))
+      node.direct.flush_list(getfield(wh, 'value'))
       setfield(wh, 'value', nil)
    end
-   -- recalc. info
-   local info = dir_node_aux[b_dir][box_dir%dir_node_auto][getid(bc)]
-   for _,v in ipairs(info) do 
-      if v[1]=='box' then
-	 shift_old = v[2](
-	    getfield(bc,'width'), getfield(bc, 'height'), getfield(bc, 'depth'))
-	 break
-      end
-   end
-   setfield(bc, 'shift', getfield(bc, 'shift') - shift_old)
-   return nh, nb, bc, b_dir
+   return nh, nb, bh, b_dir
 end
 
 -- 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 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)) -- dir_node
-   set_attr(db, attr_dir, 
+   set_attr(db, attr_dir,
 	    new_dir + (is_manual and dir_node_manual or dir_node_auto))
    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)
+   ensure_tex_attr(attr_dir, 0)
+   ensure_tex_attr(attr_icflag, 0)
    setfield(db, 'dir', getfield(b, 'dir'))
    setfield(db, 'shift', 0)
    setfield(db, 'width',  info.width(w,h,d))
@@ -520,6 +625,7 @@ end
 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)
@@ -528,71 +634,54 @@ do
       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
-	    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 _, dnc = get_box_dir(b, 0)
+	    if dnc then -- free all other dir_node
+	       node.direct.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
-	 --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
+	    if b_dir%dir_math_mod==new_dir then
 	       -- dir_node の中身が周囲の組方向とあっている
-	       return head, nb, b, false 
+	       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
-	       setfield(db, 'head', db_head)
-	       ret, flag = db, true
+	 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
+	 node.direct.flush_list(getfield(dn, 'value'))
+	 setfield(dn, 'value', nil)
+	 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')
+	 local dn_w = getfield(db, 'width')
+	 local dn_h = getfield(db, 'height')
+	 local dn_d = getfield(db, 'depth')
+	 nh, nb =  insert_before(head, b, db), nil
+	 nh, nb = node_remove(nh, b)
+         setfield(b, 'next', nil); setfield(db, 'head', b)
+         ret, flag = db, true
 	 return nh, nb, ret, flag
       end
    end
@@ -600,7 +689,7 @@ do
       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) 
+	 if (xid==id_hlist and get_attr_icflag(x)~=PACKED)
 	 or xid==id_vlist then
 	    hd, x = make_dir_whatsit(hd, x, new_dir, 'process_dir_node:' .. gc)
 	 else
@@ -611,7 +700,8 @@ do
    end
 
    -- lastbox
-   local node_prev = (Dnode~=node) and Dnode.getprev or node.prev
+   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
@@ -619,6 +709,14 @@ do
 	 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)
@@ -629,7 +727,7 @@ do
 	    end
 	    local _, wh =  get_box_dir(b, 0) -- clean dir_node attached to the box
 	    if wh then
-	       Dnode.flush_list(getfield('value', wh))
+	       node.direct.flush_list(getfield('value', wh))
 	       setfield(wh, 'value', nil)
 	    end
 	 end
@@ -645,7 +743,9 @@ end
 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
@@ -658,7 +758,7 @@ do
             local w = getfield(s, 'width')
             local h = getfield(s, 'height')
             local d = getfield(s, 'depth')
-            setdimen('ltj@tempdima', 
+            setdimen('ltj@tempdima',
                          dir_node_aux[s_dir][l_dir][key](w,h,d))
          end
       else
@@ -669,27 +769,30 @@ 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 = 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, 
-			       node_next(node_next(node_next(getlist(s)))), l_dir)
+            get_box_dim_common(key, getlist(s), l_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 = token.scan_dimen, token.scan_int
+   local scan_keyword = 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
       if s_dir ~= l_dir then
          if not wh then
             wh = create_dir_whatsit(getlist(s), 'set_box_dim', s_dir)
@@ -707,13 +810,13 @@ do
             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 
+	       local bw, bh, bd
 		  = getfield(s,'width'), getfield(s, 'height'), getfield(s, 'depth')
 	    for x in traverse(getfield(wh, 'value')) do
 	       local x_dir = has_attr(x, attr_dir)
@@ -729,46 +832,27 @@ do
       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()
+	 local l_dir = (get_dir_count())%dir_math_mod
 	 s = to_direct(s)
          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'))
+	    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
          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,dir_yoko)][b_dir%dir_node_auto]
-	    local shift_old
-	    for _,v in ipairs(info[sid]) do 
-	       if v[1]=='box' then
-		  shift_old = v[2](
-		     getfield(b,'width'), getfield(b, 'height'), getfield(b, 'depth'))
-		  break
-	       end
-	    end
-           if set_box_dim_common(key, b, l_dir) then
-	       local bw, bh, bd 
-		  = getfield(b,'width'), getfield(b, 'height'), getfield(b, 'depth')
-	       -- re-calculate shift
-	       for i,v in ipairs(info[sid]) do 
-		  if getid(sl)==id_kern then
-		     setfield(sl, 'kern', v[2](bw,bh,bd) )
-		  elseif getid(sl)==sid then
-		     local d = getfield(sl, 'shift')
-		     setfield(sl, 'shift', 
-			      getfield(sl, 'shift') - shift_old + v[2](bw,bh,bd) )
-		  end
-		  sl = node_next(sl)
-	       end
+	    local sid, b = getid(s), getlist(s)
+	    local info = dir_node_aux[get_box_dir(b,dir_yoko)%dir_math_mod][b_dir%dir_node_auto]
+	    local bw, bh, bd
+	       = getfield(b,'width'), getfield(b, 'height'), getfield(b, 'depth')
+	    local sw, sh, sd
+	       = getfield(s,'width'), getfield(s, 'height'), getfield(s, 'depth')
+	    if set_box_dim_common(key, b, l_dir) and b_dir<dir_node_manual then
 	       -- re-calculate dimension of s, if s is created "automatically"
 	       if b_dir<dir_node_manual then
 		  setfield(s, 'width',  info.width(bw,bh,bd))
@@ -803,61 +887,26 @@ do
    luatexja.direction.get_register_dir = get_register_dir
 end
 
--- 縦書き用字形への変換テーブル
-local font_vert_table = {} -- key: fontnumber
 do
-   local font_vert_basename = {} -- key: basename
-   local function add_feature_table(tname, src, dest)
-      for i,v in pairs(src) do
-	 if type(v.slookups)=='table' then
-	    local s = v.slookups[tname]
-	    if s and not dest[i] then
-	       dest[i] = s
-	    end
-	 end
-      end
-   end
-
-   local function prepare_vert_data(n, id)
-      -- test if already loaded
-      if type(id)=='number' then -- sometimes id is an integer
-         font_vert_table[n] = font_vert_table[id]; return
-      elseif (not id) or font_vert_table[n]  then return
-      end
-      local fname = id.filename
-      local bname = file.basename(fname)
-      if not fname then
-         font_vert_table[n] = {}; return
-      elseif font_vert_basename[bname] then
-         font_vert_table[n] = font_vert_basename[bname]; return
-      end
-      local vtable = {}
-      local a = id.resources.sequences
-      if a then
-	 local s = id.shared.rawdata.descriptions
-	 for i,v in pairs(a) do
-	    if v.features.vert or v.features.vrt2 then
-	       add_feature_table(v.subtables[1], s, vtable)
-	    end
+   local getbox, setbox, copy_list = tex.getbox, tex.setbox, node.direct.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')))
+	       -- copy_list しないとリストの整合性が崩れる……？
+	    )
 	 end
       end
-      font_vert_basename[bname] = vtable
-      font_vert_table[n] = vtable
-   end
-   -- 縦書き用字形への変換
-   function luatexja.direction.get_vert_glyph(n, chr)
-      local fn = font_vert_table[n]
-      return fn and fn[chr] or chr
+      stop_time_measure('box_primitive_hook')
    end
-   luatexbase.add_to_callback('luatexja.define_font',
-			      function (res, name, size, id)
-				 prepare_vert_data(id, res)
-			      end,
-			      'prepare_vert_data', 1)
-
-   local function a (n, dat) font_vert_table[n] = dat end
-   luatexja.rmlgbm.vert_addfunc = a
-
 end
 
 -- PACKED の hbox から文字を取り出す
@@ -865,35 +914,86 @@ end
 do
    local function glyph_from_packed(h)
       local b = getlist(h)
-      return (getid(b)==id_kern) 
-	 and node_next(node_next(node_next(node_next(b)))) or b
+      return (getid(b)==id_kern or (getid(b)==id_whatsit and getsubtype(b)==sid_save) )
+	 and node_next(node_next(node_next(b))) or b
    end
    luatexja.direction.glyph_from_packed = glyph_from_packed
 end
 
--- adjust and insertion
-local id_adjust = node.id('adjust')
-function luatexja.direction.check_adjust_direction()
-   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)
-      if list_dir~=adj_dir then
-         ltjb.package_error(
-                 'luatexja',
-                 'Direction Incompatible',
-                 "\\vadjust's argument and outer vlist must have same direction.")
-         Dnode.last_node()
+-- adjust
+do
+   local id_adjust = node.id('adjust')
+   function luatexja.direction.check_adjust_direction()
+      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)
+	 if list_dir~=adj_dir then
+	    ltjb.package_error(
+	       'luatexja',
+	       'Direction Incompatible',
+	       "\\vadjust's argument and outer vlist must have same direction.")
+	    node.direct.last_node()
+	 end
+      end
+      stop_time_measure('box_primitive_hook')
+   end
+end
+
+-- insert
+do
+   local id_ins = node.id('ins')
+   local id_rule = node.id('rule')
+   function luatexja.direction.populate_insertion_dir_whatsit()
+      start_time_measure('box_primitive_hook')
+      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
+	    getsubtype(h)==sid_user and getfield(h, 'user_id')==DIR then
+	       local n = h; h = node_remove(h,h)
+	       node_free(n)
+	 end
+	 for box_rule in traverse(h) do
+	    if getid(box_rule)<id_rule then
+	       h = insert_before(h, box_rule, dir_pool[list_dir]())
+	    end
+	 end
+	 ensure_tex_attr(attr_dir, 0)
+	 setfield(ad, 'head', h)
+      end
+      stop_time_measure('box_primitive_hook')
    end
-   stop_time_measure('box_primitive_hook')
 end
 
 -- 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)
@@ -902,13 +1002,10 @@ do
 	 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)
+	 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'
@@ -919,13 +1016,15 @@ do
 	 split_dir_whatsit=nil
       else
 	 adjust_badness(hd)
-	 hd = process_dir_node(create_dir_whatsit_vbox(hd, gc), gc)
+	 -- hd = process_dir_node(create_dir_whatsit_vbox(hd, gc), gc)
+	 -- done in append_to_vpack callback
+	 hd = create_dir_whatsit_vbox(hd, gc)
 	 split_dir_whatsit=nil
       end
       stop_time_measure('direction_vpack')
       return to_node(hd)
    end
-   luatexbase.add_to_callback('vpack_filter',
+   ltjb.add_to_callback('vpack_filter',
 			      dir_adjust_vpack,
 			      'ltj.direction', 10000)
 end
@@ -935,13 +1034,13 @@ do
    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',
+   ltjb.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
+      if h and (not h.next) and
 	 h.id==id_whatsit and h.subtype==sid_user and
          h.user_id == DIR then
 	    tex.lists.page_head = nil
@@ -950,23 +1049,121 @@ do
    end
 end
 
--- 
+-- append_to_vlist filter
 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)
+   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
+
+-- finalize (executed just before \shipout)
+-- we supply correct pdfsavematrix nodes etc. inside dir_node
+do
+   local finalize_inner
+   local function finalize_dir_node(db,new_dir)
+      local b = getlist(db)
+      finalize_inner(b)
+      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
+      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, 1)
+            setfield(nn, 'kern', arg(w, h, d, dn_w, dn_h, dn_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', arg(w, h, d, dn_w, dn_h, dn_d))
+         end
+         if db_head then
+            insert_after(db_head, db_tail, nn)
+            db_tail = nn
+         else
+            setfield(db, 'head', nn)
+	    db_head, db_tail = nn, nn
+         end
+      end
+   end
+
+   tex.setattribute(attr_dir, dir_yoko)
+   local shipout_temp =  node_new(id_hlist)
+   tex.setattribute(attr_dir, 0)
+
+   finalize_inner = function (box)
+      for n in traverse(getlist(box)) do
+         local nid = getid(n)
+         if (nid==id_hlist or nid==id_vlist) then
+            local ndir = get_box_dir(n, dir_yoko)
+            if ndir>=dir_node_auto then -- n is dir_node
+               finalize_dir_node(n, ndir%dir_math_mod)
+            else
+               finalize_inner(n)
+            end
+	 end
+      end
+   end
+   local getbox = tex.getbox
+   local setbox, copy = node.direct.setbox, node.direct.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)
+      if a_dir~=dir_yoko then
+         local b = create_dir_node(a, a_dir, dir_yoko, false)
+         setfield(b, 'head', a); a = b
+      end
+      setfield(shipout_temp, 'head', a)
+      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
+      --   collectgarbage(); lua_mem_kb = collectgarbage('count')
+      --end
+      --print('Lua Memory Usage', lua_mem_kb)
    end
-   luatexbase.add_to_callback('buildpage_filter',
-			      dir_adjust_buildpage,
-			      'ltj.direction', 10000)
 end