[latex3-commits] [git/LaTeX3-latex3-latex2e] gh648: Only true for file-specific generic hooks (39ab696d)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex2e
On branch  : gh648
Link       : https://github.com/latex3/latex2e/commit/39ab696deea5c3500448c27c0c63884dc26c3f8c

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

commit 39ab696deea5c3500448c27c0c63884dc26c3f8c
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date:   Mon Aug 16 01:18:35 2021 -0300

    Only true for file-specific generic hooks


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

39ab696deea5c3500448c27c0c63884dc26c3f8c
 base/lthooks.dtx | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index 2223886b..e5394e75 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -2931,7 +2931,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_try_declaring_generic_hook:nNNnn #1
   {
-    \@@_if_file_hook:wTF #1 / / \s_@@_mark
+    \@@_if_file_hook:wTF #1 / / / \s_@@_mark
       {
         \exp_args:Ne \@@_try_declaring_generic_hook_split:nNNnn
           { \exp_args:Ne \@@_file_hook_normalize:n {#1} }
@@ -3077,14 +3077,17 @@
 %<latexrelease>\IncludeInRelease{2021/11/15}{\@@_if_file_hook:w}%
 %<latexrelease>                 {Standardise~generic~hook~names}
 \prg_new_conditional:Npnn \@@_if_file_hook:w
-    #1 / #2 / #3 \s_@@_mark { TF }
+    #1 / #2 / #3 / #4 \s_@@_mark { TF }
   {
     \str_if_eq:nnTF {#1} { file }
       {
-        \exp_args:NNx \prop_if_in:NnTF \c_@@_generics_file_prop
-            { \tl_if_empty:nTF {#3} {#2} {#3} }
-          { \prg_return_true: }
+        \tl_if_empty:nTF {#3}
           { \prg_return_false: }
+          {
+            \prop_if_in:NnTF \c_@@_generics_file_prop {#3}
+              { \prg_return_true: }
+              { \prg_return_false: }
+          }
       }
       { \prg_return_false: }
   }
@@ -4412,7 +4415,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_try_file_hook:n #1
   {
-    \@@_if_file_hook:wTF #1 / / \s_@@_mark
+    \@@_if_file_hook:wTF #1 / / / \s_@@_mark
       {
         \exp_args:Ne \@@_if_usable_use:n
           { \exp_args:Ne \@@_file_hook_normalize:n {#1} }