2019-03-05 15:48:00

49 files changed, 814 insertions, 232 deletions

diff --git a/doc/context/documents/general/manuals/luatex.pdf b/doc/context/documents/general/manuals/luatex.pdf
index d932219bc..5c9a8f3b1 100644
--- a/doc/context/documents/general/manuals/luatex.pdf
+++ b/doc/context/documents/general/manuals/luatex.pdf
diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf
index 118a4e8ed..0a02331c2 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 cbb377cbe..fdc000a1f 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 975f765a5..147d7755b 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 7a780e699..f835d6ade 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 2f818973c..88576c838 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 c0ebfbba8..535c6d157 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 edb2f3c5d..ad1893c29 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 85f7ec93a..30f757833 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 07f261d3c..39a3f6cb8 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 b300eddd8..7b0254841 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 d69c21473..2290d98cf 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 358823f4a..d10ea0b9a 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 c51862766..d482570f1 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 989ef540e..b30441453 100644
--- a/doc/context/documents/general/qrcs/setup-ro.pdf
+++ b/doc/context/documents/general/qrcs/setup-ro.pdf
diff --git a/doc/context/sources/general/manuals/luatex/luatex-introduction.tex b/doc/context/sources/general/manuals/luatex/luatex-introduction.tex
index 5ed80f4c1..93d0215a8 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-introduction.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-introduction.tex
@@ -163,7 +163,7 @@ Luigi Scarso
 \starttabulate[|||]
 \NC Version  \EQ \currentdate \NC \NR
 \NC \LUATEX  \EQ \cldcontext{LUATEXENGINE} %
-                 \cldcontext{LUATEXVERSION} / %
+                 \cldcontext{"\letterpercent 0.2f",LUATEXVERSION} / %
                  \cldcontext{LUATEXFUNCTIONALITY}
                  \NC \NR
 \NC \CONTEXT \EQ MkIV \contextversion \NC \NR
diff --git a/doc/context/sources/general/manuals/luatex/luatex.tex b/doc/context/sources/general/manuals/luatex/luatex.tex
index 1486abd49..0230af738 100644
--- a/doc/context/sources/general/manuals/luatex/luatex.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex.tex
@@ -62,7 +62,7 @@
 
 \startdocument
   [manual=Lua\TeX,
-   status=experimental,
+   status=stable,
    version=1.10]
 
 \startnotmode[*export]
