From 5e7ca681fa20247e2774b90558ae8e79f1962a50 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Tue, 21 Jan 2014 16:07:00 +0100 Subject: beta 2014.01.21 16:07 --- scripts/context/stubs/mswin/context.exe | Bin 4608 -> 4608 bytes scripts/context/stubs/mswin/ctxtools.exe | Bin 4608 -> 4608 bytes scripts/context/stubs/mswin/luatools.exe | Bin 4608 -> 4608 bytes scripts/context/stubs/mswin/metatex.exe | Bin 4608 -> 4608 bytes scripts/context/stubs/mswin/mptopdf.exe | Bin 4608 -> 4608 bytes scripts/context/stubs/mswin/mtxrun.dll | Bin 7680 -> 7680 bytes scripts/context/stubs/mswin/mtxrun.exe | Bin 4608 -> 4608 bytes scripts/context/stubs/mswin/mtxrunjit.exe | Bin 0 -> 4608 bytes scripts/context/stubs/mswin/mtxworks.exe | Bin 4608 -> 4608 bytes scripts/context/stubs/mswin/pstopdf.exe | Bin 4608 -> 4608 bytes scripts/context/stubs/mswin/texexec.exe | Bin 4608 -> 4608 bytes scripts/context/stubs/mswin/texmfstart.exe | Bin 4608 -> 4608 bytes scripts/context/stubs/source/readme.txt | 42 +++++++++++---------- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4094 -> 4085 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/status-files.pdf | Bin 24814 -> 24813 bytes tex/context/base/status-lua.pdf | Bin 233039 -> 233037 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 19 files changed, 26 insertions(+), 22 deletions(-) create mode 100755 scripts/context/stubs/mswin/mtxrunjit.exe diff --git a/scripts/context/stubs/mswin/context.exe b/scripts/context/stubs/mswin/context.exe index faae5caa7..6b2c88311 100755 Binary files a/scripts/context/stubs/mswin/context.exe and b/scripts/context/stubs/mswin/context.exe differ diff --git a/scripts/context/stubs/mswin/ctxtools.exe b/scripts/context/stubs/mswin/ctxtools.exe index faae5caa7..6b2c88311 100755 Binary files a/scripts/context/stubs/mswin/ctxtools.exe and b/scripts/context/stubs/mswin/ctxtools.exe differ diff --git a/scripts/context/stubs/mswin/luatools.exe b/scripts/context/stubs/mswin/luatools.exe index faae5caa7..6b2c88311 100755 Binary files a/scripts/context/stubs/mswin/luatools.exe and b/scripts/context/stubs/mswin/luatools.exe differ diff --git a/scripts/context/stubs/mswin/metatex.exe b/scripts/context/stubs/mswin/metatex.exe index faae5caa7..6b2c88311 100755 Binary files a/scripts/context/stubs/mswin/metatex.exe and b/scripts/context/stubs/mswin/metatex.exe differ diff --git a/scripts/context/stubs/mswin/mptopdf.exe b/scripts/context/stubs/mswin/mptopdf.exe index faae5caa7..6b2c88311 100755 Binary files a/scripts/context/stubs/mswin/mptopdf.exe and b/scripts/context/stubs/mswin/mptopdf.exe differ diff --git a/scripts/context/stubs/mswin/mtxrun.dll b/scripts/context/stubs/mswin/mtxrun.dll index 5a79e1bad..42b38cb23 100644 Binary files a/scripts/context/stubs/mswin/mtxrun.dll and b/scripts/context/stubs/mswin/mtxrun.dll differ diff --git a/scripts/context/stubs/mswin/mtxrun.exe b/scripts/context/stubs/mswin/mtxrun.exe index faae5caa7..6b2c88311 100755 Binary files a/scripts/context/stubs/mswin/mtxrun.exe and b/scripts/context/stubs/mswin/mtxrun.exe differ diff --git a/scripts/context/stubs/mswin/mtxrunjit.exe b/scripts/context/stubs/mswin/mtxrunjit.exe new file mode 100755 index 000000000..6b2c88311 Binary files /dev/null and b/scripts/context/stubs/mswin/mtxrunjit.exe differ diff --git a/scripts/context/stubs/mswin/mtxworks.exe b/scripts/context/stubs/mswin/mtxworks.exe index faae5caa7..6b2c88311 100755 Binary files a/scripts/context/stubs/mswin/mtxworks.exe and b/scripts/context/stubs/mswin/mtxworks.exe differ diff --git a/scripts/context/stubs/mswin/pstopdf.exe b/scripts/context/stubs/mswin/pstopdf.exe index faae5caa7..6b2c88311 100755 Binary files a/scripts/context/stubs/mswin/pstopdf.exe and b/scripts/context/stubs/mswin/pstopdf.exe differ diff --git a/scripts/context/stubs/mswin/texexec.exe b/scripts/context/stubs/mswin/texexec.exe index faae5caa7..6b2c88311 100755 Binary files a/scripts/context/stubs/mswin/texexec.exe and b/scripts/context/stubs/mswin/texexec.exe differ diff --git a/scripts/context/stubs/mswin/texmfstart.exe b/scripts/context/stubs/mswin/texmfstart.exe index faae5caa7..6b2c88311 100755 Binary files a/scripts/context/stubs/mswin/texmfstart.exe and b/scripts/context/stubs/mswin/texmfstart.exe differ diff --git a/scripts/context/stubs/source/readme.txt b/scripts/context/stubs/source/readme.txt index 354d85b09..72892ee2f 100644 --- a/scripts/context/stubs/source/readme.txt +++ b/scripts/context/stubs/source/readme.txt @@ -1,36 +1,40 @@ Copyright: -The originally 'runscript' program was written by in 2009 by -T.M.Trzeciak and is public domain. This derived mtxrun program -is an adapted version by Hans Hagen. +The originally 'runscript' program was written by in 2009 by T.M.Trzeciak and is +public domain. This derived mtxrun program is an adapted version by Hans Hagen and +Luigi Scarso. Comment: -In ConTeXt MkIV we have two core scripts: luatools.lua and -mtxrun.lua where the second one is used to launch other scripts. +In ConTeXt MkIV we have two core scripts: luatools.lua and mtxrun.lua where the +second one is used to launch other scripts. The mtxrun.exe program calls luatex.exe. + Normally a user will use a call like: -mtxrun --script font --reload + mtxrun --script font --reload + +Here mtxrun is a lua script. In order to avoid the usage of a cmd file on windows this +runner will start texlua directly. In TeXlive a runner is added for each cmd file but +we don't want that overhead (and extra files). By using an exe we can call these +scripts in batch files without the need for using call. + +The mtxrun.exe file can be copied to a mtxrunjit.exe file in which case luajittex.exe +is called. -Here mtxrun is a lua script. In order to avoid the usage of a cmd -file on windows this runner will start texlua directly. In TeXlive -a runner is added for each cmd file but we don't want that overhead -(and extra files). By using an exe we can call these scripts in -batch files without the need for using call. + mtxrunjit --script font --reload -We also don't want to use other runners, like those that use kpse -to locate the script as this is exactly what mtxrun itself is doing -already. Therefore the runscript program is adapted to a more direct -approach suitable for mtxrun. +We also don't want to use other runners, like those that use kpse to locate the script +as this is exactly what mtxrun itself is doing already. Therefore the runscript program +is adapted to a more direct approach suitable for mtxrun. Compilation: with gcc (size optimized): -gcc -Os -s -shared -o mtxrun.dll mtxrun_dll.c -gcc -Os -s -o mtxrun.exe mtxrun_exe.c -L./ -lmtxrun + gcc -Os -s -shared -o mtxrun.dll mtxrun_dll.c + gcc -Os -s -o mtxrun.exe mtxrun_exe.c -L./ -lmtxrun with tcc (ver. 0.9.24), extra small size -tcc -shared -o runscript.dll runscript_dll.c -tcc -o runscript.exe runscript_exe.c runscript.def + tcc -shared -o runscript.dll runscript_dll.c + tcc -o runscript.exe runscript_exe.c runscript.def diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 7fdbb59d2..6aca0c324 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{2014.01.21 15:48} +\newcontextversion{2014.01.21 16: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 efc48c711..8edd7684d 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.mkiv b/tex/context/base/context.mkiv index 63e9de509..c9d05af02 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -28,7 +28,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2014.01.21 15:48} +\edef\contextversion{2014.01.21 16:07} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 719368b3a..aca6c4612 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 de843069b..78427d0ff 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 609f3db9c..e1c1e21a3 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 : 01/21/14 15:48:23 +-- merge date : 01/21/14 16:07:10 do -- begin closure to overcome local limits and interference -- cgit v1.2.3