texlive[50029] Build/source/texk/web2c/luatexdir: sync with luatex
commits+lscarso at tug.org
commits+lscarso at tug.org
Fri Feb 15 15:58:34 CET 2019
Revision: 50029
http://tug.org/svn/texlive?view=revision&revision=50029
Author: lscarso
Date: 2019-02-15 15:58:33 +0100 (Fri, 15 Feb 2019)
Log Message:
-----------
sync with luatex experimental rev. 7084
Modified Paths:
--------------
trunk/Build/source/texk/web2c/luatexdir/lua/lnewtokenlib.c
trunk/Build/source/texk/web2c/luatexdir/luatex.c
trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
trunk/Build/source/texk/web2c/luatexdir/tex/filename.c
trunk/Build/source/texk/web2c/luatexdir/tex/linebreak.c
trunk/Build/source/texk/web2c/luatexdir/tex/textoken.c
Modified: trunk/Build/source/texk/web2c/luatexdir/lua/lnewtokenlib.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/lua/lnewtokenlib.c 2019-02-15 03:56:53 UTC (rev 50028)
+++ trunk/Build/source/texk/web2c/luatexdir/lua/lnewtokenlib.c 2019-02-15 14:58:33 UTC (rev 50029)
@@ -580,9 +580,11 @@
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 @@
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 @@
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) {
Modified: trunk/Build/source/texk/web2c/luatexdir/luatex.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luatex.c 2019-02-15 03:56:53 UTC (rev 50028)
+++ trunk/Build/source/texk/web2c/luatexdir/luatex.c 2019-02-15 14:58:33 UTC (rev 50029)
@@ -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 <kpathsea/c-ctype.h>
Modified: trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h 2019-02-15 03:56:53 UTC (rev 50028)
+++ trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h 2019-02-15 14:58:33 UTC (rev 50029)
@@ -1 +1 @@
-#define luatex_svn_revision 7075
+#define luatex_svn_revision 7084
Modified: trunk/Build/source/texk/web2c/luatexdir/tex/filename.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/filename.c 2019-02-15 03:56:53 UTC (rev 50028)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/filename.c 2019-02-15 14:58:33 UTC (rev 50029)
@@ -223,8 +223,8 @@
cur_name = maketexstring(n);
cur_ext = get_nullstr();
}
+ flush_list(def_ref);
xfree(s);
-
}
/*tex
Modified: trunk/Build/source/texk/web2c/luatexdir/tex/linebreak.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/linebreak.c 2019-02-15 03:56:53 UTC (rev 50028)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/linebreak.c 2019-02-15 14:58:33 UTC (rev 50029)
@@ -1579,7 +1579,7 @@
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);
}
Modified: trunk/Build/source/texk/web2c/luatexdir/tex/textoken.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/textoken.c 2019-02-15 03:56:53 UTC (rev 50028)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/textoken.c 2019-02-15 14:58:33 UTC (rev 50029)
@@ -2383,6 +2383,7 @@
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 @@
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 @@
}
}
}
+ flush_list(source);
}
} else {
if (cur_cmd == assign_toks_cmd) {
More information about the tex-live-commits
mailing list