diff --git a/scripts/context/lua/context.lua b/scripts/context/lua/context.lua
new file mode 100644
index 000000000..b44312cfa
--- /dev/null
+++ b/scripts/context/lua/context.lua
@@ -0,0 +1,41 @@
+-- This file is a companion to "context(.exe)" and is effectively the same
+-- as:
+--
+--     mtxrun -script context ...
+--
+-- which will locate "mtx-context.lua" and load that one. The binary is a
+-- copy of "luametatex(.exe)" aka luatex 2.0 for context lmtx. In a similar
+-- fashion "mtxrun(.exe)" will load the "mtrun.lua" script.
+--
+-- The installation of context should do this on Windows:
+--
+-- luametatex.exe -> tex/texmf-win64/bin/luatex.exe
+-- luametatex.exe -> tex/texmf-win64/bin/mtxrun.exe
+-- luametatex.exe -> tex/texmf-win64/bin/context.exe
+-- mtxrun.lua     -> tex/texmf-win64/bin/mtxrun.lua
+-- context.lua    -> tex/texmf-win64/bin/context.lua
+--
+-- and this on Unix:
+--
+-- luametatex     -> tex/texmf-linux-64/bin/luatex
+-- luametatex     -> tex/texmf-linux-64/bin/mtxrun
+-- luametatex     -> tex/texmf-linux-64/bin/context
+-- mtxrun.lua     -> tex/texmf-linux-64/bin/mtxrun.lua
+-- context.lua    -> tex/texmf-linux-64/bin/context.lua
+--
+-- The static binary is smaller than 3MB so the few copies provide no real
+-- overhead.
+
+local selfpath = os.selfpath
+
+if not arg or not selfpath then
+    print("invalid stub")
+    os.exit()
+end
+
+arg[0] = "mtxrun"
+
+table.insert(arg,1,"mtx-context")
+table.insert(arg,1,"--script")
+
+dofile(selfpath .. "/" .. "mtxrun.lua")
diff --git a/scripts/context/lua/mtx-install.lua b/scripts/context/lua/mtx-install.lua
new file mode 100644
index 000000000..46580bb20
--- /dev/null
+++ b/scripts/context/lua/mtx-install.lua
@@ -0,0 +1,413 @@
+if not modules then modules = { } end modules ['mtx-install'] = {
+    version   = 1.002,
+    comment   = "companion to mtxrun.lua",
+    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
+    copyright = "PRAGMA ADE / ConTeXt Development Team",
+    license   = "see context related readme files"
+}
+
+-- todo: initial install from zip
+
+local helpinfo = [[
+<?xml version="1.0"?>
+<application>
+ <metadata>
+  <entry name="name">mtx-install</entry>
+  <entry name="detail">ConTeXt Installer</entry>
+  <entry name="version">2.00</entry>
+ </metadata>
+ <flags>
+  <category name="basic">
+   <subcategory>
+    <flag name="platform" value="string"><short>platform (windows, linux, linux-64, osx-intel, osx-ppc, linux-ppc)</short></flag>
+    <flag name="server" value="string"><short>repository url (rsync://contextgarden.net)</short></flag>
+    <flag name="modules" value="string"><short>extra modules (can be list or 'all')</short></flag>
+    <flag name="fonts" value="string"><short>additional fonts (can be list or 'all')</short></flag>
+    <flag name="goodies" value="string"><short>extra binaries (like scite and texworks)</short></flag>
+    <flag name="install"><short>install context</short></flag>
+    <flag name="update"><short>update context</short></flag>
+    <flag name="identify"><short>create list of files</short></flag>
+   </subcategory>
+  </category>
+ </flags>
+</application>
+]]
+
+local gsub, find, escapedpattern = string.gsub, string.find, string.escapedpattern
+local round = math.round
+local savetable, loadtable, sortedhash = table.save, table.load, table.sortedhash
+local joinfile, filesize, dirname, addsuffix = file.join, file.size, file.dirname, file.addsuffix
+local isdir, isfile, walkdir = lfs.isdir, lfs.isfile, lfs.dir
+local mkdirs, globdir = dir.mkdirs, dir.glob
+local osremove, osexecute, ostype = os.remove, os.execute, os.type
+local savedata = io.savedata
+local formatters = string.formatters
+
+local fetch = socket.http.request
+
+local application = logs.application {
+    name     = "mtx-install",
+    banner   = "ConTeXt Installer 2.00",
+    helpinfo = helpinfo,
+}
+
+local report = application.report
+
+scripts         = scripts         or { }
+scripts.install = scripts.install or { }
+local install   = scripts.install
+
+local texformats = {
+    "cont-en",
+    "cont-nl",
+    "cont-cz",
+    "cont-de",
+    "cont-fa",
+    "cont-it",
+    "cont-ro",
+    "cont-uk",
+    "cont-pe",
+}
+
+local platforms = {
+    ["mswin"]          = "mswin",
+    ["windows"]        = "mswin",
+    ["win32"]          = "mswin",
+    ["win"]            = "mswin",
+    --
+    ["mswin-64"]       = "win64",
+    ["windows-64"]     = "win64",
+    ["win64"]          = "win64",
+    --
+    ["linux"]          = "linux",
+    ["linux-32"]       = "linux",
+    ["linux32"]        = "linux",
+    --
+    ["linux-64"]       = "linux-64",
+    ["linux64"]        = "linux-64",
+    --
+    ["linuxmusl-64"]   = "linuxmusl-64",
+    --
+    ["linux-armhf"]    = "linux-armhf",
+    --
+    ["freebsd"]        = "freebsd",
+    --
+    ["freebsd-amd64"]  = "freebsd-amd64",
+    --
+    ["kfreebsd"]       = "kfreebsd-i386",
+    ["kfreebsd-i386"]  = "kfreebsd-i386",
+    --
+    ["kfreebsd-amd64"] = "kfreebsd-amd64",
+    --
+    ["linux-ppc"]      = "linux-ppc",
+    ["ppc"]            = "linux-ppc",
+    --
+    ["osx"]            = "osx-intel",
+    ["macosx"]         = "osx-intel",
+    ["osx-intel"]      = "osx-intel",
+    ["osxintel"]       = "osx-intel",
+    --
+    ["osx-ppc"]        = "osx-ppc",
+    ["osx-powerpc"]    = "osx-ppc",
+    ["osxppc"]         = "osx-ppc",
+    ["osxpowerpc"]     = "osx-ppc",
+    --
+    ["osx-64"]         = "osx-64",
+    --
+    ["solaris-intel"]  = "solaris-intel",
+    --
+    ["solaris-sparc"]  = "solaris-sparc",
+    ["solaris"]        = "solaris-sparc",
+    --
+    ["unknown"]        = "unknown",
+}
+
+function install.identify()
+
+    -- We have to be in "...../tex" where subdirectories are prefixed with
+    -- "texmf". We strip the "tex/texm*/" from the name in the list.
+
+    local function collect(root,tree)
+
+        local path = root .. "/" .. tree
+
+        if isdir(path) then
+
+            local prefix  = path .. "/"
+            local files   = globdir(prefix .. "**")
+            local pattern = escapedpattern("^" .. prefix)
+
+            local details = { }
+            local total   = 0
+
+            for i=1,#files do
+                local name = files[i]
+                local size = filesize(name)
+                local base = gsub(name,pattern,"")
+                local stamp = md5.hex(io.loaddata(name))
+                details[i] = { base, size, stamp }
+                total = total + size
+            end
+            report("%-20s : %4i files, %3.0f MB",tree,#files,total/(1000*1000))
+
+            savetable(path .. ".tma",details)
+
+        end
+
+    end
+
+    local sourceroot = file.join(dir.current(),"tex")
+
+    for d in walkdir("./tex") do
+        if find(d,"%texmf") then
+            collect(sourceroot,d)
+        end
+    end
+
+end
+
+function install.update()
+
+    local function validdir(d)
+        local ok = isdir(d)
+        if not ok then
+            mkdirs(d)
+            ok = isdir(d)
+        end
+        return ok
+    end
+
+    local function download(what,url,target,total,done)
+        local data = fetch(url .. "/" .. target)
+        if data then
+            if total and done then
+                report("%-8s : %3i %% : %8i : %s",what,round(100*done/total),#data,target)
+            else
+                report("%-8s : %8i : %s",what,#data,target)
+            end
+            if validdir(dirname(target)) then
+                savedata(target,data)
+            else
+                -- message
+            end
+        end
+    end
+
+    local function remove(what,target)
+        report("%-8s : %8i : %s",what,filesize(target),target)
+        osremove(target)
+    end
+
+    local function ispresent(target)
+        return isfile(target)
+    end
+
+    local function hashed(list)
+        local hash = { }
+        for i=1,#list do
+            local l = list[i]
+            hash[l[1]] = l
+        end
+        return hash
+    end
+
+    local function run(fmt,...)
+        local command = formatters[fmt](...)
+     -- command = gsub(command,"/","\\")
+        report("running: %s",command)
+        osexecute(command)
+    end
+
+    local function prepare(tree)
+        tree = joinfile("tex",tree)
+        mkdirs(tree)
+    end
+
+    local function update(url,tree)
+
+        tree = joinfile("tex",tree)
+
+        local ok = validdir(tree)
+        if not validdir(tree) then
+            report("invalid directory %a",tree)
+            return
+        end
+
+        local lua = tree .. ".tma"
+        local all = url .. "/" .. lua
+        local old = loadtable(lua)
+        local new = fetch(all)
+
+        if new then
+            new = loadstring(new)
+            if new then
+                new = new()
+            end
+        end
+
+        if not new then
+            report("invalid database %a",all)
+            return
+        end
+
+        local total = 0
+        local done  = 0
+
+        if not old then
+
+            report("installing %s, %i files",tree,#new)
+
+            for i=1,#new do
+                total = total + new[i][2]
+            end
+
+            for i=1,#new do
+                local entry  = new[i]
+                local name   = entry[1]
+                local size   = entry[2]
+                local target = joinfile(tree,name)
+                done = done + size
+                download("new",url,target,total,done)
+            end
+
+        else
+
+            report("updating %s, %i files",tree,#new)
+
+            local hold = hashed(old)
+            local hnew = hashed(new)
+            local todo = { }
+
+            for newname, newhash in sortedhash(hnew) do
+                local target  = joinfile(tree,newname)
+                local oldhash = hold[newname]
+                local action  = nil
+                if not oldhash then
+                    action = "added"
+                elseif oldhash[3] ~= newhash[3] then
+                    action = "changed"
+                elseif not ispresent(joinfile(tree,newname)) then
+                    action = "missing"
+                end
+                if action then
+                    local size = newhash[2]
+                    total = total + size
+                    todo[#todo+1] = { action, target, size }
+                end
+            end
+
+            for i=1,#todo do
+                local entry = todo[i]
+                download(entry[1],url,entry[2],total,done)
+                done = done + entry[3]
+            end
+
+            for oldname, oldhash in sortedhash(hold) do
+                local newhash = hnew[oldname]
+                local target  = joinfile(tree,oldname)
+                if not newhash and ispresent(target) then
+                    remove("removed",target)
+                end
+            end
+
+        end
+
+        savetable(lua,new)
+
+    end
+
+    local targetroot = dir.current()
+
+    local server   = environment.arguments.server   or ""
+    local port     = environment.arguments.port     or ""
+    local instance = environment.arguments.instance or ""
+
+    if server == "" then
+        report("provide server")
+        return
+    end
+
+    local url = "http://" .. server
+
+    if port ~= "" then
+        url = url .. ":" .. port
+    end
+
+    url = url .. "/"
+
+    if instance ~= "" then
+        url = url .. instance .. "/"
+    end
+
+    local osplatform = os.platform
+    local platform   = platforms[osplatform]
+
+    if not platform then
+        report("unknown platform")
+        return
+    end
+
+    local texmfplatform = "texmf-" .. platform
+
+    report("server   : %s",server)
+    report("port     : %s",port == "" and 80 or "80")
+    report("instance : %s",instance)
+    report("platform : %s",osplatform)
+    report("system   : %s",ostype)
+
+    update(url,"texmf")
+    update(url,"texmf-context")
+    update(url,texmfplatform)
+
+    prepare("texmf-cache")
+    prepare("texmf-project")
+    prepare("texmf-fonts")
+    prepare("texmf-local")
+    prepare("texmf-modules")
+
+    local binpath = joinfile(targetroot,"tex",texmfplatform,"bin")
+
+    if ostype == "unix" then
+        osexecute(formatters["chmod +x %s/*"](binpath))
+    end
+
+    local mtxrun  = joinfile(binpath,"mtxrun")
+    local context = joinfile(binpath,"context")
+
+    if ostype == "windows" then
+        addsuffix(mtxrun,"exe")
+        addsuffix(context,"exe")
+    end
+
+    run("%s --generate",mtxrun)
+    run("%s --make en", context)
+    run("%s --make nl", context)
+
+ -- local mtxrun  = joinfile(binpath,"mtxrunjit")
+ -- local context = joinfile(binpath,"contextjit")
+ --
+ -- if ostype == "windows" then
+ --     addsuffix(mtxrun,"exe")
+ --     addsuffix(context,"exe")
+ -- end
+ --
+ -- run("%s --generate",mtxrun)
+ -- run("%s --make en", context)
+ -- run("%s --make nl", context)
+
+    -- in calling script: update mtxrun.exe and mtxrun.lua
+
+    report("update, done")
+end
+
+if environment.argument("identify") then
+    install.identify()
+elseif environment.argument("install") then
+    install.update()
+elseif environment.argument("update") then
+    install.update()
+elseif environment.argument("exporthelp") then
+    application.export(environment.argument("exporthelp"),environment.files[1])
+else
+    application.help()
+end
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 143c480e5..15606e1e1 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -8857,7 +8857,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-prs"] = package.loaded["util-prs"] or true
 
--- original size: 23718, stripped down to: 16067
+-- original size: 24132, stripped down to: 16210
 
 if not modules then modules={} end modules ['util-prs']={
  version=1.001,
@@ -9423,7 +9423,12 @@ function parsers.splitmethod(str,default)
   return default or false,""
  end
 end
-local pattern=Cf(Ct("")*Cg(Cc("year")*cardinal)*P("-")*Cg(Cc("month")*cardinal)*P("-")*Cg(Cc("day")*cardinal)*P(" ")*Cg(Cc("hour")*cardinal)*P(":")*Cg(Cc("minute")*cardinal)*(P(":")*Cg(Cc("sec")*cardinal))^-1
+local p_year=lpegpatterns.digit^4/tonumber
+local pattern=Cf(Ct("")*(
+  (Cg(Cc("year")*p_year)*S("-/")*Cg(Cc("month")*cardinal)*S("-/")*Cg(Cc("day")*cardinal)
+  )+(Cg(Cc("day")*cardinal)*S("-/")*Cg(Cc("month")*cardinal)*S("-/")*Cg(Cc("year")*p_year)
+  )
+ )*P(" ")*Cg(Cc("hour")*cardinal)*P(":")*Cg(Cc("min")*cardinal)*(P(":")*Cg(Cc("sec")*cardinal))^-1
 ,rawset)
 lpegpatterns.splittime=pattern
 function parsers.totime(str)
@@ -24968,8 +24973,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 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    : 995087
--- stripped bytes    : 395047
+-- original bytes    : 995501
+-- stripped bytes    : 395318
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 143c480e5..15606e1e1 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -8857,7 +8857,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-prs"] = package.loaded["util-prs"] or true
 
--- original size: 23718, stripped down to: 16067
+-- original size: 24132, stripped down to: 16210
 
 if not modules then modules={} end modules ['util-prs']={
  version=1.001,
@@ -9423,7 +9423,12 @@ function parsers.splitmethod(str,default)
   return default or false,""
  end
 end
-local pattern=Cf(Ct("")*Cg(Cc("year")*cardinal)*P("-")*Cg(Cc("month")*cardinal)*P("-")*Cg(Cc("day")*cardinal)*P(" ")*Cg(Cc("hour")*cardinal)*P(":")*Cg(Cc("minute")*cardinal)*(P(":")*Cg(Cc("sec")*cardinal))^-1
+local p_year=lpegpatterns.digit^4/tonumber
+local pattern=Cf(Ct("")*(
+  (Cg(Cc("year")*p_year)*S("-/")*Cg(Cc("month")*cardinal)*S("-/")*Cg(Cc("day")*cardinal)
+  )+(Cg(Cc("day")*cardinal)*S("-/")*Cg(Cc("month")*cardinal)*S("-/")*Cg(Cc("year")*p_year)
+  )
+ )*P(" ")*Cg(Cc("hour")*cardinal)*P(":")*Cg(Cc("min")*cardinal)*(P(":")*Cg(Cc("sec")*cardinal))^-1
 ,rawset)
 lpegpatterns.splittime=pattern
 function parsers.totime(str)
@@ -24968,8 +24973,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 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    : 995087
--- stripped bytes    : 395047
+-- original bytes    : 995501
+-- stripped bytes    : 395318
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 143c480e5..15606e1e1 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -8857,7 +8857,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-prs"] = package.loaded["util-prs"] or true
 
--- original size: 23718, stripped down to: 16067
+-- original size: 24132, stripped down to: 16210
 
 if not modules then modules={} end modules ['util-prs']={
  version=1.001,
@@ -9423,7 +9423,12 @@ function parsers.splitmethod(str,default)
   return default or false,""
  end
 end
-local pattern=Cf(Ct("")*Cg(Cc("year")*cardinal)*P("-")*Cg(Cc("month")*cardinal)*P("-")*Cg(Cc("day")*cardinal)*P(" ")*Cg(Cc("hour")*cardinal)*P(":")*Cg(Cc("minute")*cardinal)*(P(":")*Cg(Cc("sec")*cardinal))^-1
+local p_year=lpegpatterns.digit^4/tonumber
+local pattern=Cf(Ct("")*(
+  (Cg(Cc("year")*p_year)*S("-/")*Cg(Cc("month")*cardinal)*S("-/")*Cg(Cc("day")*cardinal)
+  )+(Cg(Cc("day")*cardinal)*S("-/")*Cg(Cc("month")*cardinal)*S("-/")*Cg(Cc("year")*p_year)
+  )
+ )*P(" ")*Cg(Cc("hour")*cardinal)*P(":")*Cg(Cc("min")*cardinal)*(P(":")*Cg(Cc("sec")*cardinal))^-1
 ,rawset)
 lpegpatterns.splittime=pattern
 function parsers.totime(str)
@@ -24968,8 +24973,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 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    : 995087
--- stripped bytes    : 395047
+-- original bytes    : 995501
+-- stripped bytes    : 395318
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index 143c480e5..15606e1e1 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -8857,7 +8857,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-prs"] = package.loaded["util-prs"] or true
 
--- original size: 23718, stripped down to: 16067
+-- original size: 24132, stripped down to: 16210
 
 if not modules then modules={} end modules ['util-prs']={
  version=1.001,
@@ -9423,7 +9423,12 @@ function parsers.splitmethod(str,default)
   return default or false,""
  end
 end
-local pattern=Cf(Ct("")*Cg(Cc("year")*cardinal)*P("-")*Cg(Cc("month")*cardinal)*P("-")*Cg(Cc("day")*cardinal)*P(" ")*Cg(Cc("hour")*cardinal)*P(":")*Cg(Cc("minute")*cardinal)*(P(":")*Cg(Cc("sec")*cardinal))^-1
+local p_year=lpegpatterns.digit^4/tonumber
+local pattern=Cf(Ct("")*(
+  (Cg(Cc("year")*p_year)*S("-/")*Cg(Cc("month")*cardinal)*S("-/")*Cg(Cc("day")*cardinal)
+  )+(Cg(Cc("day")*cardinal)*S("-/")*Cg(Cc("month")*cardinal)*S("-/")*Cg(Cc("year")*p_year)
+  )
+ )*P(" ")*Cg(Cc("hour")*cardinal)*P(":")*Cg(Cc("min")*cardinal)*(P(":")*Cg(Cc("sec")*cardinal))^-1
 ,rawset)
 lpegpatterns.splittime=pattern
 function parsers.totime(str)
@@ -24968,8 +24973,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 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    : 995087
--- stripped bytes    : 395047
+-- original bytes    : 995501
+-- stripped bytes    : 395318
 
 -- end library merge
 
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 5523e4ef5..faa50ce78 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.02.26 20:04}
+\newcontextversion{2019.03.05 15:40}
 
 %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 0e610cd31..c0e856845 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.02.26 20:04}
+\edef\contextversion{2019.03.05 15:40}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkiv/buff-ini.lua b/tex/context/base/mkiv/buff-ini.lua
index bd3cf9d5a..ecb5d9dd0 100644
--- a/tex/context/base/mkiv/buff-ini.lua
+++ b/tex/context/base/mkiv/buff-ini.lua
@@ -351,11 +351,17 @@ buffers.undent = undent
 --     commands.doifelse(more)
 -- end
 
+local split = table.setmetatableindex(function(t,k)
+    local v = totable(k)
+    t[k] = v
+    return v
+end)
+
 function tokens.pickup(start,stop)
-    local stoplist     = totable(stop)
+    local stoplist     = split[stop] -- totable(stop)
     local stoplength   = #stoplist
     local stoplast     = stoplist[stoplength]
-    local startlist    = totable(start)
+    local startlist    = split[start] -- totable(start)
     local startlength  = #startlist
     local startlast    = startlist[startlength]
     local list         = { }
diff --git a/tex/context/base/mkiv/buff-ver.lua b/tex/context/base/mkiv/buff-ver.lua
index 88605631d..969a28055 100644
--- a/tex/context/base/mkiv/buff-ver.lua
+++ b/tex/context/base/mkiv/buff-ver.lua
@@ -817,7 +817,7 @@ local function typestring(settings)
         local compact   = settings.compact
         local compactor = compact and compactors[compact]
         if compactor then
-            content = lpegmatch(compactor,content)
+            content = lpegmatch(compactor,content) or content
         end
      -- content = decodecomment(content)
      -- content = dotabs(content,settings)
@@ -853,7 +853,7 @@ implement {
     actions   = typestring,
     arguments = {
         {
-            { "data"    },
+            { "data" },
             { "tab"     },
             { "method"  },
             { "compact" },
@@ -863,6 +863,50 @@ implement {
     }
 }
 
+-- implement {
+--     name      = "type_x",
+--     actions   = typestring,
+--     arguments = {
+--         {
+--             { "data", "verbatim" },
+--             { "tab"     },
+--             { "method"  },
+--             { "compact" },
+--             { "nature"  },
+--             { "escape"  },
+--         }
+--     }
+-- }
+
+-- local function typestring_y(settings)
+--     local content = tex.toks[settings.n]
+--     if content and content ~= "" then
+--         local compact   = settings.compact
+--         local compactor = compact and compactors[compact]
+--         if compactor then
+--             content = lpegmatch(compactor,content)
+--         end
+--      -- content = decodecomment(content)
+--      -- content = dotabs(content,settings)
+--         visualize(content,checkedsettings(settings,"inline"))
+--     end
+-- end
+
+-- implement {
+--     name      = "type_y",
+--     actions   = typestring_y,
+--     arguments = {
+--         {
+--             { "n", "integer" },
+--             { "tab"     },
+--             { "method"  },
+--             { "compact" },
+--             { "nature"  },
+--             { "escape"  },
+--         }
+--     }
+-- }
+
 implement {
     name      = "processbuffer",
     actions   = processbuffer,
diff --git a/tex/context/base/mkiv/cldf-ini.lua b/tex/context/base/mkiv/cldf-ini.lua
index 9b1a4e368..ccbbb2454 100644
--- a/tex/context/base/mkiv/cldf-ini.lua
+++ b/tex/context/base/mkiv/cldf-ini.lua
@@ -137,7 +137,7 @@ function context.trialtypesetting()
     return texgetcount(trialtypesettingstate) ~= 0
 end
 
-local knownfunctions = lua.get_functions_table()
+local knownfunctions = lua.get_functions_table(true)
 local showstackusage = false
 
 trackers.register("context.stack",function(v) showstackusage = v end)
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index f47b4062f..913fa747f 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2019.02.26 20:04}
+\newcontextversion{2019.03.05 15:40}
 
 %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 067af94f6..81558c98a 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -42,7 +42,7 @@
 %D has to match \type {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2019.02.26 20:04}
+\edef\contextversion{2019.03.05 15:40}
 \edef\contextkind   {beta}
 
 %D Kind of special:
diff --git a/tex/context/base/mkiv/font-con.lua b/tex/context/base/mkiv/font-con.lua
index f0f2fb5a2..93ce9f5da 100644
--- a/tex/context/base/mkiv/font-con.lua
+++ b/tex/context/base/mkiv/font-con.lua
@@ -712,7 +712,7 @@ function constructors.scale(tfmdata,specification)
                     height  = height,
                     depth   = depth,
                     width   = width,
-                    unicode = unicode,
+                    unicode = isunicode,
                 }
             else
                 chr = {
@@ -728,7 +728,7 @@ function constructors.scale(tfmdata,specification)
                     index   = index,
                     height  = height,
                     width   = width,
-                    unicode = unicode,
+                    unicode = isunicode,
                 }
             else
                 chr = {
diff --git a/tex/context/base/mkiv/font-fil.mkvi b/tex/context/base/mkiv/font-fil.mkvi
index 16ce57f8a..ae83ef4c4 100644
--- a/tex/context/base/mkiv/font-fil.mkvi
+++ b/tex/context/base/mkiv/font-fil.mkvi
@@ -85,22 +85,39 @@
       \expandafter\font_basics_define_font_synonym_yes
    \fi}
 
-\def\font_basics_define_font_synonym_nop
+\unexpanded\def\font_basics_define_font_synonym_nop
   {\expandafter\let\csname\??fontfile\m_font_name\endcsname\m_font_file
    \doifelsenextoptionalcs\font_basics_define_font_synonym_nop_opt\font_basics_define_font_synonym_nop_nil}
 
-\def\font_basics_define_font_synonym_yes
+\unexpanded\def\font_basics_define_font_synonym_yes
   {\expandafter\let\csname\??fontfile\fontclass\m_font_name\endcsname\m_font_file
    \doifelsenextoptionalcs\font_basics_define_font_synonym_yes_opt\font_basics_define_font_synonym_yes_nil}
 
-\def\font_basics_define_font_synonym_nop_opt[#specification]%
+\unexpanded\def\edefinefontsynonym[#name]#crap[#file]%
+  {\edef\m_font_name{#name}%
+   \edef\m_font_file{#file}%
+   \ifx\fontclass\empty
+      \expandafter\font_basics_define_font_synonym_nop_expanded
+   \else
+      \expandafter\font_basics_define_font_synonym_yes_expanded
+   \fi}
+
+\unexpanded\def\font_basics_define_font_synonym_nop_expanded#crap[#spec]%
+  {\expandafter\let\csname\??fontfile\m_font_name\endcsname\m_font_file
+   \normalexpanded{\font_basics_define_font_synonym_nop_opt[#1]}}
+
+\unexpanded\def\font_basics_define_font_synonym_yes_expanded#crap[#spec]%
+  {\expandafter\let\csname\??fontfile\fontclass\m_font_name\endcsname\m_font_file
+   \normalexpanded{\font_basics_define_font_synonym_yes_opt[#spec]}}
+
+\unexpanded\def\font_basics_define_font_synonym_nop_opt[#specification]%
   {\let\p_features  \undefined
    \let\p_fallbacks \undefined
    \let\p_goodies   \undefined
    \let\p_designsize\undefined
    \expandafter\font_basics_get_font_parameter_nop#specification,]=,}
 
-\def\font_basics_define_font_synonym_yes_opt[#specification]%
+\unexpanded\def\font_basics_define_font_synonym_yes_opt[#specification]%
   {\let\p_features  \undefined
    \let\p_fallbacks \undefined
    \let\p_goodies   \undefined
diff --git a/tex/context/base/mkiv/font-ots.lua b/tex/context/base/mkiv/font-ots.lua
index 563094fc1..b9f719a5f 100644
--- a/tex/context/base/mkiv/font-ots.lua
+++ b/tex/context/base/mkiv/font-ots.lua
@@ -829,7 +829,7 @@ function handlers.gsub_ligature(head,start,dataset,sequence,ligature,rlmode,skip
                 end
             end
             if not match and not pre or not replace then
-                local n = getnext(discfound)
+                local n    = getnext(discfound)
                 local char = ischar(n,currentfont)
                 if char and ligature[char] then
                     match = true
@@ -841,8 +841,8 @@ function handlers.gsub_ligature(head,start,dataset,sequence,ligature,rlmode,skip
                 local prev   = getprev(start)
                 if stop then
                     setnext(stop)
-                    local tail = getprev(stop)
                     local copy = copy_node_list(start)
+                    local tail = stop -- was: getprev(stop) -- Kai: needs checking on your samples
                     local liat = find_node_tail(copy)
                     if pre then
                         setlink(liat,pre)
diff --git a/tex/context/base/mkiv/grph-inc.lua b/tex/context/base/mkiv/grph-inc.lua
index c740d424d..f66f8249a 100644
--- a/tex/context/base/mkiv/grph-inc.lua
+++ b/tex/context/base/mkiv/grph-inc.lua
@@ -124,8 +124,8 @@ local ctx_doboxfigureobject        = context.doboxfigureobject
 
 function checkimage(figure)
     if figure then
-        local width  = figure.width
-        local height = figure.height
+        local width  = figure.width or 0
+        local height = figure.height or 0
         if width <= 0 or height <= 0 then
             report_inclusion("image %a has bad dimensions (%p,%p), discarding",figure.filename or "?",width,height)
             return false, "bad dimensions"
@@ -918,6 +918,7 @@ local function register(askedname,specification)
                             format = suffix
                         end
                     end
+specification.format = format
                 elseif io.exists(oldname) then
                     report_inclusion("file %a is bugged",oldname)
                     if format and imagetypes[format] then
@@ -1285,6 +1286,7 @@ function figures.identify(data)
         for i=1,#list do
             local identifier = list[i]
             local data = identifier(data)
+--             if data and (not data.status and data.status.status > 0) then
             if data and (not data.status and data.status.status > 0) then
                 break
             end
diff --git a/tex/context/base/mkiv/luat-cnf.lua b/tex/context/base/mkiv/luat-cnf.lua
index 0670d1684..5e3f026e9 100644
--- a/tex/context/base/mkiv/luat-cnf.lua
+++ b/tex/context/base/mkiv/luat-cnf.lua
@@ -30,6 +30,8 @@ texconfig.nest_size       =   1000
 texconfig.param_size      =  25000
 texconfig.save_size       = 100000
 texconfig.stack_size      =  10000
+texconfig.function_size   =  32768
+texconfig.properties_size =  65536
 
 local stub = [[
 
@@ -178,6 +180,8 @@ local variablenames = {
     param_size      = true,
     save_size       = true,
     stack_size      = true,
+    function_size   = true,
+    properties_size = true,
 }
 
 local function makestub()
diff --git a/tex/context/base/mkiv/luat-cod.lua b/tex/context/base/mkiv/luat-cod.lua
index dcb16c0dd..c667f3ecc 100644
--- a/tex/context/base/mkiv/luat-cod.lua
+++ b/tex/context/base/mkiv/luat-cod.lua
@@ -30,6 +30,8 @@ texconfig.nest_size       =   1000
 texconfig.param_size      =  25000
 texconfig.save_size       = 100000
 texconfig.stack_size      =  10000
+texconfig.function_size   =  32768
+texconfig.properties_size =  65536
 
 -- registering bytecode chunks
 
diff --git a/tex/context/base/mkiv/node-fnt.lua b/tex/context/base/mkiv/node-fnt.lua
index 154853121..01d7e42e5 100644
--- a/tex/context/base/mkiv/node-fnt.lua
+++ b/tex/context/base/mkiv/node-fnt.lua
@@ -437,6 +437,8 @@ do
                     local prevfont = nil
                     local prevattr = nil
                     local none     = false
+                    firstnone = nil
+                    basefont  = nil
                     for n, char, font in nextchar, r do
                         local attr = getattr(n) or 0 -- zero attribute is reserved for fonts in context
                         if font ~= prevfont or attr ~= prevattr then
@@ -446,6 +448,7 @@ do
                             if fontmode == "none" then
                                 setnone(n)
                             elseif fontmode == "base" then
+                                -- so the replace gets an extra treatment ... so be it
                                 setbase(n)
                             else
                                 setnode(n,font,attr)
diff --git a/tex/context/base/mkiv/node-nut.lua b/tex/context/base/mkiv/node-nut.lua
index 6a38cca67..50e87e988 100644
--- a/tex/context/base/mkiv/node-nut.lua
+++ b/tex/context/base/mkiv/node-nut.lua
@@ -697,7 +697,7 @@ nuts.nestedtracedslide = nestedtracedslide
 
 -- this might move
 
-local propertydata = direct.get_properties_table and direct.get_properties_table()
+local propertydata = direct.get_properties_table(true)
 
 local getattr = nuts.getattr
 local setattr = nuts.setattr
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index bdc763ec3..d0d2324d8 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 6fafd9c50..a0d9f04f4 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-ren.mkiv b/tex/context/base/mkiv/strc-ren.mkiv
index 01464ad86..5cdf5f4a7 100644
--- a/tex/context/base/mkiv/strc-ren.mkiv
+++ b/tex/context/base/mkiv/strc-ren.mkiv
@@ -376,10 +376,12 @@
    \egroup
    \ifconditional\headisdisplay
      \useindentnextparameter\headparameter
+   \else\ifconditional\headissomewhere
+     \ignoreparskip
+     \noindentation
    \else
      \ignoreparskip
-     \noindentation % recently added, was a bug
-   \fi}
+   \fi\fi}
 
 % nice testcase
 %
diff --git a/tex/context/base/mkiv/toks-ini.lua b/tex/context/base/mkiv/toks-ini.lua
index 43e2d80a3..2c85a5754 100644
--- a/tex/context/base/mkiv/toks-ini.lua
+++ b/tex/context/base/mkiv/toks-ini.lua
@@ -33,6 +33,7 @@ end
 local scan_toks       = token.scan_toks
 local scan_string     = token.scan_string
 local scan_argument   = token.scan_argument
+local scan_tokenlist  = token.scan_tokenlist
 local scan_int        = token.scan_int
 local scan_code       = token.scan_code
 local scan_dimen      = token.scan_dimen
@@ -208,6 +209,10 @@ if not scan_csname then
 
 end
 
+local function scan_verbatim()
+    return scan_argument(false)
+end
+
 tokens.scanners = { -- these expand
     token     = scan_token,
     toks      = scan_toks,
@@ -222,6 +227,8 @@ tokens.scanners = { -- these expand
     count     = scan_int,
     string    = scan_string,
     argument  = scan_argument,
+    tokenlist = scan_tokenlist,
+    verbatim  = scan_verbatim,
     code      = scan_code,
     word      = scan_word,
     number    = scan_number,
diff --git a/tex/context/base/mkiv/toks-scn.lua b/tex/context/base/mkiv/toks-scn.lua
index f73ecc86c..297ef7121 100644
--- a/tex/context/base/mkiv/toks-scn.lua
+++ b/tex/context/base/mkiv/toks-scn.lua
@@ -22,6 +22,8 @@ local tokenbits      = tokens.bits
 
 local scanstring     = scanners.string
 local scanargument   = scanners.argument
+local scanverbatim   = scanners.verbatim
+local scantokenlist  = scanners.tokenlist
 local scaninteger    = scanners.integer
 local scannumber     = scanners.number
 local scankeyword    = scanners.keyword
@@ -149,6 +151,9 @@ local shortcuts = {
     close           = close,
     scanners        = scanners,
     scanstring      = scanstring,
+    scanargument    = scanargument,
+    scanverbatim    = scanverbatim,
+    scantokenlist   = scantokenlist,
     scaninteger     = scaninteger,
     scannumber      = scannumber,
     scantable       = scantable,
diff --git a/tex/context/base/mkiv/util-prs.lua b/tex/context/base/mkiv/util-prs.lua
index ba73a9481..3154bf6c2 100644
--- a/tex/context/base/mkiv/util-prs.lua
+++ b/tex/context/base/mkiv/util-prs.lua
@@ -774,13 +774,22 @@ end
 -- print(parsers.splitmethod("{foo}"))
 -- print(parsers.splitmethod())
 
+local p_year = lpegpatterns.digit^4 / tonumber
+
 local pattern = Cf( Ct("") *
-                  Cg(Cc("year")   * cardinal)
-      *  P("-") * Cg(Cc("month")  * cardinal)
-      *  P("-") * Cg(Cc("day")    * cardinal)
-      *  P(" ") * Cg(Cc("hour")   * cardinal)
-      *  P(":") * Cg(Cc("minute") * cardinal)
-      * (P(":") * Cg(Cc("sec")    * cardinal))^-1
+    (
+        (              Cg(Cc("year")  * p_year)
+          *  S("-/") * Cg(Cc("month") * cardinal)
+          *  S("-/") * Cg(Cc("day")   * cardinal)
+        ) +
+        (              Cg(Cc("day")   * cardinal)
+          *  S("-/") * Cg(Cc("month") * cardinal)
+          *  S("-/") * Cg(Cc("year")  * p_year)
+        )
+    )
+      *  P(" ")  * Cg(Cc("hour")   * cardinal)
+      *  P(":")  * Cg(Cc("min")    * cardinal)
+      * (P(":")  * Cg(Cc("sec")    * cardinal))^-1
 , rawset)
 
 lpegpatterns.splittime = pattern
@@ -790,3 +799,6 @@ function parsers.totime(str)
 end
 
 -- print(os.time(parsers.totime("2019-03-05 12:12:12")))
+-- print(os.time(parsers.totime("2019/03/05 12:12:12")))
+-- print(os.time(parsers.totime("05-03-2019 12:12:12")))
+-- print(os.time(parsers.totime("05/03/2019 12:12:12")))
diff --git a/tex/context/fonts/mkiv/type-imp-plex.mkiv b/tex/context/fonts/mkiv/type-imp-plex.mkiv
index 44334bcbd..02de45022 100644
--- a/tex/context/fonts/mkiv/type-imp-plex.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-plex.mkiv
@@ -45,80 +45,80 @@
 
     \starttypescript [\s!sans,\s!serif,\s!mono] [plex-thin] [\s!name]
         \setups[\s!font:\s!fallback:\typescriptone]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-thin]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-thinitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-light]      [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-light]      [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-thin]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-thinitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-light]      [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-light]      [\s!features=\typescriptprefix{f:plex\typescriptone}]
     \stoptypescript
 
     % extralight
 
     \starttypescript [\s!sans,\s!serif,\s!mono] [plex-extralight] [\s!name]
         \setups[\s!font:\s!fallback:\typescriptone]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-extralight]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-extralightitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-regular]          [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-italic]           [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-extralight]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-extralightitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-regular]          [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-italic]           [\s!features=\typescriptprefix{f:plex\typescriptone}]
     \stoptypescript
 
     % light
 
     \starttypescript [\s!sans,\s!serif,\s!mono] [plex-light] [\s!name]
         \setups[\s!font:\s!fallback:\typescriptone]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-light]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-lightitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-text]        [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-textitalic]  [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-light]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-lightitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-text]        [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-textitalic]  [\s!features=\typescriptprefix{f:plex\typescriptone}]
     \stoptypescript
 
     % regular
 
     \starttypescript [\s!sans,\s!serif,\s!mono] [plex] [\s!name]
         \setups[\s!font:\s!fallback:\typescriptone]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-regular]      [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-italic]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-medium]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-mediumitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-regular]      [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-italic]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-medium]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-mediumitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
     \stoptypescript
 
     % text
 
     \starttypescript [\s!sans,\s!serif,\s!mono] [plex-text] [\s!name]
         \setups[\s!font:\s!fallback:\typescriptone]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-text]         [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-textitalic]   [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-semibold]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-semibolditalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-text]         [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-textitalic]   [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-semibold]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-semibolditalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
     \stoptypescript
 
     % medium
 
     \starttypescript [\s!sans,\s!serif,\s!mono] [plex-medium] [\s!name]
         \setups[\s!font:\s!fallback:\typescriptone]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-medium]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-mediumitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-bold]         [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-bolditalic]   [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-medium]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-mediumitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-bold]         [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-bolditalic]   [\s!features=\typescriptprefix{f:plex\typescriptone}]
     \stoptypescript
 
     % semibold
 
     \starttypescript [\s!sans,\s!serif,\s!mono] [plex-semibold] [\s!name]
         \setups[\s!font:\s!fallback:\typescriptone]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-semibold]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-semibolditalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-extra]          [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-extraitalic]    [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-semibold]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-semibolditalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-extra]          [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-extraitalic]    [\s!features=\typescriptprefix{f:plex\typescriptone}]
     \stoptypescript
 
     % bold
 
     \starttypescript [\s!sans,\s!serif,\s!mono] [plex-bold] [\s!name]
         \setups[\s!font:\s!fallback:\typescriptone]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-bold]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-bolditalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-bold]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-bolditalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-bold]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-bolditalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-bold]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-bolditalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
     \stoptypescript
 
     % done
@@ -144,92 +144,92 @@
 
     \starttypescript [\s!sans,\s!serif,\s!mono] [ibmplex-thin] [\s!name]
         \setups[\s!font:\s!fallback:\typescriptone]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-thin]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-thinitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-text]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-textitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Widened]       [\s!file:\typescriptprefix{n:plex\typescriptone}-thin]       [\s!features=\typescriptprefix{f:scplex\typescriptone}]
-        \definefontfallback[Fake\typescriptprefix{\typescriptone}Caps]      [\typescriptprefix{\typescriptone}Widened] [0x0000-0xFFFF]   [\s!rscale=0.85,method=uppercase]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Caps]          [\s!file:\typescriptprefix{n:plex\typescriptone}-thin]       [\s!fallbacks=Fake\typescriptprefix{\typescriptone}Caps]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-thin]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-thinitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-text]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-textitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Widened]       [\s!file:\typescriptprefix{n:plex\typescriptone}-thin]       [\s!features=\typescriptprefix{f:scplex\typescriptone}]
+        \edefinefontfallback[Fake\typescriptprefix{\typescriptone}Caps]      [\typescriptprefix{\typescriptone}Widened] [0x0000-0xFFFF]   [\s!rscale=0.85,method=uppercase]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Caps]          [\s!file:\typescriptprefix{n:plex\typescriptone}-thin]       [\s!fallbacks=Fake\typescriptprefix{\typescriptone}Caps]
     \stoptypescript
 
     \starttypescript [\s!sans,\s!serif,\s!mono] [ibmplex-extralight] [\s!name]
         \setups[\s!font:\s!fallback:\typescriptone]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-extralight]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-extralightitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-medium]           [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-mediumitalic]     [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Widened]       [\s!file:\typescriptprefix{n:plex\typescriptone}-extralight]       [\s!features=\typescriptprefix{f:scplex\typescriptone}]
