14 files changed, 19 insertions, 38 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 92f8f4cad..45e745faa 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.07.02 16:03}
+\newcontextversion{2020.07.02 17:49}
 
 %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 c8eddc1ab..f13b0d05b 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.07.02 16:03}
+\edef\contextversion{2020.07.02 17:49}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 21e1a320d..d07ab3621 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.07.02 16:03}
+\newcontextversion{2020.07.02 17:49}
 
 %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 9ad4337ed..64fec04ab 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -45,8 +45,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.07.02 16:03}
-\edef\contextkind   {beta}
+\edef\contextversion{2020.07.02 17:49}
 
 %D Kind of special:
 
@@ -92,7 +91,6 @@
 %D now put it into the environment.
 
 \newtoks\contextversiontoks \contextversiontoks\expandafter{\contextversion}
-\newtoks\contextkindtoks    \contextkindtoks   \expandafter{\contextkind}
 
 % \normaleverypar{\wait} % uncomment for test of funny injections
 
@@ -619,7 +617,7 @@
 % \to \everyjob
 
 \appendtoks
-    \ctxlua{statistics.savefmtstatus("\jobname","\contextversion","context.mkiv","\contextkind","\contextbanner")}% can become automatic
+    \ctxlua{statistics.savefmtstatus("\jobname","\contextversion","context.mkiv","\contextbanner")}% can become automatic
 \to \everydump
 
 \errorstopmode \dump \endinput
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index d72b40d9d..1d8188b2d 100644
--- a/tex/context/base/mkiv/context.mkxl
+++ b/tex/context/base/mkiv/context.mkxl
@@ -29,8 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.07.02 16:03}
-\edef\contextkind   {beta}
+\edef\contextversion{2020.07.02 17:49}
 
 %D Kind of special:
 
@@ -44,7 +43,7 @@
 %D Loading:
 
 \edef\mksuffix   {mkiv}
-\edef\contextmark{MKIV}
+\edef\contextmark{LMTX}
 
 \ifx\normalinput\undefined \let\normalinput\input \fi
 
@@ -76,7 +75,6 @@
 %D now put it into the environment.
 
 \newtoks\contextversiontoks \contextversiontoks\expandafter{\contextversion}
-\newtoks\contextkindtoks    \contextkindtoks   \expandafter{\contextkind}
 
 % \normaleverypar{\wait} % uncomment for test of funny injections
 
@@ -614,7 +612,7 @@
 % \to \everyjob
 
 \appendtoks
-    \ctxlua{statistics.savefmtstatus("\jobname","\contextversion","context.mkxl","\contextkind","\contextbanner")}% can become automatic
+    \ctxlua{statistics.savefmtstatus("\jobname","\contextversion","context.mkxl","\contextbanner")}% can become automatic
 \to \everydump
 
 \errorstopmode \dump \endinput
