2020-07-20 19:49:00

13 files changed, 108 insertions, 161 deletions

diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 54acc158d..a3af1d3aa 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2020.07.20 15:33}
+\newcontextversion{2020.07.20 19:47}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index dbde535c9..60743ead8 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -45,7 +45,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.07.20 15:33}
+\edef\contextversion{2020.07.20 19:47}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index 920d7d244..d479ad178 100644
--- a/tex/context/base/mkiv/context.mkxl
+++ b/tex/context/base/mkiv/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.07.20 15:33}
+\edef\contextversion{2020.07.20 19:47}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/file-job.lua b/tex/context/base/mkiv/file-job.lua
index 407c3c15d..5641d3e15 100644
--- a/tex/context/base/mkiv/file-job.lua
+++ b/tex/context/base/mkiv/file-job.lua
@@ -27,8 +27,8 @@ local implement         = interfaces.implement
 local trace_jobfiles    = false  trackers.register("system.jobfiles", function(v) trace_jobfiles = v end)
 
 local report            = logs.reporter("system")
-local report_jobfiles   = logs.reporter("system","jobfiles")
-local report_functions  = logs.reporter("system","functions")
+local report_jobfiles   = logs.reporter("system", "jobfiles")
+local report_functions  = logs.reporter("system", "functions")
 
 local texsetcount       = tex.setcount
 local elements          = interfaces.elements
diff --git a/tex/context/base/mkiv/lpdf-lmt.lmt b/tex/context/base/mkiv/lpdf-lmt.lmt
index fd0236fc7..ed385b4de 100644
--- a/tex/context/base/mkiv/lpdf-lmt.lmt
+++ b/tex/context/base/mkiv/lpdf-lmt.lmt
@@ -1706,9 +1706,11 @@ local finalize  do
                 if BleedBox then BleedBox = box end
             end
 
-            if TrimBox  then pageattributes.TrimBox  =  pdfsharedobject(TrimBox ) end
-            if CropBox  then pageattributes.CropBox  =  pdfsharedobject(CropBox ) end
-            if BleedBox then pageattributes.BleedBox =  pdfsharedobject(BleedBox) end
+            -- Indirect objects don't work in all viewers.
+
+            if TrimBox  then pageattributes.TrimBox  = TrimBox  end -- pdfsharedobject(TrimBox )
+            if CropBox  then pageattributes.CropBox  = CropBox  end -- pdfsharedobject(CropBox )
+            if BleedBox then pageattributes.BleedBox = BleedBox end -- pdfsharedobject(BleedBox)
 
         else
 
diff --git a/tex/context/base/mkiv/luat-cod.lua b/tex/context/base/mkiv/luat-cod.lua
index 18126b186..76a4ceb34 100644
--- a/tex/context/base/mkiv/luat-cod.lua
+++ b/tex/context/base/mkiv/luat-cod.lua
@@ -73,7 +73,7 @@ function lua.registercode(filename,options)
         local code = environment.luafilechunk(filename,false,opts.optimize)
         if code then
             bytedone[basename] = true
-            if environment.initex then
+            if environment.initex and not opts.initexonly then
                 local n = lua.lastbytecode + 1
                 bytedata[n] = { name = barename, options = opts }
                 if strip or opts.strip then
diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua
index d55b90f7e..678f17552 100644
--- a/tex/context/base/mkiv/mult-def.lua
+++ b/tex/context/base/mkiv/mult-def.lua
@@ -9288,6 +9288,9 @@ return {
    ["pe"]="تورفتگی",
    ["ro"]="aliniat",
   },
