diff options
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty index c1f8c2c622e..15d02be31b7 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty @@ -65,7 +65,7 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-core}[2022-08-24 Core of LuaTeX-ja] + \ProvidesPackage{luatexja-core}[2023-02-11 Core of LuaTeX-ja] \fi %</LaTeX> %% Load prerequisite packages. @@ -228,8 +228,7 @@ \def\ltj@temp{#1}\afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(true, 'yoko')}} \newluafunction\ltj@@jfont@inner \directlua{ - local t = lua.get_functions_table() - t[\the\ltj@@jfont@inner] = luatexja.jfont.jfontdefY + (lua.get_functions_table())[\the\ltj@@jfont@inner] = luatexja.jfont.jfontdefY } \def\ltj@@jfont{\expandafter\expandafter\expandafter\luafunction\expandafter\ltj@@jfont@inner\ltj@temp} @@ -487,8 +486,7 @@ } \newluafunction\ltj@@getparam@one@inner \directlua{ - local t = lua.get_functions_table() - t[\the\ltj@@getparam@one@inner] = luatexja.ext_get_parameter_unary + (lua.get_functions_table())[\the\ltj@@getparam@one@inner] = luatexja.ext_get_parameter_unary } \luadef\ltj@@getparam@one\ltj@@getparam@one@inner \def\ltj@@getparam@two#1#2{% @@ -600,8 +598,7 @@ \let\ltj@@orig@insert\insert \newluafunction\ltj@@lua@populate@insertwhatsit@inner \directlua{ - local t = lua.get_functions_table() - t[\the\ltj@@lua@populate@insertwhatsit@inner] + (lua.get_functions_table())[\the\ltj@@lua@populate@insertwhatsit@inner] = luatexja.direction.populate_insertion_dir_whatsit } \luadef\ltj@@lua@populate@insertwhatsit\ltj@@lua@populate@insertwhatsit@inner @@ -673,8 +670,7 @@ %%%% \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 + (lua.get_functions_table())[\the\ltj@@lua@raisebox@inner]=luatexja.direction.raise_box } \protected\luadef\ltj@@lua@raisebox\ltj@@lua@raisebox@inner \let\ltj@@orig@raise\raise @@ -701,8 +697,12 @@ \let\moveright\ltj@@moveright %% PRIMITIVE %%%%\vsplit +\newluafunction\ltj@@vsplit@inner +\directlua{ + (lua.get_functions_table())[\the\ltj@@vsplit@inner]=luatexja.direction.vsplit +} \let\ltj@@orig@vsplit\vsplit -\protected\def\ltj@@vsplit{\directlua{luatexja.direction.vsplit()}} +\protected\def\ltj@@vsplit{\luafunction\ltj@@vsplit@inner} \let\vsplit\ltj@@vsplit %% PRIMITIVE %%%% \vcenter @@ -715,30 +715,34 @@ %%%% \unhbox and \unvbox \newluafunction\ltj@@lua@unboxcheckdir@inner +\newluafunction\ltj@@lua@uncopycheckdir@inner +\newluafunction\ltj@@lua@uncopy@restore@whatsit@inner \directlua{ local t = lua.get_functions_table() t[\the\ltj@@lua@unboxcheckdir@inner]=luatexja.direction.unbox_check_dir + t[\the\ltj@@lua@uncopycheckdir@inner]=luatexja.direction.uncopy_check_dir + t[\the\ltj@@lua@uncopy@restore@whatsit@inner]=luatexja.direction.uncopy_restore_whatsit } \luadef\ltj@@lua@unboxcheckdir\ltj@@lua@unboxcheckdir@inner +\luadef\ltj@@lua@uncopycheckdir\ltj@@lua@uncopycheckdir@inner +\luadef\ltj@@lua@uncopy@restore@whatsit\ltj@@lua@uncopy@restore@whatsit@inner \long\def \@gobbletwo #1#2{} \let\ltj@@orig@unhbox\unhbox \let\ltj@@orig@unvbox\unvbox \protected\def\ltj@@unhbox{\ltj@reset@globaldefs\afterassignment\ltj@@unhbox@\ltj@tempcnta} \protected\def\ltj@@unvbox{\ltj@reset@globaldefs\afterassignment\ltj@@unvbox@\ltj@tempcnta} -\protected\def\ltj@@unhbox@{\ltj@@lua@unboxcheckdir\ltj@@orig@unhbox\ltj@tempcnta} -\protected\def\ltj@@unvbox@{\ltj@@lua@unboxcheckdir\ltj@@orig@unvbox\ltj@tempcnta} +\protected\def\ltj@@unhbox@{\ltj@@lua@unboxcheckdir\expandafter\ltj@@orig@unhbox\the\ltj@tempcnta\relax} +\protected\def\ltj@@unvbox@{\ltj@@lua@unboxcheckdir\expandafter\ltj@@orig@unvbox\the\ltj@tempcnta\relax} \let\ltj@@orig@unhcopy\unhcopy \let\ltj@@orig@unvcopy\unvcopy \protected\def\ltj@@unhcopy{\ltj@reset@globaldefs\afterassignment\ltj@@unhcopy@\ltj@tempcnta} \protected\def\ltj@@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()}} + \ltj@@lua@uncopycheckdir\expandafter\ltj@@orig@unhcopy\the\ltj@tempcnta\relax + \ltj@@lua@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()}} + \ltj@@lua@uncopycheckdir\expandafter\ltj@@orig@unvcopy\the\ltj@tempcnta\relax + \ltj@@lua@uncopy@restore@whatsit}% \let\unhbox\ltj@@unhbox %% PRIMITIVE \let\unvbox\ltj@@unvbox %% PRIMITIVE \let\unhcopy\ltj@@unhcopy %% PRIMITIVE |