From 808280db06d45875c9dff59b5c5d1968ca49e968 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Wed, 6 Apr 2016 13:02:10 +0000 Subject: web2c/luatexdir: sync with the upstream git-svn-id: svn://tug.org/texlive/trunk@40259 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/luatexdir/lua/ltexiolib.c | 6 +++++- Build/source/texk/web2c/luatexdir/lua/luatex-api.h | 6 ------ Build/source/texk/web2c/luatexdir/tex/texmath.w | 2 ++ Build/source/texk/web2c/luatexdir/tex/texnodes.w | 13 +++++++------ 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Build/source/texk/web2c/luatexdir/lua/ltexiolib.c b/Build/source/texk/web2c/luatexdir/lua/ltexiolib.c index 37c8fc79336..370c457b91f 100644 --- a/Build/source/texk/web2c/luatexdir/lua/ltexiolib.c +++ b/Build/source/texk/web2c/luatexdir/lua/ltexiolib.c @@ -147,7 +147,11 @@ void flush_loggable_info(void) static int texio_setescape(lua_State * L) { - escape_controls = lua_tointeger(L,-1); + if (lua_type(L, 1) == LUA_TBOOLEAN) { + escape_controls = lua_toboolean(L,1); + } else { + escape_controls = lua_tointeger(L,1); + } return 0 ; } diff --git a/Build/source/texk/web2c/luatexdir/lua/luatex-api.h b/Build/source/texk/web2c/luatexdir/lua/luatex-api.h index 07bfcba5a70..6e78434f13a 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luatex-api.h +++ b/Build/source/texk/web2c/luatexdir/lua/luatex-api.h @@ -698,7 +698,6 @@ make_lua_key(parameters);\ make_lua_key(pardir);\ make_lua_key(parshape);\ make_lua_key(pdf_data);\ -make_lua_key(pdftex);\ make_lua_key(pdf_destination);\ make_lua_key(pdf_literal);\ make_lua_key(pen_broken);\ @@ -797,7 +796,6 @@ make_lua_key(transform);\ make_lua_key(trim);\ make_lua_key(type);\ make_lua_key(uchyph);\ -make_lua_key(umath);\ make_lua_key(units_per_em);\ make_lua_key(used);\ make_lua_key(user_id);\ @@ -1051,7 +1049,6 @@ init_lua_key(pagesattributes);\ init_lua_key(parameters);\ init_lua_key(pardir);\ init_lua_key(parshape);\ -init_lua_key(pdftex);\ init_lua_key(pdf_destination);\ init_lua_key(pdf_literal);\ init_lua_key(pen_broken);\ @@ -1149,7 +1146,6 @@ init_lua_key(transform);\ init_lua_key(trim);\ init_lua_key(type);\ init_lua_key(uchyph);\ -init_lua_key(umath);\ init_lua_key(units_per_em);\ init_lua_key(used);\ init_lua_key(user_id);\ @@ -1470,7 +1466,6 @@ use_lua_key(parameters); use_lua_key(pardir); use_lua_key(parshape); use_lua_key(pdf_data); -use_lua_key(pdftex); use_lua_key(pdf_destination); use_lua_key(pdf_literal); use_lua_key(pen_broken); @@ -1569,7 +1564,6 @@ use_lua_key(transform); use_lua_key(trim); use_lua_key(type); use_lua_key(uchyph); -use_lua_key(umath); use_lua_key(units_per_em); use_lua_key(used); use_lua_key(user_id); diff --git a/Build/source/texk/web2c/luatexdir/tex/texmath.w b/Build/source/texk/web2c/luatexdir/tex/texmath.w index 5067764fbf9..abfd08db520 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texmath.w +++ b/Build/source/texk/web2c/luatexdir/tex/texmath.w @@ -2456,6 +2456,7 @@ void after_math(void) /* begin mathskip code */ if (! glue_is_zero(math_skip)) { copy_glue_values(tail,math_skip); + surround(tail) = 0; } /* end mathskip code */ if (dir_math_save) { @@ -2474,6 +2475,7 @@ void after_math(void) /* begin mathskip code */ if (! glue_is_zero(math_skip)) { copy_glue_values(tail,math_skip); + surround(tail) = 0; } /* end mathskip code */ space_factor = 1000; diff --git a/Build/source/texk/web2c/luatexdir/tex/texnodes.w b/Build/source/texk/web2c/luatexdir/tex/texnodes.w index 77610988d95..ef88d489845 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texnodes.w +++ b/Build/source/texk/web2c/luatexdir/tex/texnodes.w @@ -3022,11 +3022,9 @@ void show_node_list(int p) if (subtype(p) != normal) { print_char('('); if ((subtype(p) - 1) < thin_mu_skip_code) { - print_cmd_chr(assign_glue_cmd, - glue_base + (subtype(p) - 1)); + print_cmd_chr(assign_glue_cmd, glue_base + (subtype(p) - 1)); } else if (subtype(p) < cond_math_glue) { - print_cmd_chr(assign_mu_glue_cmd, - glue_base + (subtype(p) - 1)); + print_cmd_chr(assign_mu_glue_cmd, glue_base + (subtype(p) - 1)); } else if (subtype(p) == cond_math_glue) { tprint_esc("nonscript"); } else { @@ -3074,9 +3072,12 @@ void show_node_list(int p) tprint("on"); else tprint("off"); - if (width(p) != 0) { + if (!glue_is_zero(p)) { + tprint(", glued "); + print_spec(p, NULL); + } else if (surround(p) != 0) { tprint(", surrounded "); - print_scaled(width(p)); + print_scaled(surround(p)); } break; case penalty_node: -- cgit v1.2.3