Adjust tests for expandable plugs

latex3 · Oct 27, 2024 · 6571b0e · 6571b0e
1 parent 4851708
commit 6571b0e
Show file tree

Hide file tree

Showing 32 changed files with 290 additions and 290 deletions.
diff --git a/base/ltsockets.dtx b/base/ltsockets.dtx
@@ -371,7 +371,7 @@
 %         number of inputs = 2
 %         available plugs = noop, plug-A, plug-B
 %         current plug = plug-B
-%         definition = \protected\long macro:#1#2->\begin {quote}\sffamily
+%         definition = \long macro:#1#2->\begin {quote}\sffamily
 %     foo-B: #2\textsuperscript {2}\end {quote}
 % \end{verbatim}
 % \LogSocket{foo}

diff --git a/base/testfiles/sockets-000.tlg b/base/testfiles/sockets-000.tlg
@@ -4,7 +4,7 @@ Socket foo0:
     number of inputs = 0
     available plugs = noop
     current plug = noop
-    definition = \protected\long macro:->
+    definition = \long macro:->
 ! .
 \ShowSocket #1->\socket_log:n {#1}\errmessage {}
 l. ...\ShowSocket {foo0}
@@ -16,7 +16,7 @@ Socket foo1:
     number of inputs = 1
     available plugs = noop, identity
     current plug = identity
-    definition = \protected\long macro:#1->#1
+    definition = \long macro:#1->#1
 ! .
 \ShowSocket #1->\socket_log:n {#1}\errmessage {}
 l. ...\ShowSocket {foo1}
@@ -25,7 +25,7 @@ Socket foo2:
     number of inputs = 2
     available plugs = noop
     current plug = noop
-    definition = \protected\long macro:#1#2->
+    definition = \long macro:#1#2->
 ! .
 \ShowSocket #1->\socket_log:n {#1}\errmessage {}
 l. ...\ShowSocket {foo2}
@@ -34,7 +34,7 @@ Socket foo3:
     number of inputs = 3
     available plugs = noop
     current plug = noop
-    definition = \protected\long macro:#1#2#3->
+    definition = \long macro:#1#2#3->
 ! .
 \ShowSocket #1->\socket_log:n {#1}\errmessage {}
 l. ...\ShowSocket {foo3}
@@ -47,22 +47,22 @@ Socket bar0:
     number of inputs = 0
     available plugs = noop
     current plug = noop
-    definition = \protected\long macro:->
+    definition = \long macro:->
 Socket bar1:
     number of inputs = 1
     available plugs = noop, identity
     current plug = identity
-    definition = \protected\long macro:#1->#1
+    definition = \long macro:#1->#1
 Socket bar2:
     number of inputs = 2
     available plugs = noop
     current plug = noop
-    definition = \protected\long macro:#1#2->
+    definition = \long macro:#1#2->
 Socket bar3:
     number of inputs = 3
     available plugs = noop
     current plug = noop
-    definition = \protected\long macro:#1#2#3->
+    definition = \long macro:#1#2#3->
 AAA
 99=99?
 99=88?
diff --git a/base/testfiles/sockets-001.luatex.tlg b/base/testfiles/sockets-001.luatex.tlg
@@ -29,7 +29,7 @@ Socket foo:
     number of inputs = 0
     available plugs = noop, default
     current plug = noop
-    definition = \protected\long macro:->\typeout {modified noop}
+    definition = \long macro:->\typeout {modified noop}
 ! .
 \ShowSocket #1->\socket_log:n {#1}\errmessage {}
 l. ...\ShowSocket {foo}

diff --git a/base/testfiles/sockets-001.tlg b/base/testfiles/sockets-001.tlg
@@ -29,7 +29,7 @@ Socket foo:
     number of inputs = 0
     available plugs = noop, default
     current plug = noop
-    definition = \protected\long macro:->\typeout {modified noop}
+    definition = \long macro:->\typeout {modified noop}
 ! .
 \ShowSocket #1->\socket_log:n {#1}\errmessage {}
 l. ...\ShowSocket {foo}

diff --git a/base/testfiles/sockets-002.luatex.tlg b/base/testfiles/sockets-002.luatex.tlg
@@ -34,7 +34,7 @@ Socket foo:
     number of inputs = 0
     available plugs = noop, default
     current plug = noop
