texlive[73179] Build/source/texk/web2c/luatexdir: \globaldefs: more

[commits+lscarso at tug.org]

Revision: 73179
          https://tug.org/svn/texlive?view=revision&revision=73179
Author:   lscarso
Date:     2024-12-21 21:35:02 +0100 (Sat, 21 Dec 2024)
Log Message:
-----------
\globaldefs: more tracing (H.Hagen). LuaTeX 1.19.1

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

Modified: trunk/Build/source/texk/web2c/luatexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/ChangeLog	2024-12-21 00:41:55 UTC (rev 73178)
+++ trunk/Build/source/texk/web2c/luatexdir/ChangeLog	2024-12-21 20:35:02 UTC (rev 73179)
@@ -1,3 +1,7 @@
+2024-12-21 Luigi Scarso <luigi.scarso at gmail.com>
+	* \globaldefs: more tracing (H.Hagen)
+	* LuaTeX 1.19.1
+
 2024-11-02  Luigi Scarso <luigi.scarso at gmail.com>
 	* Fixed a memory leak in token.put_next()  (thanks to user202729 at protonmail.com)
 	* Fixed a memory leak in token.set_macro() implementation (thanks to user202729 at protonmail.com)

Modified: trunk/Build/source/texk/web2c/luatexdir/luatex.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luatex.c	2024-12-21 00:41:55 UTC (rev 73178)
+++ trunk/Build/source/texk/web2c/luatexdir/luatex.c	2024-12-21 20:35:02 UTC (rev 73179)
@@ -33,8 +33,8 @@
 */
 
 int luatex_version = 119;
-int luatex_revision = '9';
-const char *luatex_version_string = "1.19.0";
+int luatex_revision = '1';
+const char *luatex_version_string = "1.19.1";
 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-12-21 00:41:55 UTC (rev 73178)
+++ trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h	2024-12-21 20:35:02 UTC (rev 73179)
@@ -1,4 +1,4 @@
 #ifndef luatex_svn_revision_h
 #define luatex_svn_revision_h
-#define luatex_svn_revision 7628
+#define luatex_svn_revision 7629
 #endif

Modified: trunk/Build/source/texk/web2c/luatexdir/tex/maincontrol.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/maincontrol.c	2024-12-21 00:41:55 UTC (rev 73178)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/maincontrol.c	2024-12-21 20:35:02 UTC (rev 73179)
@@ -2685,6 +2685,17 @@
 
 */
 
+/*
+
+\def\foo{0} {\tracingcommands2 \tracingonline2 \globaldefs 1 \global\def \foo{1}} \foo 1 \par 
+\def\foo{0} {\tracingcommands2 \tracingonline2 \globaldefs 1        \def \foo{2}} \foo 2 \par % {\global enforced} 
+\def\foo{0} {\tracingcommands2 \tracingonline2 \globaldefs 0        \def \foo{4}} \foo 0 \par 
+\def\foo{0} {\tracingcommands2 \tracingonline2 \globaldefs 0        \gdef\foo{4}} \foo 4 \par 
+\def\foo{0} {\tracingcommands2 \tracingonline2 \globaldefs-1 \global\def \foo{3}} \foo 0 \par % {\global canceled} 
+\def\foo{0} {\tracingcommands2 \tracingonline2 \globaldefs-1        \gdef\foo{4}} \foo 0 \par % {\global canceled}
+
+*/
+
 void prefixed_command(void)
 {
     int a;                      /* accumulated prefix codes so far */
@@ -2743,14 +2754,36 @@
     /*tex
         Adjust for the setting of \.{\\globaldefs}
     */
-    if (global_defs_par != 0) {
-        if (global_defs_par < 0) {
-            if (is_global(a))
-                a = a - 4;
-        } else {
-            if (!is_global(a))
-                a = a + 4;
+    /* if (global_defs_par != 0) { */
+    /*     if (global_defs_par < 0) { */
+    /*         if (is_global(a)) */
+    /*             a = a - 4; */
+    /*     } else { */
+    /*         if (!is_global(a)) */
+    /*             a = a + 4; */
+    /*     } */
+    /* } */
+    if (cur_cmd == def_cmd && odd(cur_chr) && ! is_global(a)) {
+        a += 4;
+    }
+    if (global_defs_par < 0) {
+        if (is_global(a)) {
+            a -= 4;
+            if (tracing_commands_par > 1) {
+                begin_diagnostic();
+                tprint_nl("{\\global canceled}");
+                end_diagnostic(false);
+            }
         }
+    } else if (global_defs_par > 0) {
+        if (! is_global(a)) {
+            a += 4;
+            if (tracing_commands_par > 1) {
+                begin_diagnostic();
+                tprint_nl("{\\global enforced}");
+                end_diagnostic(false);
+            }
+        }
     }
     switch (cur_cmd) {
         case set_font_cmd:
@@ -2766,8 +2799,9 @@
                 definition is supposed to be global, and |cur_chr>=2| if the
                 definition is supposed to be expanded.
             */
-            if (odd(cur_chr) && !is_global(a) && (global_defs_par >= 0))
-                a = a + 4;
+	  /* if (odd(cur_chr) && !is_global(a) && (global_defs_par >= 0)) { */
+	  /*    a = a + 4; */
+	  /* } */
             e = (cur_chr >= 2);
             get_r_token();
             p = cur_cs;