diff --git a/source/texk/web2c/luatexdir/ChangeLog b/source/texk/web2c/luatexdir/ChangeLog index 6885c01f39536939c78db0b3569c33e2543e6e4d..36d78b65e7fac7d6b2c7830553c00172f8add304 100644 --- a/source/texk/web2c/luatexdir/ChangeLog +++ b/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,8 @@ +2024-10-12 Luigi Scarso <luigi.scarso@gmail.com> + * Handle token combiners in immediate assignments (H.Hagen) + * LuaTeX 1.19.0 + + 2024-09-01 Luigi Scarso <luigi.scarso@gmail.com> * Changed char utf8word[(4 * MAX_WORD_LEN) + 1] = { 0 }; in char utf8word[(4 * MAX_WORD_LEN) + 1] ; diff --git a/source/texk/web2c/luatexdir/luatex.c b/source/texk/web2c/luatexdir/luatex.c index 9ad8c1bf45f537186904142c3d001f8d44311469..11d1ad08d5105beb5fd2df32990fae475a445fd9 100644 --- a/source/texk/web2c/luatexdir/luatex.c +++ b/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 = 118; -int luatex_revision = '2'; -const char *luatex_version_string = "1.18.2"; +int luatex_version = 119; +int luatex_revision = '9'; +const char *luatex_version_string = "1.19.0"; const char *engine_name = my_name; #include <kpathsea/c-ctype.h> diff --git a/source/texk/web2c/luatexdir/luatex_svnversion.h b/source/texk/web2c/luatexdir/luatex_svnversion.h index 2b284e99932640aad0b15725576e2f10837aa801..2a64a438cb34daac7ff6d1d02762ee33d5937655 100644 --- a/source/texk/web2c/luatexdir/luatex_svnversion.h +++ b/source/texk/web2c/luatexdir/luatex_svnversion.h @@ -1,4 +1,4 @@ #ifndef luatex_svn_revision_h #define luatex_svn_revision_h -#define luatex_svn_revision 7626 +#define luatex_svn_revision 7627 #endif diff --git a/source/texk/web2c/luatexdir/tex/textoken.c b/source/texk/web2c/luatexdir/tex/textoken.c index 8fef4f5916ec315cd5a0f05c61440a18f06a021a..6097f223200e982db85fdb467a47d230d8aff30c 100644 --- a/source/texk/web2c/luatexdir/tex/textoken.c +++ b/source/texk/web2c/luatexdir/tex/textoken.c @@ -882,7 +882,7 @@ void check_outer_validity(void) halfword q; if (suppress_outer_error_par) return; - if ( OK_to_interrupt && (scanner_status != normal)) { + if (scanner_status != normal) { deletions_allowed = false; /*tex @@ -2907,7 +2907,10 @@ void conv_toks(void) /*tex one-step do_assignment */ if (cur_cmd > max_non_prefixed_command) { set_box_allowed = false; - prefixed_command(); + if (cur_cmd == combine_toks_cmd) + combine_the_toks(); + else + prefixed_command(); set_box_allowed = true; } /*tex done */ @@ -2922,7 +2925,10 @@ void conv_toks(void) break; } else { set_box_allowed = false; - prefixed_command(); + if (cur_cmd == combine_toks_cmd) + combine_the_toks(); + else + prefixed_command(); set_box_allowed = true; } }