-        \definefontfallback[Fake\typescriptprefix{\typescriptone}Caps]      [\typescriptprefix{\typescriptone}Widened] [0x0000-0xFFFF]         [\s!rscale=0.85,method=uppercase]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Caps]          [\s!file:\typescriptprefix{n:plex\typescriptone}-extralight]       [\s!fallbacks=Fake\typescriptprefix{\typescriptone}Caps]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-extralight]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-extralightitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-medium]           [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-mediumitalic]     [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Widened]       [\s!file:\typescriptprefix{n:plex\typescriptone}-extralight]       [\s!features=\typescriptprefix{f:scplex\typescriptone}]
+        \edefinefontfallback[Fake\typescriptprefix{\typescriptone}Caps]      [\typescriptprefix{\typescriptone}Widened] [0x0000-0xFFFF]         [\s!rscale=0.85,method=uppercase]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Caps]          [\s!file:\typescriptprefix{n:plex\typescriptone}-extralight]       [\s!fallbacks=Fake\typescriptprefix{\typescriptone}Caps]
     \stoptypescript
 
     \starttypescript [\s!sans,\s!serif,\s!mono] [ibmplex-light] [\s!name]
         \setups[\s!font:\s!fallback:\typescriptone]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-light]          [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-lightitalic]    [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-semibold]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-semibolditalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Widened]       [\s!file:\typescriptprefix{n:plex\typescriptone}-light]          [\s!features=\typescriptprefix{f:scplex\typescriptone}]