+  ["indentlist"]={
+   ["en"]="indentlist",
+  },
   ["indentnext"]={
    ["cs"]="odsadpristi",
    ["de"]="ziehefolgendeein",
@@ -10799,6 +10802,9 @@ return {
    ["pe"]="بگذارسر",
    ["ro"]="punetitlu",
   },
+  ["placeholder"]={
+   ["en"]="placeholder",
+  },
   ["placestopper"]={
    ["cs"]="predelmista",
    ["de"]="setzetrenner",
diff --git a/tex/context/base/mkiv/mult-ini.lua b/tex/context/base/mkiv/mult-ini.lua
index 3dc425953..d1271815c 100644
--- a/tex/context/base/mkiv/mult-ini.lua
+++ b/tex/context/base/mkiv/mult-ini.lua
@@ -233,137 +233,91 @@ end
 
 logs.setmessenger(context.verbatim.ctxreport)
 
--- todo: use setmacro
-
-function interfaces.setuserinterface(interface,response)
-    sharedstorage.currentinterface, currentinterface = interface, interface
-    sharedstorage.currentresponse, currentresponse = response, response
-    if environment.initex then
-        local setmacro        = false
-     -- local setmacro        = interfaces.setmacro -- cleaner (but we need to test first)
-        local nofconstants    = 0
-        local nofvariables    = 0
-        local nofelements     = 0
-        local nofcommands     = 0
-        local nofformats      = 0
-        local noftranslations = 0
-        local nofsetupstrings = 0
-        --
-        if setmacro then
-            for given, constant in next, complete.constants do
-                constant = constant[interface] or constant.en or given
-                constants[constant] = given -- breedte -> width
-                nofconstants = nofconstants + 1
-                setmacro("c!"..given,given)
-                if currentinterface ~= "en" then
-                    setmacro("k!"..constant,given)
-                end
-            end
-        else
-            local t, f, s = { }, formatters["\\ui_c{%s}{%s}"], formatters["\\ui_s{%s}"]
-            for given, constant in next, complete.constants do
-                constant = constant[interface] or constant.en or given
-                constants[constant] = given -- breedte -> width
-                nofconstants = nofconstants + 1
-                if given == constant then
-                    t[nofconstants] = s(given)
-                else
-                    t[nofconstants] = f(given,constant)
-                end
-            end
-            contextsprint(prtcatcodes,concat(t))
-        end
-        --
-        if setmacro then
-            for given, variable in next, complete.variables do
-                variable = variable[interface] or variable.en or given
-                variables[given] = variable -- ja -> yes
-                nofvariables = nofvariables + 1
-                setmacro("v!"..given,variable)
-            end
-        else
-            local t, f = { }, formatters["\\ui_v{%s}{%s}"]
-            for given, variable in next, complete.variables do
-                variable = variable[interface] or variable.en or given
-                variables[given] = variable -- ja -> yes
-                nofvariables = nofvariables + 1
-                t[nofvariables] = f(given,variable)
-            end
-            contextsprint(prtcatcodes,concat(t))
-        end
-        --
-        if setmacro then
-            for given, element in next, complete.elements do
-                element = element[interface] or element.en or given
-                elements[element] = given
-                nofelements = nofelements + 1
-                setmacro("e!"..given,element)
-            end
-        else
-            local t, f = { }, formatters["\\ui_e{%s}{%s}"]
-            for given, element in next, complete.elements do
-                element = element[interface] or element.en or given
-                elements[element] = given
-                nofelements = nofelements + 1
-                t[nofelements] = f(given,element)
-            end
-            contextsprint(prtcatcodes,concat(t))
-        end
-        --
-        if setmacro then
-            -- this can only work ok when we already have defined the command
-            luatex.registerdumpactions(function()
-                for given, command in next, complete.commands do
-                    command = command[interface] or command.en or given
-                    if command ~= given then
-                        setmacro(prtcatcodes,given,"\\"..command)
-                    end
-                    nofcommands = nofcommands + 1
-                end
-            end)
-        else
-            local t, n, f = { }, 0, formatters["\\ui_m{%s}{%s}"]
-            for given, command in next, complete.commands do
-                command = command[interface] or command.en or given
-                if command ~= given then
-                    n = n + 1
-                    t[n] = f(given,command)
-                end
-                nofcommands = nofcommands + 1
-            end
-            contextsprint(prtcatcodes,concat(t))
-        end
-        --
-        for given, format in next, complete.messages.formats do
-            formats[given] = format[interface] or format.en or given
-            nofformats = nofformats + 1
-        end
-        --
-        for given, translation in next, complete.messages.translations do
-            translations[given] = translation[interface] or translation.en or given
-            noftranslations = noftranslations + 1
-        end
-        --
-        for given, setupstring in next, complete.setupstrings do
-            setupstring = setupstring[interface] or setupstring.en or given
-            setupstrings[given] = setupstring
-            nofsetupstrings = nofsetupstrings + 1
-        end
-        --
-        report_interface("definitions: %a constants, %a variables, %a elements, %a commands, %a formats, %a translations, %a setupstrings",
-            nofconstants,nofvariables,nofelements,nofcommands,nofformats,noftranslations,nofsetupstrings)
-    else
-        report_interface("the language(s) can only be set when making the format")
-    end
-    interfaces.currentinterface = currentinterface
-    interfaces.currentresponse  = currentresponse
-end
-
-interfaces.implement {
-    name      = "setuserinterface",
-    actions   = interfaces.setuserinterface,
-    arguments = "2 strings",
-}
+-- function interfaces.setuserinterface(interface,response)
+--     sharedstorage.currentinterface, currentinterface = interface, interface
+--     sharedstorage.currentresponse, currentresponse = response, response
+--     if environment.initex then
+--         local nofconstants    = 0
+--         local nofvariables    = 0
+--         local nofelements     = 0
+--         local nofcommands     = 0
+--         local nofformats      = 0
+--         local noftranslations = 0
+--         local nofsetupstrings = 0
+--         --
+--         local t, f, s = { }, formatters["\\ui_c{%s}{%s}"], formatters["\\ui_s{%s}"]
+--         for given, constant in next, complete.constants do
+--             constant = constant[interface] or constant.en or given
+--             constants[constant] = given -- breedte -> width
+--             nofconstants = nofconstants + 1
+--             if given == constant then
+--                 t[nofconstants] = s(given)
+--             else
+--                 t[nofconstants] = f(given,constant)
+--             end
+--         end
+--         contextsprint(prtcatcodes,concat(t))
+--         --
+--         local t, f = { }, formatters["\\ui_v{%s}{%s}"]
+--         for given, variable in next, complete.variables do
+--             variable = variable[interface] or variable.en or given
+--             variables[given] = variable -- ja -> yes
+--             nofvariables = nofvariables + 1
+--             t[nofvariables] = f(given,variable)
+--         end
+--         contextsprint(prtcatcodes,concat(t))
+--         --
+--         local t, f = { }, formatters["\\ui_e{%s}{%s}"]
+--         for given, element in next, complete.elements do
+--             element = element[interface] or element.en or given
+--             elements[element] = given
+--             nofelements = nofelements + 1
+--             t[nofelements] = f(given,element)
+--         end
+--         contextsprint(prtcatcodes,concat(t))
+--         --
+--      -- local t, n, f = { }, 0, formatters["\\ui_m{%s}{%s}"]
+--         local t, n, f = { }, 0, formatters["\\ui_a\\%s\\%s"]
+--         for given, command in next, complete.commands do
+--             command = command[interface] or command.en or given
+--             if command ~= given then
+--                 n = n + 1
+--                 t[n] = f(given,command)
+--             end
+--             nofcommands = nofcommands + 1
+--         end
+--         contextsprint(prtcatcodes,"\\toksapp\\everydump{"..concat(t).."}")
+--         --
+--         for given, format in next, complete.messages.formats do
+--             formats[given] = format[interface] or format.en or given
+--             nofformats = nofformats + 1
+--         end
+--         --
+--         for given, translation in next, complete.messages.translations do
+--             translations[given] = translation[interface] or translation.en or given
+--             noftranslations = noftranslations + 1
+--         end
+--         --
+--         for given, setupstring in next, complete.setupstrings do
+--             setupstring = setupstring[interface] or setupstring.en or given
+--             setupstrings[given] = setupstring
+--             nofsetupstrings = nofsetupstrings + 1
+--         end
+--         --
+--         report_interface("definitions: %a constants, %a variables, %a elements, %a commands, %a formats, %a translations, %a setupstrings",
+--             nofconstants,nofvariables,nofelements,nofcommands,nofformats,noftranslations,nofsetupstrings)
+--     else
+--         report_interface("the language(s) can only be set when making the format")
+--     end
+--     interfaces.currentinterface = currentinterface
+--     interfaces.currentresponse  = currentresponse
+-- end
+
+-- interfaces.implement {
+--     name      = "setuserinterface",
+--     actions   = interfaces.setuserinterface,
+--     arguments = "2 strings",
+-- }
 
 interfaces.cachedsetups = interfaces.cachedsetups or { }
 interfaces.hashedsetups = interfaces.hashedsetups or { }
diff --git a/tex/context/base/mkiv/mult-ini.mkiv b/tex/context/base/mkiv/mult-ini.mkiv
index 5b22428ff..8f73c4ef8 100644
--- a/tex/context/base/mkiv/mult-ini.mkiv
+++ b/tex/context/base/mkiv/mult-ini.mkiv
@@ -20,11 +20,7 @@
 \unprotect
 
 \registerctxluafile{mult-ini}{}
-
-% Todo:
-
-\def\c!placeholder{placeholder}
-\def\c!indentlist {indentlist}
+\registerctxluafile{mult-fmt}{initexonly}
 
 %D \macros
 %D   [constanten,variabelen,commands]
@@ -723,25 +719,14 @@
 
 %D For at the \LUA\ end (experiment):
 
-% \def\do@sicon#1#2{\expandafter\gdef\csname\c!prefix!#1\endcsname{#1}%
-%                   \expandafter\gdef\csname\k!prefix!#2\endcsname{#1}} % backmapping from non english
-% \def\do@sivar#1#2{\expandafter\gdef\csname\v!prefix!#1\endcsname{#2}}
-% \def\do@siele#1#2{\expandafter\gdef\csname\e!prefix!#1\endcsname{#2}}
-% \def\do@sicom#1#2{\expandafter\gdef\csname#2\expandafter\endcsname\expandafter{\csname#1\endcsname}}
-%
-% \startinterface english
-%
-%     \def\do@sicon#1#2{\expandafter\gdef\csname\c!prefix!#1\endcsname{#1}}
-%
-% \stopinterface
-
 \def\ui_c#1#2{\expandafter\gdef\csname\c!prefix!#1\endcsname{#1}%
               \expandafter\gdef\csname\k!prefix!#2\endcsname{#1}} % backmapping from non english
 \def\ui_s  #1{\expandafter\gdef\csname\c!prefix!#1\endcsname{#1}%
               \expandafter\gdef\csname\k!prefix!#1\endcsname{#1}} % backmapping from non english
 \def\ui_v#1#2{\expandafter\gdef\csname\v!prefix!#1\endcsname{#2}}
 \def\ui_e#1#2{\expandafter\gdef\csname\e!prefix!#1\endcsname{#2}}
-\def\ui_m#1#2{\expandafter\gdef\csname#2\expandafter\endcsname\expandafter{\csname#1\endcsname}}
+%def\ui_m#1#2{\expandafter\gdef\csname#2\expandafter\endcsname\expandafter{\csname#1\endcsname}}
+\def\ui_a#1#2{\aliasmacro#2#1}
 
 \startinterface english
 
@@ -797,7 +782,7 @@
 
 \ifx\undefined\everydump
     \newtoks\everydump
-    \def\dump{\the\everydump\normaldump}
+    \def\dump{\the\everydump\global\everydump\emptytoks\glet\dump\relax\normaldump}
 \fi
 
 % \appendtoks \showcontextbanner \to \everydump
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index e68929e5b..277fd403a 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 9a918ad18..821e78dbb 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/syst-ini.mkiv b/tex/context/base/mkiv/syst-ini.mkiv
index c978eaae5..06ef9dbe3 100644
--- a/tex/context/base/mkiv/syst-ini.mkiv
+++ b/tex/context/base/mkiv/syst-ini.mkiv
@@ -761,7 +761,7 @@
 
 \newtoks\everydump
 
-\def\dump{\the\everydump\normaldump}
+\def\dump{\the\everydump\global\everydump\emptytoks\glet\dump\relax\normaldump}
 
 %D The same applies for the startup actions.
 
diff --git a/tex/context/base/mkiv/syst-ini.mkxl b/tex/context/base/mkiv/syst-ini.mkxl
index b3fe4374c..232048036 100644
--- a/tex/context/base/mkiv/syst-ini.mkxl
+++ b/tex/context/base/mkiv/syst-ini.mkxl
@@ -768,7 +768,7 @@
 
 \newtoks\everydump
 
-\def\dump{\the\everydump\normaldump}
+\def\dump{\the\everydump\global\everydump\emptytoks\glet\dump\relax\normaldump}
 
 %D The same applies for the startup actions.