no need for pdfTeXk and other such *TeXks, except for TeX and e-TeX; do not output file:line:error or %& enabled msgs to the terminal

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

6 files changed, 11 insertions, 69 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 2449a7e0861..7554a5848d8 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,12 @@
+2009-06-04  Karl Berry  <karl@tug.org>
+
+	* tex.ch: do not announce file_line_error or parse_first_line
+	on terminal, log file is good enough.
+	* alephdir/comsrcspec.ch: no need for Alephk.
+	* luatexdir/luatex.ch: no need for LuaTeXk.
+	* pdftexdir/pdftex.ch: no need for pdfTeXk.	
+	* xetexdir/xetex.ch: no need for XeTeXk.
+
 2009-06-03  Karl Berry  <karl@tug.org>
 
 	* configure.ac (with_tex_banner): use echo|grep for check
diff --git a/Build/source/texk/web2c/alephdir/comsrcspec.ch b/Build/source/texk/web2c/alephdir/comsrcspec.ch
index 97583491f57..e68b92977c1 100644
--- a/Build/source/texk/web2c/alephdir/comsrcspec.ch
+++ b/Build/source/texk/web2c/alephdir/comsrcspec.ch
@@ -45,12 +45,6 @@ end;
 if src_specials_p then begin
   wterm_ln(' Source specials enabled.')
 end;
-if file_line_error_style_p then begin
-  wterm_ln(' file:line:error style messages enabled.')
-end;
-if parse_first_line_p then begin
-  wterm_ln(' %&-line parsing enabled.')
-end;
 @z
 
 @x
diff --git a/Build/source/texk/web2c/luatexdir/luatex.ch b/Build/source/texk/web2c/luatexdir/luatex.ch
index d3c32b9a931..7837b69be96 100644
--- a/Build/source/texk/web2c/luatexdir/luatex.ch
+++ b/Build/source/texk/web2c/luatexdir/luatex.ch
@@ -29,15 +29,6 @@
 @z
 
 @x
-@d banner==LuaTeX_banner
-@y
-@d luaTeXk_banner=='This is LuaTeXk, Version ',luatex_version_string
-@#
-@d banner==LuaTeX_banner
-@d banner_k==luaTeXk_banner
-@z
-
-@x
 Actually the heading shown here is not quite normal: The |program| line
 does not mention any |output| file, because \ph\ would ask the \TeX\ user
 to specify a file name if |output| were specified here.
@@ -1055,16 +1046,6 @@ recorder_change_filename(stringcast(nameoffile+1));
 @z
 
 @x
-begin wlog(banner);
-@y
-begin if filelineerrorstylep or parsefirstlinep
-then
-  wlog(banner_k)
-else
-  wlog(banner);
-@z
-
-@x
 slow_print(format_ident); print("  ");
 @y
 wlog(versionstring);
@@ -1813,15 +1794,6 @@ end {|main_body|};
 @z
 
 @x
-  wterm(banner);
-@y
-  if filelineerrorstylep or parsefirstlinep then
-    wterm(banner_k)
-  else
-    wterm(banner);
-@z
-
-@x
   if format_ident=0 then wterm_ln(' (no format preloaded)')
   else  begin slow_print(format_ident); print_ln;
     end;
@@ -1836,12 +1808,6 @@ end {|main_body|};
     end;
     wterm_ln('\write18 enabled.');
   end;
-  if filelineerrorstylep then begin
-    wterm_ln(' file:line:error style messages enabled.')
-  end;
-  if parsefirstlinep then begin
-   wterm_ln(' %&-line parsing enabled.')
-  end;
 @z
 
 @x
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.ch b/Build/source/texk/web2c/pdftexdir/pdftex.ch
index ced8f6f9c86..b5e18ce67c5 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.ch
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.ch
@@ -31,33 +31,12 @@
 % This one resolves inconsistencies between tex.ch and tex.ech.
 % Public domain.
 
-@x [1] m.2 l.188 - Web2C: extensions imply we're not e-TeX
-@d eTeX_banner=='This is e-TeX, Version 3.1415926',eTeX_version_string
-@y
-@d eTeX_banner_k=='This is e-TeXk, Version 3.1415926',eTeX_version_string
-@d eTeX_banner=='This is e-TeX, Version 3.1415926',eTeX_version_string
-@z
-
-@x [1] m.2 l.188 - Web2C: extensions imply we're not pdfeTeX
-@d pdfeTeX_banner=='This is pdfeTeX, Version 3.1415926',pdftex_version_string,eTeX_version_string
-@y
-@d pdfeTeX_banner_k=='This is pdfeTeXk, Version 3.1415926',pdftex_version_string,eTeX_version_string
-@d pdfeTeX_banner=='This is pdfeTeX, Version 3.1415926',pdftex_version_string,eTeX_version_string
-@z
-
-@x [1] m.2 l.188 - Web2C: extensions imply we're not pdfTeX
-@d pdfTeX_banner=='This is pdfTeX, Version 3.1415926',pdftex_version_string
-@y
-@d pdfTeX_banner_k=='This is pdfTeXk, Version 3.1415926',pdftex_version_string
-@d pdfTeX_banner=='This is pdfTeX, Version 3.1415926',pdftex_version_string
-@z
-
 @x [1] m.2 l.188 - banner
 @d banner==TeX_banner
 @d banner_k==TeX_banner_k
 @y
 @d banner==pdfTeX_banner
-@d banner_k==pdfTeX_banner_k
+@d banner_k==pdfTeX_banner
 @z
 
 @x
diff --git a/Build/source/texk/web2c/tex.ch b/Build/source/texk/web2c/tex.ch
index 35177021bef..1a0b98277e1 100644
--- a/Build/source/texk/web2c/tex.ch
+++ b/Build/source/texk/web2c/tex.ch
@@ -836,12 +836,6 @@ end;
 if src_specials_p then begin
   wterm_ln(' Source specials enabled.')
 end;
-if file_line_error_style_p then begin
-  wterm_ln(' file:line:error style messages enabled.')
-end;
-if parse_first_line_p then begin
-  wterm_ln(' %&-line parsing enabled.')
-end;
 if translate_filename then begin
   wterm(' (');
   fputs(translate_filename, stdout);
diff --git a/Build/source/texk/web2c/xetexdir/xetex.ch b/Build/source/texk/web2c/xetexdir/xetex.ch
index 1a2b433a378..7bc3ce5bcaf 100644
--- a/Build/source/texk/web2c/xetexdir/xetex.ch
+++ b/Build/source/texk/web2c/xetexdir/xetex.ch
@@ -81,7 +81,7 @@ authorization from SIL International.
 @y
 @d XeTeX_banner=='This is XeTeX, Version 3.1415926',eTeX_version_string,XeTeX_version_string
   {printed when \XeTeX\ starts}
-@d XeTeX_banner_k=='This is XeTeXk, Version 3.1415926',eTeX_version_string,XeTeX_version_string
+@d XeTeX_banner_k==XeTeX_banner
 @#
 @d banner==XeTeX_banner
 @d banner_k==XeTeX_banner_k