[latex3-commits] [git/LaTeX3-latex3-latex2e] master: added #109 to latexrelease rollback ; renamed helper cs (3f7f9a2)

Frank Mittelbach frank.mittelbach at latex-project.org
Thu Feb 7 10:59:38 CET 2019


Repository : https://github.com/latex3/latex2e
On branch  : master
Link       : https://github.com/latex3/latex2e/commit/3f7f9a215236d97adc7db435f8ae5af0998c673a

>---------------------------------------------------------------

commit 3f7f9a215236d97adc7db435f8ae5af0998c673a
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Thu Feb 7 10:59:38 2019 +0100

    added #109 to latexrelease rollback ; renamed helper cs


>---------------------------------------------------------------

3f7f9a215236d97adc7db435f8ae5af0998c673a
 base/ltfiles.dtx                                   |   33 ++++++++++++++++++--
 .../{github-0109.lvt => github-0109b.lvt}          |    2 ++
 .../{github-0109.tlg => github-0109b.tlg}          |    6 ++--
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/base/ltfiles.dtx b/base/ltfiles.dtx
index cbe6bfe..f05791b 100644
--- a/base/ltfiles.dtx
+++ b/base/ltfiles.dtx
@@ -721,18 +721,47 @@
 % \changes{v1.1n}{2019/02/07}{Expand \cs{@filef at und} before executing
 %   second argument (github/109)}
 %    \begin{macrocode}
+%</2ekernel>
+%<latexrelease>\IncludeInRelease{2019/04/01}%
+%<latexrelease>  {\InputIfFileExists}{Don't lose the file name}%
+%<*2ekernel|latexrelease>
+%    \begin{macrocode}
 \long\def \InputIfFileExists#1#2{%
   \IfFileExists{#1}%
     {%
-  \expandafter\swap at args\expandafter
+  \expandafter\@swaptwoargs\expandafter
       {\@filef at und}{#2\@addtofilelist{#1}\@@input}}}
 %    \end{macrocode}
+%  \end{macro}
+%
 % 
+%  \begin{macro}{\@swaptwoargs}
+%
+% \changes{v1.1n}{2019/02/07}{Helper macro added}
+%    Swap two arguments and return them unbraced (like
+%   \cs{@firstoftwo} etc).
 %    \begin{macrocode}
-\long\def\swap at args#1#2{#2#1}
+\long\def\@swaptwoargs#1#2{#2#1}
 %    \end{macrocode}
 %  \end{macro}
 %
+%    
+%    \begin{macrocode}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>  {\InputIfFileExists}{Don't lose the file name}%
+%<latexrelease>\long\def \InputIfFileExists#1#2{%
+%<latexrelease>  \IfFileExists{#1}%
+%<latexrelease>    {#2\@addtofilelist{#1}\@@input \@filef at und}}
+%<latexrelease>
+%<latexrelease>\let\@swaptwoargs\@undefined
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
+%    \end{macrocode}
+%
+%
+%
 %  \begin{macro}{\input}
 %    Input a file: if the argument is given in braces use safe input
 %    macros, otherwise use \TeX's primitive |\input| command (which is
diff --git a/base/testfiles/github-0109.lvt b/base/testfiles/github-0109b.lvt
similarity index 80%
copy from base/testfiles/github-0109.lvt
copy to base/testfiles/github-0109b.lvt
index 87ee267..8f5659d 100644
--- a/base/testfiles/github-0109.lvt
+++ b/base/testfiles/github-0109b.lvt
@@ -7,6 +7,8 @@
 
 \input{test2e}
 
+\RequirePackage[2017/04/01]{latexrelease}  % unpatched version
+
 \START
 
 \InputIfFileExists{\jobname-1}{\input{\jobname-2}\par}{\message{No \jobname-1.}\par}
diff --git a/base/testfiles/github-0109.tlg b/base/testfiles/github-0109b.tlg
similarity index 68%
copy from base/testfiles/github-0109.tlg
copy to base/testfiles/github-0109b.tlg
index bdde228..faa7657 100644
--- a/base/testfiles/github-0109.tlg
+++ b/base/testfiles/github-0109b.tlg
@@ -1,7 +1,7 @@
 This is a generated file for the LaTeX2e validation system.
 Don't change this file in any respect.
-(github-0109-2.tex
+(github-0109b-2.tex
+file 2
+) (github-0109b-2.tex
 file 2
-) (github-0109-1.tex
-file 1
 )





More information about the latex3-commits mailing list