2019-10-29 15:08:00

31 files changed, 110 insertions, 72 deletions

diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf
index caf2193a7..8fe444645 100644
--- a/doc/context/documents/general/qrcs/setup-cs.pdf
+++ b/doc/context/documents/general/qrcs/setup-cs.pdf
diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf
index 2e0e1be0a..08e6939e8 100644
--- a/doc/context/documents/general/qrcs/setup-de.pdf
+++ b/doc/context/documents/general/qrcs/setup-de.pdf
diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf
index 966b2ae73..d78131958 100644
--- a/doc/context/documents/general/qrcs/setup-en.pdf
+++ b/doc/context/documents/general/qrcs/setup-en.pdf
diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf
index 74725cd28..8d4a8d959 100644
--- a/doc/context/documents/general/qrcs/setup-fr.pdf
+++ b/doc/context/documents/general/qrcs/setup-fr.pdf
diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf
index b5bbee3e9..b7ad4f18f 100644
--- a/doc/context/documents/general/qrcs/setup-it.pdf
+++ b/doc/context/documents/general/qrcs/setup-it.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf
index 9ff2fbd6e..7d21f8650 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-de.pdf b/doc/context/documents/general/qrcs/setup-mapping-de.pdf
index 8b4fb09bf..e0fb46a36 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-de.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-de.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-en.pdf b/doc/context/documents/general/qrcs/setup-mapping-en.pdf
index 277389453..e5be97916 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-en.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-en.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
index 7b5884e6f..aa4ae01e9 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-it.pdf b/doc/context/documents/general/qrcs/setup-mapping-it.pdf
index d28239ff7..83fac3d02 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-it.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-it.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf
index 6d4ecc600..bf190b3b1 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf
index b50d51950..fce5f91c9 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf
diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf
index 7ad98be3e..bd547b5db 100644
--- a/doc/context/documents/general/qrcs/setup-nl.pdf
+++ b/doc/context/documents/general/qrcs/setup-nl.pdf
diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf
index a12c87f72..f895eef78 100644
--- a/doc/context/documents/general/qrcs/setup-ro.pdf
+++ b/doc/context/documents/general/qrcs/setup-ro.pdf
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 0d5c86713..cdc396edc 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -194,7 +194,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-lua"] = package.loaded["l-lua"] or true
 
