2020-06-26 13:28:00

27 files changed, 100 insertions, 79 deletions

diff --git a/doc/context/documents/general/manuals/cld-mkiv.pdf b/doc/context/documents/general/manuals/cld-mkiv.pdf
index 63f1c36dc..f08253793 100644
--- a/doc/context/documents/general/manuals/cld-mkiv.pdf
+++ b/doc/context/documents/general/manuals/cld-mkiv.pdf
diff --git a/doc/context/documents/general/manuals/luametatex.pdf b/doc/context/documents/general/manuals/luametatex.pdf
index 9c9f1c5bd..db9b643ad 100644
--- a/doc/context/documents/general/manuals/luametatex.pdf
+++ b/doc/context/documents/general/manuals/luametatex.pdf
diff --git a/doc/context/sources/general/manuals/cld/cld-scanners.tex b/doc/context/sources/general/manuals/cld/cld-scanners.tex
index e0dfc30b0..3bf5f658d 100644
--- a/doc/context/sources/general/manuals/cld/cld-scanners.tex
+++ b/doc/context/sources/general/manuals/cld/cld-scanners.tex
@@ -799,6 +799,8 @@ Gives:
 
 \getbuffer[usage]
 
+If you need to pass a string, you pass it as \type {"'preset'"}, so single quotes
+inside the double ones. Otherwise strings are interpreted as scanner types.
 
 \stopsection
 
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 380edf717..69c5b9c2c 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2020.06.25 10:55}
+\newcontextversion{2020.06.26 13:25}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index 0cf1b1e6c..a5d3b1fbf 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.06.25 10:55}
+\edef\contextversion{2020.06.26 13:25}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkiv/back-exp.lua b/tex/context/base/mkiv/back-exp.lua
index 3b9a8f3ac..da2301db7 100644
--- a/tex/context/base/mkiv/back-exp.lua
+++ b/tex/context/base/mkiv/back-exp.lua
@@ -710,24 +710,26 @@ do
 
     function fixes.linenumber(di,data,i)
         local ni = data[i+1]
-        if ni and ni.data then
-            while true do
-                local d = ni.data[1]
-                if d then
-                    local e = d.element
-                    if e then
-                        if e == "line" or e == "verbatimline" then
-                            table.insert(d.data,1,di)
-                            data[i] = false
-                            return
+        if ni then
+            if ni.data then
+                while true do
+                    local d = ni.data[1]
+                    if d then
+                        local e = d.element
+                        if e then
+                            if e == "line" or e == "verbatimline" then
+                                insert(d.data,1,di)
+                                data[i] = false
+                                return
+                            else
+                                ni = d
+                            end
                         else
-                            ni = d
+                            return
                         end
                     else
                         return
                     end
-                else
-                    return
                 end
             end
         end
@@ -2523,6 +2525,8 @@ do
                     -- skip
                 elseif di.skip == "ignore" then
                     -- skip (new)
+elseif di.tg == "ignore" then
+    -- skip (new)
                 elseif di.content then
                     if di.samepar then
                         prevparnumber = false
@@ -2607,8 +2611,8 @@ do
     -- i.e cell attribute
 
     local function collapsetree(tree)
-        for tag, trees in sortedhash(treehash) do
---         for tag, trees in next, treehash do
+--         for tag, trees in sortedhash(treehash) do
+        for tag, trees in next, treehash do
             local d = trees[1].data
 -- print("!!!!!!!!",tag)
 -- inspect(trees)
@@ -3340,6 +3344,9 @@ local collectresults  do -- too many locals otherwise
             elseif id == kern_code then
                 local kern = getkern(n)
                 if kern > 0 then
+local a = getattr(n,a_tagged) or pat
+local t = taglist[a]
+if not t or t.tagname ~= "ignore" then -- maybe earlier on top)
                     local limit = threshold
                     if p then
                         local c, f = isglyph(p)
@@ -3349,7 +3356,7 @@ local collectresults  do -- too many locals otherwise
                     end
                     if kern > limit then
                         if last and not somespace[currentcontent[nofcurrentcontent]] then
-                            local a = getattr(n,a_tagged) or pat
+--                             local a = getattr(n,a_tagged) or pat
                             if a == last then
                                 if not somespace[currentcontent[nofcurrentcontent]] then
                                     if trace_export then
