web2c/luatexdir: sync with the upstream

git-svn-id: svn://tug.org/texlive/trunk@39623 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 10 insertions, 6 deletions

diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c
index 14d5fd2cd99..6a1e20d2206 100644
--- a/Build/source/texk/web2c/luatexdir/luatex.c
+++ b/Build/source/texk/web2c/luatexdir/luatex.c
@@ -29,9 +29,9 @@
 #define TeX
 
 int luatex_version = 89;        /* \.{\\luatexversion}  */
-int luatex_revision = '0';      /* \.{\\luatexrevision}  */
+int luatex_revision = '1';      /* \.{\\luatexrevision}  */
 int luatex_date_info = 2016020500;     /* the compile date is now hardwired */
-const char *luatex_version_string = "beta-0.89.0";
+const char *luatex_version_string = "beta-0.89.1";
 const char *engine_name = my_name;     /* the name of this engine */
 
 #include <kpathsea/c-ctype.h>
diff --git a/Build/source/texk/web2c/luatexdir/tex/textoken.w b/Build/source/texk/web2c/luatexdir/tex/textoken.w
index 5b10b1cdd2d..f8fb8b467a0 100644
--- a/Build/source/texk/web2c/luatexdir/tex/textoken.w
+++ b/Build/source/texk/web2c/luatexdir/tex/textoken.w
@@ -238,10 +238,14 @@ including the expansion of a macro or mark.
 @c
 void print_meaning(void)
 {
-    if (cur_cmd == math_char_num_cmd && cur_chr == 0) {
-        /* \mathchar -> \Umathchar */
-        cur_chr = 1 ;
-    }
+    /* remap \mathchar onto \Umathchar */
+    if (cur_cmd == math_given_cmd) {
+        cur_cmd = xmath_given_cmd ;
+    } /* else if (cur_cmd == math_char_num_cmd) {
+        if (cur_chr == 0) {
+            cur_chr = 1 ;
+        }
+    } */
     print_cmd_chr((quarterword) cur_cmd, cur_chr);
     if (cur_cmd >= call_cmd) {
         print_char(':');