[latex3-commits] [git/LaTeX3-latex3-latex3] master: Require LuaTeX v0.95+ (d6c2c2a43)

Joseph Wright joseph.wright at morningstar2.co.uk
Fri Oct 11 08:48:13 CEST 2019 

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/d6c2c2a43bcd3e1d11adbdddbbfc33ed9ac79a02

>---------------------------------------------------------------

commit d6c2c2a43bcd3e1d11adbdddbbfc33ed9ac79a02
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Oct 11 07:47:50 2019 +0100

    Require LuaTeX v0.95+
    
    This means we know tex.cprint() is available.
    
    Leave in loading of ltluatex: really is a requirement
    for LuaTeX use on plain.


>---------------------------------------------------------------

d6c2c2a43bcd3e1d11adbdddbbfc33ed9ac79a02
 l3kernel/CHANGELOG.md                   |  1 +
 l3kernel/expl3.dtx                      |  2 +-
 l3kernel/l3bootstrap.dtx                | 16 ++++------------
 l3kernel/l3luatex.dtx                   | 17 +++--------------
 l3kernel/testfiles/m3expl001.luatex.tlg |  1 -
 l3kernel/testfiles/m3expl002.luatex.tlg |  1 -
 l3kernel/testfiles/m3expl003.luatex.tlg |  1 -
 l3kernel/testfiles/m3expl004.luatex.tlg |  1 -
 l3kernel/testfiles/m3expl006.luatex.tlg |  1 -
 9 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index b1641ace8..752d0de04 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -9,6 +9,7 @@ this project uses date-based 'snapshot' version identifiers.
 
 ### Changed
 
+- Minimum LuaTeX version now v0.95
 - Moved `\debug_on:`, `\debug_off:`, `\debug_suspend:` and `\debug_resume:`
   to stable
 - Accept 'traditional' class options for backend (`dvipdfmx`, `dvips`, etc.)
diff --git a/l3kernel/expl3.dtx b/l3kernel/expl3.dtx
index 83cea5bc2..b6b07006e 100644
--- a/l3kernel/expl3.dtx
+++ b/l3kernel/expl3.dtx
@@ -1007,7 +1007,7 @@
 % \begin{itemize}
 %    \item \pdfTeX{} v1.40 or later.
 %    \item \XeTeX{} v0.99992 or later.
-%    \item \LuaTeX{} v0.76 or later.
+%    \item \LuaTeX{} v0.95 or later.
 %    \item e-(u)\pTeX{} mid-2012 or later.
 % \end{itemize}
 %
diff --git a/l3kernel/l3bootstrap.dtx b/l3kernel/l3bootstrap.dtx
index a5efcc910..e168663e6 100644
--- a/l3kernel/l3bootstrap.dtx
+++ b/l3kernel/l3bootstrap.dtx
@@ -212,25 +212,17 @@
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname directlua\endcsname\relax
 \else
-  \ifnum\luatexversion<70 %
+  \ifnum\luatexversion<95 %
   \else
 %    \end{macrocode}
-%   In package mode a category code table is needed: either use a pre-loaded
-%   allocator or provide one using the \LaTeXe{}-based generic code. In format
-%   mode the table used here can be hard-coded into the \Lua{}.
+%   In package mode for \LuaTeX{} we make sure the basic support is loaded:
+%   this is only necessary in plain.
 %    \begin{macrocode}
 %<*package>
     \begingroup\expandafter\expandafter\expandafter\endgroup
     \expandafter\ifx\csname newcatcodetable\endcsname\relax
       \input{ltluatex}%
     \fi
-    \newcatcodetable\ucharcat at table
-    \initcatcodetable\ucharcat at table
-    \directlua{
-      l3kernel = l3kernel or { }
-      local charcat_table = \number\ucharcat at table\space
-      l3kernel.charcat_table = charcat_table
-    }%
 %</package>
     \directlua{require("expl3")}%
 %    \end{macrocode}
@@ -270,7 +262,7 @@
       These are available in the engines\LineBreak
       - pdfTeX v1.40\LineBreak
       - XeTeX v0.99992\LineBreak
-      - LuaTeX v0.76\LineBreak
+      - LuaTeX v0.95\LineBreak
       - e-(u)pTeX mid-2012\LineBreak
       or later.\LineBreak
       \LineBreak
