2016-08-27 13:40:00

10 files changed, 34 insertions, 21 deletions

diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 858db6a3c..778f05726 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 2f11fa776..ed2c800d1 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{2016.08.26 15:35}
+\newcontextversion{2016.08.27 13:35}
 
 %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 0806b4977..7e8bf498e 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2016.08.26 15:35}
+\edef\contextversion{2016.08.27 13:35}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/data-con.lua b/tex/context/base/mkiv/data-con.lua
index 240538df2..c79fca7c5 100644
--- a/tex/context/base/mkiv/data-con.lua
+++ b/tex/context/base/mkiv/data-con.lua
@@ -91,7 +91,7 @@ function containers.read(container,name)
     local storage = container.storage
     local stored = storage[name]
     if not stored and container.enabled and caches and containers.usecache then
-        stored = caches.loaddata(container.readables,name)
+        stored = caches.loaddata(container.readables,name,container.writable)
         if stored and stored.cache_version == container.version then
             if trace_cache or trace_containers then
                 report_containers("action %a, category %a, name %a","load",container.subcategory,name)
diff --git a/tex/context/base/mkiv/data-tmp.lua b/tex/context/base/mkiv/data-tmp.lua
index 9e1515a26..eabfce96e 100644
--- a/tex/context/base/mkiv/data-tmp.lua
+++ b/tex/context/base/mkiv/data-tmp.lua
@@ -256,22 +256,22 @@ caches.getwritablepath  = getwritablepath
 -- use e.g. a home path where we have updated file databases and so maybe we need
 -- to check first if we do have a writable one
 
-function caches.getfirstreadablefile(filename,...)
-    local rd = getreadablepaths(...)
-    for i=1,#rd do
-        local path = rd[i]
-        local fullname = file.join(path,filename)
-        if is_readable(fullname) then
-            usedreadables[i] = true
-            return fullname, path
-        end
-    end
-    return caches.setfirstwritablefile(filename,...)
-end
+-- function caches.getfirstreadablefile(filename,...)
+--     local rd = getreadablepaths(...)
+--     for i=1,#rd do
+--         local path = rd[i]
+--         local fullname = file.join(path,filename)
+--         if is_readable(fullname) then
+--             usedreadables[i] = true
+--             return fullname, path
+--         end
+--     end
+--     return caches.setfirstwritablefile(filename,...)
+-- end
 
 -- next time we have an issue, we can test this instead:
 
-function caches.getfirstreadablefile_TEST_ME_FIRST(filename,...)
+function caches.getfirstreadablefile(filename,...)
     -- check if we have already written once
     local fullname, path = caches.setfirstwritablefile(filename,...)
     if is_readable(fullname) then
@@ -297,7 +297,7 @@ function caches.setfirstwritablefile(filename,...)
     return fullname, wr
 end
 
-function caches.define(category,subcategory) -- for old times sake
+function caches.define(category,subcategory) -- not used
     return function()
         return getwritablepath(category,subcategory)
     end
@@ -307,19 +307,31 @@ function caches.setluanames(path,name)
     return format("%s/%s.%s",path,name,luasuffixes.tma), format("%s/%s.%s",path,name,luasuffixes.tmc)
 end
 
-function caches.loaddata(readables,name)
+-- This works best if the first writable is the first readable too. In practice
+-- we can have these situations for file databases:
+--
+-- tma in readable
+-- tma + tmb/c in readable
+--
+-- runtime files like fonts are written to the writable cache anyway
+
+function caches.loaddata(readables,name,writable)
     if type(readables) == "string" then
         readables = { readables }
     end
     for i=1,#readables do
-        local path = readables[i]
-        local tmaname, tmcname = caches.setluanames(path,name)
+        local path   = readables[i]
         local loader = false
+        local tmaname, tmcname = caches.setluanames(path,name)
         if isfile(tmcname) then
             loader = loadfile(tmcname)
         end
         if not loader and isfile(tmaname) then
-            -- in case we have a different engine
+            -- can be different paths when we read a file database from disk
+            local tmacrap, tmcname = caches.setluanames(writable,name)
+            if isfile(tmcname) then
+                loader = loadfile(tmcname)
+            end
             utilities.lua.compile(tmaname,tmcname)
             if isfile(tmcname) then
                 loader = loadfile(tmcname)
diff --git a/tex/context/base/mkiv/math-vfu.lua b/tex/context/base/mkiv/math-vfu.lua
index 2cfe0de10..a8a789d28 100644
--- a/tex/context/base/mkiv/math-vfu.lua
+++ b/tex/context/base/mkiv/math-vfu.lua
@@ -1083,6 +1083,7 @@ function vfmath.define(specification,set,goodies)
         report_virtual("loading and virtualizing font %a at size %p took %0.3f seconds",name,size,os.clock()-start)
     end
     --
+    main.oldmath = true
     return main
 end
 
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 1161e801c..847177f23 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 b44dd4cd6..ad2ce1c88 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 77a731577..d2fa14bdf 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 b550de042..892a15f8e 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf