[latex3-commits] [git/LaTeX3-latex3-latex2e] lthooks2: set at curr@file at trim@spaces still used in some places (tools, ltxdoc.cls and source2edoc.cls), this needs correcting (80458303)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : lthooks2
Link       : https://github.com/latex3/latex2e/commit/80458303f87d583bdbfc377415a0c205c9ae3413

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

commit 80458303f87d583bdbfc377415a0c205c9ae3413
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Mon Aug 17 20:30:19 2020 +0200

    set at curr@file at trim@spaces still used in some places (tools, ltxdoc.cls and source2edoc.cls), this needs correcting


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

80458303f87d583bdbfc377415a0c205c9ae3413
 base/ltfiles.dtx     | 22 +++++++++++++++++++++-
 base/ltshipout.dtx   |  3 +++
 base/ltxdoc.dtx      | 18 ------------------
 base/source2edoc.cls | 15 ---------------
 4 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/base/ltfiles.dtx b/base/ltfiles.dtx
index 032059a7..e9c60de2 100644
--- a/base/ltfiles.dtx
+++ b/base/ltfiles.dtx
@@ -712,11 +712,31 @@
   \else##1\fi}}%
 \expandafter\reserved at a
 \expandafter{\detokenize{.tex}}
+%</2ekernel|latexrelease>
 %    \end{macrocode}
 %  \end{macro}
+
+
+%  \begin{macro}{\set at curr@file at trim@spaces}
+%
+%    Leftover moved from ltfiles.
+%    Earlier implementation approach --- this need a cleanup!
+%
+%    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 tl@trim at spaces@apply@@nN {#1} \set at curr@file }
+%    \end{macrocode}
+%  \end{macro}
+
+
+
 %
 %    \begin{macrocode}
-%</2ekernel|latexrelease>
 %<latexrelease>\EndIncludeInRelease
 %<latexrelease>\IncludeInRelease{2019/10/01}%
 %<latexrelease>                 {\includeonly}{Spaces in file names}%
diff --git a/base/ltshipout.dtx b/base/ltshipout.dtx
index 2693aba6..23a055c0 100644
--- a/base/ltshipout.dtx
+++ b/base/ltshipout.dtx
@@ -1311,6 +1311,9 @@
 %    Some internals needed elsewhere.
 %    \begin{macrocode}
 %<@@=>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \cs_set_eq:NN \@expl@@shipout at add@firstpage at material@Nn
               \__shipout_add_firstpage_material:Nn
 %    \end{macrocode}
diff --git a/base/ltxdoc.dtx b/base/ltxdoc.dtx
index d46113c5..992de3a3 100644
--- a/base/ltxdoc.dtx
+++ b/base/ltxdoc.dtx
@@ -422,26 +422,8 @@
 \def\partname{File}
 %    \end{macrocode}
 %
-
 %
-%  \begin{macro}{\set at curr@file at trim@spaces}
 %
-%    Leftover moved from ltfiles.
-%    Earlier implementation approach --- this need a cleanup!
-%
-%    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 tl@trim at spaces@apply@@nN {#1} \set at curr@file }
-%    \end{macrocode}
-%  \end{macro}
-%
-
-
 % \changes{v2.0z}{2020/05/17}{Support spaces \emph{within} filenames
 %    (gh/218)}
 %    \begin{macrocode}
diff --git a/base/source2edoc.cls b/base/source2edoc.cls
index be6e675b..3ba3bd2a 100644
--- a/base/source2edoc.cls
+++ b/base/source2edoc.cls
@@ -15,21 +15,6 @@
 
 \def\partname{File}
 
-%
-%  \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 tl@trim at spaces@apply@@nN {#1} \set at curr@file }
-%    \end{macrocode}
-%  \end{macro}
-%
-
 
 \renewcommand*{\DocInclude}[1]{%
   \relax