beta 2013.04.26 15:13

4 files changed, 72 insertions, 22 deletions

diff --git a/scripts/context/lua/mtx-pdf.lua b/scripts/context/lua/mtx-pdf.lua
index 3e4130344..551aa5b37 100644
--- a/scripts/context/lua/mtx-pdf.lua
+++ b/scripts/context/lua/mtx-pdf.lua
@@ -26,6 +26,7 @@ local helpinfo = [[
     <flag name="info"><short>show some info about the given file</short></flag>
     <flag name="metadata"><short>show metadata xml blob</short></flag>
     <flag name="fonts"><short>show used fonts (<ref name="detail)"/></short></flag>
+    <flag name="linearize"><short>linearize given file</short></flag>
    </subcategory>
   </category>
  </flags>
@@ -213,9 +214,50 @@ function scripts.pdf.fonts(filename)
     end
 end
 
+-- this is a quick hack ... proof of concept .. will change (derived from luigi's example) ...
+-- i will make a ctx wrapper
+
+local qpdf
+
+function scripts.pdf.linearize(filename)
+    qpdf = qpdf or swiglib("qpdf.core")
+    local oldfile = filename or environment.files[1]
+    if not oldfile then
+        return
+    end
+    file.addsuffix(oldfile,"pdf")
+    if not lfs.isfile(oldfile) then
+        return
+    end
+    local newfile = environment.files[2]
+    if not newfile or file.removesuffix(oldfile) == file.removesuffix(newfile)then
+        newfile = file.addsuffix(file.removesuffix(oldfile) .. "-linearized","pdf")
+    end
+    local password = environment.arguments.password
+    local instance = qpdf.qpdf_init()
+    if bit32.band(qpdf.qpdf_read(instance,oldfile,password),qpdf.QPDF_ERRORS) ~= 0 then
+        report("unable to open input file")
+    elseif bit32.band(qpdf.qpdf_init_write(instance,newfile),qpdf.QPDF_ERRORS) ~= 0 then
+        report("unable to open output file")
+    else
+        report("linearizing %a into %a",oldfile,newfile)
+        qpdf.qpdf_set_static_ID(instance,qpdf.QPDF_TRUE)
+        qpdf.qpdf_set_linearization(instance,qpdf.QPDF_TRUE)
+        qpdf.qpdf_write(instance)
+    end
+    while qpdf.qpdf_more_warnings(instance) ~= 0 do
+        report("warning: %s",qpdf.qpdf_get_error_full_text(instance,qpdf.qpdf_next_warning(qpdf)))
+    end
+    if qpdf.qpdf_has_error(instance) ~= 0 then
+        report("error: %s",qpdf.qpdf_get_error_full_text(instance,qpdf.qpdf_get_error(qpdf)))
+    end
+    qpdf.qpdf_cleanup_p(instance)
+end
+
 -- scripts.pdf.info("e:/tmp/oeps.pdf")
 -- scripts.pdf.metadata("e:/tmp/oeps.pdf")
 -- scripts.pdf.fonts("e:/tmp/oeps.pdf")
+-- scripts.pdf.linearize("e:/tmp/oeps.pdf")
 
 local filename = environment.files[1] or ""
 
@@ -227,8 +269,10 @@ elseif environment.argument("metadata") then
     scripts.pdf.metadata(filename)
 elseif environment.argument("fonts") then
     scripts.pdf.fonts(filename)
+elseif environment.argument("linearize") then
+    scripts.pdf.linearize(filename)
 elseif environment.argument("exporthelp") then
-    application.export(environment.argument("exporthelp"),environment.files[1])
+    application.export(environment.argument("exporthelp"),filename)
 else
     application.help()
 end
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 2daf44906..80489902b 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -15577,7 +15577,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lib"] = package.loaded["util-lib"] or true
 
--- original size: 11094, stripped down to: 5516
+-- original size: 11136, stripped down to: 5549
 
 if not modules then modules={} end modules ['util-lib']={
   version=1.001,
@@ -15657,10 +15657,10 @@ local function requireswiglib(required,version)
         end
       end
       if trace_swiglib then
-        report_swiglib("checking clib paths")
+        report_swiglib("checking lib paths")
       end
-      package.extraclibpath(environment.ownpath)
-      local paths=package.clibpaths()
+      package.extralibpath(environment.ownpath)
+      local paths=package.libpaths()
       for i=1,#paths do
         local found=check(lfs.isfile)
         if found and (not checkpattern or find(found,checkpattern)) then
@@ -15732,7 +15732,9 @@ function swiglib(name,version)
   local library=swiglibs[name]
   if not library then
     statistics.starttiming(swiglibs)
-    report_swiglib("loading %a",name)
+    if trace_swiglib then
+      report_swiglib("loading %a",name)
+    end
     library=requireswiglib("swiglib."..name,version)
     swiglibs[name]=library
     statistics.stoptiming(swiglibs)
@@ -15989,8 +15991,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-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    : 667160
--- stripped bytes    : 244299
+-- original bytes    : 667202
+-- stripped bytes    : 244308
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 2daf44906..80489902b 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -15577,7 +15577,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lib"] = package.loaded["util-lib"] or true
 
--- original size: 11094, stripped down to: 5516
+-- original size: 11136, stripped down to: 5549
 
 if not modules then modules={} end modules ['util-lib']={
   version=1.001,
@@ -15657,10 +15657,10 @@ local function requireswiglib(required,version)
         end
       end
       if trace_swiglib then
-        report_swiglib("checking clib paths")
+        report_swiglib("checking lib paths")
       end
-      package.extraclibpath(environment.ownpath)
-      local paths=package.clibpaths()
+      package.extralibpath(environment.ownpath)
+      local paths=package.libpaths()
       for i=1,#paths do
         local found=check(lfs.isfile)
         if found and (not checkpattern or find(found,checkpattern)) then
@@ -15732,7 +15732,9 @@ function swiglib(name,version)
   local library=swiglibs[name]
   if not library then
     statistics.starttiming(swiglibs)
-    report_swiglib("loading %a",name)
+    if trace_swiglib then
+      report_swiglib("loading %a",name)
+    end
     library=requireswiglib("swiglib."..name,version)
     swiglibs[name]=library
     statistics.stoptiming(swiglibs)
@@ -15989,8 +15991,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-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    : 667160
--- stripped bytes    : 244299
+-- original bytes    : 667202
+-- stripped bytes    : 244308
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 2daf44906..80489902b 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -15577,7 +15577,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lib"] = package.loaded["util-lib"] or true
 
--- original size: 11094, stripped down to: 5516
+-- original size: 11136, stripped down to: 5549
 
 if not modules then modules={} end modules ['util-lib']={
   version=1.001,
@@ -15657,10 +15657,10 @@ local function requireswiglib(required,version)
         end
       end
       if trace_swiglib then
-        report_swiglib("checking clib paths")
+        report_swiglib("checking lib paths")
       end
-      package.extraclibpath(environment.ownpath)
-      local paths=package.clibpaths()
+      package.extralibpath(environment.ownpath)
+      local paths=package.libpaths()
       for i=1,#paths do
         local found=check(lfs.isfile)
         if found and (not checkpattern or find(found,checkpattern)) then
@@ -15732,7 +15732,9 @@ function swiglib(name,version)
   local library=swiglibs[name]
   if not library then
     statistics.starttiming(swiglibs)
-    report_swiglib("loading %a",name)
+    if trace_swiglib then
+      report_swiglib("loading %a",name)
+    end
     library=requireswiglib("swiglib."..name,version)
     swiglibs[name]=library
     statistics.stoptiming(swiglibs)
@@ -15989,8 +15991,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-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    : 667160
--- stripped bytes    : 244299
+-- original bytes    : 667202
+-- stripped bytes    : 244308
 
 -- end library merge