[latex3-commits] [git/LaTeX3-latex3-latex2e] hotfix/gh414: Fix a signature and drop unnecessary macro (a9b93b3b)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex2e
On branch  : hotfix/gh414
Link       : https://github.com/latex3/latex2e/commit/a9b93b3b26f02d10328a654fba57108f17d8ae34

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

commit a9b93b3b26f02d10328a654fba57108f17d8ae34
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date:   Sun Oct 18 12:16:16 2020 -0300

    Fix a signature and drop unnecessary macro


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

a9b93b3b26f02d10328a654fba57108f17d8ae34
 base/ltfilehook.dtx | 37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/base/ltfilehook.dtx b/base/ltfilehook.dtx
index 24ba88f5..ecb499f3 100644
--- a/base/ltfilehook.dtx
+++ b/base/ltfilehook.dtx
@@ -31,8 +31,8 @@
 %%% From File: ltfilehook.dtx
 %
 %    \begin{macrocode}
-\providecommand\ltfilehookversion{v1.0b}
-\providecommand\ltfilehookdate{2020/09/26}
+\providecommand\ltfilehookversion{v1.0c}
+\providecommand\ltfilehookdate{2020/10/18}
 %    \end{macrocode}
 %
 %<*driver>
@@ -872,8 +872,8 @@
 %
 % \begin{macro}{\set at curr@file,\@curr at file,\@curr at file@reqd}
 %   Now we hook into \cs{set at curr@file} to resolve a possible file
-%   substitution, and add \cs{@expl@@@filehook at set@curr at file@@N} at the end, after
-%   \cs{@curr at file} is set.
+%   substitution, and add \cs{@expl@@@filehook at set@curr at file@@nNN}
+%   at the end, after \cs{@curr at file} is set.
 %
 %   A file name is built using
 %   \cs{expandafter}\cs{string}\cs{csname}\meta{filename}\cs{endcsname}
@@ -987,24 +987,24 @@
     .tex\else\string#1\fi}
 %    \end{macrocode}
 %    
-%   Then we call \cs{@expl@@@filehook at set@curr at file@@N} once for \cs{@curr at file}
-%   to set \cs[no-index]{CurrentFile(Path)Used} and once for
+%   Then we call \cs{@expl@@@filehook at set@curr at file@@nNN} once for
+%   \cs{@curr at file} to set \cs[no-index]{CurrentFile(Path)Used} and once for
 %   \cs{@curr at file@reqd} to set \cs[no-index]{CurrentFile(Path)}.
 %   Here too the slower route is only used if a substitution happened,
-%   but here \cs{@expl@@@filehook at if@file at replaced@@TF} can't be used because the
-%   flag is reset at the \cs{endgroup} above, so we check if
+%   but here \cs{@expl@@@filehook at if@file at replaced@@TF} can't be used because
+%   the flag is reset at the \cs{endgroup} above, so we check if
 %   \cs{@curr at file} and \cs{@curr at file@reqd} differ.  This macro is
 %   issued separate from \cs{set at curr@file} because it changes
 %   \cs{CurrentFile}, and side-effects would quickly get out of control.
 %    \begin{macrocode}
 \def\@filehook at set@CurrentFile{%
-  \@expl@@@filehook at set@curr at file@@N{\@curr at file}%
+  \@expl@@@filehook at set@curr at file@@nNN{\@curr at file}%
     \CurrentFileUsed\CurrentFilePathUsed
   \ifx\@curr at file@reqd\@curr at file
     \let\CurrentFile\CurrentFileUsed
     \let\CurrentFilePath\CurrentFilePathUsed
   \else
-    \@expl@@@filehook at set@curr at file@@N{\@curr at file@reqd}%
+    \@expl@@@filehook at set@curr at file@@nNN{\@curr at file@reqd}%
       \CurrentFile\CurrentFilePath
   \fi}
 %</2ekernel|latexrelease>
@@ -1016,8 +1016,7 @@
 %
 %
 %
-% \begin{macro}{\@@_set_curr_file:N,
-%               \@@_set_curr_file:nNN,
+% \begin{macro}{\@@_set_curr_file:nNN,
 %               \@@_set_curr_file_assign:nnnNN}
 %   When inputting a file, \cs{set at curr@file} does a file lookup
 %   (in \cs{input at path} and \cs{l_file_search_path_seq}) and returns the
@@ -1032,17 +1031,12 @@
 %</2ekernel>
 %<*2ekernel|latexrelease>
 %<latexrelease>\IncludeInRelease{2020/10/01}%
-%<latexrelease>          {@@_set_curr_file:N}{Set curr file}%
+%<latexrelease>          {@@_set_curr_file:nNN}{Set curr file}%
 \ExplSyntaxOn
 %<@@=filehook>
-\cs_new_protected:Npn \@@_set_curr_file:N #1
-   { \exp_args:NV \@@_set_curr_file:nNN #1 }
-%    \end{macrocode}
-%    
-%    \begin{macrocode}
 \cs_new_protected:Npn \@@_set_curr_file:nNN #1
   {
-    \@@_file_parse_full_name:nN {#1}
+    \exp_args:Nf \@@_file_parse_full_name:nN {#1}
       \@@_set_curr_file_assign:nnnNN
   }
 \cs_new_protected:Npn \@@_set_curr_file_assign:nnnNN #1 #2 #3 #4 #5
@@ -1331,8 +1325,8 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\cs_new_eq:NN \@expl@@@filehook at set@curr at file@@N
-              \__filehook_set_curr_file:N
+\cs_new_eq:NN \@expl@@@filehook at set@curr at file@@nNN
+              \__filehook_set_curr_file:nNN
 %    \end{macrocode}
 %    
 %    \begin{macrocode}
@@ -1348,7 +1342,6 @@
 %    \begin{macrocode}
 \cs_new_eq:NN \@expl@@@filehook at if@file at replaced@@TF
               \__filehook_if_file_replaced:TF
-
 %    \end{macrocode}
 %    
 %    \begin{macrocode}