From 41df6a896ad3ab1d8bb6286423e9540b2b34f576 Mon Sep 17 00:00:00 2001 From: Marius Date: Wed, 20 Mar 2013 23:00:13 +0200 Subject: beta 2013.03.20 21:07 --- context/data/scite/scite-context.properties | 2 +- doc/context/scripts/context.html | 552 +++++++++++++++++++++ doc/context/scripts/context.xml | 182 +++++++ doc/context/scripts/mtx-context.html | 552 +++++++++++++++++++++ doc/context/scripts/mtx-context.man | 154 ++++++ doc/context/scripts/mtx-context.xml | 182 +++++++ doc/context/scripts/mtx-fonts.html | 387 +++++++++++++++ doc/context/scripts/mtx-fonts.man | 53 ++ doc/context/scripts/mtx-fonts.xml | 59 +++ doc/context/scripts/mtxrun.html | 527 ++++++++++++++++++++ doc/context/scripts/mtxrun.man | 137 +++++ doc/context/scripts/mtxrun.xml | 79 +++ scripts/context/lua/mtx-context.lua | 260 +++++++--- scripts/context/lua/mtx-fonts.lua | 146 +++--- scripts/context/lua/mtxrun.lua | 326 ++++++++---- scripts/context/stubs/mswin/mtxrun.lua | 326 ++++++++---- scripts/context/stubs/unix/mtxrun | 326 ++++++++---- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4137 -> 4134 bytes tex/context/base/context-version.png | Bin 40482 -> 40182 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/lxml-tab.lua | 37 +- tex/context/base/lxml-tex.lua | 62 +-- tex/context/base/status-files.pdf | Bin 24801 -> 24788 bytes tex/context/base/status-lua.pdf | Bin 211429 -> 211561 bytes tex/context/base/status-mkiv.lua | 12 + tex/context/base/trac-exp.lua | 190 +++++++ tex/context/base/trac-log.lua | 61 ++- tex/context/base/trac-xml.lua | 92 ++++ tex/context/base/util-mrg.lua | 2 +- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 33 files changed, 4259 insertions(+), 457 deletions(-) create mode 100644 doc/context/scripts/context.html create mode 100644 doc/context/scripts/context.xml create mode 100644 doc/context/scripts/mtx-context.html create mode 100644 doc/context/scripts/mtx-context.man create mode 100644 doc/context/scripts/mtx-context.xml create mode 100644 doc/context/scripts/mtx-fonts.html create mode 100644 doc/context/scripts/mtx-fonts.man create mode 100644 doc/context/scripts/mtx-fonts.xml create mode 100644 doc/context/scripts/mtxrun.html create mode 100644 doc/context/scripts/mtxrun.man create mode 100644 doc/context/scripts/mtxrun.xml create mode 100644 tex/context/base/trac-exp.lua create mode 100644 tex/context/base/trac-xml.lua diff --git a/context/data/scite/scite-context.properties b/context/data/scite/scite-context.properties index 995c1299c..571396b58 100644 --- a/context/data/scite/scite-context.properties +++ b/context/data/scite/scite-context.properties @@ -63,7 +63,7 @@ open.suffix.$(file.patterns.context)=.tex # Example : patterns file.patterns.xml= -file.patterns.example=*.xml;*.xsl;*.xsd;*.fo;*.exa;*.rlb;*.rlg;*.rlv;*.rng;*.xfdf;*.xslt;*.dtd;*.lmx;*.htm;*.html;*.ctx;*.export; +file.patterns.example=*.xml;*.xsl;*.xsd;*.fo;*.exa;*.rlb;*.rlg;*.rlv;*.rng;*.xfdf;*.xslt;*.dtd;*.lmx;*.htm;*.html;*.xhtml*.ctx;*.export; open.suffix.$(file.patterns.example)=.xml filter.example=eXaMpLe|$(file.patterns.example)| #~ lexer.$(file.patterns.example)=xml diff --git a/doc/context/scripts/context.html b/doc/context/scripts/context.html new file mode 100644 index 000000000..4edd372de --- /dev/null +++ b/doc/context/scripts/context.html @@ -0,0 +1,552 @@ + + + + + + + + + ConTeXt Process Management 0.60 + + + + +
+
+
+ ConTeXt Process Management 0.60
+
+
+
+
+
+ wiki: http://contextgarden.net | mail: ntg-context@ntg.nl | website: http://www.pragma-ade.nl
+
+
+
+
+
+
+
+
+ +
+
+

Command line options

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
flagvaluedescription
basic
--runprocess (one or more) files (default action)
--makecreate context formats
--ctx=nameuse ctx file (process management specification)
--interfaceuse specified user interface (default: en)
--autopdfclose pdf file in viewer and start pdf viewer afterwards
--purgepurge files either or not after a run (--pattern=...)
--purgeallpurge all files either or not after a run (--pattern=...)
--usemodulelistload the given module or style, normally part of the distribution
--environmentlistload the given environment file first (document styles)
--modelistenable given the modes (conditional processing in styles)
--pathlistalso consult the given paths when files are looked for
--argumentslistset variables that can be consulted during a run (key/value pairs)
--randomseednumberset the randomseed
--resultnamerename the resulting output to the given name
--trackerslistset tracker variables (show list with --showtrackers)
--directiveslistset directive variables (show list with --showdirectives)
--silentlistdisable logcatgories (show list with --showlogcategories)
--noconsoledisable logging to the console (logfile only)
--purgeresultpurge result file before run
--forcexmlforce xml stub
--forcecldforce cld (context lua document) stub
--forceluaforce lua stub (like texlua)
--forcempforce mp stub
--arrangerun extra imposition pass, given that the style sets up imposition
--noarrangeignore imposition specifications in the style
--jituse luajittex with jit turned off (only use the faster virtual machine)
--jitonuse luajittex with jit turned on (in most cases not faster, even slower)
--onceonly run once (no multipass data file is produced)
--batchmoderun without stopping and do not show messages on the console
--nonstopmoderun without stopping
--generategenerate file database etc. (as luatools does)
--paranoiddo not descend to .. and ../..
--versionreport installed context version
--globalassume given file present elsewhere
--nofileuse dummy file as jobname
expert
--touchupdate context version number (remake needed afterwards, also provide --expert)
--nostatisticsomit runtime statistics at the end of the run
--updateupdate context from website (not to be confused with contextgarden)
--profileprofile job (use: mtxrun --script profile --analyze)
--timinggenerate timing and statistics overview
--extra=nameprocess extra (mtx-context-... in distribution)
--extrasshow extras
special
--pdftexprocess file with texexec using pdftex
--xetexprocess file with texexec using xetex
--mkiiprocess file with texexec
--pipedo not check for file and enter scroll mode (--dummyfile=whatever.tmp)
+
+
+ + diff --git a/doc/context/scripts/context.xml b/doc/context/scripts/context.xml new file mode 100644 index 000000000..9105056d8 --- /dev/null +++ b/doc/context/scripts/context.xml @@ -0,0 +1,182 @@ + + + + mtx-context + ConTeXt Process Management + 0.60 + + + + + + process (one or more) files (default action) + + + create context formats + + + + + use ctx file (process management specification) + + + use specified user interface (default: en) + + + + + close pdf file in viewer and start pdf viewer afterwards + + + purge files either or not after a run (=...) + + + purge all files either or not after a run (=...) + + + + + load the given module or style, normally part of the distribution + + + load the given environment file first (document styles) + + + enable given the modes (conditional processing in styles) + + + also consult the given paths when files are looked for + + + set variables that can be consulted during a run (key/value pairs) + + + set the randomseed + + + rename the resulting output to the given name + + + set tracker variables (show list with ) + + + set directive variables (show list with ) + + + disable logcatgories (show list with ) + + + disable logging to the console (logfile only) + + + purge result file before run + + + + + force xml stub + + + force cld (context lua document) stub + + + force lua stub (like texlua) + + + force mp stub + + + + + run extra imposition pass, given that the style sets up imposition + + + ignore imposition specifications in the style + + + + + use luajittex with jit turned off (only use the faster virtual machine) + + + use luajittex with jit turned on (in most cases not faster, even slower) + + + + + only run once (no multipass data file is produced) + + + run without stopping and do not show messages on the console + + + run without stopping + + + + + generate file database etc. (as luatools does) + + + do not descend to .. and ../.. + + + report installed context version + + + + + assume given file present elsewhere + + + use dummy file as jobname + + + + + + + update context version number (remake needed afterwards, also provide ) + + + omit runtime statistics at the end of the run + + + update context from website (not to be confused with contextgarden) + + + profile job (use: mtxrun profile ) + + + generate timing and statistics overview + + + + + process extra (mtx-context-... in distribution) + + + show extras + + + + + + + process file with texexec using pdftex + + + process file with texexec using xetex + + + process file with texexec + + + + + do not check for file and enter scroll mode (=whatever.tmp) + + + + + diff --git a/doc/context/scripts/mtx-context.html b/doc/context/scripts/mtx-context.html new file mode 100644 index 000000000..4edd372de --- /dev/null +++ b/doc/context/scripts/mtx-context.html @@ -0,0 +1,552 @@ + + + + + + + + + ConTeXt Process Management 0.60 + + + + +
+
+
+ ConTeXt Process Management 0.60
+
+
+
+
+
+ wiki: http://contextgarden.net | mail: ntg-context@ntg.nl | website: http://www.pragma-ade.nl
+
+
+
+
+
+
+
+
+ +
+
+

