From d54b26c1bcb69a4c1a9b0d2982964ba5afe351e1 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Tue, 2 Feb 2021 03:09:16 +0000 Subject: sync with the upstream git-svn-id: svn://tug.org/texlive/trunk@57595 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/luatexdir/ChangeLog | 5 ++++- Build/source/texk/web2c/luatexdir/luatex_svnversion.h | 2 +- Build/source/texk/web2c/luatexdir/tex/scanning.c | 8 ++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 3c3dc892b35..0fb4733ff47 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,4 +1,7 @@ -2021-01-31 Luigi Scarso +2021-02-01 Luigi Scarso + * two TeX January 2021 DEK buglet fixes (H.Hagen) + +2021-01-31 Luigi Scarso * mark math glyphs as protected (in order to prevent processing as text in base mode) (H.Hagen) * removed width/ic compensation for traditional math code path diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h index c91a2c84ab3..aad873b3bcc 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 7402 +#define luatex_svn_revision 7403 diff --git a/Build/source/texk/web2c/luatexdir/tex/scanning.c b/Build/source/texk/web2c/luatexdir/tex/scanning.c index 2ecb54bc2f6..deddbf5649b 100644 --- a/Build/source/texk/web2c/luatexdir/tex/scanning.c +++ b/Build/source/texk/web2c/luatexdir/tex/scanning.c @@ -2093,7 +2093,8 @@ halfword scan_toks(boolean macro_def, boolean xpand) */ s = match_token + cur_chr; get_token(); - if (cur_cmd == left_brace_cmd) { + /* if (cur_cmd == left_brace_cmd) { */ + if (cur_tok < left_brace_limit) { hash_brace = cur_tok; store_new_token(cur_tok); store_new_token(end_match_token); @@ -2101,7 +2102,10 @@ halfword scan_toks(boolean macro_def, boolean xpand) } if (t == nine_token) { print_err("You already have nine parameters"); - help1("I'm going to ignore the # sign you just used."); + help2( + "I'm going to ignore the # sign you just used,", + "as well as the token that followed it." + ); error(); } else { incr(t); -- cgit v1.2.3