summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir/lua
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2017-02-15 22:47:54 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2017-02-15 22:47:54 +0000
commite1d7bddac7d75ef6bb337f709e67cbd35a6b1e09 (patch)
tree780e86b897efa5ee377c06c45981b4cec49bfeda /Build/source/texk/web2c/luatexdir/lua
parentb7a9077e3786c754c908fcb1acb14f856aac4e8f (diff)
luatexdir, mplibdir: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@43237 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/lua')
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/lnodelib.c2
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/lstatslib.c13
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/luatex-api.h1
3 files changed, 11 insertions, 5 deletions
diff --git a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c
index a6fc98aba17..dbe195ff2c0 100644
--- a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c
@@ -538,7 +538,7 @@ static int lua_nodelib_direct_getcomponents(lua_State * L)
{
halfword n = lua_tointeger(L, 1);
if ((n) && (type(n) == glyph_node)) {
- lua_pushinteger(L, lig_ptr(n));
+ nodelib_pushdirect_or_nil(lig_ptr(n));
} else {
lua_pushnil(L);
}
diff --git a/Build/source/texk/web2c/luatexdir/lua/lstatslib.c b/Build/source/texk/web2c/luatexdir/lua/lstatslib.c
index 7c6e1bda2b8..7473ca214a4 100644
--- a/Build/source/texk/web2c/luatexdir/lua/lstatslib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/lstatslib.c
@@ -116,6 +116,13 @@ static const char *luatexrevision(void)
return (const char *) (strrchr(luatex_version_string, '.') + 1);
}
+static const char *getenginename(void)
+{
+ return engine_name;
+}
+
+
+
static lua_Number get_luatexhashchars(void)
{
return (lua_Number) LUAI_HASHLIMIT;
@@ -217,8 +224,6 @@ static lua_Number shell_escape_state(void)
}
}
-static int luastate_max = 1; /* fixed value */
-
/* temp, for backward compat */
static int init_pool_ptr = 0;
@@ -250,9 +255,10 @@ static struct statistic stats[] = {
{"log_name", 'S', (void *) &getlogname},
{"banner", 'S', (void *) &getbanner},
{"luatex_version", 'G', &get_luatexversion},
- {"luatex_revision", 'S', (void *) &luatexrevision},
+ {"luatex_revision", 'S', (void *) &luatexrevision},
{"luatex_hashtype", 'S', (void *) &get_luatexhashtype},
{"luatex_hashchars", 'N', &get_luatexhashchars},
+ {"luatex_engine", 'S', (void *) &getenginename},
{"ini_version", 'b', &ini_version},
@@ -302,7 +308,6 @@ static struct statistic stats[] = {
{"largest_used_mark", 'g', &biggest_used_mark},
{"luabytecodes", 'g', &luabytecode_max},
{"luabytecode_bytes", 'g', &luabytecode_bytes},
- {"luastates", 'g', &luastate_max},
{"luastate_bytes", 'g', &luastate_bytes},
{"callbacks", 'g', &callback_count},
{"indirect_callbacks", 'g', &saved_callback_count},
diff --git a/Build/source/texk/web2c/luatexdir/lua/luatex-api.h b/Build/source/texk/web2c/luatexdir/lua/luatex-api.h
index 4ef40be8b71..f7c612ce204 100644
--- a/Build/source/texk/web2c/luatexdir/lua/luatex-api.h
+++ b/Build/source/texk/web2c/luatexdir/lua/luatex-api.h
@@ -189,6 +189,7 @@ extern int callback_count;
extern int saved_callback_count;
extern const char *luatex_banner;
+extern const char *engine_name;
/* luastuff.h */