TeX & Co: Announce dumpname on the terminal

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

11 files changed, 50 insertions, 21 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index c78bd01c72f..ed7ba239aa8 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,8 +1,13 @@
+2014-01-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* mf.ch, tex.ch: Write dump_name to the terminal.
+	* texmfmp.h: Define dumpname => dump_name.
+
 2014-01-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Request from Knuth.
-	* mf.ch: Restore the word `preloaded' from base_idents.
-	* tex.ch: Restore the word `preloaded' from format_idents.
+	* mf.ch: Restore the word `preloaded' for base_idents.
+	* tex.ch: Restore the word `preloaded' for format_idents.
 
 2014-01-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog
index 5e25c322ef2..5088881389c 100644
--- a/Build/source/texk/web2c/alephdir/ChangeLog
+++ b/Build/source/texk/web2c/alephdir/ChangeLog
@@ -1,6 +1,10 @@
+2014-01-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* com16bit.ch, comsrcspec.ch: Write dump_name to the terminal.
+
 2014-01-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-	* com16bit.ch.ch: Restore the word `preloaded' from
+	* com16bit.ch.ch: Restore the word `preloaded' for
 	format_idents (as in ../tex.ch).
 
 2013-06-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
diff --git a/Build/source/texk/web2c/alephdir/com16bit.ch b/Build/source/texk/web2c/alephdir/com16bit.ch
index 28df09da530..3c76a59f7bd 100644
--- a/Build/source/texk/web2c/alephdir/com16bit.ch
+++ b/Build/source/texk/web2c/alephdir/com16bit.ch
@@ -419,6 +419,8 @@ We define |input_ln| in C, for efficiency.
 @!dump_line:boolean; {was a \.{\%\AM format} line seen?}
 tini@/
 @#
+@!dump_name:const_cstring; {format name for terminal display}
+@#
 @!bound_default:integer; {temporary for setup}
 @!bound_name:const_cstring; {temporary for setup}
 @#
