Redefine \vadjust

diff --git a/src/ltj-direction.lua b/src/ltj-direction.lua
index 08804aa..ff89c26 100644 (file)
--- a/src/ltj-direction.lua
+++ b/src/ltj-direction.lua
@@ -175,8 +175,6 @@ do
 
    local function create_dir_whatsit_parbox(h, gc)
       stop_time_measure('tex_linebreak')
-      print('BEGIN POST_LINEBREAK', gc)
-      luatexja.ext_show_node_list(h, '   ', print)
       -- start 側は ltj-debug.lua に
       local new_dir, hd = ltjs.list_dir, to_direct(h)
       for line in traverse_id(id_hlist, hd) do

diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index c20aae5..e344928 100644 (file)
--- a/src/luatexja-core.sty
+++ b/src/luatexja-core.sty
@@ -148,6 +148,7 @@
 \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
@@ -540,14 +541,20 @@
 \newif\ifddir
 \protected\def\tate{%
   \directlua{luatexja.direction.set_list_direction(3, 'tate')}%
-  \ltj@dir@count=3\tdirtrue\ydirfalse\ddirfalse}
+  \ltj@dir@count=3\relax\ifvmode\ltj@adjdir@count=3\fi\tdirtrue\ydirfalse\ddirfalse}
 \protected\def\yoko{%
   \directlua{luatexja.direction.set_list_direction(4, 'yoko')}%
-  \ltj@dir@count=4\ydirtrue\tdirfalse\ddirfalse}
+  \ltj@dir@count=4\relax\ifvmode\ltj@adjdir@count=4\fi\ydirtrue\tdirfalse\ddirfalse}
 \protected\def\dtou{%
   \directlua{luatexja.direction.set_list_direction(1, 'dtou')}%
-  \ltj@dir@count=1\ydirfalse\tdirfalse\ddirtrue}
+  \ltj@dir@count=1\relax\ifvmode\ltj@adjdir@count=1\fi\ydirfalse\tdirfalse\ddirtrue}
 \yoko
+%%%% vadjust
+\let\ltj@@orig@vadjust=\vadjust
+\protected\def\vadjust{%
+  \ltj@@orig@vadjust\bgroup\aftergroup\egroup
+  \ifcase\ltj@adjdir@count\or\dtou\or\or\tate\or\yoko\fi
+}
 
 %%%%%%%% \ltjgetwd<box_num> etc.
 %\def\ltjgetwd{\expandafter\expandafter\expandafter\ltj@@getwd\ltj@grab@num}