new syntax in JFM: end_stretch = {-0.5, 0.5}

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

diff --git a/src/ltj-direction.lua b/src/ltj-direction.lua
index cceac7a..970a3f7 100644 (file)
--- a/src/ltj-direction.lua
+++ b/src/ltj-direction.lua
@@ -138,7 +138,6 @@ do
    local node_traverse = node.traverse
    local STCK = luatexja.userid_table.STCK
    local IHB = luatexja.userid_table.IHB
-   local sid_local = node.subtype('local_par')
    local id_local = node.id('local_par')
 
    local function test_list(h, lv)
@@ -157,8 +156,6 @@ do
                  elseif not(uid==IHB or uid==STCK) then
                     flag = 0; break -- error
                  end
-              elseif ps~=sid_local then
-                 flag = 0; break
               end
            elseif p.id~=id_local then
               flag = 0; break
@@ -171,6 +168,8 @@ do
         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
@@ -181,10 +180,12 @@ do
       elseif v=='adj' then
          v = get_adjust_dir_count()
       end
-      local h = to_direct(tex_nest[lv].head)
-      local w = dir_pool[v]()
-      insert_after(h, h, w)
-      tex_nest[lv].tail = to_node(node_tail(w))
+      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
@@ -206,7 +207,7 @@ do
                 "To change direction in an align, \n"
                    .. "you shold use \\hbox or \\vbox.")
       else
-        local h = (lv==0) and tex.lists.page_head or tex_nest[lv].head.next
+        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
@@ -221,8 +222,15 @@ do
         elseif flag==1 then
            node_set_attr(w, attr_dir, v)
            if lv==0 then page_direction = v end
-        else
-           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
          ensure_tex_attr(attr_icflag, 0)
       end
@@ -237,7 +245,7 @@ local function create_dir_whatsit(hd, gc, new_dir)
            getsubtype(hd)==sid_user and getfield(hd, 'user_id')==DIR then
       set_attr(hd, attr_icflag,
               get_attr_icflag(hd) + PROCESSED_BEGIN_FLAG)
-      local n = node_next(hd)
+      local n =node_next(hd)
       if n then
         set_attr(n, attr_icflag,
                  get_attr_icflag(n) + PROCESSED_BEGIN_FLAG)