diff --git a/base/ltsockets.dtx b/base/ltsockets.dtx index ffeef1e12..a977f8f6a 100644 --- 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 index f577da656..29e505ec3 100644 --- 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 index 62e870d92..062406d6d 100644 --- 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 index d3d073db8..4e01c4615 100644 --- 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 index 403b365c5..5b4246b18 100644 --- 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 index a9761904f..c5db70213 100644 --- 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 index 21f55f5e7..4b95c376c 100644 --- 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 index d3137af22..f35b98bdf 100644 --- 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': diff --git a/required/latex-lab/testfiles-OR/footmisc-002.tlg b/required/latex-lab/testfiles-OR/footmisc-002.tlg index 81b272248..115cb32b6 100644 --- a/required/latex-lab/testfiles-OR/footmisc-002.tlg +++ b/required/latex-lab/testfiles-OR/footmisc-002.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/footmisc-003.tlg b/required/latex-lab/testfiles-OR/footmisc-003.tlg index 0a480d46f..35b7b9fc0 100644 --- a/required/latex-lab/testfiles-OR/footmisc-003.tlg +++ b/required/latex-lab/testfiles-OR/footmisc-003.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/footmisc-004.tlg b/required/latex-lab/testfiles-OR/footmisc-004.tlg index 3b83ece44..92fbd88fe 100644 --- a/required/latex-lab/testfiles-OR/footmisc-004.tlg +++ b/required/latex-lab/testfiles-OR/footmisc-004.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/footmisc-005.tlg b/required/latex-lab/testfiles-OR/footmisc-005.tlg index f9d6cbeb2..20ba260b0 100644 --- a/required/latex-lab/testfiles-OR/footmisc-005.tlg +++ b/required/latex-lab/testfiles-OR/footmisc-005.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 = para - definition = \protected\long macro:#1->\setbox \FN@tempboxa \hbox {\@makefntext {#1}}\dp \FN@tempboxa \z@ \ht \FN@tempboxa \dimexpr \wd \FN@tempboxa *\footnotebaselineskip /\columnwidth \relax \box \FN@tempboxa + definition = \long macro:#1->\setbox \FN@tempboxa \hbox {\@makefntext {#1}}\dp \FN@tempboxa \z@ \ht \FN@tempboxa \dimexpr \wd \FN@tempboxa *\footnotebaselineskip /\columnwidth \relax \box \FN@tempboxa Socket fntext/begin: number of inputs = 0 available plugs = noop, default current plug = noop - definition = \protected\long macro:-> + definition = \long macro:-> Socket fntext/end: number of inputs = 0 available plugs = noop, default, para current plug = para - definition = \protected\long macro:->\strut \penalty -10\relax \hskip \footglue + definition = \long macro:->\strut \penalty -10\relax \hskip \footglue 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/footmisc-006.tlg b/required/latex-lab/testfiles-OR/footmisc-006.tlg index 558b0e3dc..d3a5882b6 100644 --- a/required/latex-lab/testfiles-OR/footmisc-006.tlg +++ b/required/latex-lab/testfiles-OR/footmisc-006.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 = para - definition = \protected\long macro:#1->\setbox \FN@tempboxa \hbox {\@makefntext {#1}}\dp \FN@tempboxa \z@ \ht \FN@tempboxa \dimexpr \wd \FN@tempboxa *\footnotebaselineskip /\columnwidth \relax \box \FN@tempboxa + definition = \long macro:#1->\setbox \FN@tempboxa \hbox {\@makefntext {#1}}\dp \FN@tempboxa \z@ \ht \FN@tempboxa \dimexpr \wd \FN@tempboxa *\footnotebaselineskip /\columnwidth \relax \box \FN@tempboxa Socket fntext/begin: number of inputs = 0 available plugs = noop, default current plug = noop - definition = \protected\long macro:-> + definition = \long macro:-> Socket fntext/end: number of inputs = 0 available plugs = noop, default, para current plug = para - definition = \protected\long macro:->\strut \penalty -10\relax \hskip \footglue + definition = \long macro:->\strut \penalty -10\relax \hskip \footglue 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/footmisc-007-rollback.tlg b/required/latex-lab/testfiles-OR/footmisc-007-rollback.tlg index 2934898b7..d9edc0a0c 100644 --- a/required/latex-lab/testfiles-OR/footmisc-007-rollback.tlg +++ b/required/latex-lab/testfiles-OR/footmisc-007-rollback.tlg @@ -39,57 +39,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/footmisc-009-multiple-tagging.tlg b/required/latex-lab/testfiles-OR/footmisc-009-multiple-tagging.tlg index 31927700a..5deadc4b8 100644 --- a/required/latex-lab/testfiles-OR/footmisc-009-multiple-tagging.tlg +++ b/required/latex-lab/testfiles-OR/footmisc-009-multiple-tagging.tlg @@ -36,57 +36,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/footmisc-009-multiple.tlg b/required/latex-lab/testfiles-OR/footmisc-009-multiple.tlg index d1696cbfc..ec7995a8b 100644 --- a/required/latex-lab/testfiles-OR/footmisc-009-multiple.tlg +++ b/required/latex-lab/testfiles-OR/footmisc-009-multiple.tlg @@ -36,57 +36,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/footmisc-010-setspace-tagging.tlg b/required/latex-lab/testfiles-OR/footmisc-010-setspace-tagging.tlg index 93eb84d12..76b77f453 100644 --- a/required/latex-lab/testfiles-OR/footmisc-010-setspace-tagging.tlg +++ b/required/latex-lab/testfiles-OR/footmisc-010-setspace-tagging.tlg @@ -31,57 +31,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/footmisc-010-setspace.tlg b/required/latex-lab/testfiles-OR/footmisc-010-setspace.tlg index e6acc36dd..33445b6d9 100644 --- a/required/latex-lab/testfiles-OR/footmisc-010-setspace.tlg +++ b/required/latex-lab/testfiles-OR/footmisc-010-setspace.tlg @@ -31,57 +31,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/footmisc-011-para.tlg b/required/latex-lab/testfiles-OR/footmisc-011-para.tlg index 45ab2bfb1..9a2dc41b9 100644 --- a/required/latex-lab/testfiles-OR/footmisc-011-para.tlg +++ b/required/latex-lab/testfiles-OR/footmisc-011-para.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 = para - definition = \protected\long macro:#1->\setbox \FN@tempboxa \hbox {\@makefntext {#1}}\dp \FN@tempboxa \z@ \ht \FN@tempboxa \dimexpr \wd \FN@tempboxa *\footnotebaselineskip /\columnwidth \relax \box \FN@tempboxa + definition = \long macro:#1->\setbox \FN@tempboxa \hbox {\@makefntext {#1}}\dp \FN@tempboxa \z@ \ht \FN@tempboxa \dimexpr \wd \FN@tempboxa *\footnotebaselineskip /\columnwidth \relax \box \FN@tempboxa Socket fntext/begin: number of inputs = 0 available plugs = noop, default current plug = noop - definition = \protected\long macro:-> + definition = \long macro:-> Socket fntext/end: number of inputs = 0 available plugs = noop, default, para current plug = para - definition = \protected\long macro:->\strut \penalty -10\relax \hskip \footglue + definition = \long macro:->\strut \penalty -10\relax \hskip \footglue 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/footmisc-012-side-hyperref.tlg b/required/latex-lab/testfiles-OR/footmisc-012-side-hyperref.tlg index 96470e154..78419a994 100644 --- a/required/latex-lab/testfiles-OR/footmisc-012-side-hyperref.tlg +++ b/required/latex-lab/testfiles-OR/footmisc-012-side-hyperref.tlg @@ -18,57 +18,57 @@ Socket fntext/process: number of inputs = 1 available plugs = noop, identity, default, side, mp current plug = side - definition = \protected\long macro:#1->\marginpar {#1} + definition = \long macro:#1->\marginpar {#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 = noop - definition = \protected\long macro:-> + definition = \long macro:-> Socket fntext/end: number of inputs = 0 available plugs = noop, default, para current plug = noop - definition = \protected\long macro:-> + definition = \long macro:-> 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/footmisc-012-side.tlg b/required/latex-lab/testfiles-OR/footmisc-012-side.tlg index 0c9f52ca4..1b611c1a0 100644 --- a/required/latex-lab/testfiles-OR/footmisc-012-side.tlg +++ b/required/latex-lab/testfiles-OR/footmisc-012-side.tlg @@ -18,57 +18,57 @@ Socket fntext/process: number of inputs = 1 available plugs = noop, identity, default, side, mp current plug = side - definition = \protected\long macro:#1->\marginpar {#1} + definition = \long macro:#1->\marginpar {#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 = noop - definition = \protected\long macro:-> + definition = \long macro:-> Socket fntext/end: number of inputs = 0 available plugs = noop, default, para current plug = noop - definition = \protected\long macro:-> + definition = \long macro:-> 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/footmisc-013-scrartcl.tlg b/required/latex-lab/testfiles-OR/footmisc-013-scrartcl.tlg index e40406f94..097a8dfee 100644 --- a/required/latex-lab/testfiles-OR/footmisc-013-scrartcl.tlg +++ b/required/latex-lab/testfiles-OR/footmisc-013-scrartcl.tlg @@ -25,57 +25,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/footmisc-014-hang.tlg b/required/latex-lab/testfiles-OR/footmisc-014-hang.tlg index 21f55f5e7..4b95c376c 100644 --- a/required/latex-lab/testfiles-OR/footmisc-014-hang.tlg +++ b/required/latex-lab/testfiles-OR/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/footmisc-floats-abovefloats-flushbottom.tlg b/required/latex-lab/testfiles-OR/footmisc-floats-abovefloats-flushbottom.tlg index 0ff8aee4a..f17227b9f 100644 --- a/required/latex-lab/testfiles-OR/footmisc-floats-abovefloats-flushbottom.tlg +++ b/required/latex-lab/testfiles-OR/footmisc-floats-abovefloats-flushbottom.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/footmisc-floats-abovefloats.tlg b/required/latex-lab/testfiles-OR/footmisc-floats-abovefloats.tlg index 712316875..4b780e26e 100644 --- a/required/latex-lab/testfiles-OR/footmisc-floats-abovefloats.tlg +++ b/required/latex-lab/testfiles-OR/footmisc-floats-abovefloats.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/footmisc-floats-belowfloats-flushbottom.tlg b/required/latex-lab/testfiles-OR/footmisc-floats-belowfloats-flushbottom.tlg index 20380c49f..3584a1cad 100644 --- a/required/latex-lab/testfiles-OR/footmisc-floats-belowfloats-flushbottom.tlg +++ b/required/latex-lab/testfiles-OR/footmisc-floats-belowfloats-flushbottom.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/footmisc-floats-latex.tlg b/required/latex-lab/testfiles-OR/footmisc-floats-latex.tlg index 0b088c434..f5dae83bb 100644 --- a/required/latex-lab/testfiles-OR/footmisc-floats-latex.tlg +++ b/required/latex-lab/testfiles-OR/footmisc-floats-latex.tlg @@ -20,57 +20,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/footnote-float-above.tlg b/required/latex-lab/testfiles-OR/footnote-float-above.tlg index 61109209d..dc650f71e 100644 --- a/required/latex-lab/testfiles-OR/footnote-float-above.tlg +++ b/required/latex-lab/testfiles-OR/footnote-float-above.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/footnote-hyperref-001.tlg b/required/latex-lab/testfiles-OR/footnote-hyperref-001.tlg index 21f55f5e7..4b95c376c 100644 --- a/required/latex-lab/testfiles-OR/footnote-hyperref-001.tlg +++ b/required/latex-lab/testfiles-OR/footnote-hyperref-001.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/footnote-par.tlg b/required/latex-lab/testfiles-OR/footnote-par.tlg index 21f55f5e7..4b95c376c 100644 --- a/required/latex-lab/testfiles-OR/footnote-par.tlg +++ b/required/latex-lab/testfiles-OR/footnote-par.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/tagging-001.tlg b/required/latex-lab/testfiles-OR/tagging-001.tlg index 11db8d686..a38438983 100644 --- a/required/latex-lab/testfiles-OR/tagging-001.tlg +++ b/required/latex-lab/testfiles-OR/tagging-001.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/new-or-001.tlg b/required/latex-lab/testfiles/new-or-001.tlg index 9ddfd0b02..20154b8c0 100644 --- a/required/latex-lab/testfiles/new-or-001.tlg +++ b/required/latex-lab/testfiles/new-or-001.tlg @@ -9,7 +9,7 @@ Socket @makecol/outputbox: number of inputs = 0 available plugs = noop, space-footnotes-floats, floats-footnotes-space, footnotes-space-floats, space-floats-footnotes, floats-footnotes, footnotes-floats current plug = footnotes-floats - definition = \protected\long macro:->\@outputbox@appendfootnotes \@outputbox@attachfloats \@outputbox@reinsertbskip + definition = \long macro:->\@outputbox@appendfootnotes \@outputbox@attachfloats \@outputbox@reinsertbskip ! . \ShowSocket #1->\socket_log:n {#1}\errmessage {} l. ...\ShowSocket {@makecol/outputbox} @@ -21,7 +21,7 @@ Socket @makecol/footnotes: 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 {@makecol/footnotes}