beta 2011.01.14 14:32

5 files changed, 189 insertions, 145 deletions

diff --git a/scripts/context/lua/mtx-metapost.lua b/scripts/context/lua/mtx-metapost.lua
new file mode 100644
index 000000000..9bdd1260f
--- /dev/null
+++ b/scripts/context/lua/mtx-metapost.lua
@@ -0,0 +1,171 @@
+if not modules then modules = { } end modules ['mtx-metapost'] = { -- this was mtx-mptopdf
+    version   = 0.100,
+    comment   = "companion to mtxrun.lua",
+    author    = "Taco Hoekwater & Hans Hagen",
+    copyright = "ConTeXt Development Team",
+    license   = "see context related readme files"
+}
+
+scripts             = scripts             or { }
+scripts.mptopdf     = scripts.mptopdf     or { }
+scripts.mptopdf.aux = scripts.mptopdf.aux or { }
+
+local format, find, gsub = string.format, string.find, string.gsub
+
+local function assumes_latex(filename)
+    local d = io.loaddata(filename) or ""
+    return find(d,"\\documentstyle") or find(d,"\\documentclass") or find(d,"\\begin{document}")
+end
+
+local template = "\\startTEXpage\n\\convertMPtoPDF{%s}{1}{1}\n\\stopTEXpage"
+local texified = "\\starttext\n%s\n\\stoptext"
+local splitter = "\\startTEXpage\\externalfigure[%s][page=%s]\\stopTEXpage"
+local tempname = "mptopdf-temp.tex"
+
+local function do_convert(filename)
+    if find(filename,".%d+$") or find(filename,"%.mps$") then
+        io.savedata(tempname,format(template,filename))
+        local resultname = format("%s-%s.pdf",file.nameonly(filename),file.extname(filename))
+        local result = os.execute(format([[context --once --batch --purge --result=%s "%s"]],resultname,tempname))
+        return lfs.isfile(resultname) and resultname
+    end
+end
+
+local function do_split(filename,numbers)
+    local name = file.nameonly(filename)
+    for i=1,#numbers do
+        io.savedata(tempname,format(splitter,file.addsuffix(name,"pdf"),i))
+        local resultname = format("%s-%s.pdf",name,numbers[i])
+        local result = os.execute(format([[context --once --batch --purge --result=%s "%s"]],resultname,tempname))
+    end
+end
+
+local function do_texify(str)
+    -- This only works for flat mp files i.e. outer beginfigs. Normally a
+    -- context user will directly make a tex file. Of course we can make
+    -- this script more clever, but why should we as better methods exist.
+    local numbers = { }
+    str = "\\startMPinclusions\n".. str .. "\n\\stopMPinclusions"
+    str = gsub(str,"beginfig%s*%(%s*(.-)%s*%)%s*;%s*",function(s)
+        numbers[#numbers+1] = tonumber(s) or 0
+        return "\n\\stopMPinclusions\n\\startMPpage\n"
+    end)
+    str = gsub(str,"%s*endfig%s*;%s*","\n\\stopMPpage\n\\startMPinclusions\n")
+    str = gsub(str,"\\startMPinclusions%s*\\stopMPinclusions","")
+    str = gsub(str,"[\n\r]+","\n")
+    return format(texified,str), numbers
+end
+
+local function do_convert_all(filename)
+    local results = dir.glob(file.nameonly(filename) .. ".*") -- reset
+    local report = { }
+    for i=1,#results do
+        local filename = results[i]
+        local resultname = do_convert(filename)
+        if resultname then
+            report[#report+1] = { filename, resultname }
+        end
+    end
+    if #report > 0 then
+        logs.simple("number of converted files: %i", #report)
+        logs.simple("")
+        for i=1,#report do
+            local r = report[i]
+            logs.simple("%s => %s", r[1], r[2])
+        end
+    else
+        logs.simple("no files are converted for '%s'",filename)
+    end
+end
+
+local function do_convert_one(filename)
+    local resultname = do_convert(filename)
+    if resultname then
+        logs.simple("%s => %s", filename,resultname)
+    else
+        logs.simple("no result for '%s'",filename)
+    end
+end
+
+function scripts.mptopdf.convertall()
+    local rawmp   = environment.arguments.rawmp   or false
+    local metafun = environment.arguments.metafun or false
+    local latex   = environment.arguments.latex   or false
+    local pattern = environment.arguments.pattern or false
+    local split   = environment.arguments.split   or false
+    local files
+    if pattern then
+        files = dir.glob(file.nameonly(filename))
+    else
+        files   = environment.files
+    end
+    if #files > 0 then
+        for i=1,#files do
+            local filename = files[i]
+            if file.suffix(filename) == "mp" then
+                local command, convert, texdata, numbers
+                if rawmp then
+                    if metafun then
+                        command, convert = format("mpost --progname=mpost --mem=metafun %s",filename), true
+                    else
+                        command, convert = format("mpost --mem=mpost %s",filename), true
+                    end
+                else
+                    if latex or assumes_latex(filename) then
+                        command, convert = format("mpost --mem=mpost --tex=latex %s",filename), true
+                    elseif texexec then
+                        command, convert = format("texexec --mptex %s",filename), true
+                    else
+                        texdata, numbers = do_texify(io.loaddata(filename) or "")
+                        io.savedata(tempname,texdata)
+                        command, convert = format("context --result=%s --purge --once %s",file.nameonly(filename),tempname), false
+                    end
+                end
+                logs.simple("running: %s\n",command)
+                local done = os.execute(command)
+                if done then
+                    if convert then
+                        do_convert_all(filename)
+                    elseif split then
+                        do_split(filename,numbers)
+                        -- already pdf, maybe optionally split
+                    end
+                else
+                    logs.simple("error while processing mp file '%s'", filename)
+                end
+            else
+                do_convert_one(filename)
+            end
+        end
+    else
+        logs.simple("no files match to process")
+    end
+end
+
+logs.extendbanner("MetaPost to PDF processor 0.10")
+
+messages.help = [[
+--rawmp               raw metapost run
+--metafun             use metafun instead of plain
+--latex               force --tex=latex
+--texexec             force texexec usage (mkii)
+--split               split single result file into pages
+
+intended usage:
+
+mtxrun --script metapost yourfile.mp
+mtxrun --script metapost --split yourfile.mp
+mtxrun --script metapost yourfile.123 myfile.mps
+
+other usage resembles mptopdf.pl
+]]
+
+if environment.files[1] then
+    scripts.mptopdf.convertall()
+else
+    if not environment.arguments.help then
+        logs.simple("provide MP output file (or pattern)")
+        logs.simple("")
+    end
+    logs.help(messages.help)
+end
diff --git a/scripts/context/lua/mtx-mptopdf.lua b/scripts/context/lua/mtx-mptopdf.lua
deleted file mode 100644
index 4662c2830..000000000
--- a/scripts/context/lua/mtx-mptopdf.lua
+++ /dev/null
@@ -1,127 +0,0 @@
-if not modules then modules = { } end modules ['mtx-mptopdf'] = {
-    version   = 1.303,
-    comment   = "companion to mtxrun.lua, patched by HH so errors are his",
-    author    = "Taco Hoekwater, Elvenkind BV, Dordrecht NL",
-    copyright = "Elvenkind BV / ConTeXt Development Team",
-    license   = "see context related readme files"
-}
-
-scripts             = scripts             or { }
-scripts.mptopdf     = scripts.mptopdf     or { }
-scripts.mptopdf.aux = scripts.mptopdf.aux or { }
-
-local dosish      = os.type == 'windows'
-local miktex      = dosish and environment.TEXSYSTEM and environment.TEXSYSTEM:find("miktex")
-local escapeshell = environment.SHELL and environment.SHELL:find("sh") and true
-
-function scripts.mptopdf.aux.find_latex(fname)
-    local d = io.loaddata(fname) or ""
-    return d:find("\\documentstyle") or d:find("\\documentclass") or d:find("\\begin{document}")
-end
-
-function scripts.mptopdf.aux.do_convert (fname)
-    local command, done, pdfdest = "", 0, ""
-    if fname:find(".%d+$") or fname:find("%.mps$") then
-        if miktex then
-            command = "pdftex -undump=mptopdf"
-        else
-            command = "pdftex -fmt=mptopdf -progname=context"
-        end
-        if dosish then
-            command = string.format('%s \\relax "%s"',command,fname)
-        else
-            command = string.format('%s \\\\relax "%s"',command,fname)
-        end
-        local result = os.execute(command)
-        if result == 0 then
-            local name, suffix = file.nameonly(fname), file.extname(fname)
-            local pdfsrc =  name .. ".pdf"
-            if lfs.isfile(pdfsrc) then
-                pdfdest = name .. "-" .. suffix .. ".pdf"
-                os.rename(pdfsrc, pdfdest)
-                if lfs.isfile(pdfsrc) then -- rename failed
-                    file.copy(pdfsrc, pdfdest)
-                end
-                done = 1
-            end
-        end
-    end
-    return done, pdfdest
-end
-
-function scripts.mptopdf.aux.make_mps(fn,latex,rawmp,metafun)
-    local rest, mpbin = latex and " --tex=latex " or " ", ""
-    if rawmp then
-        if metafun then
-            mpbin = "mpost --progname=mpost --mem=metafun"
-        else
-            mpbin = "mpost --mem=mpost"
-        end
-    else
-        if latex then
-            mpbin = "mpost --mem=mpost"
-        else
-            mpbin = "texexec --mptex"
-        end
-    end
-    local runner = mpbin .. rest .. fn
-    logs.simple("running: %s\n", runner)
-    return (os.execute(runner))
-end
-
-function scripts.mptopdf.convertall()
-    local rawmp   = environment.arguments.rawmp   or false
-    local metafun = environment.arguments.metafun or false
-    local latex   = environment.arguments.latex   or false
-    local files   = dir.glob(environment.files)
-    if #files > 0 then
-        local fn = files[1]
-        if #files == 1 and fn:find("%.mp$") then
-            latex = scripts.mptopdf.aux.find_latex(fn) or latex
-        end
-        if scripts.mptopdf.aux.make_mps(fn,latex,rawmp,metafun) then
-            files = dir.glob(file.nameonly(fn) .. ".*") -- reset
-        else
-            logs.simple("error while processing mp file '%s'", fn)
-            exit(1)
-        end
-        local report = { }
-        for i=1,#files do
-            local fn = files[i]
-            local success, name = scripts.mptopdf.aux.do_convert(fn)
-            if success > 0 then
-                report[#report+1] = { fn, name }
-            end
-        end
-        if #report > 0 then
-            logs.simple("number of converted files: %i", #report)
-            logs.simple("")
-            for i=1,#report do
-                local r = report[i]
-                logs.simple("%s => %s", r[1], r[2])
-            end
-        else
-            logs.simple("no files are converted")
-        end
-    else
-        logs.simple("no files match %s", table.concat(environment.files,' '))
-    end
-end
-
-logs.extendbanner("MetaPost to PDF Converter 0.51")
-
-messages.help = [[
---rawmp               raw metapost run
---metafun             use metafun instead of plain
---latex               force --tex=latex
-]]
-
-if environment.files[1] then
-    scripts.mptopdf.convertall()
-else
-    if not environment.arguments.help then
-        logs.simple("provide MP output file (or pattern)")
-        logs.simple("")
-    end
-    logs.help(messages.help)
-end
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index d264c05ab..75a527188 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -207,9 +207,6 @@ local squote           = P("'")
 local dquote           = P('"')
 local space            = P(" ")
 
-patterns.somecontent   = (anything - newline - space)^1
-patterns.beginline     = #(1-newline)
-
 local utfbom_32_be     = P('\000\000\254\255')
 local utfbom_32_le     = P('\255\254\000\000')
 local utfbom_16_be     = P('\255\254')
@@ -282,6 +279,9 @@ patterns.undouble      = (dquote/"") * patterns.nodquote * (dquote/"")
 patterns.unquoted      = patterns.undouble + patterns.unsingle -- more often undouble
 patterns.unspacer      = ((patterns.spacer^1)/"")^0
 
+patterns.somecontent   = (anything - newline - space)^1 -- (utf8char - newline - space)^1
+patterns.beginline     = #(1-newline)
+
 local unquoted = Cs(patterns.unquoted * endofstring) -- not C
 
 function string.unquoted(str)
@@ -13754,7 +13754,7 @@ runners.registered = {
     makempy      = { 'makempy.pl',      true  },
     mptopdf      = { 'mptopdf.pl',      true  },
     pstopdf      = { 'pstopdf.rb',      true  },  -- converts ps (and some more) images, does some cleaning (replaced)
---  examplex     = { 'examplex.rb',     false },
+ -- examplex     = { 'examplex.rb',     false },
     concheck     = { 'concheck.rb',     false },
     runtools     = { 'runtools.rb',     true  },
     textools     = { 'textools.rb',     true  },
@@ -13763,9 +13763,9 @@ runners.registered = {
     rlxtools     = { 'rlxtools.rb',     true  },
     pdftools     = { 'pdftools.rb',     true  },
     mpstools     = { 'mpstools.rb',     true  },
---  exatools     = { 'exatools.rb',     true  },
+ -- exatools     = { 'exatools.rb',     true  },
     xmltools     = { 'xmltools.rb',     true  },
---  luatools     = { 'luatools.lua',    true  },
+ -- luatools     = { 'luatools.lua',    true  },
     mtxtools     = { 'mtxtools.rb',     true  },
     pdftrimwhite = { 'pdftrimwhite.pl', false }
 }
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index d264c05ab..75a527188 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -207,9 +207,6 @@ local squote           = P("'")
 local dquote           = P('"')
 local space            = P(" ")
 
-patterns.somecontent   = (anything - newline - space)^1
-patterns.beginline     = #(1-newline)
-
 local utfbom_32_be     = P('\000\000\254\255')
 local utfbom_32_le     = P('\255\254\000\000')
 local utfbom_16_be     = P('\255\254')
@@ -282,6 +279,9 @@ patterns.undouble      = (dquote/"") * patterns.nodquote * (dquote/"")
 patterns.unquoted      = patterns.undouble + patterns.unsingle -- more often undouble
 patterns.unspacer      = ((patterns.spacer^1)/"")^0
 
+patterns.somecontent   = (anything - newline - space)^1 -- (utf8char - newline - space)^1
+patterns.beginline     = #(1-newline)
+
 local unquoted = Cs(patterns.unquoted * endofstring) -- not C
 
 function string.unquoted(str)
@@ -13754,7 +13754,7 @@ runners.registered = {
     makempy      = { 'makempy.pl',      true  },
     mptopdf      = { 'mptopdf.pl',      true  },
     pstopdf      = { 'pstopdf.rb',      true  },  -- converts ps (and some more) images, does some cleaning (replaced)
---  examplex     = { 'examplex.rb',     false },
+ -- examplex     = { 'examplex.rb',     false },
     concheck     = { 'concheck.rb',     false },
     runtools     = { 'runtools.rb',     true  },
     textools     = { 'textools.rb',     true  },
@@ -13763,9 +13763,9 @@ runners.registered = {
     rlxtools     = { 'rlxtools.rb',     true  },
     pdftools     = { 'pdftools.rb',     true  },
     mpstools     = { 'mpstools.rb',     true  },
---  exatools     = { 'exatools.rb',     true  },
+ -- exatools     = { 'exatools.rb',     true  },
     xmltools     = { 'xmltools.rb',     true  },
---  luatools     = { 'luatools.lua',    true  },
+ -- luatools     = { 'luatools.lua',    true  },
     mtxtools     = { 'mtxtools.rb',     true  },
     pdftrimwhite = { 'pdftrimwhite.pl', false }
 }
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index d264c05ab..75a527188 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -207,9 +207,6 @@ local squote           = P("'")
 local dquote           = P('"')
 local space            = P(" ")
 
-patterns.somecontent   = (anything - newline - space)^1
-patterns.beginline     = #(1-newline)
-
 local utfbom_32_be     = P('\000\000\254\255')
 local utfbom_32_le     = P('\255\254\000\000')
 local utfbom_16_be     = P('\255\254')
@@ -282,6 +279,9 @@ patterns.undouble      = (dquote/"") * patterns.nodquote * (dquote/"")
 patterns.unquoted      = patterns.undouble + patterns.unsingle -- more often undouble
 patterns.unspacer      = ((patterns.spacer^1)/"")^0
 
+patterns.somecontent   = (anything - newline - space)^1 -- (utf8char - newline - space)^1
+patterns.beginline     = #(1-newline)
+
 local unquoted = Cs(patterns.unquoted * endofstring) -- not C
 
 function string.unquoted(str)
@@ -13754,7 +13754,7 @@ runners.registered = {
     makempy      = { 'makempy.pl',      true  },
     mptopdf      = { 'mptopdf.pl',      true  },
     pstopdf      = { 'pstopdf.rb',      true  },  -- converts ps (and some more) images, does some cleaning (replaced)
---  examplex     = { 'examplex.rb',     false },
+ -- examplex     = { 'examplex.rb',     false },
     concheck     = { 'concheck.rb',     false },
     runtools     = { 'runtools.rb',     true  },
     textools     = { 'textools.rb',     true  },
@@ -13763,9 +13763,9 @@ runners.registered = {
     rlxtools     = { 'rlxtools.rb',     true  },
     pdftools     = { 'pdftools.rb',     true  },
     mpstools     = { 'mpstools.rb',     true  },
---  exatools     = { 'exatools.rb',     true  },
+ -- exatools     = { 'exatools.rb',     true  },
     xmltools     = { 'xmltools.rb',     true  },
---  luatools     = { 'luatools.lua',    true  },
+ -- luatools     = { 'luatools.lua',    true  },
     mtxtools     = { 'mtxtools.rb',     true  },
     pdftrimwhite = { 'pdftrimwhite.pl', false }
 }