diff --git a/l3kernel/l3luatex.dtx b/l3kernel/l3luatex.dtx
index bf02115b8..ce661b32f 100644
--- a/l3kernel/l3luatex.dtx
+++ b/l3kernel/l3luatex.dtx
@@ -355,22 +355,11 @@ end
 % \end{macro}
 %
 % \begin{macro}{l3kernel.charcat}
-%   Creating arbitrary chars needs a category code table. As set up here,
-%   one may have been assigned earlier (see \pkg{l3bootstrap}) or a hard-coded
-%   one is used. The latter is intended for format mode and should be adjusted
-%   to match an eventual allocator.
+%   Creating arbitrary chars using |tex.cprint|.
 %    \begin{macrocode}
 local charcat
-if cprint then
-  function charcat(charcode, catcode)
-    cprint(catcode, utf8_char(charcode))
-  end
-else
-  local charcat_table = l3kernel.charcat_table or 1
-  function charcat(charcode, catcode)
-    setcatcode(charcat_table, charcode, catcode)
-    sprint(charcat_table, utf8_char(charcode))
-  end
+function charcat(charcode, catcode)
+  cprint(catcode, utf8_char(charcode))
 end
 l3kernel.charcat = charcat
 %    \end{macrocode}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 67950a06c..0b8975b63 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -4,7 +4,6 @@ Don't change this file in any respect.
 Package: expl3 ....-..-.. L3 programming layer (loader) 
 (expl3-code.tex
 Package: expl3 ....-..-.. L3 programming layer (code)
-\ucharcat at table=\catcodetable...
 \c_max_int=\count...
 \l_tmpa_int=\count...
 \l_tmpb_int=\count...
diff --git a/l3kernel/testfiles/m3expl002.luatex.tlg b/l3kernel/testfiles/m3expl002.luatex.tlg
index 9a75f4ea2..08ad1c448 100644
--- a/l3kernel/testfiles/m3expl002.luatex.tlg
+++ b/l3kernel/testfiles/m3expl002.luatex.tlg
@@ -4,7 +4,6 @@ Don't change this file in any respect.
 Package: expl3 ....-..-.. L3 programming layer (loader) 
 (expl3-code.tex
 Package: expl3 ....-..-.. L3 programming layer (code)
-\ucharcat at table=\catcodetable...
 \c_max_int=\count...
 \l_tmpa_int=\count...
 \l_tmpb_int=\count...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 67950a06c..0b8975b63 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -4,7 +4,6 @@ Don't change this file in any respect.
 Package: expl3 ....-..-.. L3 programming layer (loader) 
 (expl3-code.tex
 Package: expl3 ....-..-.. L3 programming layer (code)
-\ucharcat at table=\catcodetable...
 \c_max_int=\count...
 \l_tmpa_int=\count...
 \l_tmpb_int=\count...
diff --git a/l3kernel/testfiles/m3expl004.luatex.tlg b/l3kernel/testfiles/m3expl004.luatex.tlg
index 551e11e20..b7f9dd4b8 100644
--- a/l3kernel/testfiles/m3expl004.luatex.tlg
+++ b/l3kernel/testfiles/m3expl004.luatex.tlg
@@ -4,7 +4,6 @@ Don't change this file in any respect.
 Package: expl3 ....-..-.. L3 programming layer (loader) 
 (expl3-code.tex
 Package: expl3 ....-..-.. L3 programming layer (code)
-\ucharcat at table=\catcodetable...
 \c_max_int=\count...
 \l_tmpa_int=\count...
 \l_tmpb_int=\count...
diff --git a/l3kernel/testfiles/m3expl006.luatex.tlg b/l3kernel/testfiles/m3expl006.luatex.tlg
index 07ee8b7a0..e3ca3e131 100644
--- a/l3kernel/testfiles/m3expl006.luatex.tlg
+++ b/l3kernel/testfiles/m3expl006.luatex.tlg
@@ -5,7 +5,6 @@ Author: Bruno Le Floch and Joseph Wright
 Package: expl3 ....-..-.. L3 programming layer (loader) 
 (expl3-code.tex
 Package: expl3 ....-..-.. L3 programming layer (code)
-\ucharcat at table=\catcodetable...
 \c_max_int=\count...
 \l_tmpa_int=\count...
 \l_tmpb_int=\count...

More information about the latex3-commits mailing list