summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-03-06 21:30:29 +0000
committerKarl Berry <karl@freefriends.org>2020-03-06 21:30:29 +0000
commit42ae3845f0172233885a1e6895a92093a68c2711 (patch)
treed60870f6d24352167dc84504cfc459c144f4fc44 /Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx
parent79c7361836cfe04ef5ad28226f59da581b8484dd (diff)
latex-base-dev (6mar20)
git-svn-id: svn://tug.org/texlive/trunk@54129 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx')
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx43
1 files changed, 28 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx b/Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx
index cc67093fdbb..10d06c1f529 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx
+++ b/Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx
@@ -42,23 +42,36 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%%% From File: ltexpl.dtx
-\IfFileExists{expl3.ltx}
- {%
- \ifnum0%
- \ifdefined\pdffilesize 1\fi
- \ifdefined\filesize 1\fi
- \ifdefined\luatexversion\ifnum\luatexversion>94 1\fi\fi
- >0 %
- \else
- \message{Skipping expl3-dependent extensions}
+\expandafter\ifx\csname tex\string _let:D\endcsname\relax
+ \IfFileExists{expl3.ltx}
+ {%
+ \ifnum0%
+ \ifdefined\pdffilesize 1\fi
+ \ifdefined\filesize 1\fi
+ \ifdefined\luatexversion\ifnum\luatexversion>94 1\fi\fi
+ >0 %
+ \expandafter\@firstofone
+ \else
+ \message{Skipping expl3-dependent extensions}
\expandafter\endinput
- \fi
- }
- {%
- \message{Skipping expl3-dependent extensions}%
+ \fi
+ }
+ {%
+ \message{Skipping expl3-dependent extensions}%
\endinput
- }%
-\input{expl3.ltx}
+ }%
+ {%
+ \input{expl3.ltx}
+ \ifdefined\NewDocumentCommand
+ \else
+ \IfFileExists{xparse.ltx}
+ {\input{xparse.ltx}}
+ {}%
+ \fi
+ }%
+\else
+ \GenericInfo{}{Skipping: expl3 code already part of the format}
+\fi
\endinput
%%
%% End of file `ltexpl.ltx'.