summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-04-16 06:58:27 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-04-16 06:58:27 +0000
commitbffd3dfd2a934cde7389a5a6517bd1ad284113eb (patch)
tree9b356ce9041842ccbf7f2d014d2161739e4c4d7c /Build
parent4fff009b9b32a9dd5c04146b18d4be71b0ad56e6 (diff)
LuaTeX: Correctly handle '--luac' and '--luaconly' (from Akira)
git-svn-id: svn://tug.org/texlive/trunk@29968 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/luainit.w15
2 files changed, 13 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 12da222905d..0532154a0bd 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * lua/luainit.w: Handle '--luac' and '--luaconly' (from Akira).
+
2013-04-16 Elie Roux <elie.roux@telecom-bretagne.eu>
* font/tfmofm.w: check for .ofm as well as .tfm.
diff --git a/Build/source/texk/web2c/luatexdir/lua/luainit.w b/Build/source/texk/web2c/luatexdir/lua/luainit.w
index b0535fb9d01..26a10429e6f 100644
--- a/Build/source/texk/web2c/luatexdir/lua/luainit.w
+++ b/Build/source/texk/web2c/luatexdir/lua/luainit.w
@@ -765,7 +765,7 @@ void lua_initialize(int ac, char **av)
argv = av;
if (luatex_svn < 0) {
- const char *fmt = "This is LuaTeX, Version %s-%s" WEB2CVERSION;
+ const char *fmt = "This is LuaTeX, Version %s-%s " WEB2CVERSION;
size_t len;
char buf[16];
sprintf(buf, "%d", luatex_date_info);
@@ -776,7 +776,7 @@ void lua_initialize(int ac, char **av)
banner = xmalloc(len);
sprintf(banner, fmt, luatex_version_string, buf);
} else {
- const char *fmt = "This is LuaTeX, Version %s-%s " WEB2CVERSION "(rev %d)";
+ const char *fmt = "This is LuaTeX, Version %s-%s " WEB2CVERSION " (rev %d)";
size_t len;
char buf[16];
sprintf(buf, "%d", luatex_date_info);
@@ -789,10 +789,13 @@ void lua_initialize(int ac, char **av)
kpse_invocation_name = cleaned_invocation_name(argv[0]);
/* be 'luac' */
- if (argc > 1 &&
- (STREQ(kpse_invocation_name, "texluac") ||
- STREQ(argv[1], "--luaconly") || STREQ(argv[1], "--luac"))) {
- exit(luac_main(ac, av));
+ if (argc >1) {
+ if (STREQ(kpse_invocation_name, "texluac"))
+ exit(luac_main(ac, av));
+ if (STREQ(argv[1], "--luaconly") || STREQ(argv[1], "--luac")) {
+ strcpy(av[1], "luatex");
+ exit(luac_main(--ac, ++av));
+ }
}
#if defined(WIN32) || defined(__MINGW32__) || defined(__CYGWIN__)
mk_suffixlist();