From 56c9134f4aa02292ed17e726efd8e493b90e6011 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 25 Sep 2020 03:01:58 +0000 Subject: CTAN sync 202009250301 --- macros/latex/contrib/l3kernel/l3bootstrap.dtx | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'macros/latex/contrib/l3kernel/l3bootstrap.dtx') diff --git a/macros/latex/contrib/l3kernel/l3bootstrap.dtx b/macros/latex/contrib/l3kernel/l3bootstrap.dtx index 810de9812c..c3b597031a 100644 --- a/macros/latex/contrib/l3kernel/l3bootstrap.dtx +++ b/macros/latex/contrib/l3kernel/l3bootstrap.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-09-06} +% \date{Released 2020-09-24} % % \maketitle % @@ -176,16 +176,23 @@ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname directlua\endcsname\relax \else - \ifnum\luatexversion<95 % + \ifnum\luatexversion<110 % \else % \end{macrocode} % For \LuaTeX{} we make sure the basic support is loaded: % this is only necessary in plain. +% +% Additionally we just ensure that \TeX{} has seen the csnames \cs{prg_return_true:} +% and \cs{prg_return_false:} before the Lua code builds these tokens. % \begin{macrocode} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname newcatcodetable\endcsname\relax \input{ltluatex}% \fi + \begingroup\edef\ignored{% + \expandafter\noexpand\csname prg_return_true:\endcsname + \expandafter\noexpand\csname prg_return_false:\endcsname + }\endgroup \directlua{require("expl3")}% % \end{macrocode} % As the user might be making a custom format, no assumption is made about @@ -212,6 +219,9 @@ % The code currently requires \eTeX{} and functionality equivalent to % \tn{pdfstrcmp}, and also driver and Unicode character support. This is % available in a reasonably-wide range of engines. +% +% For \LuaTeX, we require at least Lua 5.3 and the |token.set_lua| function. +% This is available at least since \LuaTeX{} 1.10. % \begin{macrocode} \begingroup \def\next{\endgroup}% @@ -224,7 +234,7 @@ These are available in the engines\LineBreak - pdfTeX v1.40\LineBreak - XeTeX v0.99992\LineBreak - - LuaTeX v0.95\LineBreak + - LuaTeX v1.10\LineBreak - e-(u)pTeX mid-2012\LineBreak or later.\LineBreak \LineBreak @@ -247,7 +257,7 @@ \fi \expandafter\ifx\csname directlua\endcsname\relax \else - \ifnum\luatexversion<76 \else 1\fi + \ifnum\luatexversion<110 \else 1\fi \fi =0 % \newlinechar`\^^J % -- cgit v1.2.3