texlive[57743] Build/source/texk/web2c/luatexdir: sync with the

[commits+kakuto at tug.org]

Revision: 57743
          http://tug.org/svn/texlive?view=revision&revision=57743
Author:   kakuto
Date:     2021-02-15 00:09:14 +0100 (Mon, 15 Feb 2021)
Log Message:
-----------
sync with the upstream

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/luatexdir/ChangeLog
    trunk/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c
    trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
    trunk/Build/source/texk/web2c/luatexdir/luatexcallbackids.h
    trunk/Build/source/texk/web2c/luatexdir/tex/printing.c

Modified: trunk/Build/source/texk/web2c/luatexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/ChangeLog	2021-02-14 22:57:34 UTC (rev 57742)
+++ trunk/Build/source/texk/web2c/luatexdir/ChangeLog	2021-02-14 23:09:14 UTC (rev 57743)
@@ -1,3 +1,6 @@
+2012-02-14 Luigi Scarso <luigi.scarso at gmail.com> 
+    * callback for nesting level used in tracingmacros
+
 2021-02-01 Luigi Scarso <luigi.scarso at gmail.com> 
     * two TeX January 2021 DEK buglet fixes (H.Hagen)
 

Modified: trunk/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c	2021-02-14 22:57:34 UTC (rev 57742)
+++ trunk/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c	2021-02-14 23:09:14 UTC (rev 57743)
@@ -85,6 +85,7 @@
     "make_extensible",
     "process_pdf_image_content",
     "provide_charproc_data",
+    "input_level_string",
     NULL
 };
 

Modified: trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h	2021-02-14 22:57:34 UTC (rev 57742)
+++ trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h	2021-02-14 23:09:14 UTC (rev 57743)
@@ -1 +1 @@
-#define luatex_svn_revision 7403
+#define luatex_svn_revision 7405

Modified: trunk/Build/source/texk/web2c/luatexdir/luatexcallbackids.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luatexcallbackids.h	2021-02-14 22:57:34 UTC (rev 57742)
+++ trunk/Build/source/texk/web2c/luatexdir/luatexcallbackids.h	2021-02-14 23:09:14 UTC (rev 57743)
@@ -77,6 +77,7 @@
     make_extensible_callback,
     process_pdf_image_content_callback,
     provide_charproc_data_callback,
+    input_level_string_callback,
     total_callbacks,
 } callback_callback_types;
 

Modified: trunk/Build/source/texk/web2c/luatexdir/tex/printing.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/printing.c	2021-02-14 22:57:34 UTC (rev 57742)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/printing.c	2021-02-14 23:09:14 UTC (rev 57743)
@@ -1304,24 +1304,39 @@
 
 void print_input_level(void)
 {
-    int m = level_max;
-    if (m) {
-        int l = input_ptr;
-        int c = level_chr > 0 ? level_chr : '.';
-        if (l > m) {
-            tprint_nl("[");
-            print_int((l/m)*m);
-            print(']');
-            l = l % m;
+    int callback_id = callback_defined(input_level_string_callback);
+    if (callback_id>0) {
+        char *s = NULL;
+        if (run_callback(callback_id, "d->S", input_ptr, &s)) {
+            if (s && strlen(s) > 0) {
+                tprint_nl(s);
+                free(s);
+            } else {
+                print_ln();
+            }
         } else {
             print_ln();
         }
-        while (l > 0) {
-           print(c);
-           l--;
+    } else {
+        int m = level_max;
+        if (m) {
+            int l = input_ptr;
+            int c = level_chr > 0 ? level_chr : '.';
+            if (l > m) {
+                tprint_nl("[");
+                print_int((l/m)*m);
+                print(']');
+                l = l % m;
+            } else {
+                print_ln();
+            }
+            while (l > 0) {
+               print(c);
+               l--;
+            }
+        } else {
+            print_ln();
         }
-    } else {
-        print_ln();
     }
 }