-    definition = \protected\long macro:->\typeout {modified noop}
+    definition = \long macro:->\typeout {modified noop}
 ! .
 \ShowSocket #1->\socket_log:n {#1}\errmessage {}
 l. ...\ShowSocket {foo}

diff --git a/base/testfiles/sockets-002.tlg b/base/testfiles/sockets-002.tlg
@@ -34,7 +34,7 @@ Socket foo:
     number of inputs = 0
     available plugs = noop, default
     current plug = noop
-    definition = \protected\long macro:->\typeout {modified noop}
+    definition = \long macro:->\typeout {modified noop}
 ! .
 \ShowSocket #1->\socket_log:n {#1}\errmessage {}
 l. ...\ShowSocket {foo}

diff --git a/required/latex-lab/testfiles-OR-luatex/footmisc-014-hang.tlg b/required/latex-lab/testfiles-OR-luatex/footmisc-014-hang.tlg
@@ -18,57 +18,57 @@ Socket fntext/process:
     number of inputs = 1
     available plugs = noop, identity, default, side, mp
     current plug = default
-    definition = \protected\long macro:#1->\insert \footins {#1}
+    definition = \long macro:#1->\insert \footins {#1}
 Socket fntext/make:
     number of inputs = 1
     available plugs = noop, identity, default, para
     current plug = default
-    definition = \protected\long macro:#1->\@makefntext {#1}
+    definition = \long macro:#1->\@makefntext {#1}
 Socket fntext/begin:
     number of inputs = 0
     available plugs = noop, default
     current plug = default
-    definition = \protected\long macro:->\rule \z@ \footnotesep 
+    definition = \long macro:->\rule \z@ \footnotesep 
 Socket fntext/end:
     number of inputs = 0
     available plugs = noop, default, para
     current plug = default
-    definition = \protected\long macro:->\@finalstrut \strutbox 
+    definition = \long macro:->\@finalstrut \strutbox 
 Socket fntext/mark:
     number of inputs = 0
     available plugs = noop, default
     current plug = default
-    definition = \protected\long macro:->\ifdim \footnotemargin >\z@ \hb@xt@ \footnotemargin {\hss \@makefnmark }\else \ifdim \footnotemargin =\z@ \llap {\@makefnmark }\else \ifdim \footnotemargin =-\maxdimen \@makefnmark \else \llap {\hb@xt@ -\footnotemargin {\@makefnmark \hss }}\fi \fi \fi 
+    definition = \long macro:->\ifdim \footnotemargin >\z@ \hb@xt@ \footnotemargin {\hss \@makefnmark }\else \ifdim \footnotemargin =\z@ \llap {\@makefnmark }\else \ifdim \footnotemargin =-\maxdimen \@makefnmark \else \llap {\hb@xt@ -\footnotemargin {\@makefnmark \hss }}\fi \fi \fi 
 Socket fntext/text:
     number of inputs = 1
     available plugs = noop, identity
     current plug = identity
-    definition = \protected\long macro:#1->#1
+    definition = \long macro:#1->#1
 Socket tagsupport/fnmark:
     number of inputs = 1
     available plugs = noop, identity, FEMark
     current plug = FEMark
-    definition = \protected\long macro:#1->\tag_mc_end_push: \tag_struct_begin:n {tag=footnotemark}\bool_if:NTF \l__fnote_autodetect_bool {\fnote_mark_gput:oo {\@thefnmark }{\l_fnote_type_tl }\tl_set:Ne \l__fnote_linktarget_tl {footnote*.\tag_get:n {struct_num}}}{\hook_gput_code:nne {tagpdf/finish/before}{tagpdf/footnote}{\exp_not:N \fnote_gput_refs:ee {\tag_get:n {struct_num}}{\property_ref:ee {__fnote/\l__fnote_currentlabel_tl }{fnote/struct}}}\tl_set:Ne \l__fnote_linktarget_tl {footnote*.\property_ref:ee {__fnote/\l__fnote_currentlabel_tl }{fnote/struct}}}\tag_mc_begin:n {tag=Lbl}\bool_if:NTF \l_fnote_link_bool {\exp_args:No \hyper@linkstart {\l_fnote_link_type_tl }{\l__fnote_linktarget_tl }#1\hyper@linkend }{#1}\tag_mc_end: \tag_struct_end: \tag_mc_begin_pop:n {}
+    definition = \long macro:#1->\tag_mc_end_push: \tag_struct_begin:n {tag=footnotemark}\bool_if:NTF \l__fnote_autodetect_bool {\fnote_mark_gput:oo {\@thefnmark }{\l_fnote_type_tl }\tl_set:Ne \l__fnote_linktarget_tl {footnote*.\tag_get:n {struct_num}}}{\hook_gput_code:nne {tagpdf/finish/before}{tagpdf/footnote}{\exp_not:N \fnote_gput_refs:ee {\tag_get:n {struct_num}}{\property_ref:ee {__fnote/\l__fnote_currentlabel_tl }{fnote/struct}}}\tl_set:Ne \l__fnote_linktarget_tl {footnote*.\property_ref:ee {__fnote/\l__fnote_currentlabel_tl }{fnote/struct}}}\tag_mc_begin:n {tag=Lbl}\bool_if:NTF \l_fnote_link_bool {\exp_args:No \hyper@linkstart {\l_fnote_link_type_tl }{\l__fnote_linktarget_tl }#1\hyper@linkend }{#1}\tag_mc_end: \tag_struct_end: \tag_mc_begin_pop:n {}
 Socket tagsupport/fntext/begin:
     number of inputs = 0
     available plugs = noop, FENote
     current plug = FENote
