OSDN Git Service

Revert "fix #37467 (Is it safe to write a whatsit in math mode?)"
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Tue, 29 Aug 2017 00:10:05 +0000 (09:10 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Tue, 29 Aug 2017 00:10:05 +0000 (09:10 +0900)
This reverts commit cab73095d7d9dd76c9973688474da279a9311d63.

Note that there is no need to revert commit b187d6f9

src/ltj-direction.lua
src/luatexja-core.sty

index f26d9c5..9d650f2 100644 (file)
@@ -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,7 +194,7 @@ 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
index 6a4a230..3ea21ca 100644 (file)
   }
   \PushPreHook{hbox}{\luafunction\ltj@@box@dirhook\aftergroup\ltj@@reset@badness}
   \PushPreHook{vbox}{\luafunction\ltj@@box@dirhook\aftergroup\ltj@@reset@badness}
-  \PushPreHook{math}{\luafunction\ltj@@box@dirhook}
-  \PushPreHook{display}{\luafunction\ltj@@box@dirhook}
 \else
   \let\ltj@@everyhbox=\everyhbox\let\ltj@@everyvbox=\everyvbox
   \newtoks\ltj@@i@everyhbox\newtoks\ltj@@i@everyvbox
     \aftergroup\ltj@@reset@badness\the\ltj@@i@everyhbox}
   \ltj@@everyvbox{\luafunction\ltj@@box@dirhook
     \aftergroup\ltj@@reset@badness\the\ltj@@i@everyvbox}
-  %% math
-  \ifltj@in@latex
-    \frozen@everymath{\luafunction\ltj@@box@dirhook\check@mathfonts\the\everymath}
-  \else
-    \let\ltj@@everymath=\everymath\newtoks\ltj@@i@everymath\let\everymath=\ltj@@i@everymath
-    \ltj@@everymath{\luafunction\ltj@@box@dirhook\the\ltj@@i@everymath}
-  \fi
-  %% display
-  \ifltj@in@latex
-    \frozen@everydisplay{\luafunction\ltj@@box@dirhook\check@mathfonts\the\everydisplay}
-  \else
-    \let\ltj@@everydisplay=\everydisplay\newtoks\ltj@@i@everydisplay\let\everydisplay=\ltj@@i@everydisplay
-    \ltj@@everydisplay{\luafunction\ltj@@box@dirhook\the\ltj@@i@everydisplay}
-  \fi
 \fi
 
 \newluafunction\ltj@@reset@badness@inner