@@ -3370,12 +3377,14 @@ local collectresults  do -- too many locals otherwise
                                 end
                                 nofcurrentcontent = nofcurrentcontent + 1
                                 currentcontent[nofcurrentcontent] = " "
-                                currentnesting = taglist[last]
+--                                 currentnesting = taglist[last]
+currentnesting = t
                                 pushentry(currentnesting)
                                 currentattribute = last
                             end
                         end
                     end
+end
                 end
             elseif id == whatsit_code then
                 if subtype == userdefinedwhatsit_code then
diff --git a/tex/context/base/mkiv/cldf-lmt.lua b/tex/context/base/mkiv/cldf-lmt.lua
index 4855372fa..b23ab1bd0 100644
--- a/tex/context/base/mkiv/cldf-lmt.lua
+++ b/tex/context/base/mkiv/cldf-lmt.lua
@@ -25,10 +25,11 @@ local scanstring        = scanners.string
 local scanboolean       = scanners.boolean
 local scandimen         = scanners.dimen
 local scanfloat         = scanners.float
-local scancount         = scanners.integer
-local scaninteger       = scanners.luainteger
-local scancardinal      = scanners.luacardinal
+local scaninteger       = scanners.integer
 local scannumber        = scanners.luanumber
+local scanluainteger    = scanners.luainteger
+local scanluacardinal   = scanners.luacardinal
+local scanluanumber     = scanners.luanumber
 local scanargument      = scanners.argument
 local scantoken         = scanners.token
 local scancsname        = scanners.csname
@@ -65,7 +66,7 @@ implement {
         if b == "value" then
             context("%.99g",floats[n] or 0)
         else
-            floats[n] = scannumber(true)
+            floats[n] = scanluanumber(true)
          -- floats[n] = scanfloat(true)
         end
     end,
@@ -80,7 +81,7 @@ implement {
         if b == "value" then
             context("%i",integers[n] or 0)
         else
-            integers[n] = scaninteger(true)
+            integers[n] = scanluainteger(true)
         end
     end,
 }
@@ -94,7 +95,7 @@ implement {
         if b == "value" then
             return integer_code, integers[n] or 0
         else
-            integers[n] = scancount(true)
+            integers[n] = scaninteger(true)
         end
     end,
 }
@@ -122,7 +123,7 @@ implement {
         if b == "value" then
             context("%1.0f",cardinals[n] or 0)
         else
-            cardinals[n] = scancardinal(true)
+            cardinals[n] = scanluacardinal(true)
         end
     end,
 }
@@ -137,7 +138,7 @@ implement {
             context("%N",floats[n] or integers[n] or cardinals[n] or 0) -- maybe %N
         else
          -- floats[n] = scanfloat(true)
-            floats[n] = scannumber(true)
+            floats[n] = scanluanumber(true)
         end
     end,
 }
@@ -148,9 +149,9 @@ implement {
     value     = true,
     actions   = function(b)
         if b == "value" then
-            return integer_code, random(scaninteger(),scaninteger())
+            return integer_code, random(scanluainteger(),scanluainteger())
         else
-            randomseed(scaninteger(true))
+            randomseed(scanluainteger(true))
         end
     end,
 }
@@ -210,7 +211,7 @@ implement {
                 data.ny      = ny
                 data.type    = ty
                 if ty == "integer" then
-                    data.scanner = scancount
+                    data.scanner = scaninteger
                 elseif ty == "boolean" then
                     data.scanner = scanboolean
                 elseif ty == "dimension" then
@@ -533,7 +534,7 @@ implement {
     name      = "newluatable",
     protected = true,
  -- public    = true,
-    arguments = { "csname" },
+    arguments = "csname",
     actions   = newluatable,
 }
 
@@ -549,7 +550,7 @@ implement {
     name      = "disposeluatable",
     protected = true,
     public    = true,
-    arguments = { "csname" },
+    arguments = "csname",
     actions   = disposeluatable,
 }
 
@@ -557,7 +558,7 @@ implement {
     name      = "inspectluatable",
     protected = true,
     public    = true,
-    arguments = { "csname" },
+    arguments = "csname",
     actions   = inspectluatable,
 }
 
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 3b01c297e..9ae188108 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2020.06.25 10:55}
+\newcontextversion{2020.06.26 13:25}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index bbefc17e6..ffb4e97ce 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -45,7 +45,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.06.25 10:55}
+\edef\contextversion{2020.06.26 13:25}
 \edef\contextkind   {beta}
 
 %D Kind of special:
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index 45a8e2f2f..d66cf2afe 100644
--- a/tex/context/base/mkiv/context.mkxl
+++ b/tex/context/base/mkiv/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.06.25 10:55}
+\edef\contextversion{2020.06.26 13:25}
 \edef\contextkind   {beta}
 
 %D Kind of special:
