summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2011-07-19 12:40:15 +0300
committerMarius <mariausol@gmail.com>2011-07-19 12:40:15 +0300
commit4b73db70e44825563db88d9f5943551af419e457 (patch)
treec310c2a04269fcef49f5bc78c484f52f0709e4a1
parente4c246fb375298e91e3e279b42b74bbbfdc63a91 (diff)
downloadcontext-4b73db70e44825563db88d9f5943551af419e457.tar.gz
beta 2011.07.19 11:22
-rw-r--r--tex/context/base/cont-new.mkii2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/file-job.lua6
-rw-r--r--tex/context/base/status-files.pdfbin23766 -> 23757 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin162151 -> 162151 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
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
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index ec24fa3b4..ec09248dd 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files 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