From 7081daa053bbefd85d24d99e127da2a61a3cb7a5 Mon Sep 17 00:00:00 2001 From: Marius Date: Fri, 29 Mar 2013 02:00:16 +0200 Subject: beta 2013.03.29 00:44 --- doc/context/scripts/mkii/ctxtools.xml | 2 - doc/context/scripts/mkii/pdftools.xml | 2 - doc/context/scripts/mkii/pstopdf.xml | 2 - doc/context/scripts/mkii/rlxtools.xml | 2 - doc/context/scripts/mkii/texexec.xml | 2 - doc/context/scripts/mkii/texmfstart.html | 94 ++++++ doc/context/scripts/mkii/texmfstart.man | 147 ++++++++ doc/context/scripts/mkii/texmfstart.xml | 78 +++++ doc/context/scripts/mkii/textools.xml | 2 - doc/context/scripts/mkii/texutil.xml | 2 - doc/context/scripts/mkiv/luatools.html | 59 ++++ doc/context/scripts/mkiv/luatools.man | 78 +++++ doc/context/scripts/mkiv/luatools.xml | 31 ++ doc/context/scripts/mkiv/mtx-base.html | 2 +- doc/context/scripts/mkiv/mtx-base.man | 2 +- doc/context/scripts/mkiv/mtx-base.xml | 4 +- scripts/context/lua/mtx-base.lua | 4 +- scripts/context/lua/mtx-mkii-help.lua | 376 --------------------- scripts/context/lua/mtxrun.lua | 47 +-- scripts/context/stubs/mswin/ctxtools.exe | Bin 0 -> 6144 bytes scripts/context/stubs/mswin/mtxrun.lua | 47 +-- scripts/context/stubs/mswin/pstopdf.exe | Bin 0 -> 6144 bytes scripts/context/stubs/unix/ctxtools | 2 + scripts/context/stubs/unix/mtxrun | 47 +-- scripts/context/stubs/unix/pstopdf | 2 + 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 +- 35 files changed, 611 insertions(+), 474 deletions(-) create mode 100644 doc/context/scripts/mkii/texmfstart.html create mode 100644 doc/context/scripts/mkii/texmfstart.man create mode 100644 doc/context/scripts/mkii/texmfstart.xml create mode 100644 doc/context/scripts/mkiv/luatools.html create mode 100644 doc/context/scripts/mkiv/luatools.man create mode 100644 doc/context/scripts/mkiv/luatools.xml delete mode 100644 scripts/context/lua/mtx-mkii-help.lua create mode 100644 scripts/context/stubs/mswin/ctxtools.exe create mode 100644 scripts/context/stubs/mswin/pstopdf.exe create mode 100644 scripts/context/stubs/unix/ctxtools create mode 100644 scripts/context/stubs/unix/pstopdf diff --git a/doc/context/scripts/mkii/ctxtools.xml b/doc/context/scripts/mkii/ctxtools.xml index 9586270ce..8f51cd93a 100644 --- a/doc/context/scripts/mkii/ctxtools.xml +++ b/doc/context/scripts/mkii/ctxtools.xml @@ -28,6 +28,4 @@ - - diff --git a/doc/context/scripts/mkii/pdftools.xml b/doc/context/scripts/mkii/pdftools.xml index 3b903ff4c..292ef4f88 100644 --- a/doc/context/scripts/mkii/pdftools.xml +++ b/doc/context/scripts/mkii/pdftools.xml @@ -19,6 +19,4 @@ - - diff --git a/doc/context/scripts/mkii/pstopdf.xml b/doc/context/scripts/mkii/pstopdf.xml index f3a63c0e2..d7a7de0ae 100644 --- a/doc/context/scripts/mkii/pstopdf.xml +++ b/doc/context/scripts/mkii/pstopdf.xml @@ -13,6 +13,4 @@ - - diff --git a/doc/context/scripts/mkii/rlxtools.xml b/doc/context/scripts/mkii/rlxtools.xml index b89671fdc..8a221eccf 100644 --- a/doc/context/scripts/mkii/rlxtools.xml +++ b/doc/context/scripts/mkii/rlxtools.xml @@ -13,6 +13,4 @@ - - diff --git a/doc/context/scripts/mkii/texexec.xml b/doc/context/scripts/mkii/texexec.xml index c3cb6127b..8f85a4f25 100644 --- a/doc/context/scripts/mkii/texexec.xml +++ b/doc/context/scripts/mkii/texexec.xml @@ -27,6 +27,4 @@ - - diff --git a/doc/context/scripts/mkii/texmfstart.html b/doc/context/scripts/mkii/texmfstart.html new file mode 100644 index 000000000..534e95671 --- /dev/null +++ b/doc/context/scripts/mkii/texmfstart.html @@ -0,0 +1,94 @@ + + + + + + + + + + + texmfstart 7.0.0 + + + + + +
+
texmfstart 7.0.0
+
+
+
+
wiki: http://contextgarden.net | mail: ntg-context@ntg.nl | website: http://www.pragma-ade.nl
+
+
+
+ +
+
+

