\newluatexattribute\ltj@tkblshift % attribute for tjabaselineshift
\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
\ltj@@decl@array@param{kcatcode}
\ltj@@decl@array@param{jacharrange}
\ltj@@decl@array@param{chartorange}
+\ltj@@decl@array@param{boxdir}
\def\ltjgetparameter#1{%
\directlua{luatexja.base.start_time_measure('get_par')}%
\ifcsname ltj@@array@param/#1\endcsname
\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
+ #1\directlua{luatexja.__temp = -(\the\ltj@curjfnt)*(\the\ltj@curtfnt)}\endgroup
\ltj@tempcntc=\directlua{tex.sprint(luatexja.__temp)}\relax
\ifnum\ltj@tempcntc=-1
\@PackageError{luatexja-core}%
\directlua{luatexja.jfont.clear_alt_font(\the\ltj@tempcntc)}}\ignorespaces}
-%%%%%%%% \yoko, \tate, \ifydir, \iftdir
-\newif\ifydir
-\newif\iftdir
-\newif\ifddir
+%%%%%%%% \yoko, \tate,\dtou
\protected\def\tate{%
\directlua{luatexja.direction.set_list_direction(3, 'tate')}%
}
\protected\def\dtou{%
\directlua{luatexja.direction.set_list_direction(1, 'dtou')}%
}
-\yoko
+\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')}%
+}
-%\def\ifydir{\directlua{luatexja.direction.dir_conditional(4)}}
-%\def\iftdir{\directlua{luatexja.direction.dir_conditional(3)}}
-%\def\ifddir{\directlua{luatexja.direction.dir_conditional(1)}}
+\yoko
-\newcount\ltj@adjdir@count@backup
%%%% insert
%\let\orig@insert=\insert
%\protected\def\insert{\begingroup\afterassignment\ltj@@insert@A\ltj@tempcnta}
\let\ltj@@orig@vadjust=\vadjust
\protected\def\vadjust{%
\ltj@@orig@vadjust\bgroup
- \ifcase\ltj@adjdir@count\or\dtou\or\or\tate\or\yoko\fi
+ \directlua{luatexja.direction.set_list_direction('adj')}%
\aftergroup\ltj@@vadjust@check@dir\let\next}
\protected\def\ltj@@vadjust@check@dir{%
\directlua{luatexja.direction.check_adjust_direction()}%
}
-%%%% hbox, vbox, vtop
+%%%% \hbox, \vbox, \vtop
\everyhbox{%
\directlua{luatexja.direction.set_list_direction()}%
\aftergroup\ltj@@reset@badness
}
\protected\def\ltj@@reset@badness{%
\directlua{%
- luatexja.direction.reset_dir_conditional()
if luatexja.global_temp then
tex.hbadness= tex.hbadness or luatexja.hbadness_temp
tex.vbadness= tex.vbadness or luatexja.vbadness_temp
end
}%
}
+\setbox0\hbox{%
+ $\directlua{% This value depends on the version of LuaTeX.
+ luatexja.stack.mmode = -tex.nest[tex.nest.ptr].mode
+ }$%
+}
-%%%% unhbox and unvbox
+%%%% \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
\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}
+ \ltj@@orig@unhbox\ltj@tempcnta}
\protected\def\ltj@@unvbox{%
\directlua{luatexja.direction.check_dir(\the\ltj@tempcnta)}%
- \ltj@@orig@unvbox\ltj@tempcnta\endgroup}
+ \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.check_dir(\the\ltj@tempcnta)}%
+ \ltj@@orig@unhcopy\ltj@tempcnta}
+\protected\def\ltj@@unvcopy{%
+ \directlua{luatexja.direction.check_dir(\the\ltj@tempcnta)}%
+ \ltj@@orig@unvcopy\ltj@tempcnta}
%%%% lastbox
\directlua{luatexja.direction.set_box_dim('depth')}%
\ltj@restore@globaldefs\endgroup}
-%%%%%%%% \ifybox, \iftbox, \ifdbox
-\def\ltj@@box@cond#1#2\fi{\fi\csname if#1\endcsname}
-\def\ifybox#1{\directlua{luatexja.direction.box_dir_conditional(\the\numexpr #1\relax, 4)}}
-\def\iftbox#1{\directlua{luatexja.direction.box_dir_conditional(\the\numexpr #1\relax, 3)}}
-\def\ifdbox#1{\directlua{luatexja.direction.box_dir_conditional(\the\numexpr #1\relax, 1)}}
%%------------------ Load module for the format
OSDN Git Service
