From 88f77f07b3417cf5e16878b9b3490a1de430e6fe Mon Sep 17 00:00:00 2001
From: Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Date: Wed, 26 Nov 2014 11:29:27 +0900
Subject: [PATCH] Try to fix ticket #34641

---
 src/luatexja-core.sty | 63 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 26 deletions(-)

diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index 1d8af52..6e8ce43 100644
--- a/src/luatexja-core.sty
+++ b/src/luatexja-core.sty
@@ -70,7 +70,7 @@
 
 %% Load prerequisite packages.
 \endlinechar=13 %
-\newif\ifltj@everyhook@avail\ltj@everyhook@availfalse
+%%% \newif\ifltj@everyhook@avail\ltj@everyhook@availfalse
 %! 外部パッケージは普通の \endlinechar で読まないと危険.
 \ifltj@in@latex                 %<*LaTeX>
   \RequirePackage{luaotfload} [2013/05/10] % v2.2
@@ -78,7 +78,7 @@
   \RequirePackage{pdftexcmds} [2011/11/29] % v0.20
   \RequirePackage{xkeyval}    [2012/10/14] % v2.6b
   \RequirePackage{atbegshi}
-  \IfFileExists{everyhook.sty}{\RequirePackage{everyhook}\ltj@everyhook@availtrue}{}
+%%%  \IfFileExists{everyhook.sty}{\RequirePackage{everyhook}\ltj@everyhook@availtrue}{}
 \else                           %<*!LaTeX>
   \input luaotfload.sty
   \input ltxcmds.sty
@@ -575,30 +575,41 @@
     luatexja.stack.mmode = -tex.nest[tex.nest.ptr].mode
   }$%
 }
-\ifltj@everyhook@avail
-  \PushPreHook{hbox}{%
-    \directlua{luatexja.direction.set_list_direction_hook()}%
-    \aftergroup\ltj@@reset@badness
-  }
-  \PushPreHook{vbox}{%
-    \directlua{luatexja.direction.set_list_direction_hook()}%
-    \aftergroup\ltj@@reset@badness
-  }
-\else
-  {\catcode`\!=0\catcode`\\=12
-  !@PackageWarningNoLine{luatexja-core}{%
-  I will use \everyhbox and \everyvbox directly !MessageBreak
-  for  supporting multiple directions, !MessageBreak
-  since everyhook.sty is not available}}
-  \everyhbox{%
-    \directlua{luatexja.direction.set_list_direction_hook()}%
-    \aftergroup\ltj@@reset@badness
-  }
-  \everyvbox{%
-    \directlua{luatexja.direction.set_list_direction_hook()}%
-    \aftergroup\ltj@@reset@badness
-  }
-\fi
+% \ifltj@everyhook@avail
+%   \PushPreHook{hbox}{%
+%     \directlua{luatexja.direction.set_list_direction_hook()}%
+%     \aftergroup\ltj@@reset@badness
+%   }
+%   \PushPreHook{vbox}{%
+%     \directlua{luatexja.direction.set_list_direction_hook()}%
+%     \aftergroup\ltj@@reset@badness
+%   }
+% \else
+%   {\catcode`\!=0\catcode`\\=12
+%   !@PackageWarningNoLine{luatexja-core}{%
+%   I will use \everyhbox and \everyvbox directly !MessageBreak
+%   for  supporting multiple directions, !MessageBreak
+%   since everyhook.sty is not available}}
+%   \everyhbox{%
+%     \directlua{luatexja.direction.set_list_direction_hook()}%
+%     \aftergroup\ltj@@reset@badness
+%   }
+%   \everyvbox{%
+%     \directlua{luatexja.direction.set_list_direction_hook()}%
+%     \aftergroup\ltj@@reset@badness
+%   }
+% \fi
+
+\let\ltj@@everyhbox=\everyhbox\let\ltj@@everyvbox=\everyvbox
+\newtoks\ltj@@i@everyhbox\newtoks\ltj@@i@everyvbox
+\let\everyhbox=\ltj@@i@everyhbox\let\everyvbox=\ltj@@i@everyvbox
+\ltj@@everyhbox{%
+  \directlua{luatexja.direction.set_list_direction_hook()}%
+  \aftergroup\ltj@@reset@badness\the\ltj@@i@everyhbox}
+\ltj@@everyvbox{%
+  \directlua{luatexja.direction.set_list_direction_hook()}%
+  \aftergroup\ltj@@reset@badness\the\ltj@@i@everyvbox}
+
 \protected\def\ltj@@reset@badness{%
   \directlua{%
     if luatexja.global_temp then
-- 
2.11.0