[latex3-commits] [git/LaTeX3-latex3-latex2e] gh217: fixed rollback for #217 (5010f085)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : gh217
Link       : https://github.com/latex3/latex2e/commit/5010f085bdcd217a6cd63f78709003e4ff7e741a

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

commit 5010f085bdcd217a6cd63f78709003e4ff7e741a
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Tue May 5 14:43:52 2020 +0200

    fixed rollback for #217


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

5010f085bdcd217a6cd63f78709003e4ff7e741a
 base/ltfiles.dtx                                   | 54 +++++++++++++---------
 .../tlb-latexrelease-rollback-003-often.luatex.tlg | 13 ++----
 .../tlb-latexrelease-rollback-003-often.tlg        | 13 ++----
 .../tlb-latexrelease-rollback-003-often.xetex.tlg  | 13 ++----
 base/testfiles/tlb-rollback-004-often.luatex.tlg   |  7 ++-
 base/testfiles/tlb-rollback-004-often.tlg          |  7 ++-
 base/testfiles/tlb-rollback-004-often.xetex.tlg    |  7 ++-
 7 files changed, 55 insertions(+), 59 deletions(-)

diff --git a/base/ltfiles.dtx b/base/ltfiles.dtx
index c3c77081..74861e60 100644
--- a/base/ltfiles.dtx
+++ b/base/ltfiles.dtx
@@ -32,7 +32,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltfiles.dtx}
-             [2020-05-04 v1.2g LaTeX Kernel (File Handling)]
+             [2020-05-05 v1.2g LaTeX Kernel (File Handling)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltfiles.dtx}
@@ -599,12 +599,33 @@
     \@latex at error{\string\include\space cannot be nested}\@eha
   \else
     \set at curr@file at trim@spaces{#1}%
-    \expandafter\@include\expandafter{\@curr at file} %compatibility with space delimited @include
+%    \end{macrocode}
+%    For historical reasons \cs{@include} expects an argument
+%    delimited by a space. This is kept (though uncessary now to avoid
+%    errors in other packages that use \cs{@include} directly.
+%    \begin{macrocode}
+    \expandafter\@include\expandafter{\@curr at file} % deliberate space
   \fi}
 %    \end{macrocode}
 % \end{macro}
 %
 %
+%
+%  \begin{macro}{\set at curr@file at trim@spaces}
+%
+%    For |\include| and |\includeonly| we need a variant that removes
+%    any leading and trailing spaces from the filename, while leaving
+%    any spaces \emph{inside} the filename intact. In order simplify
+%    the implementaion we borrow some code from the \texttt{expl3}
+%    language, \textbf{\emph{beware}: this may change unannounced}.
+%    \begin{macrocode}
+\def\set at curr@file at trim@spaces#1{%
+  \@expl at exp@args@@Ne \set at curr@file {\@expl at tl@trim at spaces@@n {#1}}}
+%    \end{macrocode}
+%  \end{macro}
+%
+%
+%
 %    \begin{macrocode}
 %</2ekernel|latexrelease>
 %<latexrelease>\EndIncludeInRelease
@@ -625,8 +646,11 @@
 %<latexrelease>    \expandafter\@include\@curr at file
 %<latexrelease>  \fi}
 %<latexrelease>
+%<latexrelease>\let\set at curr@file at trim@spaces\@undefined
 %<latexrelease>\EndIncludeInRelease
-%<latexrelease>
+%    \end{macrocode}
+%    
+%    \begin{macrocode}
 %<latexrelease>\IncludeInRelease{0000/00/00}%
 %<latexrelease>                 {\includeonly}{Spaces in file names}%
 %<latexrelease>\def\includeonly#1{%
@@ -639,6 +663,7 @@
 %<latexrelease>  \else \@include#1 \fi}
 %<latexrelease>
 %<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
 %    \end{macrocode}
 
 %
@@ -646,9 +671,10 @@
 % \changes{v1.2g}{2020/05/02}{Support spaces in filenames by enclosing
 %    the names of \texttt{.aux}-files in quotes (gh/217)}
 %    \begin{macrocode}
+%</2ekernel>
 %<*2ekernel|latexrelease>
 %<latexrelease>\IncludeInRelease{2020/10/01}%
-%<latexrelease>                 {\includeonly}{Spaces in file names}%
+%<latexrelease>                 {\@include}{Spaces in file names}%
 %    \end{macrocode}
 %    
 %    \begin{macrocode}
@@ -690,7 +716,7 @@
 %<latexrelease>\EndIncludeInRelease
 %<latexrelease>
 %<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease>                 {\includeonly}{Spaces in file names}%
+%<latexrelease>                 {\@include}{Spaces in file names}%
 %<latexrelease>\def\@include#1 {%
 %<latexrelease>  \clearpage
 %<latexrelease>  \if at filesw
@@ -774,7 +800,6 @@
 
 %  \begin{macro}{\@curr at file}
 %  \begin{macro}{\set at curr@file}
-%  \begin{macro}{\set at curr@file at trim@spaces}
 %
 %   File name handling is done by generating a csname from the
 %   provided file name (which means that UTF-8 octets gets turned into
@@ -815,25 +840,9 @@
         \csname\@firstofone#1\@empty\endcsname}}%
   \endgroup
 }
-%<latexrelease>\EndIncludeInRelease
-%    \end{macrocode}
-%    For |\include| and |\includeonly| we need a variant that removes
-%    any leading and trailing spaces from the filename, while leaving
-%    any spaces \emph{inside} the filename intact. In order simplify
-%    the implementaion we borrow some code from the \texttt{expl3}
-%    language, \textbf{\emph{beware}: this may change unannounced}/
-%    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2020/10/01}%
-%<latexrelease>                 {\includeonly}{Spaces in file names}%
-\def\set at curr@file at trim@spaces#1{%
-  \@expl at exp@args@@Ne \set at curr@file {\@expl at tl@trim at spaces@@n {#1}}}
-%<latexrelease>\EndIncludeInRelease
-%<latexrelease>\IncludeInRelease{2019/10/01}%
-%<latexrelease>                 {\set at curr@file}{Quote file names}%
 %    \end{macrocode}
 %  \end{macro}
 %  \end{macro}
-%  \end{macro}
 %
 %
 %  \begin{macro}{\quote at name}
@@ -934,7 +943,6 @@
 %<latexrelease>\let\quote@@name\@undefined
 %<latexrelease>\let\unquote at name\@undefined
 %<latexrelease>\let\set at curr@file\@undefined
-%<latexrelease>\let\set at curr@file at trim@spaces\@undefined
 %<latexrelease>
 %<latexrelease>\let\IfFileExists@\@undefined
 %<latexrelease>
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index 0ecec2a4..2bfa2040 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -76,10 +76,8 @@ Applying: [....-..-..] Save language for hyphenation on input line ....
 Skipping: [....-..-..] Spaces in file names on input line ....
 Skipping: [....-..-..] Spaces in file names on input line ....
 Applying: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
-Skipping: [....-..-..] Quote file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
+Skipping: [....-..-..] Spaces in file names on input line ....
+Applying: [....-..-..] Spaces in file names on input line ....
 Skipping: [....-..-..] Quote file names on input line ....
 Applying: [....-..-..] Quote file names on input line ....
 Skipping: [....-..-..] Don't lose the file name on input line ....
@@ -418,11 +416,10 @@ Already applied: [....-..-..] Save language for hyphenation on input line ....
 Skipping: [....-..-..] Spaces in file names on input line ....
 Applying: [....-..-..] Spaces in file names on input line ....
 Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
+Skipping: [....-..-..] Spaces in file names on input line ....
+Applying: [....-..-..] Spaces in file names on input line ....
 Applying: [....-..-..] Quote file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Quote file names on input line ....
+LaTeX Info: Redefining \IfFileExists on input line ....
 Already applied: [....-..-..] Quote file names on input line ....
 Applying: [....-..-..] Don't lose the file name on input line ....
 LaTeX Info: Redefining \InputIfFileExists on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index 54939678..832de98b 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -74,10 +74,8 @@ Applying: [....-..-..] Save language for hyphenation on input line ....
 Skipping: [....-..-..] Spaces in file names on input line ....
 Skipping: [....-..-..] Spaces in file names on input line ....
 Applying: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
-Skipping: [....-..-..] Quote file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
+Skipping: [....-..-..] Spaces in file names on input line ....
+Applying: [....-..-..] Spaces in file names on input line ....
 Skipping: [....-..-..] Quote file names on input line ....
 Applying: [....-..-..] Quote file names on input line ....
 Skipping: [....-..-..] Don't lose the file name on input line ....
@@ -410,11 +408,10 @@ Already applied: [....-..-..] Save language for hyphenation on input line ....
 Skipping: [....-..-..] Spaces in file names on input line ....
 Applying: [....-..-..] Spaces in file names on input line ....
 Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
+Skipping: [....-..-..] Spaces in file names on input line ....
+Applying: [....-..-..] Spaces in file names on input line ....
 Applying: [....-..-..] Quote file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Quote file names on input line ....
+LaTeX Info: Redefining \IfFileExists on input line ....
 Already applied: [....-..-..] Quote file names on input line ....
 Applying: [....-..-..] Don't lose the file name on input line ....
 LaTeX Info: Redefining \InputIfFileExists on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
index 56407147..08faf5a9 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -74,10 +74,8 @@ Applying: [....-..-..] Save language for hyphenation on input line ....
 Skipping: [....-..-..] Spaces in file names on input line ....
 Skipping: [....-..-..] Spaces in file names on input line ....
 Applying: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
-Skipping: [....-..-..] Quote file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
+Skipping: [....-..-..] Spaces in file names on input line ....
+Applying: [....-..-..] Spaces in file names on input line ....
 Skipping: [....-..-..] Quote file names on input line ....
 Applying: [....-..-..] Quote file names on input line ....
 Skipping: [....-..-..] Don't lose the file name on input line ....
@@ -419,11 +417,10 @@ Already applied: [....-..-..] Save language for hyphenation on input line ....
 Skipping: [....-..-..] Spaces in file names on input line ....
 Applying: [....-..-..] Spaces in file names on input line ....
 Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
+Skipping: [....-..-..] Spaces in file names on input line ....
+Applying: [....-..-..] Spaces in file names on input line ....
 Applying: [....-..-..] Quote file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Quote file names on input line ....
+LaTeX Info: Redefining \IfFileExists on input line ....
 Already applied: [....-..-..] Quote file names on input line ....
 Applying: [....-..-..] Don't lose the file name on input line ....
 LaTeX Info: Redefining \InputIfFileExists on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index d064b4af..3932b05c 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -128,11 +128,10 @@ Already applied: [....-..-..] Save language for hyphenation on input line ....
 Skipping: [....-..-..] Spaces in file names on input line ....
 Applying: [....-..-..] Spaces in file names on input line ....
 Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
+Skipping: [....-..-..] Spaces in file names on input line ....
+Applying: [....-..-..] Spaces in file names on input line ....
 Applying: [....-..-..] Quote file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Quote file names on input line ....
+LaTeX Info: Redefining \IfFileExists on input line ....
 Already applied: [....-..-..] Quote file names on input line ....
 Applying: [....-..-..] Don't lose the file name on input line ....
 LaTeX Info: Redefining \InputIfFileExists on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index 05d9b896..7946d612 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -126,11 +126,10 @@ Already applied: [....-..-..] Save language for hyphenation on input line ....
 Skipping: [....-..-..] Spaces in file names on input line ....
 Applying: [....-..-..] Spaces in file names on input line ....
 Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
+Skipping: [....-..-..] Spaces in file names on input line ....
+Applying: [....-..-..] Spaces in file names on input line ....
 Applying: [....-..-..] Quote file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Quote file names on input line ....
+LaTeX Info: Redefining \IfFileExists on input line ....
 Already applied: [....-..-..] Quote file names on input line ....
 Applying: [....-..-..] Don't lose the file name on input line ....
 LaTeX Info: Redefining \InputIfFileExists on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index ab9c05c2..7466cc82 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -126,11 +126,10 @@ Already applied: [....-..-..] Save language for hyphenation on input line ....
 Skipping: [....-..-..] Spaces in file names on input line ....
 Applying: [....-..-..] Spaces in file names on input line ....
 Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
+Skipping: [....-..-..] Spaces in file names on input line ....
+Applying: [....-..-..] Spaces in file names on input line ....
 Applying: [....-..-..] Quote file names on input line ....
-Already applied: [....-..-..] Spaces in file names on input line ....
-Already applied: [....-..-..] Quote file names on input line ....
+LaTeX Info: Redefining \IfFileExists on input line ....
 Already applied: [....-..-..] Quote file names on input line ....
 Applying: [....-..-..] Don't lose the file name on input line ....
 LaTeX Info: Redefining \InputIfFileExists on input line ....