--- original size: 6436, stripped down to: 2933
+-- original size: 6520, stripped down to: 2988
 
 if not modules then modules={} end modules ['l-lua']={
  version=1.001,
@@ -212,6 +212,9 @@ if LUAVERSION<5.2 and jit then
  MINORVERSION=2
  LUAVERSION=5.2
 end
+if lua and lua.openfile then
+ io.open=lua.openfile
+end
 if not lpeg then
  lpeg=require("lpeg")
 end
@@ -579,7 +582,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-sandbox"] = package.loaded["l-sandbox"] or true
 
--- original size: 9747, stripped down to: 6313
+-- original size: 9604, stripped down to: 6394
 
 if not modules then modules={} end modules ['l-sandbox']={
  version=1.001,
@@ -811,6 +814,9 @@ local function supported(library)
  return l
 end
 loadfile=register(loadfile,"loadfile")
+if supported("lua") then
+ lua.openfile=register(lua.openfile,"lua.openfile")
+end
 if supported("io") then
  io.open=register(io.open,"io.open")
  io.popen=register(io.popen,"io.popen") 
@@ -25860,8 +25866,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1030951
--- stripped bytes    : 408133
+-- original bytes    : 1030892
+-- stripped bytes    : 407938
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 0d5c86713..cdc396edc 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -194,7 +194,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-lua"] = package.loaded["l-lua"] or true
 
--- original size: 6436, stripped down to: 2933
+-- original size: 6520, stripped down to: 2988
 
 if not modules then modules={} end modules ['l-lua']={
  version=1.001,
@@ -212,6 +212,9 @@ if LUAVERSION<5.2 and jit then
  MINORVERSION=2
  LUAVERSION=5.2
 end
+if lua and lua.openfile then
+ io.open=lua.openfile
+end
 if not lpeg then
  lpeg=require("lpeg")
 end
@@ -579,7 +582,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-sandbox"] = package.loaded["l-sandbox"] or true
 
--- original size: 9747, stripped down to: 6313
+-- original size: 9604, stripped down to: 6394
 
 if not modules then modules={} end modules ['l-sandbox']={
  version=1.001,
@@ -811,6 +814,9 @@ local function supported(library)
  return l
 end
 loadfile=register(loadfile,"loadfile")
+if supported("lua") then
+ lua.openfile=register(lua.openfile,"lua.openfile")
+end
 if supported("io") then
  io.open=register(io.open,"io.open")
  io.popen=register(io.popen,"io.popen") 
@@ -25860,8 +25866,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1030951
--- stripped bytes    : 408133
+-- original bytes    : 1030892
+-- stripped bytes    : 407938
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 0d5c86713..cdc396edc 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -194,7 +194,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-lua"] = package.loaded["l-lua"] or true
 
--- original size: 6436, stripped down to: 2933
+-- original size: 6520, stripped down to: 2988
 
 if not modules then modules={} end modules ['l-lua']={
  version=1.001,
@@ -212,6 +212,9 @@ if LUAVERSION<5.2 and jit then
  MINORVERSION=2
  LUAVERSION=5.2
 end
+if lua and lua.openfile then
+ io.open=lua.openfile
+end
 if not lpeg then
  lpeg=require("lpeg")
 end
@@ -579,7 +582,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-sandbox"] = package.loaded["l-sandbox"] or true
 
--- original size: 9747, stripped down to: 6313
+-- original size: 9604, stripped down to: 6394
 
 if not modules then modules={} end modules ['l-sandbox']={
  version=1.001,
@@ -811,6 +814,9 @@ local function supported(library)
  return l
 end
 loadfile=register(loadfile,"loadfile")
+if supported("lua") then
+ lua.openfile=register(lua.openfile,"lua.openfile")
+end
 if supported("io") then
  io.open=register(io.open,"io.open")
  io.popen=register(io.popen,"io.popen") 
@@ -25860,8 +25866,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1030951
--- stripped bytes    : 408133
+-- original bytes    : 1030892
+-- stripped bytes    : 407938
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index 0d5c86713..cdc396edc 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -194,7 +194,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-lua"] = package.loaded["l-lua"] or true
 
--- original size: 6436, stripped down to: 2933
+-- original size: 6520, stripped down to: 2988
 
 if not modules then modules={} end modules ['l-lua']={
  version=1.001,
@@ -212,6 +212,9 @@ if LUAVERSION<5.2 and jit then
  MINORVERSION=2
  LUAVERSION=5.2
 end
+if lua and lua.openfile then
+ io.open=lua.openfile
+end
 if not lpeg then
  lpeg=require("lpeg")
 end
@@ -579,7 +582,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-sandbox"] = package.loaded["l-sandbox"] or true
 
--- original size: 9747, stripped down to: 6313
+-- original size: 9604, stripped down to: 6394
 
 if not modules then modules={} end modules ['l-sandbox']={
  version=1.001,
@@ -811,6 +814,9 @@ local function supported(library)
  return l
 end
 loadfile=register(loadfile,"loadfile")
+if supported("lua") then
+ lua.openfile=register(lua.openfile,"lua.openfile")
+end
 if supported("io") then
  io.open=register(io.open,"io.open")
  io.popen=register(io.popen,"io.popen") 
@@ -25860,8 +25866,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1030951
--- stripped bytes    : 408133
+-- original bytes    : 1030892
+-- stripped bytes    : 407938
 
 -- end library merge
 
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 42dac33ab..e4a4633e3 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{2019.10.28 18:12}
+\newcontextversion{2019.10.29 15:00}
 
 %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 d3691a6e7..bc5f2b94f 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{2019.10.28 18:12}
+\edef\contextversion{2019.10.29 15:00}
 
 %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 f06aeab01..80f15c587 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{2019.10.28 18:12}
+\newcontextversion{2019.10.29 15:00}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index b367c0c44..880ae7fa3 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{2019.10.28 18:12}
+\edef\contextversion{2019.10.29 15:00}
 \edef\contextkind   {beta}
 
 %D Kind of special:
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index 77678596c..23cebe57e 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{2019.10.28 18:12}
+\edef\contextversion{2019.10.29 15:00}
 \edef\contextkind   {beta}
 
 %D Kind of special:
diff --git a/tex/context/base/mkiv/l-lua.lua b/tex/context/base/mkiv/l-lua.lua
index 6e9606e84..51399216c 100644
--- a/tex/context/base/mkiv/l-lua.lua
+++ b/tex/context/base/mkiv/l-lua.lua
@@ -35,6 +35,12 @@ if LUAVERSION < 5.2 and jit then
     LUAVERSION   = 5.2
 end
 
+-- this is lmtx only:
+
+if lua and lua.openfile then
+    io.open = lua.openfile
+end
+
 -- lpeg
 
 if not lpeg then
diff --git a/tex/context/base/mkiv/l-sandbox.lua b/tex/context/base/mkiv/l-sandbox.lua
index c2e1753d3..276e54937 100644
--- a/tex/context/base/mkiv/l-sandbox.lua
+++ b/tex/context/base/mkiv/l-sandbox.lua
@@ -281,20 +281,24 @@ end
 
 loadfile = register(loadfile,"loadfile")
 
+if supported("lua") then
+    lua.openfile = register(lua.openfile,"lua.openfile")
+end
+
 if supported("io") then
-    io.open               = register(io.open,              "io.open")
-    io.popen              = register(io.popen,             "io.popen") -- needs checking
-    io.lines              = register(io.lines,             "io.lines")
-    io.output             = register(io.output,            "io.output")
-    io.input              = register(io.input,             "io.input")
+    io.open   = register(io.open,  "io.open")
+    io.popen  = register(io.popen, "io.popen") -- needs checking
+    io.lines  = register(io.lines, "io.lines")
+    io.output = register(io.output,"io.output")
+    io.input  = register(io.input, "io.input")
 end
 
 if supported("os") then
-    os.execute            = register(os.execute,           "os.execute")
-    os.spawn              = register(os.spawn,             "os.spawn")
-    os.exec               = register(os.exec,              "os.exec")
-    os.rename             = register(os.rename,            "os.rename")
-    os.remove             = register(os.remove,            "os.remove")
+    os.execute = register(os.execute,"os.execute")
+    os.spawn   = register(os.spawn,  "os.spawn")
+    os.exec    = register(os.exec,   "os.exec")
+    os.rename  = register(os.rename, "os.rename")
+    os.remove  = register(os.remove, "os.remove")
 end
 
 if supported("lfs") then
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index f337a1e15..2d27af210 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 4825b13c7..15622145c 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-itm.mkvi b/tex/context/base/mkiv/strc-itm.mkvi
index f09b24cdf..f835aa352 100644
--- a/tex/context/base/mkiv/strc-itm.mkvi
+++ b/tex/context/base/mkiv/strc-itm.mkvi
@@ -204,9 +204,9 @@
 % 1 = between unless before
 % 2 = between
 
-\newconstant   \c_strc_itemgroups_spacing_mode      \c_strc_itemgroups_spacing_mode\plustwo
-\newconditional\c_strc_itemgroups_optimize          \settrue\c_strc_itemgroups_optimize
-\newconditional\c_strc_itemgroups_auto_concat       \settrue\c_strc_itemgroups_auto_concat
+\newconstant   \c_strc_itemgroups_spacing_mode   \c_strc_itemgroups_spacing_mode\plustwo
+\newconditional\c_strc_itemgroups_optimize       \settrue\c_strc_itemgroups_optimize
+\newconditional\c_strc_itemgroups_auto_concat    \settrue\c_strc_itemgroups_auto_concat
 
 \newsignal     \d_strc_itemgroups_signal
 
@@ -215,30 +215,28 @@
 \newdimen      \d_strc_itemgroups_list_width
 \newdimen      \d_strc_itemgroups_asked_width
 
-\newdimen      \d_strc_itemgroups_max_width         % multipass
-\newcount      \c_strc_itemgroups_max_items         % multipass
+\newdimen      \d_strc_itemgroups_max_width      % multipass
+\newcount      \c_strc_itemgroups_max_items      % multipass
 
 \newcount      \c_strc_itemgroups_n_of_items
 \newcount      \c_strc_itemgroups_nesting
 \newcount      \c_strc_itemgroups_column_depth
 
-\def           \v_strc_itemgroups_counter           {itemgroup:\currentparentitemgroup}
+\def           \v_strc_itemgroups_counter        {itemgroup:\currentparentitemgroup}
+\let           \m_strc_itemgroups_repeat_start   \empty
+\def           \v_strc_itemgroups_unknown_symbol {?}
+\let           \m_strc_itemgroups_indenting      \empty
+\let           \m_strc_itemgroups_destination    \empty
 
-\let           \m_strc_itemgroups_repeat_start      \empty
-\def           \v_strc_itemgroups_unknown_symbol    {?}
+\let           \currentitemlevel                 \!!zerocount % public
+\def           \currentnofitems                  {\the\c_strc_itemgroups_max_items}
+\def           \currentitemnumber                {\strc_counters_raw_sub\v_strc_itemgroups_counter\currentitemlevel} % public
 
-\let           \m_strc_itemgroups_indenting         \empty
-\let           \m_strc_itemgroups_destination       \empty
+\newtoks       \itemgroupcommands                % maybe public
 
-\let           \currentitemlevel               \!!zerocount % public
-\def           \currentnofitems                {\the\c_strc_itemgroups_max_items}
-\def           \currentitemnumber              {\strc_counters_raw_sub\v_strc_itemgroups_counter\currentitemlevel} % public
-
-\newtoks       \itemgroupcommands              % maybe public
-
-\def           \currentitemgroupsymbol         {n}    % here we cannot use a _ in the name
-\let           \currentitemgroupconversionset  \empty % here we cannot use a _ in the name
-\let           \currentitemgroupsegments       \empty
+\def           \currentitemgroupsymbol           {n}    % here we cannot use a _ in the name
+\let           \currentitemgroupconversionset    \empty % here we cannot use a _ in the name
+\let           \currentitemgroupsegments         \empty
 
 \def\strc_itemgroups_register_status
   {\clf_registeritemgroup{\currentparentitemgroup}\c_strc_itemgroups_nesting\c_strc_itemgroups_n_of_items\dimexpr\itemgroupparameter\c!maxwidth\relax}
@@ -513,9 +511,9 @@
    \setfalse\c_strc_itemgroups_columns
    % to be checked
    \let\m_strc_itemgroups_destination\empty
-   \let\strc_itemgroups_used_symbol\empty % ** start value
+   \let\strc_itemgroups_used_symbol  \empty % ** start value
    \let\strc_itemgroups_margin_symbol\empty
-   \let\strc_itemgroups_extra_symbol\empty
+   \let\strc_itemgroups_extra_symbol \empty
    %
    \global\letitemgroupparameter\c!maxwidth\!!zeropoint
    }
@@ -800,25 +798,6 @@
 \unexpanded\def\startitemgroup
   {\dotripleempty\strc_itemgroups_start}
 
-% \def\strc_itemgroups_start[#category][#options][#settings]%
-%   {\begingroup % (1)
-%    \def\currentitemgroup{#category}% no nested mixing of itemgroups
-%    \let\currentparentitemgroup\currentitemgroup
-%    \global\advance\c_strc_itemgroups_nesting\plusone
-%    \def\currentitemlevel{\number\c_strc_itemgroups_nesting}%
-%    \normalexpanded{\chaintocurrentitemgroup{\currentparentitemgroup:\currentitemlevel}}%
-%    \edef\currentitemgroup{\currentparentitemgroup:\currentitemlevel}%
-%    %
-%    \ifthirdargument
-%      \strc_itemgroups_start_indeed[#options][#settings]%
-%    \else\ifsecondargument
-%      \doifelseassignment{#options}
-%        {\strc_itemgroups_start_indeed[][#options]}
-%        {\strc_itemgroups_start_indeed[#options][]}%
-%    \else
-%      \strc_itemgroups_start_indeed[][]%
-%    \fi\fi}
-
 \def\strc_itemgroups_start[#category][#options][#settings]%
   {\begingroup % (1)
    \def\currentitemgroup{#category}% no nested mixing of itemgroups
@@ -1879,4 +1858,26 @@
 \defineitemgroup
   [\v!itemize]
 
+%D This is really ugly I should get rid of the global mess, whuch is a side
+%D effect of the simple \type {\item} interface that we're stuck with for
+%D compatibility reasons. See footnotes for usage. It's probablynot robust
+%D for mixed itemgroups so in the end I need to get rid of the globals. One
+%D problem is that counters are set.
+
+\defineitemgroup
+  [\v!itemize:\v!note]
+
+\def\strc_itemgroups_push
+  {\edef\strc_itemgroups_pop
+     {\xdef\noexpand\currentitemlevel{\currentitemlevel}%
+      \global\c_strc_itemgroups_nesting     \the\c_strc_itemgroups_nesting     \relax
+      \global\c_strc_itemgroups_column_depth\the\c_strc_itemgroups_column_depth\relax}%
+   \global\c_strc_itemgroups_column_depth\zerocount
+   \global\c_strc_itemgroups_nesting     \zerocount
+   \glet\currentitemlevel\!!zerocount
+   \unexpanded\def\startitemize{\startitemgroup[\v!itemize:\v!note]}%
+   \unexpanded\def\stopitemize {\stopitemgroup}}
+
+\let\strc_itemgroups_pop\relax
+
 \protect \endinput
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 966b2ae73..d78131958 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index f65eb65f8..ca4115bc9 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index e856248cb..b8a21fc93 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  : 10/28/19 18:12:38
+-- merge date  : 10/29/19 15:00:00
 
 do -- begin closure to overcome local limits and interference
 
@@ -20,6 +20,9 @@ if LUAVERSION<5.2 and jit then
  MINORVERSION=2
  LUAVERSION=5.2
 end
+if lua and lua.openfile then
+ io.open=lua.openfile
+end
 if not lpeg then
  lpeg=require("lpeg")
 end