2018-06-11 12:12:00

21 files changed, 79 insertions, 49 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 9bc20d6ab..241725efa 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{2018.06.10 15:42}
+\newcontextversion{2018.06.11 12:05}
 
 %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 5358f59af..5ff255b8e 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{2018.06.10 15:42}
+\edef\contextversion{2018.06.11 12:05}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-nl.mkii b/tex/context/base/mkii/mult-nl.mkii
index be6df5d07..4d5ab2af1 100644
--- a/tex/context/base/mkii/mult-nl.mkii
+++ b/tex/context/base/mkii/mult-nl.mkii
@@ -1274,6 +1274,7 @@
 \setinterfaceconstant{vcompact}{vcomprimeer}
 \setinterfaceconstant{vector}{vector}
 \setinterfaceconstant{veroffset}{kopoffset}
+\setinterfaceconstant{vfactor}{vfactor}
 \setinterfaceconstant{vfil}{vfil}
 \setinterfaceconstant{viewerprefix}{viewerprefix}
 \setinterfaceconstant{voffset}{voffset}
diff --git a/tex/context/base/mkiv/back-exp.lua b/tex/context/base/mkiv/back-exp.lua
index fd86217b1..8f6470870 100644
--- a/tex/context/base/mkiv/back-exp.lua
+++ b/tex/context/base/mkiv/back-exp.lua
@@ -3064,7 +3064,7 @@ function nodes.handlers.export(head) -- hooks into the page builder
     end
  -- continueexport()
     restart = true
-    collectresults(tonut(head))
+    collectresults(head)
     if trace_export then
         report_export("%w<!-- stop flushing page -->",currentdepth)
     end
diff --git a/tex/context/base/mkiv/buff-ver.lua b/tex/context/base/mkiv/buff-ver.lua
index 2e9489e61..886b62b9e 100644
--- a/tex/context/base/mkiv/buff-ver.lua
+++ b/tex/context/base/mkiv/buff-ver.lua
@@ -255,7 +255,7 @@ function visualizers.load(name)
             if trace_visualize then
                 report_visualizers("loading visualizer %a",name)
             end
-            lua.registercode(luaname)
+            lua.registercode(luaname) -- only used here, end up in format
             context.input(texname)
         end
         if rawget(specifications,name) == nil then
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 26de0cbf1..17ace314b 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{2018.06.10 15:42}
+\newcontextversion{2018.06.11 12:05}
 
 %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 57c1158da..8842e4fc3 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{2018.06.10 15:42}
+\edef\contextversion{2018.06.11 12:05}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
@@ -547,7 +547,7 @@
 
 \loadmarkfile{cont-log}
 
-\loadmarkfile{task-ini}
+% \loadmarkfile{task-ini}
 
 \loadmarkfile{cldf-ver} % verbatim, this can come late
 \loadmarkfile{cldf-com} % commands, this can come late
@@ -571,6 +571,7 @@
 \loadmarkfile{meta-blb}
 \loadmarkfile{grph-epd}
 
+\loadmarkfile{task-ini}
 
 \loadmarkfile{cont-run} % the main runner (used in cont-yes.mkiv)
 
