beta 2014.07.11 12:20

4 files changed, 84 insertions, 36 deletions

diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 81d47d1f2..fb3fdf5a9 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -11321,7 +11321,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 25139, stripped down to: 17839
+-- original size: 25695, stripped down to: 18281
 
 if not modules then modules={} end modules ['lxml-aux']={
   version=1.001,
@@ -11331,6 +11331,7 @@ if not modules then modules={} end modules ['lxml-aux']={
   license="see context related readme files"
 }
 local trace_manipulations=false trackers.register("lxml.manipulations",function(v) trace_manipulations=v end)
+local trace_inclusions=false trackers.register("lxml.inclusions",function(v) trace_inclusions=v end)
 local report_xml=logs.reporter("xml")
 local xml=xml
 local xmlconvert,xmlcopy,xmlname=xml.convert,xml.copy,xml.name
@@ -11637,11 +11638,14 @@ xml.insertafter=insert_element
 xml.insertbefore=function(r,p,e) insert_element(r,p,e,true) end
 xml.injectafter=inject_element
 xml.injectbefore=function(r,p,e) inject_element(r,p,e,true) end
-local function include(xmldata,pattern,attribute,recursive,loaddata)
+local function include(xmldata,pattern,attribute,recursive,loaddata,level)
   pattern=pattern or 'include'
   loaddata=loaddata or io.loaddata
   local collected=xmlapplylpath(xmldata,pattern)
   if collected then
+    if not level then
+      level=1
+    end
     for c=1,#collected do
       local ek=collected[c]
       local name=nil
@@ -11655,11 +11659,19 @@ local function include(xmldata,pattern,attribute,recursive,loaddata)
       if not name then
         for a in gmatch(attribute or "href","([^|]+)") do
           name=ekat[a]
-          if name then break end
+          if name then
+            break
+          end
+        end
+      end
+      local data=nil
+      if name and name~="" then
+        data=loaddata(name) or ""
+        if trace_inclusions then
+          report_xml("including %s bytes from %a at level %s by pattern %a and attribute %a (%srecursing)",#data,name,level,pattern,attribute or "",recursive and "" or "not ")
         end
       end
-      local data=name and name~="" and loaddata(name) or ""
-      if data=="" then
+      if not data or data=="" then
         epdt[ek.ni]="" 
       elseif ekat["parse"]=="text" then
         epdt[ek.ni]=xml.escaped(data) 
@@ -11669,7 +11681,7 @@ local function include(xmldata,pattern,attribute,recursive,loaddata)
           epdt[ek.ni]="" 
         else
           if recursive then
-            include(xi,pattern,attribute,recursive,loaddata)
+            include(xi,pattern,attribute,recursive,loaddata,level+1)
           end
           local child=xml.body(xi) 
           child.__p__=ekrt
@@ -12036,7 +12048,7 @@ local function recurse(e,action)
     for i=1,#edt do
       local str=edt[i]
       if type(str)~="string" then
-        recurse(str,action,recursive)
+        recurse(str,action) 
       elseif str~="" then
         edt[i]=action(str)
       end
@@ -17259,8 +17271,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    : 710105
--- stripped bytes    : 252051
+-- original bytes    : 710661
+-- stripped bytes    : 252165
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 81d47d1f2..fb3fdf5a9 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -11321,7 +11321,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 25139, stripped down to: 17839
+-- original size: 25695, stripped down to: 18281
 
 if not modules then modules={} end modules ['lxml-aux']={
   version=1.001,
@@ -11331,6 +11331,7 @@ if not modules then modules={} end modules ['lxml-aux']={
   license="see context related readme files"
 }
 local trace_manipulations=false trackers.register("lxml.manipulations",function(v) trace_manipulations=v end)
+local trace_inclusions=false trackers.register("lxml.inclusions",function(v) trace_inclusions=v end)
 local report_xml=logs.reporter("xml")
 local xml=xml
 local xmlconvert,xmlcopy,xmlname=xml.convert,xml.copy,xml.name
@@ -11637,11 +11638,14 @@ xml.insertafter=insert_element
 xml.insertbefore=function(r,p,e) insert_element(r,p,e,true) end
 xml.injectafter=inject_element
 xml.injectbefore=function(r,p,e) inject_element(r,p,e,true) end
-local function include(xmldata,pattern,attribute,recursive,loaddata)
+local function include(xmldata,pattern,attribute,recursive,loaddata,level)
   pattern=pattern or 'include'
   loaddata=loaddata or io.loaddata
   local collected=xmlapplylpath(xmldata,pattern)
   if collected then
+    if not level then
+      level=1
+    end
     for c=1,#collected do
       local ek=collected[c]
       local name=nil
@@ -11655,11 +11659,19 @@ local function include(xmldata,pattern,attribute,recursive,loaddata)
       if not name then
         for a in gmatch(attribute or "href","([^|]+)") do
           name=ekat[a]
-          if name then break end
+          if name then
+            break
+          end
+        end
+      end
+      local data=nil
+      if name and name~="" then
+        data=loaddata(name) or ""
+        if trace_inclusions then
+          report_xml("including %s bytes from %a at level %s by pattern %a and attribute %a (%srecursing)",#data,name,level,pattern,attribute or "",recursive and "" or "not ")
         end
       end
-      local data=name and name~="" and loaddata(name) or ""
-      if data=="" then
+      if not data or data=="" then
         epdt[ek.ni]="" 
       elseif ekat["parse"]=="text" then
         epdt[ek.ni]=xml.escaped(data) 
@@ -11669,7 +11681,7 @@ local function include(xmldata,pattern,attribute,recursive,loaddata)
           epdt[ek.ni]="" 
         else
           if recursive then
-            include(xi,pattern,attribute,recursive,loaddata)
+            include(xi,pattern,attribute,recursive,loaddata,level+1)
           end
           local child=xml.body(xi) 
           child.__p__=ekrt
@@ -12036,7 +12048,7 @@ local function recurse(e,action)
     for i=1,#edt do
       local str=edt[i]
       if type(str)~="string" then
-        recurse(str,action,recursive)
+        recurse(str,action) 
       elseif str~="" then
         edt[i]=action(str)
       end
@@ -17259,8 +17271,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    : 710105
--- stripped bytes    : 252051
+-- original bytes    : 710661
+-- stripped bytes    : 252165
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 81d47d1f2..fb3fdf5a9 100755
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -11321,7 +11321,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 25139, stripped down to: 17839
+-- original size: 25695, stripped down to: 18281
 
 if not modules then modules={} end modules ['lxml-aux']={
   version=1.001,
@@ -11331,6 +11331,7 @@ if not modules then modules={} end modules ['lxml-aux']={
   license="see context related readme files"
 }
 local trace_manipulations=false trackers.register("lxml.manipulations",function(v) trace_manipulations=v end)
+local trace_inclusions=false trackers.register("lxml.inclusions",function(v) trace_inclusions=v end)
 local report_xml=logs.reporter("xml")
 local xml=xml
 local xmlconvert,xmlcopy,xmlname=xml.convert,xml.copy,xml.name
@@ -11637,11 +11638,14 @@ xml.insertafter=insert_element
 xml.insertbefore=function(r,p,e) insert_element(r,p,e,true) end
 xml.injectafter=inject_element
 xml.injectbefore=function(r,p,e) inject_element(r,p,e,true) end
-local function include(xmldata,pattern,attribute,recursive,loaddata)
+local function include(xmldata,pattern,attribute,recursive,loaddata,level)
   pattern=pattern or 'include'
   loaddata=loaddata or io.loaddata
   local collected=xmlapplylpath(xmldata,pattern)
   if collected then
+    if not level then
+      level=1
+    end
     for c=1,#collected do
       local ek=collected[c]
       local name=nil
@@ -11655,11 +11659,19 @@ local function include(xmldata,pattern,attribute,recursive,loaddata)
       if not name then
         for a in gmatch(attribute or "href","([^|]+)") do
           name=ekat[a]
-          if name then break end
+          if name then
+            break
+          end
+        end
+      end
+      local data=nil
+      if name and name~="" then
+        data=loaddata(name) or ""
+        if trace_inclusions then
+          report_xml("including %s bytes from %a at level %s by pattern %a and attribute %a (%srecursing)",#data,name,level,pattern,attribute or "",recursive and "" or "not ")
         end
       end
-      local data=name and name~="" and loaddata(name) or ""
-      if data=="" then
+      if not data or data=="" then
         epdt[ek.ni]="" 
       elseif ekat["parse"]=="text" then
         epdt[ek.ni]=xml.escaped(data) 
@@ -11669,7 +11681,7 @@ local function include(xmldata,pattern,attribute,recursive,loaddata)
           epdt[ek.ni]="" 
         else
           if recursive then
-            include(xi,pattern,attribute,recursive,loaddata)
+            include(xi,pattern,attribute,recursive,loaddata,level+1)
           end
           local child=xml.body(xi) 
           child.__p__=ekrt
@@ -12036,7 +12048,7 @@ local function recurse(e,action)
     for i=1,#edt do
       local str=edt[i]
       if type(str)~="string" then
-        recurse(str,action,recursive)
+        recurse(str,action) 
       elseif str~="" then
         edt[i]=action(str)
       end
@@ -17259,8 +17271,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    : 710105
--- stripped bytes    : 252051
+-- original bytes    : 710661
+-- stripped bytes    : 252165
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index 81d47d1f2..fb3fdf5a9 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -11321,7 +11321,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 25139, stripped down to: 17839
+-- original size: 25695, stripped down to: 18281
 
 if not modules then modules={} end modules ['lxml-aux']={
   version=1.001,
@@ -11331,6 +11331,7 @@ if not modules then modules={} end modules ['lxml-aux']={
   license="see context related readme files"
 }
 local trace_manipulations=false trackers.register("lxml.manipulations",function(v) trace_manipulations=v end)
+local trace_inclusions=false trackers.register("lxml.inclusions",function(v) trace_inclusions=v end)
 local report_xml=logs.reporter("xml")
 local xml=xml
 local xmlconvert,xmlcopy,xmlname=xml.convert,xml.copy,xml.name
@@ -11637,11 +11638,14 @@ xml.insertafter=insert_element
 xml.insertbefore=function(r,p,e) insert_element(r,p,e,true) end
 xml.injectafter=inject_element
 xml.injectbefore=function(r,p,e) inject_element(r,p,e,true) end
-local function include(xmldata,pattern,attribute,recursive,loaddata)
+local function include(xmldata,pattern,attribute,recursive,loaddata,level)
   pattern=pattern or 'include'
   loaddata=loaddata or io.loaddata
   local collected=xmlapplylpath(xmldata,pattern)
   if collected then
+    if not level then
+      level=1
+    end
     for c=1,#collected do
       local ek=collected[c]
       local name=nil
@@ -11655,11 +11659,19 @@ local function include(xmldata,pattern,attribute,recursive,loaddata)
       if not name then
         for a in gmatch(attribute or "href","([^|]+)") do
           name=ekat[a]
-          if name then break end
+          if name then
+            break
+          end
+        end
+      end
+      local data=nil
+      if name and name~="" then
+        data=loaddata(name) or ""
+        if trace_inclusions then
+          report_xml("including %s bytes from %a at level %s by pattern %a and attribute %a (%srecursing)",#data,name,level,pattern,attribute or "",recursive and "" or "not ")
         end
       end
-      local data=name and name~="" and loaddata(name) or ""
-      if data=="" then
+      if not data or data=="" then
         epdt[ek.ni]="" 
       elseif ekat["parse"]=="text" then
         epdt[ek.ni]=xml.escaped(data) 
@@ -11669,7 +11681,7 @@ local function include(xmldata,pattern,attribute,recursive,loaddata)
           epdt[ek.ni]="" 
         else
           if recursive then
-            include(xi,pattern,attribute,recursive,loaddata)
+            include(xi,pattern,attribute,recursive,loaddata,level+1)
           end
           local child=xml.body(xi) 
           child.__p__=ekrt
@@ -12036,7 +12048,7 @@ local function recurse(e,action)
     for i=1,#edt do
       local str=edt[i]
       if type(str)~="string" then
-        recurse(str,action,recursive)
+        recurse(str,action) 
       elseif str~="" then
         edt[i]=action(str)
       end
@@ -17259,8 +17271,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    : 710105
--- stripped bytes    : 252051
+-- original bytes    : 710661
+-- stripped bytes    : 252165
 
 -- end library merge