Command line options

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
flagvaluedescription
basic
--runprocess (one or more) files (default action)
--makecreate context formats
--ctx=nameuse ctx file (process management specification)
--interfaceuse specified user interface (default: en)
--autopdfclose pdf file in viewer and start pdf viewer afterwards
--purgepurge files either or not after a run (--pattern=...)
--purgeallpurge all files either or not after a run (--pattern=...)
--usemodulelistload the given module or style, normally part of the distribution
--environmentlistload the given environment file first (document styles)
--modelistenable given the modes (conditional processing in styles)
--pathlistalso consult the given paths when files are looked for
--argumentslistset variables that can be consulted during a run (key/value pairs)
--randomseednumberset the randomseed
--resultnamerename the resulting output to the given name
--trackerslistset tracker variables (show list with --showtrackers)
--directiveslistset directive variables (show list with --showdirectives)
--silentlistdisable logcatgories (show list with --showlogcategories)
--noconsoledisable logging to the console (logfile only)
--purgeresultpurge result file before run
--forcexmlforce xml stub
--forcecldforce cld (context lua document) stub
--forceluaforce lua stub (like texlua)
--forcempforce mp stub
--arrangerun extra imposition pass, given that the style sets up imposition
--noarrangeignore imposition specifications in the style
--jituse luajittex with jit turned off (only use the faster virtual machine)
--jitonuse luajittex with jit turned on (in most cases not faster, even slower)
--onceonly run once (no multipass data file is produced)
--batchmoderun without stopping and do not show messages on the console
--nonstopmoderun without stopping
--generategenerate file database etc. (as luatools does)
--paranoiddo not descend to .. and ../..
--versionreport installed context version
--globalassume given file present elsewhere
--nofileuse dummy file as jobname
expert
--touchupdate context version number (remake needed afterwards, also provide --expert)
--nostatisticsomit runtime statistics at the end of the run
--updateupdate context from website (not to be confused with contextgarden)
--profileprofile job (use: mtxrun --script profile --analyze)
--timinggenerate timing and statistics overview
--extra=nameprocess extra (mtx-context-... in distribution)
--extrasshow extras
special
--pdftexprocess file with texexec using pdftex
--xetexprocess file with texexec using xetex
--mkiiprocess file with texexec
--pipedo not check for file and enter scroll mode (--dummyfile=whatever.tmp)
+
+
+ + diff --git a/doc/context/scripts/mtx-context.man b/doc/context/scripts/mtx-context.man new file mode 100644 index 000000000..439f7bb9f --- /dev/null +++ b/doc/context/scripts/mtx-context.man @@ -0,0 +1,154 @@ +.TH ConTeXt Process Management 0.60 +.SH "NAME" +mtx-context.SH "SYNOPSIS" +\fBmtx-context\fP [ \fIOPTIONS\fP ... ] +.SH "DESCRIPTION" +ConTeXt Process Management + +.SH "OPTIONS: BASIC" +.TP +.B --run +process (one or more) files (default action) +.TP +.B --make +create context formats +.TP +.B --ctx=name +use ctx file (process management specification) +.TP +.B --interface +use specified user interface (default: en) +.TP +.B --autopdf +close pdf file in viewer and start pdf viewer afterwards +.TP +.B --purge +purge files either or not after a run (--pattern=...) +.TP +.B --purgeall +purge all files either or not after a run (--pattern=...) +.TP +.B --usemodule=list +load the given module or style, normally part of the distribution +.TP +.B --environment=list +load the given environment file first (document styles) +.TP +.B --mode=list +enable given the modes (conditional processing in styles) +.TP +.B --path=list +also consult the given paths when files are looked for +.TP +.B --arguments=list +set variables that can be consulted during a run (key/value pairs) +.TP +.B --randomseed=number +set the randomseed +.TP +.B --result=name +rename the resulting output to the given name +.TP +.B --trackers=list +set tracker variables (show list with --showtrackers) +.TP +.B --directives=list +set directive variables (show list with --showdirectives) +.TP +.B --silent=list +disable logcatgories (show list with --showlogcategories) +.TP +.B --noconsole +disable logging to the console (logfile only) +.TP +.B --purgeresult +purge result file before run +.TP +.B --forcexml +force xml stub +.TP +.B --forcecld +force cld (context lua document) stub +.TP +.B --forcelua +force lua stub (like texlua) +.TP +.B --forcemp +force mp stub +.TP +.B --arrange +run extra imposition pass, given that the style sets up imposition +.TP +.B --noarrange +ignore imposition specifications in the style +.TP +.B --jit +use luajittex with jit turned off (only use the faster virtual machine) +.TP +.B --jiton +use luajittex with jit turned on (in most cases not faster, even slower) +.TP +.B --once +only run once (no multipass data file is produced) +.TP +.B --batchmode +run without stopping and do not show messages on the console +.TP +.B --nonstopmode +run without stopping +.TP +.B --generate +generate file database etc. (as luatools does) +.TP +.B --paranoid +do not descend to .. and ../.. +.TP +.B --version +report installed context version +.TP +.B --global +assume given file present elsewhere +.TP +.B --nofile +use dummy file as jobname +.SH "OPTIONS: EXPERT" +.TP +.B --touch +update context version number (remake needed afterwards, also provide --expert) +.TP +.B --nostatistics +omit runtime statistics at the end of the run +.TP +.B --update +update context from website (not to be confused with contextgarden) +.TP +.B --profile +profile job (use: mtxrun --script profile --analyze) +.TP +.B --timing +generate timing and statistics overview +.TP +.B --extra=name +process extra (mtx-context-... in distribution) +.TP +.B --extras +show extras +.SH "OPTIONS: SPECIAL" +.TP +.B --pdftex +process file with texexec using pdftex +.TP +.B --xetex +process file with texexec using xetex +.TP +.B --mkii +process file with texexec +.TP +.B --pipe +do not check for file and enter scroll mode (--dummyfile=whatever.tmp) +.SH "AUTHOR" +More information about ConTeXt and the tools that come with it can be found at: + +maillist : ntg-context@ntg.nl / http://www.ntg.nl/mailman/listinfo/ntg-context +webpage : http://www.pragma-ade.nl / http://tex.aanhet.net +wiki : http://contextgarden.net diff --git a/doc/context/scripts/mtx-context.xml b/doc/context/scripts/mtx-context.xml new file mode 100644 index 000000000..9105056d8 --- /dev/null +++ b/doc/context/scripts/mtx-context.xml @@ -0,0 +1,182 @@ + + + + mtx-context + ConTeXt Process Management + 0.60 + + + + + + process (one or more) files (default action) + + + create context formats + + + + + use ctx file (process management specification) + + + use specified user interface (default: en) + + + + + close pdf file in viewer and start pdf viewer afterwards + + + purge files either or not after a run (=...) + + + purge all files either or not after a run (=...) + + + + + load the given module or style, normally part of the distribution + + + load the given environment file first (document styles) + + + enable given the modes (conditional processing in styles) + + + also consult the given paths when files are looked for + + + set variables that can be consulted during a run (key/value pairs) + + + set the randomseed + + + rename the resulting output to the given name + + + set tracker variables (show list with ) + + + set directive variables (show list with ) + + + disable logcatgories (show list with ) + + + disable logging to the console (logfile only) + + + purge result file before run + + + + + force xml stub + + + force cld (context lua document) stub + + + force lua stub (like texlua) + + + force mp stub + + + + + run extra imposition pass, given that the style sets up imposition + + + ignore imposition specifications in the style + + + + + use luajittex with jit turned off (only use the faster virtual machine) + + + use luajittex with jit turned on (in most cases not faster, even slower) + + + + + only run once (no multipass data file is produced) + + + run without stopping and do not show messages on the console + + + run without stopping + + + + + generate file database etc. (as luatools does) + + + do not descend to .. and ../.. + + + report installed context version + + + + + assume given file present elsewhere + + + use dummy file as jobname + + + + + + + update context version number (remake needed afterwards, also provide ) + + + omit runtime statistics at the end of the run + + + update context from website (not to be confused with contextgarden) + + + profile job (use: mtxrun profile ) + + + generate timing and statistics overview + + + + + process extra (mtx-context-... in distribution) + + + show extras + + + + + + + process file with texexec using pdftex + + + process file with texexec using xetex + + + process file with texexec + + + + + do not check for file and enter scroll mode (=whatever.tmp) + + + + + diff --git a/doc/context/scripts/mtx-fonts.html b/doc/context/scripts/mtx-fonts.html new file mode 100644 index 000000000..b5372178c --- /dev/null +++ b/doc/context/scripts/mtx-fonts.html @@ -0,0 +1,387 @@ + + + + + + + + + ConTeXt Font Database Management 0.21 + + + + +
+
+
+ ConTeXt Font Database Management 0.21
+
+
+
+
+
+ wiki: http://contextgarden.net | mail: ntg-context@ntg.nl | website: http://www.pragma-ade.nl
+
+
+
+
+
+
+
+
+ +
+
+

Command line options

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
flagvaluedescription
--savesave open type font in raw table
--unpacksave a tma file in a more readale format
--reloadgenerate new font database (use --force when in doubt)
--reload--simple:generate luatex-fonts-names.lua (not for context!)
--list--name: list installed fonts, filter by name [--pattern]
--list--spec: list installed fonts, filter by spec [--filter]
--list--file: list installed fonts, filter by file [--pattern]
--patternstrfilter files using pattern
--filterlistkey-value pairs
--allshow all found instances (combined with other flags)
--infogive more details
--tracklistenable trackers
--statisticssome info about the database
+

Examples of searches

mtxrun --script font --list somename (== --pattern=*somename*)

mtxrun --script font --list --name somename
mtxrun --script font --list --name --pattern=*somename*

mtxrun --script font --list --spec somename
mtxrun --script font --list --spec somename-bold-italic
mtxrun --script font --list --spec --pattern=*somename*
mtxrun --script font --list --spec --filter="fontname=somename"
mtxrun --script font --list --spec --filter="familyname=somename,weight=bold,style=italic,width=condensed"
mtxrun --script font --list --spec --filter="familyname=crap*,weight=bold,style=italic"

mtxrun --script font --list --all
mtxrun --script font --list --file somename
mtxrun --script font --list --file --all somename
mtxrun --script font --list --file --pattern=*somename*