diff --git a/tex/context/base/mkiv/l-macro.lua b/tex/context/base/mkiv/l-macro.lua
index 30c7cbec6..cbd234fce 100644
--- a/tex/context/base/mkiv/l-macro.lua
+++ b/tex/context/base/mkiv/l-macro.lua
@@ -14,7 +14,7 @@ if not modules then modules = { } end modules ['l-macros'] = {
 local S, P, R, V, C, Cs, Cc, Ct, Carg = lpeg.S, lpeg.P, lpeg.R, lpeg.V, lpeg.C, lpeg.Cs, lpeg.Cc, lpeg.Ct, lpeg.Carg
 local lpegmatch = lpeg.match
 local concat = table.concat
-local format, sub = string.format, string.sub
+local format, sub, match = string.format, string.sub, string.match
 local next, load, type = next, load, type
 
 local newline       = S("\n\r")^1
@@ -170,6 +170,51 @@ function macros.resolving()
     return next(patterns)
 end
 
+local function reload(path,name,data)
+    local only = match(name,".-([^/]+)%.lua")
+    if only and only ~= "" then
+        local name = path .. "/" .. only
+        local f = io.open(name,"wb")
+        f:write(data)
+        f:close()
+        local f = loadfile(name)
+        os.remove(name)
+        return f
+    end
+end
+
+-- local function reload(path,name,data)
+--     if path and path ~= "" then
+--         local only = file.nameonly(name) .. "-macro.lua"
+--         local name = file.join(path,only)
+--         io.savedata(name,data)
+--         local l = loadfile(name)
+--         os.remove(name)
+--         return l
+--     end
+--     return load(data,name)
+-- end
+--
+-- assumes no helpers
+
+local function reload(path,name,data)
+    if path and path ~= "" then
+        local only = string.match(name,".-([^/]+)%.lua")
+        if only and only ~= "" then
+            local name = path .. "/" .. only .. "-macro.lua"
+            local f = io.open(name,"wb")
+            if f then
+                f:write(data)
+                f:close()
+                local l = loadfile(name)
+                os.remove(name)
+                return l
+            end
+        end
+    end
+    return load(data,name)
+end
+
 local function loaded(name,trace,detail)
  -- local c = io.loaddata(fullname) -- not yet available
     local f = io.open(name,"rb")
@@ -194,12 +239,11 @@ local function loaded(name,trace,detail)
             report_lua("no macros expanded in '%s'",name)
         end
     end
-    if #name > 30 then
-        n = "--[[" .. sub(name,-30) .. "]] " .. n
-    else
-        n = "--[[" ..     name      .. "]] " .. n
-    end
-    return load(n)
+ -- if #name > 30 then
+ --     name = sub(name,-30)
+ -- end
+ -- n = "--[[" .. name .. "]]\n" .. n
+    return reload(lfs and lfs.currentdir(),name,n)
 end
 
 macros.loaded = loaded
diff --git a/tex/context/base/mkiv/lpdf-ini.lua b/tex/context/base/mkiv/lpdf-ini.lua
index f9000f537..abe597810 100644
--- a/tex/context/base/mkiv/lpdf-ini.lua
+++ b/tex/context/base/mkiv/lpdf-ini.lua
@@ -896,27 +896,7 @@ function lpdf.finalizedocument()
     end
 end
 
--- codeinjections.finalizepage = lpdf.finalizepage -- no longer triggered at the tex end
-
-if not callbacks.register("finish_pdfpage", lpdf.finalizepage) then
-
-    local find_tail    = nodes.tail
-    local latelua_node = nodes.pool.latelua
-
-    function nodeinjections.finalizepage(head)
-        local t = find_tail(head.list)
-        if t then
-            local n = latelua_node("lpdf.finalizepage(true)") -- last in the shipout
-            t.next = n
-            n.prev = t
-        end
-        return head, true
-    end
-
-    nodes.tasks.enableaction("shipouts","backends.pdf.nodeinjections.finalizepage")
-
-end
-
+callbacks.register("finish_pdfpage", lpdf.finalizepage)
 callbacks.register("finish_pdffile", lpdf.finalizedocument)
 
 do
diff --git a/tex/context/base/mkiv/luat-cod.lua b/tex/context/base/mkiv/luat-cod.lua
index 94006d52c..63a51b4fc 100644
--- a/tex/context/base/mkiv/luat-cod.lua
+++ b/tex/context/base/mkiv/luat-cod.lua
@@ -38,7 +38,7 @@ lua.bytedata      = bytedata
 lua.bytedone      = bytedone
 
 local setbytecode = lua.setbytecode
-local getbytecode = lua.getbytecode
+----- getbytecode = lua.getbytecode
 
 lua.firstbytecode = 501
 lua.lastbytecode  = lua.lastbytecode or (lua.firstbytecode - 1) -- as we load ourselves again ... maybe return earlier
diff --git a/tex/context/base/mkiv/luat-fmt.lua b/tex/context/base/mkiv/luat-fmt.lua
index 30c55eecc..3e08a86f0 100644
--- a/tex/context/base/mkiv/luat-fmt.lua
+++ b/tex/context/base/mkiv/luat-fmt.lua
@@ -51,7 +51,7 @@ local function secondaryflags()
     return concat(flags," ")
 end
 
--- The silent option is Taco. It's a bit of a hack because we cannot yet mess
+-- The silent option is for Taco. It's a bit of a hack because we cannot yet mess
 -- with directives. In fact, I could probably clean up the maker a bit by now.
 
 local template = [[--ini %primaryflags% --lua=%luafile% %texfile% %secondaryflags% %dump% %redirect%]]
diff --git a/tex/context/base/mkiv/sort-lan.lua b/tex/context/base/mkiv/sort-lan.lua
index 1aa173d1b..3d5c89bb8 100644
--- a/tex/context/base/mkiv/sort-lan.lua
+++ b/tex/context/base/mkiv/sort-lan.lua
@@ -71,16 +71,22 @@ definitions['fr'] = { parent = 'default' }
 
 -- DIN 5007-1
 
-definitions['DIN 5007-1'] = { parent = 'default' }
+definitions['DIN 5007-1'] = {
+    parent       = 'default',
+    replacements = {
+        { "ß", "ss" },
+    },
+}
 
 -- DIN 5007-2
 
 definitions['DIN 5007-2'] = {
     parent       = 'default',
     replacements = {
-        { "ä", 'ae' }, { "Ä", 'Ae' },
-        { "ö", 'oe' }, { "Ö", 'Oe' },
-        { "ü", 'ue' }, { "Ü", 'Ue' },
+        { "ä", "ae" }, { "Ä", "Ae" },
+        { "ö", "oe" }, { "Ö", "Oe" },
+        { "ü", "ue" }, { "Ü", "Ue" },
+        { "ß", "ss" },
     },
 }
 
@@ -88,7 +94,9 @@ definitions['DIN 5007-2'] = {
 
 definitions['Duden'] = {
     parent       = 'default',
-    replacements = { { "ß", 's' } },
+    replacements = {
+        { "ß", "s" },
+    },
 }
 
 -- definitions['de'] = { parent = 'default' } -- new german
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 5698d1e1f..8697305df 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 d7df10fdb..5e4f1b448 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-tag.mkiv b/tex/context/base/mkiv/strc-tag.mkiv
index 60ea17378..f69d75a59 100644
--- a/tex/context/base/mkiv/strc-tag.mkiv
+++ b/tex/context/base/mkiv/strc-tag.mkiv
@@ -293,10 +293,6 @@
 % \dostarttaggedchained  % {tag} {detail} \??hash
 % \dostarttaggednodetail % {tag}
 
-% \unexpanded\def\strc_tags_enable
-%   {\let\dostarttagged\strc_tags_start_yes
-%    \let\dostoptagged \strc_tags_stop_yes}
-
 \newconditional\c_strc_tags_enabled
 
 \unexpanded\def\strc_tags_enable
diff --git a/tex/context/base/mkiv/task-ini.lua b/tex/context/base/mkiv/task-ini.lua
index 49f85f01d..3d16482a5 100644
--- a/tex/context/base/mkiv/task-ini.lua
+++ b/tex/context/base/mkiv/task-ini.lua
@@ -81,7 +81,6 @@ appendaction("shipouts",     "normalizers", "nodes.handlers.accessibility",
 appendaction("shipouts",     "normalizers", "nodes.handlers.backgrounds",                       nil, "nut",    "disabled"  )
 appendaction("shipouts",     "normalizers", "typesetters.rubies.attach",                        nil, "nut",    "disabled"  )
 appendaction("shipouts",     "normalizers", "nodes.properties.delayed",                         nil, "nut",    "production")
-appendaction("shipouts",     "normalizers", "backends.pdf.nodeinjections.finalizepage",         nil, "nut",    "production")
 
 appendaction("shipouts",     "finishers",   "nodes.visualizers.handler",                        nil, "nut",    "disabled"  )
 appendaction("shipouts",     "finishers",   "attributes.colors.handler",                        nil, "nut",    "disabled"  )
diff --git a/tex/context/base/mkiv/util-lua.lua b/tex/context/base/mkiv/util-lua.lua
index 7c5e1bf2a..1f531ef48 100644
--- a/tex/context/base/mkiv/util-lua.lua
+++ b/tex/context/base/mkiv/util-lua.lua
@@ -114,7 +114,7 @@ function luautilities.strippedloadstring(code,name,forcestrip) -- not executed
     end
     if forcestrip and luautilities.stripcode or luautilities.alwaysstripcode then
         register(name)
-        return load(dump(code,true)), 0 -- not yet executes
+        return load(dump(code,true)), 0 -- not yet executed
     else
         return code, 0
     end
diff --git a/tex/context/interface/mkii/keys-nl.xml b/tex/context/interface/mkii/keys-nl.xml
index f493e096f..463f1f84d 100644
--- a/tex/context/interface/mkii/keys-nl.xml
+++ b/tex/context/interface/mkii/keys-nl.xml
@@ -1280,6 +1280,7 @@
 		<cd:constant name='vcompact' value='vcomprimeer'/>
 		<cd:constant name='vector' value='vector'/>
 		<cd:constant name='veroffset' value='kopoffset'/>
+		<cd:constant name='vfactor' value='vfactor'/>
 		<cd:constant name='vfil' value='vfil'/>
 		<cd:constant name='viewerprefix' value='viewerprefix'/>
 		<cd:constant name='voffset' value='voffset'/>
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index fde82a864..ab8ade821 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 ad2a27ac3..315413f0e 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 240543831..ae3761cce 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  : 06/10/18 15:42:18
+-- merge date  : 06/11/18 12:05:53
 
 do -- begin closure to overcome local limits and interference