Fix ticket #36913

[luatex-ja/luatexja.git] / src / ltj-direction.lua

diff --git a/src/ltj-direction.lua b/src/ltj-direction.lua
index e22298b..5228662 100644 (file)
--- a/src/ltj-direction.lua
+++ b/src/ltj-direction.lua
@@ -106,14 +106,14 @@ do
       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
@@ -266,15 +266,22 @@ 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))
@@ -490,7 +497,7 @@ 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')
@@ -694,6 +701,7 @@ do
 
    -- 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
@@ -701,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)
@@ -935,6 +951,9 @@ do
       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
@@ -956,7 +975,25 @@ 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)
@@ -965,10 +1002,10 @@ do
         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'