-        \definefontfallback[Fake\typescriptprefix{\typescriptone}Caps]      [\typescriptprefix{\typescriptone}Widened] [0x0000-0xFFFF]       [\s!rscale=0.85,method=uppercase]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Caps]          [\s!file:\typescriptprefix{n:plex\typescriptone}-light]          [\s!fallbacks=Fake\typescriptprefix{\typescriptone}Caps]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-light]          [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-lightitalic]    [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-semibold]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-semibolditalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Widened]       [\s!file:\typescriptprefix{n:plex\typescriptone}-light]          [\s!features=\typescriptprefix{f:scplex\typescriptone}]
+        \edefinefontfallback[Fake\typescriptprefix{\typescriptone}Caps]      [\typescriptprefix{\typescriptone}Widened] [0x0000-0xFFFF]       [\s!rscale=0.85,method=uppercase]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Caps]          [\s!file:\typescriptprefix{n:plex\typescriptone}-light]          [\s!fallbacks=Fake\typescriptprefix{\typescriptone}Caps]
     \stoptypescript
 
     \starttypescript [\s!sans,\s!serif,\s!mono] [ibmplex] [\s!name]
         \setups[\s!font:\s!fallback:\typescriptone]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-regular]    [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-italic]     [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-bold]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-bolditalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Widened]       [\s!file:\typescriptprefix{n:plex\typescriptone}-regular]    [\s!features=\typescriptprefix{f:scplex\typescriptone}]
