[latex3-commits] [git/LaTeX3-latex3-latex2e] hotfix/gh441: Fix bug in \hook_show:n (ea1bc5bc)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex2e
On branch  : hotfix/gh441
Link       : https://github.com/latex3/latex2e/commit/ea1bc5bc20c703086bcce92d304b5c7867e822e2

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

commit ea1bc5bc20c703086bcce92d304b5c7867e822e2
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date:   Wed Dec 16 21:24:28 2020 -0300

    Fix bug in \hook_show:n


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

ea1bc5bc20c703086bcce92d304b5c7867e822e2
 base/lthooks.dtx                       |  4 +++-
 base/testfiles-lthooks/lthooks-019.tlg | 12 ++++--------
 base/testfiles-lthooks/lthooks-020.tlg |  6 ++----
 base/testfiles-lthooks/lthooks-021.tlg |  6 ++----
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index 45f46761..acbe2583 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -3563,7 +3563,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_list_one_rule:nnn #1#2#3
   {
-    \@@_list_if_rule_exists:nnnF {#1} {#2} {#3} { }
+    \@@_list_if_rule_exists:nnnF {#1} {#2} {#3}
       { \@@_list_if_rule_exists:nnnF {#1} {#2} { ?? } { } }
   }
 \cs_new_protected:Npn \@@_list_if_rule_exists:nnnF #1#2#3
@@ -3571,7 +3571,9 @@
     \if_cs_exist:w g_@@_ #3 _rule_ #1 | #2 _tl \cs_end:
       \exp_args:Nv \@@_tmp:w
         { g_@@_ #3 _rule_ #1 | #2 _tl } { #1 | #2 } {#3}
+      \exp_after:wN \use_none:nn
     \fi:
+    \use:n
   }
 %    \end{macrocode}
 % \end{macro}
diff --git a/base/testfiles-lthooks/lthooks-019.tlg b/base/testfiles-lthooks/lthooks-019.tlg
index 1384077f..bf0c54e9 100644
--- a/base/testfiles-lthooks/lthooks-019.tlg
+++ b/base/testfiles-lthooks/lthooks-019.tlg
@@ -169,8 +169,7 @@ Handled code for my2
 >     ---
 > Rules:
 >     my3|my2 with default relation <
->     ---
-> Execution order:
+> Execution order (after applying rules):
 >     my1, my3, my2.
 Expected output: my1, my3, my2
 Update code for hook 'env/quote/after' on input line ...:
@@ -210,8 +209,7 @@ Handled code for my2
 >     ---
 > Rules:
 >     my3|my2 with default relation <
->     ---
-> Execution order (after reversal):
+> Execution order (after reversal and applying rules):
 >     my2, my3, my1.
 Expected output: my2, my3, my1
 **** Add to hook Start (zz1) on input line ... <- \typeout {A}
@@ -443,8 +441,7 @@ Handled code for zz3
 > Rules:
 >     zz2|zz1 with default relation <
 >     zz3|zz1 with default relation >
->     ---
-> Execution order:
+> Execution order (after applying rules):
 >     zz2, zz1, zz3.
 Update code for hook 'Stop' on input line ...:
  default rule zz2|zz1: < found
@@ -470,6 +467,5 @@ Handled code for zz3
 > Rules:
 >     zz2|zz1 with default relation <
 >     zz3|zz1 with default relation >
->     ---
-> Execution order (after reversal):
+> Execution order (after reversal and applying rules):
 >     zz3, zz1, zz2.
diff --git a/base/testfiles-lthooks/lthooks-020.tlg b/base/testfiles-lthooks/lthooks-020.tlg
index 95e93d57..e7487378 100644
--- a/base/testfiles-lthooks/lthooks-020.tlg
+++ b/base/testfiles-lthooks/lthooks-020.tlg
@@ -29,8 +29,7 @@ LaTeX Font Info:    ... okay on input line ....
 >     ---
 > Rules:
 >     label-3|label-2 with default relation <
->     ---
-> Execution order:
+> Execution order (after applying rules):
 >     label-1, label-3, label-4, label-5, label-6, label-2.
 -> The hook 'Rhook1':
 > Code chunks:
@@ -46,8 +45,7 @@ LaTeX Font Info:    ... okay on input line ....
 >     ---
 > Rules:
 >     label-3|label-2 with default relation <
->     ---
-> Execution order (after reversal):
+> Execution order (after reversal and applying rules):
 >     label-2, label-6, label-5, label-4, label-3, label-1.
 Nhook1
 A
diff --git a/base/testfiles-lthooks/lthooks-021.tlg b/base/testfiles-lthooks/lthooks-021.tlg
index 054d9d08..48b79139 100644
--- a/base/testfiles-lthooks/lthooks-021.tlg
+++ b/base/testfiles-lthooks/lthooks-021.tlg
@@ -108,8 +108,7 @@ Update code for hook '??' on input line ...:
 >     ---
 > Rules:
 >     label2|label1 with default relation <-
->     ---
-> Execution order:
+> Execution order (after applying rules):
 >     label1, label2.
 Update code for hook 'aaa' on input line ...:
  default rule label2|label1: <- found
@@ -131,6 +130,5 @@ Handled code for label2
 >     ---
 > Rules:
 >     label2|label1 with default relation <-
->     ---
-> Execution order:
+> Execution order (after applying rules):
 >     label1, label2.