diff --git a/source/texk/web2c/luatexdir/luatex_svnversion.h b/source/texk/web2c/luatexdir/luatex_svnversion.h index 54061ae58aee3adbfd9659863086e43842c7a085..c6db7e5df38374545aa46a3b6325e93633bcf0f4 100644 --- a/source/texk/web2c/luatexdir/luatex_svnversion.h +++ b/source/texk/web2c/luatexdir/luatex_svnversion.h @@ -1 +1 @@ -#define luatex_svn_revision 6354 +#define luatex_svn_revision 6356 diff --git a/source/texk/web2c/luatexdir/utils/utils.w b/source/texk/web2c/luatexdir/utils/utils.w index e947fb77df54a1a867bef26f883eb15987148309..920e339833bcdc83b1f1510ee886a6c6fe70b7b7 100644 --- a/source/texk/web2c/luatexdir/utils/utils.w +++ b/source/texk/web2c/luatexdir/utils/utils.w @@ -250,24 +250,32 @@ char *stripzeros(char *a) @ @c void initversionstring(char **versions) { +#ifdef LuajitTeX +#define LUA_VER_STRING LUAJIT_VERSION +#else +#define LUA_VER_STRING "lua version " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "." LUA_VERSION_RELEASE +#endif const_string fmt = "Compiled with libpng %s; using %s\n" - "Compiled with zlib %s; using %s\n" + "Compiled with %s\n" /* Lua or LuaJIT */ + "Compiled with mplib version %s\n" "Compiled with poppler version %s\n" - "Compiled with mplib version %s\n"; + "Compiled with zlib %s; using %s\n"; size_t len = strlen(fmt) + strlen(PNG_LIBPNG_VER_STRING) + strlen(png_libpng_ver) - + strlen(ZLIB_VERSION) + strlen(zlib_version) - + strlen(POPPLER_VERSION) + + strlen(LUA_VER_STRING) + strlen(mp_metapost_version()) + + strlen(POPPLER_VERSION) + + strlen(ZLIB_VERSION) + strlen(zlib_version) + 1; /* len will be more than enough, because of the placeholder chars in fmt that get replaced by the arguments. */ *versions = xmalloc(len); sprintf(*versions, fmt, - PNG_LIBPNG_VER_STRING, png_libpng_ver, - ZLIB_VERSION, zlib_version, POPPLER_VERSION, mp_metapost_version()); + PNG_LIBPNG_VER_STRING, png_libpng_ver, LUA_VER_STRING, + mp_metapost_version(),POPPLER_VERSION, + ZLIB_VERSION, zlib_version); } @ @c