-        \definefontfallback[Fake\typescriptprefix{\typescriptone}Caps]      [\typescriptprefix{\typescriptone}Widened] [0x0000-0xFFFF]   [\s!rscale=0.85,method=uppercase]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Caps]          [\s!file:\typescriptprefix{n:plex\typescriptone}-regular]    [\s!fallbacks=Fake\typescriptprefix{\typescriptone}Caps]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-regular]    [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:plex\typescriptone}-italic]     [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-bold]       [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-bolditalic] [\s!features=\typescriptprefix{f:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Widened]       [\s!file:\typescriptprefix{n:plex\typescriptone}-regular]    [\s!features=\typescriptprefix{f:scplex\typescriptone}]
+        \edefinefontfallback[Fake\typescriptprefix{\typescriptone}Caps]      [\typescriptprefix{\typescriptone}Widened] [0x0000-0xFFFF]   [\s!rscale=0.85,method=uppercase]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Caps]          [\s!file:\typescriptprefix{n:plex\typescriptone}-regular]    [\s!fallbacks=Fake\typescriptprefix{\typescriptone}Caps]
     \stoptypescript
 
     % narrow
 
     \starttypescript [\s!sans,\s!serif,\s!mono] [ibmplexnarrow-thin] [\s!name]
         \setups[\s!font:\s!fallback:\typescriptone]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-thin]       [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-thinitalic] [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-text]       [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-textitalic] [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}Widened]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-thin]       [\s!features=\typescriptprefix{f:scnarrowplex\typescriptone}]
