diff options
author | Karl Berry <karl@freefriends.org> | 2014-01-07 23:06:03 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-01-07 23:06:03 +0000 |
commit | ea751c100642b9b81c97ad32b1b492c917d5a93c (patch) | |
tree | 8b3554859f8f067f8ca942d08dad6a0792a3a803 /Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty | |
parent | 79b68a754e61b4825c185082d15b0e334440fbde (diff) |
l3kernel (7jan14)
git-svn-id: svn://tug.org/texlive/trunk@32599 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty | 60 |
1 files changed, 37 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty b/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty index e8217993546..dacc6a0203a 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty @@ -13,7 +13,7 @@ %% %% Do not distribute a modified version of this file. %% -%% File: l3bootstrap.dtx Copyright (C) 2011-2013 The LaTeX3 project +%% File: l3bootstrap.dtx Copyright (C) 2011-2014 The LaTeX3 project %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -102,44 +102,58 @@ {% \def\ExplFileDate{#1/#2/#3}% } -\GetIdInfo$Id: l3bootstrap.dtx 4629 2013-12-29 20:59:49Z joseph $ +\GetIdInfo$Id: l3bootstrap.dtx 4640 2014-01-04 16:03:52Z joseph $ {L3 Bootstrap code} \ProvidesPackage{l3bootstrap} [% \ExplFileDate\space v\ExplFileVersion\space L3 Experimental bootstrap code% ] -\def\@tempa% - {% - \def\@tempa{}% - \RequirePackage{luatex}% - \RequirePackage{pdftexcmds}% - \let\pdfstrcmp\pdf@strcmp - } \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname directlua\endcsname\relax \else + \begingroup + \def\@tempa + {% + \endgroup + \RequirePackage{luatex}% + \RequirePackage{pdftexcmds}% + }% \expandafter\@tempa \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfstrcmp\endcsname\relax \let\pdfstrcmp\strcmp \fi -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfstrcmp\endcsname\relax - \PackageError{expl3}{Required primitives not found} +\begingroup + \def\ShortText{Required primitives not found}% + \def\LongText% {% - LaTeX3 requires the e-TeX primitives and \string\pdfstrcmp.\MessageBreak - \MessageBreak - These are available in engine versions:\MessageBreak - - pdfTeX 1.30\MessageBreak - - XeTeX 0.9994\MessageBreak - - LuaTeX 0.40\MessageBreak - or later.\MessageBreak - \MessageBreak - Loading of expl3 will abort!% - } - \expandafter\endinput + LaTeX3 requires the e-TeX primitives and \string\pdfstrcmp.\LineBreak + \LineBreak + These are available in engine versions:\LineBreak + - pdfTeX 1.30\LineBreak + - XeTeX 0.9994\LineBreak + - LuaTeX 0.40\LineBreak + or later.\LineBreak + \LineBreak + }% + \expandafter\ifx\csname pdfstrcmp\endcsname\relax + \expandafter\ifx\csname pdf@strcmp\endcsname\relax + \def\LineBreak{\noexpand\MessageBreak}% + \edef\Error% + {% + \endgroup + \noexpand\PackageError{expl3}{\ShortText} + {\LongText Loading of expl3 will abort!}% + \noexpand\endinput + }% + \expandafter\expandafter\expandafter\Error + \else + \endgroup + \fi +\else + \endgroup \fi \protected\edef\ExplSyntaxOff {% |