X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja-core.sty;h=ea64137d2137e7e4c38c548667ec62dc85f11cf9;hb=50539ede1b94b67293b1dd623d79229dd6612bde;hp=d673f83b6054b6ded1badeec66e4034472c7cc17;hpb=648ac28531637194fba2044dab10d285bf3b1a75;p=luatex-ja%2Fluatexja.git

diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index d673f83..ea64137 100644
--- a/src/luatexja-core.sty
+++ b/src/luatexja-core.sty
@@ -65,24 +65,27 @@
   \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
     \csname iftrue\endcsname
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{luatexja-core}[2014/06/22 Core of LuaTeX-ja]
+  \ProvidesPackage{luatexja-core}[2015/02/22 Core of LuaTeX-ja]
 \fi                             %</LaTeX>
 
 %% Load prerequisite packages.
 \endlinechar=13 %
+\newif\ifltj@everyhook@avail\ltj@everyhook@availfalse
 %! 外部パッケージは普通の \endlinechar で読まないと危険.
 \ifltj@in@latex                 %<*LaTeX>
-  \RequirePackage{luaotfload} [2013/05/10] % v2.2
-  \RequirePackage{infwarerr}  [2010/04/08] % v1.3
+  \RequirePackage{luaotfload} [2013/12/31] % v2.3
   \RequirePackage{ltxcmds}    [2011/11/09] % v1.22
   \RequirePackage{pdftexcmds} [2011/11/29] % v0.20
   \RequirePackage{xkeyval}    [2012/10/14] % v2.6b
+  \RequirePackage{atbegshi}
+  \IfFileExists{everyhook.sty}{\RequirePackage{everyhook}\ltj@everyhook@availtrue}{}
 \else                           %<*!LaTeX>
   \input luaotfload.sty
-  \input infwarerr.sty
   \input ltxcmds.sty
   \input pdftexcmds.sty
   \input xkeyval
+  \input atbegshi.sty
+  \AtBeginShipoutInit
 \fi                             %</LaTeX>
 \endlinechar=-1 %
 
@@ -134,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
@@ -143,22 +147,22 @@
 \newluatexattribute\jfam          % index for current jfam
 
 \newluatexattribute\ltj@dir
-
-\ltj@dir=0
-\ltj@icflag=0
-\ltj@origchar=0
-\ltj@charclass=0
-\ltj@curjfnt=-1
-\ltj@curtfnt=-1
+\newlanguage\ltj@@japanese
+\ltj@dir\z@
+\ltj@icflag\z@
+\ltj@origchar\z@
+\ltj@charclass\z@
+\ltj@curjfnt\m@ne
+\ltj@curtfnt\m@ne
 
 %%%%%%%% Attributes for character ranges
 \newcount\ltj@tempcnta
-\ltj@tempcnta=0
+\ltj@tempcnta\z@
 \loop\ifnum\ltj@tempcnta<7
   \expandafter\newluatexattribute%
     \csname ltj@kcat\the\ltj@tempcnta\endcsname
   \csname ltj@kcat\the\ltj@tempcnta\endcsname=0
-  \advance\ltj@tempcnta by1
+  \advance\ltj@tempcnta\@ne
 \repeat
 
 
@@ -173,6 +177,15 @@
       "File `luatexja.lua' not found"))
 }
 
+
+%%% true if we can use [new]token.scan_int and co.
+\newif\ifltj@token@avail@scan
+\directlua{%
+  local bs = string.char(92)
+  if luatexja.token  then tex.sprint(bs .. 'ltj@token@avail@scantrue') end
+}
+
+
 %% \RequireLuaTeXjaSubmodule{name}[date]
 % A TeX version of luatexja.load_module(name)
 % The second optional argument [date] is simply ignored.