-    definition = \protected\long macro:->\tag_mc_end_push: \tag_check_child:nnTF {FENote}{pdf2}{\tag_struct_begin:n {tag=footnote}}{\tag_struct_begin:n {tag=footnote,parent=\int_max:nn {2}{\tag_get:n {current_Sect}+0}}}\tl_set:Ne \l__fnote_currentstruct_tl {\tag_get:n {struct_num}}\bool_if:NTF \l__fnote_autodetect_bool {\fnote_mark_gpop_all:ooN {\@thefnmark }{\l_fnote_type_tl }\l__fnote_currentrefs_seq \seq_map_inline:Nn \l__fnote_currentrefs_seq {\fnote_gput_refs:ee {##1}{\l__fnote_currentstruct_tl }}}{}
+    definition = \long macro:->\tag_mc_end_push: \tag_check_child:nnTF {FENote}{pdf2}{\tag_struct_begin:n {tag=footnote}}{\tag_struct_begin:n {tag=footnote,parent=\int_max:nn {2}{\tag_get:n {current_Sect}+0}}}\tl_set:Ne \l__fnote_currentstruct_tl {\tag_get:n {struct_num}}\bool_if:NTF \l__fnote_autodetect_bool {\fnote_mark_gpop_all:ooN {\@thefnmark }{\l_fnote_type_tl }\l__fnote_currentrefs_seq \seq_map_inline:Nn \l__fnote_currentrefs_seq {\fnote_gput_refs:ee {##1}{\l__fnote_currentstruct_tl }}}{}
 Socket tagsupport/fntext/end:
     number of inputs = 0
     available plugs = noop, FENote
     current plug = FENote
-    definition = \protected\long macro:->\tag_struct_end: \tag_mc_begin_pop:n {}
+    definition = \long macro:->\tag_struct_end: \tag_mc_begin_pop:n {}
 Socket tagsupport/fntext/mark:
     number of inputs = 1
     available plugs = noop, identity, FENoteLbl
     current plug = FENoteLbl
-    definition = \protected\long macro:#1->\tag_mc_end_push: \seq_map_inline:Nn \l__fnote_currentrefs_seq {\MakeLinkTarget *{footnote*.##1}}\MakeLinkTarget *{footnote*.\l__fnote_currentstruct_tl }\tag_struct_begin:n {tag=footnotelabel,parent=\l__fnote_currentstruct_tl ,firstkid}\tag_mc_begin:n {tag=Lbl}#1\tag_mc_end: \tag_struct_end: \tag_mc_begin_pop:n {}
+    definition = \long macro:#1->\tag_mc_end_push: \seq_map_inline:Nn \l__fnote_currentrefs_seq {\MakeLinkTarget *{footnote*.##1}}\MakeLinkTarget *{footnote*.\l__fnote_currentstruct_tl }\tag_struct_begin:n {tag=footnotelabel,parent=\l__fnote_currentstruct_tl ,firstkid}\tag_mc_begin:n {tag=Lbl}#1\tag_mc_end: \tag_struct_end: \tag_mc_begin_pop:n {}
 Socket tagsupport/fntext/text:
     number of inputs = 1
     available plugs = noop, identity, FENotetext
     current plug = FENotetext
-    definition = \protected\long macro:#1->\tag_mc_end_push: \tag_mc_begin:n {}#1\tag_mc_end: \tag_mc_begin_pop:n {}
+    definition = \long macro:#1->\tag_mc_end_push: \tag_mc_begin:n {}#1\tag_mc_end: \tag_mc_begin_pop:n {}
 -> The hook 'fntext/before':
 > The hook is empty.
 -> The hook 'fntext':

diff --git a/required/latex-lab/testfiles-OR/check-declarations.tlg b/required/latex-lab/testfiles-OR/check-declarations.tlg
@@ -18,57 +18,57 @@ Socket fntext/process:
     number of inputs = 1
     available plugs = noop, identity, default, side, mp
     current plug = default
-    definition = \protected\long macro:#1->\insert \footins {#1}
+    definition = \long macro:#1->\insert \footins {#1}
 Socket fntext/make:
     number of inputs = 1
     available plugs = noop, identity, default, para
     current plug = default
-    definition = \protected\long macro:#1->\@makefntext {#1}
+    definition = \long macro:#1->\@makefntext {#1}
 Socket fntext/begin:
     number of inputs = 0
     available plugs = noop, default
     current plug = default
-    definition = \protected\long macro:->\rule \z@ \footnotesep 
+    definition = \long macro:->\rule \z@ \footnotesep 
 Socket fntext/end:
     number of inputs = 0
     available plugs = noop, default, para
     current plug = default
-    definition = \protected\long macro:->\@finalstrut \strutbox 
+    definition = \long macro:->\@finalstrut \strutbox 
 Socket fntext/mark:
     number of inputs = 0
     available plugs = noop, default
     current plug = default
-    definition = \protected\long macro:->\ifdim \footnotemargin >\z@ \hb@xt@ \footnotemargin {\hss \@makefnmark }\else \ifdim \footnotemargin =\z@ \llap {\@makefnmark }\else \ifdim \footnotemargin =-\maxdimen \@makefnmark \else \llap {\hb@xt@ -\footnotemargin {\@makefnmark \hss }}\fi \fi \fi 
+    definition = \long macro:->\ifdim \footnotemargin >\z@ \hb@xt@ \footnotemargin {\hss \@makefnmark }\else \ifdim \footnotemargin =\z@ \llap {\@makefnmark }\else \ifdim \footnotemargin =-\maxdimen \@makefnmark \else \llap {\hb@xt@ -\footnotemargin {\@makefnmark \hss }}\fi \fi \fi 
 Socket fntext/text:
     number of inputs = 1
     available plugs = noop, identity
     current plug = identity
-    definition = \protected\long macro:#1->#1
+    definition = \long macro:#1->#1
 Socket tagsupport/fnmark:
     number of inputs = 1
     available plugs = noop, identity, FEMark
     current plug = FEMark
-    definition = \protected\long macro:#1->\tag_mc_end_push: \tag_struct_begin:n {tag=footnotemark}\bool_if:NTF \l__fnote_autodetect_bool {\fnote_mark_gput:oo {\@thefnmark }{\l_fnote_type_tl }\tl_set:Ne \l__fnote_linktarget_tl {footnote*.\tag_get:n {struct_num}}}{\hook_gput_code:nne {tagpdf/finish/before}{tagpdf/footnote}{\exp_not:N \fnote_gput_refs:ee {\tag_get:n {struct_num}}{\property_ref:ee {__fnote/\l__fnote_currentlabel_tl }{fnote/struct}}}\tl_set:Ne \l__fnote_linktarget_tl {footnote*.\property_ref:ee {__fnote/\l__fnote_currentlabel_tl }{fnote/struct}}}\tag_mc_begin:n {tag=Lbl}\bool_if:NTF \l_fnote_link_bool {\exp_args:No \hyper@linkstart {\l_fnote_link_type_tl }{\l__fnote_linktarget_tl }#1\hyper@linkend }{#1}\tag_mc_end: \tag_struct_end: \tag_mc_begin_pop:n {}
+    definition = \long macro:#1->\tag_mc_end_push: \tag_struct_begin:n {tag=footnotemark}\bool_if:NTF \l__fnote_autodetect_bool {\fnote_mark_gput:oo {\@thefnmark }{\l_fnote_type_tl }\tl_set:Ne \l__fnote_linktarget_tl {footnote*.\tag_get:n {struct_num}}}{\hook_gput_code:nne {tagpdf/finish/before}{tagpdf/footnote}{\exp_not:N \fnote_gput_refs:ee {\tag_get:n {struct_num}}{\property_ref:ee {__fnote/\l__fnote_currentlabel_tl }{fnote/struct}}}\tl_set:Ne \l__fnote_linktarget_tl {footnote*.\property_ref:ee {__fnote/\l__fnote_currentlabel_tl }{fnote/struct}}}\tag_mc_begin:n {tag=Lbl}\bool_if:NTF \l_fnote_link_bool {\exp_args:No \hyper@linkstart {\l_fnote_link_type_tl }{\l__fnote_linktarget_tl }#1\hyper@linkend }{#1}\tag_mc_end: \tag_struct_end: \tag_mc_begin_pop:n {}
 Socket tagsupport/fntext/begin:
     number of inputs = 0
     available plugs = noop, FENote
     current plug = FENote
-    definition = \protected\long macro:->\tag_mc_end_push: \tag_check_child:nnTF {FENote}{pdf2}{\tag_struct_begin:n {tag=footnote}}{\tag_struct_begin:n {tag=footnote,parent=\int_max:nn {2}{\tag_get:n {current_Sect}+0}}}\tl_set:Ne \l__fnote_currentstruct_tl {\tag_get:n {struct_num}}\bool_if:NTF \l__fnote_autodetect_bool {\fnote_mark_gpop_all:ooN {\@thefnmark }{\l_fnote_type_tl }\l__fnote_currentrefs_seq \seq_map_inline:Nn \l__fnote_currentrefs_seq {\fnote_gput_refs:ee {##1}{\l__fnote_currentstruct_tl }}}{}
+    definition = \long macro:->\tag_mc_end_push: \tag_check_child:nnTF {FENote}{pdf2}{\tag_struct_begin:n {tag=footnote}}{\tag_struct_begin:n {tag=footnote,parent=\int_max:nn {2}{\tag_get:n {current_Sect}+0}}}\tl_set:Ne \l__fnote_currentstruct_tl {\tag_get:n {struct_num}}\bool_if:NTF \l__fnote_autodetect_bool {\fnote_mark_gpop_all:ooN {\@thefnmark }{\l_fnote_type_tl }\l__fnote_currentrefs_seq \seq_map_inline:Nn \l__fnote_currentrefs_seq {\fnote_gput_refs:ee {##1}{\l__fnote_currentstruct_tl }}}{}
 Socket tagsupport/fntext/end:
     number of inputs = 0
     available plugs = noop, FENote
     current plug = FENote
-    definition = \protected\long macro:->\tag_struct_end: \tag_mc_begin_pop:n {}
+    definition = \long macro:->\tag_struct_end: \tag_mc_begin_pop:n {}
 Socket tagsupport/fntext/mark:
     number of inputs = 1
     available plugs = noop, identity, FENoteLbl
     current plug = FENoteLbl
-    definition = \protected\long macro:#1->\tag_mc_end_push: \seq_map_inline:Nn \l__fnote_currentrefs_seq {\MakeLinkTarget *{footnote*.##1}}\MakeLinkTarget *{footnote*.\l__fnote_currentstruct_tl }\tag_struct_begin:n {tag=footnotelabel,parent=\l__fnote_currentstruct_tl ,firstkid}\tag_mc_begin:n {tag=Lbl}#1\tag_mc_end: \tag_struct_end: \tag_mc_begin_pop:n {}
+    definition = \long macro:#1->\tag_mc_end_push: \seq_map_inline:Nn \l__fnote_currentrefs_seq {\MakeLinkTarget *{footnote*.##1}}\MakeLinkTarget *{footnote*.\l__fnote_currentstruct_tl }\tag_struct_begin:n {tag=footnotelabel,parent=\l__fnote_currentstruct_tl ,firstkid}\tag_mc_begin:n {tag=Lbl}#1\tag_mc_end: \tag_struct_end: \tag_mc_begin_pop:n {}
 Socket tagsupport/fntext/text:
     number of inputs = 1
     available plugs = noop, identity, FENotetext
     current plug = FENotetext
-    definition = \protected\long macro:#1->\tag_mc_end_push: \tag_mc_begin:n {}#1\tag_mc_end: \tag_mc_begin_pop:n {}
+    definition = \long macro:#1->\tag_mc_end_push: \tag_mc_begin:n {}#1\tag_mc_end: \tag_mc_begin_pop:n {}
 -> The hook 'fntext/before':
 > The hook is empty.
 -> The hook 'fntext':