Merge branch 'vert_vrt2' into kitagawa_test

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

diff --git a/src/ltj-direction.lua b/src/ltj-direction.lua
index 359442f..9d650f2 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')
@@ -523,7 +530,7 @@ do
       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(
@@ -703,7 +710,7 @@ do
         local bid = getid(b)
         if bid==id_hlist or bid==id_vlist then
             local p = getlist(b)
-           -- alignment 由来
+           -- 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
@@ -944,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
@@ -995,6 +1005,7 @@ do
         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'
@@ -1148,7 +1159,6 @@ do
       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