use hooks with args for addcontentsline

latex3 · Jun 7, 2023 · f019f02 · f019f02
1 parent 545fd4d
commit f019f02
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/required/latex-lab/latex-lab-toc-hyperref-changes.dtx b/required/latex-lab/latex-lab-toc-hyperref-changes.dtx
@@ -136,13 +136,12 @@
              } % none
            }
        }
-    \AddToHook{cmd/addcontentsline/before}[hyp]
+    \AddToHookWithArguments{cmd/addcontentsline/before}[hyp]
      {%
-       \ExpandArgs{ooo}
        \Hy@addcontentsline@addbookmark
-         {\addcontentsline@arg@one}
-         {\addcontentsline@arg@two}
-         {\addcontentsline@arg@three}%
+         {#1}
+         {#2}
+         {#3}%
      }   
    }    
 \ExplSyntaxOff

diff --git a/required/latex-lab/latex-lab-toc-kernel-changes.dtx b/required/latex-lab/latex-lab-toc-kernel-changes.dtx
@@ -181,15 +181,12 @@
 % \cs{addcontentsline} should always write the unique counter representation
 % \cs{@currentHref} so that we can create the |/Ref| key. At the same time
 % we need a hook, so that hyperref can add its bookmarks code. The generic hook
-% would be ok, but we need the arguments, so we store them first.
+% is ok. We only declare it and add until the merge.
 %
 %    \begin{macrocode}
-\NewHook{cmd/addcontentsline/before}
-\def\addcontentsline#1#2#3{% toc extension, type, tag
-    \def\addcontentsline@arg@one{#1}% name??
-    \def\addcontentsline@arg@two{#2}%
-    \def\addcontentsline@arg@three{#3}%
-    \UseHook{cmd/addcontentsline/before}%
+\NewHookWithArguments{cmd/addcontentsline/before}{3}
+\def\addcontentsline#1#2#3{% #1=toc extension, #2= heading type, tag
+    \UseHookWithArguments{cmd/addcontentsline/before}{3}{#1}{#2}{#3}%
     \addtocontents{#1}{%
       \protect\contentsline{#2}{#3}{\thepage}{\@currentHref}\protected@file@percent
     }}