beta 2012.11.22 14:55

14 files changed, 97 insertions, 91 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 12f182399..40af090f9 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{2012.11.22 11:29}
+\newcontextversion{2012.11.22 14:55}
 
 %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 85f21c864..cd705db36 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{2012.11.22 11:29}
+\newcontextversion{2012.11.22 14:55}
 
 %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/context-version.pdf b/tex/context/base/context-version.pdf
index e55cc07c2..7193df418 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index c38b8efd8..d40f681be 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 50320e65d..3060c6534 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{2012.11.22 11:29}
+\edef\contextversion{2012.11.22 14:55}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 3f9b0f979..f2c50f11f 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.11.22 11:29}
+\edef\contextversion{2012.11.22 14:55}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/data-tmp.lua b/tex/context/base/data-tmp.lua
index 6e235dd34..31c9485f4 100644
--- a/tex/context/base/data-tmp.lua
+++ b/tex/context/base/data-tmp.lua
@@ -37,7 +37,7 @@ local resolvers = resolvers
 -- intermezzo
 
 local directive_cleanup = false  directives.register("system.compile.cleanup", function(v) directive_cleanup = v end)
-local directive_strip   = true   directives.register("system.compile.strip",   function(v) directive_strip   = v end)
+local directive_strip   = false  directives.register("system.compile.strip",   function(v) directive_strip   = v end)
 
 local compile = utilities.lua.compile
 
diff --git a/tex/context/base/luat-env.lua b/tex/context/base/luat-env.lua
index e5893e911..4d58897a0 100644
--- a/tex/context/base/luat-env.lua
+++ b/tex/context/base/luat-env.lua
@@ -278,7 +278,7 @@ end
 --     return modu and modu.dataonly
 -- end
 
-local stripindeed = true  directives.register("system.compile.strip", function(v) stripindeed = v end)
+local stripindeed = false  directives.register("system.compile.strip", function(v) stripindeed = v end)
 
 local function strippable(filename)
     if stripindeed then
diff --git a/tex/context/base/luat-sto.lua b/tex/context/base/luat-sto.lua
index acf658505..a9952ceb9 100644
--- a/tex/context/base/luat-sto.lua
+++ b/tex/context/base/luat-sto.lua
@@ -34,11 +34,9 @@ storage.nofmodules = storage.nofmodules or 0
 storage.mark       = utilities.storage.mark
 storage.allocate   = utilities.storage.allocate
 storage.marked     = utilities.storage.marked
-storage.strip      = true
+storage.strip      = false
 
-directives.register("system.compile.strip", function(v)
-    storage.strip = v
-end)
+directives.register("system.compile.strip", function(v) storage.strip = v end)
 
 function storage.register(...)
     local t = { ... }
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 8b4358fe7..d15bd8eb1 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 3b93ab6eb..f6452600f 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/trac-set.lua b/tex/context/base/trac-set.lua
index 60e57b015..8c842f542 100644
--- a/tex/context/base/trac-set.lua
+++ b/tex/context/base/trac-set.lua
@@ -28,9 +28,10 @@ local data = { } -- maybe just local
 
 local trace_initialize = false -- only for testing during development
 
-function setters.initialize(filename,name,values,frozen) -- filename only for diagnostics
+function setters.initialize(filename,name,values) -- filename only for diagnostics
     local setter = data[name]
     if setter then
+        frozen = true -- don't permitoverload
 -- trace_initialize = true
         local data = setter.data
         if data then
@@ -323,19 +324,15 @@ if environment then
     local engineflags = environment.engineflags
 
     if engineflags then
-        if trackers then
-            local list = engineflags["c:trackers"] or engineflags["trackers"]
-            if type(list) == "string" then
-                setters.initialize("commandline flags","trackers",settings_to_hash(list),true)
-             -- t_enable(list)
-            end
+        local list = engineflags["c:trackers"] or engineflags["trackers"]
+        if type(list) == "string" then
+            setters.initialize("commandline flags","trackers",settings_to_hash(list))
+         -- t_enable(list)
         end
-        if directives then
-            local list = engineflags["c:directives"] or engineflags["directives"]
-            if type(list) == "string" then
-                setters.initialize("commandline flags","directives", settings_to_hash(list),true)
-             -- d_enable(list)
-            end
+        local list = engineflags["c:directives"] or engineflags["directives"]
+        if type(list) == "string" then
+            setters.initialize("commandline flags","directives", settings_to_hash(list))
+         -- d_enable(list)
         end
     end
 
diff --git a/tex/context/base/util-lua.lua b/tex/context/base/util-lua.lua
index 017964deb..e21f2587e 100644
--- a/tex/context/base/util-lua.lua
+++ b/tex/context/base/util-lua.lua
@@ -37,83 +37,94 @@ luautilities.strippedchunks    = strippedchunks
 --
 -- Begin of borrowed code ... works for Lua 5.1 which LuaTeX currently uses ...
 
-local function strip_code_pc(dump,name)
-    local before = #dump
-    local version, format, endian, int, size, ins, num = byte(dump,5,11)
-    local subint
-    if endian == 1 then
-        subint = function(dump, i, l)
-            local val = 0
-            for n = l, 1, -1 do
-                val = val * 256 + byte(dump,i + n - 1)
+local strip_code_pc, strippedbytecode
+
+if jit then
+
+    strip_code_pc = function(dump,name)
+        local before = #dump
+        local version, format, endian, int, size, ins, num = byte(dump,5,11)
+        local subint
+        if endian == 1 then
+            subint = function(dump, i, l)
+                local val = 0
+                for n = l, 1, -1 do
+                    val = val * 256 + byte(dump,i + n - 1)
+                end
+                return val, i + l
             end