diff --git a/tex/context/base/mkiv/data-use.lua b/tex/context/base/mkiv/data-use.lua
index 7df416b65..a7ca2389e 100644
--- a/tex/context/base/mkiv/data-use.lua
+++ b/tex/context/base/mkiv/data-use.lua
@@ -68,7 +68,7 @@ statistics.register("used cache path",  function() return caches.usedpaths() end
 
 -- experiment (code will move)
 
-function statistics.savefmtstatus(texname,formatbanner,sourcefile,kind,banner) -- texname == formatname
+function statistics.savefmtstatus(texname,formatbanner,sourcefile,banner) -- texname == formatname
     local enginebanner = status.banner
     if formatbanner and enginebanner and sourcefile then
         local luvname = file.replacesuffix(texname,"luv") -- utilities.lua.suffixes.luv
diff --git a/tex/context/base/mkiv/luat-env.lua b/tex/context/base/mkiv/luat-env.lua
index 1620a26e5..edf127765 100644
--- a/tex/context/base/mkiv/luat-env.lua
+++ b/tex/context/base/mkiv/luat-env.lua
@@ -38,14 +38,6 @@ local mt = {
             else
                 return "unknown"
             end
-        elseif k == "kind" then
-            local kind = texgettoks and texgettoks("contextkindtoks")
-            if kind and kind ~= "" then
-                rawset(environment,"kind",kind)
-                return kind
-            else
-                return "unknown"
-            end
         elseif k == "jobname" or k == "formatname" then
             local name = tex and tex[k]
             if name or name== "" then
diff --git a/tex/context/base/mkiv/luat-run.lua b/tex/context/base/mkiv/luat-run.lua
index d29a463b8..990a1b154 100644
--- a/tex/context/base/mkiv/luat-run.lua
+++ b/tex/context/base/mkiv/luat-run.lua
@@ -99,18 +99,11 @@ end
 local function report_output_log()
 end
 
--- local function show_open()
--- end
-
--- local function show_close()
--- end
-
 local function pre_dump_actions()
     for i=1,#dumpactions do
         dumpactions[i]()
     end
     lua.finalize(trace_lua_dump and report_lua or nil)
- -- statistics.savefmtstatus("\jobname","\contextversion","context.tex")
 end
 
 local function wrapup_synctex()
diff --git a/tex/context/base/mkiv/mult-ini.mkiv b/tex/context/base/mkiv/mult-ini.mkiv
index b589f38f2..66b4673b0 100644
--- a/tex/context/base/mkiv/mult-ini.mkiv
+++ b/tex/context/base/mkiv/mult-ini.mkiv
@@ -24,6 +24,7 @@
 % Todo:
 
 \def\c!placeholder{placeholder}
+\def\c!indentlist {indentlist}
 
 %D \macros
 %D   [constanten,variabelen,commands]
@@ -764,7 +765,7 @@
 
 \def\contextbanner
   {ConTeXt \space
-   ver: \contextversion \space \contextmark \space \contextkind \space \space
+   ver: \contextversion \space \contextmark \space \space
    fmt: \formatversion \space \space
    int: \currentinterface/\currentresponses}
 
diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua
index 16eb3e68b..8c09dd803 100644
--- a/tex/context/base/mkiv/mult-low.lua
+++ b/tex/context/base/mkiv/mult-low.lua
@@ -34,7 +34,7 @@ return {
         --
         "fmtname", "fmtversion", "texengine", "texenginename", "texengineversion", "texenginefunctionality",
         "luatexengine", "pdftexengine", "xetexengine", "unknownengine",
-        "contextformat", "contextversion", "contextkind", "contextlmtxmode", "contextmark", "mksuffix",
+        "contextformat", "contextversion", "contextlmtxmode", "contextmark", "mksuffix",
         --
         "activecatcode",
         --
diff --git a/tex/context/base/mkiv/spac-lin.mkiv b/tex/context/base/mkiv/spac-lin.mkiv
index ef87536f2..640bcdaae 100644
--- a/tex/context/base/mkiv/spac-lin.mkiv
+++ b/tex/context/base/mkiv/spac-lin.mkiv
@@ -79,12 +79,12 @@
 %D See \type {indentation-005.tex}:
 %D
 %D \starttyping
-%D \setuplines[indentnext={0pt,10pt,15pt,20pt}]
+%D \setuplines[indentlist={0pt,10pt,15pt,20pt}]
 %D
 %D \setupindenting[yes,1em]
-%D \setuplines[indentnext={0pt,*,*}]
+%D \setuplines[indentlist={0pt,*,*}]
 %D
-%D \setuplines[indentnext={0pt,1em,*}]
+%D \setuplines[indentlist={0pt,1em,*}]
 %D \starttyping
 
 \newcount\c_spac_lines_indent_cnt
@@ -97,7 +97,7 @@
    \else
      \advance\c_spac_lines_indent_cnt\plusone
    \fi
-   \getfromcommacommand[\m_spac_lines_indentnext][\c_spac_lines_indent_cnt]%
+   \getfromcommacommand[\m_spac_lines_indentlist][\c_spac_lines_indent_cnt]%
    \ifx\commalistelement\wildcardsymbol
      \hskip\d_spac_lines_indent
    \else
@@ -133,12 +133,11 @@
    \setupwhitespace[\v!none]% todo use fast variant
    %\obeylines % move upwards to keep spaces in the first line due to optional argument
    %
-   \edef\m_spac_lines_indentnext{\linesparameter\c!indentnext}%
-   \getcommacommandsize[\m_spac_lines_indentnext]%
+   \edef\m_spac_lines_indentlist{\linesparameter\c!indentlist}%
+   \getcommacommandsize[\m_spac_lines_indentlist]%
    \c_spac_lines_indent_max\commalistsize
    \c_spac_lines_indent_cnt\zerocount
    \ifnum\c_spac_lines_indent_max>\plusone
-     \letlinesparameter\c!indentnext\empty
      \let\spac_lines_indent\spac_lines_indent_indeed
      \d_spac_lines_indent\d_spac_indentation_par
    \else
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 2b85fcc22..0f1852d0b 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 b34a061e8..1b0676045 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 51ab6e32e..4ae9c30f8 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-07-02 16:03
+-- merge date  : 2020-07-02 17:49
 
 do -- begin closure to overcome local limits and interference