From 8ec6f52457309f1e1152d881c29acc8f8c775442 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 19 Jun 2015 22:34:54 +0000 Subject: l3 (19jun15) git-svn-id: svn://tug.org/texlive/trunk@37621 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/l3kernel/l3bootstrap.dtx | 73 +++++++++++----------- 1 file changed, 37 insertions(+), 36 deletions(-) (limited to 'Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx') diff --git a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx index b5fc71e1438..f15f704a2c9 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx @@ -145,7 +145,7 @@ % \end{macro} % \end{macro} % \end{macro} -\GetIdInfo$Id: l3bootstrap.dtx 5542 2015-02-28 22:47:53Z joseph $ +\GetIdInfo$Id: l3bootstrap.dtx 5608 2015-05-20 15:29:10Z joseph $ {L3 Bootstrap code} % %<*driver> @@ -373,7 +373,7 @@ % primitive or a version of \LuaTeX{} capable of emulating it. % \begin{macrocode} \begingroup - \def\next{\endgroup} + \def\next{\endgroup}% \def\ShortText{Required primitives not found}% \def\LongText% {% @@ -386,48 +386,49 @@ or later.\LineBreak \LineBreak }% - \expandafter\ifx\csname pdfstrcmp\endcsname\relax + \ifnum0% + \expandafter\ifx\csname pdfstrcmp\endcsname\relax\else 1\fi \expandafter\ifx\csname directlua\endcsname\relax \else - \ifnum\luatexversion<36 % - \newlinechar`\^^J\relax + \ifnum\luatexversion<36 \else 1\fi + \fi + =0 % + \newlinechar`\^^J % %<*initex> - \def\LineBreak{^^J}% - \edef\next - {% - \errhelp - {% - \LongText - For pdfTeX and XeTeX the '-etex' command-line switch is also - needed.\LineBreak - \LineBreak - Format building will abort!\LineBreak - }% - \errmessage{\ShortText}% - \endgroup - \noexpand\end - }% -% -%<*package> - \def\LineBreak{\noexpand\MessageBreak}% - \expandafter\ifx\csname PackageError\endcsname\relax - \def\LineBreak{^^J}% - \def\PackageError#1#2#3% + \def\LineBreak{^^J}% + \edef\next + {% + \errhelp {% - \errhelp{#3}% - \errmessage{#1 Error: #2!} + \LongText + For pdfTeX and XeTeX the '-etex' command-line switch is also + needed.\LineBreak + \LineBreak + Format building will abort!\LineBreak }% - \fi - \edef\next + \errmessage{\ShortText}% + \endgroup + \noexpand\end + }% +% +%<*package> + \def\LineBreak{\noexpand\MessageBreak}% + \expandafter\ifx\csname PackageError\endcsname\relax + \def\LineBreak{^^J}% + \def\PackageError#1#2#3% {% - \noexpand\PackageError{expl3}{\ShortText} - {\LongText Loading of expl3 will abort!}% - \endgroup - \noexpand\endinput + \errhelp{#3}% + \errmessage{#1 Error: #2} }% -% \fi - \fi + \edef\next + {% + \noexpand\PackageError{expl3}{\ShortText} + {\LongText Loading of expl3 will abort!}% + \endgroup + \noexpand\endinput + }% +% \fi \next % \end{macrocode} -- cgit v1.2.3