diff options
Diffstat (limited to 'tex/context/base/mkiv')
-rw-r--r-- | tex/context/base/mkiv/cont-new.mkiv | 2 | ||||
-rw-r--r-- | tex/context/base/mkiv/context.mkiv | 2 | ||||
-rw-r--r-- | tex/context/base/mkiv/grph-fil.lua | 30 | ||||
-rw-r--r-- | tex/context/base/mkiv/status-files.pdf | bin | 24610 -> 24596 bytes | |||
-rw-r--r-- | tex/context/base/mkiv/status-lua.pdf | bin | 264786 -> 264787 bytes |
5 files changed, 23 insertions, 11 deletions
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index ff5584f5a..4d1a5f344 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{2022.12.29 14:29} +\newcontextversion{2023.01.04 11:32} %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 eecce37d5..6df85ce83 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -49,7 +49,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2022.12.29 14:29} +\edef\contextversion{2023.01.04 11:32} %D Kind of special: diff --git a/tex/context/base/mkiv/grph-fil.lua b/tex/context/base/mkiv/grph-fil.lua index 4de30cd30..afb303acd 100644 --- a/tex/context/base/mkiv/grph-fil.lua +++ b/tex/context/base/mkiv/grph-fil.lua @@ -49,12 +49,12 @@ job.register('job.files.collected', tobesaved, initializer) local contextrunner = sandbox.registerrunner { name = "hashed context run", program = "context", - template = [[%options% %?path: --runpath=%path% ?% %filename%]], + template = [[%options% %?path: --path=%path% ?% %?runpath: --runpath=%runpath% ?% %filename%]], checkers = { options = "string", filename = "readable", path = "string", - -- runpath = "string", + runpath = "string", } } @@ -73,12 +73,17 @@ function jobfiles.run(action) if filename and filename ~= "" then local result = action.result local runner = action.runner or contextrunner + local path = action.path +if not isfile(filename) and path and path ~= "" then + filename = file.join(path,filename) +end local oldchecksum = collected[filename] local newchecksum = checksum(filename) +-- print(filename,oldchecksum,newchecksum) local tobedone = false local forcerun = action.forcerun or jobfiles.forcerun if not result then - result = replacesuffix(usedname,resultsuffix) + result = replacesuffix(filename,resultsuffix) action.result = result end if forcerun then @@ -144,20 +149,27 @@ local function analyzed(name,options) local usedname = addsuffix(name,inputsuffix) -- we assume tex if not set local resultname = replacesuffix(name,resultsuffix) -- we assume tex if not set local pathname = file.pathpart(usedname) - local runpath = environment.arguments.path -- sic, no runpath - if pathname ~= "" then - if runpath then - runpath = file.join(runpath,pathname) + local path = environment.arguments.path -- sic, no runpath + local runpath = environment.arguments.runpath + local resultname = replacesuffix(name,resultsuffix) -- we assume tex if not set + if runpath and runpath ~= "" then + -- not really needed but probably more robust for local leftovers + resultname = file.join(runpath,file.basename(resultname)) + end + if path ~= "" then + if path then + path = file.join(path,pathname) else - runpath = pathname + path = pathname end usedname = file.basename(usedname) end return { options = options, - path = runpath, -- or nil + path = path, filename = usedname, result = resultname, + runpath = runpath, } end diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex 653a9e73b..f634b088d 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 Binary files differindex 8c0f230e1..e46cc1d23 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf |