From 7f5d796e43772d5941569dcab6ce341d9949a2cd Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Thu, 7 Apr 2016 22:31:24 +0000 Subject: web2c/luatexdir: sync with the upstream git-svn-id: svn://tug.org/texlive/trunk@40337 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/luatexdir/lua/lnodelib.c | 8 ++----- Build/source/texk/web2c/luatexdir/lua/lpdflib.c | 28 ++++++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'Build/source/texk/web2c/luatexdir/lua') diff --git a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c index e5863c61ad9..5967a67c790 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c @@ -1960,6 +1960,7 @@ static int lua_nodelib_subtypes(lua_State * L) else if (lua_key_eq(s,kern)) subtypes = node_subtypes_kern; else if (lua_key_eq(s,rule)) subtypes = node_subtypes_rule; else if (lua_key_eq(s,list)) subtypes = node_subtypes_list; + else if (lua_key_eq(s,adjust)) subtypes = node_subtypes_adjust; else if (lua_key_eq(s,disc)) subtypes = node_subtypes_disc; else if (lua_key_eq(s,fill)) subtypes = node_subtypes_fill; else if (lua_key_eq(s,leader)) { subtypes = node_subtypes_leader; l = 2; } @@ -1982,6 +1983,7 @@ static int lua_nodelib_subtypes(lua_State * L) else if (t == rule_node) subtypes = node_subtypes_rule; else if (t == hlist_node) subtypes = node_subtypes_list; else if (t == vlist_node) subtypes = node_subtypes_list; + else if (t == adjust_node) subtypes = node_subtypes_adjust; else if (t == disc_node) subtypes = node_subtypes_disc; else if (t == glue_spec_node) subtypes = node_subtypes_fill; else if (t == margin_kern_node) subtypes = node_subtypes_marginkern; @@ -2943,8 +2945,6 @@ static void lua_nodelib_getfield_whatsit(lua_State * L, int n, const char *s) lua_pushinteger(L, pdf_action_new_window(n)); } else if (lua_key_eq(s, data)) { tokenlist_to_luastring(L, pdf_action_tokens(n)); - } else if (lua_key_eq(s, ref_count)) { - lua_pushinteger(L, pdf_action_refcount(n)); } else { lua_pushnil(L); } @@ -3709,8 +3709,6 @@ static void lua_nodelib_direct_getfield_whatsit(lua_State * L, int n, const char lua_pushinteger(L, pdf_action_new_window(n)); } else if (lua_key_eq(s, data)) { tokenlist_to_luastring(L, pdf_action_tokens(n)); - } else if (lua_key_eq(s, ref_count)) { - lua_pushinteger(L, pdf_action_refcount(n)); } else { lua_pushnil(L); } @@ -4973,8 +4971,6 @@ static int lua_nodelib_setfield_whatsit(lua_State * L, int n, const char *s) pdf_action_new_window(n) = (halfword) lua_tointeger(L, 3); } else if (lua_key_eq(s, data)) { pdf_action_tokens(n) = nodelib_gettoks(L, 3); - /* } else if (lua_key_eq(s, ref_count)) { - pdf_action_refcount(n) = (halfword) lua_tointeger(L, 3); */ } else { return nodelib_cantset(L, n, s); } diff --git a/Build/source/texk/web2c/luatexdir/lua/lpdflib.c b/Build/source/texk/web2c/luatexdir/lua/lpdflib.c index 7991f234f0e..2161d791108 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lpdflib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lpdflib.c @@ -745,19 +745,19 @@ static int l_get_lastannot(lua_State * L) */ -static int l_get_compresslevel(lua_State * L) +static int l_get_compress_level(lua_State * L) { lua_pushinteger(L, (pdf_compress_level)); return 1 ; } -static int l_get_objcompresslevel(lua_State * L) +static int l_get_obj_compress_level(lua_State * L) { - lua_pushinteger(L, (pdf_objcompresslevel)); + lua_pushinteger(L, (pdf_obj_compress_level)); return 1 ; } -static int l_set_compresslevel(lua_State * L) +static int l_set_compress_level(lua_State * L) { if (lua_type(L, 1) == LUA_TNUMBER) { int c = (int) lua_tointeger(L, 1); @@ -765,12 +765,12 @@ static int l_set_compresslevel(lua_State * L) c = 0 ; else if (c>9) c = 9 ; - set_pdf_objcompresslevel(c); + set_pdf_compress_level(c); } return 0 ; } -static int l_set_objcompresslevel(lua_State * L) +static int l_set_obj_compress_level(lua_State * L) { if (lua_type(L, 1) == LUA_TNUMBER) { int c = (int) lua_tointeger(L, 1); @@ -778,7 +778,7 @@ static int l_set_objcompresslevel(lua_State * L) c = 0 ; else if (c>9) c = 9 ; - set_pdf_compress_level(c); + set_pdf_obj_compress_level(c); } return 0 ; } @@ -874,6 +874,8 @@ static int getpdffontsize(lua_State * L) return 1 ; } +/* + static int getpdfpageref(lua_State * L) { if (lua_type(L, 1) == LUA_TNUMBER) { @@ -885,6 +887,8 @@ static int getpdfpageref(lua_State * L) return 1 ; } +*/ + static int getpdfxformname(lua_State * L) { if (lua_type(L, 1) == LUA_TNUMBER) { @@ -1070,7 +1074,7 @@ static const struct luaL_Reg pdflib[] = { { "registerannot", l_registerannot }, { "reserveobj", l_reserveobj }, { "getpos", l_getpos }, - { "pageref", getpdfpageref }, + /* { "pageref", getpdfpageref }, */ { "maxobjnum", l_maxobjnum }, { "pageref", l_pageref }, { "print", luapdfprint }, @@ -1101,10 +1105,10 @@ static const struct luaL_Reg pdflib[] = { { "getretval", l_get_retval }, { "getlastobj", l_get_lastobj }, { "getlastannot", l_get_lastannot }, - { "getcompresslevel", l_get_compresslevel }, - { "getobjcompresslevel", l_get_objcompresslevel }, - { "setcompresslevel", l_set_compresslevel }, - { "setobjcompresslevel", l_set_objcompresslevel }, + { "getcompresslevel", l_get_compress_level }, + { "getobjcompresslevel", l_get_obj_compress_level }, + { "setcompresslevel", l_set_compress_level }, + { "setobjcompresslevel", l_set_obj_compress_level }, { "getdecimaldigits", l_get_decimal_digits }, { "setdecimaldigits", l_set_decimal_digits }, { "getpkresolution", l_get_pk_resolution }, -- cgit v1.2.3