diff --git a/tex/context/base/mkiv/core-con.lua b/tex/context/base/mkiv/core-con.lua
index 880813f33..9617849d0 100644
--- a/tex/context/base/mkiv/core-con.lua
+++ b/tex/context/base/mkiv/core-con.lua
@@ -330,7 +330,7 @@ converters.nofdays    = nofdays
 converters.textime    = textime
 
 implement { name = "weekday",  actions = { weekday,  context }, arguments = { "integer", "integer", "integer" } }
-implement { name = "leapyear", actions = { leapyear, context }, arguments = { "integer" } }
+implement { name = "leapyear", actions = { leapyear, context }, arguments = "integer" }
 implement { name = "nofdays",  actions = { nofdays,  context }, arguments = { "integer", "integer" } }
 
 implement { name = "year",     actions = { osdate,   context }, arguments = "'%Y'" }
@@ -1357,7 +1357,7 @@ do
     implement {
         name      = "daymnem",
         actions   = daymnem,
-        arguments = { "integer" }
+        arguments = "integer",
     }
 
     implement {
@@ -1369,13 +1369,13 @@ do
     implement {
         name      = "monthname",
         actions   = monthname,
-        arguments = { "integer" }
+        arguments = "integer",
     }
 
     implement {
         name      = "monthmnem",
         actions   = monthmnem,
-        arguments = { "integer" }
+        arguments = "integer",
     }
 
     -- todo : short week days
diff --git a/tex/context/base/mkiv/font-col.lua b/tex/context/base/mkiv/font-col.lua
index d197c7c85..c47a29906 100644
--- a/tex/context/base/mkiv/font-col.lua
+++ b/tex/context/base/mkiv/font-col.lua
@@ -478,5 +478,5 @@ implement {
 implement {
     name      = "doifelsecharinfont",
     actions   = { collections.found, commands.doifelse },
-    arguments = { "integer" }
+    arguments = "integer"
 }
diff --git a/tex/context/base/mkiv/font-ots.lua b/tex/context/base/mkiv/font-ots.lua
index b612e85e7..86101ee24 100644
--- a/tex/context/base/mkiv/font-ots.lua
+++ b/tex/context/base/mkiv/font-ots.lua
@@ -25,7 +25,7 @@ effect that suddenly fonts behave differently. We don't want to catch all font
 issues.</p>
 
 <p>After a lot of experiments (mostly by Taco, me and Idris) the first implementation
-becaus quite useful. When it did most of what we wanted, a more optimized version
+was already quite useful. When it did most of what we wanted, a more optimized version
 evolved. Of course all errors are mine and of course the code can be improved. There
 are quite some optimizations going on here and processing speed is currently quite
 acceptable and has been improved over time. Many complex scripts are not yet supported
diff --git a/tex/context/base/mkiv/grph-inc.lua b/tex/context/base/mkiv/grph-inc.lua
index 8032f3c24..a59ac8ac2 100644
--- a/tex/context/base/mkiv/grph-inc.lua
+++ b/tex/context/base/mkiv/grph-inc.lua
@@ -707,7 +707,7 @@ implement { name = "figurefilepath", actions = { get, file.dirname,  context },
 implement { name = "figurefilename", actions = { get, file.nameonly, context }, arguments = { "'used'", "'fullname'" } }
 implement { name = "figurefiletype", actions = { get, file.extname,  context }, arguments = { "'used'", "'fullname'" } }
 
-implement { name = "figuresetdimensions", actions = setdimensions, arguments = { "integer" } }
+implement { name = "figuresetdimensions", actions = setdimensions, arguments = "integer" }
 
 -- todo: local path or cache path
 
diff --git a/tex/context/base/mkiv/meta-ini.mkiv b/tex/context/base/mkiv/meta-ini.mkiv
index 6ba0abfa6..52aafac62 100644
--- a/tex/context/base/mkiv/meta-ini.mkiv
+++ b/tex/context/base/mkiv/meta-ini.mkiv
@@ -136,25 +136,34 @@
 
 \let\stopMPinclusions\relax
 
+% The next was broken since we added instances so it will go away!
+
 \unexpanded\def\MPinclusions
   {\dosingleempty\meta_inclusions}
 
 \def\meta_inclusions[#1]%
   {\edef\m_meta_option{#1}%
-   \dosinglegroupempty\meta_inclusions_indeed}
+   \dodoublegroupempty\meta_inclusions_indeed}
 
 \def\meta_inclusions_indeed#1#2%
   {\let\m_meta_saved_instance\currentMPinstance
-   \edef\currentMPinstance{#1}%
-   \ifx\currentMPinstance\empty
-     \let\currentMPinstance\defaultMPinstance
-   \fi
    \ifx\m_meta_option\!!plustoken \else
      \global\t_meta_inclusions\emptytoks
    \fi
-   \gtoksapp\t_meta_inclusions{#2}%
+   \ifsecondargument
+     \edef\currentMPinstance{#1}%
+     \ifx\currentMPinstance\empty
+       \let\currentMPinstance\defaultMPinstance
+     \fi
+     \gtoksapp\t_meta_inclusions{#2}%
+   \else
+     \let\currentMPinstance\defaultMPinstance
+     \gtoksapp\t_meta_inclusions{#1}%
+   \fi
    \let\currentMPinstance\m_meta_saved_instance}
 
+% so far
+
 \installcommandhandler \??mpinstance {MPinstance} \??mpinstance
 
 \setupMPinstance
diff --git a/tex/context/base/mkiv/meta-ini.mkxl b/tex/context/base/mkiv/meta-ini.mkxl
index dbb7aeb57..513f87ae2 100644
--- a/tex/context/base/mkiv/meta-ini.mkxl
+++ b/tex/context/base/mkiv/meta-ini.mkxl
@@ -135,25 +135,34 @@
 
 \let\stopMPinclusions\relax
 
+% The next was broken since we added instances so it will go away!
+
 \unexpanded\def\MPinclusions
   {\dosingleempty\meta_inclusions}
 
 \def\meta_inclusions[#1]%
   {\edef\m_meta_option{#1}%
-   \dosinglegroupempty\meta_inclusions_indeed}
+   \dodoublegroupempty\meta_inclusions_indeed}
 
 \def\meta_inclusions_indeed#1#2%
   {\let\m_meta_saved_instance\currentMPinstance
-   \edef\currentMPinstance{#1}%
-   \ifempty\currentMPinstance
-     \let\currentMPinstance\defaultMPinstance
-   \fi
    \ifx\m_meta_option\!!plustoken \else
      \global\t_meta_inclusions\emptytoks
    \fi
-   \gtoksapp\t_meta_inclusions{#2}%
+   \ifsecondargument
+     \edef\currentMPinstance{#1}%
+     \ifx\currentMPinstance\empty
+       \let\currentMPinstance\defaultMPinstance
+     \fi
+     \gtoksapp\t_meta_inclusions{#2}%
+   \else
+     \let\currentMPinstance\defaultMPinstance
+     \gtoksapp\t_meta_inclusions{#1}%
+   \fi
    \let\currentMPinstance\m_meta_saved_instance}
 
+% so far
+
 \installcommandhandler \??mpinstance {MPinstance} \??mpinstance
 
 \setupMPinstance
diff --git a/tex/context/base/mkiv/page-lin.lua b/tex/context/base/mkiv/page-lin.lua
index 5ad660460..06983ef5c 100644
--- a/tex/context/base/mkiv/page-lin.lua
+++ b/tex/context/base/mkiv/page-lin.lua
@@ -485,15 +485,6 @@ function boxed.stage_two(n,m)
             local m  = li[2]
             local ti = t[i]
             if ti then
-             -- local d = getdirection(n)
-             -- local l = getlist(n)
-             -- if d == 1 then
-             --     local w = getwidth(n)
-             --     ti = hpack_nodes(linked_nodes(new_kern(-w),ti,new_kern(w)))
-             -- end
-             -- setnext(ti,l)
-             -- setprev(l,ti)
-             -- setlist(n,ti)
                 addtoline(n,ti)
                 resolve(n,m)
             else
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 26777bb6d..1cd7d90a0 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index ad3136f2a..770293cb2 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/strc-doc.lua b/tex/context/base/mkiv/strc-doc.lua
index 9877a0f9c..aadbd8a90 100644
--- a/tex/context/base/mkiv/strc-doc.lua
+++ b/tex/context/base/mkiv/strc-doc.lua
@@ -1103,9 +1103,9 @@ implement { name = "namedstructureuservariable", actions = sections.userdata,
 implement { name = "setstructurelevel",          actions = sections.setlevel,        arguments = "2 strings" }
 implement { name = "getstructurelevel",          actions = sections.getcurrentlevel, arguments = "string" }
 implement { name = "setstructurenumber",         actions = sections.setnumber,       arguments = { "integer", "string" } } -- string as we support +-
-implement { name = "getstructurenumber",         actions = sections.getnumber,       arguments = { "integer" } }
+implement { name = "getstructurenumber",         actions = sections.getnumber,       arguments = "integer" }
 implement { name = "getsomestructurenumber",     actions = sections.getnumber,       arguments = { "integer", "string" } }
-implement { name = "getfullstructurenumber",     actions = sections.fullnumber,      arguments = { "integer" } }
+implement { name = "getfullstructurenumber",     actions = sections.fullnumber,      arguments = "integer" }
 implement { name = "getsomefullstructurenumber", actions = sections.fullnumber,      arguments = { "integer", "string" } }
 implement { name = "getspecificstructuretitle",  actions = sections.structuredata,   arguments = { "string", "'titledata.title'",false,"string" } }
 
diff --git a/tex/context/base/mkiv/strc-lst.lua b/tex/context/base/mkiv/strc-lst.lua
index 9f4e0fe63..fdbb97873 100644
--- a/tex/context/base/mkiv/strc-lst.lua
+++ b/tex/context/base/mkiv/strc-lst.lua
@@ -1216,7 +1216,7 @@ implement {
 implement { name = "doifelselisthastitle",  actions = { lists.hastitledata,  commands.doifelse }, arguments = { "string", "integer" } }
 implement { name = "doifelselisthaspage",   actions = { lists.haspagedata,   commands.doifelse }, arguments = { "string", "integer" } }
 implement { name = "doifelselisthasnumber", actions = { lists.hasnumberdata, commands.doifelse }, arguments = { "string", "integer" } }
-implement { name = "doifelselisthasentry",  actions = { lists.iscached,      commands.doifelse }, arguments = { "integer" } }
+implement { name = "doifelselisthasentry",  actions = { lists.iscached,      commands.doifelse }, arguments = "integer" }
 
 local function savedlisttitle(name,n,tag)
     local data = cached[tonumber(n)]
@@ -1274,7 +1274,7 @@ implement {
 implement {
     name      = "discardfromlist",
     actions   = lists.discard,
-    arguments = { "integer" }
+    arguments = "integer"
 }
 
 -- new and experimental and therefore off by default
diff --git a/tex/context/base/mkiv/strc-pag.lua b/tex/context/base/mkiv/strc-pag.lua
index 9b3a77e74..47fa9463c 100644
--- a/tex/context/base/mkiv/strc-pag.lua
+++ b/tex/context/base/mkiv/strc-pag.lua
@@ -440,6 +440,6 @@ implement { -- weird place
 
 interfaces.implement {
     name      = "pageofinternal",
-    arguments = { "integer" },
+    arguments = "integer",
     actions   = helpers.pageofinternal,
 }
diff --git a/tex/context/base/mkiv/supp-ran.lua b/tex/context/base/mkiv/supp-ran.lua
index ef2654406..08889edf3 100644
--- a/tex/context/base/mkiv/supp-ran.lua
+++ b/tex/context/base/mkiv/supp-ran.lua
@@ -142,7 +142,7 @@ implement { name = "getrandomnumber",   actions = { getrandomnumber, context },
 implement { name = "getrandomdimen",    actions = { getrandomnumber, context }, arguments = { "dimen", "dimen" } }
 implement { name = "getrandomfloat",    actions = { getrandomnumber, context }, arguments = { "number", "number" } }
 --------- { name = "getmprandomnumber", actions = { getmprandomnumber, context } }
-implement { name = "setrandomseed",     actions = { setrandomseed },            arguments = { "integer" } }
+implement { name = "setrandomseed",     actions = { setrandomseed },            arguments = "integer" }
 implement { name = "getrandomseed",     actions = { getrandomseed, context } }
 implement { name = "pushrandomseed",    actions = { pushrandomseed  } }
 implement { name = "poprandomseed",     actions = { poprandomseed } }
diff --git a/tex/context/base/mkiv/typo-lin.lua b/tex/context/base/mkiv/typo-lin.lua
index 15e543c52..1d523a200 100644
--- a/tex/context/base/mkiv/typo-lin.lua
+++ b/tex/context/base/mkiv/typo-lin.lua
@@ -123,10 +123,10 @@ local getreserved       = jobpositions.getreserved
 local paragraphs        = { }
 typesetters.paragraphs  = paragraphs
 
-local addskips          = false
+local addskips          = false -- todo: use engine normalizer
 local noflines          = 0
 
--- This is the third version, a mix between immediate (prestice lines) and delayed
+-- This is the third version, a mix between immediate (prestine lines) and delayed
 -- as we don't want anchors that are not used.
 
 -- I will make a better variant once lmtx is stable i.e. less clutter.
diff --git a/tex/context/modules/mkiv/m-chart.lua b/tex/context/modules/mkiv/m-chart.lua
index 76efbedfd..6c57f070e 100644
--- a/tex/context/modules/mkiv/m-chart.lua
+++ b/tex/context/modules/mkiv/m-chart.lua
@@ -323,7 +323,7 @@ implement {
 
 implement {
     name      = "flow_set_text",
-    arguments = { "string", "string" },
+    arguments = "2 strings",
     actions   = function(align,str)
         temp.texts[#temp.texts+1] = {
             align = align,
@@ -358,7 +358,7 @@ implement {
 
 implement {
     name      = "flow_set_label",
-    arguments = { "string", "string" },
+    arguments = "2 strings",
     actions   = function(location,text)
         temp.labels[#temp.labels+1] = {
             location = location,
@@ -369,7 +369,7 @@ implement {
 
 implement {
     name      = "flow_set_comment",
-    arguments = { "string", "string" },
+    arguments = "2 strings",
     actions   = function(location,text)
         local connections = temp.connections
         if connections then
@@ -389,7 +389,7 @@ implement {
 
 implement {
     name      = "flow_set_exit",
-    arguments = { "string", "string" },
+    arguments = "2 strings",
     actions   = function(location,text)
         temp.exits[#temp.exits+1] = {
             location = location,
@@ -582,7 +582,7 @@ implement {
 
 implement {
     name      = "flow_set_connection",
-    arguments = { "string", "string", "string" },
+    arguments = "3 strings",
     actions   = function(location,displacement,name)
         local dx, dy = lpegmatch(splitter,displacement)
         dx = tonumber(dx)
diff --git a/tex/context/modules/mkiv/m-steps.lua b/tex/context/modules/mkiv/m-steps.lua
index ce84866a4..bbc267274 100644
--- a/tex/context/modules/mkiv/m-steps.lua
+++ b/tex/context/modules/mkiv/m-steps.lua
@@ -399,7 +399,7 @@ end
 
 interfaces.implement {
     name      = "step_start_chart",
-    arguments = { "string", "string" },
+    arguments = "2 strings",
     actions   = step_start_chart,
 }
 
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 471d32d1b..b4b5d0af1 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 2020-06-25 10:55
+-- merge date  : 2020-06-26 13:25
 
 do -- begin closure to overcome local limits and interference