diff options
author | Karl Berry <karl@freefriends.org> | 2020-04-12 21:34:43 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-04-12 21:34:43 +0000 |
commit | 7c7d218636b435d74705a3a769dbf7c127a4b6b0 (patch) | |
tree | 98675a40f2a3593c57b51482f2ae45a18a3b1882 /Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty | |
parent | 5e7ed049ca3b0c441681d4de96bda07a1fbad414 (diff) |
luatexja (12apr20)
git-svn-id: svn://tug.org/texlive/trunk@54705 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty | 123 |
1 files changed, 73 insertions, 50 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty index d870df0e282..c8e5449c9bb 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty @@ -200,11 +200,24 @@ %%%%%%%% Redefine \/ \newluafunction\ltj@@italic@inner +\newluafunction\ltj@@start@time@measure@inner +\newluafunction\ltj@@stop@time@measure@inner \directlua{ local t = lua.get_functions_table() + local start_time_measure = luatexja.base.start_time_measure + local stop_time_measure = luatexja.base.stop_time_measure + local scan_arg = token.scan_argument t[\the\ltj@@italic@inner] = luatexja.jfont.append_italic + t[\the\ltj@@start@time@measure@inner] = function() + start_time_measure(scan_arg()) + end + t[\the\ltj@@stop@time@measure@inner] = function() + stop_time_measure(scan_arg()) + end } \protected\def\/{\relax\luafunction\ltj@@italic@inner} +\luadef\ltj@@start@time@measure\ltj@@start@time@measure@inner +\luadef\ltj@@stop@time@measure\ltj@@stop@time@measure@inner %%%%%%%% \jfont\CS={...:...;jfm=metric;...}, \globaljfont \protected\def\jfont#1{% @@ -253,8 +266,8 @@ t[\the\ltj@@fakeparbegin@inner] = luatexja.jfmglue.create_beginpar_node t[\the\ltj@@fakeboxbdd@inner] = luatexja.jfmglue.create_boxbdd_node } -\protected\def\ltj@reset@globaldefs{\luafunction\ltj@reset@globaldefs@inner} -\protected\def\ltj@restore@globaldefs{\luafunction\ltj@restore@globaldefs@inner} +\protected\luadef\ltj@reset@globaldefs \ltj@reset@globaldefs@inner +\protected\luadef\ltj@restore@globaldefs\ltj@restore@globaldefs@inner \protected\def\inhibitglue{\ifhmode\relax\luafunction\ltj@@ihb@inner\fi} \protected\def\ltjfakeparbegin{\ifhmode\relax\luafunction\ltj@@fakeparbegin@inner\fi} \protected\def\ltjfakeboxbdd{\ifhmode\relax\luafunction\ltj@@fakeboxbdd@inner\fi} @@ -394,8 +407,8 @@ local d = scan_glue(); sss(sti.XSK, d); node.free(d) end } -\protected\def\ltjsetkanjiskip{\luafunction\ltjsetkanjiskip@inner} -\protected\def\ltjsetxkanjiskip{\luafunction\ltjsetxkanjiskip@inner} +\protected\luadef\ltjsetkanjiskip \ltjsetkanjiskip@inner +\protected\luadef\ltjsetxkanjiskip\ltjsetxkanjiskip@inner % jcharwidowpenalty = <count> \define@key[ltj]{japaram}{jcharwidowpenalty}{% %COUNT @@ -434,16 +447,16 @@ \else\directlua{luatexja.isglobal=''}\fi } \protected\def\ltjsetparameter#1{% - \directlua{luatexja.base.start_time_measure('set_par')}% + \ltj@@start@time@measure{set_par}% \ltj@setpar@global\setkeys[ltj]{japaram}{#1}% - \directlua{luatexja.base.stop_time_measure('set_par')}% + \ltj@@stop@time@measure{set_par}% \ignorespaces} \protected\def\ltjglobalsetparameter#1{% \relax\ifnum\globaldefs<0\directlua{luatexja.isglobal=''}% \else\directlua{luatexja.isglobal='global'}\fi% - \directlua{luatexja.base.start_time_measure('set_par')}% + \ltj@@start@time@measure{set_par}% \setkeys[ltj]{japaram}{#1}% - \directlua{luatexja.base.stop_time_measure('set_par')}% + \ltj@@stop@time@measure{set_par}% \ignorespaces} %%%%%%%% \ltjgetparameter @@ -459,7 +472,7 @@ \ltj@@decl@array@param{chartorange} \ltj@@decl@array@param{boxdir} \def\ltjgetparameter#1{% - \directlua{luatexja.base.start_time_measure('get_par')}% + \ltj@@start@time@measure{get_par}% % stop call is moved in luatexja.lua \ifcsname ltj@@array@param/#1\endcsname \expandafter\ltx@firstoftwo @@ -469,9 +482,12 @@ {\ltj@@getparam@two{#1}}% {\ltj@@getparam@one{#1}}% } -\def\ltj@@getparam@one#1{% - \directlua{luatexja.ext_get_parameter_unary('#1')}% -}% +\newluafunction\ltj@@getparam@one@inner +\directlua{ + local t = lua.get_functions_table() + t[\the\ltj@@getparam@one@inner] = luatexja.ext_get_parameter_unary +} +\luadef\ltj@@getparam@one\ltj@@getparam@one@inner \def\ltj@@getparam@two#1#2{% \directlua{luatexja.ext_get_parameter_binary('#1', \ltj@safe@num@or{nil}{#2})}% } @@ -491,7 +507,7 @@ end end } -\protected\def\ltj@alljachar{\luafunction\ltj@alljachar@inner} +\protected\luadef\ltj@alljachar\ltj@alljachar@inner \protected\def\ltj@allalchar{\relax \csname ltj@kcat0\endcsname="7FFFFFFF %" \csname ltj@kcat1\endcsname="7FFFFFFF %" @@ -579,10 +595,17 @@ %%%% insert \let\orig@insert=\insert +\newluafunction\ltj@@lua@populate@insertwhatsit@inner +\directlua{ + local t = lua.get_functions_table() + t[\the\ltj@@lua@populate@insertwhatsit@inner] + = luatexja.direction.populate_insertion_dir_whatsit +} +\luadef\ltj@@lua@populate@insertwhatsit\ltj@@lua@populate@insertwhatsit@inner \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\ltj@@next} -\protected\def\ltj@@insert@B{\directlua{luatexja.direction.populate_insertion_dir_whatsit()}\endgroup} +\protected\def\ltj@@insert@B{\ltj@@lua@populate@insertwhatsit\endgroup} %%%% vadjust \let\ltj@@orig@vadjust=\vadjust @@ -602,46 +625,45 @@ }$% } \setbox\z@\box\voidb@x +\newluafunction\ltj@@box@dirhook@inner +\newluafunction\ltj@@reset@badness@inner +\directlua{ + local t, ltjd = lua.get_functions_table(), luatexja.direction + t[\the\ltj@@box@dirhook@inner] + = function() ltjd.set_list_direction_hook() end + t[\the\ltj@@reset@badness@inner] = function() + if luatexja.global_temp then + tex.hbadness= tex.hbadness or luatexja.hbadness_temp + tex.vbadness= tex.vbadness or luatexja.vbadness_temp + tex.globaldefs= luatexja.global_temp or tex.globaldefs + end + end +} +\luadef\ltj@@box@dirhook\ltj@@box@dirhook@inner \ifltj@everyhook@avail% using everyhook package - \newluafunction\ltj@@box@dirhook - \directlua{ - local t, ltjd = lua.get_functions_table(), luatexja.direction - t[\the\ltj@@box@dirhook] - = function() ltjd.set_list_direction_hook() end - } - \PushPreHook{hbox}{\luafunction\ltj@@box@dirhook\aftergroup\ltj@@reset@badness} - \PushPreHook{vbox}{\luafunction\ltj@@box@dirhook\aftergroup\ltj@@reset@badness} + \PushPreHook{hbox}{\ltj@@box@dirhook\aftergroup\ltj@@reset@badness} + \PushPreHook{vbox}{\ltj@@box@dirhook\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 - \newluafunction\ltj@@box@dirhook - \directlua{ - local t, ltjd = lua.get_functions_table(), luatexja.direction - t[\the\ltj@@box@dirhook] - = function() ltjd.set_list_direction_hook() end - } - \ltj@@everyhbox{\luafunction\ltj@@box@dirhook + \ltj@@everyhbox{\ltj@@box@dirhook \aftergroup\ltj@@reset@badness\the\ltj@@i@everyhbox} - \ltj@@everyvbox{\luafunction\ltj@@box@dirhook + \ltj@@everyvbox{\ltj@@box@dirhook \aftergroup\ltj@@reset@badness\the\ltj@@i@everyvbox} \fi -\newluafunction\ltj@@reset@badness@inner -\directlua{ - local t = lua.get_functions_table() - t[\the\ltj@@reset@badness@inner] = function() - if luatexja.global_temp then - tex.hbadness= tex.hbadness or luatexja.hbadness_temp - tex.vbadness= tex.vbadness or luatexja.vbadness_temp - tex.globaldefs= luatexja.global_temp or tex.globaldefs - end - end} \protected\def\ltj@@reset@badness{\luafunction\ltj@@reset@badness@inner} \AtBeginShipout{\directlua{luatexja.direction.finalize()}} %%%% \raise, \lower, \moveleft, \moveright +\newluafunction\ltj@@lua@raisebox@inner +\directlua{ + local t = lua.get_functions_table() + t[\the\ltj@@lua@raisebox@inner]=luatexja.direction.raise_box +} +\protected\luadef\ltj@@lua@raisebox\ltj@@lua@raisebox@inner \let\ltj@@orig@raise=\raise \let\ltj@@orig@lower=\lower \protected\def\raise{\ltj@reset@globaldefs\afterassignment\ltj@@raise\ltj@tempdima} @@ -649,8 +671,7 @@ \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@@lua@raisebox\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 @@ -659,8 +680,7 @@ \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@@lua@raisebox\ltj@@orig@moveleft\the\ltj@tempdima\noexpand\box\ltj@afbox }\ltj@afterbox\ltj@@moveleft@a} %%%%\vsplit @@ -670,22 +690,25 @@ \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}% + \ltj@@lua@raisebox\ltj@@orig@vcenter{\box\ltj@afbox}% } %%%% \unhbox and \unvbox +\newluafunction\ltj@@lua@unboxcheckdir@inner +\directlua{ + local t = lua.get_functions_table() + t[\the\ltj@@lua@unboxcheckdir@inner]=luatexja.direction.unbox_check_dir +} +\luadef\ltj@@lua@unboxcheckdir\ltj@@lua@unboxcheckdir@inner \long\def \@gobbletwo #1#2{} \let\ltj@@orig@unhbox=\unhbox \let\ltj@@orig@unvbox=\unvbox \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.unbox_check_dir()}% - \ltj@@orig@unhbox\ltj@tempcnta} + \ltj@@lua@unboxcheckdir\ltj@@orig@unhbox\ltj@tempcnta} \protected\def\ltj@@unvbox{% - \directlua{luatexja.direction.unbox_check_dir()}% - \ltj@@orig@unvbox\ltj@tempcnta} + \ltj@@lua@unboxcheckdir\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} |