[latex3-commits] [git/LaTeX3-latex3-latex3] LaTeX2020: Turn on expl3 syntax for pkg in pre-load case (fb74d1b6f)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : LaTeX2020
Link       : https://github.com/latex3/latex3/commit/fb74d1b6f8d0d5e197263202e6c599adfb900d41

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

commit fb74d1b6f8d0d5e197263202e6c599adfb900d41
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Oct 3 18:54:11 2019 +0100

    Turn on expl3 syntax for pkg in pre-load case


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

fb74d1b6f8d0d5e197263202e6c599adfb900d41
 l3kernel/expl3.dtx | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/l3kernel/expl3.dtx b/l3kernel/expl3.dtx
index c4ae2b319..a5a5b593b 100644
--- a/l3kernel/expl3.dtx
+++ b/l3kernel/expl3.dtx
@@ -1227,6 +1227,18 @@
 \fi
 %    \end{macrocode}
 %
+% If \pkg{expl3} was pre-loaded, we now have to deal with the fact that
+% the syntax will not be activated for the package mode version:
+% simply turn it on. We use \tn{@pushfilenameaux} as a marker: it's defined
+% a little later.
+%    \begin{macrocode}
+%<*!2ekernel>
+\ifdefined\@pushfilenameaux
+  \ExplSyntaxOn
+\fi
+%</!2ekernel>
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 %<@@=expl>
 %    \end{macrocode}