diff options
author | Luigi Scarso <luigi.scarso@gmail.com> | 2019-02-15 14:58:33 +0000 |
---|---|---|
committer | Luigi Scarso <luigi.scarso@gmail.com> | 2019-02-15 14:58:33 +0000 |
commit | c95ec548f97bb16f9ca58ccb4825e6d517e27f6d (patch) | |
tree | 824f90ec1fe5fce34f56764d51d999cad2a55c20 /Build/source/texk/web2c/luatexdir/tex | |
parent | 6ec4f2024cacd839370876dca215c9681734b1da (diff) |
sync with luatex experimental rev. 7084
git-svn-id: svn://tug.org/texlive/trunk@50029 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/tex')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/filename.c | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/linebreak.c | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/textoken.c | 3 |
3 files changed, 5 insertions, 2 deletions
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) { |