summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2021-02-02 03:09:16 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2021-02-02 03:09:16 +0000
commitd54b26c1bcb69a4c1a9b0d2982964ba5afe351e1 (patch)
treebb02ba93232f223a6c35e383dcaf4270e9712319 /Build/source
parentc1179e644f3dd53a680eaa48ff43c7f3810338c7 (diff)
sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@57595 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex_svnversion.h2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/scanning.c8
3 files changed, 11 insertions, 4 deletions
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 <luigi.scarso@gmail.com>
+2021-02-01 Luigi Scarso <luigi.scarso@gmail.com>
+ * two TeX January 2021 DEK buglet fixes (H.Hagen)
+
+2021-01-31 Luigi Scarso <luigi.scarso@gmail.com>
* 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);