-        \definefontfallback[Fake\typescriptprefix{\typescriptone}Caps]          [\typescriptprefix{\typescriptone}Widened] [0x0000-0xFFFF]         [\s!rscale=0.85,method=uppercase]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}Caps]          [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-thin]       [\s!fallbacks=Fake\typescriptprefix{\typescriptone}Caps]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-thin]       [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-thinitalic] [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-text]       [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-textitalic] [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}Widened]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-thin]       [\s!features=\typescriptprefix{f:scnarrowplex\typescriptone}]
+        \edefinefontfallback[Fake\typescriptprefix{\typescriptone}Caps]          [\typescriptprefix{\typescriptone}Widened] [0x0000-0xFFFF]         [\s!rscale=0.85,method=uppercase]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}Caps]          [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-thin]       [\s!fallbacks=Fake\typescriptprefix{\typescriptone}Caps]
     \stoptypescript
 
     \starttypescript [\s!sans,\s!serif,\s!mono] [ibmplexnarrow-extralight] [\s!name]
         \setups[\s!font:\s!fallback:\typescriptone]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-extralight]       [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-extralightitalic] [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-medium]           [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-mediumitalic]     [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}Widened]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-extralight]       [\s!features=\typescriptprefix{f:scnarrowplex\typescriptone}]
-        \definefontfallback[Fake\typescriptprefix{\typescriptone}Caps]          [\typescriptprefix{\typescriptone}Widened] [0x0000-0xFFFF]               [\s!rscale=0.85,method=uppercase]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}Caps]          [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-extralight]       [\s!fallbacks=Fake\typescriptprefix{\typescriptone}Caps]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-extralight]       [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-extralightitalic] [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-medium]           [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-mediumitalic]     [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}Widened]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-extralight]       [\s!features=\typescriptprefix{f:scnarrowplex\typescriptone}]
+        \edefinefontfallback[Fake\typescriptprefix{\typescriptone}Caps]          [\typescriptprefix{\typescriptone}Widened] [0x0000-0xFFFF]               [\s!rscale=0.85,method=uppercase]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}Caps]          [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-extralight]       [\s!fallbacks=Fake\typescriptprefix{\typescriptone}Caps]
     \stoptypescript
 
     \starttypescript [\s!sans,\s!serif,\s!mono] [ibmplexnarrow-light] [\s!name]
         \setups[\s!font:\s!fallback:\typescriptone]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-light]          [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-lightitalic]    [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-semibold]       [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-semibolditalic] [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}Widened]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-light]          [\s!features=\typescriptprefix{f:scnarrowplex\typescriptone}]
-        \definefontfallback[Fake\typescriptprefix{\typescriptone}Caps]          [\typescriptprefix{\typescriptone}Widened] [0x0000-0xFFFF]             [\s!rscale=0.85,method=uppercase]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}Caps]          [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-light]          [\s!fallbacks=Fake\typescriptprefix{\typescriptone}Caps]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-light]          [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-lightitalic]    [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-semibold]       [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-semibolditalic] [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}Widened]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-light]          [\s!features=\typescriptprefix{f:scnarrowplex\typescriptone}]
+        \edefinefontfallback[Fake\typescriptprefix{\typescriptone}Caps]          [\typescriptprefix{\typescriptone}Widened] [0x0000-0xFFFF]             [\s!rscale=0.85,method=uppercase]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}Caps]          [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-light]          [\s!fallbacks=Fake\typescriptprefix{\typescriptone}Caps]
     \stoptypescript
 
     \starttypescript [\s!sans,\s!serif,\s!mono] [ibmplexnarrow] [\s!name]
         \setups[\s!font:\s!fallback:\typescriptone]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-regular]    [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-italic]     [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-bold]       [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-bolditalic] [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}Widened]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-regular]    [\s!features=\typescriptprefix{f:scnarrowplex\typescriptone}]
-        \definefontfallback[Fake\typescriptprefix{\typescriptone}Caps]          [\typescriptprefix{\typescriptone}Widened] [0x0000-0xFFFF]         [\s!rscale=0.85,method=uppercase]
-        \definefontsynonym     [\typescriptprefix{\typescriptone}Caps]          [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-regular]    [\s!fallbacks=Fake\typescriptprefix{\typescriptone}Caps]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-regular]    [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}\s!Italic]     [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-italic]     [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-bold]       [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-bolditalic] [\s!features=\typescriptprefix{f:narrowplex\typescriptone}]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}Widened]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-regular]    [\s!features=\typescriptprefix{f:scnarrowplex\typescriptone}]
+        \edefinefontfallback[Fake\typescriptprefix{\typescriptone}Caps]          [\typescriptprefix{\typescriptone}Widened] [0x0000-0xFFFF]         [\s!rscale=0.85,method=uppercase]
+        \edefinefontsynonym     [\typescriptprefix{\typescriptone}Caps]          [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-regular]    [\s!fallbacks=Fake\typescriptprefix{\typescriptone}Caps]
     \stoptypescript
 
 
@@ -245,109 +245,109 @@
     \definefontfallback [SansHebrewFallbackBold] [SansHebrewBold] [0x0590-0x05ff] [check=yes,force=no]
 
     \starttypescript [\s!sans] [ibmplex-thin] [\s!name]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-thin]
-                                                                            [\s!features=\typescriptprefix{f:plex\typescriptone},
-                                                                             \s!fallbacks=\typescriptprefix{tf:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-text]
-                                                                            [\s!features=\typescriptprefix{f:plex\typescriptone},
-                                                                             \s!fallbacks=\typescriptprefix{bf:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Hebrew]        [\s!file:\typescriptprefix{n:plex\typescriptone-hebrew}-thin]
-                                                                            [\s!features=hebrew]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Hebrew\s!Bold] [\s!file:\typescriptprefix{n:plex\typescriptone-hebrew}-text]
-                                                                            [\s!features=hebrew]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-thin]
+                                                                             [\s!features=\typescriptprefix{f:plex\typescriptone},
+                                                                              \s!fallbacks=\typescriptprefix{tf:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-text]
+                                                                             [\s!features=\typescriptprefix{f:plex\typescriptone},
+                                                                              \s!fallbacks=\typescriptprefix{bf:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Hebrew]        [\s!file:\typescriptprefix{n:plex\typescriptone-hebrew}-thin]
+                                                                             [\s!features=hebrew]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Hebrew\s!Bold] [\s!file:\typescriptprefix{n:plex\typescriptone-hebrew}-text]
+                                                                             [\s!features=hebrew]
     \stoptypescript
 
     \starttypescript [\s!sans] [ibmplex-extralight] [\s!name]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-extralight]