+
+ + diff --git a/doc/context/scripts/mtx-fonts.man b/doc/context/scripts/mtx-fonts.man new file mode 100644 index 000000000..46dc2cc8e --- /dev/null +++ b/doc/context/scripts/mtx-fonts.man @@ -0,0 +1,53 @@ +.TH ConTeXt Font Database Management 0.21 +.SH "NAME" +mtx-fonts.SH "SYNOPSIS" +\fBmtx-fonts\fP [ \fIOPTIONS\fP ... ] +.SH "DESCRIPTION" +ConTeXt Font Database Management + +.SH "OPTIONS" +.TP +.B --save +save open type font in raw table +.TP +.B --unpack +save a tma file in a more readale format +.TP +.B --reload +generate new font database (use --force when in doubt) +.TP +.B --reload +--simple:generate luatex-fonts-names.lua (not for context!) +.TP +.B --list +--name: list installed fonts, filter by name [--pattern] +.TP +.B --list +--spec: list installed fonts, filter by spec [--filter] +.TP +.B --list +--file: list installed fonts, filter by file [--pattern] +.TP +.B --pattern=str +filter files using pattern +.TP +.B --filter=list +key-value pairs +.TP +.B --all +show all found instances (combined with other flags) +.TP +.B --info +give more details +.TP +.B --track=list +enable trackers +.TP +.B --statistics +some info about the database +.SH "AUTHOR" +More information about ConTeXt and the tools that come with it can be found at: + +maillist : ntg-context@ntg.nl / http://www.ntg.nl/mailman/listinfo/ntg-context +webpage : http://www.pragma-ade.nl / http://tex.aanhet.net +wiki : http://contextgarden.net diff --git a/doc/context/scripts/mtx-fonts.xml b/doc/context/scripts/mtx-fonts.xml new file mode 100644 index 000000000..4cd799ac3 --- /dev/null +++ b/doc/context/scripts/mtx-fonts.xml @@ -0,0 +1,59 @@ + + + + mtx-fonts + ConTeXt Font Database Management + 0.21 + + + + + save open type font in raw table + save a tma file in a more readale format + + + generate new font database (use when in doubt) + :generate luatex-fonts-names.lua (not for context!) + + + : list installed fonts, filter by name [] + : list installed fonts, filter by spec [] + : list installed fonts, filter by file [] + + + filter files using pattern + key-value pairs + show all found instances (combined with other flags) + give more details + enable trackers + some info about the database + + + + + + Examples of searches + + mtxrun --script font --list somename (== --pattern=*somename*) + + + mtxrun --script font --list --name somename + mtxrun --script font --list --name --pattern=*somename* + + + mtxrun --script font --list --spec somename + mtxrun --script font --list --spec somename-bold-italic + mtxrun --script font --list --spec --pattern=*somename* + mtxrun --script font --list --spec --filter="fontname=somename" + mtxrun --script font --list --spec --filter="familyname=somename,weight=bold,style=italic,width=condensed" + mtxrun --script font --list --spec --filter="familyname=crap*,weight=bold,style=italic" + + + mtxrun --script font --list --all + mtxrun --script font --list --file somename + mtxrun --script font --list --file --all somename + mtxrun --script font --list --file --pattern=*somename* + + + + diff --git a/doc/context/scripts/mtxrun.html b/doc/context/scripts/mtxrun.html new file mode 100644 index 000000000..ffae8cec7 --- /dev/null +++ b/doc/context/scripts/mtxrun.html @@ -0,0 +1,527 @@ + + + + + + + + + ConTeXt TDS Runner Tool 1.31 + + + + +
+
+
+ ConTeXt TDS Runner Tool 1.31
+
+
+
+
+
+ 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 an 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/mtxrun.man b/doc/context/scripts/mtxrun.man new file mode 100644 index 000000000..744146fc8 --- /dev/null +++ b/doc/context/scripts/mtxrun.man @@ -0,0 +1,137 @@ +.TH ConTeXt TDS Runner Tool 1.31 +.SH "NAME" +mtxrun.SH "SYNOPSIS" +\fBmtxrun\fP [ \fIOPTIONS\fP ... ] +.SH "DESCRIPTION" +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 an 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: + +maillist : ntg-context@ntg.nl / http://www.ntg.nl/mailman/listinfo/ntg-context +webpage : http://www.pragma-ade.nl / http://tex.aanhet.net +wiki : http://contextgarden.net diff --git a/doc/context/scripts/mtxrun.xml b/doc/context/scripts/mtxrun.xml new file mode 100644 index 000000000..a7d4114d5 --- /dev/null +++ b/doc/context/scripts/mtxrun.xml @@ -0,0 +1,79 @@ + + + + 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 an 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 + + + + diff --git a/scripts/context/lua/mtx-context.lua b/scripts/context/lua/mtx-context.lua index d06b60b77..ad25b52ce 100644 --- a/scripts/context/lua/mtx-context.lua +++ b/scripts/context/lua/mtx-context.lua @@ -19,85 +19,195 @@ local lpegpatterns, lpegmatch, Cs, P = lpeg.patterns, lpeg.match, lpeg.Cs, lpeg. local getargument = environment.getargument or environment.argument local setargument = environment.setargument -local basicinfo = [[ ---run process (one or more) files (default action) ---make create context formats - ---ctx=name use ctx file (process management specification) ---interface use specified user interface (default: en) - ---autopdf close pdf file in viewer and start pdf viewer afterwards ---purge(all) purge files either or not after a run (--pattern=...) - ---usemodule=list load the given module or style, normally part o fthe distribution ---environment=list load the given environment file first (document styles) ---mode=list enable given the modes (conditional processing in styles) ---path=list also consult the given paths when files are looked for ---arguments=list set variables that can be consulted during a run (key/value pairs) ---randomseed=number set the randomseed ---result=name rename the resulting output to the given name ---trackers=list set tracker variables (show list with --showtrackers) ---directives=list set directive variables (show list with --showdirectives) ---silent=list disable logcatgories (show list with --showlogcategories) ---noconsole disable logging to the console (logfile only) ---purgeresult purge result file before run - ---forcexml force xml stub ---forcecld force cld (context lua document) stub ---forcelua force lua stub (like texlua) ---forcemp force mp stub - ---arrange run extra imposition pass, given that the style sets up imposition ---noarrange ignore imposition specifications in the style - ---jit use luajittex with jit turned off (only use the faster virtual machine) ---jiton use luajittex with jit turned on (in most cases not faster, even slower) - ---once only run once (no multipass data file is produced) ---batchmode run without stopping and don't show messages on the console ---nonstopmode run without stopping - ---generate generate file database etc. (as luatools does) ---paranoid don't descend to .. and ../.. ---version report installed context version - ---global assume given file present elsewhere ---nofile use dummy file as jobname - ---expert expert options -]] - -local expertinfo = [[ -expert options: - ---touch update context version number (remake needed afterwards, also provide --expert) ---nostatistics omit runtime statistics at the end of the run ---update update context from website (not to be confused with contextgarden) ---profile profile job (use: mtxrun --script profile --analyze) ---timing generate timing and statistics overview - ---extra=name process extra (mtx-context- in distribution) ---extras show extras -]] - -local specialinfo = [[ -special options: - ---pdftex process file with texexec using pdftex ---xetex process file with texexec using xetex ---mkii process file with texexec - ---pipe don't check for file and enter scroll mode (--dummyfile=whatever.tmp) +local helpinfo = [[ + + + + mtx-context + ConTeXt Process Management + 0.60 + + + + + + process (one or more) files (default action) + + + create context formats + + + + + use ctx file (process management specification) + + + use specified user interface (default: en) + + + + + close pdf file in viewer and start pdf viewer afterwards + + + purge files either or not after a run (=...) + + + purge all files either or not after a run (=...) + + + + + load the given module or style, normally part of the distribution + + + load the given environment file first (document styles) + + + enable given the modes (conditional processing in styles) + + + also consult the given paths when files are looked for + + + set variables that can be consulted during a run (key/value pairs) + + + set the randomseed + + + rename the resulting output to the given name + + + set tracker variables (show list with ) + + + set directive variables (show list with ) + + + disable logcatgories (show list with ) + + + disable logging to the console (logfile only) + + + purge result file before run + + + + + force xml stub + + + force cld (context lua document) stub + + + force lua stub (like texlua) + + + force mp stub + + + + + run extra imposition pass, given that the style sets up imposition + + + ignore imposition specifications in the style + + + + + use luajittex with jit turned off (only use the faster virtual machine) + + + use luajittex with jit turned on (in most cases not faster, even slower) + + + + + only run once (no multipass data file is produced) + + + run without stopping and do not show messages on the console + + + run without stopping + + + + + generate file database etc. (as luatools does) + + + do not descend to .. and ../.. + + + report installed context version + + + + + assume given file present elsewhere + + + use dummy file as jobname + + + + + + + update context version number (remake needed afterwards, also provide ) + + + omit runtime statistics at the end of the run + + + update context from website (not to be confused with contextgarden) + + + profile job (use: mtxrun profile ) + + + generate timing and statistics overview + + + + + process extra (mtx-context-... in distribution) + + + show extras + + + + + + + process file with texexec using pdftex + + + process file with texexec using xetex + + + process file with texexec + + + + + do not check for file and enter scroll mode (=whatever.tmp) + + + + + ]] local application = logs.application { name = "mtx-context", banner = "ConTeXt Process Management 0.60", - helpinfo = { - basic = basicinfo, - extra = extrainfo, - expert = expertinfo, - } + helpinfo = helpinfo, } -- local luatexflags = { @@ -1468,6 +1578,8 @@ elseif getargument("extras") then scripts.context.extras(environment.files[1] or getargument("extras")) elseif getargument("extra") then scripts.context.extra() +elseif getargument("exporthelp") then + application.export(getargument("exporthelp"),environment.files[1]) elseif getargument("help") then if environment.files[1] == "extras" then scripts.context.extras() diff --git a/scripts/context/lua/mtx-fonts.lua b/scripts/context/lua/mtx-fonts.lua index 6dfd6b108..659059fa1 100644 --- a/scripts/context/lua/mtx-fonts.lua +++ b/scripts/context/lua/mtx-fonts.lua @@ -6,42 +6,70 @@ if not modules then modules = { } end modules ['mtx-fonts'] = { license = "see context related readme files" } -local helpinfo = [[ ---save save open type font in raw table ---unpack save a tma file in a more readale format - ---reload [--force] generate new font database (use force when in doubt) ---reload --simple generate 'luatex-fonts-names.lua' (not for context!) - ---list --name list installed fonts, filter by name [--pattern] ---list --spec list installed fonts, filter by spec [--filter] ---list --file list installed fonts, filter by file [--pattern] - ---pattern=str filter files using pattern ---filter=list key-value pairs ---all show all found instances (combined with other flags) ---info give more details ---track=list enable trackers ---statistics some info about the database - -examples of searches: +local getargument = environment.getargument +local setargument = environment.setargument +local givenfiles = environment.files -mtxrun --script font --list somename (== --pattern=*somename*) - -mtxrun --script font --list --name somename -mtxrun --script font --list --name --pattern=*somename* - -mtxrun --script font --list --spec somename -mtxrun --script font --list --spec somename-bold-italic -mtxrun --script font --list --spec --pattern=*somename* -mtxrun --script font --list --spec --filter="fontname=somename" -mtxrun --script font --list --spec --filter="familyname=somename,weight=bold,style=italic,width=condensed" -mtxrun --script font --list --spec --filter="familyname=crap*,weight=bold,style=italic" - -mtxrun --script font --list --all -mtxrun --script font --list --file somename -mtxrun --script font --list --file --all somename -mtxrun --script font --list --file --pattern=*somename* +local helpinfo = [[ + + + + mtx-fonts + ConTeXt Font Database Management + 0.21 + + + + + save open type font in raw table + save a tma file in a more readale format + + + generate new font database (use when in doubt) + :generate luatex-fonts-names.lua (not for context!) + + + : list installed fonts, filter by name [] + : list installed fonts, filter by spec [] + : list installed fonts, filter by file [] + + + filter files using pattern + key-value pairs + show all found instances (combined with other flags) + give more details + enable trackers + some info about the database + + + + + + Examples of searches + + mtxrun --script font --list somename (== --pattern=*somename*) + + + mtxrun --script font --list --name somename + mtxrun --script font --list --name --pattern=*somename* + + + mtxrun --script font --list --spec somename + mtxrun --script font --list --spec somename-bold-italic + mtxrun --script font --list --spec --pattern=*somename* + mtxrun --script font --list --spec --filter="fontname=somename" + mtxrun --script font --list --spec --filter="familyname=somename,weight=bold,style=italic,width=condensed" + mtxrun --script font --list --spec --filter="familyname=crap*,weight=bold,style=italic" + + + mtxrun --script font --list --all + mtxrun --script font --list --file somename + mtxrun --script font --list --file --all somename + mtxrun --script font --list --file --pattern=*somename* + + + + ]] local application = logs.application { @@ -139,10 +167,10 @@ function fonts.names.simple() end function scripts.fonts.reload() - if environment.argument("simple") then + if getargument("simple") then fonts.names.simple() else - fonts.names.load(true,environment.arguments.force) + fonts.names.load(true,arguments.force) end end @@ -210,7 +238,7 @@ end local function reloadbase(reload) if reload then report("fontnames, reloading font database") - names.load(true,environment.arguments.force) + names.load(true,arguments.force) report("fontnames, done\n\n") end end @@ -276,16 +304,16 @@ end function scripts.fonts.list() - local all = environment.argument("all") - local info = environment.argument("info") - local reload = environment.argument("reload") - local pattern = environment.argument("pattern") - local filter = environment.argument("filter") - local given = environment.files[1] + local all = getargument("all") + local info = getargument("info") + local reload = getargument("reload") + local pattern = getargument("pattern") + local filter = getargument("filter") + local given = givenfiles[1] reloadbase(reload) - if environment.argument("name") then + if getargument("name") then if pattern then --~ mtxrun --script font --list --name --pattern=*somename* list_matches(fonts.names.list(string.topattern(pattern,true),reload,all),info) @@ -297,7 +325,7 @@ function scripts.fonts.list() else report("not supported: --list --name ",name) end - elseif environment.argument("spec") then + elseif getargument("spec") then if pattern then --~ mtxrun --script font --list --spec --pattern=*somename* report("not supported: --list --spec --pattern",name) @@ -310,7 +338,7 @@ function scripts.fonts.list() else report("not supported: --list --spec ",name) end - elseif environment.argument("file") then + elseif getargument("file") then if pattern then --~ mtxrun --script font --list --file --pattern=*somename* list_specifications(fonts.names.collectfiles(string.topattern(pattern,true),reload,all),info) @@ -338,7 +366,7 @@ function scripts.fonts.list() end function scripts.fonts.unpack() - local name = file.removesuffix(file.basename(environment.files[1] or "")) + local name = file.removesuffix(file.basename(givenfiles[1] or "")) if name and name ~= "" then local cache = containers.define("fonts", "otf", 2.730, true) local cleanname = containers.cleanname(name) @@ -355,8 +383,8 @@ function scripts.fonts.unpack() end function scripts.fonts.save() - local name = environment.files[1] or "" - local sub = environment.files[2] or "" + local name = givenfiles[1] or "" + local sub = givenfiles[2] or "" local function save(savename,fontblob) if fontblob then savename = savename:lower() .. ".lua" @@ -396,21 +424,23 @@ function scripts.fonts.save() end end -if environment.argument("names") then - environment.setargument("reload",true) - environment.setargument("simple",true) +if getargument("names") then + setargument("reload",true) + setargument("simple",true) end -if environment.argument("list") then +if getargument("list") then scripts.fonts.list() -elseif environment.argument("reload") then +elseif getargument("reload") then scripts.fonts.reload() -elseif environment.argument("save") then +elseif getargument("save") then scripts.fonts.save() -elseif environment.argument("unpack") then +elseif getargument("unpack") then scripts.fonts.unpack() -elseif environment.argument("statistics") then +elseif getargument("statistics") then fonts.names.statistics() +elseif getargument("exporthelp") then + application.export(getargument("exporthelp"),givenfiles[1]) else application.help() end diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index 0648e94e7..92c9a763a 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -6072,7 +6072,7 @@ do -- create closure to overcome 200 locals limit package.loaded["trac-log"] = package.loaded["trac-log"] or true --- original size: 20644, stripped down to: 14615 +-- original size: 21510, stripped down to: 15167 if not modules then modules={} end modules ['trac-log']={ version=1.001, @@ -6137,6 +6137,7 @@ logs=logs or {} local logs=logs local moreinfo=[[ More information about ConTeXt and the tools that come with it can be found at: +]].."\n"..[[ maillist : ntg-context@ntg.nl / http://www.ntg.nl/mailman/listinfo/ntg-context webpage : http://www.pragma-ade.nl / http://tex.aanhet.net wiki : http://contextgarden.net @@ -6536,11 +6537,14 @@ function logs.reportbanner() end function logs.reportline () end function logs.simplelines () end function logs.help () end +local Carg,C,lpegmatch=lpeg.Carg,lpeg.C,lpeg.match +local p_newline=lpeg.patterns.newline +local linewise=( + Carg(1)*C((1-p_newline)^1)/function(t,s) t.report(s) end+Carg(1)*p_newline^2/function(t) t.report() end+p_newline +)^1 local function reportlines(t,str) if str then - for line in gmatch(str,"(.-)[\n\r]") do - t.report(line) - end + lpegmatch(linewise,str,1,t) end end local function reportbanner(t) @@ -6561,8 +6565,7 @@ local function reporthelp(t,...) if type(helpinfo)=="string" then reportlines(t,helpinfo) elseif type(helpinfo)=="table" then - local n=select("#",...) - for i=1,n do + for i=1,select("#",...) do reportlines(t,t.helpinfo[select(i,...)]) if i0 then dt[#dt+1]=spacing end - local resolved=(namespace=="" and xmlns[#xmlns]) or nsremap[namespace] or namespace + local resolved=namespace=="" and xmlns[#xmlns] or nsremap[namespace] or namespace top=stack[#stack] dt=top.dt local t={ ns=namespace or "",rn=resolved,tg=tag,at=at,dt={},__p__=top } @@ -8064,7 +8092,7 @@ local function add_begin(spacing,namespace,tag) if #spacing>0 then dt[#dt+1]=spacing end - local resolved=(namespace=="" and xmlns[#xmlns]) or nsremap[namespace] or namespace + local resolved=namespace=="" and xmlns[#xmlns] or nsremap[namespace] or namespace top={ ns=namespace or "",rn=resolved,tg=tag,at=at,dt={},__p__=stack[#stack] } setmetatable(top,mt) dt=top.dt @@ -8078,9 +8106,9 @@ local function add_end(spacing,namespace,tag) local toclose=remove(stack) top=stack[#stack] if #stack<1 then - errorstr=format("nothing to close with %s %s",tag,xml.checkerror(top,toclose) or "") + errorstr=formatters["unable to close %s %s"](tag,xml.checkerror(top,toclose) or "") elseif toclose.tg~=tag then - errorstr=format("unable to close %s with %s %s",toclose.tg,tag,xml.checkerror(top,toclose) or "") + errorstr=formatters["unable to close %s with %s %s"](toclose.tg,tag,xml.checkerror(top,toclose) or "") end dt=top.dt dt[#dt+1]=toclose @@ -8125,9 +8153,9 @@ local function attribute_specification_error(str) return str end xml.placeholders={ - unknown_dec_entity=function(str) return (str=="" and "&error;") or format("&%s;",str) end, - unknown_hex_entity=function(str) return format("&#x%s;",str) end, - unknown_any_entity=function(str) return format("&#x%s;",str) end, + unknown_dec_entity=function(str) return str=="" and "&error;" or formatters["&%s;"](str) end, + unknown_hex_entity=function(str) return formatters["&#x%s;"](str) end, + unknown_any_entity=function(str) return formatters["&#x%s;"](str) end, } local placeholders=xml.placeholders local function fromhex(s) @@ -8135,7 +8163,7 @@ local function fromhex(s) if n then return utfchar(n) else - return format("h:%s",s),true + return formatters["h:%s"](s),true end end local function fromdec(s) @@ -8143,7 +8171,7 @@ local function fromdec(s) if n then return utfchar(n) else - return format("d:%s",s),true + return formatters["d:%s"](s),true end end local rest=(1-P(";"))^0 @@ -8469,9 +8497,9 @@ local function _xmlconvert_(data,settings) if errorhandler then local currentresource=settings.currentresource if currentresource and currentresource~="" then - xml.errorhandler(format("load error in [%s]: %s",currentresource,errorstr)) + xml.errorhandler(formatters["load error in [%s]: %s"](currentresource,errorstr)) else - xml.errorhandler(format("load error: %s",errorstr)) + xml.errorhandler(formatters["load error: %s"](errorstr)) end end end @@ -8607,7 +8635,7 @@ local function verbose_element(e,handlers) local ats=eat and next(eat) and {} if ats then for k,v in next,eat do - ats[#ats+1]=format('%s=%q',k,escaped(v)) + ats[#ats+1]=formatters['%s=%q'](k,escaped(v)) end end if ern and trace_entities and ern~=ens then @@ -8722,7 +8750,7 @@ local function xserialize(e,handlers) end local handlers={} local function newhandlers(settings) - local t=table.copy(handlers.verbose or {}) + local t=table.copy(handlers[settings and settings.parent or "verbose"] or {}) if settings then for k,v in next,settings do if type(v)=="table" then @@ -8803,7 +8831,7 @@ local xmlstringhandler=newhandlers { local function xmltostring(root) if not root then return "" - elseif type(root)=='string' then + elseif type(root)=="string" then return root else return serialize(root,xmlstringhandler) or "" @@ -8892,7 +8920,7 @@ end function xml.tocdata(e,wrapper) local whatever=type(e)=="table" and xmltostring(e.dt) or e or "" if wrapper then - whatever=format("<%s>%s",wrapper,whatever,wrapper) + whatever=formatters["<%s>%s"](wrapper,whatever,wrapper) end local t={ special=true,ns="",tg="@cd@",at={},rn="",dt={ whatever },__p__=e } setmetatable(t,getmetatable(e)) @@ -11144,6 +11172,99 @@ function finalizers.upperall(collected) end +end -- of closure + +do -- create closure to overcome 200 locals limit + +package.loaded["trac-xml"] = package.loaded["trac-xml"] or true + +-- original size: 3490, stripped down to: 2879 + +if not modules then modules={} end modules ['trac-xml']={ + version=1.001, + comment="companion to trac-log.mkiv", + author="Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright="PRAGMA ADE / ConTeXt Development Team", + license="see context related readme files" +} +local formatters=string.formatters +local reporters=logs.reporters +local xmlserialize=xml.serialize +local xmlcollected=xml.collected +local xmltext=xml.text +local xmlfirst=xml.first +local function showhelp(specification,...) + local root=xml.convert(specification.helpinfo or "") + if not root then + return + end + local xs=xml.gethandlers("string") + xml.sethandlersfunction(xs,"short",function(e,handler) xmlserialize(e.dt,handler) end) + xml.sethandlersfunction(xs,"ref",function(e,handler) handler.handle("--"..e.at.name) end) + local wantedcategories=select("#",...)==0 and true or table.tohash {... } + local nofcategories=xml.count(root,"/application/flags/category") + local report=specification.report + for category in xmlcollected(root,"/application/flags/category") do + local categoryname=category.at.name or "" + if wantedcategories==true or wantedcategories[categoryname] then + if nofcategories>1 then + report("%s options:",categoryname) + report() + end + for subcategory in xmlcollected(category,"/subcategory") do + for flag in xmlcollected(subcategory,"/flag") do + local name=flag.at.name + local value=flag.at.value + local short=xmltext(xmlfirst(flag,"/short")) + if value then + report("--%-24s %s",formatters["%s=%s"](name,value),short) + else + report("--%-24s %s",name,short) + end + end + report() + end + end + end + for category in xmlcollected(root,"/application/examples/category") do + local title=xmltext(xmlfirst(category,"/title")) + if title and title~="" then + report() + report(title) + report() + end + for subcategory in xmlcollected(category,"/subcategory") do + for example in xmlcollected(subcategory,"/example") do + local command=xmltext(xmlfirst(example,"/command")) + local comment=xmltext(xmlfirst(example,"/comment")) + report(command) + end + report() + end + end +end +local reporthelp=reporters.help +local exporthelp=reporters.export +function reporters.help(t,...) + local helpinfo=t.helpinfo + if type(helpinfo)=="string" and string.find(helpinfo,"^<%?xml") then + showhelp(t,...) + else + reporthelp(t,...) + end +end +function reporters.export(t,method,filename) + dofile(resolvers.findfile("trac-exp.lua","tex")) + local exporters=logs.exporters + local result=method and exporters and exporters[method] and exporters[method](t,method) or exporthelp(t) + if type(filename)=="string" and filename~="" then + io.savedata(filename,result) + else + reporters.lines(t,result) + end +end + + end -- of closure do -- create closure to overcome 200 locals limit @@ -15390,10 +15511,10 @@ end 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 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 +-- 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 : 636443 --- stripped bytes : 230487 +-- original bytes : 640903 +-- stripped bytes : 231417 -- end library merge @@ -15459,6 +15580,8 @@ local ownlibs = { -- order can be made better 'lxml-aux.lua', 'lxml-xml.lua', + 'trac-xml.lua', + 'data-ini.lua', 'data-exp.lua', 'data-env.lua', @@ -15603,59 +15726,85 @@ if not environment.experiments then environment.experiments = e_experiments end local instance = resolvers.reset() local helpinfo = [[ ---script run an mtx script (lua prefered method) (--noquotes), no script gives list ---execute run a script or program (texmfstart method) (--noquotes) ---resolve resolve prefixed arguments ---ctxlua run internally (using preloaded libs) ---internal run script using built in libraries (same as --ctxlua) ---locate locate given filename in database (default) or system (--first --all --detail) - ---autotree use texmf tree cf. env 'texmfstart_tree' or 'texmfstarttree' ---tree=pathtotree use given texmf tree (default file: 'setuptex.tmf') ---environment=name use given (tmf) environment file ---path=runpath go to given path before execution ---ifchanged=filename only execute when given file has changed (md checksum) ---iftouched=old,new only execute when given file has changed (time stamp) - ---makestubs create stubs for (context related) scripts ---removestubs remove stubs (context related) scripts ---stubpath=binpath paths where stubs wil be written ---windows create windows (mswin) stubs ---unix create unix (linux) stubs - ---verbose give a bit more info ---trackers=list enable given trackers ---progname=str format or backend - ---edit launch editor with found file ---launch (--all) launch files like manuals, assumes os support - ---timedrun run a script an time its run ---autogenerate regenerate databases if needed (handy when used to run context in an editor) - ---usekpse use kpse as fallback (when no mkiv and cache installed, often slower) ---forcekpse force using kpse (handy when no mkiv and cache installed but less functionality) - ---prefixes show supported prefixes - ---generate generate file database - ---variables show configuration variables ---configurations show configuration order - ---directives show (known) directives ---trackers show (known) trackers ---experiments show (known) experiments - ---expand-braces expand complex variable ---expand-path expand variable (resolve paths) ---expand-var expand variable (resolve references) ---show-path show path expansion of ... ---var-value report value of variable ---find-file report file location ---find-path report path of file - ---pattern=str filter variables + + + + 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 an 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 + + + + ]] local application = logs.application { @@ -16617,6 +16766,11 @@ elseif e_argument("experiments") then experiments.show() +elseif e_argument("exporthelp") then + + runners.loadbase() + application.export(e_argument("exporthelp"),filename) + elseif e_argument("help") or filename=='help' or filename == "" then application.help() diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index 0648e94e7..92c9a763a 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -6072,7 +6072,7 @@ do -- create closure to overcome 200 locals limit package.loaded["trac-log"] = package.loaded["trac-log"] or true --- original size: 20644, stripped down to: 14615 +-- original size: 21510, stripped down to: 15167 if not modules then modules={} end modules ['trac-log']={ version=1.001, @@ -6137,6 +6137,7 @@ logs=logs or {} local logs=logs local moreinfo=[[ More information about ConTeXt and the tools that come with it can be found at: +]].."\n"..[[ maillist : ntg-context@ntg.nl / http://www.ntg.nl/mailman/listinfo/ntg-context webpage : http://www.pragma-ade.nl / http://tex.aanhet.net wiki : http://contextgarden.net @@ -6536,11 +6537,14 @@ function logs.reportbanner() end function logs.reportline () end function logs.simplelines () end function logs.help () end +local Carg,C,lpegmatch=lpeg.Carg,lpeg.C,lpeg.match +local p_newline=lpeg.patterns.newline +local linewise=( + Carg(1)*C((1-p_newline)^1)/function(t,s) t.report(s) end+Carg(1)*p_newline^2/function(t) t.report() end+p_newline +)^1 local function reportlines(t,str) if str then - for line in gmatch(str,"(.-)[\n\r]") do - t.report(line) - end + lpegmatch(linewise,str,1,t) end end local function reportbanner(t) @@ -6561,8 +6565,7 @@ local function reporthelp(t,...) if type(helpinfo)=="string" then reportlines(t,helpinfo) elseif type(helpinfo)=="table" then - local n=select("#",...) - for i=1,n do + for i=1,select("#",...) do reportlines(t,t.helpinfo[select(i,...)]) if i0 then dt[#dt+1]=spacing end - local resolved=(namespace=="" and xmlns[#xmlns]) or nsremap[namespace] or namespace + local resolved=namespace=="" and xmlns[#xmlns] or nsremap[namespace] or namespace top=stack[#stack] dt=top.dt local t={ ns=namespace or "",rn=resolved,tg=tag,at=at,dt={},__p__=top } @@ -8064,7 +8092,7 @@ local function add_begin(spacing,namespace,tag) if #spacing>0 then dt[#dt+1]=spacing end - local resolved=(namespace=="" and xmlns[#xmlns]) or nsremap[namespace] or namespace + local resolved=namespace=="" and xmlns[#xmlns] or nsremap[namespace] or namespace top={ ns=namespace or "",rn=resolved,tg=tag,at=at,dt={},__p__=stack[#stack] } setmetatable(top,mt) dt=top.dt @@ -8078,9 +8106,9 @@ local function add_end(spacing,namespace,tag) local toclose=remove(stack) top=stack[#stack] if #stack<1 then - errorstr=format("nothing to close with %s %s",tag,xml.checkerror(top,toclose) or "") + errorstr=formatters["unable to close %s %s"](tag,xml.checkerror(top,toclose) or "") elseif toclose.tg~=tag then - errorstr=format("unable to close %s with %s %s",toclose.tg,tag,xml.checkerror(top,toclose) or "") + errorstr=formatters["unable to close %s with %s %s"](toclose.tg,tag,xml.checkerror(top,toclose) or "") end dt=top.dt dt[#dt+1]=toclose @@ -8125,9 +8153,9 @@ local function attribute_specification_error(str) return str end xml.placeholders={ - unknown_dec_entity=function(str) return (str=="" and "&error;") or format("&%s;",str) end, - unknown_hex_entity=function(str) return format("&#x%s;",str) end, - unknown_any_entity=function(str) return format("&#x%s;",str) end, + unknown_dec_entity=function(str) return str=="" and "&error;" or formatters["&%s;"](str) end, + unknown_hex_entity=function(str) return formatters["&#x%s;"](str) end, + unknown_any_entity=function(str) return formatters["&#x%s;"](str) end, } local placeholders=xml.placeholders local function fromhex(s) @@ -8135,7 +8163,7 @@ local function fromhex(s) if n then return utfchar(n) else - return format("h:%s",s),true + return formatters["h:%s"](s),true end end local function fromdec(s) @@ -8143,7 +8171,7 @@ local function fromdec(s) if n then return utfchar(n) else - return format("d:%s",s),true + return formatters["d:%s"](s),true end end local rest=(1-P(";"))^0 @@ -8469,9 +8497,9 @@ local function _xmlconvert_(data,settings) if errorhandler then local currentresource=settings.currentresource if currentresource and currentresource~="" then - xml.errorhandler(format("load error in [%s]: %s",currentresource,errorstr)) + xml.errorhandler(formatters["load error in [%s]: %s"](currentresource,errorstr)) else - xml.errorhandler(format("load error: %s",errorstr)) + xml.errorhandler(formatters["load error: %s"](errorstr)) end end end @@ -8607,7 +8635,7 @@ local function verbose_element(e,handlers) local ats=eat and next(eat) and {} if ats then for k,v in next,eat do - ats[#ats+1]=format('%s=%q',k,escaped(v)) + ats[#ats+1]=formatters['%s=%q'](k,escaped(v)) end end if ern and trace_entities and ern~=ens then @@ -8722,7 +8750,7 @@ local function xserialize(e,handlers) end local handlers={} local function newhandlers(settings) - local t=table.copy(handlers.verbose or {}) + local t=table.copy(handlers[settings and settings.parent or "verbose"] or {}) if settings then for k,v in next,settings do if type(v)=="table" then @@ -8803,7 +8831,7 @@ local xmlstringhandler=newhandlers { local function xmltostring(root) if not root then return "" - elseif type(root)=='string' then + elseif type(root)=="string" then return root else return serialize(root,xmlstringhandler) or "" @@ -8892,7 +8920,7 @@ end function xml.tocdata(e,wrapper) local whatever=type(e)=="table" and xmltostring(e.dt) or e or "" if wrapper then - whatever=format("<%s>%s",wrapper,whatever,wrapper) + whatever=formatters["<%s>%s"](wrapper,whatever,wrapper) end local t={ special=true,ns="",tg="@cd@",at={},rn="",dt={ whatever },__p__=e } setmetatable(t,getmetatable(e)) @@ -11144,6 +11172,99 @@ function finalizers.upperall(collected) end +end -- of closure + +do -- create closure to overcome 200 locals limit + +package.loaded["trac-xml"] = package.loaded["trac-xml"] or true + +-- original size: 3490, stripped down to: 2879 + +if not modules then modules={} end modules ['trac-xml']={ + version=1.001, + comment="companion to trac-log.mkiv", + author="Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright="PRAGMA ADE / ConTeXt Development Team", + license="see context related readme files" +} +local formatters=string.formatters +local reporters=logs.reporters +local xmlserialize=xml.serialize +local xmlcollected=xml.collected +local xmltext=xml.text +local xmlfirst=xml.first +local function showhelp(specification,...) + local root=xml.convert(specification.helpinfo or "") + if not root then + return + end + local xs=xml.gethandlers("string") + xml.sethandlersfunction(xs,"short",function(e,handler) xmlserialize(e.dt,handler) end) + xml.sethandlersfunction(xs,"ref",function(e,handler) handler.handle("--"..e.at.name) end) + local wantedcategories=select("#",...)==0 and true or table.tohash {... } + local nofcategories=xml.count(root,"/application/flags/category") + local report=specification.report + for category in xmlcollected(root,"/application/flags/category") do + local categoryname=category.at.name or "" + if wantedcategories==true or wantedcategories[categoryname] then + if nofcategories>1 then + report("%s options:",categoryname) + report() + end + for subcategory in xmlcollected(category,"/subcategory") do + for flag in xmlcollected(subcategory,"/flag") do + local name=flag.at.name + local value=flag.at.value + local short=xmltext(xmlfirst(flag,"/short")) + if value then + report("--%-24s %s",formatters["%s=%s"](name,value),short) + else + report("--%-24s %s",name,short) + end + end + report() + end + end + end + for category in xmlcollected(root,"/application/examples/category") do + local title=xmltext(xmlfirst(category,"/title")) + if title and title~="" then + report() + report(title) + report() + end + for subcategory in xmlcollected(category,"/subcategory") do + for example in xmlcollected(subcategory,"/example") do + local command=xmltext(xmlfirst(example,"/command")) + local comment=xmltext(xmlfirst(example,"/comment")) + report(command) + end + report() + end + end +end +local reporthelp=reporters.help +local exporthelp=reporters.export +function reporters.help(t,...) + local helpinfo=t.helpinfo + if type(helpinfo)=="string" and string.find(helpinfo,"^<%?xml") then + showhelp(t,...) + else + reporthelp(t,...) + end +end +function reporters.export(t,method,filename) + dofile(resolvers.findfile("trac-exp.lua","tex")) + local exporters=logs.exporters + local result=method and exporters and exporters[method] and exporters[method](t,method) or exporthelp(t) + if type(filename)=="string" and filename~="" then + io.savedata(filename,result) + else + reporters.lines(t,result) + end +end + + end -- of closure do -- create closure to overcome 200 locals limit @@ -15390,10 +15511,10 @@ end 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 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 +-- 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 : 636443 --- stripped bytes : 230487 +-- original bytes : 640903 +-- stripped bytes : 231417 -- end library merge @@ -15459,6 +15580,8 @@ local ownlibs = { -- order can be made better 'lxml-aux.lua', 'lxml-xml.lua', + 'trac-xml.lua', + 'data-ini.lua', 'data-exp.lua', 'data-env.lua', @@ -15603,59 +15726,85 @@ if not environment.experiments then environment.experiments = e_experiments end local instance = resolvers.reset() local helpinfo = [[ ---script run an mtx script (lua prefered method) (--noquotes), no script gives list ---execute run a script or program (texmfstart method) (--noquotes) ---resolve resolve prefixed arguments ---ctxlua run internally (using preloaded libs) ---internal run script using built in libraries (same as --ctxlua) ---locate locate given filename in database (default) or system (--first --all --detail) - ---autotree use texmf tree cf. env 'texmfstart_tree' or 'texmfstarttree' ---tree=pathtotree use given texmf tree (default file: 'setuptex.tmf') ---environment=name use given (tmf) environment file ---path=runpath go to given path before execution ---ifchanged=filename only execute when given file has changed (md checksum) ---iftouched=old,new only execute when given file has changed (time stamp) - ---makestubs create stubs for (context related) scripts ---removestubs remove stubs (context related) scripts ---stubpath=binpath paths where stubs wil be written ---windows create windows (mswin) stubs ---unix create unix (linux) stubs - ---verbose give a bit more info ---trackers=list enable given trackers ---progname=str format or backend - ---edit launch editor with found file ---launch (--all) launch files like manuals, assumes os support - ---timedrun run a script an time its run ---autogenerate regenerate databases if needed (handy when used to run context in an editor) - ---usekpse use kpse as fallback (when no mkiv and cache installed, often slower) ---forcekpse force using kpse (handy when no mkiv and cache installed but less functionality) - ---prefixes show supported prefixes - ---generate generate file database - ---variables show configuration variables ---configurations show configuration order - ---directives show (known) directives ---trackers show (known) trackers ---experiments show (known) experiments - ---expand-braces expand complex variable ---expand-path expand variable (resolve paths) ---expand-var expand variable (resolve references) ---show-path show path expansion of ... ---var-value report value of variable ---find-file report file location ---find-path report path of file - ---pattern=str filter variables + + + + 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 an 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 + + + + ]] local application = logs.application { @@ -16617,6 +16766,11 @@ elseif e_argument("experiments") then experiments.show() +elseif e_argument("exporthelp") then + + runners.loadbase() + application.export(e_argument("exporthelp"),filename) + elseif e_argument("help") or filename=='help' or filename == "" then application.help() diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index 0648e94e7..92c9a763a 100644 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -6072,7 +6072,7 @@ do -- create closure to overcome 200 locals limit package.loaded["trac-log"] = package.loaded["trac-log"] or true --- original size: 20644, stripped down to: 14615 +-- original size: 21510, stripped down to: 15167 if not modules then modules={} end modules ['trac-log']={ version=1.001, @@ -6137,6 +6137,7 @@ logs=logs or {} local logs=logs local moreinfo=[[ More information about ConTeXt and the tools that come with it can be found at: +]].."\n"..[[ maillist : ntg-context@ntg.nl / http://www.ntg.nl/mailman/listinfo/ntg-context webpage : http://www.pragma-ade.nl / http://tex.aanhet.net wiki : http://contextgarden.net @@ -6536,11 +6537,14 @@ function logs.reportbanner() end function logs.reportline () end function logs.simplelines () end function logs.help () end +local Carg,C,lpegmatch=lpeg.Carg,lpeg.C,lpeg.match +local p_newline=lpeg.patterns.newline +local linewise=( + Carg(1)*C((1-p_newline)^1)/function(t,s) t.report(s) end+Carg(1)*p_newline^2/function(t) t.report() end+p_newline +)^1 local function reportlines(t,str) if str then - for line in gmatch(str,"(.-)[\n\r]") do - t.report(line) - end + lpegmatch(linewise,str,1,t) end end local function reportbanner(t) @@ -6561,8 +6565,7 @@ local function reporthelp(t,...) if type(helpinfo)=="string" then reportlines(t,helpinfo) elseif type(helpinfo)=="table" then - local n=select("#",...) - for i=1,n do + for i=1,select("#",...) do reportlines(t,t.helpinfo[select(i,...)]) if i0 then dt[#dt+1]=spacing end - local resolved=(namespace=="" and xmlns[#xmlns]) or nsremap[namespace] or namespace + local resolved=namespace=="" and xmlns[#xmlns] or nsremap[namespace] or namespace top=stack[#stack] dt=top.dt local t={ ns=namespace or "",rn=resolved,tg=tag,at=at,dt={},__p__=top } @@ -8064,7 +8092,7 @@ local function add_begin(spacing,namespace,tag) if #spacing>0 then dt[#dt+1]=spacing end - local resolved=(namespace=="" and xmlns[#xmlns]) or nsremap[namespace] or namespace + local resolved=namespace=="" and xmlns[#xmlns] or nsremap[namespace] or namespace top={ ns=namespace or "",rn=resolved,tg=tag,at=at,dt={},__p__=stack[#stack] } setmetatable(top,mt) dt=top.dt @@ -8078,9 +8106,9 @@ local function add_end(spacing,namespace,tag) local toclose=remove(stack) top=stack[#stack] if #stack<1 then - errorstr=format("nothing to close with %s %s",tag,xml.checkerror(top,toclose) or "") + errorstr=formatters["unable to close %s %s"](tag,xml.checkerror(top,toclose) or "") elseif toclose.tg~=tag then - errorstr=format("unable to close %s with %s %s",toclose.tg,tag,xml.checkerror(top,toclose) or "") + errorstr=formatters["unable to close %s with %s %s"](toclose.tg,tag,xml.checkerror(top,toclose) or "") end dt=top.dt dt[#dt+1]=toclose @@ -8125,9 +8153,9 @@ local function attribute_specification_error(str) return str end xml.placeholders={ - unknown_dec_entity=function(str) return (str=="" and "&error;") or format("&%s;",str) end, - unknown_hex_entity=function(str) return format("&#x%s;",str) end, - unknown_any_entity=function(str) return format("&#x%s;",str) end, + unknown_dec_entity=function(str) return str=="" and "&error;" or formatters["&%s;"](str) end, + unknown_hex_entity=function(str) return formatters["&#x%s;"](str) end, + unknown_any_entity=function(str) return formatters["&#x%s;"](str) end, } local placeholders=xml.placeholders local function fromhex(s) @@ -8135,7 +8163,7 @@ local function fromhex(s) if n then return utfchar(n) else - return format("h:%s",s),true + return formatters["h:%s"](s),true end end local function fromdec(s) @@ -8143,7 +8171,7 @@ local function fromdec(s) if n then return utfchar(n) else - return format("d:%s",s),true + return formatters["d:%s"](s),true end end local rest=(1-P(";"))^0 @@ -8469,9 +8497,9 @@ local function _xmlconvert_(data,settings) if errorhandler then local currentresource=settings.currentresource if currentresource and currentresource~="" then - xml.errorhandler(format("load error in [%s]: %s",currentresource,errorstr)) + xml.errorhandler(formatters["load error in [%s]: %s"](currentresource,errorstr)) else - xml.errorhandler(format("load error: %s",errorstr)) + xml.errorhandler(formatters["load error: %s"](errorstr)) end end end @@ -8607,7 +8635,7 @@ local function verbose_element(e,handlers) local ats=eat and next(eat) and {} if ats then for k,v in next,eat do - ats[#ats+1]=format('%s=%q',k,escaped(v)) + ats[#ats+1]=formatters['%s=%q'](k,escaped(v)) end end if ern and trace_entities and ern~=ens then @@ -8722,7 +8750,7 @@ local function xserialize(e,handlers) end local handlers={} local function newhandlers(settings) - local t=table.copy(handlers.verbose or {}) + local t=table.copy(handlers[settings and settings.parent or "verbose"] or {}) if settings then for k,v in next,settings do if type(v)=="table" then @@ -8803,7 +8831,7 @@ local xmlstringhandler=newhandlers { local function xmltostring(root) if not root then return "" - elseif type(root)=='string' then + elseif type(root)=="string" then return root else return serialize(root,xmlstringhandler) or "" @@ -8892,7 +8920,7 @@ end function xml.tocdata(e,wrapper) local whatever=type(e)=="table" and xmltostring(e.dt) or e or "" if wrapper then - whatever=format("<%s>%s",wrapper,whatever,wrapper) + whatever=formatters["<%s>%s"](wrapper,whatever,wrapper) end local t={ special=true,ns="",tg="@cd@",at={},rn="",dt={ whatever },__p__=e } setmetatable(t,getmetatable(e)) @@ -11144,6 +11172,99 @@ function finalizers.upperall(collected) end +end -- of closure + +do -- create closure to overcome 200 locals limit + +package.loaded["trac-xml"] = package.loaded["trac-xml"] or true + +-- original size: 3490, stripped down to: 2879 + +if not modules then modules={} end modules ['trac-xml']={ + version=1.001, + comment="companion to trac-log.mkiv", + author="Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright="PRAGMA ADE / ConTeXt Development Team", + license="see context related readme files" +} +local formatters=string.formatters +local reporters=logs.reporters +local xmlserialize=xml.serialize +local xmlcollected=xml.collected +local xmltext=xml.text +local xmlfirst=xml.first +local function showhelp(specification,...) + local root=xml.convert(specification.helpinfo or "") + if not root then + return + end + local xs=xml.gethandlers("string") + xml.sethandlersfunction(xs,"short",function(e,handler) xmlserialize(e.dt,handler) end) + xml.sethandlersfunction(xs,"ref",function(e,handler) handler.handle("--"..e.at.name) end) + local wantedcategories=select("#",...)==0 and true or table.tohash {... } + local nofcategories=xml.count(root,"/application/flags/category") + local report=specification.report + for category in xmlcollected(root,"/application/flags/category") do + local categoryname=category.at.name or "" + if wantedcategories==true or wantedcategories[categoryname] then + if nofcategories>1 then + report("%s options:",categoryname) + report() + end + for subcategory in xmlcollected(category,"/subcategory") do + for flag in xmlcollected(subcategory,"/flag") do + local name=flag.at.name + local value=flag.at.value + local short=xmltext(xmlfirst(flag,"/short")) + if value then + report("--%-24s %s",formatters["%s=%s"](name,value),short) + else + report("--%-24s %s",name,short) + end + end + report() + end + end + end + for category in xmlcollected(root,"/application/examples/category") do + local title=xmltext(xmlfirst(category,"/title")) + if title and title~="" then + report() + report(title) + report() + end + for subcategory in xmlcollected(category,"/subcategory") do + for example in xmlcollected(subcategory,"/example") do + local command=xmltext(xmlfirst(example,"/command")) + local comment=xmltext(xmlfirst(example,"/comment")) + report(command) + end + report() + end + end +end +local reporthelp=reporters.help +local exporthelp=reporters.export +function reporters.help(t,...) + local helpinfo=t.helpinfo + if type(helpinfo)=="string" and string.find(helpinfo,"^<%?xml") then + showhelp(t,...) + else + reporthelp(t,...) + end +end +function reporters.export(t,method,filename) + dofile(resolvers.findfile("trac-exp.lua","tex")) + local exporters=logs.exporters + local result=method and exporters and exporters[method] and exporters[method](t,method) or exporthelp(t) + if type(filename)=="string" and filename~="" then + io.savedata(filename,result) + else + reporters.lines(t,result) + end +end + + end -- of closure do -- create closure to overcome 200 locals limit @@ -15390,10 +15511,10 @@ end 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 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 +-- 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 : 636443 --- stripped bytes : 230487 +-- original bytes : 640903 +-- stripped bytes : 231417 -- end library merge @@ -15459,6 +15580,8 @@ local ownlibs = { -- order can be made better 'lxml-aux.lua', 'lxml-xml.lua', + 'trac-xml.lua', + 'data-ini.lua', 'data-exp.lua', 'data-env.lua', @@ -15603,59 +15726,85 @@ if not environment.experiments then environment.experiments = e_experiments end local instance = resolvers.reset() local helpinfo = [[ ---script run an mtx script (lua prefered method) (--noquotes), no script gives list ---execute run a script or program (texmfstart method) (--noquotes) ---resolve resolve prefixed arguments ---ctxlua run internally (using preloaded libs) ---internal run script using built in libraries (same as --ctxlua) ---locate locate given filename in database (default) or system (--first --all --detail) - ---autotree use texmf tree cf. env 'texmfstart_tree' or 'texmfstarttree' ---tree=pathtotree use given texmf tree (default file: 'setuptex.tmf') ---environment=name use given (tmf) environment file ---path=runpath go to given path before execution ---ifchanged=filename only execute when given file has changed (md checksum) ---iftouched=old,new only execute when given file has changed (time stamp) - ---makestubs create stubs for (context related) scripts ---removestubs remove stubs (context related) scripts ---stubpath=binpath paths where stubs wil be written ---windows create windows (mswin) stubs ---unix create unix (linux) stubs - ---verbose give a bit more info ---trackers=list enable given trackers ---progname=str format or backend - ---edit launch editor with found file ---launch (--all) launch files like manuals, assumes os support - ---timedrun run a script an time its run ---autogenerate regenerate databases if needed (handy when used to run context in an editor) - ---usekpse use kpse as fallback (when no mkiv and cache installed, often slower) ---forcekpse force using kpse (handy when no mkiv and cache installed but less functionality) - ---prefixes show supported prefixes - ---generate generate file database - ---variables show configuration variables ---configurations show configuration order - ---directives show (known) directives ---trackers show (known) trackers ---experiments show (known) experiments - ---expand-braces expand complex variable ---expand-path expand variable (resolve paths) ---expand-var expand variable (resolve references) ---show-path show path expansion of ... ---var-value report value of variable ---find-file report file location ---find-path report path of file - ---pattern=str filter variables + + + + 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 an 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 + + + + ]] local application = logs.application { @@ -16617,6 +16766,11 @@ elseif e_argument("experiments") then experiments.show() +elseif e_argument("exporthelp") then + + runners.loadbase() + application.export(e_argument("exporthelp"),filename) + elseif e_argument("help") or filename=='help' or filename == "" then application.help() diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 4fceea3cb..4eaa92ddc 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.20 10:34} +\newcontextversion{2013.03.20 21:07} %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 43c591c41..4a89abc96 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.20 10:34} +\newcontextversion{2013.03.20 21:07} %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 172657701..45ca003ab 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 029e973d8..71514b2c2 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 5158dbd76..b65181bbf 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.20 10:34} +\edef\contextversion{2013.03.20 21:07} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index a2f2280fa..980e650a6 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.20 10:34} +\edef\contextversion{2013.03.20 21:07} %D For those who want to use this: diff --git a/tex/context/base/lxml-tab.lua b/tex/context/base/lxml-tab.lua index 216dc16e8..2bb5844fc 100644 --- a/tex/context/base/lxml-tab.lua +++ b/tex/context/base/lxml-tab.lua @@ -16,7 +16,7 @@ if not modules then modules = { } end modules ['lxml-tab'] = { local trace_entities = false trackers.register("xml.entities", function(v) trace_entities = v end) -local report_xml = logs and logs.reporter("xml","core") or function(...) print(format(...)) end +local report_xml = logs and logs.reporter("xml","core") or function(...) print(string.format(...)) end --[[ldx--

