From 3cb4e75696df6c7abebf17fbc606ca86dcdfb520 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sun, 6 Sep 2015 23:19:17 +0000
Subject: l3 (6sep15)

git-svn-id: svn://tug.org/texlive/trunk@38305 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/source/latex/l3kernel/expl3.dtx | 26 +++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

(limited to 'Master/texmf-dist/source/latex/l3kernel/expl3.dtx')

diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
index b66626c6e91..69518ad2ae1 100644
--- a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
@@ -36,8 +36,8 @@
 %<*driver|generic|package>
 \def\ExplFileName{expl3}
 \def\ExplFileDescription{L3 programming layer}
-\def\ExplFileDate{2015/07/30}
-\def\ExplFileVersion{5724}
+\def\ExplFileDate{2015/09/06}
+\def\ExplFileVersion{5925}
 %</driver|generic|package>
 %<*driver>
 \documentclass[full]{l3doc}
@@ -915,7 +915,7 @@
 %     much more useful than compactness.
 %   \item Use long, descriptive names for functions and variables,
 %     and for auxiliary functions use the parent function name plus
-%     |aux|, |aux_i|, |aux_ii| and so on.
+%     |aux|, |auxi|, |auxii| and so on.
 %   \item If in doubt, ask the team via the LaTeX-L list: someone will
 %     soon get back to you!
 % \end{itemize}
@@ -999,7 +999,7 @@
 %    \item \pdfTeX{} v1.30 or later.
 %    \item \XeTeX{} v0.9994 or later.
 %    \item \LuaTeX{} v0.40 or later.
-%    \item e(u)p\TeX{} v110825 or later.
+%    \item e-(u)p\TeX{} mid-2012 or later.
 % \end{itemize}
 % of which the first three engines are currently officially supported by
 % the team.
@@ -1259,6 +1259,15 @@
 \input{expl3-code.tex}
 %    \end{macrocode}
 %
+% A check that the bootstrap code did not abort loading: if it did,
+% bail out silently here.
+%    \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname tex\string _let:D\endcsname\relax
+  \expandafter\endinput
+\fi
+%    \end{macrocode}
+%
 % Deactivate writing module information to the log.
 %    \begin{macrocode}
 \protected\def\GetIdInfoLog{}
@@ -1687,6 +1696,15 @@
 \input expl3-code.tex %
 %    \end{macrocode}
 %
+% A check that the bootstrap code did not abort loading: if it did,
+% bail out silently here.
+%    \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname tex\string _let:D\endcsname\relax
+  \expandafter\endinput
+\fi
+%    \end{macrocode}
+%
 % \begin{macro}{\__iow_wrap_set:Nx}
 %   Without \LaTeXe{} there is no \cs{protected@edef} so the more risky
 %   direct use of \cs{tl_set:Nx} is required.
-- 
cgit v1.2.3

