From 64f6e8fc0c6cb9254a6fe3db0b4ab31c51cf8524 Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Thu, 4 Apr 2019 14:11:01 +0200
Subject: 2019-04-04 13:38:00

---
 tex/context/base/mkiv/strc-lst.lua | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'tex/context/base/mkiv/strc-lst.lua')

diff --git a/tex/context/base/mkiv/strc-lst.lua b/tex/context/base/mkiv/strc-lst.lua
index 72c24ed5d..bc6135e72 100644
--- a/tex/context/base/mkiv/strc-lst.lua
+++ b/tex/context/base/mkiv/strc-lst.lua
@@ -99,7 +99,8 @@ local v_default         = variables.default
 -- for the moment not public --
 
 local function zerostrippedconcat(t,separator)
-    local f, l = 1, #t
+    local f = 1
+    local l = #t
     for i=f,l do
         if t[i] == 0 then
             f = f + 1
@@ -309,7 +310,8 @@ local synchronizepage = function(r)  -- bah ... will move
     return synchronizepage(r)
 end
 
-local function enhancelist(n)
+local function enhancelist(specification)
+    local n = specification.n
     local l = cached[n]
     if not l then
         report_lists("enhancing %a, unknown internal",n)
@@ -851,18 +853,22 @@ end
 function lists.userdata(name,r,tag) -- to tex (todo: xml)
     local result = lists.result[r]
     if result then
-        local userdata, metadata = result.userdata, result.metadata
+        local userdata = result.userdata
         local str = userdata and userdata[tag]
         if str then
-            return str, metadata
+            return str, result.metadata
         end
     end
 end
 
 function lists.uservalue(name,r,tag,default) -- to lua
     local str = lists.result[r]
-    str = str and str.userdata
-    str = str and str[tag]
+    if str then
+        str = str.userdata
+    end
+    if str then
+        str = str[tag]
+    end
     return str or default
 end
 
@@ -1076,7 +1082,9 @@ implement {
 implement {
     name      = "enhancelist",
     arguments = "integer",
-    actions   = enhancelist,
+    actions   = function(n)
+        enhancelist { n = n }
+    end
 }
 
 implement {
@@ -1084,7 +1092,7 @@ implement {
     arguments = "integer",
     protected = true, -- for now, pre 1.09
     actions   = function(n)
-        ctx_latelua(function() enhancelist(n) end)
+        ctx_latelua { action = enhancelist, n = n }
     end,
 }
 
-- 
cgit v1.2.3