From c10f5dbdbb8091c3ab40f1112a5e49b55165b07f Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Fri, 29 Mar 2013 00:44:00 +0100 Subject: beta 2013.03.29 00:44 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4132 -> 4135 bytes tex/context/base/context-version.png | Bin 40143 -> 40387 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/status-files.pdf | Bin 24761 -> 24776 bytes tex/context/base/status-lua.pdf | Bin 211455 -> 211414 bytes tex/context/base/trac-xml.lua | 41 +++++++++++++-------- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 10 files changed, 30 insertions(+), 21 deletions(-) (limited to 'tex') diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 204684312..ca5fe3675 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2013.03.28 23:10} +\newcontextversion{2013.03.29 00:44} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 7bb692d2a..40e3bc7b7 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{2013.03.28 23:10} +\newcontextversion{2013.03.29 00:44} %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 f90f966d1..24c2f7d50 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png index 34ef69eda..1e07fa661 100644 Binary files a/tex/context/base/context-version.png and b/tex/context/base/context-version.png differ diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index aa7cfe2df..f4dd490aa 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2013.03.28 23:10} +\edef\contextversion{2013.03.29 00:44} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 7631b4075..42fab1e6d 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -25,7 +25,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2013.03.28 23:10} +\edef\contextversion{2013.03.29 00:44} %D For those who want to use this: diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 244c588ae..25b90ab1e 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index 3beebc8e5..03431a89e 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/context/base/trac-xml.lua b/tex/context/base/trac-xml.lua index 3301b4137..cd8b8c0a5 100644 --- a/tex/context/base/trac-xml.lua +++ b/tex/context/base/trac-xml.lua @@ -132,25 +132,27 @@ function reporters.help(t,...) end end -function reporters.export(t,method,filename) +function reporters.export(t,methods,filename) if not xmlfound(t) then return exporthelp(t) end - if not method or method == "" then - method = environment.arguments["exporthelp"] + if not methods or methods == "" then + methods = environment.arguments["exporthelp"] end if not filename or filename == "" then filename = environment.files[1] end dofile(resolvers.findfile("trac-exp.lua","tex")) local exporters = logs.exporters - if not exporters or not method then + if not exporters or not methods then return exporthelp(t) end - if method == "all" then - method = table.keys(exporters) + if methods == "all" then + methods = table.keys(exporters) + elseif type(methods) == "string" then + methods = utilities.parsers.settings_to_array(methods) else - method = { method } + return exporthelp(t) end if type(filename) ~= "string" or filename == "" then filename = false @@ -158,17 +160,24 @@ function reporters.export(t,method,filename) t.report("export file %a will not be saved on the current path (safeguard)",filename) return end - for i=1,#method do - local m = method[i] - local result = exporters[m](t,m) - if result and result ~= "" then - if filename then - local fullname = file.replacesuffix(filename,m) - t.report("saving export in %a",fullname) - io.savedata(fullname,result) + for i=1,#methods do + local method = methods[i] + local exporter = exporters[method] + if exporter then + local result = exporter(t,method) + if result and result ~= "" then + if filename then + local fullname = file.replacesuffix(filename,method) + t.report("saving export in %a",fullname) + io.savedata(fullname,result) + else + reporters.lines(t,result) + end else - reporters.lines(t,result) + t.report("no output from exporter %a",method) end + else + t.report("unknown exporter %a",method) end end end diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 11395bd08..73c6a086e 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/28/13 23:10:34 +-- merge date : 03/29/13 00:44:04 do -- begin closure to overcome local limits and interference -- cgit v1.2.3