beta 2014.03.27 20:04

20 files changed, 221 insertions, 72 deletions

diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 544afc7ee..e8bd37bf0 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -8888,7 +8888,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["luat-env"] = package.loaded["luat-env"] or true
 
--- original size: 5930, stripped down to: 4235
+-- original size: 6174, stripped down to: 4141
 
  if not modules then modules={} end modules ['luat-env']={
   version=1.001,
@@ -8966,15 +8966,13 @@ function environment.luafilechunk(filename,silent)
   filename=file.replacesuffix(filename,"lua")
   local fullname=environment.luafile(filename)
   if fullname and fullname~="" then
-    local data=luautilities.loadedluacode(fullname,strippable,filename) 
-    if trace_locating then
+    local data=luautilities.loadedluacode(fullname,strippable,filename)
+    if not silent then
       report_lua("loading file %a %s",fullname,not data and "failed" or "succeeded")
-    elseif not silent then
-      texio.write("<",data and "+ " or "- ",fullname,">")
     end
     return data
   else
-    if trace_locating then
+    if not silent then
       report_lua("unknown file %a",filename)
     end
     return nil
@@ -16876,8 +16874,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 694087
--- stripped bytes    : 245999
+-- original bytes    : 694331
+-- stripped bytes    : 246337
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 544afc7ee..e8bd37bf0 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -8888,7 +8888,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["luat-env"] = package.loaded["luat-env"] or true
 
--- original size: 5930, stripped down to: 4235
+-- original size: 6174, stripped down to: 4141
 
  if not modules then modules={} end modules ['luat-env']={
   version=1.001,
@@ -8966,15 +8966,13 @@ function environment.luafilechunk(filename,silent)
   filename=file.replacesuffix(filename,"lua")
   local fullname=environment.luafile(filename)
   if fullname and fullname~="" then
-    local data=luautilities.loadedluacode(fullname,strippable,filename) 
-    if trace_locating then
+    local data=luautilities.loadedluacode(fullname,strippable,filename)
+    if not silent then
       report_lua("loading file %a %s",fullname,not data and "failed" or "succeeded")
-    elseif not silent then
-      texio.write("<",data and "+ " or "- ",fullname,">")
     end
     return data
   else
-    if trace_locating then
+    if not silent then
       report_lua("unknown file %a",filename)
     end
     return nil
@@ -16876,8 +16874,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 694087
--- stripped bytes    : 245999
+-- original bytes    : 694331
+-- stripped bytes    : 246337
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 544afc7ee..e8bd37bf0 100755
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -8888,7 +8888,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["luat-env"] = package.loaded["luat-env"] or true
 
--- original size: 5930, stripped down to: 4235
+-- original size: 6174, stripped down to: 4141
 
  if not modules then modules={} end modules ['luat-env']={
   version=1.001,
@@ -8966,15 +8966,13 @@ function environment.luafilechunk(filename,silent)
   filename=file.replacesuffix(filename,"lua")
   local fullname=environment.luafile(filename)
   if fullname and fullname~="" then
-    local data=luautilities.loadedluacode(fullname,strippable,filename) 
-    if trace_locating then
+    local data=luautilities.loadedluacode(fullname,strippable,filename)
+    if not silent then
       report_lua("loading file %a %s",fullname,not data and "failed" or "succeeded")
-    elseif not silent then
-      texio.write("<",data and "+ " or "- ",fullname,">")
     end
     return data
   else
-    if trace_locating then
+    if not silent then
       report_lua("unknown file %a",filename)
     end
     return nil
@@ -16876,8 +16874,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 694087
--- stripped bytes    : 245999
+-- original bytes    : 694331
+-- stripped bytes    : 246337
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index 544afc7ee..e8bd37bf0 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -8888,7 +8888,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["luat-env"] = package.loaded["luat-env"] or true
 
--- original size: 5930, stripped down to: 4235
+-- original size: 6174, stripped down to: 4141
 
  if not modules then modules={} end modules ['luat-env']={
   version=1.001,
@@ -8966,15 +8966,13 @@ function environment.luafilechunk(filename,silent)
   filename=file.replacesuffix(filename,"lua")
   local fullname=environment.luafile(filename)
   if fullname and fullname~="" then
-    local data=luautilities.loadedluacode(fullname,strippable,filename) 
-    if trace_locating then
+    local data=luautilities.loadedluacode(fullname,strippable,filename)
+    if not silent then
       report_lua("loading file %a %s",fullname,not data and "failed" or "succeeded")
-    elseif not silent then
-      texio.write("<",data and "+ " or "- ",fullname,">")
     end
     return data
   else
-    if trace_locating then
+    if not silent then
       report_lua("unknown file %a",filename)
     end
     return nil
@@ -16876,8 +16874,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 694087
--- stripped bytes    : 245999
+-- original bytes    : 694331
+-- stripped bytes    : 246337
 
 -- end library merge
 
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index b9810afe1..2b7b745a6 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.25 16:58}
+\newcontextversion{2014.03.27 20:04}
 
 %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 0adefaf85..0ad517b2b 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 652fd2693..44470388a 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.25 16:58}
+\edef\contextversion{2014.03.27 20:04}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/lpdf-ano.lua b/tex/context/base/lpdf-ano.lua
index 8c53eca8c..395b0e457 100644
--- a/tex/context/base/lpdf-ano.lua
+++ b/tex/context/base/lpdf-ano.lua
@@ -436,7 +436,7 @@ end
 
 -- we could share dictionaries ... todo
 
-local function somedestination(destination,internal,page)
+local function somedestination(destination,internal,page) -- no view anyway
     if references.innermethod ~= v_page then
         if type(destination) == "number" then
             if not internal then
@@ -445,6 +445,7 @@ local function somedestination(destination,internal,page)
             destination = nil
         end
         if internal then
+            flaginternals[internal] = true -- for bookmarks and so
             local used = usedinternals[internal]
             if used == defaultview or used == true then
                 return pagereferences[page]
@@ -456,7 +457,9 @@ local function somedestination(destination,internal,page)
                 S = pdf_goto,
                 D = destination,
             }
-        elseif destination then
+        end
+        if destination then
+            -- hopefully this one is flushed
             return pdfdictionary {
                 S = pdf_goto,
                 D = destination,
@@ -1048,8 +1051,9 @@ local function build(levels,start,parent,method)
                 Title  = pdfunicode(title),
                 Parent = parent,
                 Prev   = prev and pdfreference(prev),
+                A      = somedestination(reference.internal,reference.internal,reference.realpage),
             }
-            entry.Dest = somedestination(reference.internal,reference.internal,reference.realpage)
+         -- entry.Dest = somedestination(reference.internal,reference.internal,reference.realpage)
             if not first then first, last = child, child end
             prev = child
             last = prev
diff --git a/tex/context/base/lpdf-u3d.lua b/tex/context/base/lpdf-u3d.lua
index f1df1d18e..f0fca0762 100644
--- a/tex/context/base/lpdf-u3d.lua
+++ b/tex/context/base/lpdf-u3d.lua
@@ -17,6 +17,7 @@ if not modules then modules = { } end modules ['lpdf-u3d'] = {
 -- point we will end up with a reimplementation. For instance
 -- it makes sense to add the same activation code as with swf.
 
+local tonumber = tonumber
 local format, find = string.format, string.find
 local cos, sin, sqrt, pi, atan2, abs = math.cos, math.sin, math.sqrt, math.pi, math.atan2, math.abs
 
diff --git a/tex/context/base/lpdf-xmp.lua b/tex/context/base/lpdf-xmp.lua
index 061ed0757..c8b2d236c 100644
--- a/tex/context/base/lpdf-xmp.lua
+++ b/tex/context/base/lpdf-xmp.lua
@@ -7,6 +7,7 @@ if not modules then modules = { } end modules ['lpdf-xmp'] = {
     comment   = "with help from Peter Rolf",
 }
 
+local tostring = tostring
 local format, random, char, gsub, concat = string.format, math.random, string.char, string.gsub, table.concat
 local xmlfillin = xml.fillin
 
@@ -119,16 +120,16 @@ end
 
 -- redefined
 
-local addtoinfo  = lpdf.addtoinfo
-local addxmpinfo = lpdf.addxmpinfo
+local pdfaddtoinfo  = lpdf.addtoinfo
+local pdfaddxmpinfo = lpdf.addxmpinfo
 
 function lpdf.addtoinfo(tag,pdfvalue,strvalue)
-    addtoinfo(tag,pdfvalue)
+    pdfaddtoinfo(tag,pdfvalue)
     local value = strvalue or gsub(tostring(pdfvalue),"^%((.*)%)$","%1") -- hack
     if trace_info then
         report_info("set %a to %a",tag,value)
     end
-    addxmpinfo(tag,value)
+    pdfaddxmpinfo(tag,value)
 end
 
 -- for the do-it-yourselvers
@@ -159,20 +160,20 @@ local function flushxmpinfo()
     local fullbanner = tex.pdftexbanner
  -- local fullbanner = gsub(tex.pdftexbanner,"kpse.*","")
 
-    addxmpinfo("DocumentID",      documentid)
-    addxmpinfo("InstanceID",      instanceid)
-    addxmpinfo("Producer",        producer)
-    addxmpinfo("CreatorTool",     creator)
-    addxmpinfo("CreateDate",      time)
-    addxmpinfo("ModifyDate",      time)
-    addxmpinfo("MetadataDate",    time)
-    addxmpinfo("PTEX.Fullbanner", fullbanner)
-
-    addtoinfo("Producer",         producer)
-    addtoinfo("Creator",          creator)
-    addtoinfo("CreationDate",     time)
-    addtoinfo("ModDate",          time)
---  addtoinfo("PTEX.Fullbanner",  fullbanner) -- no checking done on existence
+    pdfaddxmpinfo("DocumentID",      documentid)
+    pdfaddxmpinfo("InstanceID",      instanceid)
+    pdfaddxmpinfo("Producer",        producer)
+    pdfaddxmpinfo("CreatorTool",     creator)
+    pdfaddxmpinfo("CreateDate",      time)
+    pdfaddxmpinfo("ModifyDate",      time)
+    pdfaddxmpinfo("MetadataDate",    time)
+    pdfaddxmpinfo("PTEX.Fullbanner", fullbanner)
+
+    pdfaddtoinfo("Producer",         producer)
+    pdfaddtoinfo("Creator",          creator)
+    pdfaddtoinfo("CreationDate",     time)
+    pdfaddtoinfo("ModDate",          time)
+--  pdfaddtoinfo("PTEX.Fullbanner",  fullbanner) -- no checking done on existence
 
     local blob = xml.tostring(xml.first(xmp or valid_xmp(),"/x:xmpmeta"))
     local md = pdfdictionary {
diff --git a/tex/context/base/luat-env.lua b/tex/context/base/luat-env.lua
index 5558e0303..5f2a0d281 100644
--- a/tex/context/base/luat-env.lua
+++ b/tex/context/base/luat-env.lua
@@ -102,14 +102,20 @@ function environment.luafilechunk(filename,silent) -- used for loading lua bytec
     local fullname = environment.luafile(filename)
     if fullname and fullname ~= "" then
         local data = luautilities.loadedluacode(fullname,strippable,filename) -- can be overloaded
-        if trace_locating then
+--         if trace_locating then
+--             report_lua("loading file %a %s",fullname,not data and "failed" or "succeeded")
+--         elseif not silent then
+--             texio.write("<",data and "+ " or "- ",fullname,">")
+--         end
+        if not silent then
             report_lua("loading file %a %s",fullname,not data and "failed" or "succeeded")
-        elseif not silent then
-            texio.write("<",data and "+ " or "- ",fullname,">")
         end
         return data
     else
-        if trace_locating then
+--         if trace_locating then
+--             report_lua("unknown file %a",filename)
+--         end
+        if not silent then
             report_lua("unknown file %a",filename)
         end
         return nil
diff --git a/tex/context/base/node-nut.lua b/tex/context/base/node-nut.lua
index a2f4c93ff..2b4e9968c 100644
--- a/tex/context/base/node-nut.lua
+++ b/tex/context/base/node-nut.lua
@@ -129,7 +129,7 @@ nuts.getfield             = direct.getfield
 nuts.getnext              = direct.getnext
 nuts.getprev              = direct.getprev
 nuts.getid                = direct.getid
-nuts.getattr              = direct.getfield
+nuts.getattr              = direct.has_attribute or direct.getfield
 nuts.getchar              = direct.getchar
 nuts.getfont              = direct.getfont
 nuts.getsubtype           = direct.getsubtype
@@ -141,7 +141,7 @@ nuts.getleader            = direct.getleader
 -- setters
 
 nuts.setfield             = direct.setfield
-nuts.setattr              = direct.setfield
+nuts.setattr              = direct.set_attribute or setfield
 
 nuts.getbox               = direct.getbox
 nuts.setbox               = direct.setbox
diff --git a/tex/context/base/node-res.lua b/tex/context/base/node-res.lua
index 0d45d1bd6..debb261e9 100644
--- a/tex/context/base/node-res.lua
+++ b/tex/context/base/node-res.lua
@@ -69,6 +69,7 @@ local getbox    = nuts.getbox
 local getfield  = nuts.getfield
 local setfield  = nuts.setfield
 local getid     = nuts.getid
+local getlist   = nuts.getlist
 
 local copy_nut  = nuts.copy
 local new_nut   = nuts.new
@@ -513,6 +514,7 @@ local function cleanup(nofboxes) -- todo
         for i=0,nofboxes do
             local l = getbox(i)
             if l then
+-- print(nodes.listtoutf(getlist(l)))
                 free_nut(l) -- also list ?
                 nl = nl + 1
             end
diff --git a/tex/context/base/s-inf-03.mkiv b/tex/context/base/s-inf-03.mkiv
index b6dada55a..48449d690 100644
--- a/tex/context/base/s-inf-03.mkiv
+++ b/tex/context/base/s-inf-03.mkiv
@@ -343,6 +343,10 @@ show("global","",sameglobal.global,false,_G,builtin,"darkgreen",globals,"darkblu
 
 for k, v in table.sortedpairs(_G) do
     if not skipglobal[k] and not obsolete[k] and type(v) == "table" and not marked(v) then
+
+ --     local mt = getmetatable(v)
+ --     print("!!!!!!!!!!",k,v,mt,mt and mt.__index)
+
         if     basiclua[k] then show(k,"basic lua",sameglobal[k],basiclua[k],v,builtin[k],"darkred",   false,false,true)
         elseif extralua[k] then show(k,"extra lua",sameglobal[k],extralua[k],v,builtin[k],"darkred",   false,false,true)
         elseif basictex[k] then show(k,"basic tex",sameglobal[k],basictex[k],v,builtin[k],"darkred",   false,false,true)
diff --git a/tex/context/base/spac-ver.lua b/tex/context/base/spac-ver.lua
index 21695a396..87f645cd1 100644
--- a/tex/context/base/spac-ver.lua
+++ b/tex/context/base/spac-ver.lua
@@ -535,14 +535,15 @@ local categories = allocate {
      [5] = 'disable',
      [6] = 'nowhite',
      [7] = 'goback',
-     [8] = 'together'
+     [8] = 'together', -- not used (?)
+     [9] = 'overlay',
 }
 
 vspacing.categories = categories
 
 function vspacing.tocategories(str)
     local t = { }
-    for s in gmatch(str,"[^, ]") do
+    for s in gmatch(str,"[^, ]") do -- use lpeg instead
         local n = tonumber(s)
         if n then
             t[categories[n]] = true
@@ -553,7 +554,7 @@ function vspacing.tocategories(str)
     return t
 end
 
-function vspacing.tocategory(str)
+function vspacing.tocategory(str) -- can be optimized
     if type(str) == "string" then
         return set.tonumber(vspacing.tocategories(str))
     else
@@ -854,7 +855,16 @@ end
 
 -- penalty only works well when before skip
 
-local discard, largest, force, penalty, add, disable, nowhite, goback, together = 0, 1, 2, 3, 4, 5, 6, 7, 8 -- move into function when upvalue 60 issue
+local discard  = 0
+local largest  = 1
+local force    = 2
+local penalty  = 3
+local add      = 4
+local disable  = 5
+local nowhite  = 6
+local goback   = 7
+local together = 8 -- not used (?)
+local overlay  = 9
 
 -- [whatsits][hlist][glue][glue][penalty]
 
@@ -886,6 +896,106 @@ local function specialpenalty(start,penalty)
     end
 end
 
+local function check_experimental_overlay(head,current) -- todo
+    local p = nil
+    local c = current
+    local n = nil
+
+    local function overlay(p, n, s, mvl)
+        local c = getprev(n)
+        while c and c ~= p do
+            local p = getprev(c)
+            free_node(c)
+            c = p
+        end
+        setfield(n,"prev",nil)
+        if not mvl then
+            setfield(p,"next",n)
+        end
+        local p_ht = getfield(p,"height")
+        local p_dp = getfield(p,"depth")
+        local n_ht = getfield(n,"height")
+        local delta = n_ht + s + p_dp
+        local k = new_kern(-delta)
+        if trace_vspacing then
+            report_vspacing("overlaying, prev height: %p, prev depth: %p, next height: %p, skips: %p, move up: %p",p_ht,p_dp,n_ht,s,delta)
+        end
+        if n_ht > p_ht then
+            -- we should adapt pagetotal ! (need a hook for that)
+            setfield(p,"height",n_ht)
+        end
+        return k
+    end
+
+    while c do
+        local id = getid(c)
+        if id == glue_code or id == penalty_code or id == kern_code then
+            -- skip (actually, remove)
+            c = getnext(c)
+        elseif id == hlist_code then
+            n = c
+            break
+        else
+            break
+        end
+    end
+    if n then
+        -- we have a next line
+        c = current
+        while c do
+            local id = getid(c)
+            if id == glue_code or id == penalty_code then
+                c = getprev(c)
+            elseif id == hlist_code then
+                p = c
+                break
+            else
+                break
+            end
+        end
+        if not p then
+            if a_snapmethod == a_snapvbox then
+                -- quit, we're not on the mvl
+            else
+                -- messy
+                local c = tonut(texlists.page_head)
+                local s = 0
+                while c do
+                    local id = getid(c)
+                    if id == glue_code then
+                        if p then
+                            s = s + getfield(getfield(c,"glue_spec"),"width")
+                        end
+                    elseif id == kern_code then
+                        if p then
+                            s = s + getfield(c,"kern")
+                        end
+                    elseif id == penalty_code then
+                        -- skip (actually, remove)
+                    elseif id == hlist_code then
+                        p = c
+                        s = 0
+                    else
+                        p = nil
+                        s = 0
+                    end
+                    c = getnext(c)
+                end
+                if p and p ~= n then
+                    local k = overlay(p,n,s,true)
+                    insert_node_before(n,n,k)
+                    return k, getnext(n)
+                end
+            end
+        elseif p ~= n then
+            local k = overlay(p,n,0,false   )
+            insert_node_after(p,p,k)
+            return head, getnext(n)
+        end
+    end
+    return remove_node(head, current, true)
+end
+
 local function collapser(head,where,what,trace,snap,a_snapmethod) -- maybe also pass tail
     if trace then
         reset_tracing(head)
@@ -1060,6 +1170,10 @@ local function collapser(head,where,what,trace,snap,a_snapmethod) -- maybe also
                 elseif sc == discard then
                     if trace then trace_skip("discard",sc,so,sp,current) end
                     head, current = remove_node(head, current, true)
+                elseif sc == overlay then
+                    -- todo (overlay following line over previous
+                    if trace then trace_skip("overlay",sc,so,sp,current) end
+                    head, current = check_experimental_overlay(head,current,a_snapmethod)
                 elseif ignore_following then
                     if trace then trace_skip("disabled",sc,so,sp,current) end
                     head, current = remove_node(head, current, true)
diff --git a/tex/context/base/spac-ver.mkiv b/tex/context/base/spac-ver.mkiv
index 1f8bf2c79..0133a6c40 100644
--- a/tex/context/base/spac-ver.mkiv
+++ b/tex/context/base/spac-ver.mkiv
@@ -1868,6 +1868,14 @@
      \fi\fi
    \relax}
 
+% \strut \hfill first line \blank[overlay] second line \hfill \strut
+%
+% \ruledvbox {
+%     \strut \hfill line 1 \blank[overlay]
+%     line 2 \hfill \strut \blank[overlay]
+%     \strut \hfill line 3 \hfill \strut
+% }
+
 \definevspacing[\v!preference][penalty:-500]  % goodbreak
 \definevspacing[\v!samepage]  [penalty:10000] % nobreak
 \definevspacing[\v!max]       [category:1]
@@ -1875,6 +1883,8 @@
 \definevspacing[\v!disable]   [category:5]
 \definevspacing[\v!nowhite]   [category:6]
 \definevspacing[\v!back]      [category:7]
+%               together      [category:8]
+\definevspacing[\v!overlay]   [category:9]
 \definevspacing[\v!always]    [category:0]
 \definevspacing[\v!weak]      [order:0]
 \definevspacing[\v!strong]    [order:100]
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 98b303c58..057c89a0c 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 ec7f5e27f..1cb31328c 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-itm.mkvi b/tex/context/base/strc-itm.mkvi
index 9e11f2047..098b863b9 100644
--- a/tex/context/base/strc-itm.mkvi
+++ b/tex/context/base/strc-itm.mkvi
@@ -1009,8 +1009,21 @@
      \strc_itemgroups_between_command
    \fi}
 
-\unexpanded\def\strc_itemgroups_start_item[#1]% we can reuse more
-  {\def\currentitemreference{#1}%
+% c_strc_itemgroups_concat:
+%
+% the problem is that we use leftskip so concat cannot reliable take the height into
+% account; it's .. rather tricky when white space in there anyway (due to \par) .. so
+% we rely on a special blank method
+%
+% \startitemize[n]
+%     \item bla
+%     \item \startitemize[a]
+%         \item bla $\displaystyle\int^{x^{y^4}}$ \item bla
+%     \stopitemize
+% \stopitemize
+
+\unexpanded\def\strc_itemgroups_start_item[#reference]% we can reuse more
+  {\def\currentitemreference{#reference}%
    \ifconditional\c_strc_itemgroups_text
      % begin of item
    \else
@@ -1026,10 +1039,12 @@
      \strc_itemgroups_start_item_next
    \fi
    \ifconditional\c_strc_itemgroups_concat
-   % \vskip-\dimexpr\lastskip+\lineheight\relax
-     \vskip-\lastskip   % we cannot use a \dimexpr here  because
-     \vskip-\lineheight % then we loose the stretch and shrink
-     \nobreak
+     % \vskip-\lastskip   % we cannot use a \dimexpr here  because
+     % \vskip-\lineheight % then we loose the stretch and shrink
+     % \nobreak
+     %
+     \blank[\v!overlay]% new per 2014-03-27
+     %
      \setfalse\c_strc_itemgroups_concat
    \fi
    \dostarttagged\t!item\empty
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index ecff0ccd7..7e3c261a0 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/25/14 16:58:35
+-- merge date  : 03/27/14 20:04:55
 
 do -- begin closure to overcome local limits and interference