summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuigi Scarso <luigi.scarso@gmail.com>2021-04-19 14:58:13 +0000
committerLuigi Scarso <luigi.scarso@gmail.com>2021-04-19 14:58:13 +0000
commit579e5d528ba0da1687dfa6e2aaf0d288d9a281d8 (patch)
tree819a7f334c14b4edf48e8d5f9a32f2a3f3d4075c
parentc55fff18e2c535a3058c3b0fe3a59ad46c99aeac (diff)
Sync with upstream luatex. Accept par in math after halign and eqn when in supress mode; a patch for linkarea in rtl context.
git-svn-id: svn://tug.org/texlive/trunk@58916 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog7
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex.c6
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex_svnversion.h2
-rw-r--r--Build/source/texk/web2c/luatexdir/pdf/pdflink.c11
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/texmath.c8
5 files changed, 29 insertions, 5 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 2cfba66d219..350e7557c45 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,6 @@
+2021-04-19 Luigi Scarso <luigi.scarso@gmail.com>
+ * A patch for linkarea in rtl context
+
2021-04-10 Luigi Scarso <luigi.scarso@gmail.com>
* LuaTeX version 1.13.2 with MetaPost 2.01.
The version change in MetaPost
@@ -7,6 +10,10 @@
* LuaTeX version 1.13.1,
The version change is due solely to the bug fix in btex .. etex
+2021-03-28 Luigi Scarso <luigi.scarso@gmail.com>
+ * also accept par in math after halign
+ and eqn when in supress mode (HH)
+
2021-03-23 Karl Berry <karl@tug.org>
* TL'21.
diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c
index 32be034a474..d441d53f952 100644
--- a/Build/source/texk/web2c/luatexdir/luatex.c
+++ b/Build/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 = 113;
-int luatex_revision = '2';
-const char *luatex_version_string = "1.13.2";
+int luatex_version = 114;
+int luatex_revision = '0';
+const char *luatex_version_string = "1.14.0";
const char *engine_name = my_name;
#include <kpathsea/c-ctype.h>
diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
index 05a5731b53d..e71e8868ac7 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 7430
+#define luatex_svn_revision 7432
diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdflink.c b/Build/source/texk/web2c/luatexdir/pdf/pdflink.c
index 77b950adf25..b5bad7a682b 100644
--- a/Build/source/texk/web2c/luatexdir/pdf/pdflink.c
+++ b/Build/source/texk/web2c/luatexdir/pdf/pdflink.c
@@ -106,7 +106,16 @@ void end_link(PDF pdf, halfword p)
pdf_ann_right(q) = pos.h + pdf_link_margin;
break;
case dir_TRT:
- pdf_ann_left(q) = pos.h - pdf_link_margin;
+ /*tex
+ In version 1.13.0 the test for swapping was moved
+ to the moment we write the rectangle, but it did not
+ consider this case.
+ */
+ if (pdf_ann_left(q)<pdf_ann_right(q)) {
+ pdf_ann_left(q) = pos.h - pdf_link_margin;
+ } else {
+ pdf_ann_right(q) = pos.h - pdf_link_margin;
+ }
break;
case dir_LTL:
case dir_RTT:
diff --git a/Build/source/texk/web2c/luatexdir/tex/texmath.c b/Build/source/texk/web2c/luatexdir/tex/texmath.c
index 4d2bf80ecd6..461a51578fb 100644
--- a/Build/source/texk/web2c/luatexdir/tex/texmath.c
+++ b/Build/source/texk/web2c/luatexdir/tex/texmath.c
@@ -2554,8 +2554,12 @@ void after_math(void)
}
if (mode == -m) {
/*tex end of equation number */
+ RECHECK:
if (cur_cmd == math_shift_cmd) {
check_second_math_shift();
+ } else if (suppress_mathpar_error_par && cur_cmd == par_end_cmd) {
+ get_x_token();
+ goto RECHECK;
} else {
check_display_math_end();
}
@@ -2690,8 +2694,12 @@ void after_math(void)
void finish_display_alignment(pointer p, pointer q, halfword saved_prevdepth)
{
do_assignments();
+ RECHECK:
if (cur_cmd == math_shift_cmd) {
check_second_math_shift();
+ } else if (suppress_mathpar_error_par && cur_cmd == par_end_cmd) {
+ get_x_token();
+ goto RECHECK;
} else {
check_display_math_end();
}