diff options
author | Karl Berry <karl@freefriends.org> | 2014-05-22 22:00:03 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-05-22 22:00:03 +0000 |
commit | a8821950ae08fd013ee64b64531ab848daf3a52d (patch) | |
tree | 48ec8aeb134872f41c67392a341fa6ada437e8fe /Master/texmf-dist/source/latex/l3kernel/expl3.dtx | |
parent | 18d8e85ee1c3930117a61759d4443a3e495d9ac0 (diff) |
l3kernel (22may14)
git-svn-id: svn://tug.org/texlive/trunk@34204 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/expl3.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/expl3.dtx | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx index 85a95511ca2..9a757ce9240 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{2014/05/06} -\def\ExplFileVersion{4751} +\def\ExplFileDate{2014/05/20} +\def\ExplFileVersion{4814} %</driver|generic|package> %<*driver> \documentclass[full]{l3doc} @@ -1067,17 +1067,17 @@ % \begin{macrocode} %<*!loader> \begingroup - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx PackageError\endcsname\relax + \def\next{\endgroup} + \expandafter\ifx\csname PackageError\endcsname\relax \begingroup - \def\PackageError##1##2##3% + \def\next{\endgroup\endgroup} + \def\PackageError#1#2#3% {% \endgroup - \errhelp{##3}% - \errmessage{##1 Error: ##2!} + \errhelp{#3}% + \errmessage{#1 Error: #2!} } \fi - \def\next{} \expandafter\ifx\csname ExplLoaderFileVersion\endcsname\relax \def\next {% @@ -1086,11 +1086,11 @@ You have attempted to use the expl3 code directly rather than using the correct loader. Loading of expl3 will abort. } + \endgroup \endinput } \else \ifx\ExplLoaderFileVersion\ExplFileVersion - \def\next{} \else \def\next {% @@ -1100,11 +1100,11 @@ probably you have one or more files 'locally installed' which are in conflict. Loading of expl3 will abort. }% + \endgroup \endinput } \fi - \expandafter\fi -\expandafter\endgroup +\fi \next %</!loader> % \end{macrocode} @@ -1633,8 +1633,17 @@ % appropriate case! To allow this loading to take place a temporary % definition of \cs{ProvidesExplFile} is provided % \begin{macrocode} -\cs_set_protected:Npn \ProvidesExplFile #1#2#3#4 - { \iow_log:n { File:~#1~#2~v#3~#4 } } +\cs_set_protected:Npn \ProvidesExplFile + { + \group_begin: + \char_set_catcode_space:n { `\ } + \ProvidesExplFileAux + } +\cs_set_protected:Npn \ProvidesExplFileAux #1#2#3#4 + { + \group_end: + \iow_log:x { File:~#1~#2~v#3~#4 } + } \tex_input:D l3 \xetex_if_engine:TF @@ -1648,6 +1657,7 @@ } .def \scan_stop: \cs_undefine:N \ProvidesExplFile +\cs_undefine:N \ProvidesExplFileAux % \end{macrocode} % % For the generic loader, a few final steps to take. Turn of \cs{expl3} |