texlive[70262] Build/source/texk/web2c/luatexdir: Default output of
commits+lscarso at tug.org
commits+lscarso at tug.org
Thu Feb 29 23:21:37 CET 2024
Revision: 70262
https://tug.org/svn/texlive?view=revision&revision=70262
Author: lscarso
Date: 2024-02-29 23:21:37 +0100 (Thu, 29 Feb 2024)
Log Message:
-----------
Default output of \tracingmacros as in pdftex; texconfig.trace_extra_newline adds a newline in \tracingmacros as before (H.Hagen).
Modified Paths:
--------------
trunk/Build/source/texk/web2c/luatexdir/ChangeLog
trunk/Build/source/texk/web2c/luatexdir/NEWS
trunk/Build/source/texk/web2c/luatexdir/lua/luainit.c
trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
trunk/Build/source/texk/web2c/luatexdir/tex/expand.c
trunk/Build/source/texk/web2c/luatexdir/tex/mainbody.c
trunk/Build/source/texk/web2c/luatexdir/tex/mainbody.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 2024-02-29 21:23:06 UTC (rev 70261)
+++ trunk/Build/source/texk/web2c/luatexdir/ChangeLog 2024-02-29 22:21:37 UTC (rev 70262)
@@ -1,3 +1,7 @@
+2024-02-29 Luigi Scarso <luigi.scarso at gmail.com>
+ * Default output of \tracingmacros as in pdftex; texconfig.trace_extra_newline adds a newline in \tracingmacros as before (H.Hagen).
+
+
2024-02-20 Luigi Scarso <luigi.scarso at gmail.com>
* in kpse mode, --shell-escape enable the standard lfs.* and os.* functions otherwise protected
* fixed lfs.mkdirp return value
Modified: trunk/Build/source/texk/web2c/luatexdir/NEWS
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/NEWS 2024-02-29 21:23:06 UTC (rev 70261)
+++ trunk/Build/source/texk/web2c/luatexdir/NEWS 2024-02-29 22:21:37 UTC (rev 70262)
@@ -13,6 +13,9 @@
- With --safer, all debug functions except traceback are nil
- New commandline switch --[no-]check-dvi-total-pages exit when DVI exceeds 65535 pages (default: check).
This breaks backward compatibility.
+- texconfig.trace_extra_newline adds a newline in \tracingmacros. Default is false, so the
+ output match pdftex. Previously an extra newline was added and
+ with texconfig.trace_extra_newline=true it is again inserted as before.
- Some fixes, among others:
* setgentounicode has a glyph_unicode_tree not NULL (thanks M. Chernoff)
* Character index within the limits in defining a Type 3 font (H.Hagen). Thanks M. Chernoff.
Modified: trunk/Build/source/texk/web2c/luatexdir/lua/luainit.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/lua/luainit.c 2024-02-29 21:23:06 UTC (rev 70261)
+++ trunk/Build/source/texk/web2c/luatexdir/lua/luainit.c 2024-02-29 22:21:37 UTC (rev 70262)
@@ -998,6 +998,7 @@
haltonerrorp = false;
haltingonerrorp = false;
tracefilenames = 1;
+ traceextranewline = 0;
dump_name = NULL;
/*tex
In the next option 0 means ``disable Synchronize TeXnology''. The
@@ -1166,6 +1167,8 @@
get_lua_boolean("texconfig", "check_dvi_total_pages", &check_dvi_total_pages);
/*tex |prohibit_file_trace| (boolean) */
get_lua_boolean("texconfig", "trace_file_names", &tracefilenames);
+ /*tex |trace_extra_newline| (boolean) */
+ get_lua_boolean("texconfig", "trace_extra_newline", &traceextranewline);
/*tex |file_line_error| */
get_lua_boolean("texconfig", "file_line_error", &filelineerrorstylep);
/*tex |halt_on_error| */
Modified: trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h 2024-02-29 21:23:06 UTC (rev 70261)
+++ trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h 2024-02-29 22:21:37 UTC (rev 70262)
@@ -1,4 +1,4 @@
#ifndef luatex_svn_revision_h
#define luatex_svn_revision_h
-#define luatex_svn_revision 7608
+#define luatex_svn_revision 7611
#endif
Modified: trunk/Build/source/texk/web2c/luatexdir/tex/expand.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/expand.c 2024-02-29 21:23:06 UTC (rev 70261)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/expand.c 2024-02-29 22:21:37 UTC (rev 70262)
@@ -654,8 +654,9 @@
if (tracing_macros_par > 0) {
/*tex Show the text of the macro being expanded. */
begin_diagnostic();
+ if (traceextranewline==false)
+ print_ln(); /* also see newlines in print_input_level */
print_input_level();
- // print_ln();
print_cs(warning_index);
token_show(ref_count);
end_diagnostic(false);
Modified: trunk/Build/source/texk/web2c/luatexdir/tex/mainbody.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/mainbody.c 2024-02-29 21:23:06 UTC (rev 70261)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/mainbody.c 2024-02-29 22:21:37 UTC (rev 70262)
@@ -180,6 +180,11 @@
boolean tracefilenames;
+/*tex Extra line in tracingmacros? */
+
+boolean traceextranewline;
+
+
/*tex
This program has two important variations: (1) There is a long and slow version
Modified: trunk/Build/source/texk/web2c/luatexdir/tex/mainbody.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/mainbody.h 2024-02-29 21:23:06 UTC (rev 70261)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/mainbody.h 2024-02-29 22:21:37 UTC (rev 70262)
@@ -117,8 +117,9 @@
# define carriage_return '\r' /* ASCII code used at end of line */
/* Global variables */
-extern boolean luainit; /* are we using lua for initializations */
-extern boolean tracefilenames; /* print file open-close info? */
+extern boolean luainit; /* are we using lua for initializations */
+extern boolean tracefilenames; /* print file open-close info? */
+extern boolean traceextranewline; /* extra line in tracingmacros? */
extern boolean ini_version; /* are we \.{INITEX}? */
Modified: trunk/Build/source/texk/web2c/luatexdir/tex/printing.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/printing.c 2024-02-29 21:23:06 UTC (rev 70261)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/printing.c 2024-02-29 22:21:37 UTC (rev 70262)
@@ -1318,6 +1318,7 @@
/*
Indentation (based on a suggestion by PO on tex-implementors but adapted to
out situation and with built-in limits and so.
+ It's possible to add an extra newline with texconfig.trace_extra_newline = 1
*/
void print_input_level(void)
@@ -1330,10 +1331,12 @@
tprint_nl(s);
free(s);
} else {
- print_ln();
+ if (traceextranewline)
+ print_ln();
}
} else {
- print_ln();
+ if (traceextranewline)
+ print_ln();
}
} else {
int m = level_max;
@@ -1346,7 +1349,8 @@
print(']');
l = l % m;
} else {
- print_ln();
+ if (traceextranewline)
+ print_ln();
}
while (l > 0) {
print(c);
@@ -1353,7 +1357,8 @@
l--;
}
} else {
- print_ln();
+ if (traceextranewline)
+ print_ln();
}
}
}
More information about the tex-live-commits
mailing list.