X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-direction.lua;h=133e3e87e59afafa93daa9f4325e03d1499cabbc;hb=87c0b418e8b10f5c13049bf4b3402725e02ecf6a;hp=f26d9c562574ad0d12ee892744f8448bc6a1fc66;hpb=cab73095d7d9dd76c9973688474da279a9311d63;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-direction.lua b/src/ltj-direction.lua
index f26d9c5..133e3e8 100644
--- a/src/ltj-direction.lua
+++ b/src/ltj-direction.lua
@@ -174,7 +174,7 @@ do
       local lv = tex_nest.ptr -- must be >= 1
       if not v then
          v = get_dir_count()
-	 if abs(tex_nest[lv].mode) == ltjs.mmode and v == dir_tate then
+	 if abs(tex_nest[lv-1].mode) == ltjs.mmode and v == dir_tate then
 	    v = dir_utod
 	 end
       elseif v=='adj' then
@@ -194,20 +194,27 @@ do
       local lv = tex_nest.ptr
       if not v then
          v,name  = get_dir_count(), nil
-	 if abs(tex_nest[lv].mode) == ltjs.mmode and v == dir_tate then
+	 if lv>=1 and abs(tex_nest[lv-1].mode) == ltjs.mmode and v == dir_tate then
 	    v = dir_utod
 	 end
       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