texlive[72533] Build/source/texk/web2c/luatexdir: Handle token

commits+lscarso at tug.org commits+lscarso at tug.org
Sat Oct 12 10:38:16 CEST 2024


Revision: 72533
          https://tug.org/svn/texlive?view=revision&revision=72533
Author:   lscarso
Date:     2024-10-12 10:38:16 +0200 (Sat, 12 Oct 2024)
Log Message:
-----------
Handle token combiners in immediate assignments (H.Hagen). Fixed a typo in texfont.c (thanks to Josef Friedrich). LuaTeX 1.19.0

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/luatexdir/ChangeLog
    trunk/Build/source/texk/web2c/luatexdir/font/texfont.c
    trunk/Build/source/texk/web2c/luatexdir/luatex.c
    trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
    trunk/Build/source/texk/web2c/luatexdir/tex/textoken.c

Modified: trunk/Build/source/texk/web2c/luatexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/ChangeLog	2024-10-12 01:13:41 UTC (rev 72532)
+++ trunk/Build/source/texk/web2c/luatexdir/ChangeLog	2024-10-12 08:38:16 UTC (rev 72533)
@@ -1,3 +1,12 @@
+2024-10-12  Luigi Scarso <luigi.scarso at gmail.com>
+	* Handle token combiners in immediate assignments (H.Hagen)
+	* LuaTeX 1.19.0
+
+
+2024-09-15  Luigi Scarso <luigi.scarso at gmail.com>
+	* Fixed a typo in texfont.c (thanks to Josef Friedrich)
+
+
 2024-09-01  Luigi Scarso <luigi.scarso at gmail.com>
         * Changed char utf8word[(4 * MAX_WORD_LEN) + 1] = { 0 };
 	in char utf8word[(4 * MAX_WORD_LEN) + 1] ;

Modified: trunk/Build/source/texk/web2c/luatexdir/font/texfont.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/font/texfont.c	2024-10-12 01:13:41 UTC (rev 72532)
+++ trunk/Build/source/texk/web2c/luatexdir/font/texfont.c	2024-10-12 08:38:16 UTC (rev 72533)
@@ -1878,7 +1878,7 @@
 
 /*tex
 
-    Here's an old (sort of obsolete) letterspace-a-font helper. It does so by by
+    Here's an old (sort of obsolete) letterspace-a-font helper. It does so by
     creating a virtual font.
 
 */

Modified: trunk/Build/source/texk/web2c/luatexdir/luatex.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luatex.c	2024-10-12 01:13:41 UTC (rev 72532)
+++ trunk/Build/source/texk/web2c/luatexdir/luatex.c	2024-10-12 08:38:16 UTC (rev 72533)
@@ -32,9 +32,9 @@
     stick to "0" upto "9" so users can expect a number represented as string.
 */
 
-int luatex_version = 118;
-int luatex_revision = '2';
-const char *luatex_version_string = "1.18.2";
+int luatex_version = 119;
+int luatex_revision = '9';
+const char *luatex_version_string = "1.19.0";
 const char *engine_name = my_name;
 
 #include <kpathsea/c-ctype.h>

Modified: trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h	2024-10-12 01:13:41 UTC (rev 72532)
+++ trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h	2024-10-12 08:38:16 UTC (rev 72533)
@@ -1,4 +1,4 @@
 #ifndef luatex_svn_revision_h
 #define luatex_svn_revision_h
-#define luatex_svn_revision 7624
+#define luatex_svn_revision 7627
 #endif

Modified: trunk/Build/source/texk/web2c/luatexdir/tex/textoken.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/textoken.c	2024-10-12 01:13:41 UTC (rev 72532)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/textoken.c	2024-10-12 08:38:16 UTC (rev 72533)
@@ -882,7 +882,7 @@
     halfword q;
     if (suppress_outer_error_par)
         return;
-    if (   OK_to_interrupt  && (scanner_status != normal)) {
+    if (scanner_status != normal) {
         deletions_allowed = false;
         /*tex
 
@@ -2907,7 +2907,10 @@
                 /*tex one-step do_assignment */
                 if (cur_cmd > max_non_prefixed_command) {
                     set_box_allowed = false;
-                    prefixed_command();
+                    if (cur_cmd == combine_toks_cmd)
+                        combine_the_toks();
+                    else
+                        prefixed_command();
                     set_box_allowed = true;
                 }
                 /*tex done */
@@ -2922,7 +2925,10 @@
                             break;
                         } else {
                             set_box_allowed = false;
-                            prefixed_command();
+                            if (cur_cmd == combine_toks_cmd)
+                                combine_the_toks();
+                            else
+                                prefixed_command();
                             set_box_allowed = true;
                         }
                     }



More information about the tex-live-commits mailing list.