[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: \i at iffileonpath, use \quote at name in \@filef at und, and provide missing rollback (3650424e)
David Carlisle
d.p.carlisle at gmail.com
Mon Nov 11 21:51:26 CET 2019
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/3650424e19ad0896253ac1b8690d238958d84374
>---------------------------------------------------------------
commit 3650424e19ad0896253ac1b8690d238958d84374
Author: David Carlisle <d.p.carlisle at gmail.com>
Date: Mon Nov 11 20:51:26 2019 +0000
\i at iffileonpath, use \quote at name in \@filef at und, and provide missing rollback
>---------------------------------------------------------------
3650424e19ad0896253ac1b8690d238958d84374
base/changes.txt | 5 +++++
base/ltfiles.dtx | 68 ++++++++++++++++++++++++++++++++++----------------------
2 files changed, 46 insertions(+), 27 deletions(-)
diff --git a/base/changes.txt b/base/changes.txt
index 743f2866..4289125d 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -4,6 +4,11 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
=======================================================================
+2019-11-11 David Carlisle <David.Carlisle at latex-project.org>
+
+ * ltfiles.dtx: use \quote at name again for \@filef at und in
+ \@iffileonpath
+
2019-11-02 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* ltmiscen.dtx: Make \\ and \@centercr robust in all situations (gh/203)
diff --git a/base/ltfiles.dtx b/base/ltfiles.dtx
index 87a7f5e9..7c43abc0 100644
--- a/base/ltfiles.dtx
+++ b/base/ltfiles.dtx
@@ -32,7 +32,7 @@
%<*driver>
% \fi
\ProvidesFile{ltfiles.dtx}
- [2019/11/09 v1.2e LaTeX Kernel (File Handling)]
+ [2019/11/11 v1.2f LaTeX Kernel (File Handling)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltfiles.dtx}
@@ -796,6 +796,33 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\@iffileonpath}
+% If the file is not found by |\openin|, and |\input at path| is defined,
+% look in all the directories specified in |\input at path|.
+% \changes{v0.9p}{1994/01/18}{Macro added}
+% \changes{v1.0f}{1994/05/02}
+% {\cs{@break at loop} renamed to \cs{@break at tfor}}
+% \changes{v1.0t}{1995/05/25}
+% {(CAR) added \cs{long}}
+% \changes{v1.1d}{1996/01/10}
+% {Change argument handling to not require doubled hash. latex/2024}
+% \changes{v1.2d}{2019/10/26}{quote on openin}%
+% \changes{v1.2f}{2019/11/11}{make \cs{@filef at und} match quoting used on \cs{openin}}%
+% \begin{macrocode}
+\long\def\@iffileonpath#1{%
+ \let\reserved at a\@secondoftwo
+ \expandafter\@tfor\expandafter\reserved at b\expandafter
+ :\expandafter=\input at path\do{%
+ \openin\@inputcheck\expandafter\quote at name\expandafter{\reserved at b#1} %
+ \ifeof\@inputcheck\else
+ \edef\@filef at und{\expandafter\quote at name\expandafter{\reserved at b#1} }%
+ \let\reserved at a\@firstoftwo%
+ \closein\@inputcheck
+ \@break at tfor
+ \fi}%
+ \reserved at a}
+% \end{macrocode}
+% \end{macro}
%
% \begin{macrocode}
%</2ekernel|latexrelease>
@@ -825,38 +852,25 @@
%<latexrelease> \fi
%<latexrelease> \reserved at a}
%<latexrelease>
+%<latexrelease>\long\def\@iffileonpath#1{%
+%<latexrelease> \let\reserved at a\@secondoftwo
+%<latexrelease> \expandafter\@tfor\expandafter\reserved at b\expandafter
+%<latexrelease> :\expandafter=\input at path\do{%
+%<latexrelease> \openin\@inputcheck\reserved at b#1 %
+%<latexrelease> \ifeof\@inputcheck\else
+%<latexrelease> \edef\@filef at und{\reserved at b#1 }%
+%<latexrelease> \let\reserved at a\@firstoftwo%
+%<latexrelease> \closein\@inputcheck
+%<latexrelease> \@break at tfor
+%<latexrelease> \fi}%
+%<latexrelease> \reserved at a}
+%<latexrelease>
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
%
%
%
-% \begin{macro}{\@iffileonpath}
-% If the file is not found by |\openin|, and |\input at path| is defined,
-% look in all the directories specified in |\input at path|.
-% \changes{v0.9p}{1994/01/18}{Macro added}
-% \changes{v1.0f}{1994/05/02}
-% {\cs{@break at loop} renamed to \cs{@break at tfor}}
-% \changes{v1.0t}{1995/05/25}
-% {(CAR) added \cs{long}}
-% \changes{v1.1d}{1996/01/10}
-% {Change argument handling to not require doubled hash. latex/2024}
-% \changes{v1.2d}{2019/10/26}{quote on openin}%
-% \begin{macrocode}
-\long\def\@iffileonpath#1{%
- \let\reserved at a\@secondoftwo
- \expandafter\@tfor\expandafter\reserved at b\expandafter
- :\expandafter=\input at path\do{%
- \openin\@inputcheck\expandafter\quote at name\expandafter{\reserved at b#1} %
- \ifeof\@inputcheck\else
- \edef\@filef at und{"\reserved at b#1" }%
- \let\reserved at a\@firstoftwo%
- \closein\@inputcheck
- \@break at tfor
- \fi}%
- \reserved at a}
-% \end{macrocode}
-% \end{macro}
%
% \begin{macro}{\InputIfFileExists}
% \changes{v0.9b}
More information about the latex3-commits
mailing list