@@ -664,7 +666,7 @@ end
 @!trick_buf:array[0..ssup_error_line] of ASCII_code; {circular buffer for
 @z
 
-@x [5.61] l.1556 - Print rest of banner, eliminate misleading `(no format preloaded)'.
+@x [5.61] l.1556 - Print rest of banner.
 wterm(eTeX_banner);
 if format_ident=0 then wterm_ln(' (no format preloaded)')
 else  begin slow_print(format_ident); print_ln;
@@ -672,8 +674,9 @@ else  begin slow_print(format_ident); print_ln;
 @y
 wterm(eTeX_banner);
 wterm(version_string);
-if format_ident>0 then slow_print(format_ident);
-print_ln;
+if format_ident=0 then wterm_ln(' (preloaded format=',dump_name,')')
+else  begin slow_print(format_ident); print_ln;
+  end;
 @z
 
 @x [6.73] l.1732 - Add unspecified_mode.
diff --git a/Build/source/texk/web2c/alephdir/comsrcspec.ch b/Build/source/texk/web2c/alephdir/comsrcspec.ch
index e68b92977c1..41ec7007f47 100644
--- a/Build/source/texk/web2c/alephdir/comsrcspec.ch
+++ b/Build/source/texk/web2c/alephdir/comsrcspec.ch
@@ -25,16 +25,18 @@
 @x
 wterm(eTeX_banner);
 wterm(version_string);
-if format_ident>0 then slow_print(format_ident);
-print_ln;
+if format_ident=0 then wterm_ln(' (preloaded format=',dump_name,')')
+else  begin slow_print(format_ident); print_ln;
+  end;
 @y
 if src_specials_p or file_line_error_style_p or parse_first_line_p then
   wterm(banner_k)
 else
   wterm(eTeX_banner);
 wterm(version_string);
-if format_ident>0 then slow_print(format_ident);
-print_ln;
+if format_ident=0 then wterm_ln(' (preloaded format=',dump_name,')')
+else  begin slow_print(format_ident); print_ln;
+  end;
 if shellenabledp then begin
   wterm(' ');
   if restrictedshell then begin
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index 39f34ca2c7d..e3396f1970f 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* texmfmp.c: Do not declare dump_name, now done in change files.
+
 2014-01-14  Akira Kakuto  <kakuto@fuk.kinidai.ac.jp>
 
 	* texmfmp.c: use fsyscp_system indtead of system (Windows only).
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index e138136c94c..97f890e2b16 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -582,9 +582,6 @@ int argc;
 /* If the user overrides argv[0] with -progname.  */
 static const_string user_progname;
 
-/* The C version of what might wind up in DUMP_VAR.  */
-static const_string dump_name;
-
 /* The C version of the jobname, if given. */
 static const_string c_job_name;
 
diff --git a/Build/source/texk/web2c/mf.ch b/Build/source/texk/web2c/mf.ch
index 435561e7450..30432668995 100644
--- a/Build/source/texk/web2c/mf.ch
+++ b/Build/source/texk/web2c/mf.ch
@@ -171,6 +171,8 @@
 @!dump_line:boolean; {was a \.{\%\AM base} line seen?}
 tini@/
 @#
+@!dump_name:const_cstring; {base name for terminal display}
+@#
 @!bound_default:integer; {temporary for setup}
 @!bound_name:const_cstring; {temporary for setup}
 @#
@@ -564,7 +566,7 @@ if (s<256)and(selector>pseudo) then print_char(s)
 if (s<256)and((selector>pseudo) or xprn[s])then print_char(s)
 @z
 
-@x [5.61] Print rest of banner, eliminate misleading `(no base preloaded)'.
+@x [5.61] Print rest of banner.
 wterm(banner);
 if base_ident=0 then wterm_ln(' (no base preloaded)')
 else  begin slow_print(base_ident); print_ln;
@@ -572,7 +574,9 @@ else  begin slow_print(base_ident); print_ln;
 @y
 wterm (banner);
 wterm (version_string);
-if base_ident>0 then slow_print(base_ident); print_ln;
+if base_ident=0 then wterm_ln(' (preloaded base=',dump_name,')')
+else  begin slow_print(base_ident); print_ln;
+  end;
 if translate_filename then begin
   wterm('(');
   fputs(translate_filename, stdout);
diff --git a/Build/source/texk/web2c/tex.ch b/Build/source/texk/web2c/tex.ch
index 53549255cb4..a76721e9164 100644
--- a/Build/source/texk/web2c/tex.ch
+++ b/Build/source/texk/web2c/tex.ch
@@ -516,6 +516,8 @@ We define |input_ln| in C, for efficiency. Nevertheless we quote the module
 @!dump_line:boolean; {was a \.{\%\AM format} line seen?}
 tini@/
 @#
+@!dump_name:const_cstring; {format name for terminal display}
+@#
 @!bound_default:integer; {temporary for setup}
 @!bound_name:const_cstring; {temporary for setup}
 @#
@@ -757,14 +759,15 @@ else
   wterm(banner);
 @z
 
-@x [5.61] l.1556 - Print rest of banner, eliminate misleading `(no format preloaded)'.
+@x [5.61] l.1556 - Print rest of banner.
 if format_ident=0 then wterm_ln(' (no format preloaded)')
 else  begin slow_print(format_ident); print_ln;
   end;
 @y
 wterm(version_string);
-if format_ident>0 then slow_print(format_ident);
-print_ln;
+if format_ident=0 then wterm_ln(' (preloaded format=',dump_name,')')
+else  begin slow_print(format_ident); print_ln;
+  end;
 if shellenabledp then begin
   wterm(' ');
   if restrictedshell then begin
diff --git a/Build/source/texk/web2c/texmfmp.h b/Build/source/texk/web2c/texmfmp.h
index 73fdeec9aea..422fc5d4421 100644
--- a/Build/source/texk/web2c/texmfmp.h
+++ b/Build/source/texk/web2c/texmfmp.h
@@ -99,6 +99,7 @@ typedef void* voidpointer;
 #endif /* MF */
 
 /* Restore underscores.  */
+#define dumpname dump_name
 #define kpsedvipsconfigformat kpse_dvips_config_format
 #define kpsefontmapformat kpse_fontmap_format
 #define kpsemfpoolformat kpse_mfpool_format
diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index 22ea2f2239d..5be7cd95065 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* fixwrites.c: Recognize dumpname as string.
+
 2014-01-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Introduce a genuine 64-bit integer type, in case of 32-bit off_t.
diff --git a/Build/source/texk/web2c/web2c/fixwrites.c b/Build/source/texk/web2c/web2c/fixwrites.c
index a0375b1fdf7..2c1f33608c8 100644
--- a/Build/source/texk/web2c/web2c/fixwrites.c
+++ b/Build/source/texk/web2c/web2c/fixwrites.c
@@ -402,10 +402,12 @@ main (int argc,  string *argv)
           /* More kludges -- recognize some things as strings and use %s:
              - versionstring
              - poolname
-             - formatengine */
+             - formatengine
+             - dumpname */
           else if (strncmp (cp, "versionstring", 13) == 0
                    || strncmp (cp, "poolname", 8) == 0
-                   || strncmp (cp, "formatengine", 12) == 0)
+                   || strncmp (cp, "formatengine", 12) == 0
+                   || strncmp (cp, "dumpname", 8) == 0)
             {
               *as++ = '%';
               *as++ = 's';
@@ -413,7 +415,7 @@ main (int argc,  string *argv)
 
 	  /* And yet another kludge, to handle stringcast (<whatever>) */
           else if (strncmp (cp, "stringcast", 10) == 0
-                   || strncmp (cp, "conststringcast", 10) == 0)
+                   || strncmp (cp, "conststringcast", 15) == 0)
 	    {
 	      *as++ = '%';
 	      *as++ = 's';