summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuigi Scarso <luigi.scarso@gmail.com>2022-02-05 17:58:27 +0000
committerLuigi Scarso <luigi.scarso@gmail.com>2022-02-05 17:58:27 +0000
commit3d6f7239d0cf26e66cc626968d61aa2eb6648ad7 (patch)
tree2ad58f4a6b5b61377546c004c47e7a2b5371739e
parentd01759e790bd40b7e02b361f6860b7c6bea7af88 (diff)
Sync luatex with upstream.
git-svn-id: svn://tug.org/texlive/trunk@61895 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog3
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex_svnversion.h2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/maincontrol.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index d0190c9d68b..cf0677f2a02 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,6 @@
+2022-02-05 Luigi Scarso <luigi.scarso@gmail.com>
+ * intercept prefix for toksapp cum suis (H.Hagen)
+
2022-01-23 Luigi Scarso <luigi.scarso@gmail.com>
* fixing a 15 year old buglet (math atom glue leak).
* New primitive \matheqdirmode for short skip detection in r2l typesetting (H. Hagen)
diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
index ce2de16fab7..ef7e23f3a25 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 7487
+#define luatex_svn_revision 7490
diff --git a/Build/source/texk/web2c/luatexdir/tex/maincontrol.c b/Build/source/texk/web2c/luatexdir/tex/maincontrol.c
index 4f91283b9c0..477842ec421 100644
--- a/Build/source/texk/web2c/luatexdir/tex/maincontrol.c
+++ b/Build/source/texk/web2c/luatexdir/tex/maincontrol.c
@@ -2705,7 +2705,7 @@ void prefixed_command(void)
get_x_token();
} while ((cur_cmd == spacer_cmd) || (cur_cmd == relax_cmd));
- if (cur_cmd <= max_non_prefixed_command) {
+ if (cur_cmd <= max_non_prefixed_command || cur_cmd == combine_toks_cmd) {
/*tex
Discard erroneous prefixes and |return|
*/