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 | 32 |
1 files changed, 14 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 5784b1b3c6e..71d14ce8b0f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty @@ -99,17 +99,13 @@ \expandafter\endinput\fi\relax %% Check LuaTeX version. -\ifnum\luatexversion<74 +\ifnum\luatexversion<85 \@PackageError{luatexja-core} {This LuaTeX engine is too old for this package;\MessageBreak - at least beta-0.74.0 is needed} + at least beta-0.85.0 is needed} {Package loading is aborted now.\MessageBreak} \expandafter\endinput\fi\relax -%! なお、luatexbase-compat の説明に従うと、LuaTeX 拡張プリミティブは -%! plain/LaTeX の両方で \luatex 付の名前(\directlua はそのまま) -%! で使えると考えてよい。 - %% \LuaTeXjaAvailable %! 環境検査にパスした時に定義される. \let\LuaTeXjaAvailable=t % @@ -339,16 +335,16 @@ % yjabaselineshift = <dimen> \define@key[ltj]{japaram}{yalbaselineshift}{% \directlua{tex.setattribute(luatexja.isglobal, - luatexbase.attributes['ltj@yablshift'], luatexja.token.scan_dimen())}#1\relax} + luatexbase.attributes['ltj@yablshift'], token.scan_dimen())}#1\relax} \define@key[ltj]{japaram}{yjabaselineshift}{% \directlua{tex.setattribute(luatexja.isglobal, - luatexbase.attributes['ltj@ykblshift'], luatexja.token.scan_dimen())}#1\relax} + luatexbase.attributes['ltj@ykblshift'], token.scan_dimen())}#1\relax} \define@key[ltj]{japaram}{talbaselineshift}{% \directlua{tex.setattribute(luatexja.isglobal, - luatexbase.attributes['ltj@tablshift'], luatexja.token.scan_dimen())}#1\relax} + luatexbase.attributes['ltj@tablshift'], token.scan_dimen())}#1\relax} \define@key[ltj]{japaram}{tjabaselineshift}{% \directlua{tex.setattribute(luatexja.isglobal, - luatexbase.attributes['ltj@tkblshift'], luatexja.token.scan_dimen())}#1\relax} + luatexbase.attributes['ltj@tkblshift'], token.scan_dimen())}#1\relax} % jaxspmode = {<char_code>, <mode>} % mode: inhibit, preonly, postonly, allow @@ -392,7 +388,7 @@ \newluafunction\ltjsetkanjiskip@inner \newluafunction\ltjsetxkanjiskip@inner \directlua{ - local t, scan_glue = lua.get_functions_table(), luatexja.token.scan_glue + local t, scan_glue = lua.get_functions_table(), token.scan_glue local sss, sti = luatexja.stack.set_stack_skip, luatexja.stack_table_index t[\the\ltjsetkanjiskip@inner] = function() local d = scan_glue(); sss(sti.KSK, d); node.free(d) @@ -406,12 +402,12 @@ \else \protected\def\ltjsetkanjiskip{% % SKIP \directlua{% - local d = luatexja.token.scan_glue() + local d = 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() + local d = token.scan_glue() luatexja.stack.set_stack_skip(luatexja.stack_table_index.XSK, d); node.free(d) }} \fi @@ -520,10 +516,10 @@ %%%%%%%% \ltjsetmathletter<number>, \ltjunsetmathletter<number> \protected\def\ltjsetmathletter#1{% - \directlua{luatexja.math.is_math_letters[luatexja.token.scan_int()]=true}#1\relax + \directlua{luatexja.math.is_math_letters[token.scan_int()]=true}#1\relax } \protected\def\ltjunsetmathletter#1{% - \directlua{luatexja.math.is_math_letters[luatexja.token.scan_int()]=false}#1\relax + \directlua{luatexja.math.is_math_letters[token.scan_int()]=false}#1\relax } %%%%%%%% \ltjdeclarealtfont<base_font_cs><alt_font_cs>{100-200,3000-,5000,...} @@ -750,11 +746,11 @@ %%%%%%%% \ltjgetwd<box_num> etc. \def\ltj@@getwd{% - \directlua{luatexja.direction.get_box_dim('width', luatexja.token.scan_int())}} + \directlua{luatexja.direction.get_box_dim('width', token.scan_int())}} \def\ltj@@getht{% - \directlua{luatexja.direction.get_box_dim('height', luatexja.token.scan_int())}} + \directlua{luatexja.direction.get_box_dim('height', token.scan_int())}} \def\ltj@@getdp{% - \directlua{luatexja.direction.get_box_dim('depth', luatexja.token.scan_int())}} + \directlua{luatexja.direction.get_box_dim('depth', token.scan_int())}} \let\ltjgetwd=\ltj@@getwd\let\ltjgetht=\ltj@@getht\let\ltjgetdp=\ltj@@getdp %%%%%%%% \ltjsetwd<box_num>=<dimen> etc. |