From 4b73db70e44825563db88d9f5943551af419e457 Mon Sep 17 00:00:00 2001 From: Marius Date: Tue, 19 Jul 2011 12:40:15 +0300 Subject: beta 2011.07.19 11:22 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/file-job.lua | 6 +++--- tex/context/base/status-files.pdf | Bin 23766 -> 23757 bytes tex/context/base/status-lua.pdf | Bin 162151 -> 162151 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 67885d132..f9f6051c0 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2011.07.19 11:04} +\newcontextversion{2011.07.19 11:22} %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/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 90fec089d..3ea2ee162 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2011.07.19 11:04} +\newcontextversion{2011.07.19 11:22} %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/context.mkii b/tex/context/base/context.mkii index 476b79b60..6224cc9b7 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.07.19 11:04} +\edef\contextversion{2011.07.19 11:22} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index f9e37570b..a63d89bf9 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.07.19 11:04} +\edef\contextversion{2011.07.19 11:22} %D For those who want to use this: diff --git a/tex/context/base/file-job.lua b/tex/context/base/file-job.lua index 7893b9396..8cd7ffeb8 100644 --- a/tex/context/base/file-job.lua +++ b/tex/context/base/file-job.lua @@ -37,10 +37,10 @@ local v_component = variables.component local function findctxfile(name) -- loc ? any ? if file.is_qualified_path(name) then -- maybe when no suffix do some test for tex return name - elseif not url.hasscheme(filename) then - return findbyscheme("loc",filename) or "" + elseif not url.hasscheme(name) then + return resolvers.finders.byscheme("loc",name) or "" else - return resolvers.findtexfile(filename) or "" + return resolvers.findtexfile(name) or "" end end diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index f20fdf666..89e7900b7 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index ec24fa3b4..ec09248dd 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index bf34d9bd4..046532dd8 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 : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 07/19/11 11:04:40 +-- merge date : 07/19/11 11:22:19 do -- begin closure to overcome local limits and interference -- cgit v1.2.3