@@ -198,17 +211,17 @@
 
 %%%%%%%% \jfont\CS={...:...;jfm=metric;...}, \globaljfont
 \protected\def\jfont{%
-  \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(false)}}
+  \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(false, 'yoko')}}
 \protected\def\globaljfont{%
-  \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(true)}}
-\def\ltj@@jfont{\directlua{luatexja.jfont.jfontdefY('yoko')}}
+  \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(true,  'yoko')}}
+\def\ltj@@jfont{\directlua{luatexja.jfont.jfontdefY()}}
 
 %%%%%%%% \tfont\CS={...:...;jfm=metric;...}, \globaltfont
-\protected\def\tfont{\afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(false)}}
+\protected\def\tfont{%
+  \afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(false, 'tate')}}
 \protected\def\globaltfont{%
-  \afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(true)}}
-\def\ltj@@tfont{\directlua{luatexja.jfont.jfontdefY('tate')}}
-
+  \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}
@@ -243,18 +256,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}{%
@@ -277,8 +291,8 @@
   \expandafter\ltj@@set@stackfont#1:{MJSS}}
 \protected\def\ltj@@set@stackfont#1,#2:#3{%
   \ltj@reset@globaldefs
-  \ltj@tempcnta=\ltj@curjfnt\ltj@curjfnt=-1 #2%
-  \ifnum\ltj@curjfnt=-1
+  \ltj@tempcnta=\ltj@curjfnt\ltj@curjfnt\m@ne#2%
+  \ifnum\ltj@curjfnt=\m@ne
     \@PackageError{luatexja-core}%
     {\string#2 is not a control sequence that represents \MessageBreak
      a Japanese font}{}%
@@ -290,6 +304,22 @@
   \ltj@restore@globaldefs
   }
 