-            return val, i + l
-        end
-    else
-        subint = function(dump, i, l)
-            local val = 0
-            for n = 1, l, 1 do
-                val = val * 256 + byte(dump,i + n - 1)
+        else
+            subint = function(dump, i, l)
+                local val = 0
+                for n = 1, l, 1 do
+                    val = val * 256 + byte(dump,i + n - 1)
+                end
+                return val, i + l
             end
-            return val, i + l
         end
-    end
-    local strip_function
-    strip_function = function(dump)
-        local count, offset = subint(dump, 1, size)
-        local stripped, dirty = rep("\0", size), offset + count
-        offset = offset + count + int * 2 + 4
-        offset = offset + int + subint(dump, offset, int) * ins
-        count, offset = subint(dump, offset, int)
-        for n = 1, count do
-            local t
-            t, offset = subint(dump, offset, 1)
-            if t == 1 then
-                offset = offset + 1
-            elseif t == 4 then
-                offset = offset + size + subint(dump, offset, size)
-            elseif t == 3 then
-                offset = offset + num
+        local strip_function
+        strip_function = function(dump)
+            local count, offset = subint(dump, 1, size)
+            local stripped, dirty = rep("\0", size), offset + count
+            offset = offset + count + int * 2 + 4
+            offset = offset + int + subint(dump, offset, int) * ins
+            count, offset = subint(dump, offset, int)
+            for n = 1, count do
+                local t
+                t, offset = subint(dump, offset, 1)
+                if t == 1 then
+                    offset = offset + 1
+                elseif t == 4 then
+                    offset = offset + size + subint(dump, offset, size)
+                elseif t == 3 then
+                    offset = offset + num
+                end
             end
+            count, offset = subint(dump, offset, int)
+            stripped = stripped .. sub(dump,dirty, offset - 1)
+            for n = 1, count do
+                local proto, off = strip_function(sub(dump,offset, -1))
+                stripped, offset = stripped .. proto, offset + off - 1
+            end
+            offset = offset + subint(dump, offset, int) * int + int
+            count, offset = subint(dump, offset, int)
+            for n = 1, count do
+                offset = offset + subint(dump, offset, size) + size + int * 2
+            end
+            count, offset = subint(dump, offset, int)
+            for n = 1, count do
+                offset = offset + subint(dump, offset, size) + size
+            end
+            stripped = stripped .. rep("\0", int * 3)
+            return stripped, offset
         end
-        count, offset = subint(dump, offset, int)
-        stripped = stripped .. sub(dump,dirty, offset - 1)
-        for n = 1, count do
-            local proto, off = strip_function(sub(dump,offset, -1))
-            stripped, offset = stripped .. proto, offset + off - 1
-        end
-        offset = offset + subint(dump, offset, int) * int + int
-        count, offset = subint(dump, offset, int)
-        for n = 1, count do
-            offset = offset + subint(dump, offset, size) + size + int * 2
-        end
-        count, offset = subint(dump, offset, int)
-        for n = 1, count do
-            offset = offset + subint(dump, offset, size) + size
+        dump = sub(dump,1,12) .. strip_function(sub(dump,13,-1))
+        local after = #dump
+        local delta = before-after
+        if tracestripping then
+            utilities.report("stripped bytecode: %s, before %s, after %s, delta %s",name or "unknown",before,after,delta)
         end
-        stripped = stripped .. rep("\0", int * 3)
-        return stripped, offset
-    end
-    dump = sub(dump,1,12) .. strip_function(sub(dump,13,-1))
-    local after = #dump
-    local delta = before-after
-    if tracestripping then
-        utilities.report("stripped bytecode: %s, before %s, after %s, delta %s",name or "unknown",before,after,delta)
+        strippedchunks[#strippedchunks+1] = name
+        luautilities.nofstrippedchunks = luautilities.nofstrippedchunks + 1
+        luautilities.nofstrippedbytes  = luautilities.nofstrippedbytes  + delta
+        return dump, delta
     end
-    strippedchunks[#strippedchunks+1] = name
-    luautilities.nofstrippedchunks = luautilities.nofstrippedchunks + 1
-    luautilities.nofstrippedbytes  = luautilities.nofstrippedbytes  + delta
-    return dump, delta
-end
 
--- ... end of borrowed code.
+    -- ... end of borrowed code.
 
-local function strippedbytecode(code,forcestrip,name)
-    if (forcestrip and luautilities.stripcode) or luautilities.alwaysstripcode then
-        return strip_code_pc(code,name)
-    else
-        return code, 0
+    strippedbytecode = function(code,forcestrip,name)
+        if (forcestrip and luautilities.stripcode) or luautilities.alwaysstripcode then
+            return strip_code_pc(code,name)
+        else
+            return code, 0
+        end
     end
+
+else
+
+    strip_code_pc    = function(str) return str, 0 end
+    strippedbytecode = strip_code_pc
+
 end
 
 luautilities.stripbytecode    = strip_code_pc
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 367afa20a..68ef3450d 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  : 11/22/12 11:29:41
+-- merge date  : 11/22/12 14:55:44
 
 do -- begin closure to overcome local limits and interference