Babel 3.44 inserts \textdir

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

diff --git a/src/ltj-direction.lua b/src/ltj-direction.lua
index 133e3e8..7dd0dee 100644 (file)
--- a/src/ltj-direction.lua
+++ b/src/ltj-direction.lua
@@ -139,6 +139,7 @@ do
    local STCK = luatexja.userid_table.STCK
    local IHB = luatexja.userid_table.IHB
    local id_local = node.id('local_par')
+   local id_dir = node.id('dir')
 
    local function test_list(h, lv)
       if not h then
@@ -157,7 +158,7 @@ do
                     flag = 0; break -- error
                  end
               end
-           elseif p.id~=id_local then
+           elseif p.id~=id_local and p.id~=id_dir then
               flag = 0; break
            end
         end
@@ -220,6 +221,9 @@ do
            if lv==0 and not page_direction then
               page_direction = v -- for first call of \yoko (in luatexja-core.sty)
            else
+              if luatexja.debug then
+                luatexja.ext_show_node_list(node.direct.tonode(h),'>> ', texio.write_nl)
+              end
               ltjb.package_error(
                  'luatexja',
                  "Use `\\" .. tostring(name) .. "' at top of list",
@@ -640,7 +644,10 @@ do
       local bh = getlist(b)
       local box_dir, dn =  get_box_dir(b, ltjs.list_dir)
       -- 既に b の中身にあるwhatsit
-
+      if (box_dir<dir_node_auto) and (not dn) then
+       bh = create_dir_whatsit(bh, 'make_dir_whatsit', dir_yoko)
+       dn = bh; setfield(b, 'head', bh)
+      end
       if box_dir%dir_math_mod==new_dir then
         if box_dir>=dir_node_auto then
            -- dir_node としてカプセル化されている
@@ -1010,7 +1017,7 @@ do
         split_dir_whatsit = hd
       elseif gc=='split_off'  then
         if split_dir_head then
-           list_dir = has_attr(split_dir_head, attr_dir)
+           ltjs.list_dir = has_attr(split_dir_head, attr_dir)
            hd = insert_before(hd, hd, split_dir_head)
            split_dir_head=nil
         end
@@ -1056,45 +1063,7 @@ do
    end
 end
 
--- append_to_vlist filter
-do
-   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
+-- append_to_vlist filter: done in ltj-lineskip.lua
 
 -- finalize (executed just before \shipout)
 -- we supply correct pdfsavematrix nodes etc. inside dir_node
@@ -1102,6 +1071,11 @@ do
    local finalize_inner
    local function finalize_dir_node(db,new_dir)
       local b = getlist(db)
+      if getid(b)==id_whatsit and getsubtype(b)==sid_user
+         and getfield(b, 'user_id')==DIR then
+         local ob = b; b = node_remove(b,b); setfield(db, 'head', b);
+        node_free(ob)
+      end
       finalize_inner(b)
       local w = getfield(b, 'width')
       local h = getfield(b, 'height')
@@ -1110,8 +1084,9 @@ do
       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 t = dir_node_aux[get_box_dir(b, dir_yoko)%dir_math_mod][new_dir]
+      t = t and t[getid(b)]; if not t then return end
+      for _,v in ipairs(t) do
          local cmd, arg, nn = v[1], v[2]
          if cmd=='kern' then
             nn = node_new(id_kern, 1)