[latex3-commits] [git/LaTeX3-latex3-latex2e] LaTeX2020: Load expl3.ltx if safe to do so (21686dc0)

[Joseph Wright]

Repository : https://github.com/latex3/latex2e
On branch  : LaTeX2020
Link       : https://github.com/latex3/latex2e/commit/21686dc076ed5324f3309ce5ffdee5635bfc9280

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

commit 21686dc076ed5324f3309ce5ffdee5635bfc9280
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Oct 2 15:08:03 2019 +0100

    Load expl3.ltx if safe to do so


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

21686dc076ed5324f3309ce5ffdee5635bfc9280
 base/ltexpl.dtx  | 22 ++++++++++++++++++++++
 base/ltfinal.dtx | 10 +++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/base/ltexpl.dtx b/base/ltexpl.dtx
index 0df01f4e..20c55e14 100644
--- a/base/ltexpl.dtx
+++ b/base/ltexpl.dtx
@@ -59,6 +59,28 @@
 %<*2ekernel>
 %    \end{macrocode}
 %
+% \subsection{Loader}
+%
+%  Check for the required primitive/enigne support and the existence of
+%  a loader.
+%    \begin{macrocode}
+\ifnum0%
+  \ifdefined\pdffilesize 1\fi
+  \ifdefined\filesize 1\fi
+  \ifdefined\luatexversion\ifnum\luatexversion>109 1\fi\fi
+  >0 %
+  \IfFileExists{expl3.ltx}{}
+    {%
+      \message{Skipping expl3-dependent extensions}%
+      \endinput
+    }%
+\else
+  \message{Skipping expl3-dependent extensions}
+  \expandafter\endinput
+\fi
+\input{expl3.ltx}
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 %</2ekernel>
 %    \end{macrocode}
diff --git a/base/ltfinal.dtx b/base/ltfinal.dtx
index 47641e96..ba22d7f5 100644
--- a/base/ltfinal.dtx
+++ b/base/ltfinal.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltfinal.dtx}
-             [2019/09/14 v2.1h LaTeX Kernel (Final Settings)]
+             [2019-10-02 v2.2 LaTeX Kernel (Final Settings)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltfinal.dtx}
@@ -1044,6 +1044,14 @@
 %  }{}
 %    \end{macrocode}
 %
+% \subsection{Loading further extensions}
+%
+% \changes{v2.2}{2019-10-02}{Load \pkg{ltexpl}}
+% Simply load further code: it's deliberately separate
+%    \begin{macrocode}
+\input{ltexpl.ltx}
+%    \end{macrocode}
+%
 % \subsection{Freeing Memory}
 %
 % \begin{macro}{\reserved at a}