From c95ec548f97bb16f9ca58ccb4825e6d517e27f6d Mon Sep 17 00:00:00 2001 From: Luigi Scarso Date: Fri, 15 Feb 2019 14:58:33 +0000 Subject: sync with luatex experimental rev. 7084 git-svn-id: svn://tug.org/texlive/trunk@50029 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/luatexdir/lua/lnewtokenlib.c | 4 ++++ Build/source/texk/web2c/luatexdir/luatex.c | 6 +++--- Build/source/texk/web2c/luatexdir/luatex_svnversion.h | 2 +- Build/source/texk/web2c/luatexdir/tex/filename.c | 2 +- Build/source/texk/web2c/luatexdir/tex/linebreak.c | 2 +- Build/source/texk/web2c/luatexdir/tex/textoken.c | 3 +++ 6 files changed, 13 insertions(+), 6 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/web2c/luatexdir/lua/lnewtokenlib.c b/Build/source/texk/web2c/luatexdir/lua/lnewtokenlib.c index 3e879b54ade..cb3736b8ee3 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lnewtokenlib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lnewtokenlib.c @@ -580,9 +580,11 @@ static int run_scan_string(lua_State * L) /* HH */ t = def_ref; def_ref = saved_defref; tokenlist_to_luastring(L,t); + flush_list(t); } else if (cur_cmd == call_cmd) { t = token_link(cur_chr); tokenlist_to_luastring(L,t); + flush_list(t); } else if (cur_cmd == 11 || cur_cmd == 12 ) { declare_buffer; while (1) { @@ -617,6 +619,7 @@ static int run_scan_argument(lua_State * L) /* HH */ t = def_ref; def_ref = saved_defref; tokenlist_to_luastring(L,t); + flush_list(t); } else if (cur_cmd == call_cmd) { halfword saved_cur_tok = cur_tok; cur_tok = right_brace_token + '}'; @@ -630,6 +633,7 @@ static int run_scan_argument(lua_State * L) /* HH */ t = def_ref; def_ref = saved_defref; tokenlist_to_luastring(L,t); + flush_list(t); } else if (cur_cmd == 11 || cur_cmd == 12 ) { declare_buffer; while (1) { diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c index a057c3a6cc0..98bfd7f891f 100644 --- a/Build/source/texk/web2c/luatexdir/luatex.c +++ b/Build/source/texk/web2c/luatexdir/luatex.c @@ -32,9 +32,9 @@ stick to "0" upto "9" so users can expect a number represented as string. */ -int luatex_version = 109; -int luatex_revision = '2'; -const char *luatex_version_string = "1.09.2"; +int luatex_version = 110; +int luatex_revision = '0'; +const char *luatex_version_string = "1.10.0"; const char *engine_name = my_name; #include diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h index 67b691c3776..433bde2a4a7 100644 --- a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h +++ b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h @@ -1 +1 @@ -#define luatex_svn_revision 7075 +#define luatex_svn_revision 7084 diff --git a/Build/source/texk/web2c/luatexdir/tex/filename.c b/Build/source/texk/web2c/luatexdir/tex/filename.c index fdc6641efca..b1f810d2305 100644 --- a/Build/source/texk/web2c/luatexdir/tex/filename.c +++ b/Build/source/texk/web2c/luatexdir/tex/filename.c @@ -223,8 +223,8 @@ void scan_file_name_toks(void) cur_name = maketexstring(n); cur_ext = get_nullstr(); } + flush_list(def_ref); xfree(s); - } /*tex diff --git a/Build/source/texk/web2c/luatexdir/tex/linebreak.c b/Build/source/texk/web2c/luatexdir/tex/linebreak.c index df13931e14c..d31a63236a8 100644 --- a/Build/source/texk/web2c/luatexdir/tex/linebreak.c +++ b/Build/source/texk/web2c/luatexdir/tex/linebreak.c @@ -1579,7 +1579,7 @@ static void ext_try_break( shortfall -= (total_font_stretch + margin_kern_stretch); } else if ((shortfall < 0) && ((total_font_shrink + margin_kern_shrink) > 0)) { if ((total_font_shrink + margin_kern_shrink) > -shortfall) - shortfall -= ((total_font_shrink + margin_kern_shrink) / (max_shrink_ratio / cur_font_step)) / 2; + shortfall = -((total_font_shrink + margin_kern_shrink) / (max_shrink_ratio / cur_font_step)) / 2; else shortfall += (total_font_shrink + margin_kern_shrink); } diff --git a/Build/source/texk/web2c/luatexdir/tex/textoken.c b/Build/source/texk/web2c/luatexdir/tex/textoken.c index 6056bba2517..d6c16890649 100644 --- a/Build/source/texk/web2c/luatexdir/tex/textoken.c +++ b/Build/source/texk/web2c/luatexdir/tex/textoken.c @@ -2383,6 +2383,7 @@ void combine_the_toks(int how) target = toks(nt); if (target == null) { set_toks_register(nt,source,global); + token_link(source) = null; } else { s = token_link(source); if (s != null) { @@ -2390,6 +2391,7 @@ void combine_the_toks(int how) if (t == null) { /*tex Can this happen? */ set_token_link(target, s); + token_link(source) = null; } else if (append) { /*tex Append. */ if (token_ref_count(target) == 0) { @@ -2428,6 +2430,7 @@ void combine_the_toks(int how) } } } + flush_list(source); } } else { if (cur_cmd == assign_toks_cmd) { -- cgit v1.2.3