Fix a bug that xkanjiskip is inserted in \hbox{a\null}あ

[luatex-ja/luatexja.git] / src / luatexja-core.sty

diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index 6e8ce43..c4c7fba 100644 (file)
--- 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
@@ -137,6 +137,7 @@
 \newluatexattribute\ltj@curtfnt   % index for ``current vertical Japanese font''
 \newluatexattribute\ltj@origchar  %
 \newluatexattribute\ltj@charclass %
+\newluatexattribute\ltj@charcode %
 \newluatexattribute\ltj@autospc   % attribute for autospacing
 \newluatexattribute\ltj@autoxspc  % attribute for autoxspacing
 \newluatexattribute\ltj@yablshift % attribute for yalbaselineshift
@@ -213,7 +214,6 @@
   \afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(true,  'tate')}}
 \def\ltj@@tfont{\directlua{luatexja.jfont.jfontdefY()}}
 
-
 %%%%%%%% \zw, \zh
 \protected\def\zw{\directlua{tex.setdimen('ltj@zw', luatexja.jfont.get_zw())}\ltj@zw}
 \protected\def\zh{\directlua{tex.setdimen('ltj@zh', luatexja.jfont.get_zh())}\ltj@zh}
@@ -247,18 +247,19 @@
 
 %%%%%%%% \ltjsetparameter
 \newcount\ltj@@stack \newcount\ltj@@group@level
-\ltj@@group@level=0 \ltj@@stack=0
+\ltj@@group@level\z@\ltj@@stack\z@
 
-\setbox0\hbox{%
+\setbox\z@\hbox{%
   \directlua{% This value depends on the version of LuaTeX.
     luatexja.stack.hmode = -tex.nest[tex.nest.ptr].mode
   }%
 }
-\setbox0\vbox{%
+\setbox\z@\vbox{%
   \directlua{% This value depends on the version of LuaTeX.
     luatexja.stack.vmode = -tex.nest[tex.nest.ptr].mode
   }%
 }
+\setbox\z@\box\voidb@x
 
 % prebreakpenalty = {<char_code>, <penalty>}
 \define@key[ltj]{japaram}{kcatcode}{%
@@ -570,45 +571,34 @@
 }
 
 %%%% \hbox, \vbox, \vtop
-\setbox0\hbox{%
+\setbox\z@\hbox{%
   $\directlua{% This value depends on the version of LuaTeX.
     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
-
-\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}
+\setbox\z@\box\voidb@x
+\ifltj@everyhook@avail% using everyhook package
+  \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
+  \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}
+\fi
 
 \protected\def\ltj@@reset@badness{%
   \directlua{%
@@ -676,7 +666,6 @@
   \ltj@@orig@unvcopy\ltj@tempcnta
   \directlua{luatexja.direction.uncopy_restore_whatsit()}}
 
-
 %%%% lastbox
 \let\ltj@@orig@lastbox=\lastbox
 \protected\def\lastbox{%
@@ -718,7 +707,6 @@
   \directlua{luatexja.direction.set_box_dim('depth')}%
   \ltj@restore@globaldefs\endgroup}
 
-
 %%------------------ Load module for the format
 
 \ifltj@in@latex                 %<*LaTeX>