[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Separate \hook_show:n and \hook_log:n (38b644fe)

PhelypeOleinik phelype.oleinik at latex-project.org
Fri Sep 11 09:41:45 CEST 2020


Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/38b644fefe73708bd5ae49ddc0db05ab3f99d6c5

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

commit 38b644fefe73708bd5ae49ddc0db05ab3f99d6c5
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date:   Fri Sep 11 04:41:45 2020 -0300

    Separate \hook_show:n and \hook_log:n


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

38b644fefe73708bd5ae49ddc0db05ab3f99d6c5
 base/lthooks.dtx                            | 46 +++++++++++++++++------------
 base/testfiles-disabled/lthooks2-001.lvt    | 12 ++++----
 base/testfiles-disabled/shipout-003.lvt     |  4 +--
 base/testfiles-lthooks/filehook-003.lvt     |  6 ++--
 base/testfiles-lthooks/filehook-bug-140.lvt |  2 +-
 base/testfiles-lthooks/lthooks-009.lvt      |  8 ++---
 base/testfiles-lthooks/lthooks-010.lvt      | 18 +++++------
 base/testfiles-lthooks/lthooks-013.lvt      | 10 +++----
 base/testfiles-lthooks/lthooks-016.lvt      |  6 ++--
 base/testfiles-lthooks/lthooks-018.lvt      |  2 +-
 base/testfiles-lthooks/lthooks-019.lvt      | 26 ++++++++--------
 base/testfiles-lthooks/lthooks-020.lvt      | 12 ++++----
 base/testfiles-lthooks/lthooks-021.lvt      |  4 +--
 base/testfiles-lthooks/lthooks-022.lvt      | 10 +++----
 base/testfiles-lthooks/lthooks-023.lvt      |  2 +-
 base/testfiles-lthooks/lthooks-023.tlg      |  2 +-
 base/testfiles-lthooks/lthooks-024.lvt      |  4 +--
 base/testfiles-lthooks/lthooks-026.lvt      |  4 +--
 base/testfiles-lthooks/lthooks-027.lvt      |  8 ++---
 base/testfiles-lthooks/lthooks-errors.lvt   |  2 +-
 base/testfiles-lthooks/lthooks-errors.tlg   |  2 +-
 base/testfiles-lthooks2/lthooks2-002.lvt    | 12 ++++----
 22 files changed, 105 insertions(+), 97 deletions(-)

diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index 03ecc080..a260bdde 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -1635,10 +1635,11 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\tl_gremove_once:Nx}
+% \begin{macro}{\tl_gremove_once:Nx,\tl_show:x}
 %   Some variants of \pkg{expl3} functions. \fmi{should be moved to expl3}
 %    \begin{macrocode}
 \cs_generate_variant:Nn \tl_gremove_once:Nn { Nx }
+\cs_generate_variant:Nn \tl_show:n { x }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -3191,13 +3192,17 @@
 %
 %
 %
-%  \begin{macro}{\hook_log:n}
-%    This writes out information about the hook given in its argument
-%    onto the terminal and the \texttt{.log} file.
+% \begin{macro}{\hook_show:n,\hook_log:n}
+%   This writes out information about the hook given in its argument
+%   onto the \texttt{.log} file and the terminal, if \cs{show_hook:n} is
+%   used.  Internally both share the same structure, except that at the
+%   end, \cs{hook_show:n} triggers \TeX's prompt.
 %    \begin{macrocode}
 \cs_new_protected:Npn \hook_log:n #1
