diff options
author | Norbert Preining <norbert@preining.info> | 2023-11-03 03:02:40 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-11-03 03:02:40 +0000 |
commit | 1e464deefd235880a2fac2390e896bfd2b523151 (patch) | |
tree | e9294919c95d4a444e911d20d2e3ddd60e45f9d1 /macros/latex-dev/required/latex-lab/latex-lab-footnotes.dtx | |
parent | 2da66dea964ffa47d24f26081f2942a6e1ef1121 (diff) |
CTAN sync 202311030302
Diffstat (limited to 'macros/latex-dev/required/latex-lab/latex-lab-footnotes.dtx')
-rw-r--r-- | macros/latex-dev/required/latex-lab/latex-lab-footnotes.dtx | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/macros/latex-dev/required/latex-lab/latex-lab-footnotes.dtx b/macros/latex-dev/required/latex-lab/latex-lab-footnotes.dtx index f62d12bfd9..2389906c5a 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-footnotes.dtx +++ b/macros/latex-dev/required/latex-lab/latex-lab-footnotes.dtx @@ -899,8 +899,6 @@ % \subsection{Variants} % % \begin{macrocode} -\cs_generate_variant:Nn \ref_value:nn { Vn } -\cs_generate_variant:Nn \prop_gput:Nnn {cxn} \cs_generate_variant:Nn \hook_gput_code:nnn{nne} \cs_generate_variant:Nn \tag_struct_use:n {e} % \end{macrocode} @@ -1711,14 +1709,14 @@ % At first we define a suitable attribute, it uses as value the structure % number of the note as stored in \cs{l__fnote_currentstruct_tl} % \begin{macrocode} -\ref_attribute_gset:nnnn {fnote/struct}{1}{now}{\l_@@_currentstruct_tl} +\property_new:nnnn {fnote/struct}{now}{1}{\l_@@_currentstruct_tl} % \end{macrocode} % % We add a hook to the label hook. By default it does nothing -% \begin{macro}{\@@_label_hook:n} +% \begin{macro}{\@@_label_hook:e} % \begin{macrocode} -\cs_new_protected:Npn \@@_label_hook:n #1 {} -\AddToHookWithArguments{label}{ \@@_label_hook:n{#1}} +\cs_new_protected:Npn \@@_label_hook:e #1 {} +\AddToHookWithArguments{label}{ \@@_label_hook:e{#1}} % \end{macrocode} % \end{macro} % Inside a footnotetext we change the hook to store the structure number too. @@ -1726,9 +1724,9 @@ % \begin{macrocode} \AddToHook{fntext/begin} { - \cs_set_protected:Npn \@@_label_hook:n #1 + \cs_set_protected:Npn \@@_label_hook:e #1 { - \ref_label:nn {#1} {fnote/struct} + \property_record:ee {@@/#1} {fnote/struct} } } % \end{macrocode} @@ -1766,7 +1764,7 @@ % \begin{macrocode} \cs_new_protected:Npn \fnote_mark_gput:nn #1 #2 % #1 the representation of the mark, #2 type { - \prop_gput:cxn { g_@@_currentmarks_ #2 _prop } + \prop_gput:cen { g_@@_currentmarks_ #2 _prop } { \tag_get:n{struct_num} } { #1 } } @@ -1839,7 +1837,7 @@ % which means the name of the prop shouldn't be fix. % \begin{macrocode} \fnote_mark_gput:oo {\@thefnmark}{\l_fnote_type_tl} - \tl_set:Nx \l_@@_linktarget_tl {footnote*.\tag_get:n{struct_num}} + \tl_set:Ne \l_@@_linktarget_tl {footnote*.\tag_get:n{struct_num}} } % \end{macrocode} % If there is no autodetecting we need some id, @@ -1854,13 +1852,13 @@ { \exp_not:N\fnote_gput_refs:ee { \tag_get:n{struct_num} } - { \ref_value:Vn\l_@@_currentlabel_tl {fnote/struct} } + { \property_ref:ee{ @@/\l_@@_currentlabel_tl } {fnote/struct} } } % \end{macrocode} % in this case we set the name of the linktarget in the note % to the structure number of the text mark. % \begin{macrocode} - \tl_set:Nx \l_@@_linktarget_tl {footnote*.\ref_value:Vn\l_@@_currentlabel_tl {fnote/struct}} + \tl_set:Ne \l_@@_linktarget_tl {footnote*.\property_ref:ee {@@/\l_@@_currentlabel_tl} {fnote/struct}} } % \end{macrocode} % And now the actual content @@ -1938,7 +1936,7 @@ % \end{macrocode} % Store the current structure number for labels. % \begin{macrocode} - \tl_set:Nx \l_@@_currentstruct_tl { \tag_get:n{struct_num} } + \tl_set:Ne \l_@@_currentstruct_tl { \tag_get:n{struct_num} } % \end{macrocode} % We want to move the label structure here. So we provide a container % It number is |\l__fnote_currentstruct_tl| plus 1. |