1 files changed, 8 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/strc-lst.mkvi b/Master/texmf-dist/tex/context/base/mkiv/strc-lst.mkvi
index 7bc859b670b..153d879b791 100644
--- a/Master/texmf-dist/tex/context/base/mkiv/strc-lst.mkvi
+++ b/Master/texmf-dist/tex/context/base/mkiv/strc-lst.mkvi
@@ -145,9 +145,8 @@
   {\endgroup}
 
 % \unexpanded
-
-\def\strc_lists_inject_enhance#listindex%
-  {\expandafter\clf_deferredenhancelist\number#listindex\relax}
+\def\strc_lists_inject_enhance#listindex#internal%
+  {\normalexpanded{\ctxlatecommand{enhancelist(\number#listindex)}}}
 
 \unexpanded\def\strc_lists_inject_yes[#settings][#userdata]% can be used directly
   {\setupcurrentlist[\c!type=userdata,\c!location=\v!none,#settings]% grouped (use \let...
@@ -169,16 +168,16 @@
         userdata {\detokenize\expandafter{\normalexpanded{#userdata}}}
    \relax
    \edef\currentlistnumber{\the\scratchcounter}%
-   \setxvalue{\??listlocations\currentlist}{\the\locationcount}%
+\setxvalue{\??listlocations\currentlist}{\the\locationcount}%
    \ifx\p_location\v!here
      % this branch injects nodes !
-     \strc_lists_inject_enhance{\currentlistnumber}%
+     \strc_lists_inject_enhance{\currentlistnumber}{\the\locationcount}%
      \clf_setinternalreference
         internal \locationcount
         view     {\interactionparameter\c!focus}%
      \relax % this will change
      \xdef\currentstructurelistattribute{\the\lastdestinationattribute}%
-     \dontleavehmode\hpack attr \destinationattribute \lastdestinationattribute{}% todo
+     \dontleavehmode\hbox attr \destinationattribute \lastdestinationattribute{}% todo
    \else
      % and this one doesn't
      \clf_enhancelist\currentlistnumber\relax
@@ -468,7 +467,7 @@
    \relax}
 
 \def\firststructureelementinlist#list% expandable
-  {\firstinset{#list}}
+  {\clf_firstinset{#list}}
 
 \def\structurelistsize
   {\clf_listsize}
@@ -872,7 +871,7 @@
 
 \appendtoks
     \dontcomplain
-  % \letinteractionparameter\c!width\zeropoint % a weird one
+    \letinteractionparameter\c!width\zeropoint % a weird one
 \to \t_lists_every_renderingsetup
 
 \appendtoks
@@ -1092,7 +1091,7 @@
             \fi
             \ifconditional\c_lists_has_page
                 \ifconditional\c_lists_show_page
-                    \setbox\b_strc_lists_page\hpack {
+                    \setbox\b_strc_lists_page\hbox {
                         \scratchdimen\listalternativeparameter\c!width
                         \hbox \strc_lists_get_reference_attribute\v!pagenumber \ifdim\scratchdimen>\zeropoint to \scratchdimen\fi {
                             \hfill