-  { \@@_normalize_hook_args:Nn \@@_log:n {#1} }
-\cs_new_protected:Npn \@@_log:n #1
+  { \@@_normalize_hook_args:Nn \@@_log:nN {#1} \iow_log:x }
+\cs_new_protected:Npn \hook_show:n #1
+  { \@@_normalize_hook_args:Nn \@@_log:nN {#1} \tl_show:x }
+\cs_new_protected:Npn \@@_log:nN #1 #2
   {
     \@@_preamble_hook:n {#1}
     \iow_term:x{^^JThe~ hook~ '#1':}
@@ -3219,16 +3224,19 @@
 %    
 %    \begin{macrocode}
         \iow_term:x{~Extra~ code~ next~ invocation:}
-        \iow_term:x{\@spaces
-          \tl_if_empty:cTF { @@_next~#1 }
-             {---}
+        \iow_term:x
+          {
+            \@spaces
+            \tl_if_empty:cTF { @@_next~#1 }
+              {---}
 %    \end{macrocode}
 %    If the token list is not empty we want to display it but without
 %    the first tokens (the code to clear itself) so we call a helper
 %    command to  get rid of them.
 %    \begin{macrocode}
-             {->~  \exp_args:Nv
-                   \@@_log_next_code:n {@@_next~#1} } }
+              {->~ \exp_args:Nv
+                   \@@_log_next_code:n {@@_next~#1} }
+          }
 %    \end{macrocode}
 %
 %   Loop through the rules in a hook and for every rule found, print it.
@@ -3244,7 +3252,8 @@
               {
                 \@spaces ##2~ with~
                 \str_if_eq:nnT {##3} {??} { default~ }
-                relation~ ##1 }
+                relation~ ##1
+              }
           }
         \bool_if:NT \l_@@_tmpa_bool
           { \iow_term:x { \@spaces --- } }
@@ -3265,7 +3274,7 @@
                  }
                :
               }
-            \iow_term:x
+            #2 % \tl_show:n
               {
                 \@spaces
                 \clist_if_empty:cTF { g_@@_#1_labels_clist }
@@ -3275,8 +3284,7 @@
           }
           { #2 { ~Execution~order~not~set~yet. } }
       }
-      { \iow_term:n { ~The~hook~is~empty. } }
-    \iow_term:n { }
+      { #2 { ~The~hook~is~empty. } }
   }
 %    \end{macrocode}
 %
@@ -3802,12 +3810,12 @@
 %
 %
 %
-%  \begin{macro}{\ShowHook}
-%    
+% \begin{macro}{\ShowHook,\LogHook}
 %    \begin{macrocode}
-\cs_new_protected:Npn \ShowHook { \hook_log:n }
+\cs_new_protected:Npn \ShowHook { \hook_show:n }
+\cs_new_protected:Npn \LogHook { \hook_log:n }
 %    \end{macrocode}
-%  \end{macro}
+% \end{macro}
 %
 %  \begin{macro}{\DebugHooksOn,\DebugHooksOff}
 %    
diff --git a/base/testfiles-disabled/lthooks2-001.lvt b/base/testfiles-disabled/lthooks2-001.lvt
index 3b05d7b4..a327565f 100644
--- a/base/testfiles-disabled/lthooks2-001.lvt
+++ b/base/testfiles-disabled/lthooks2-001.lvt
@@ -14,15 +14,15 @@
 
 \usepackage{hyperref}
 
-\ShowHook{begindocument}
+\LogHook{begindocument}
 
 \begin{document}
 
-\ShowHook{enddocument}
-\ShowHook{enddocument/afterlastpage}
-\ShowHook{enddocument/afteraux}
-\ShowHook{enddocument/info}
-\ShowHook{enddocument/end}
+\LogHook{enddocument}
+\LogHook{enddocument/afterlastpage}
+\LogHook{enddocument/afteraux}
+\LogHook{enddocument/info}
+\LogHook{enddocument/end}
 
 \section{A}\label{A}
 
diff --git a/base/testfiles-disabled/shipout-003.lvt b/base/testfiles-disabled/shipout-003.lvt
index 47297a09..47c0aef0 100644
--- a/base/testfiles-disabled/shipout-003.lvt
+++ b/base/testfiles-disabled/shipout-003.lvt
@@ -20,8 +20,8 @@
 \AtBeginShipout{%
   \AtBeginShipoutUpperLeft{\put(0.5\paperwidth,-0.5\paperheight){\circle{10}}}}
 
-\ShowHook{shipout/before}
-\ShowHook{shipout/background}
+\LogHook{shipout/before}
+\LogHook{shipout/background}
 
 \begin{document}
 
diff --git a/base/testfiles-lthooks/filehook-003.lvt b/base/testfiles-lthooks/filehook-003.lvt
index 7bd8c499..dc5fe71f 100644
--- a/base/testfiles-lthooks/filehook-003.lvt
+++ b/base/testfiles-lthooks/filehook-003.lvt
@@ -22,9 +22,9 @@
 
 \begin{document}
 
-\ShowHook{include/before}
-\ShowHook{include/after}
-\ShowHook{include/end}
+\LogHook{include/before}
+\LogHook{include/after}
+\LogHook{include/end}
 
 \END
 
diff --git a/base/testfiles-lthooks/filehook-bug-140.lvt b/base/testfiles-lthooks/filehook-bug-140.lvt
index 179236eb..e7af1a88 100644
--- a/base/testfiles-lthooks/filehook-bug-140.lvt
+++ b/base/testfiles-lthooks/filehook-bug-140.lvt
@@ -18,7 +18,7 @@
 \AddToHook{file/before/\jobname-\foobar.tex}{\typeout{3}}
 \AddToHook{file/after/\jobname-\foobar.tex}{\typeout{3}}
 
-\ShowHook{file/before/\jobname-foo-bar.tex}
+\LogHook{file/before/\jobname-foo-bar.tex}
 
 \typeout{----------------------}
 
diff --git a/base/testfiles-lthooks/lthooks-009.lvt b/base/testfiles-lthooks/lthooks-009.lvt
index d232eec6..43a2225b 100644
--- a/base/testfiles-lthooks/lthooks-009.lvt
+++ b/base/testfiles-lthooks/lthooks-009.lvt
@@ -44,15 +44,15 @@
 \AddToHookNext{hook}{\hello}
 \AddToHookNext{hook}{\AddToHookNext{hook}{nested}}
 \AddToHookNext{hook}{world!}
-\ShowHook{hook}
+\LogHook{hook}
 
 \typeout{Use 'hook': \UseHook{hook}}
-\ShowHook{hook}
+\LogHook{hook}
 
 \typeout{and again: \UseHook{hook}}
-\ShowHook{hook}
+\LogHook{hook}
 
 \typeout{once more: \UseHook{hook}}
-\ShowHook{hook}
+\LogHook{hook}
 
 \end{document}
diff --git a/base/testfiles-lthooks/lthooks-010.lvt b/base/testfiles-lthooks/lthooks-010.lvt
index 7efac2b3..2732c019 100644
--- a/base/testfiles-lthooks/lthooks-010.lvt
+++ b/base/testfiles-lthooks/lthooks-010.lvt
@@ -29,46 +29,46 @@
 \prop_show:c{g__hook_sffamily_code_prop}
 \ExplSyntaxOff
 
-\ShowHook{sffamily}
+\LogHook{sffamily}
 
 \begin{document}
 
 \sffamily              % first next code
-\ShowHook{sffamily}
+\LogHook{sffamily}
 
 \AddToHook     {sffamily}[baz] {baz code}
-\ShowHook{sffamily}
+\LogHook{sffamily}
 
 \sffamily
-\ShowHook{sffamily}     % second next code
+\LogHook{sffamily}     % second next code
 
 \ExplSyntaxOn
 \prop_show:c{g__hook_sffamily_code_prop}
 \ExplSyntaxOff
 
 \sffamily
-\ShowHook{sffamily}
+\LogHook{sffamily}
 
-\ShowHook{enddocument}
+\LogHook{enddocument}
 
 \typeout{--- New hook after begin document ---}
 
 \NewHook{xxx}
 
-\ShowHook{xxx}
+\LogHook{xxx}
 
 \UseHook{xxx}
 
 \AddToHook{xxx}     {\typeout{some code ...}}
 \AddToHook{xxx}[foo]{\typeout{some foo code ...}}
 
-\ShowHook{xxx}
+\LogHook{xxx}
 
 \UseHook{xxx}
 
 \RemoveFromHook{xxx}[*]
 
-\ShowHook{xxx}
+\LogHook{xxx}
 
 
 
diff --git a/base/testfiles-lthooks/lthooks-013.lvt b/base/testfiles-lthooks/lthooks-013.lvt
index 21c273e1..d0c33aa9 100644
--- a/base/testfiles-lthooks/lthooks-013.lvt
+++ b/base/testfiles-lthooks/lthooks-013.lvt
@@ -26,16 +26,16 @@
 
 \AddToHook{file/bar}{\typeout{file bar}}
 
-\ShowHook{env/itemize/begin}
-\ShowHook{file/bar}
-\ShowHook{file/foo}
+\LogHook{env/itemize/begin}
+\LogHook{file/bar}
+\LogHook{file/foo}
 
-\ShowHook{env/itemize/began}     % this one has a typo
+\LogHook{env/itemize/began}     % this one has a typo
 
 
 \AddToHook{baz}{missing decl}
 
-\ShowHook{bar}
+\LogHook{bar}
 
 
 \begin{document}
diff --git a/base/testfiles-lthooks/lthooks-016.lvt b/base/testfiles-lthooks/lthooks-016.lvt
index 4d1f1ef3..00c5926b 100644
--- a/base/testfiles-lthooks/lthooks-016.lvt
+++ b/base/testfiles-lthooks/lthooks-016.lvt
@@ -37,8 +37,8 @@
 \TIMO
 
 
-\ShowHook{xxx}
-\ShowHook{yyy}
-\ShowHook{zzz}
+\LogHook{xxx}
+\LogHook{yyy}
+\LogHook{zzz}
 
 \END
diff --git a/base/testfiles-lthooks/lthooks-018.lvt b/base/testfiles-lthooks/lthooks-018.lvt
index e4e81c14..c3f19a47 100644
--- a/base/testfiles-lthooks/lthooks-018.lvt
+++ b/base/testfiles-lthooks/lthooks-018.lvt
@@ -17,6 +17,6 @@
 
 \AddToHook{env/before/quote}[my1]{\dotfill before 1\dotfill\par}
 
-\ShowHook{env/before/quote}
+\LogHook{env/before/quote}
 
 \END
diff --git a/base/testfiles-lthooks/lthooks-019.lvt b/base/testfiles-lthooks/lthooks-019.lvt
index c7c5dc32..22318aa1 100644
--- a/base/testfiles-lthooks/lthooks-019.lvt
+++ b/base/testfiles-lthooks/lthooks-019.lvt
@@ -27,7 +27,7 @@
 
 \UseHook{xx}
 
-\ShowHook{xx}
+\LogHook{xx}
 
 \typeout{Expected output: my1 my3 my4 my2}
 
@@ -49,7 +49,7 @@
 
 \UseHook{yy}
 
-\ShowHook{yy}
+\LogHook{yy}
 
 \typeout{Expected output:  my2, my5, my4, my3, my1}
 
@@ -71,12 +71,12 @@
 
 
 \UseHook{env/quote/before}
-\ShowHook{env/quote/before}
+\LogHook{env/quote/before}
 
 \typeout{Expected output:  my1, my3, top-level, my2}
 
 \UseHook{env/quote/after}
-\ShowHook{env/quote/after}
+\LogHook{env/quote/after}
 
 \typeout{Expected output:  my2, top-level, my3, my1}
 
@@ -95,12 +95,12 @@
 \UseHook{Start}
 \UseHook{Stop}
 
-\ShowHook{Start}
-\ShowHook{Stop}
+\LogHook{Start}
+\LogHook{Stop}
 
 \DeclareHookRule{Stop}{zz3}{before}{zz4}
 
-\ShowHook{Stop}
+\LogHook{Stop}
 
 \RemoveFromHook{Start}[*]
 \RemoveFromHook{Stop}[zz1]
@@ -109,8 +109,8 @@
 \RemoveFromHook{Stop}[zz4]
 
 
-\ShowHook{Start}
-\ShowHook{Stop}
+\LogHook{Start}
+\LogHook{Stop}
 
 \DeclareHookRule{Stop}{zz3}{unrelated}{zz4}
 
@@ -126,8 +126,8 @@
 \UseHook{Start}
 \UseHook{Stop}
 
-\ShowHook{Start}
-\ShowHook{Stop}
+\LogHook{Start}
+\LogHook{Stop}
 
 \RemoveFromHook{Start}[*]
 \RemoveFromHook{Stop}[*]
@@ -146,8 +146,8 @@
 \UseHook{Start}
 \UseHook{Stop}
 
-\ShowHook{Start}
-\ShowHook{Stop}
+\LogHook{Start}
+\LogHook{Stop}
 
 \END
 
diff --git a/base/testfiles-lthooks/lthooks-020.lvt b/base/testfiles-lthooks/lthooks-020.lvt
index cbcda360..4349ba87 100644
--- a/base/testfiles-lthooks/lthooks-020.lvt
+++ b/base/testfiles-lthooks/lthooks-020.lvt
@@ -78,8 +78,8 @@
 
 \begin{document}
 
-\ShowHook{Nhook1}
-\ShowHook{Rhook1}
+\LogHook{Nhook1}
+\LogHook{Rhook1}
 
 \typeout{Nhook1}
 \UseHook{Nhook1}
@@ -88,8 +88,8 @@
 
 %------------------------------
 
-\ShowHook{Nhook2}
-\ShowHook{Rhook2}
+\LogHook{Nhook2}
+\LogHook{Rhook2}
 
 \typeout{Nhook2}
 \UseHook{Nhook2}
@@ -98,8 +98,8 @@
 
 %------------------------------
 
-\ShowHook{Nhook3}
-\ShowHook{Rhook3}
+\LogHook{Nhook3}
+\LogHook{Rhook3}
 
 \typeout{Nhook3}
 \UseHook{Nhook3}
diff --git a/base/testfiles-lthooks/lthooks-021.lvt b/base/testfiles-lthooks/lthooks-021.lvt
index 007046e9..9453e252 100644
--- a/base/testfiles-lthooks/lthooks-021.lvt
+++ b/base/testfiles-lthooks/lthooks-021.lvt
@@ -24,12 +24,12 @@
 % because '??' isn't recognised:
 \DeclareHookRule{??}{label1}{voids}{label2}
 
-\ShowHook{aaa}
+\LogHook{aaa}
 
 \ExplSyntaxOn
 \__hook_initialize_hook_code:n {aaa}
 \ExplSyntaxOff
 
-\ShowHook{aaa}
+\LogHook{aaa}
 
 \END
diff --git a/base/testfiles-lthooks/lthooks-022.lvt b/base/testfiles-lthooks/lthooks-022.lvt
index 93b46bea..c9943028 100644
--- a/base/testfiles-lthooks/lthooks-022.lvt
+++ b/base/testfiles-lthooks/lthooks-022.lvt
@@ -15,16 +15,16 @@
 \AddToHook{foo}[label-C]{\typeout{C-code}}
 
 \DeclareHookRule{foo}{label-A}{voids}{label-B}
-\ShowHook{foo}
+\LogHook{foo}
 
 \DeclareHookRule{foo}{label-A}{incompatible-warning}{label-B}
-\ShowHook{foo}
+\LogHook{foo}
 
 \DeclareHookRule{foo}{label-A}{unrelated}{label-B}
-\ShowHook{foo}
+\LogHook{foo}
 
 \DeclareHookRule{foo}{label-B}{before}{label-A}
-\ShowHook{foo}
+\LogHook{foo}
 
 
 
@@ -32,7 +32,7 @@
 \begin{document}
 \TIMO
 
-\ShowHook{foo}
+\LogHook{foo}
 
 \UseHook{foo}
 \END
diff --git a/base/testfiles-lthooks/lthooks-023.lvt b/base/testfiles-lthooks/lthooks-023.lvt
index 660b84de..a35d2c36 100644
--- a/base/testfiles-lthooks/lthooks-023.lvt
+++ b/base/testfiles-lthooks/lthooks-023.lvt
@@ -30,7 +30,7 @@
 % Resolve an incompatibility
 \DeclareHookRule{foo}{label-C}{voids}{label-A}
 
-\ShowHook{foo}
+\LogHook{foo}
 
 \UseHook{foo}
 
diff --git a/base/testfiles-lthooks/lthooks-023.tlg b/base/testfiles-lthooks/lthooks-023.tlg
index bd47ae11..8707480b 100644
--- a/base/testfiles-lthooks/lthooks-023.tlg
+++ b/base/testfiles-lthooks/lthooks-023.tlg
@@ -8,7 +8,7 @@ Package hooks Warning: Labels `label-E' and `label-D' are incompatible. You
 (hooks)                code for both labels will be dropped.
 For immediate help type H <return>.
  ...                                              
-l. ...\ShowHook{foo}
+l. ...\LogHook{foo}
 LaTeX found two incompatible labels in the same hook. This indicates an
 incompatibility between packages.
 The hook 'foo':
diff --git a/base/testfiles-lthooks/lthooks-024.lvt b/base/testfiles-lthooks/lthooks-024.lvt
index 3154af46..5e415086 100644
--- a/base/testfiles-lthooks/lthooks-024.lvt
+++ b/base/testfiles-lthooks/lthooks-024.lvt
@@ -32,7 +32,7 @@
   \AddToHook{foo}[./foo/]{#1/foo/  } % Valid
   \AddToHook{foo}[/./foo]{/./foo   }
   \__hook_initialize_hook_code:n {foo}
-  \ShowHook{foo}
+  \LogHook{foo}
   \RemoveFromHook{foo}[*]
 }
 \ExplSyntaxOff
@@ -51,7 +51,7 @@
 \def\testme#1{%
   \expanded{\AddToHook{foo}[./foo]{#1/foo}} % Valid
   \csname __hook_initialize_hook_code:n\endcsname {foo}
-  \ShowHook{foo}
+  \LogHook{foo}
   \RemoveFromHook{foo}[*]
 }
 
diff --git a/base/testfiles-lthooks/lthooks-026.lvt b/base/testfiles-lthooks/lthooks-026.lvt
index 8fe8a98c..4e0cb381 100644
--- a/base/testfiles-lthooks/lthooks-026.lvt
+++ b/base/testfiles-lthooks/lthooks-026.lvt
@@ -15,7 +15,7 @@
 \AtBeginEnvironment[bar]{quote}{\typeout{quote begin 2}}
 
 
-\ShowHook{env/quote/begin}
+\LogHook{env/quote/begin}
 
 
 \begin{document}
@@ -25,7 +25,7 @@
 \AtEndEnvironment[baz]{quote}{\typeout{quote end 2}}
 \AfterEndEnvironment[foobar]{quote}{\typeout{quote after 2}}
 
-\ShowHook{env/quote/after}
+\LogHook{env/quote/after}
 
 \begin{quote} test 2 \end{quote}
 
diff --git a/base/testfiles-lthooks/lthooks-027.lvt b/base/testfiles-lthooks/lthooks-027.lvt
index 5824e2fc..eed7c641 100644
--- a/base/testfiles-lthooks/lthooks-027.lvt
+++ b/base/testfiles-lthooks/lthooks-027.lvt
@@ -30,7 +30,7 @@
     \DeclareHookRule { A } { . } { after } { x }
     \UseOneTimeHook {-{hook}-}
     \AddToHook { -{hook}- } [ x ] {\message{bbb}}
-    \ShowHook { -{hook}- }
+    \LogHook { -{hook}- }
   }
 
 \TEST { Macro with argument (expect 'my-bar.xxx' and 'after'): }
@@ -46,7 +46,7 @@
     \DeclareHookRule { A } { . } { after } { x }
     \UseOneTimeHook {grüße}
     \AddToHook { grüße } [ x ] {\message{bbb}}
-    \ShowHook { grüße }
+    \LogHook { grüße }
   }
 
 \def\hookname{鉤}
@@ -58,7 +58,7 @@
     \DeclareHookRule { A } { . } { after } { x }
     \UseOneTimeHook {\hookname}
     \AddToHook { \hookname } [ x ] {\message{bbb}}
-    \ShowHook { \hookname }
+    \LogHook { \hookname }
   }
 
 \def\hookname{ <-with spaces-> }
@@ -70,7 +70,7 @@
     \DeclareHookRule { A } { . } { after } { x }
     \UseOneTimeHook {\hookname}
     \AddToHook { \hookname } [ x ] {\message{bbb}}
-    \ShowHook { \hookname }
+    \LogHook { \hookname }
   }
 
 \end{document}
diff --git a/base/testfiles-lthooks/lthooks-errors.lvt b/base/testfiles-lthooks/lthooks-errors.lvt
index 7beac3bc..db381466 100644
--- a/base/testfiles-lthooks/lthooks-errors.lvt
+++ b/base/testfiles-lthooks/lthooks-errors.lvt
@@ -25,7 +25,7 @@
 
 \DeclareHookRule {xxx} {label1} {incompatible-error} {label5}
 
-\ShowHook{xxx}
+\LogHook{xxx}
 
 \makeatletter
 \@expl@@@filehook at file@pop@@
diff --git a/base/testfiles-lthooks/lthooks-errors.tlg b/base/testfiles-lthooks/lthooks-errors.tlg
index 307c0e93..9a01f860 100644
--- a/base/testfiles-lthooks/lthooks-errors.tlg
+++ b/base/testfiles-lthooks/lthooks-errors.tlg
@@ -14,7 +14,7 @@ Package hooks Warning: Labels `label4' and `label3' are incompatible in hook
 (hooks)                `xxx'. The code for both labels will be dropped.
 For immediate help type H <return>.
  ...                                              
-l. ...\ShowHook{xxx}
+l. ...\LogHook{xxx}
 LaTeX found two incompatible labels in the same hook. This indicates an
 incompatibility between packages.
 The hook 'xxx':
diff --git a/base/testfiles-lthooks2/lthooks2-002.lvt b/base/testfiles-lthooks2/lthooks2-002.lvt
index cc3b99ab..05c94989 100644
--- a/base/testfiles-lthooks2/lthooks2-002.lvt
+++ b/base/testfiles-lthooks2/lthooks2-002.lvt
@@ -17,17 +17,17 @@
 
 \AfterEndDocument{\typeout{in preamble}}
 
-\ShowHook{begindocument}
+\LogHook{begindocument}
 
 \begin{document}
 
 \AfterEndDocument{\typeout{after preamble}}
 
-\ShowHook{enddocument}
-\ShowHook{enddocument/afterlastpage}
-\ShowHook{enddocument/afteraux}
-\ShowHook{enddocument/info}
-\ShowHook{enddocument/end}
+\LogHook{enddocument}
+\LogHook{enddocument/afterlastpage}
+\LogHook{enddocument/afteraux}
+\LogHook{enddocument/info}
+\LogHook{enddocument/end}
 
 
 \typeout{Without updates to etoolbox the order will get reversed:}





More information about the latex3-commits mailing list.