2017-04-16 12:47:00

3 files changed, 33 insertions, 9 deletions

diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index ec4e81506..b2101937a 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -14018,7 +14018,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 29836, stripped down to: 21175
+-- original size: 29835, stripped down to: 21174
 
 if not modules then modules={} end modules ['lxml-aux']={
   version=1.001,
@@ -14670,7 +14670,7 @@ local obsolete=xml.obsolete
 xml.strip_whitespace=xml.strip         obsolete.strip_whitespace=xml.strip
 xml.collect_elements=xml.collect        obsolete.collect_elements=xml.collect
 xml.delete_element=xml.delete        obsolete.delete_element=xml.delete
-xml.replace_element=xml.replace        obsolete.replace_element=xml.replacet
+xml.replace_element=xml.replace        obsolete.replace_element=xml.replace
 xml.each_element=xml.each         obsolete.each_element=xml.each
 xml.process_elements=xml.process        obsolete.process_elements=xml.process
 xml.insert_element_after=xml.insertafter      obsolete.insert_element_after=xml.insertafter
@@ -20422,7 +20422,7 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-sandbox.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-fil.lua util-sac.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-tpl.lua util-sbx.lua util-mrg.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    : 841486
+-- original bytes    : 841485
 -- stripped bytes    : 305240
 
 -- end library merge
@@ -20718,6 +20718,7 @@ local helpinfo = [[
    </subcategory>
    <subcategory>
     <flag name="expand-braces"><short>expand complex variable</short></flag>
+    <flag name="resolve-path"><short>expand variable (completely resolve paths)</short></flag>
     <flag name="expand-path"><short>expand variable (resolve paths)</short></flag>
     <flag name="expand-var"><short>expand variable (resolve references)</short></flag>
     <flag name="show-path"><short>show path expansion of ...</short></flag>
@@ -21701,6 +21702,13 @@ elseif e_argument("expand-path") then
     environment.initializearguments(environment.arguments_after)
     resolvers.dowithfilesandreport(resolvers.expandpath, environment.files)
 
+elseif e_argument("resolve-path") then
+
+    resolvers.load("nofiles")
+    runners.register_arguments(filename)
+    environment.initializearguments(environment.arguments_after)
+    resolvers.dowithfilesandreport(resolvers.cleanedpathlist, environment.files)
+
 elseif e_argument("expand-var") or e_argument("expand-variable") then
 
     -- luatools: runners.execute_ctx_script("mtx-base","--expand-var",filename)
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index ec4e81506..b2101937a 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -14018,7 +14018,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 29836, stripped down to: 21175
+-- original size: 29835, stripped down to: 21174
 
 if not modules then modules={} end modules ['lxml-aux']={
   version=1.001,
@@ -14670,7 +14670,7 @@ local obsolete=xml.obsolete
 xml.strip_whitespace=xml.strip         obsolete.strip_whitespace=xml.strip
 xml.collect_elements=xml.collect        obsolete.collect_elements=xml.collect
 xml.delete_element=xml.delete        obsolete.delete_element=xml.delete
-xml.replace_element=xml.replace        obsolete.replace_element=xml.replacet
+xml.replace_element=xml.replace        obsolete.replace_element=xml.replace
 xml.each_element=xml.each         obsolete.each_element=xml.each
 xml.process_elements=xml.process        obsolete.process_elements=xml.process
 xml.insert_element_after=xml.insertafter      obsolete.insert_element_after=xml.insertafter
@@ -20422,7 +20422,7 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-sandbox.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-fil.lua util-sac.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-tpl.lua util-sbx.lua util-mrg.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    : 841486
+-- original bytes    : 841485
 -- stripped bytes    : 305240
 
 -- end library merge
@@ -20718,6 +20718,7 @@ local helpinfo = [[
    </subcategory>
    <subcategory>
     <flag name="expand-braces"><short>expand complex variable</short></flag>
+    <flag name="resolve-path"><short>expand variable (completely resolve paths)</short></flag>
     <flag name="expand-path"><short>expand variable (resolve paths)</short></flag>
     <flag name="expand-var"><short>expand variable (resolve references)</short></flag>
     <flag name="show-path"><short>show path expansion of ...</short></flag>
@@ -21701,6 +21702,13 @@ elseif e_argument("expand-path") then
     environment.initializearguments(environment.arguments_after)
     resolvers.dowithfilesandreport(resolvers.expandpath, environment.files)
 
+elseif e_argument("resolve-path") then
+
+    resolvers.load("nofiles")
+    runners.register_arguments(filename)
+    environment.initializearguments(environment.arguments_after)
+    resolvers.dowithfilesandreport(resolvers.cleanedpathlist, environment.files)
+
 elseif e_argument("expand-var") or e_argument("expand-variable") then
 
     -- luatools: runners.execute_ctx_script("mtx-base","--expand-var",filename)
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index ec4e81506..b2101937a 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -14018,7 +14018,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 29836, stripped down to: 21175
+-- original size: 29835, stripped down to: 21174
 
 if not modules then modules={} end modules ['lxml-aux']={
   version=1.001,
@@ -14670,7 +14670,7 @@ local obsolete=xml.obsolete
 xml.strip_whitespace=xml.strip         obsolete.strip_whitespace=xml.strip
 xml.collect_elements=xml.collect        obsolete.collect_elements=xml.collect
 xml.delete_element=xml.delete        obsolete.delete_element=xml.delete
-xml.replace_element=xml.replace        obsolete.replace_element=xml.replacet
+xml.replace_element=xml.replace        obsolete.replace_element=xml.replace
 xml.each_element=xml.each         obsolete.each_element=xml.each
 xml.process_elements=xml.process        obsolete.process_elements=xml.process
 xml.insert_element_after=xml.insertafter      obsolete.insert_element_after=xml.insertafter
@@ -20422,7 +20422,7 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-sandbox.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-fil.lua util-sac.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-tpl.lua util-sbx.lua util-mrg.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    : 841486
+-- original bytes    : 841485
 -- stripped bytes    : 305240
 
 -- end library merge
@@ -20718,6 +20718,7 @@ local helpinfo = [[
    </subcategory>
    <subcategory>
     <flag name="expand-braces"><short>expand complex variable</short></flag>
+    <flag name="resolve-path"><short>expand variable (completely resolve paths)</short></flag>
     <flag name="expand-path"><short>expand variable (resolve paths)</short></flag>
     <flag name="expand-var"><short>expand variable (resolve references)</short></flag>
     <flag name="show-path"><short>show path expansion of ...</short></flag>
@@ -21701,6 +21702,13 @@ elseif e_argument("expand-path") then
     environment.initializearguments(environment.arguments_after)
     resolvers.dowithfilesandreport(resolvers.expandpath, environment.files)
 
+elseif e_argument("resolve-path") then
+
+    resolvers.load("nofiles")
+    runners.register_arguments(filename)
+    environment.initializearguments(environment.arguments_after)
+    resolvers.dowithfilesandreport(resolvers.cleanedpathlist, environment.files)
+
 elseif e_argument("expand-var") or e_argument("expand-variable") then
 
     -- luatools: runners.execute_ctx_script("mtx-base","--expand-var",filename)