diff options
author | Taco Hoekwater <taco@elvenkind.com> | 2009-04-16 07:56:44 +0000 |
---|---|---|
committer | Taco Hoekwater <taco@elvenkind.com> | 2009-04-16 07:56:44 +0000 |
commit | 40c2ba944e1cee0677734608263cbc7ba3a729bf (patch) | |
tree | 6da3acbd4e74eb5854f90416313fb56a4eb29824 /Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c | |
parent | 79e9c535970a1887e1b6b2196cd90775955ea486 (diff) |
Import luatex 0.39.0
git-svn-id: svn://tug.org/texlive/trunk@12733 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c b/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c index c85a1912e49..f06445e62fe 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c @@ -21,7 +21,7 @@ #include <ptexlib.h> static const char _svn_version[] = - "$Id: lcallbacklib.c 2064 2009-03-20 13:13:14Z taco $ $URL: http://scm.foundry.supelec.fr/svn/luatex/trunk/src/texk/web2c/luatexdir/lua/lcallbacklib.c $"; + "$Id: lcallbacklib.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://scm.foundry.supelec.fr/svn/luatex/trunk/source/texk/web2c/luatexdir/lua/lcallbacklib.c $"; extern int do_run_callback(int special, char *values, va_list vl); extern int lua_traceback(lua_State * L); @@ -430,7 +430,10 @@ static int callback_register(lua_State * L) { int cb; char *s; - if (!lua_isstring(L, 1) || ((!lua_isfunction(L, 2)) && !lua_isnil(L, 2))) { + if (!lua_isstring(L, 1) || + ((!lua_isfunction(L, 2)) && + (!lua_isnil(L, 2)) && + (!(lua_isboolean(L, 2) && lua_toboolean(L,2)==0)))) { lua_pushnil(L); lua_pushstring(L, "Invalid arguments to callback.register."); return 2; @@ -447,6 +450,8 @@ static int callback_register(lua_State * L) } if (lua_isfunction(L, 2)) { callback_set[cb] = cb; + } else if (lua_isboolean(L, 2)) { + callback_set[cb] = -1; } else { callback_set[cb] = 0; } |