-                                                                            [\s!features=\typescriptprefix{f:plex\typescriptone},
-                                                                             \s!fallbacks=\typescriptprefix{tf:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-medium]
-                                                                            [\s!features=\typescriptprefix{f:plex\typescriptone},
-                                                                             \s!fallbacks=\typescriptprefix{bf:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Hebrew]        [\s!file:\typescriptprefix{n:plex\typescriptone-hebrew}-extralight]
-                                                                            [\s!features=hebrew]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Hebrew\s!Bold] [\s!file:\typescriptprefix{n:plex\typescriptone-hebrew}-medium]
-                                                                            [\s!features=hebrew]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-extralight]
+                                                                             [\s!features=\typescriptprefix{f:plex\typescriptone},
+                                                                              \s!fallbacks=\typescriptprefix{tf:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-medium]
+                                                                             [\s!features=\typescriptprefix{f:plex\typescriptone},
+                                                                              \s!fallbacks=\typescriptprefix{bf:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Hebrew]        [\s!file:\typescriptprefix{n:plex\typescriptone-hebrew}-extralight]
+                                                                             [\s!features=hebrew]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Hebrew\s!Bold] [\s!file:\typescriptprefix{n:plex\typescriptone-hebrew}-medium]
+                                                                             [\s!features=hebrew]
     \stoptypescript
 
     \starttypescript [\s!sans] [ibmplex-light] [\s!name]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-light]
-                                                                            [\s!features=\typescriptprefix{f:plex\typescriptone},
-                                                                             \s!fallbacks=\typescriptprefix{tf:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-semibold]
-                                                                            [\s!features=\typescriptprefix{f:plex\typescriptone},
-                                                                             \s!fallbacks=\typescriptprefix{bf:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Hebrew]        [\s!file:\typescriptprefix{n:plex\typescriptone-hebrew}-light]
-                                                                            [\s!features=hebrew]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Hebrew\s!Bold] [\s!file:\typescriptprefix{n:plex\typescriptone-hebrew}-semibold]
-                                                                            [\s!features=hebrew]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-light]
+                                                                             [\s!features=\typescriptprefix{f:plex\typescriptone},
+                                                                              \s!fallbacks=\typescriptprefix{tf:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-semibold]
+                                                                             [\s!features=\typescriptprefix{f:plex\typescriptone},
+                                                                              \s!fallbacks=\typescriptprefix{bf:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Hebrew]        [\s!file:\typescriptprefix{n:plex\typescriptone-hebrew}-light]
+                                                                             [\s!features=hebrew]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Hebrew\s!Bold] [\s!file:\typescriptprefix{n:plex\typescriptone-hebrew}-semibold]
+                                                                             [\s!features=hebrew]
     \stoptypescript
 
     \starttypescript [\s!sans] [ibmplex] [\s!name]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-regular]
-                                                                            [\s!features=\typescriptprefix{f:plex\typescriptone},
-                                                                             \s!fallbacks=\typescriptprefix{tf:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-bold]
-                                                                            [\s!features=\typescriptprefix{f:plex\typescriptone},
-                                                                             \s!fallbacks=\typescriptprefix{bf:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Hebrew]        [\s!file:\typescriptprefix{n:plex\typescriptone-hebrew}-regular]
-                                                                            [\s!features=hebrew]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Hebrew\s!Bold] [\s!file:\typescriptprefix{n:plex\typescriptone-hebrew}-bold]
-                                                                            [\s!features=hebrew]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:plex\typescriptone}-regular]
+                                                                             [\s!features=\typescriptprefix{f:plex\typescriptone},
+                                                                              \s!fallbacks=\typescriptprefix{tf:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:plex\typescriptone}-bold]
+                                                                             [\s!features=\typescriptprefix{f:plex\typescriptone},
+                                                                              \s!fallbacks=\typescriptprefix{bf:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Hebrew]        [\s!file:\typescriptprefix{n:plex\typescriptone-hebrew}-regular]
+                                                                             [\s!features=hebrew]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Hebrew\s!Bold] [\s!file:\typescriptprefix{n:plex\typescriptone-hebrew}-bold]
+                                                                             [\s!features=hebrew]
     \stoptypescript
 
     % narrow
 
     \starttypescript [\s!sans] [ibmplexnarrow-thin] [\s!name]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-thin]
-                                                                            [\s!features=\typescriptprefix{f:narrowplex\typescriptone},
-                                                                             \s!fallbacks=\typescriptprefix{tf:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-text]
-                                                                            [\s!features=\typescriptprefix{f:narrowplex\typescriptone},
-                                                                             \s!fallbacks=\typescriptprefix{bf:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Hebrew]        [\s!file:\typescriptprefix{n:narrowplex\typescriptone-hebrew}-thin]
-                                                                            [\s!features=hebrew]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Hebrew\s!Bold] [\s!file:\typescriptprefix{n:narrowplex\typescriptone-hebrew}-text]
-                                                                            [\s!features=hebrew]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-thin]
+                                                                             [\s!features=\typescriptprefix{f:narrowplex\typescriptone},
+                                                                              \s!fallbacks=\typescriptprefix{tf:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-text]
+                                                                             [\s!features=\typescriptprefix{f:narrowplex\typescriptone},
+                                                                              \s!fallbacks=\typescriptprefix{bf:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Hebrew]        [\s!file:\typescriptprefix{n:narrowplex\typescriptone-hebrew}-thin]
+                                                                             [\s!features=hebrew]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Hebrew\s!Bold] [\s!file:\typescriptprefix{n:narrowplex\typescriptone-hebrew}-text]
+                                                                             [\s!features=hebrew]
     \stoptypescript
 
     \starttypescript [\s!sans] [ibmplexnarrow-extralight] [\s!name]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-extralight]
-                                                                            [\s!features=\typescriptprefix{f:narrowplex\typescriptone},
-                                                                             \s!fallbacks=\typescriptprefix{tf:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-medium]
-                                                                            [\s!features=\typescriptprefix{f:narrowplex\typescriptone},
-                                                                             \s!fallbacks=\typescriptprefix{bf:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Hebrew]        [\s!file:\typescriptprefix{n:narrowplex\typescriptone-hebrew}-extralight]
-                                                                            [\s!features=hebrew]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Hebrew\s!Bold] [\s!file:\typescriptprefix{n:narrowplex\typescriptone-hebrew}-medium]
-                                                                            [\s!features=hebrew]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-extralight]
+                                                                             [\s!features=\typescriptprefix{f:narrowplex\typescriptone},
+                                                                              \s!fallbacks=\typescriptprefix{tf:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-medium]
+                                                                             [\s!features=\typescriptprefix{f:narrowplex\typescriptone},
+                                                                              \s!fallbacks=\typescriptprefix{bf:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Hebrew]        [\s!file:\typescriptprefix{n:narrowplex\typescriptone-hebrew}-extralight]
+                                                                             [\s!features=hebrew]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Hebrew\s!Bold] [\s!file:\typescriptprefix{n:narrowplex\typescriptone-hebrew}-medium]
+                                                                             [\s!features=hebrew]
     \stoptypescript
 
     \starttypescript [\s!sans] [ibmplexnarrow-light] [\s!name]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-light]