Command line options

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
flagvaluedescription
--scriptrun an mtx script (lua prefered method) (--noquotes), no script gives list
--executerun a script or program (texmfstart method) (--noquotes)
--resolveresolve prefixed arguments
--ctxluarun internally (using preloaded libs)
--internalrun script using built in libraries (same as --ctxlua)
--locatelocate given filename in database (default) or system (--first --all --detail)
--autotreeuse texmf tree cf. env texmfstart_tree or texmfstarttree
--treepathtotreeuse given texmf tree (default file: setuptex.tmf)
--environmentnameuse given (tmf) environment file
--pathrunpathgo to given path before execution
--ifchangedfilenameonly execute when given file has changed (md checksum)
--iftouchedold,newonly execute when given file has changed (time stamp)
--makestubscreate stubs for (context related) scripts
--removestubsremove stubs (context related) scripts
--stubpathbinpathpaths where stubs wil be written
--windowscreate windows (mswin) stubs
--unixcreate unix (linux) stubs
--verbosegive a bit more info
--trackerslistenable given trackers
--prognamestrformat or backend
--editlaunch editor with found file
--launchlaunch files like manuals, assumes os support (--all)
--timedrunrun a script and time its run
--autogenerateregenerate databases if needed (handy when used to run context in an editor)
--usekpseuse kpse as fallback (when no mkiv and cache installed, often slower)
--forcekpseforce using kpse (handy when no mkiv and cache installed but less functionality)
--prefixesshow supported prefixes
--generategenerate file database
--variablesshow configuration variables
--configurationsshow configuration order
--directivesshow (known) directives
--trackersshow (known) trackers
--experimentsshow (known) experiments
--expand-bracesexpand complex variable
--expand-pathexpand variable (resolve paths)
--expand-varexpand variable (resolve references)
--show-pathshow path expansion of ...
--var-valuereport value of variable
--find-filereport file location
--find-pathreport path of file
--patternstringfilter variables
+
+
+
+ + diff --git a/doc/context/scripts/mkii/texmfstart.man b/doc/context/scripts/mkii/texmfstart.man new file mode 100644 index 000000000..212097ff1 --- /dev/null +++ b/doc/context/scripts/mkii/texmfstart.man @@ -0,0 +1,147 @@ +.TH "mtxrun" "1" "01-01-2013" "version 1.31" "ConTeXt TDS Runner Tool" +.SH NAME +.B mtxrun +.SH SYNOPSIS +.B mtxrun [ +.I OPTIONS ... +.B ] [ +.I FILENAMES +.B ] +.SH DESCRIPTION +.B ConTeXt TDS Runner Tool +.SH OPTIONS +.TP +.B --script +run an mtx script (lua prefered method) (--noquotes), no script gives list +.TP +.B --execute +run a script or program (texmfstart method) (--noquotes) +.TP +.B --resolve +resolve prefixed arguments +.TP +.B --ctxlua +run internally (using preloaded libs) +.TP +.B --internal +run script using built in libraries (same as --ctxlua) +.TP +.B --locate +locate given filename in database (default) or system (--first --all --detail) +.TP +.B --autotree +use texmf tree cf. env texmfstart_tree or texmfstarttree +.TP +.B --tree=pathtotree +use given texmf tree (default file: setuptex.tmf) +.TP +.B --environment=name +use given (tmf) environment file +.TP +.B --path=runpath +go to given path before execution +.TP +.B --ifchanged=filename +only execute when given file has changed (md checksum) +.TP +.B --iftouched=old,new +only execute when given file has changed (time stamp) +.TP +.B --makestubs +create stubs for (context related) scripts +.TP +.B --removestubs +remove stubs (context related) scripts +.TP +.B --stubpath=binpath +paths where stubs wil be written +.TP +.B --windows +create windows (mswin) stubs +.TP +.B --unix +create unix (linux) stubs +.TP +.B --verbose +give a bit more info +.TP +.B --trackers=list +enable given trackers +.TP +.B --progname=str +format or backend +.TP +.B --edit +launch editor with found file +.TP +.B --launch +launch files like manuals, assumes os support (--all) +.TP +.B --timedrun +run a script and time its run +.TP +.B --autogenerate +regenerate databases if needed (handy when used to run context in an editor) +.TP +.B --usekpse +use kpse as fallback (when no mkiv and cache installed, often slower) +.TP +.B --forcekpse +force using kpse (handy when no mkiv and cache installed but less functionality) +.TP +.B --prefixes +show supported prefixes +.TP +.B --generate +generate file database +.TP +.B --variables +show configuration variables +.TP +.B --configurations +show configuration order +.TP +.B --directives +show (known) directives +.TP +.B --trackers +show (known) trackers +.TP +.B --experiments +show (known) experiments +.TP +.B --expand-braces +expand complex variable +.TP +.B --expand-path +expand variable (resolve paths) +.TP +.B --expand-var +expand variable (resolve references) +.TP +.B --show-path +show path expansion of ... +.TP +.B --var-value +report value of variable +.TP +.B --find-file +report file location +.TP +.B --find-path +report path of file +.TP +.B --pattern=string +filter variables +.SH AUTHOR +More information about ConTeXt and the tools that come with it can be found at: + + +.B "maillist:" +ntg-context@ntg.nl / http://www.ntg.nl/mailman/listinfo/ntg-context + +.B "webpage:" +http://www.pragma-ade.nl / http://tex.aanhet.net + +.B "wiki:" +http://contextgarden.net diff --git a/doc/context/scripts/mkii/texmfstart.xml b/doc/context/scripts/mkii/texmfstart.xml new file mode 100644 index 000000000..249a9bb54 --- /dev/null +++ b/doc/context/scripts/mkii/texmfstart.xml @@ -0,0 +1,78 @@ + + + mtxrun + ConTeXt TDS Runner Tool + 1.31 + + + + + run an mtx script (lua prefered method) (), no script gives list + run a script or program (texmfstart method) () + resolve prefixed arguments + run internally (using preloaded libs) + run script using built in libraries (same as ) + locate given filename in database (default) or system ( ) + + + use texmf tree cf. env texmfstart_tree or texmfstarttree + use given texmf tree (default file: setuptex.tmf) + use given (tmf) environment file + go to given path before execution + only execute when given file has changed (md checksum) + only execute when given file has changed (time stamp) + + + create stubs for (context related) scripts + remove stubs (context related) scripts + paths where stubs wil be written + create windows (mswin) stubs + create unix (linux) stubs + + + give a bit more info + enable given trackers + format or backend + + + launch editor with found file + launch files like manuals, assumes os support () + + + run a script and time its run + regenerate databases if needed (handy when used to run context in an editor) + + + use kpse as fallback (when no mkiv and cache installed, often slower) + force using kpse (handy when no mkiv and cache installed but less functionality) + + + show supported prefixes + + + generate file database + + + show configuration variables + show configuration order + + + show (known) directives + show (known) trackers + show (known) experiments + + + expand complex variable + expand variable (resolve paths) + expand variable (resolve references) + show path expansion of ... + report value of variable + report file location + report path of file + + + filter variables + + + + \ No newline at end of file diff --git a/doc/context/scripts/mkii/textools.xml b/doc/context/scripts/mkii/textools.xml index b8c085cc0..963c4a3a4 100644 --- a/doc/context/scripts/mkii/textools.xml +++ b/doc/context/scripts/mkii/textools.xml @@ -27,6 +27,4 @@ - - diff --git a/doc/context/scripts/mkii/texutil.xml b/doc/context/scripts/mkii/texutil.xml index 0687f8a64..fde9abd58 100644 --- a/doc/context/scripts/mkii/texutil.xml +++ b/doc/context/scripts/mkii/texutil.xml @@ -18,6 +18,4 @@ - - \ No newline at end of file diff --git a/doc/context/scripts/mkiv/luatools.html b/doc/context/scripts/mkiv/luatools.html new file mode 100644 index 000000000..6cb869a2b --- /dev/null +++ b/doc/context/scripts/mkiv/luatools.html @@ -0,0 +1,59 @@ + + + + + + + + + + + luatools 1.35 + + + + + +
+
luatools 1.35
+
+
+
+
wiki: http://contextgarden.net | mail: ntg-context@ntg.nl | website: http://www.pragma-ade.nl
+
+
+
+ +
+
+

