ltj-direction.lua: make \tate etc. unusable in unrestricted horizontal mode and math...

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

diff --git a/src/ltj-direction.lua b/src/ltj-direction.lua
index 0947f34..133e3e8 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
@@ -200,14 +200,21 @@ do
       elseif v=='adj' then
          v,name = get_adjust_dir_count(), nil
       end
+      local current_nest = tex_nest[lv]
       if tex.currentgrouptype==6 then
         ltjb.package_error(
                  'luatexja',
                  "You can't use `\\" .. name .. "' in an align",
-                "To change direction in an align, \n"
-                   .. "you shold use \\hbox or \\vbox.")
+                "To change the direction in an align, \n"
+                .. "you shold use \\hbox or \\vbox.")
+      elseif current_nest.mode == ltjs.hmode or abs(current_nest.mode) == ltjs.mmode then
+        ltjb.package_error(
+                 'luatexja',
+                "Improper `\\" .. name .. "'",
+                'You cannot change the direction in unrestricted horizontal mode \n'
+                .. 'nor math modes.')
       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 current_nest.head.next
         local flag,w = test_list(h,lv)
         if flag==0 then
            if lv==0 and not page_direction then
@@ -225,12 +232,12 @@ do
         elseif lv==0 then
            page_direction = v
         else -- flag == 2: need to create dir whatsit.
-           local h = tex_nest[lv].head
+           local h = current_nest.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)
+           current_nest.tail = node_tail_node(w)
         end
          ensure_tex_attr(attr_icflag, 0)
       end
@@ -530,7 +537,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(
@@ -951,6 +958,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
@@ -1156,7 +1166,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