X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-direction.lua;h=97f267820aa8a58e8dc978b109eeed5c615a1352;hb=d177010c46e52e722b4752eded1ae4a6807953df;hp=61d081929de0843be8a88aff476f0bf622978306;hpb=ea7139b7a0fd8a90b0700222383ce08e78ea2927;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-direction.lua b/src/ltj-direction.lua
index 61d0819..97f2678 100644
--- 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
@@ -1002,6 +1012,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'
@@ -1099,8 +1110,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)
@@ -1155,7 +1167,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