\newluatexattribute\jfam % index for current jfam
\newcount\ltj@dir@count % counter for indicating direction
+\newcount\ltj@adjdir@count % counter for indicating direction (for vadjust)
\newluatexattribute\ltj@dir
\ltj@dir=0
\newif\ifddir
\protected\def\tate{%
\directlua{luatexja.direction.set_list_direction(3, 'tate')}%
- \ltj@dir@count=3\tdirtrue\ydirfalse\ddirfalse}
+ \ltj@reset@globaldefs\ltj@dir@count=3\relax
+ \ifvmode\ltj@adjdir@count=3\fi\tdirtrue\ydirfalse\ddirfalse\ltj@restore@globaldefs}
\protected\def\yoko{%
\directlua{luatexja.direction.set_list_direction(4, 'yoko')}%
- \ltj@dir@count=4\ydirtrue\tdirfalse\ddirfalse}
+ \ltj@reset@globaldefs\ltj@dir@count=4\relax
+ \ifvmode\ltj@adjdir@count=4\fi\ydirtrue\tdirfalse\ddirfalse\ltj@restore@globaldefs}
\protected\def\dtou{%
\directlua{luatexja.direction.set_list_direction(1, 'dtou')}%
- \ltj@dir@count=1\ydirfalse\tdirfalse\ddirtrue}
+ \ltj@reset@globaldefs\ltj@dir@count=1\relax
+ \ifvmode\ltj@adjdir@count=1\fi\ydirfalse\tdirfalse\ddirtrue\ltj@restore@globaldefs}
\yoko
+\newcount\ltj@adjdir@count@backup
+%%%% insert
+\let\orig@insert=\insert
+\protected\def\insert{\begingroup\afterassignment\ltj@@insert@A\ltj@tempcnta}
+\protected\def\ltj@@insert@A{\orig@insert\ltj@tempcnta\bgroup\aftergroup\endgroup\let\next}
+%%%% vadjust
+\let\ltj@@orig@vadjust=\vadjust
+\protected\def\vadjust{%
+ \ltj@@orig@vadjust\bgroup
+ \ifcase\ltj@adjdir@count\or\dtou\or\or\tate\or\yoko\fi
+ \aftergroup\ltj@@vadjust@check@dir\let\next}
+\protected\def\ltj@@vadjust@check@dir{%
+ \directlua{luatexja.direction.check_adjust_direction()}%
+}
+%%%% unhbox and unvbox
+\let\ltj@@orig@unhbox=\unhbox
+\let\ltj@@orig@unvbox=\unvbox
+\protected\def\unhbox{\begingroup\afterassignment\ltj@@unhbox\ltj@tempcnta}
+\protected\def\unvbox{\begingroup\afterassignment\ltj@@unvbox\ltj@tempcnta}
+\protected\def\ltj@@unhbox{%
+ \directlua{luatexja.direction.check_dir(\the\ltj@tempcnta)}%
+ \ltj@@orig@unhbox\ltj@tempcnta\endgroup}
+\protected\def\ltj@@unvbox{%
+ \directlua{luatexja.direction.check_dir(\the\ltj@tempcnta)}%
+ \ltj@@orig@unvbox\ltj@tempcnta\endgroup}
+
%%%%%%%% \ltjgetwd<box_num> etc.
%\def\ltjgetwd{\expandafter\expandafter\expandafter\ltj@@getwd\ltj@grab@num}
%\def\ltjgetht{\expandafter\expandafter\expandafter\ltj@@getht\ltj@grab@num}