1 files changed, 9 insertions, 7 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 5c2bd74e53c..08e56a700fa 100644
--- a/Master/texmf-dist/tex/context/base/mkiv/strc-lst.mkvi
+++ b/Master/texmf-dist/tex/context/base/mkiv/strc-lst.mkvi
@@ -145,7 +145,7 @@
   {\endgroup}
 
 \unexpanded\def\strc_lists_inject_enhance#listindex#internal%
-  {\normalexpanded{\ctxlatecommand{enhancelist(#listindex)}}}
+  {\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...
@@ -153,7 +153,7 @@
    \setnextinternalreference
    \scratchcounter\clf_addtolist
         references {
-            internal \nextinternalreference
+            internal \locationcount
           % block    {\currentsectionblock}
           % section  structures.sections.currentid()
           % location {\p_location}
@@ -167,12 +167,12 @@
         userdata {\detokenize\expandafter{\normalexpanded{#userdata}}}
    \relax
    \edef\currentlistnumber{\the\scratchcounter}%
-\setxvalue{\??listlocations\currentlist}{\nextinternalreference}%
+\setxvalue{\??listlocations\currentlist}{\the\locationcount}%
    \ifx\p_location\v!here
      % this branch injects nodes !
-     \strc_lists_inject_enhance{\currentlistnumber}{\nextinternalreference}%
+     \strc_lists_inject_enhance{\currentlistnumber}{\the\locationcount}%
      \clf_setinternalreference
-        internal \nextinternalreference
+        internal \locationcount
         view     {\interactionparameter\c!focus}%
      \relax % this will change
      \xdef\currentstructurelistattribute{\the\lastdestinationattribute}%
@@ -271,6 +271,7 @@
 
 \def\strc_lists_place_indeed#tag#list#settings%
   {\begingroup
+   \the\t_lists_every_renderingcleanup % \let\currentlistentrylocation\empty
    \edef\currentlist{#tag}%
    \setupcurrentlist[#settings]%
    \the\everystructurelist
@@ -308,7 +309,7 @@
   {\strc_lists_complete_indeed[#tag][#tag][#settings]}
 
 \def\strc_lists_complete_indeed[#singular][#plural][#settings]%
-  {\normalexpanded{\startnamedsection[\v!title][\c!title=\headtext{#plural},\c!reference=#singular]}%
+  {\normalexpanded{\startnamedsection[\v!title][\c!title=\headtext{#plural},\c!reference=#singular]}% {} around ref ?
    \strc_lists_place[#singular][#settings]%
    \stopnamedsection}
 
@@ -349,7 +350,7 @@
    \endgroup}
 
 \def\strc_lists_combined_complete[#tag][#settings]%
-  {\normalexpanded{\startnamedsection[\v!title][\c!title={\headtext{#tag}},\c!reference=#tag]}%
+  {\normalexpanded{\startnamedsection[\v!title][\c!title={\headtext{#tag}},\c!reference=#tag]}% {} around ref ?
    \strc_lists_combined_place[#tag][#settings]%
    \stopnamedsection}
 
@@ -527,6 +528,7 @@
 
 \unexpanded\def\strclistsentryprocess#tag#method#index#extra% This one is called at the lua end!
   {\clf_pushlist#index\relax
+  %\let\currentlistentrylocation\empty
    \edef\currentlist      {#tag}%
    \edef\currentlistmethod{#method}%
    \edef\currentlistindex {#index}%