beta 2014.03.25 02:17

14 files changed, 430 insertions, 224 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 4a1c45b49..09b3049ce 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{2014.03.24 00:52}
+\newcontextversion{2014.03.25 02:17}
 
 %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 80ab7a524..38a667788 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index aade5078a..2034834b0 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2014.03.24 00:52}
+\edef\contextversion{2014.03.25 02:17}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/font-otd.lua b/tex/context/base/font-otd.lua
index e421111dd..2dd23b741 100644
--- a/tex/context/base/font-otd.lua
+++ b/tex/context/base/font-otd.lua
@@ -132,58 +132,61 @@ local default   = "dflt"
 local function initialize(sequence,script,language,s_enabled,a_enabled,font,attr,dynamic,ra)
     local features = sequence.features
     if features then
-        local order = sequence.order or { }
-     -- for kind, scripts in next, features do
-        for i=1,#order do --
-            local kind = order[i] --
-            local e_e
-            local a_e = a_enabled and a_enabled[kind] -- the value (location)
-            if a_e ~= nil then
-                e_e = a_e
-            else
-                e_e = s_enabled and s_enabled[kind] -- the value (font)
-            end
-            if e_e then
-                local scripts = features[kind] --
-                local languages = scripts[script] or scripts[wildcard]
-                if languages then
-                 -- local valid, what = false
-                    local valid = false
-                    -- not languages[language] or languages[default] or languages[wildcard] because we want tracing
-                    -- only first attribute match check, so we assume simple fina's
-                    -- default can become a font feature itself
-                    if languages[language] then
-                        valid = e_e -- was true
-                     -- what  = language
-                 -- elseif languages[default] then
-                 --     valid = true
-                 --     what  = default
-                    elseif languages[wildcard] then
-                        valid = e_e -- was true
-                     -- what  = wildcard
-                    end
-                    if valid then
-                        local attribute = autofeatures[kind] or false
-                     -- if a_e and dynamic < 0 then
-                     --     valid = false
-                     -- end
-                     -- if trace_applied then
-                     --     local typ, action = match(sequence.type,"(.*)_(.*)") -- brrr
-                     --     report_process(
-                     --         "%s font: %03i, dynamic: %03i, kind: %s, script: %-4s, language: %-4s (%-4s), type: %s, action: %s, name: %s",
-                     --         (valid and "+") or "-",font,attr or 0,kind,script,language,what,typ,action,sequence.name)
-                     -- end
-                        if trace_applied then
-                            report_process(
-                                "font %s, dynamic %a (%a), feature %a, script %a, language %a, lookup %a, value %a",
-                                    font,attr or 0,dynamic,kind,script,language,sequence.name,valid)
+        local order = sequence.order
+        if order then
+            for i=1,#order do --
+                local kind = order[i] --
+                local e_e
+                local a_e = a_enabled and a_enabled[kind] -- the value (location)
+                if a_e ~= nil then
+                    e_e = a_e
+                else
+                    e_e = s_enabled and s_enabled[kind] -- the value (font)
+                end
+                if e_e then
+                    local scripts = features[kind] --
+                    local languages = scripts[script] or scripts[wildcard]
+                    if languages then
+                     -- local valid, what = false
+                        local valid = false
+                        -- not languages[language] or languages[default] or languages[wildcard] because we want tracing
+                        -- only first attribute match check, so we assume simple fina's
+                        -- default can become a font feature itself
+                        if languages[language] then
+                            valid = e_e -- was true
+                         -- what  = language
+                     -- elseif languages[default] then
+                     --     valid = true
+                     --     what  = default
+                        elseif languages[wildcard] then
+                            valid = e_e -- was true
+                         -- what  = wildcard
+                        end
+                        if valid then
+                            local attribute = autofeatures[kind] or false
+                         -- if a_e and dynamic < 0 then
+                         --     valid = false
+                         -- end
+                         -- if trace_applied then
+                         --     local typ, action = match(sequence.type,"(.*)_(.*)") -- brrr
+                         --     report_process(
+                         --         "%s font: %03i, dynamic: %03i, kind: %s, script: %-4s, language: %-4s (%-4s), type: %s, action: %s, name: %s",
+                         --         (valid and "+") or "-",font,attr or 0,kind,script,language,what,typ,action,sequence.name)
+                         -- end
+                            if trace_applied then
+                                report_process(
+                                    "font %s, dynamic %a (%a), feature %a, script %a, language %a, lookup %a, value %a",
+                                        font,attr or 0,dynamic,kind,script,language,sequence.name,valid)
+                            end
+                            ra[#ra+1] = { valid, attribute, sequence.chain or 0, kind, sequence }
                         end
-                        ra[#ra+1] = { valid, attribute, sequence.chain or 0, kind, sequence }
                     end
                 end
             end
+            -- { valid, attribute, chain, "generic", sequence } -- false anyway, could be flag instead of table
+        else
+            -- can't happen
         end
-        -- { valid, attribute, chain, "generic", sequence } -- false anyway, could be flag instead of table
     else
         -- { false, false, chain, false, sequence } -- indirect lookup, part of chain (todo: make this a separate table)
     end
diff --git a/tex/context/base/font-otn.lua b/tex/context/base/font-otn.lua
index 540716b35..25c750ae8 100644
--- a/tex/context/base/font-otn.lua
+++ b/tex/context/base/font-otn.lua
@@ -2053,17 +2053,21 @@ local autofeatures = fonts.analyzers.features -- was: constants
 local function initialize(sequence,script,language,enabled)
     local features = sequence.features
     if features then
-        local order = features.order
-        for i=1,#order do --
-            local kind = order[i] --
-            local valid = enabled[kind]
-            if valid then
-                local scripts = features[kind] --
-                local languages = scripts[script] or scripts[wildcard]
-                if languages and (languages[language] or languages[wildcard]) then
-                    return { valid, autofeatures[kind] or false, sequence.chain or 0, kind, sequence }
+        local order = sequence.order
+        if order then
+            for i=1,#order do --
+                local kind = order[i] --
+                local valid = enabled[kind]
+                if valid then
+                    local scripts = features[kind] --
+                    local languages = scripts[script] or scripts[wildcard]
+                    if languages and (languages[language] or languages[wildcard]) then
+                        return { valid, autofeatures[kind] or false, sequence.chain or 0, kind, sequence }
+                    end
                 end
             end
+        else
+            -- can't happen
         end
     end
     return false
diff --git a/tex/context/base/l-lua.lua b/tex/context/base/l-lua.lua
index 4a96b0b1d..9565f484a 100644
--- a/tex/context/base/l-lua.lua
+++ b/tex/context/base/l-lua.lua
@@ -6,6 +6,17 @@ if not modules then modules = { } end modules ['l-lua'] = {
     license   = "see context related readme files"
 }
 
+-- potential issues with 5.3:
+
+-- i'm not sure yet if the int/float change is good for luatex
+
+-- math.min
+-- math.max
+-- tostring
+-- tonumber
+-- utf.*
+-- bit32
+
 -- compatibility hacksand helpers
 
 local major, minor = string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$")
diff --git a/tex/context/base/lpdf-ano.lua b/tex/context/base/lpdf-ano.lua
index 3706ff983..8c53eca8c 100644
--- a/tex/context/base/lpdf-ano.lua
+++ b/tex/context/base/lpdf-ano.lua
@@ -449,7 +449,6 @@ local function somedestination(destination,internal,page)
             if used == defaultview or used == true then
                 return pagereferences[page]
             end
-            flaginternals[internal] = true -- to be sure
             if type(destination) ~= "string" then
                 destination = autoprefix .. internal
             end
@@ -705,7 +704,6 @@ runners["inner"] = function(var,actions)
                 end
                 internal = vir.internal
                 if internal then
---                     var.inner = internal
                     flaginternals[internal] = true
                 end
             end
diff --git a/tex/context/base/lpdf-ini.lua b/tex/context/base/lpdf-ini.lua
index c79f3bf62..e3e619ec6 100644
--- a/tex/context/base/lpdf-ini.lua
+++ b/tex/context/base/lpdf-ini.lua
@@ -13,67 +13,131 @@ local sind, cosd, floor, max, min = math.sind, math.cosd, math.floor, math.max,
 local lpegmatch, P, C, R, S, Cc, Cs = lpeg.match, lpeg.P, lpeg.C, lpeg.R, lpeg.S, lpeg.Cc, lpeg.Cs
 local formatters = string.formatters
 
--- pdf.mapfile pdf.mapline (todo: used in font-ctx.lua)
--- pdf.getpos pdf.gethpos pdf.getvpos
--- pdf.reserveobj pdf.immediateobj pdf.obj pdf.refobj
--- pdf.pageref
--- pdf.catalog pdf.info pdf.names pdf.trailer
-
-local backends           = backends
-local pdf                = pdf
-lpdf                     = lpdf or { }
-local lpdf               = lpdf
-
-local pdfreserveobject   = pdf.reserveobj
-local pdfimmediateobject = pdf.immediateobj
-local pdfdeferredobject  = pdf.obj
-local pdfreferenceobject = pdf.refobj
+local report_objects    = logs.reporter("backend","objects")
+local report_finalizing = logs.reporter("backend","finalizing")
+local report_blocked    = logs.reporter("backend","blocked")
 
-local factor             = number.dimenfactors.bp
+-- gethpos              : used
+-- getpos               : used
+-- getvpos              : used
+--
+-- getmatrix            : used
+-- hasmatrix            : used
+--
+-- mapfile              : used in font-ctx.lua
+-- mapline              : used in font-ctx.lua
+--
+-- maxobjnum            : not used
+-- obj                  : used
+-- immediateobj         : used
+-- objtype              : not used
+-- pageref              : used
+-- print                : can be used
+-- refobj               : used
+-- registerannot        : not to be used
+-- reserveobj           : used
+
+-- pdf.catalog          : used
+-- pdf.info             : used
+-- pdf.trailer          : used
+-- pdf.names            : not to be used
+
+-- pdf.setinfo          : used
+-- pdf.setcatalog       : used
+-- pdf.setnames         : not to be used
+-- pdf.settrailer       : used
+
+-- pdf.getinfo          : used
+-- pdf.getcatalog       : used
+-- pdf.getnames         : not to be used
+-- pdf.gettrailer       : used
+
+local pdf    = pdf
+local factor = number.dimenfactors.bp
+
+if pdf.setinfo then
+--     table.setmetatablenewindex(pdf,function(t,k,v)
+--         report_blocked("'pdf.%s' is not supported",k)
+--     end)
+    -- the getters are harmless
+end
+
+if not pdf.setinfo then
+    function pdf.setinfo   (s) pdf.info    = s end
+    function pdf.setcatalog(s) pdf.catalog = s end
+    function pdf.setnames  (s) pdf.names   = s end
+    function pdf.settrailer(s) pdf.trailer = s end
+end
+
+if not pdf.getpos then
+    function pdf.getpos   () return pdf.h, pdf.v     end
+    function pdf.gethpos  () return pdf.h            end
+    function pdf.getvpos  () return pdf.v            end
+    function pdf.hasmatrix() return false            end
+    function pdf.getmatrix() return 1, 0, 0, 1, 0, 0 end
+end
+
+if not pdf.setpageresources then
+    function pdf.setpageresources  (s) pdf.pageresources   = s end
+    function pdf.setpageattributes (s) pdf.pageattributes  = s end
+    function pdf.setpagesattributes(s) pdf.pagesattributes = s end
+end
+
+local pdfsetinfo            = pdf.setinfo
+local pdfsetcatalog         = pdf.setcatalog
+local pdfsetnames           = pdf.setnames
+local pdfsettrailer         = pdf.settrailer
+
+local pdfsetpageresources   = pdf.setpageresources
+local pdfsetpageattributes  = pdf.setpageattributes
+local pdfsetpagesattributes = pdf.setpagesattributes
+
+local pdfgetpos             = pdf.getpos
+local pdfgethpos            = pdf.gethpos
+local pdfgetvpos            = pdf.getvpos
+local pdfgetmatrix          = pdf.getmatrix
+local pdfhasmatrix          = pdf.hasmatrix
+
+local pdfreserveobject      = pdf.reserveobj
+local pdfimmediateobject    = pdf.immediateobj
+local pdfdeferredobject     = pdf.obj
+local pdfreferenceobject    = pdf.refobj
+
+function pdf.setinfo           () report_blocked("'pdf.%s' is not supported","setinfo")            end -- use lpdf.addtoinfo etc
+function pdf.setcatalog        () report_blocked("'pdf.%s' is not supported","setcatalog")         end
+function pdf.setnames          () report_blocked("'pdf.%s' is not supported","setnames")           end
+function pdf.settrailer        () report_blocked("'pdf.%s' is not supported","settrailer")         end
+function pdf.setpageresources  () report_blocked("'pdf.%s' is not supported","setpageresources")   end
+function pdf.setpageattributes () report_blocked("'pdf.%s' is not supported","setpageattributes")  end
+function pdf.setpagesattributes() report_blocked("'pdf.%s' is not supported","setpagesattributes") end
+
+function pdf.registerannot() report_blocked("'pdf.%s' is not supported","registerannot") end
 
 local trace_finalizers = false  trackers.register("backend.finalizers", function(v) trace_finalizers = v end)
 local trace_resources  = false  trackers.register("backend.resources",  function(v) trace_resources  = v end)
 local trace_objects    = false  trackers.register("backend.objects",    function(v) trace_objects    = v end)
 local trace_detail     = false  trackers.register("backend.detail",     function(v) trace_detail     = v end)
 
-local report_objects    = logs.reporter("backend","objects")
-local report_finalizing = logs.reporter("backend","finalizing")
-
-backends.pdf = backends.pdf or {
+local backends   = backends
+local pdfbackend = {
     comment        = "backend for directly generating pdf output",
     nodeinjections = { },
     codeinjections = { },
     registrations  = { },
     tables         = { },
 }
+backends.pdf     = pdfbackend
+lpdf             = lpdf or { }
+local lpdf       = lpdf
 
--- first some helpers
-
-local codeinjections = backends.pdf.codeinjections
-
-local pdfgetpos, pdfgethpos, pdfgetvpos, pdfhasmatrix, pdfgetmatrix
-
-if pdf.getpos then
-    pdfgetpos    = pdf.getpos
-    pdfgethpos   = pdf.gethpos
-    pdfgetvpos   = pdf.getvpos
-    pdfgetmatrix = pdf.getmatrix
-    pdfhasmatrix = pdf.hasmatrix
-else
-    if pdf.h then
-        pdfgetpos  = function() return pdf.h, pdf.v end
-        pdfgethpos = function() return pdf.h        end
-        pdfgetvpos = function() return pdf.v        end
-    end
-     pdfhasmatrix = function() return false            end
-     pdfgetmatrix = function() return 1, 0, 0, 1, 0, 0 end
-end
+local codeinjections = pdfbackend.codeinjections
+local nodeinjections = pdfbackend.nodeinjections
 
-codeinjections.getpos    = pdfgetpos    lpdf.getpos    = pdfgetpos
-codeinjections.gethpos   = pdfgethpos   lpdf.gethpos   = pdfgethpos
-codeinjections.getvpos   = pdfgetvpos   lpdf.getvpos   = pdfgetvpos
-codeinjections.hasmatrix = pdfhasmatrix lpdf.hasmatrix = pdfhasmatrix
-codeinjections.getmatrix = pdfgetmatrix lpdf.getmatrix = pdfgetmatrix
+codeinjections.getpos    = pdfgetpos     lpdf.getpos    = pdfgetpos
+codeinjections.gethpos   = pdfgethpos    lpdf.gethpos   = pdfgethpos
+codeinjections.getvpos   = pdfgetvpos    lpdf.getvpos   = pdfgetvpos
+codeinjections.hasmatrix = pdfhasmatrix  lpdf.hasmatrix = pdfhasmatrix
+codeinjections.getmatrix = pdfgetmatrix  lpdf.getmatrix = pdfgetmatrix
 
 function lpdf.transform(llx,lly,urx,ury)
     if pdfhasmatrix() then
@@ -582,7 +646,8 @@ end
 
 -- three priority levels, default=2
 
-local pagefinalizers, documentfinalizers = { { }, { }, { } }, { { }, { }, { } }
+local pagefinalizers     = { { }, { }, { } }
+local documentfinalizers = { { }, { }, { } }
 
 local pageresources, pageattributes, pagesattributes
 
@@ -595,9 +660,9 @@ end
 resetpageproperties()
 
 local function setpageproperties()
-    pdf.pageresources   = pageresources  ()
-    pdf.pageattributes  = pageattributes ()
-    pdf.pagesattributes = pagesattributes()
+    pdfsetpageresources  (pageresources  ())
+    pdfsetpageattributes (pageattributes ())
+    pdfsetpagesattributes(pagesattributes())
 end
 
 local function addtopageresources  (k,v) pageresources  [k] = v end
@@ -670,14 +735,14 @@ function lpdf.finalizedocument()
     end
 end
 
--- backends.pdf.codeinjections.finalizepage = lpdf.finalizepage -- no longer triggered at the tex end
+-- codeinjections.finalizepage = lpdf.finalizepage -- no longer triggered at the tex end
 
 if not callbacks.register("finish_pdfpage", lpdf.finalizepage) then
 
     local find_tail    = nodes.tail
     local latelua_node = nodes.pool.latelua
 
-    function backends.pdf.nodeinjections.finalizepage(head)
+    function nodeinjections.finalizepage(head)
         local t = find_tail(head.list)
         if t then
             local n = latelua_node("lpdf.finalizepage(true)") -- last in the shipout
@@ -710,15 +775,33 @@ lpdf.protectresources = true
 
 local catalog = pdfdictionary { Type = pdfconstant("Catalog") } -- nicer, but when we assign we nil the Type
 local info    = pdfdictionary { Type = pdfconstant("Info")    } -- nicer, but when we assign we nil the Type
-local names   = pdfdictionary { Type = pdfconstant("Names")   } -- nicer, but when we assign we nil the Type
+----- names   = pdfdictionary { Type = pdfconstant("Names")   } -- nicer, but when we assign we nil the Type
 
-local function flushcatalog() if not environment.initex then trace_flush("catalog") catalog.Type = nil pdf.catalog = catalog() end end
-local function flushinfo   () if not environment.initex then trace_flush("info")    info   .Type = nil pdf.info    = info   () end end
-local function flushnames  () if not environment.initex then trace_flush("names")   names  .Type = nil pdf.names   = names  () end end
+local function flushcatalog() if not environment.initex then trace_flush("catalog") catalog.Type = nil pdfsetcatalog(catalog()) end end
+local function flushinfo   () if not environment.initex then trace_flush("info")    info   .Type = nil pdfsetinfo   (info   ()) end end
+-------------- flushnames  () if not environment.initex then trace_flush("names")   names  .Type = nil pdfsetnames  (names  ()) end end
 
 function lpdf.addtocatalog(k,v) if not (lpdf.protectresources and catalog[k]) then trace_set("catalog",k) catalog[k] = v end end
 function lpdf.addtoinfo   (k,v) if not (lpdf.protectresources and info   [k]) then trace_set("info",   k) info   [k] = v end end
-function lpdf.addtonames  (k,v) if not (lpdf.protectresources and names  [k]) then trace_set("names",  k) names  [k] = v end end
+-------- lpdf.addtonames  (k,v) if not (lpdf.protectresources and names  [k]) then trace_set("names",  k) names  [k] = v end end
+
+local names = pdfdictionary {
+    Type = pdfconstant("Names")
+}
+
+local function flushnames()
+    if next(names) and not environment.initex then
+        trace_flush("names")
+        lpdf.addtocatalog("Names",pdfreference(pdfimmediateobject(tostring(names))))
+    end
+end
+
+function lpdf.addtonames(k,v)
+    if not (lpdf.protectresources and names  [k]) then
+        trace_set("names",  k)
+        names  [k] = v
+    end
+end
 
 local dummy = pdfreserveobject() -- else bug in hvmd due so some internal luatex conflict
 
@@ -768,9 +851,9 @@ registerdocumentfinalizer(flushcolorspaces,3,"color spaces")
 registerdocumentfinalizer(flushpatterns,3,"patterns")
 registerdocumentfinalizer(flushshades,3,"shades")
 
+registerdocumentfinalizer(flushnames,3,"names") -- before catalog
 registerdocumentfinalizer(flushcatalog,3,"catalog")
 registerdocumentfinalizer(flushinfo,3,"info")
-registerdocumentfinalizer(flushnames,3,"names") -- before catalog
 
 registerpagefinalizer(checkextgstates,3,"extended graphic states")
 registerpagefinalizer(checkcolorspaces,3,"color spaces")
@@ -884,3 +967,30 @@ end
 --     end
 --
 -- end
+
+-- setmetatable(pdf, {
+--     __index = function(t,k)
+--         if     k == "info"           then return pdf.getinfo()
+--         elseif k == "catalog"        then return pdf.getcatalog()
+--         elseif k == "names"          then return pdf.getnames()
+--         elseif k == "trailer"        then return pdf.gettrailer()
+--         elseif k == "pageattribute"  then return pdf.getpageattribute()
+--         elseif k == "pageattributes" then return pdf.getpageattributes()
+--         elseif k == "pageresources"  then return pdf.getpageresources()
+--         elseif
+--             return nil
+--         end
+--     end,
+--     __newindex = function(t,k,v)
+--         if     k == "info"           then return pdf.setinfo(v)
+--         elseif k == "catalog"        then return pdf.setcatalog(v)
+--         elseif k == "names"          then return pdf.setnames(v)
+--         elseif k == "trailer"        then return pdf.settrailer(v)
+--         elseif k == "pageattribute"  then return pdf.setpageattribute(v)
+--         elseif k == "pageattributes" then return pdf.setpageattributes(v)
+--         elseif k == "pageresources"  then return pdf.setpageresources(v)
+--         else
+--             rawset(t,k,v)
+--         end
+--     end,
+-- })
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index cfc733f8d..381c98753 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 179e1f9ec..8515b3fd2 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-ref.lua b/tex/context/base/strc-ref.lua
index 4a7404e96..a989321c4 100644
--- a/tex/context/base/strc-ref.lua
+++ b/tex/context/base/strc-ref.lua
@@ -296,13 +296,7 @@ local function setnextinternal(kind,name)
     return n
 end
 
-references.setnextorder    = setnextorder
-references.setnextinternal = setnextinternal
-
-commands.setnextreferenceorder    = setnextorder
-commands.setnextinternalreference = setnextinternal
-
-function references.currentorder(kind,name)
+local function currentorder(kind,name)
     return orders[kind] and orders[kind][name] or lastorder
 end
 
@@ -322,12 +316,18 @@ local function setcomponent(data)
     -- but for the moment we do it here (experiment)
 end
 
+references.setnextorder    = setnextorder
+references.setnextinternal = setnextinternal
+references.currentorder    = currentorder
+references.setcomponent    = setcomponent
+
+commands.setnextreferenceorder    = setnextorder
+commands.setnextinternalreference = setnextinternal
+
 function commands.currentreferenceorder(kind,name)
-    context(references.currentorder(kind,name))
+    context(currentorder(kind,name))
 end
 
-references.setcomponent = setcomponent
-
 function references.set(kind,prefix,tag,data)
 --  setcomponent(data)
     local pd = tobesaved[prefix] -- nicer is a metatable
@@ -366,6 +366,8 @@ commands.enhancereference = references.enhance
 
 -- -- -- related to strc-ini.lua -- -- --
 
+-- no metatable here .. better be sparse
+
 local function register_from_lists(collected,derived,pages,sections)
     local derived_g = derived[""] -- global
     if not derived_g then
@@ -423,26 +425,26 @@ local function register_from_lists(collected,derived,pages,sections)
             end
         end
     end
---     inspect(derived)
+ -- inspect(derived)
 end
 
 references.registerinitializer(function() register_from_lists(lists.collected,derived) end)
 
 -- urls
 
-references.urls      = references.urls      or { }
-references.urls.data = references.urls.data or { }
+local urls      = references.urls or { }
+references.urls = urls
+local urldata   = urls.data or { }
+urls.data       = urldata
 
-local urls = references.urls.data
-
-function references.urls.define(name,url,file,description)
+function urls.define(name,url,file,description)
     if name and name ~= "" then
-        urls[name] = { url or "", file or "", description or url or file or ""}
+        urldata[name] = { url or "", file or "", description or url or file or ""}
     end
 end
 
-function references.urls.get(name)
-    local u = urls[name]
+function urls.get(name)
+    local u = urldata[name]
     if u then
         local url, file = u[1], u[2]
         if file and file ~= "" then
@@ -454,7 +456,7 @@ function references.urls.get(name)
 end
 
 function commands.geturl(name)
-    local url = references.urls.get(name)
+    local url = urls.get(name)
     if url and url ~= "" then
         ctx_pushcatcodes(txtcatcodes)
         context(url)
@@ -463,49 +465,49 @@ function commands.geturl(name)
 end
 
 -- function commands.gethyphenatedurl(name,...)
---     local url = references.urls.get(name)
+--     local url = urls.get(name)
 --     if url and url ~= "" then
 --         hyphenatedurl(url,...)
 --     end
 -- end
 
 function commands.doifurldefinedelse(name)
-    commands.doifelse(urls[name])
+    commands.doifelse(urldata[name])
 end
 
-commands.useurl= references.urls.define
+commands.useurl= urls.define
 
 -- files
 
-references.files      = references.files      or { }
-references.files.data = references.files.data or { }
-
-local files = references.files.data
+local files      = references.files or { }
+references.files = files
+local filedata   = files.data or { }
+files.data       = filedata
 
-function references.files.define(name,file,description)
+function files.define(name,file,description)
     if name and name ~= "" then
-        files[name] = { file or "", description or file or "" }
+        filedata[name] = { file or "", description or file or "" }
     end
 end
 
-function references.files.get(name,method,space) -- method: none, before, after, both, space: yes/no
-    local f = files[name]
+function files.get(name,method,space) -- method: none, before, after, both, space: yes/no
+    local f = filedata[name]
     if f then
         context(f[1])
     end
 end
 
 function commands.doiffiledefinedelse(name)
-    commands.doifelse(files[name])
+    commands.doifelse(filedata[name])
 end
 
-commands.usefile= references.files.define
+commands.usefile= files.define
 
 -- helpers
 
 function references.checkedfile(whatever) -- return whatever if not resolved
     if whatever then
-        local w = files[whatever]
+        local w = filedata[whatever]
         if w then
             return w[1]
         else
@@ -516,7 +518,7 @@ end
 
 function references.checkedurl(whatever) -- return whatever if not resolved
     if whatever then
-        local w = urls[whatever]
+        local w = urldata[whatever]
         if w then
             local u, f = w[1], w[2]
             if f and f ~= "" then
@@ -532,11 +534,11 @@ end
 
 function references.checkedfileorurl(whatever,default) -- return nil, nil if not resolved
     if whatever then
-        local w = files[whatever]
+        local w = filedata[whatever]
         if w then
             return w[1], nil
         else
-            local w = urls[whatever]
+            local w = urldata[whatever]
             if w then
                 local u, f = w[1], w[2]
                 if f and f ~= "" then
@@ -552,25 +554,25 @@ end
 
 -- programs
 
-references.programs      = references.programs      or { }
-references.programs.data = references.programs.data or { }
+local programs      = references.programs or { }
+references.programs = programs
+local programdata   = programs.data or { }
+programs.data       = programdata
 
-local programs = references.programs.data
-
-function references.programs.define(name,file,description)
+function programs.define(name,file,description)
     if name and name ~= "" then
-        programs[name] = { file or "", description or file or ""}
+        programdata[name] = { file or "", description or file or ""}
     end
 end
 
-function references.programs.get(name)
-    local f = programs[name]
+function programs.get(name)
+    local f = programdata[name]
     return f and f[1]
 end
 
 function references.checkedprogram(whatever) -- return whatever if not resolved
     if whatever then
-        local w = programs[whatever]
+        local w = programdata[whatever]
         if w then
             return w[1]
         else
@@ -579,10 +581,10 @@ function references.checkedprogram(whatever) -- return whatever if not resolved
     end
 end
 
-commands.defineprogram = references.programs.define
+commands.defineprogram = programs.define
 
 function commands.getprogram(name)
-    local f = programs[name]
+    local f = programdata[name]
     if f then
         context(f[1])
     end
@@ -591,11 +593,11 @@ end
 -- shared by urls and files
 
 function references.whatfrom(name)
-    context((urls[name] and v_url) or (files[name] and v_file) or v_unknown)
+    context((urldata[name] and v_url) or (filedata[name] and v_file) or v_unknown)
 end
 
 function references.from(name)
-    local u = urls[name]
+    local u = urldata[name]
     if u then
         local url, file, description = u[1], u[2], u[3]
         if description ~= "" then
@@ -607,7 +609,7 @@ function references.from(name)
             return url
         end
     else
-        local f = files[name]
+        local f = filedata[name]
         if f then
             local file, description = f[1], f[2]
             if description ~= "" then
@@ -620,7 +622,7 @@ function references.from(name)
 end
 
 function commands.from(name)
-    local u = urls[name]
+    local u = urldata[name]
     if u then
         local url, file, description = u[1], u[2], u[3]
         if description ~= "" then
@@ -632,7 +634,7 @@ function commands.from(name)
             ctx_dofromurlliteral(url)
         end
     else
-        local f = files[name]
+        local f = filedata[name]
         if f then
             local file, description = f[1], f[2]
             if description ~= "" then
@@ -646,7 +648,7 @@ end
 
 function references.define(prefix,reference,list)
     local d = defined[prefix] if not d then d = { } defined[prefix] = d end
-    d[reference] = { "defined", list }
+    d[reference] = list
 end
 
 function references.reset(prefix,reference)
@@ -667,7 +669,77 @@ commands.resetreference  = references.reset
 
 -- to what extend do we check the non prefixed variant
 
-local strict = false
+-- local strict = false
+--
+-- local function resolve(prefix,reference,args,set) -- we start with prefix,reference
+--     if reference and reference ~= "" then
+--         if not set then
+--             set = { prefix = prefix, reference = reference }
+--         else
+--             if not set.reference then set.reference = reference end
+--             if not set.prefix    then set.prefix    = prefix    end
+--         end
+--         local r = settings_to_array(reference)
+--         for i=1,#r do
+--             local ri = r[i]
+--             local d
+--             if strict then
+--                 d = defined[prefix] or defined[""]
+--                 d = d and d[ri]
+--             else
+--                 d = defined[prefix]
+--                 d = d and d[ri]
+--                 if not d then
+--                     d = defined[""]
+--                     d = d and d[ri]
+--                 end
+--             end
+--             if d then
+--                 resolve(prefix,d,nil,set)
+--             else
+--                 local var = splitreference(ri)
+--                 if var then
+--                     var.reference = ri
+--                     local vo, vi = var.outer, var.inner
+--                     if not vo and vi then
+--                         -- to be checked
+--                         if strict then
+--                             d = defined[prefix] or defined[""]
+--                             d = d and d[vi]
+--                         else
+--                             d = defined[prefix]
+--                             d = d and d[vi]
+--                             if not d then
+--                                 d = defined[""]
+--                                 d = d and d[vi]
+--                             end
+--                         end
+--                         --
+--                         if d then
+--                             resolve(prefix,d,var.arguments,set) -- args can be nil
+--                         else
+--                             if args then var.arguments = args end
+--                             set[#set+1] = var
+--                         end
+--                     else
+--                         if args then var.arguments = args end
+--                         set[#set+1] = var
+--                     end
+--                     if var.has_tex then
+--                         set.has_tex = true
+--                     end
+--                 else
+--                 --  report_references("funny pattern %a",ri)
+--                 end
+--             end
+--         end
+--         return set
+--     else
+--         return { }
+--     end
+-- end
+
+setmetatableindex(defined,"table")
 
 local function resolve(prefix,reference,args,set) -- we start with prefix,reference
     if reference and reference ~= "" then
@@ -680,20 +752,9 @@ local function resolve(prefix,reference,args,set) -- we start with prefix,refere
         local r = settings_to_array(reference)
         for i=1,#r do
             local ri = r[i]
-            local d
-            if strict then
-                d = defined[prefix] or defined[""]
-                d = d and d[ri]
-            else
-                d = defined[prefix]
-                d = d and d[ri]
-                if not d then
-                    d = defined[""]
-                    d = d and d[ri]
-                end
-            end
+            local d = defined[prefix][ri] or defined[""][ri]
             if d then
-                resolve(prefix,d[2],nil,set)
+                resolve(prefix,d,nil,set)
             else
                 local var = splitreference(ri)
                 if var then
@@ -701,20 +762,10 @@ local function resolve(prefix,reference,args,set) -- we start with prefix,refere
                     local vo, vi = var.outer, var.inner
                     if not vo and vi then
                         -- to be checked
-                        if strict then
-                            d = defined[prefix] or defined[""]
-                            d = d and d[vi]
-                        else
-                            d = defined[prefix]
-                            d = d and d[vi]
-                            if not d then
-                                d = defined[""]
-                                d = d and d[vi]
-                            end
-                        end
+                        d = defined[prefix][vi] or defined[""][vi]
                         --
                         if d then
-                            resolve(prefix,d[2],var.arguments,set) -- args can be nil
+                            resolve(prefix,d,var.arguments,set) -- args can be nil
                         else
                             if args then var.arguments = args end
                             set[#set+1] = var
@@ -843,7 +894,7 @@ end
 local externalfiles = { }
 
 setmetatableindex(externalfiles, function(t,k)
-    local v = files[k]
+    local v = filedata[k]
     if not v then
         v = { k, k }
     end
@@ -1032,7 +1083,7 @@ references.registerinitializer(function(tobesaved,collected)
     productdata.components = componentlist(job.structure.collected) or { }
 end)
 
-function structures.references.loadpresets(product,component) -- we can consider a special components hash
+function references.loadpresets(product,component) -- we can consider a special components hash
     if product and component and product~= "" and component ~= "" and not productdata.product then -- maybe: productdata.filename ~= filename
         productdata.product = product
         productdata.component = component
@@ -1052,7 +1103,7 @@ function structures.references.loadpresets(product,component) -- we can consider
     end
 end
 
-structures.references.productdata = productdata
+references.productdata = productdata
 
 local useproduct = commands.useproduct
 
@@ -1066,7 +1117,7 @@ if useproduct then
                 if trace_referencing or trace_importing then
                     report_references("loading presets for component %a of product %a",component,product)
                 end
-                structures.references.loadpresets(product,component)
+                references.loadpresets(product,component)
             end
         end
     end
diff --git a/tex/context/base/trac-deb.lua b/tex/context/base/trac-deb.lua
index cd8f803d4..edf32c3b9 100644
--- a/tex/context/base/trac-deb.lua
+++ b/tex/context/base/trac-deb.lua
@@ -147,13 +147,35 @@ function tracers.showlines(filename,linenumber,offset,luaerrorline)
     end
 end
 
-function tracers.printerror(offset)
+-- this will work ok in >=0.79
+
+local function processerror(offset)
     local inputstack   = resolvers.inputstack
     local filename     = inputstack[#inputstack] or status.filename
     local linenumber   = tonumber(status.linenumber) or 0
     local lasttexerror = status.lasterrorstring or "?"
     local lastluaerror = status.lastluaerrorstring or lasttexerror
-    local luaerrorline = match(lastluaerror,[[%[.-lua%].-:.-(%d+)]]) -- this will work ok in >=0.79
+    local luaerrorline = match(lastluaerror,[[%[.-lua%].-:.-(%d+)]]) or (lastluaerror and find(lastluaerror,"?:0:",1,true) and 0)
+    local report       = luaerrorline and report_lua or report_tex
+    tracers.printerror {
+        filename     = filename,
+        linenumber   = linenumber,
+        lasttexerror = lasttexerror,
+        lastluaerror = lastluaerror,
+        luaerrorline = luaerrorline,
+        offset       = tonumber(offset) or 10,
+    }
+end
+
+-- so one can overload the printer if (really) needed
+
+function tracers.printerror(specification)
+    local filename     = specification.filename
+    local linenumber   = specification.linenumber
+    local lasttexerror = specification.lasttexerror
+    local lastluaerror = specification.lastluaerror
+    local luaerrorline = specification.luaerrorline
+    local offset       = specification.offset
     local report       = luaerrorline and report_lua or report_tex
     if not filename then
         report("error not related to input file: %s ...",lasttexerror)
@@ -182,7 +204,7 @@ directives.register("system.errorcontext", function(v)
     local register = callback.register
     if v then
         register('show_error_message',  nop)
-        register('show_error_hook',     function() tracers.printerror(v) end)
+        register('show_error_hook',     function() processerror(v) end)
         register('show_lua_error_hook', nop)
     else
         register('show_error_message',  nil)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index fb0710b1c..ca538dfc8 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  : 03/24/14 00:52:15
+-- merge date  : 03/25/14 02:17:04
 
 do -- begin closure to overcome local limits and interference
 
@@ -11499,17 +11499,20 @@ local autofeatures=fonts.analyzers.features
 local function initialize(sequence,script,language,enabled)
   local features=sequence.features
   if features then
-    local order=features.order
-    for i=1,#order do
-      local kind=order[i] 
-      local valid=enabled[kind]
-      if valid then
-        local scripts=features[kind] 
-        local languages=scripts[script] or scripts[wildcard]
-        if languages and (languages[language] or languages[wildcard]) then
-          return { valid,autofeatures[kind] or false,sequence.chain or 0,kind,sequence }
+    local order=sequence.order
+    if order then
+      for i=1,#order do
+        local kind=order[i] 
+        local valid=enabled[kind]
+        if valid then
+          local scripts=features[kind] 
+          local languages=scripts[script] or scripts[wildcard]
+          if languages and (languages[language] or languages[wildcard]) then
+            return { valid,autofeatures[kind] or false,sequence.chain or 0,kind,sequence }
+          end
         end
       end
+    else
     end
   end
   return false
diff --git a/tex/generic/context/luatex/luatex-fonts-otn.lua b/tex/generic/context/luatex/luatex-fonts-otn.lua
index 9d3253f2c..068f0a9b9 100644
--- a/tex/generic/context/luatex/luatex-fonts-otn.lua
+++ b/tex/generic/context/luatex/luatex-fonts-otn.lua
@@ -2038,17 +2038,21 @@ local autofeatures = fonts.analyzers.features -- was: constants
 local function initialize(sequence,script,language,enabled)
     local features = sequence.features
     if features then
-        local order = features.order
-        for i=1,#order do
-            local kind = order[i] --
-            local valid = enabled[kind]
-            if valid then
-                local scripts = features[kind] --
-                local languages = scripts[script] or scripts[wildcard]
-                if languages and (languages[language] or languages[wildcard]) then
-                    return { valid, autofeatures[kind] or false, sequence.chain or 0, kind, sequence }
+        local order = sequence.order
+        if order then
+            for i=1,#order do
+                local kind = order[i] --
+                local valid = enabled[kind]
+                if valid then
+                    local scripts = features[kind] --
+                    local languages = scripts[script] or scripts[wildcard]
+                    if languages and (languages[language] or languages[wildcard]) then
+                        return { valid, autofeatures[kind] or false, sequence.chain or 0, kind, sequence }
+                    end
                 end
             end
+        else
+            -- can't happen
         end
     end
     return false