Command line options

+ + + + + + + + + + + + + + + + + + + + + +
flagvaluedescription
--generategenerate file database
--variablesshow configuration variables
--configurationsshow configuration order
--expand-bracesexpand complex variable
--expand-pathexpand variable (resolve paths)
--expand-varexpand variable (resolve references)
--show-pathshow path expansion of ...
--var-valuereport value of variable
--find-filereport file location
--find-pathreport path of file
--make[or --ini] make luatex format
--run[or --fmt] run luatex format
--compileassemble and compile lua inifile
--verbosegive a bit more info
--allshow all found files
--formatstrfilter cf format specification (default 'tex', use 'any' for any match)
--patternstrfilter variables
--trackerslistenable given trackers
+
+
+
+ + diff --git a/doc/context/scripts/mkiv/luatools.man b/doc/context/scripts/mkiv/luatools.man new file mode 100644 index 000000000..145e9f608 --- /dev/null +++ b/doc/context/scripts/mkiv/luatools.man @@ -0,0 +1,78 @@ +.TH "luatools" "1" "01-01-2013" "version 1.35" "ConTeXt TDS Management Tool (aka luatools)" +.SH NAME +.B luatools +.SH SYNOPSIS +.B luatools [ +.I OPTIONS ... +.B ] [ +.I FILENAMES +.B ] +.SH DESCRIPTION +.B ConTeXt TDS Management Tool (aka luatools) +.SH OPTIONS +.TP +.B --generate +generate file database +.TP +.B --variables +show configuration variables +.TP +.B --configurations +show configuration order +.TP +.B --expand-braces +expand complex variable +.TP +.B --expand-path +expand variable (resolve paths) +.TP +.B --expand-var +expand variable (resolve references) +.TP +.B --show-path +show path expansion of ... +.TP +.B --var-value +report value of variable +.TP +.B --find-file +report file location +.TP +.B --find-path +report path of file +.TP +.B --make +[or --ini] make luatex format +.TP +.B --run +[or --fmt] run luatex format +.TP +.B --compile +assemble and compile lua inifile +.TP +.B --verbose +give a bit more info +.TP +.B --all +show all found files +.TP +.B --format=str +filter cf format specification (default 'tex', use 'any' for any match) +.TP +.B --pattern=str +filter variables +.TP +.B --trackers=list +enable given trackers +.SH AUTHOR +More information about ConTeXt and the tools that come with it can be found at: + + +.B "maillist:" +ntg-context@ntg.nl / http://www.ntg.nl/mailman/listinfo/ntg-context + +.B "webpage:" +http://www.pragma-ade.nl / http://tex.aanhet.net + +.B "wiki:" +http://contextgarden.net diff --git a/doc/context/scripts/mkiv/luatools.xml b/doc/context/scripts/mkiv/luatools.xml new file mode 100644 index 000000000..34460fffe --- /dev/null +++ b/doc/context/scripts/mkiv/luatools.xml @@ -0,0 +1,31 @@ + + + luatools + ConTeXt TDS Management Tool (aka luatools) + 1.35 + + + + + generate file database + show configuration variables + show configuration order + expand complex variable + expand variable (resolve paths) + expand variable (resolve references) + show path expansion of ... + report value of variable + report file location + report path of file + [or ] make luatex format + [or ] run luatex format + assemble and compile lua inifile + give a bit more info + show all found files + filter cf format specification (default 'tex', use 'any' for any match) + filter variables + enable given trackers + + + + \ No newline at end of file diff --git a/doc/context/scripts/mkiv/mtx-base.html b/doc/context/scripts/mkiv/mtx-base.html index 97ac24a7a..2d97a2811 100644 --- a/doc/context/scripts/mkiv/mtx-base.html +++ b/doc/context/scripts/mkiv/mtx-base.html @@ -44,7 +44,7 @@ --find-filereport file location --find-pathreport path of file --make[or --ini] make luatex format - --run[or --fmt run luatex format + --run[or --fmt] run luatex format --compileassemble and compile lua inifile --verbosegive a bit more info --allshow all found files diff --git a/doc/context/scripts/mkiv/mtx-base.man b/doc/context/scripts/mkiv/mtx-base.man index 372cc4ccf..6c72dcb07 100644 --- a/doc/context/scripts/mkiv/mtx-base.man +++ b/doc/context/scripts/mkiv/mtx-base.man @@ -45,7 +45,7 @@ report path of file [or --ini] make luatex format .TP .B --run -[or --fmt run luatex format +[or --fmt] run luatex format .TP .B --compile assemble and compile lua inifile diff --git a/doc/context/scripts/mkiv/mtx-base.xml b/doc/context/scripts/mkiv/mtx-base.xml index 7efaac7e1..de15b0188 100644 --- a/doc/context/scripts/mkiv/mtx-base.xml +++ b/doc/context/scripts/mkiv/mtx-base.xml @@ -18,8 +18,8 @@ report value of variable report file location report path of file - [or make luatex format - [or run luatex format + [or ] make luatex format + [or ] run luatex format assemble and compile lua inifile give a bit more info show all found files diff --git a/scripts/context/lua/mtx-base.lua b/scripts/context/lua/mtx-base.lua index e8bf991f4..bd6749717 100644 --- a/scripts/context/lua/mtx-base.lua +++ b/scripts/context/lua/mtx-base.lua @@ -27,8 +27,8 @@ local helpinfo = [[ report value of variable report file location report path of file - [or make luatex format - [or run luatex format + [or ] make luatex format + [or ] run luatex format assemble and compile lua inifile give a bit more info show all found files diff --git a/scripts/context/lua/mtx-mkii-help.lua b/scripts/context/lua/mtx-mkii-help.lua deleted file mode 100644 index e43f47bf0..000000000 --- a/scripts/context/lua/mtx-mkii-help.lua +++ /dev/null @@ -1,376 +0,0 @@ -local helpinfo = [[ - - - - texexec - TeXExec - 6.2.1 - - - - - make formats - check versions - process file - process mp file - process mpx file - process mp file to stand-alone graphics - process mp/ctx file to stand-alone graphics - list of file content - generate overview of figures - generate module documentation - impose pages (booklets) - select pages from file(s) - copy pages from file(s) - trim pages from file(s) - combine multiple pages - split file in pages - - - - - - -]] - - -local texexec = logs.application { - name = "texexec", - banner = "TeXExec 6.2.1", - helpinfo = helpinfo, -} - -local helpinfo = [[ - - - - texutil - TeXUtil - 9.1.0 - - - - - convert tui file into tuo file - generate figure dimensions file - filter essential log messages - remove most temporary files - remove all temporary files - generate documentation file from source - analyze pdf file - - - - - -]] - -local texutil = logs.application { - name = "texutil", - banner = "TeXUtil 9.1.0", - helpinfo = helpinfo, -} - -local helpinfo = [[ - - - - ctxtools - CtxTools - 1.3.5 - - - - - update context version - report context version - generate jedit syntax files [ - generate bbedit syntax files [ - generate scite syntax files [ - generate raw syntax files [ - generate interface files (xml) [nl de ..] - remove temporary files [ [basename] - [filename] - ) # no help, hidden temporary feature - convert pdftex mapfiles to dvipdfmx [ [texmfroot] - create doctype entity definition from enco-uc.tex - add context copyright notice [ - replace line-endings [ [pattern] - [filename] - download latest version and remake formats [ - remove utf bom [ - - - - - - -]] - -local ctxtools = logs.application { - name = "ctxtools", - banner = "CtxTools 1.3.5", - helpinfo = helpinfo, -} - -local helpinfo = [[ - - - - textools - TeXTools - 1.3.1 - - - - - [pattern] [ - [pattern] [ - [pattern] [ - [pattern] [ - filename [ - [pattern] [ - [pattern] [ - [pattern] [ - [texmfroot] [ - filename [ - fromroot toroot [ - [ [ - [ [ - filename - afmfile encodingname - tpm file (run in texmf root) - - - - - - -]] - -local textools = logs.application { - name = "textools", - banner = "TeXTools 1.3.1", - helpinfo = helpinfo, -} - -local helpinfo = [[ - - - - pdftools - PDFTools - 1.2.1 - - - - - [ - [ ] - filename [ - filename [ - filename - [ - [ - filename - - - - - - -]] - -local pdftools = logs.application { - name = "pdftools", - banner = "PDFTools 1.2.1", - helpinfo = helpinfo, -} - -local helpinfo = [[ - - - - tmftools - TMFTools - 1.1.0 - - - - - [ ] [pattern] - - - act as kpse server - - - - -]] - -local tmftools = logs.application { - name = "tmftools", - banner = "TMFTools 1.2.1", - helpinfo = helpinfo, -} - -local helpinfo = [[ - - - - xmltools - XMLTools - 1.2.2 - - - - - generate directory listing - generate graphic from mathml - report entities and elements [ ] - cleanup xml file [] - enhance xml file (partial) - filter elements from xml file [] - generate ddirectory listing - - - - -]] - -local xmltools = logs.application { - name = "xmltools", - banner = "XMLTools 1.2.1", - helpinfo = helpinfo, -} - -local helpinfo = [[ - - - - pstopdf - PStoPDF - 2.0.1 - - - - - handles exa request file - watch folders for conversions (untested) - - - - - - -]] - -local pstopdf = logs.application { - name = "pstopdf", - banner = "PStoPDF 2.0.1", - helpinfo = helpinfo, -} - -local helpinfo = [[ - - - - rlxtools - RlxTools - 1.0.1 - - - - - [ manipulatorfile resourselog - [ filename - - - - - - -]] - -local rlxtools = logs.application { - name = "rlxtools", - banner = "RlxTools 1.0.1", - helpinfo = helpinfo, -} - -local helpinfo = [[ - - - - imgtopdf - ImgToPdf - 1.1.2 - - - - - convert image into pdf - level of compression in percent - image depth in bits - colorspace (rgb,cmyk,gray) - quality in percent - path where files are looked for - path where files end up - determine settings automatically - - - - -]] - -local imgtopdf = logs.application { - name = "imgtopdf", - banner = "ImgToPdf 1.1.2", - helpinfo = helpinfo, -} - --- texmfstart.rb is normally replaced by mtxrun --- runtools.rb is run from within context --- concheck.rb is run from within editors --- texsync.rb is no longer in the zip --- mpstools.rb is no longer in the zip --- rscortool.rb is only run indirectly --- rsfiltool.rb is only run indirectly --- rslibtool.rb is only run indirectly - - -local application = logs.application { - name = "mkii-help", - banner = "MkII Help generator 1.00", -} - -local filename = environment.files[1] - -if not filename then - application.report("no mkii script given") - return -end - -local mkiiapplication - -if filename == "texexec" then mkiiapplication = texexec -elseif filename == "texutil" then mkiiapplication = texutil -elseif filename == "ctxtools" then mkiiapplication = ctxtools -elseif filename == "textools" then mkiiapplication = textools -elseif filename == "pdftools" then mkiiapplication = pdftools -elseif filename == "tmftools" then mkiiapplication = tmftools -elseif filename == "xmltools" then mkiiapplication = xmltools -elseif filename == "pstopdf" then mkiiapplication = pstopdf -elseif filename == "rlxtools" then mkiiapplication = rlxtools -elseif filename == "imgtopdf" then mkiiapplication = imgtopdf end - -if not mkiiapplication then - application.report("no valid mkii script given") - return -end - -if environment.argument("exporthelp") then - mkiiapplication.export(environment.argument("exporthelp"),environment.files[2]) -else - mkiiapplication.help() -end diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index 49c43be78..22089df7a 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -11211,7 +11211,7 @@ do -- create closure to overcome 200 locals limit package.loaded["trac-xml"] = package.loaded["trac-xml"] or true --- original size: 5962, stripped down to: 4596 +-- original size: 6351, stripped down to: 4919 if not modules then modules={} end modules ['trac-xml']={ version=1.001, @@ -11324,25 +11324,27 @@ function reporters.help(t,...) reporthelp(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 @@ -11350,17 +11352,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 @@ -15614,8 +15623,8 @@ end -- of closure -- used libraries : l-lua.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 luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 644433 --- stripped bytes : 232542 +-- original bytes : 644822 +-- stripped bytes : 232608 -- end library merge diff --git a/scripts/context/stubs/mswin/ctxtools.exe b/scripts/context/stubs/mswin/ctxtools.exe new file mode 100644 index 000000000..2d45f2749 Binary files /dev/null and b/scripts/context/stubs/mswin/ctxtools.exe differ diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index 49c43be78..22089df7a 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -11211,7 +11211,7 @@ do -- create closure to overcome 200 locals limit package.loaded["trac-xml"] = package.loaded["trac-xml"] or true --- original size: 5962, stripped down to: 4596 +-- original size: 6351, stripped down to: 4919 if not modules then modules={} end modules ['trac-xml']={ version=1.001, @@ -11324,25 +11324,27 @@ function reporters.help(t,...) reporthelp(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 @@ -11350,17 +11352,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 @@ -15614,8 +15623,8 @@ end -- of closure -- used libraries : l-lua.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 luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 644433 --- stripped bytes : 232542 +-- original bytes : 644822 +-- stripped bytes : 232608 -- end library merge diff --git a/scripts/context/stubs/mswin/pstopdf.exe b/scripts/context/stubs/mswin/pstopdf.exe new file mode 100644 index 000000000..2d45f2749 Binary files /dev/null and b/scripts/context/stubs/mswin/pstopdf.exe differ diff --git a/scripts/context/stubs/unix/ctxtools b/scripts/context/stubs/unix/ctxtools new file mode 100644 index 000000000..2e6bd4afa --- /dev/null +++ b/scripts/context/stubs/unix/ctxtools @@ -0,0 +1,2 @@ +#!/bin/sh +mtxrun --script ctxtools "$@" diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index 49c43be78..22089df7a 100644 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -11211,7 +11211,7 @@ do -- create closure to overcome 200 locals limit package.loaded["trac-xml"] = package.loaded["trac-xml"] or true --- original size: 5962, stripped down to: 4596 +-- original size: 6351, stripped down to: 4919 if not modules then modules={} end modules ['trac-xml']={ version=1.001, @@ -11324,25 +11324,27 @@ function reporters.help(t,...) reporthelp(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 @@ -11350,17 +11352,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 @@ -15614,8 +15623,8 @@ end -- of closure -- used libraries : l-lua.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 luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 644433 --- stripped bytes : 232542 +-- original bytes : 644822 +-- stripped bytes : 232608 -- end library merge diff --git a/scripts/context/stubs/unix/pstopdf b/scripts/context/stubs/unix/pstopdf new file mode 100644 index 000000000..116f5f4a3 --- /dev/null +++ b/scripts/context/stubs/unix/pstopdf @@ -0,0 +1,2 @@ +#!/bin/sh +mtxrun --script pstopdf "$@" 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