-                                                                            [\s!features=\typescriptprefix{f:narrowplex\typescriptone},
-                                                                             \s!fallbacks=\typescriptprefix{tf:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-semibold]
-                                                                            [\s!features=\typescriptprefix{f:narrowplex\typescriptone},
-                                                                             \s!fallbacks=\typescriptprefix{bf:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Hebrew]        [\s!file:\typescriptprefix{n:narrowplex\typescriptone-hebrew}-light]
-                                                                            [\s!features=hebrew]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Hebrew\s!Bold] [\s!file:\typescriptprefix{n:narrowplex\typescriptone-hebrew}-semibold]
-                                                                            [\s!features=hebrew]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-light]
+                                                                             [\s!features=\typescriptprefix{f:narrowplex\typescriptone},
+                                                                              \s!fallbacks=\typescriptprefix{tf:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-semibold]
+                                                                             [\s!features=\typescriptprefix{f:narrowplex\typescriptone},
+                                                                              \s!fallbacks=\typescriptprefix{bf:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Hebrew]        [\s!file:\typescriptprefix{n:narrowplex\typescriptone-hebrew}-light]
+                                                                             [\s!features=hebrew]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Hebrew\s!Bold] [\s!file:\typescriptprefix{n:narrowplex\typescriptone-hebrew}-semibold]
+                                                                             [\s!features=hebrew]
     \stoptypescript
 
     \starttypescript [\s!sans] [ibmplexnarrow] [\s!name]
-        \definefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-regular]
-                                                                            [\s!features=\typescriptprefix{f:narrowplex\typescriptone},
-                                                                             \s!fallbacks=\typescriptprefix{tf:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-bold]
-                                                                            [\s!features=\typescriptprefix{f:narrowplex\typescriptone},
-                                                                             \s!fallbacks=\typescriptprefix{bf:plex\typescriptone}]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Hebrew]        [\s!file:\typescriptprefix{n:narrowplex\typescriptone-hebrew}-regular]
-                                                                            [\s!features=hebrew]
-        \definefontsynonym [\typescriptprefix{\typescriptone}Hebrew\s!Bold] [\s!file:\typescriptprefix{n:narrowplex\typescriptone-hebrew}-bold]
-                                                                            [\s!features=hebrew]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}]              [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-regular]
+                                                                             [\s!features=\typescriptprefix{f:narrowplex\typescriptone},
+                                                                              \s!fallbacks=\typescriptprefix{tf:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold]       [\s!file:\typescriptprefix{n:narrowplex\typescriptone}-bold]
+                                                                             [\s!features=\typescriptprefix{f:narrowplex\typescriptone},
+                                                                              \s!fallbacks=\typescriptprefix{bf:plex\typescriptone}]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Hebrew]        [\s!file:\typescriptprefix{n:narrowplex\typescriptone-hebrew}-regular]
+                                                                             [\s!features=hebrew]
+        \edefinefontsynonym [\typescriptprefix{\typescriptone}Hebrew\s!Bold] [\s!file:\typescriptprefix{n:narrowplex\typescriptone-hebrew}-bold]
+                                                                             [\s!features=hebrew]
     \stoptypescript
 
     % The main definition, inspired by discussion at the 2018 ConTeXt meeting after a talk by Taco. Here
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 975f765a5..147d7755b 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 f0161868a..b48a519ae 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/context/modules/common/s-abbreviations-logos.tex b/tex/context/modules/common/s-abbreviations-logos.tex
index 00719a668..203ee936b 100644
--- a/tex/context/modules/common/s-abbreviations-logos.tex
+++ b/tex/context/modules/common/s-abbreviations-logos.tex
@@ -24,6 +24,7 @@
 \logo [MKCI]          {MkCI}
 \logo [MPII]          {MpII}
 \logo [MPIV]          {MpIV}
+\logo [LMTX]          {lmtx}
 
 \logo [ACROBAT]       {Acro\-bat}
 \logo [AFM]           {afm}
@@ -37,6 +38,7 @@
 \logo [APA]           {apa}
 \logo [API]           {api}
 \logo [ARABTEX]       {Arab\TeXsuffix}
+\logo [ARM]           {arm}
 \logo [ASCII]         {ascii}
 \logo [ASCIIMATH]     {AsciiMath}
 \logo [ASCIITEX]      {ascii\TeXsuffix}
@@ -53,6 +55,7 @@
 \logo [CJK]           {cjk}
 \logo [CLD]           {cld}
 \logo [CLD]           {cld}
+\logo [CMAKE]         {cmake}
 \logo [CMR]           {cmr}
 \logo [CMYK]          {cmyk}
 \logo [CNC]           {cnc}
@@ -67,11 +70,12 @@
 \logo [CTXTOOLS]      {ctxtools}
 \logo [CWEB]          {cweb}
 \logo [DAC]           {dac}
+\logo [DARWIN]        {Darwin}
 \logo [DECTEN]        {dec-10}
 \logo [DISTILLER]     {distiller}
 \logo [DNA]           {dna}
 \logo [DPI]           {dpi}
-\logo [DRATEX]        {Dra\TeXsuffix}
+%logo [DRATEX]        {Dra\TeXsuffix}
 \logo [DSC]           {dsc}
 \logo [DTD]           {dtd}
 \logo [DTK]           {dtk}
@@ -86,7 +90,6 @@
 \logo [DVISCR]        {dviscr}
 \logo [DVIWINDO]      {dviwindo}
 \logo [EBCDIC]        {ebcdic}
-\logo [EU]            {eu}
 \logo [EC]            {ec}
 \logo [EIFFEL]        {Eiffel}
 \logo [EMACS]         {emacs}
@@ -96,6 +99,7 @@
 \logo [EPS]           {eps}
 \logo [EPUB]          {ePub}
 \logo [ETEX]          {\eTeX}
+\logo [EU]            {eu}
 \logo [EUROBACHOTEX]  {EuroBacho\TeXsuffix}
 \logo [EUROMATH]      {EuroMath}
 \logo [EUROTEX]       {Euro\TeXsuffix}
@@ -151,13 +155,12 @@
 \logo [KVM]           {kvm}
 \logo [LAMSTEX]       {\LamSTeX}
 \logo [LATEX]         {\LaTeX}
-\logo [LATEXTE]       {\LaTeX2e}
-\logo [LATEXTN]       {\LaTeX2.09}
+%logo [LATEXTE]       {\LaTeX2e}
+%logo [LATEXTN]       {\LaTeX2.09}
 \logo [LCD]           {lcd}
 \logo [LINUX]         {linux}
 \logo [LISP]          {Lisp}
 \logo [LMX]           {lmx}
-\logo [LMTX]          {lmtx}
 \logo [LPEG]          {lpeg}
 \logo [LUA]           {Lua}
 \logo [LUAJIT]        {LuaJIT}
@@ -165,7 +168,7 @@
 \logo [LUATEX]        {Lua\TeXsuffix}
 \logo [LUATOOLS]      {luatools}
 \logo [MACOSX]        {MacOSX}
-\logo [MACROTEX]      {Macro\TeXsuffix}
+%logo [MACROTEX]      {Macro\TeXsuffix}
 \logo [MAKEMPY]       {MakeMPY}
 \logo [MAPPING]       {map}
 \logo [MAPS]          {Maps}
@@ -188,25 +191,26 @@
 \logo [MPS]           {mps}
 \logo [MPTOPDF]       {mptopdf}
 \logo [MSDOS]         {msdos}
+\logo [MSEXCEL]       {MS~Excel}
 \logo [MSWINDOWS]     {MS~Windows}
 \logo [MSWORD]        {MS~Word}
-\logo [MSEXCEL]       {MS~Excel}
 \logo [MTXRUN]        {mtxrun}
 \logo [MTXTOOLS]      {mtxtools}
 \logo [MYSQL]         {MySQL}
 \logo [NETPBM]        {NetPBM}
+\logo [NGINX]         {nginx}
 \logo [NTG]           {ntg}
 \logo [NTS]           {nts}
-\logo [NGINX]         {nginx}
 \logo [OFM]           {ofm}
 \logo [OMEGA]         {Omega}
+\logo [OPENBSD]       {OpenBSD}
 \logo [OPENMATH]      {OpenMath}
 \logo [OPENTYPE]      {OpenType}
 \logo [OPI]           {opi}
+\logo [OSX]           {os-x}
 \logo [OTEX]          {Oriental \TeXsuffix}
 \logo [OTF]           {otf}
 \logo [OTP]           {otp}
-\logo [OSX]           {os-x}
 \logo [OVF]           {ovf}
 \logo [PASCAL]        {Pascal}
 \logo [PCTEX]         {pc\TeXsuffix}
@@ -243,8 +247,8 @@
 \logo [RELAXNG]       {Relax\kern.125emNG}
 \logo [RGB]           {rgb}
 \logo [RLXTOOLS]      {rlxtools}
-\logo [RUBY]          {Ruby}
 \logo [RSYNC]         {Rsync}
+\logo [RUBY]          {Ruby}
 \logo [SCITE]         {SciTE}
 \logo [SGML]          {sgml}
 \logo [SI]            {si}
@@ -317,12 +321,12 @@
 \logo [WEBC]          {web2c}
 \logo [WIKI]          {Wiki}
 \logo [WINDOWS]       {Windows}
-\logo [WINNT]         {WinNT}
-\logo [WINNX]         {Win9x}
+%logo [WINNT]         {WinNT}
+%logo [WINNX]         {Win9x}
 \logo [WTHREEC]       {W3C}
 \logo [WWW]           {www}
 \logo [WYSIWYG]       {wysiwyg}
-\logo [XDVI]          {Xdvi}
+%logo [XDVI]          {Xdvi}
 \logo [XETEX]         {\XeTeX}
 \logo [XFDF]          {xfdf}
 \logo [XHTML]         {xhtml}
@@ -331,7 +335,7 @@
 \logo [XML]           {xml}
 \logo [XMLTOOLS]      {xmltools}
 \logo [XPATH]         {xpath}
-\logo [XPDFETEX]      {xpdfe\TeXsuffix}
+%logo [XPDFETEX]      {xpdfe\TeXsuffix}
 \logo [XSL]           {xsl}
 \logo [XSLFO]         {xsl-fo}
 \logo [XSLT]          {xslt}
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 5d9477553..6fab6ea69 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  : 02/26/19 20:04:01
+-- merge date  : 03/05/19 15:40:37
 
 do -- begin closure to overcome local limits and interference
 
@@ -8799,7 +8799,7 @@ function constructors.scale(tfmdata,specification)
      height=height,
      depth=depth,
      width=width,
-     unicode=unicode,
+     unicode=isunicode,
     }
    else
     chr={
@@ -8815,7 +8815,7 @@ function constructors.scale(tfmdata,specification)
      index=index,
      height=height,
      width=width,
-     unicode=unicode,
+     unicode=isunicode,
     }
    else
     chr={
@@ -26074,8 +26074,8 @@ function handlers.gsub_ligature(head,start,dataset,sequence,ligature,rlmode,skip
     local prev=getprev(start)
     if stop then
      setnext(stop)
-     local tail=getprev(stop)
      local copy=copy_node_list(start)
+     local tail=stop 
      local liat=find_node_tail(copy)
      if pre then
       setlink(liat,pre)