[latex3-commits] [latex3/latex2e] cmd-args: Update test files (bdfb6bec)
github at latex-project.org
github at latex-project.org
Thu May 18 01:59:38 CEST 2023
Repository : https://github.com/latex3/latex2e
On branch : cmd-args
Link : https://github.com/latex3/latex2e/commit/bdfb6bec0285fdc02553ae73c911ff1afe3bbc7e
>---------------------------------------------------------------
commit bdfb6bec0285fdc02553ae73c911ff1afe3bbc7e
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date: Wed May 17 20:59:38 2023 -0300
Update test files
>---------------------------------------------------------------
bdfb6bec0285fdc02553ae73c911ff1afe3bbc7e
base/testfiles-lthooks/github-0674.tlg | 4 ++--
base/testfiles-lthooks/ltcmdhooks-001.tlg | 20 +++++++++++++++++--
base/testfiles-lthooks/ltcmdhooks-002.tlg | 16 +++++++++++++--
base/testfiles-lthooks/ltcmdhooks-003.tlg | 32 +++++++++++++++---------------
base/testfiles-lthooks/ltcmdhooks-004.tlg | 10 +++++++++-
base/testfiles-lthooks/ltcmdhooks-005.tlg | 2 +-
base/testfiles-lthooks/ltcmdhooks-005a.tlg | 2 +-
7 files changed, 61 insertions(+), 25 deletions(-)
diff --git a/base/testfiles-lthooks/github-0674.tlg b/base/testfiles-lthooks/github-0674.tlg
index d0aed422..4fe13b05 100644
--- a/base/testfiles-lthooks/github-0674.tlg
+++ b/base/testfiles-lthooks/github-0674.tlg
@@ -3,11 +3,11 @@ Don't change this file in any respect.
> \textbf=robust macro:
->\protect \textbf .
> \textbf =\long macro:
-#1->\UseHook {cmd/textbf/before}\ifmmode \nfss at text {\bfseries #1}\else \hmode at bgroup \text at command {#1}\bfseries \check at icl #1\check at icr \expandafter \egroup \fi \UseHook {cmd/textbf/after}.
+#1->\UseHookWithArguments {cmd/textbf/before}{1}{#1}\ifmmode \nfss at text {\bfseries #1}\else \hmode at bgroup \text at command {#1}\bfseries \check at icl #1\check at icr \expandafter \egroup \fi \UseHookWithArguments {cmd/textbf/after}{1}{#1}.
<argument> \textbf
l. ...\ShowCommand\textbf
% after hook not patched in but "befor...
> \foo=macro:
-#1/#2->\UseHook {cmd/foo/before}<foo code>\UseHook {cmd/foo/after}.
+#1/#2->\UseHookWithArguments {cmd/foo/before}{2}{#1}{#2}<foo code>\UseHookWithArguments {cmd/foo/after}{2}{#1}{#2}.
<argument> \foo
l. ...\ShowCommand\foo
diff --git a/base/testfiles-lthooks/ltcmdhooks-001.tlg b/base/testfiles-lthooks/ltcmdhooks-001.tlg
index 9338ad7c..4ff07daa 100644
--- a/base/testfiles-lthooks/ltcmdhooks-001.tlg
+++ b/base/testfiles-lthooks/ltcmdhooks-001.tlg
@@ -254,9 +254,17 @@ LaTeX Font Info: ... okay on input line ....
[lthooks] ++ trying to patch by retokenization
[lthooks] ++ macro can be retokenized cleanly
[lthooks] == retokenizing macro now
+Update code for hook 'cmd/foo/before' on input line ...:
+Code labels for sorting:
+ x and y
+Data structure for label rules:
+ x = 0 ->
+ y = 0 ->
+Handled code for x
+Handled code for y
-> \begin{document} try cmd/foo/after.
[lthooks] analyzing '\foo'
-[lthooks] \foo=\long macro:#1#2->\UseHook {cmd/foo/before}FOO #1 #2
+[lthooks] \foo=\long macro:#1#2->\UseHookWithArguments {cmd/foo/before}{2}{#1}{#2}FOO #1 #2
[lthooks] ++ control sequence is defined
[lthooks] ++ control sequence is a macro
[lthooks] ++ macro is not private
@@ -264,8 +272,16 @@ LaTeX Font Info: ... okay on input line ....
[lthooks] ++ trying to patch by retokenization
[lthooks] ++ macro can be retokenized cleanly
[lthooks] == retokenizing macro now
+Update code for hook 'cmd/foo/after' on input line ...:
+Code labels for sorting:
+ x and y
+Data structure for label rules:
+ x = 0 ->
+ y = 0 ->
+Handled code for x
+Handled code for y
> \foo=\long macro:
-#1#2->\UseHook {cmd/foo/before}FOO #1 #2\UseHook {cmd/foo/after}.
+#1#2->\UseHookWithArguments {cmd/foo/before}{2}{#1}{#2}FOO #1 #2\UseHookWithArguments {cmd/foo/after}{2}{#1}{#2}.
l. ...\show\foo
before 1 before 2 FOO hello world after 2 after 1
-> Adding cmd hook to 'baz' (before):
diff --git a/base/testfiles-lthooks/ltcmdhooks-002.tlg b/base/testfiles-lthooks/ltcmdhooks-002.tlg
index 04853f50..887fda93 100644
--- a/base/testfiles-lthooks/ltcmdhooks-002.tlg
+++ b/base/testfiles-lthooks/ltcmdhooks-002.tlg
@@ -40,9 +40,15 @@ l. ...\show\foo
[lthooks] ++ trying to patch by retokenization
[lthooks] ++ macro can be retokenized cleanly
[lthooks] == retokenizing macro now
+Update code for hook 'cmd/foo/before' on input line ...:
+Code labels for sorting:
+ x
+Data structure for label rules:
+ x = 0 ->
+Handled code for x
-> \begin{document} try cmd/foo/after.
[lthooks] analyzing '\foo'
-[lthooks] \foo=\long macro:#1#2->\UseHook {cmd/foo/before}FOO #1 #2
+[lthooks] \foo=\long macro:#1#2->\UseHookWithArguments {cmd/foo/before}{2}{#1}{#2}FOO #1 #2
[lthooks] ++ control sequence is defined
[lthooks] ++ control sequence is a macro
[lthooks] ++ macro is not private
@@ -50,8 +56,14 @@ l. ...\show\foo
[lthooks] ++ trying to patch by retokenization
[lthooks] ++ macro can be retokenized cleanly
[lthooks] == retokenizing macro now
+Update code for hook 'cmd/foo/after' on input line ...:
+Code labels for sorting:
+ x
+Data structure for label rules:
+ x = 0 ->
+Handled code for x
> \foo=\long macro:
-#1#2->\UseHook {cmd/foo/before}FOO #1 #2\UseHook {cmd/foo/after}.
+#1#2->\UseHookWithArguments {cmd/foo/before}{2}{#1}{#2}FOO #1 #2\UseHookWithArguments {cmd/foo/after}{2}{#1}{#2}.
l. ...\show\foo
Completed box being shipped out [1]
\vbox(633.0+0.0)x407.0
diff --git a/base/testfiles-lthooks/ltcmdhooks-003.tlg b/base/testfiles-lthooks/ltcmdhooks-003.tlg
index bfbb7208..73547cc6 100644
--- a/base/testfiles-lthooks/ltcmdhooks-003.tlg
+++ b/base/testfiles-lthooks/ltcmdhooks-003.tlg
@@ -13,7 +13,7 @@ Don't change this file in any respect.
**** Add to hook cmd/fooA/before (lbl) on input line ... <- before
-> Adding cmd hook to 'fooA' (after):
[lthooks] analyzing '\fooA'
-[lthooks] \fooA=\long macro:#1#2#3->\UseHook {cmd/fooA/before}(#1,#2,#3)
+[lthooks] \fooA=\long macro:#1#2#3->\UseHookWithArguments {cmd/fooA/before}{3}{#1}{#2}{#3}(#1,#2,#3)
[lthooks] ++ control sequence is defined
[lthooks] ++ control sequence is a macro
[lthooks] ++ macro is not private
@@ -23,7 +23,7 @@ Don't change this file in any respect.
[lthooks] == retokenizing macro now
**** Add to hook cmd/fooA/after (lbl) on input line ... <- after
> \fooA=\long macro:
-#1#2#3->\UseHook {cmd/fooA/before}(#1,#2,#3)\UseHook {cmd/fooA/after}.
+#1#2#3->\UseHookWithArguments {cmd/fooA/before}{3}{#1}{#2}{#3}(#1,#2,#3)\UseHookWithArguments {cmd/fooA/after}{3}{#1}{#2}{#3}.
<argument> \fooA
l. ...\test\newcommand\fooA[3]{(#1,#2,#3)}
-> Adding cmd hook to 'fooB' (before):
@@ -46,7 +46,7 @@ l. ...\test\newcommand\fooA[3]{(#1,#2,#3)}
->\@protected at testopt \fooB \\fooB {x}.
> \\fooB=\long macro:
> default #1=x.
-[#1]#2#3->\UseHook {cmd/fooB/before}(#1,#2,#3)\UseHook {cmd/fooB/after}.
+[#1]#2#3->\UseHookWithArguments {cmd/fooB/before}{3}{#1}{#2}{#3}(#1,#2,#3)\UseHookWithArguments {cmd/fooB/after}{3}{#1}{#2}{#3}.
<recently read> }
l. ...\test\newcommand\fooB[3][x]{(#1,#2,#3)}
-> Adding cmd hook to 'fooC' (before):
@@ -68,7 +68,7 @@ l. ...\test\newcommand\fooB[3][x]{(#1,#2,#3)}
> \fooC=robust macro:
->\protect \fooC .
> \fooC =\long macro:
-#1#2#3->\UseHook {cmd/fooC/before}(#1,#2,#3)\UseHook {cmd/fooC/after}.
+#1#2#3->\UseHookWithArguments {cmd/fooC/before}{3}{#1}{#2}{#3}(#1,#2,#3)\UseHookWithArguments {cmd/fooC/after}{3}{#1}{#2}{#3}.
<argument> \fooC
l. ......t\DeclareRobustCommand\fooC[3]{(#1,#2,#3)}
-> Adding cmd hook to 'fooD' (before):
@@ -93,7 +93,7 @@ l. ......t\DeclareRobustCommand\fooC[3]{(#1,#2,#3)}
->\@protected at testopt \fooD \\fooD {x}.
> \\fooD =\long macro:
> default #1=x.
-[#1]#2#3->\UseHook {cmd/fooD/before}(#1,#2,#3)\UseHook {cmd/fooD/after}.
+[#1]#2#3->\UseHookWithArguments {cmd/fooD/before}{3}{#1}{#2}{#3}(#1,#2,#3)\UseHookWithArguments {cmd/fooD/after}{3}{#1}{#2}{#3}.
<recently read> }
l. ......eclareRobustCommand\fooD[3][x]{(#1,#2,#3)}
-> Adding cmd hook to 'fooE' (before):
@@ -109,7 +109,7 @@ l. ......eclareRobustCommand\fooD[3][x]{(#1,#2,#3)}
**** Add to hook cmd/fooE/before (lbl) on input line ... <- before
-> Adding cmd hook to 'fooE' (after):
[lthooks] analyzing '\fooE'
-[lthooks] \fooE=macro:#1#2#3->\UseHook {cmd/fooE/before}(#1,#2,#3)
+[lthooks] \fooE=macro:#1#2#3->\UseHookWithArguments {cmd/fooE/before}{3}{#1}{#2}{#3}(#1,#2,#3)
[lthooks] ++ control sequence is defined
[lthooks] ++ control sequence is a macro
[lthooks] ++ macro is not private
@@ -119,7 +119,7 @@ l. ......eclareRobustCommand\fooD[3][x]{(#1,#2,#3)}
[lthooks] == retokenizing macro now
**** Add to hook cmd/fooE/after (lbl) on input line ... <- after
> \fooE=macro:
-#1#2#3->\UseHook {cmd/fooE/before}(#1,#2,#3)\UseHook {cmd/fooE/after}.
+#1#2#3->\UseHookWithArguments {cmd/fooE/before}{3}{#1}{#2}{#3}(#1,#2,#3)\UseHookWithArguments {cmd/fooE/after}{3}{#1}{#2}{#3}.
<argument> \fooE
l. ...\test\newcommand*\fooE[3]{(#1,#2,#3)}
-> Adding cmd hook to 'fooF' (before):
@@ -142,7 +142,7 @@ l. ...\test\newcommand*\fooE[3]{(#1,#2,#3)}
->\@protected at testopt \fooF \\fooF {x}.
> \\fooF=macro:
> default #1=x.
-[#1]#2#3->\UseHook {cmd/fooF/before}(#1,#2,#3)\UseHook {cmd/fooF/after}.
+[#1]#2#3->\UseHookWithArguments {cmd/fooF/before}{3}{#1}{#2}{#3}(#1,#2,#3)\UseHookWithArguments {cmd/fooF/after}{3}{#1}{#2}{#3}.
<recently read> }
l. ...\test\newcommand*\fooF[3][x]{(#1,#2,#3)}
-> Adding cmd hook to 'fooG' (before):
@@ -164,7 +164,7 @@ l. ...\test\newcommand*\fooF[3][x]{(#1,#2,#3)}
> \fooG=robust macro:
->\protect \fooG .
> \fooG =macro:
-#1#2#3->\UseHook {cmd/fooG/before}(#1,#2,#3)\UseHook {cmd/fooG/after}.
+#1#2#3->\UseHookWithArguments {cmd/fooG/before}{3}{#1}{#2}{#3}(#1,#2,#3)\UseHookWithArguments {cmd/fooG/after}{3}{#1}{#2}{#3}.
<argument> \fooG
l. ......\DeclareRobustCommand*\fooG[3]{(#1,#2,#3)}
-> Adding cmd hook to 'fooH' (before):
@@ -189,7 +189,7 @@ l. ......\DeclareRobustCommand*\fooG[3]{(#1,#2,#3)}
->\@protected at testopt \fooH \\fooH {x}.
> \\fooH =macro:
> default #1=x.
-[#1]#2#3->\UseHook {cmd/fooH/before}(#1,#2,#3)\UseHook {cmd/fooH/after}.
+[#1]#2#3->\UseHookWithArguments {cmd/fooH/before}{3}{#1}{#2}{#3}(#1,#2,#3)\UseHookWithArguments {cmd/fooH/after}{3}{#1}{#2}{#3}.
<recently read> }
l. ......clareRobustCommand*\fooH[3][x]{(#1,#2,#3)}
-> Adding cmd hook to 'fooI' (before):
@@ -202,14 +202,14 @@ l. ......clareRobustCommand*\fooH[3][x]{(#1,#2,#3)}
**** Add to hook cmd/fooI/before (lbl) on input line ... <- before
-> Adding cmd hook to 'fooI' (after):
[lthooks] analyzing '\fooI'
-[lthooks] \fooI=macro:->\UseHook {cmd/fooI/before}(1,2,3)
+[lthooks] \fooI=macro:->\UseHookWithArguments {cmd/fooI/before}{0}(1,2,3)
[lthooks] ++ control sequence is defined
[lthooks] ++ control sequence is a macro
[lthooks] ++ macro is not private
[lthooks] ++ command can be patched without rescanning
**** Add to hook cmd/fooI/after (lbl) on input line ... <- after
> \fooI=macro:
-->\UseHook {cmd/fooI/before}(1,2,3)\UseHook {cmd/fooI/after}.
+->\UseHookWithArguments {cmd/fooI/before}{0}(1,2,3)\UseHookWithArguments {cmd/fooI/after}{0}.
<argument> \fooI
l. ...\test\newcommand*\fooI{(1,2,3)}
-> Adding cmd hook to 'fooJ' (before):
@@ -222,14 +222,14 @@ l. ...\test\newcommand*\fooI{(1,2,3)}
**** Add to hook cmd/fooJ/before (lbl) on input line ... <- before
-> Adding cmd hook to 'fooJ' (after):
[lthooks] analyzing '\fooJ'
-[lthooks] \fooJ=\long macro:->\UseHook {cmd/fooJ/before}(1,2,3)
+[lthooks] \fooJ=\long macro:->\UseHookWithArguments {cmd/fooJ/before}{0}(1,2,3)
[lthooks] ++ control sequence is defined
[lthooks] ++ control sequence is a macro
[lthooks] ++ macro is not private
[lthooks] ++ command can be patched without rescanning
**** Add to hook cmd/fooJ/after (lbl) on input line ... <- after
> \fooJ=\long macro:
-->\UseHook {cmd/fooJ/before}(1,2,3)\UseHook {cmd/fooJ/after}.
+->\UseHookWithArguments {cmd/fooJ/before}{0}(1,2,3)\UseHookWithArguments {cmd/fooJ/after}{0}.
<argument> \fooJ
l. ...\test\newcommand\fooJ{(1,2,3)}
-> Adding cmd hook to 'fooK' (before):
@@ -251,7 +251,7 @@ l. ...\test\newcommand\fooJ{(1,2,3)}
> \fooK=robust macro:
->\protect \fooK .
> \fooK =macro:
-->\UseHook {cmd/fooK/before}(1,2,3)\UseHook {cmd/fooK/after}.
+->\UseHookWithArguments {cmd/fooK/before}{0}(1,2,3)\UseHookWithArguments {cmd/fooK/after}{0}.
<argument> \fooK
l. ...\test\DeclareRobustCommand*\fooK{(1,2,3)}
-> Adding cmd hook to 'fooL' (before):
@@ -273,6 +273,6 @@ l. ...\test\DeclareRobustCommand*\fooK{(1,2,3)}
> \fooL=robust macro:
->\protect \fooL .
> \fooL =\long macro:
-->\UseHook {cmd/fooL/before}(1,2,3)\UseHook {cmd/fooL/after}.
+->\UseHookWithArguments {cmd/fooL/before}{0}(1,2,3)\UseHookWithArguments {cmd/fooL/after}{0}.
<argument> \fooL
l. ...\test\DeclareRobustCommand\fooL{(1,2,3)}
diff --git a/base/testfiles-lthooks/ltcmdhooks-004.tlg b/base/testfiles-lthooks/ltcmdhooks-004.tlg
index fb32fdbd..4e5a8aaf 100644
--- a/base/testfiles-lthooks/ltcmdhooks-004.tlg
+++ b/base/testfiles-lthooks/ltcmdhooks-004.tlg
@@ -8,6 +8,7 @@ Command patched with expand-and-redefine
[lthooks] ++ control sequence is a macro
[lthooks] ++ macro is not private
[lthooks] ++ command can be patched without rescanning
+Update code for hook 'cmd/foo/before' on input line ...:
**** Add to hook cmd/foo/before (top-level) on input line ... <- \typeout {[top-level] \string \foo \space with [##1]{##2}}
Update code for hook 'cmd/foo/before' on input line ...:
-> Adding cmd hook to 'foo' (after):
@@ -17,6 +18,7 @@ Update code for hook 'cmd/foo/before' on input line ...:
[lthooks] ++ control sequence is a macro
[lthooks] ++ macro is not private
[lthooks] ++ command can be patched without rescanning
+Update code for hook 'cmd/foo/after' on input line ...:
**** Add to hook cmd/foo/after (lbl) on input line ... <- \typeout {[main] \string \foo \space with [##1]{##2}}
Update code for hook 'cmd/foo/after' on input line ...:
Code labels for sorting:
@@ -38,11 +40,12 @@ Command patched with retokenisation
[lthooks] ++ trying to patch by retokenization
[lthooks] ++ macro can be retokenized cleanly
[lthooks] == retokenizing macro now
+Update code for hook 'cmd/bar/before' on input line ...:
**** Add to hook cmd/bar/before (top-level) on input line ... <- \typeout {[top-level] \string \bar \space with {##1}{##2}}
Update code for hook 'cmd/bar/before' on input line ...:
-> Adding cmd hook to 'bar' (after):
[lthooks] analyzing '\bar'
-[lthooks] \bar=macro:#1/#2/->\UseHook {cmd/bar/before}\typeout {\string \bar {#1}{#2}}
+[lthooks] \bar=macro:#1/#2/->\UseHookWithArguments {cmd/bar/before}{2}{#1}{#2}\typeout {\string \bar {#1}{#2}}
[lthooks] ++ control sequence is defined
[lthooks] ++ control sequence is a macro
[lthooks] ++ macro is not private
@@ -50,6 +53,7 @@ Update code for hook 'cmd/bar/before' on input line ...:
[lthooks] ++ trying to patch by retokenization
[lthooks] ++ macro can be retokenized cleanly
[lthooks] == retokenizing macro now
+Update code for hook 'cmd/bar/after' on input line ...:
**** Add to hook cmd/bar/after (lbl) on input line ... <- \typeout {[main] \string \bar \space with {##1}{##2}}
Update code for hook 'cmd/bar/after' on input line ...:
Code labels for sorting:
@@ -68,6 +72,7 @@ ltcmd Command (always expand-and-redefine)
[lthooks] ++ control sequence is a macro
[lthooks] ++ macro is not private
[lthooks] ++ command can be patched without rescanning
+Update code for hook 'cmd/baz/before' on input line ...:
**** Add to hook cmd/baz/before (top-level) on input line ... <- \typeout {[top-level] \string \baz \space with {##1}[##2]}
Update code for hook 'cmd/baz/before' on input line ...:
-> Adding cmd hook to 'baz' (after):
@@ -77,6 +82,7 @@ Update code for hook 'cmd/baz/before' on input line ...:
[lthooks] ++ control sequence is a macro
[lthooks] ++ macro is not private
[lthooks] ++ command can be patched without rescanning
+Update code for hook 'cmd/baz/after' on input line ...:
**** Add to hook cmd/baz/after (lbl) on input line ... <- \typeout {[main] \string \baz \space with {##1}[##2]}
Update code for hook 'cmd/baz/after' on input line ...:
Code labels for sorting:
@@ -95,6 +101,7 @@ ltcmd expandable Command (always expand-and-redefine)
[lthooks] ++ control sequence is a macro
[lthooks] ++ macro is not private
[lthooks] ++ command can be patched without rescanning
+Update code for hook 'cmd/boo/before' on input line ...:
**** Add to hook cmd/boo/before (top-level) on input line ... <- [top-level] \string \boo \space with [##1]{##2}
Update code for hook 'cmd/boo/before' on input line ...:
-> Adding cmd hook to 'boo' (after):
@@ -104,6 +111,7 @@ Update code for hook 'cmd/boo/before' on input line ...:
[lthooks] ++ control sequence is a macro
[lthooks] ++ macro is not private
[lthooks] ++ command can be patched without rescanning
+Update code for hook 'cmd/boo/after' on input line ...:
**** Add to hook cmd/boo/after (lbl) on input line ... <- [main] \string \boo \space with [##1]{##2}
Update code for hook 'cmd/boo/after' on input line ...:
Code labels for sorting:
diff --git a/base/testfiles-lthooks/ltcmdhooks-005.tlg b/base/testfiles-lthooks/ltcmdhooks-005.tlg
index 122495f6..feec09be 100644
--- a/base/testfiles-lthooks/ltcmdhooks-005.tlg
+++ b/base/testfiles-lthooks/ltcmdhooks-005.tlg
@@ -22,6 +22,6 @@ LaTeX Font Info: ... okay on input line ....
LaTeX Font Info: Checking defaults for U/cmr/m/n on input line ....
LaTeX Font Info: ... okay on input line ....
> \foo=\long macro:
-#1#2->\UseHook {cmd/foo/before}FOO #1 #2\UseHook {cmd/foo/after}.
+#1#2->\UseHookWithArguments {cmd/foo/before}{2}{#1}{#2}FOO #1 #2\UseHookWithArguments {cmd/foo/after}{2}{#1}{#2}.
l. ...\show\foo
before 1 before 2 FOO hello world after 1
diff --git a/base/testfiles-lthooks/ltcmdhooks-005a.tlg b/base/testfiles-lthooks/ltcmdhooks-005a.tlg
index e18af4a2..7c8f1b15 100644
--- a/base/testfiles-lthooks/ltcmdhooks-005a.tlg
+++ b/base/testfiles-lthooks/ltcmdhooks-005a.tlg
@@ -22,6 +22,6 @@ LaTeX Font Info: ... okay on input line ....
LaTeX Font Info: Checking defaults for U/cmr/m/n on input line ....
LaTeX Font Info: ... okay on input line ....
> \foo=\long macro:
-#1#2->\UseHook {cmd/foo/before}FOO #1 #2\UseHook {cmd/foo/after}.
+#1#2->\UseHookWithArguments {cmd/foo/before}{2}{#1}{#2}FOO #1 #2\UseHookWithArguments {cmd/foo/after}{2}{#1}{#2}.
l. ...\show\foo
before 1 before 2 FOO hello world after 1
More information about the latex3-commits
mailing list.