[latex3-commits] [git/LaTeX3-latex3-latex2e] apdf161: Pass the correct argument to \@@_currname_or_default:n (0d9d2141)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex2e
On branch  : apdf161
Link       : https://github.com/latex3/latex2e/commit/0d9d2141502db29212c07608b36a826d01147caf

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

commit 0d9d2141502db29212c07608b36a826d01147caf
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date:   Mon Sep 7 16:00:34 2020 -0300

    Pass the correct argument to \@@_currname_or_default:n
    
    Corrects the behaviour of \hook_new: n{.} (for example)


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

0d9d2141502db29212c07608b36a826d01147caf
 base/lthooks.dtx                       | 2 +-
 base/testfiles-lthooks/lthooks-024.tlg | 5 ++---
 base/testfiles-lthooks/lthooks-026.tlg | 8 ++++----
 base/testfiles-lthooks/lthooks-027.tlg | 4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index e1a2962f..d441cf2f 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -1882,7 +1882,7 @@
       }
       {
         \str_if_eq:nnTF {#1} { . }
-          { \@@_currname_or_default:n {#1} }
+          { \@@_currname_or_default:n {#2} }
           { \@@_parse_dot_label:nw {#2} #1 ./ \s_@@_mark }
       }
   }
diff --git a/base/testfiles-lthooks/lthooks-024.tlg b/base/testfiles-lthooks/lthooks-024.tlg
index 33c0d440..cb975010 100644
--- a/base/testfiles-lthooks/lthooks-024.tlg
+++ b/base/testfiles-lthooks/lthooks-024.tlg
@@ -20,8 +20,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 and I'll forget about whatever was undefined.
 The hook 'foo':
  Code chunks:
-    top-level -> top-leveltop-level
-    . -> top-level
+    top-level -> top-leveltop-leveltop-level
     .. -> ..
     ../ -> ../
     / -> /
@@ -39,7 +38,7 @@ The hook 'foo':
  Rules:
     ---
  Execution order:
-    top-level, ., .., ../, /, //, top-level/, /./, .x, /.x, .x/, top-level/foo, top-level/foo/, /./foo
+    top-level, .., ../, /, //, top-level/, /./, .x, /.x, .x/, top-level/foo, top-level/foo/, /./foo
 ! Undefined control sequence.
 <argument> \::error 
                     ! hooks: Empty code label on line .... Using `top-level' ...
diff --git a/base/testfiles-lthooks/lthooks-026.tlg b/base/testfiles-lthooks/lthooks-026.tlg
index 9da783a5..d1b68886 100644
--- a/base/testfiles-lthooks/lthooks-026.tlg
+++ b/base/testfiles-lthooks/lthooks-026.tlg
@@ -2,14 +2,14 @@ This is a generated file for the l3build validation system.
 Don't change this file in any respect.
 The hook 'env/quote/begin':
  Code chunks:
-    . -> \typeout {quote begin}
+    top-level -> \typeout {quote begin}
     bar -> \typeout {quote begin 2}
  Extra code next invocation:
     ---
  Rules:
     ---
  Execution order:
-    ., bar
+    top-level, bar
 (../l3backend-dvips.def
 File: l3backend-dvips.def ....-..-.. L3 backend support: dvips
 \l__pdf_internal_box=\box...
@@ -43,14 +43,14 @@ quote end
 quote after
 The hook 'env/quote/after':
  Code chunks:
-    . -> \typeout {quote after}
+    top-level -> \typeout {quote after}
     foobar -> \typeout {quote after 2}
  Extra code next invocation:
     ---
  Rules:
     ---
  Execution order (after reversal):
-    foobar, .
+    foobar, top-level
 quote begin
 quote before 2
 quote begin
diff --git a/base/testfiles-lthooks/lthooks-027.tlg b/base/testfiles-lthooks/lthooks-027.tlg
index e7b6a7d6..a5e46d44 100644
--- a/base/testfiles-lthooks/lthooks-027.tlg
+++ b/base/testfiles-lthooks/lthooks-027.tlg
@@ -6,13 +6,13 @@ TEST 1: Using stuff once (expect 'aaa bbb'):
 aaa bbb
 The hook 'A':
  Code chunks:
-    . -> \message {aaa}
+    top-level -> \message {aaa}
  Extra code next invocation:
     ---
  Rules:
     ---
  Execution order:
-    .
+    top-level
 ============================================================
 ============================================================
 TEST 2:  Braces in hook names (expect 'aaa bbb'):