X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja-core.sty;h=f5240669c57451523be9956c943c11b6d80e0d5c;hb=0526b27bf88ed7f2adedef267f4d9226f6f5a692;hp=0352e1e55689197425211ba455df8999c5a00dd0;hpb=c004010f7a45f5e5c0d46556fe9065515d6bd60a;p=luatex-ja%2Fluatexja.git diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty index 0352e1e..f524066 100644 --- a/src/luatexja-core.sty +++ b/src/luatexja-core.sty @@ -146,7 +146,7 @@ \newluatexattribute\jfam % index for current jfam \newluatexattribute\ltj@dir - +\newlanguage\ltj@@japanese \ltj@dir=0 \ltj@icflag=0 \ltj@origchar=0 @@ -438,6 +438,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 @@ -448,11 +449,9 @@ } \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, \ltjjachar @@ -553,9 +552,12 @@ \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{%