The parser used here is inspired by the variant discussed in the lua book, but @@ -41,10 +41,11 @@ local xml = xml local concat, remove, insert = table.concat, table.remove, table.insert local type, next, setmetatable, getmetatable, tonumber = type, next, setmetatable, getmetatable, tonumber -local format, lower, find, match, gsub = string.format, string.lower, string.find, string.match, string.gsub +local lower, find, match, gsub = string.lower, string.find, string.match, string.gsub local utfchar = utf.char local lpegmatch = lpeg.match local P, S, R, C, V, C, Cs = lpeg.P, lpeg.S, lpeg.R, lpeg.C, lpeg.V, lpeg.C, lpeg.Cs +local formatters = string.formatters --[[ldx--

First a hack to enable namespace resolving. A namespace is characterized by @@ -208,7 +209,7 @@ local function add_empty(spacing, namespace, tag) if #spacing > 0 then dt[#dt+1] = spacing end - local resolved = (namespace == "" and xmlns[#xmlns]) or nsremap[namespace] or namespace + local resolved = namespace == "" and xmlns[#xmlns] or nsremap[namespace] or namespace top = stack[#stack] dt = top.dt local t = { ns=namespace or "", rn=resolved, tg=tag, at=at, dt={}, __p__ = top } @@ -224,7 +225,7 @@ local function add_begin(spacing, namespace, tag) if #spacing > 0 then dt[#dt+1] = spacing end - local resolved = (namespace == "" and xmlns[#xmlns]) or nsremap[namespace] or namespace + local resolved = namespace == "" and xmlns[#xmlns] or nsremap[namespace] or namespace top = { ns=namespace or "", rn=resolved, tg=tag, at=at, dt={}, __p__ = stack[#stack] } setmetatable(top, mt) dt = top.dt @@ -239,9 +240,9 @@ local function add_end(spacing, namespace, tag) local toclose = remove(stack) top = stack[#stack] if #stack < 1 then - errorstr = format("nothing to close with %s %s", tag, xml.checkerror(top,toclose) or "") + errorstr = formatters["unable to close %s %s"](tag,xml.checkerror(top,toclose) or "") elseif toclose.tg ~= tag then -- no namespace check - errorstr = format("unable to close %s with %s %s", toclose.tg, tag, xml.checkerror(top,toclose) or "") + errorstr = formatters["unable to close %s with %s %s"](toclose.tg,tag,xml.checkerror(top,toclose) or "") end dt = top.dt dt[#dt+1] = toclose @@ -295,9 +296,9 @@ local function attribute_specification_error(str) end xml.placeholders = { - unknown_dec_entity = function(str) return (str == "" and "&error;") or format("&%s;",str) end, - unknown_hex_entity = function(str) return format("&#x%s;",str) end, - unknown_any_entity = function(str) return format("&#x%s;",str) end, + unknown_dec_entity = function(str) return str == "" and "&error;" or formatters["&%s;"](str) end, + unknown_hex_entity = function(str) return formatters["&#x%s;"](str) end, + unknown_any_entity = function(str) return formatters["&#x%s;"](str) end, } local placeholders = xml.placeholders @@ -307,7 +308,7 @@ local function fromhex(s) if n then return utfchar(n) else - return format("h:%s",s), true + return formatters["h:%s"](s), true end end @@ -316,7 +317,7 @@ local function fromdec(s) if n then return utfchar(n) else - return format("d:%s",s), true + return formatters["d:%s"](s), true end end @@ -680,8 +681,6 @@ local function _xmlconvert_(data, settings) resolve_predefined = true end -- ---~ inspect(settings) - -- stack, top, at, xmlns, errorstr = { }, { }, { }, { }, nil acache, hcache, dcache = { }, { }, { } -- not stored reported_attribute_errors = { } @@ -722,9 +721,9 @@ local function _xmlconvert_(data, settings) if errorhandler then local currentresource = settings.currentresource if currentresource and currentresource ~= "" then - xml.errorhandler(format("load error in [%s]: %s",currentresource,errorstr)) + xml.errorhandler(formatters["load error in [%s]: %s"](currentresource,errorstr)) else - xml.errorhandler(format("load error: %s",errorstr)) + xml.errorhandler(formatters["load error: %s"](errorstr)) end end end @@ -923,7 +922,7 @@ local function verbose_element(e,handlers) -- options local ats = eat and next(eat) and { } if ats then for k,v in next, eat do - ats[#ats+1] = format('%s=%q',k,escaped(v)) + ats[#ats+1] = formatters['%s=%q'](k,escaped(v)) end end if ern and trace_entities and ern ~= ens then @@ -1053,7 +1052,7 @@ end local handlers = { } local function newhandlers(settings) - local t = table.copy(handlers.verbose or { }) -- merge + local t = table.copy(handlers[settings and settings.parent or "verbose"] or { }) -- merge if settings then for k,v in next, settings do if type(v) == "table" then @@ -1177,7 +1176,7 @@ local xmlstringhandler = newhandlers { local function xmltostring(root) -- 25% overhead due to collecting if not root then return "" - elseif type(root) == 'string' then + elseif type(root) == "string" then return root else -- if next(root) then -- next is faster than type (and >0 test) return serialize(root,xmlstringhandler) or "" @@ -1315,7 +1314,7 @@ xml.tocdata(e,"error") function xml.tocdata(e,wrapper) -- a few more in the aux module local whatever = type(e) == "table" and xmltostring(e.dt) or e or "" if wrapper then - whatever = format("<%s>%s",wrapper,whatever,wrapper) + whatever = formatters["<%s>%s"](wrapper,whatever,wrapper) end local t = { special = true, ns = "", tg = "@cd@", at = { }, rn = "", dt = { whatever }, __p__ = e } setmetatable(t,getmetatable(e)) diff --git a/tex/context/base/lxml-tex.lua b/tex/context/base/lxml-tex.lua index f7de100b2..112f62751 100644 --- a/tex/context/base/lxml-tex.lua +++ b/tex/context/base/lxml-tex.lua @@ -750,37 +750,37 @@ function lxml.main(id) xmlserialize(getid(id),xmltexhandler) -- the real root (@rt@) end ---~ -- lines (untested) ---~ ---~ local buffer = { } ---~ ---~ local xmllinescapture = ( ---~ newline^2 / function() buffer[#buffer+1] = "" end + ---~ newline / function() buffer[#buffer] = buffer[#buffer] .. " " end + ---~ content / function(s) buffer[#buffer] = buffer[#buffer] .. s end ---~ )^0 ---~ ---~ local xmllineshandler = table.copy(xmltexhandler) ---~ ---~ xmllineshandler.handle = function(...) lpegmatch(xmllinescapture,concat{ ... }) end ---~ ---~ function lines(root) ---~ if not root then ---~ -- rawroot = false ---~ -- quit ---~ elseif type(root) == 'string' then ---~ -- rawroot = false ---~ lpegmatch(xmllinescapture,root) ---~ elseif next(root) then -- tr == 'table' ---~ xmlserialize(root,xmllineshandler) ---~ end ---~ end ---~ ---~ function xml.lines(root) -- used at all? ---~ buffer = { "" } ---~ lines(root) ---~ return result ---~ end +-- -- lines (untested) +-- +-- local buffer = { } +-- +-- local xmllinescapture = ( +-- newline^2 / function() buffer[#buffer+1] = "" end + +-- newline / function() buffer[#buffer] = buffer[#buffer] .. " " end + +-- content / function(s) buffer[#buffer] = buffer[#buffer] .. s end +-- )^0 +-- +-- local xmllineshandler = table.copy(xmltexhandler) +-- +-- xmllineshandler.handle = function(...) lpegmatch(xmllinescapture,concat{ ... }) end +-- +-- function lines(root) +-- if not root then +-- -- rawroot = false +-- -- quit +-- elseif type(root) == 'string' then +-- -- rawroot = false +-- lpegmatch(xmllinescapture,root) +-- elseif next(root) then -- tr == 'table' +-- xmlserialize(root,xmllineshandler) +-- end +-- end +-- +-- function xml.lines(root) -- used at all? +-- buffer = { "" } +-- lines(root) +-- return result +-- end local function to_text(e) if e.command == nil then diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index aa7450545..d1d5c4328 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 44d672007..b97167234 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/status-mkiv.lua b/tex/context/base/status-mkiv.lua index 32ae00cd3..cf41da58c 100644 --- a/tex/context/base/status-mkiv.lua +++ b/tex/context/base/status-mkiv.lua @@ -4539,6 +4539,18 @@ return { loading = "luat-lib", status = "okay", }, + { + category = "lua", + filename = "trac-xml", + loading = "mtxrun", + status = "okay", + }, + { + category = "lua", + filename = "trac-exp", + loading = "mtxrun", + status = "okay", + }, { category = "lua", comment = "experimental code, will be redone when lua 5.2", diff --git a/tex/context/base/trac-exp.lua b/tex/context/base/trac-exp.lua new file mode 100644 index 000000000..d1ce3c458 --- /dev/null +++ b/tex/context/base/trac-exp.lua @@ -0,0 +1,190 @@ +if not modules then modules = { } end modules ['trac-exp'] = { + version = 1.001, + comment = "companion to trac-log.mkiv", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} + +local formatters = string.formatters +local reporters = logs.reporters +local xmlserialize = xml.serialize +local xmlcollected = xml.collected +local xmltext = xml.text +local xmlfirst = xml.first +local xmlfilter = xml.filter + +-- there is no need for a newhandlers { name = "help", parent = "string" } + +local function flagdata(flag) + local name = flag.at.name or "" + local value = flag.at.value or "" + -- local short = xmlfirst(s,"/short") + -- local short = xmlserialize(short,xs) + local short = xmltext(xmlfirst(flag,"/short")) or "" + return name, value, short +end + +local function exampledata(example) + local command = xmltext(xmlfirst(example,"/command")) or "" + local comment = xmltext(xmlfirst(example,"/comment")) or "" + return command, comment +end + +local function categorytitle(category) + return xmltext(xmlfirst(category,"/title")) or "" +end + +local exporters = { } + +exporters.man = function(specification,...) + local root = xml.convert(specification.helpinfo or "") + if not root then + return + end + local xs = xml.gethandlers("string") + xml.sethandlersfunction(xs,"short",function(e,handler) xmlserialize(e.dt,handler) end) + xml.sethandlersfunction(xs,"ref", function(e,handler) handler.handle("--"..e.at.name) end) + local wantedcategories = select("#",...) == 0 and true or table.tohash { ... } + local nofcategories = xml.count(root,"/application/flags/category") + local name = xmlfilter(root,"/application/metadata/entry[@name='name']/text()") + local detail = xmlfilter(root,"/application/metadata/entry[@name='detail']/text()") or name + local version = xmlfilter(root,"/application/metadata/entry[@name='version']/text()") or "0.00" + local banner = specification.banner or detail or name + -- + local result = { } + -- + result[#result+1] = formatters['.TH %s\n.SH "NAME"\n%s.SH "SYNOPSIS"\n\\fB%s\\fP [ \\fIOPTIONS\\fP ... ]\n.SH "DESCRIPTION"\n%s\n']( + banner,name,name,detail + ) + for category in xmlcollected(root,"/application/flags/category") do + if nofcategories > 1 then + result[#result+1] = formatters['.SH "OPTIONS: %s"'](string.upper(category.at.name or "all")) + else + result[#result+1] = '.SH "OPTIONS"' + end + for subcategory in xmlcollected(category,"/subcategory") do + for flag in xmlcollected(subcategory,"/flag") do + local name, value, short = flagdata(flag) + if value == "" then + result[#result+1] = formatters[".TP\n.B --%s\n%s"](name,short) + else + result[#result+1] = formatters[".TP\n.B --%s=%s\n%s"](name,value,short) + end + end + end + end + result[#result+1] = formatters['.SH "AUTHOR"\n%s'](specification.moreinfo) + return table.concat(result,"\n") +end + +local craptemplate = [[ + + + +%s + + +%s + +]] + +exporters.xml = function(specification,...) + local helpinfo = specification.helpinfo + if type(helpinfo) == "string" then + if string.find(helpinfo,"^<%?xml") then + return helpinfo + end + elseif type(helpinfo) == "table" then + helpinfo = table.concat(helpinfo,"\n\n") + else + helpinfo = "no help" + end + return formatters[craptemplate](specification.banner or "?",helpinfo) +end + +local bodytemplate = [[ +

Command line options

+ + + + + + + 1 then + ?> + + + + + + +
flagvaluedescription
--
+



+]] + +exporters.html = function(specification,...) + local root = xml.convert(specification.helpinfo or "") + if not root then + return + end + local xs = xml.gethandlers("string") + xml.sethandlersfunction(xs,"short",function(e,handler) xmlserialize(e.dt,handler) end) + xml.sethandlersfunction(xs,"ref", function(e,handler) handler.handle("--"..e.at.name) end) + local wantedcategories = select("#",...) == 0 and true or table.tohash { ... } + local nofcategories = xml.count(root,"/application/flags/category") + local name = xmlfilter(root,"/application/metadata/entry[@name='name']/text()") + local detail = xmlfilter(root,"/application/metadata/entry[@name='detail']/text()") or name + local version = xmlfilter(root,"/application/metadata/entry[@name='version']/text()") or "0.00" + local banner = specification.banner or detail or name + -- + dofile(resolvers.findfile("trac-lmx.lua","tex")) + -- + local htmltemplate = io.loaddata(resolvers.findfile("context-base.lmx","tex")) or "no template" + -- + local body = lmx.convertstring(bodytemplate, { + nofcategories = nofcategories, + wantedcategories = wantedcategories, + root = root, + -- moreinfo = specification.moreinfo, + flagdata = flagdata, + exampledata = exampledata, + categorytitle = categorytitle, + }) + local html = lmx.convertstring(htmltemplate, { + maintext = body, + title = banner, + bottomtext = "wiki: http://contextgarden.net | mail: ntg-context@ntg.nl | website: http://www.pragma-ade.nl", + }) + -- + return html +end + +logs.exporters = exporters diff --git a/tex/context/base/trac-log.lua b/tex/context/base/trac-log.lua index 0b229c306..4f1d9ac01 100644 --- a/tex/context/base/trac-log.lua +++ b/tex/context/base/trac-log.lua @@ -84,7 +84,7 @@ local logs = logs local moreinfo = [[ More information about ConTeXt and the tools that come with it can be found at: - +]] .. "\n" .. [[ maillist : ntg-context@ntg.nl / http://www.ntg.nl/mailman/listinfo/ntg-context webpage : http://www.pragma-ade.nl / http://tex.aanhet.net wiki : http://contextgarden.net @@ -633,11 +633,26 @@ function logs.help () end -- obsolete -- applications +-- local function reportlines(t,str) +-- if str then +-- for line in gmatch(str,"([^\n\r]*)[\n\r]") do +-- t.report(line) +-- end +-- end +-- end + +local Carg, C, lpegmatch = lpeg.Carg, lpeg.C, lpeg.match +local p_newline = lpeg.patterns.newline + +local linewise = ( + Carg(1) * C((1-p_newline)^1) / function(t,s) t.report(s) end + + Carg(1) * p_newline^2 / function(t) t.report() end + + p_newline +)^1 + local function reportlines(t,str) if str then - for line in gmatch(str,"(.-)[\n\r]") do - t.report(line) - end + lpegmatch(linewise,str,1,t) end end @@ -661,8 +676,7 @@ local function reporthelp(t,...) if type(helpinfo) == "string" then reportlines(t,helpinfo) elseif type(helpinfo) == "table" then - local n = select("#",...) - for i=1,n do + for i=1,select("#",...) do reportlines(t,t.helpinfo[select(i,...)]) if i < n then t.report() @@ -673,16 +687,43 @@ end local function reportinfo(t) t.report() - reportlines(t,moreinfo) + reportlines(t,t.moreinfo) +end + +local function reportexport(t,method) + report(t.helpinfo) end +local reporters = { + lines = reportlines, -- not to be overloaded + banner = reportbanner, + version = reportversion, + help = reporthelp, + info = reportinfo, + export = reportexport, +} + +logs.reporters = reporters + function logs.application(t) t.name = t.name or "unknown" t.banner = t.banner + t.moreinfo = moreinfo t.report = logs.reporter(t.name) - t.help = function(...) reportbanner(t) ; reporthelp(t,...) ; reportinfo(t) end - t.identify = function() reportbanner(t) end - t.version = function() reportversion(t) end + t.help = function(...) + reporters.banner(t) + reporters.help(t,...) + reporters.info(t) + end + t.export = function(...) + reporters.export(t,...) + end + t.identify = function() + reporters.banner(t) + end + t.version = function() + reporters.version(t) + end return t end diff --git a/tex/context/base/trac-xml.lua b/tex/context/base/trac-xml.lua new file mode 100644 index 000000000..e44f3c399 --- /dev/null +++ b/tex/context/base/trac-xml.lua @@ -0,0 +1,92 @@ +if not modules then modules = { } end modules ['trac-xml'] = { + version = 1.001, + comment = "companion to trac-log.mkiv", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} + +local formatters = string.formatters +local reporters = logs.reporters +local xmlserialize = xml.serialize +local xmlcollected = xml.collected +local xmltext = xml.text +local xmlfirst = xml.first + +-- there is no need for a newhandlers { name = "help", parent = "string" } + +local function showhelp(specification,...) + local root = xml.convert(specification.helpinfo or "") + if not root then + return + end + local xs = xml.gethandlers("string") + xml.sethandlersfunction(xs,"short",function(e,handler) xmlserialize(e.dt,handler) end) + xml.sethandlersfunction(xs,"ref", function(e,handler) handler.handle("--"..e.at.name) end) + local wantedcategories = select("#",...) == 0 and true or table.tohash { ... } + local nofcategories = xml.count(root,"/application/flags/category") + local report = specification.report + for category in xmlcollected(root,"/application/flags/category") do + local categoryname = category.at.name or "" + if wantedcategories == true or wantedcategories[categoryname] then + if nofcategories > 1 then + report("%s options:",categoryname) + report() + end + for subcategory in xmlcollected(category,"/subcategory") do + for flag in xmlcollected(subcategory,"/flag") do + local name = flag.at.name + local value = flag.at.value + -- local short = xmlfirst(s,"/short") + -- local short = xmlserialize(short,xs) + local short = xmltext(xmlfirst(flag,"/short")) + if value then + report("--%-24s %s",formatters["%s=%s"](name,value),short) + else + report("--%-24s %s",name,short) + end + end + report() + end + end + end + for category in xmlcollected(root,"/application/examples/category") do + local title = xmltext(xmlfirst(category,"/title")) + if title and title ~= "" then + report() + report(title) + report() + end + for subcategory in xmlcollected(category,"/subcategory") do + for example in xmlcollected(subcategory,"/example") do + local command = xmltext(xmlfirst(example,"/command")) + local comment = xmltext(xmlfirst(example,"/comment")) + report(command) + end + report() + end + end +end + +local reporthelp = reporters.help +local exporthelp = reporters.export + +function reporters.help(t,...) + local helpinfo = t.helpinfo + if type(helpinfo) == "string" and string.find(helpinfo,"^<%?xml") then + showhelp(t,...) + else + reporthelp(t,...) + end +end + +function reporters.export(t,method,filename) + dofile(resolvers.findfile("trac-exp.lua","tex")) + local exporters = logs.exporters + local result = method and exporters and exporters[method] and exporters[method](t,method) or exporthelp(t) + if type(filename) == "string" and filename ~= "" then + io.savedata(filename,result) + else + reporters.lines(t,result) + end +end diff --git a/tex/context/base/util-mrg.lua b/tex/context/base/util-mrg.lua index 97a02e7cf..78b23dcbb 100644 --- a/tex/context/base/util-mrg.lua +++ b/tex/context/base/util-mrg.lua @@ -132,7 +132,7 @@ local function self_compact(data) if merger.strip_comment then local before = #data data = lpegmatch(compact,data) - data = lpegmatch(strip,data) + data = lpegmatch(strip,data) -- also strips in longstrings ... alas -- data = string.strip(data) local after = #data delta = before - after diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index e2a6781ed..cf2316ac2 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/20/13 10:34:56 +-- merge date : 03/20/13 21:07:28 do -- begin closure to overcome local limits and interference -- cgit v1.2.3