+\ifltj@token@avail@scan %%%%%%%%%%%%%%%%%%%%%%%% new tokenlib
+% {y,t}{ja,al}baselineshift = <dimen>
+% yjabaselineshift = <dimen>
+\define@key[ltj]{japaram}{yalbaselineshift}{%
+  \directlua{tex.setattribute(luatexja.isglobal,
+    luatexbase.attributes['ltj@yablshift'], luatexja.token.scan_dimen())}#1}
+\define@key[ltj]{japaram}{yjabaselineshift}{%
+  \directlua{tex.setattribute(luatexja.isglobal,
+    luatexbase.attributes['ltj@ykblshift'], luatexja.token.scan_dimen())}#1}
+\define@key[ltj]{japaram}{talbaselineshift}{%
+  \directlua{tex.setattribute(luatexja.isglobal,
+    luatexbase.attributes['ltj@tablshift'], luatexja.token.scan_dimen())}#1}
+\define@key[ltj]{japaram}{tjabaselineshift}{%
+  \directlua{tex.setattribute(luatexja.isglobal,
+    luatexbase.attributes['ltj@tkblshift'], luatexja.token.scan_dimen())}#1}
+\else %%%%%%%%%%%%%%%%%%%%%%%% old tokenlib
 % yalbaselineshift = <dimen>
 % yjabaselineshift = <dimen>
 \define@key[ltj]{japaram}{yalbaselineshift}{%
@@ -310,6 +340,7 @@
   \directlua{tex.setattribute(luatexja.isglobal,
     luatexbase.attributes['ltj@tkblshift'],
     \ltj@safe@dimen@or\ltj@defdimen{#1})}}
+\fi %%%%%%%%%%%%%%%%%%%%%%%%
 
 % jaxspmode = {<char_code>, <mode>}
 % mode: inhibit, preonly, postonly, allow
@@ -326,6 +357,7 @@
     \ltj@safe@num@or{nil}{#1},
     \ltj@safe@num@or{nil}{\ltj@temp},0,3)}}
 
+
 % alxspmode = {<char_code>, <mode>}
 % mode: inhibit, preonly, postonly, allow
 %    or       0        1         2      3
@@ -344,32 +376,48 @@
 % autospacing = <bool> (default: true)
 \define@boolkey[ltj]{japaram}{autospacing}[true]{%
   \ifltj@japaram@autospacing
-    \directlua{luatexja.ext_print_global()}\ltj@autospc=1
+    \directlua{luatexja.ext_print_global()}\ltj@autospc\@ne
   \else
-    \directlua{luatexja.ext_print_global()}\ltj@autospc=0
+    \directlua{luatexja.ext_print_global()}\ltj@autospc\z@
   \fi}
 
 % autoxspacing = <bool> (default: true)
 \define@boolkey[ltj]{japaram}{autoxspacing}[true]{%
   \ifltj@japaram@autoxspacing
-    \directlua{luatexja.ext_print_global()}\ltj@autoxspc=1
+    \directlua{luatexja.ext_print_global()}\ltj@autoxspc\@ne
   \else
-    \directlua{luatexja.ext_print_global()}\ltj@autoxspc=0
+    \directlua{luatexja.ext_print_global()}\ltj@autoxspc\z@
   \fi}
 
-% [x]]kanjiskip = <dimen>
-\define@key[ltj]{japaram}{kanjiskip}{\ltjsetkanjiskip{#1}}
-\define@key[ltj]{japaram}{xkanjiskip}{\ltjsetxkanjiskip{#1}}
-\protected\def\ltjsetkanjiskip#1{%                  % SKIP
-  \directlua{%
-    local d = \ltj@safe@glue{#1}
-    luatexja.stack.set_stack_skip(luatexja.stack_table_index.KSK, d); node.free(d)
-}\ignorespaces}
-\protected\def\ltjsetxkanjiskip#1{%                  % SKIP
-  \directlua{%
-    local d = \ltj@safe@glue{#1}
-    luatexja.stack.set_stack_skip(luatexja.stack_table_index.XSK, d); node.free(d)
-}\ignorespaces}
+% [x]]kanjiskip = <skip>
+\ifltj@token@avail@scan %%%%%%%%%%%%%%%%%%%%%%%% new tokenlib
+  \define@key[ltj]{japaram}{kanjiskip}{\ltjsetkanjiskip #1}
+  \define@key[ltj]{japaram}{xkanjiskip}{\ltjsetxkanjiskip #1}
+  \protected\def\ltjsetkanjiskip{%                  % SKIP
+    \directlua{%
+      local d = luatexja.token.scan_glue()
+      luatexja.stack.set_stack_skip(luatexja.stack_table_index.KSK, d); node.free(d)
+  }}
+  \protected\def\ltjsetxkanjiskip{%                  % SKIP
+    \directlua{%
+      local d = luatexja.token.scan_glue()
+      luatexja.stack.set_stack_skip(luatexja.stack_table_index.XSK, d); node.free(d)
+  }}
+\else %%%%%%%%%%%%%%%%%%%%%%%% old tokenlib
+  \define@key[ltj]{japaram}{kanjiskip}{\ltjsetkanjiskip{#1}}
+  \define@key[ltj]{japaram}{xkanjiskip}{\ltjsetxkanjiskip{#1}}
+  \protected\def\ltjsetkanjiskip#1{%                  % SKIP
+    \directlua{%
+      local d = \ltj@safe@glue{#1}
+      luatexja.stack.set_stack_skip(luatexja.stack_table_index.KSK, d); node.free(d)
+  }\ignorespaces}
+  \protected\def\ltjsetxkanjiskip#1{%                  % SKIP
+    \directlua{%
+      local d = \ltj@safe@glue{#1}
+      luatexja.stack.set_stack_skip(luatexja.stack_table_index.XSK, d); node.free(d)
+  }\ignorespaces}
+\else
+\fi %%%%%%%%%%%%%%%%%%%%%%%%
 
 
 % jcharwidowpenalty = <count>
@@ -435,6 +483,7 @@
 \ltj@@decl@array@param{boxdir}
 \def\ltjgetparameter#1{%
   \directlua{luatexja.base.start_time_measure('get_par')}%
+  % stop call is moved in luatexja.lua
   \ifcsname ltj@@array@param/#1\endcsname
     \expandafter\ltx@firstoftwo
   \else
@@ -445,23 +494,21 @@
 }
 \def\ltj@@getparam@one#1{%
   \directlua{luatexja.ext_get_parameter_unary('#1')}%
-  \directlua{luatexja.base.stop_time_measure('get_par')}%
 }%
 \def\ltj@@getparam@two#1#2{%
   \directlua{luatexja.ext_get_parameter_binary('#1', \ltj@safe@num@or{nil}{#2})}%
-  \directlua{luatexja.base.stop_time_measure('get_par')}%
 }
 
 %%%%%%%% \ltjalchar<number>, \ltjjachar<number>
 \let\ltj@@origchar=\char
 \protected\def\ltj@alljachar{\relax
-    \csname ltj@kcat0\endcsname=0
-    \csname ltj@kcat1\endcsname=0
-    \csname ltj@kcat2\endcsname=0
-    \csname ltj@kcat3\endcsname=0
-    \csname ltj@kcat4\endcsname=0
-    \csname ltj@kcat5\endcsname=0
-    \csname ltj@kcat6\endcsname=0 }
+    \csname ltj@kcat0\endcsname\z@
+    \csname ltj@kcat1\endcsname\z@
+    \csname ltj@kcat2\endcsname\z@
+    \csname ltj@kcat3\endcsname\z@
+    \csname ltj@kcat4\endcsname\z@
+    \csname ltj@kcat5\endcsname\z@
+    \csname ltj@kcat6\endcsname\z@}
 \protected\def\ltj@allalchar{\relax
     \csname ltj@kcat0\endcsname="7FFFFFFF %"
     \csname ltj@kcat1\endcsname="7FFFFFFF %"
@@ -489,18 +536,18 @@
 %%%%%%%% \ltjdeclarealtfont<base_font_cs><alt_font_cs>{100-200,3000-,5000,...}
 % <base_font_cs> の 第 3 引数の文字達は <alt_font_cs> で組む
 % いつも global
-\def\ltj@@getjfontnumber#1{% result in \ltj@tempcntc 
+\def\ltj@@getjfontnumber#1{% result in \ltj@tempcntc
   \ltj@reset@globaldefs
-  \begingroup\ltj@curjfnt=-1 \ltj@curtfnt=-1\relax
-  #1\directlua{luatexja.__temp = -\the\ltj@curjfnt*\the\ltj@curtfnt}\endgroup
+  \begingroup\ltj@curjfnt\m@ne\ltj@curtfnt\m@ne\relax
+  #1\directlua{luatexja.__temp = -(\the\ltj@curjfnt)*(\the\ltj@curtfnt)}\endgroup
   \ltj@tempcntc=\directlua{tex.sprint(luatexja.__temp)}\relax
-  \ifnum\ltj@tempcntc=-1
+  \ifnum\ltj@tempcntc=\m@ne
     \@PackageError{luatexja-core}%
     {\string#1 is not a control sequence that represents \MessageBreak
      a Japanese font}{I'll use the current horizontal Japanese font instead.^^J}%
     \ltj@tempcntc=\ltj@curjfnt
   \fi\ltj@restore@globaldefs}
-  
+
 \protected\def\ltjdeclarealtfont#1#2#3{%
   {\ltj@@getjfontnumber#1\@tempcnta=\ltj@tempcntc% \@tempcnta: 基底フォント
    \ltj@@getjfontnumber#2%
@@ -540,6 +587,9 @@
 \protected\def\dtou{%
   \directlua{luatexja.direction.set_list_direction(1, 'dtou')}%
 }
+\protected\def\utod{% 「縦数式ディレクション」
+  \directlua{luatexja.direction.set_list_direction(11, 'utod')}%
+}
 \define@key[ltj]{japaram}{direction}{%% always local
   \directlua{luatexja.direction.set_list_direction(1, 'ltjsetparameter')}%
 }
@@ -547,28 +597,52 @@
 \yoko
 
 %%%% 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}
+\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\ltj@@insert@B\let\next}
+\protected\def\ltj@@insert@B{\directlua{luatexja.direction.populate_insertion_dir_whatsit()}\endgroup}
+
 %%%% vadjust
 \let\ltj@@orig@vadjust=\vadjust
 \protected\def\vadjust{%
   \ltj@@orig@vadjust\bgroup
-  \directlua{luatexja.direction.set_list_direction('adj')}%
+  \directlua{luatexja.direction.set_list_direction_hook('adj')}%
   \aftergroup\ltj@@vadjust@check@dir\let\next}
 \protected\def\ltj@@vadjust@check@dir{%
   \directlua{luatexja.direction.check_adjust_direction()}%
 }
 
-%%%% hbox, vbox, vtop
-\everyhbox{%
-  \directlua{luatexja.direction.set_list_direction()}%
-  \aftergroup\ltj@@reset@badness
-}
-\everyvbox{%
-  \directlua{luatexja.direction.set_list_direction()}%
-  \aftergroup\ltj@@reset@badness
+%%%% \hbox, \vbox, \vtop
+\setbox\z@\hbox{%
+  $\directlua{% This value depends on the version of LuaTeX.
+    luatexja.stack.mmode = -tex.nest[tex.nest.ptr].mode
+  }$%
 }
+\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{%
     if luatexja.global_temp then
@@ -578,20 +652,62 @@
     end
   }%
 }
+\AtBeginShipout{\directlua{luatexja.direction.finalize()}}
+
+%%%% \raise, \lower, \moveleft, \moveright
+\let\ltj@@orig@raise=\raise
+\let\ltj@@orig@lower=\lower
+\protected\def\raise{\ltj@reset@globaldefs\afterassignment\ltj@@raise\ltj@tempdima}
+\protected\def\lower{\ltj@reset@globaldefs\afterassignment\ltj@@raise\ltj@tempdima-}
+\protected\def\ltj@@raise{%
+  \ltj@restore@globaldefs
+  \edef\ltj@@raise@a{%
+    \noexpand\directlua{luatexja.direction.raise_box()}%
+    \ltj@@orig@raise\the\ltj@tempdima\noexpand\box\ltj@afbox
+  }\ltj@afterbox\ltj@@raise@a}
+\let\ltj@@orig@moveleft=\moveleft
+\let\ltj@@orig@moveright=\moveright
+\protected\def\moveleft{\ltj@reset@globaldefs\afterassignment\ltj@@moveleft\ltj@tempdima}
+\protected\def\moveright{\ltj@reset@globaldefs\afterassignment\ltj@@moveleft\ltj@tempdima-}
+\protected\def\ltj@@moveleft{%
+  \ltj@restore@globaldefs
+  \edef\ltj@@moveleft@a{%
+    \noexpand\directlua{luatexja.direction.raise_box()}%
+    \ltj@@orig@moveleft\the\ltj@tempdima\noexpand\box\ltj@afbox
+  }\ltj@afterbox\ltj@@moveleft@a}
+
+%%%% \vcenter
+\let\ltj@@orig@vcenter=\vcenter
+\protected\def\vcenter{\ltj@afterbox\ltj@@vcenter\vbox}
+\protected\def\ltj@@vcenter{%
+  \directlua{luatexja.direction.raise_box()}%
+  \ltj@@orig@vcenter{\box\ltj@afbox}%
+}
 
-
-%%%% unhbox and unvbox
+%%%% \unhbox and \unvbox
+\long\def \@gobbletwo #1#2{}
 \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\unhbox{\ltj@reset@globaldefs\afterassignment\ltj@@unhbox\ltj@tempcnta}
+\protected\def\unvbox{\ltj@reset@globaldefs\afterassignment\ltj@@unvbox\ltj@tempcnta}
 \protected\def\ltj@@unhbox{%
-  \directlua{luatexja.direction.check_dir(\the\ltj@tempcnta)}%
-  \ltj@@orig@unhbox\ltj@tempcnta\endgroup}
+  \directlua{luatexja.direction.unbox_check_dir()}%
+  \ltj@@orig@unhbox\ltj@tempcnta}
 \protected\def\ltj@@unvbox{%
-  \directlua{luatexja.direction.check_dir(\the\ltj@tempcnta)}%
-  \ltj@@orig@unvbox\ltj@tempcnta\endgroup}
-
+  \directlua{luatexja.direction.unbox_check_dir()}%
+  \ltj@@orig@unvbox\ltj@tempcnta}
+\let\ltj@@orig@unhcopy=\unhcopy
+\let\ltj@@orig@unvcopy=\unvcopy
+\protected\def\unhcopy{\ltj@reset@globaldefs\afterassignment\ltj@@unhcopy\ltj@tempcnta}
+\protected\def\unvcopy{\ltj@reset@globaldefs\afterassignment\ltj@@unvcopy\ltj@tempcnta}
+\protected\def\ltj@@unhcopy{%
+  \directlua{luatexja.direction.unbox_check_dir(true)}%
+  \ltj@@orig@unhcopy\ltj@tempcnta
+  \directlua{luatexja.direction.uncopy_restore_whatsit()}}
+\protected\def\ltj@@unvcopy{%
+  \directlua{luatexja.direction.unbox_check_dir(true)}%
+  \ltj@@orig@unvcopy\ltj@tempcnta
+  \directlua{luatexja.direction.uncopy_restore_whatsit()}}
 
 %%%% lastbox
 \let\ltj@@orig@lastbox=\lastbox
@@ -600,21 +716,21 @@
 }
 
 %%%%%%%% \ltjgetwd<box_num> etc.
-%\def\ltjgetwd{\expandafter\expandafter\expandafter\ltj@@getwd\ltj@grab@num}
-%\def\ltjgetht{\expandafter\expandafter\expandafter\ltj@@getht\ltj@grab@num}
-%\def\ltjgetdp{\expandafter\expandafter\expandafter\ltj@@getdp\ltj@grab@num}
+\ifltj@token@avail@scan %%%%%%%%%%%%%%%%%%%%%%%% new tokenlib
+\def\ltj@@getwd{%
+  \directlua{luatexja.direction.get_box_dim('width', luatexja.token.scan_int())}}
+\def\ltj@@getht{%
+  \directlua{luatexja.direction.get_box_dim('height', luatexja.token.scan_int())}}
+\def\ltj@@getdp{%
+  \directlua{luatexja.direction.get_box_dim('depth', luatexja.token.scan_int())}}
+\else %%%%%%%%%%%%%%%%%%%%%%%% old tokenlib
 \def\ltj@@getwd#1{%
-  \directlua{luatexja.direction.get_box_dim('width', \the\numexpr#1\relax)}%
-  \ltj@tempdima%
-}
+  \directlua{luatexja.direction.get_box_dim('width', \the\numexpr#1\relax)}}
 \def\ltj@@getht#1{%
-  \directlua{luatexja.direction.get_box_dim('height', \the\numexpr#1\relax)}%
-  \ltj@tempdima%
-}
+  \directlua{luatexja.direction.get_box_dim('height', \the\numexpr#1\relax)}}
 \def\ltj@@getdp#1{%
-  \directlua{luatexja.direction.get_box_dim('depth', \the\numexpr#1\relax)}%
-  \ltj@tempdima%
-}
+  \directlua{luatexja.direction.get_box_dim('depth', \the\numexpr#1\relax)}}
+\fi %%%%%%%%%%%%%%%%%%%%%%%%
 \let\ltjgetwd=\ltj@@getwd\let\ltjgetht=\ltj@@getht\let\ltjgetdp=\ltj@@getdp
 
 %%%%%%%% \ltjsetwd<box_num>=<dimen> etc.
@@ -637,7 +753,6 @@
   \directlua{luatexja.direction.set_box_dim('depth')}%
   \ltj@restore@globaldefs\endgroup}
 
-
 %%------------------ Load module for the format
 
 \ifltj@in@latex                 %<*LaTeX>