build system: remove Web2C support for mpost and dvitomp

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

7 files changed, 38 insertions, 190 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 60bce946d24..0052727c228 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* help.h (DVITOMPHELP): remove help for obsolete Web2C version.
+	* help.h (LUATANGLEHELP): sort in alphabetically.
+	* texmfmp-help.h (MPHELP): remove help for obsolete Web2C version.	
+
 2009-05-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac, ac/web2c.ac (enable_ipc): default is enabled.
diff --git a/Build/source/texk/web2c/help.h b/Build/source/texk/web2c/help.h
index e6888b669d5..da159a9627d 100644
--- a/Build/source/texk/web2c/help.h
+++ b/Build/source/texk/web2c/help.h
@@ -100,18 +100,6 @@ const_string DVICOPYHELP[] = {
 };
 #endif /* DVICOPY */
 
-#ifdef DVITOMP
-const_string DVITOMPHELP[] = {
-    "Usage: dvitomp [OPTION]... DVIFILE[.dvi] [MPXFILE[.mpx]]",
-    "  Translate DVIFILE to the MetaPost MPXFILE.",
-    "  Default MPXFILE is basename of DVIFILE extended with `.mpx'.",
-    "",
-    "-help                  display this help and exit",
-    "-version               output version information and exit",
-    NULL
-};
-#endif /* DVITOMP */
-
 #ifdef DVITYPE
 const_string DVITYPEHELP[] = {
     "Usage: dvitype [OPTION]... DVIFILE[.dvi]",
@@ -171,6 +159,20 @@ const_string GFTYPEHELP[] = {
 };
 #endif /* GFTYPE */
 
+#if defined (LUATANGLE) || defined (LUATANGLEBOOT)
+const_string LUATANGLEHELP[] = {
+    "Usage: luatangle [OPTION]... WEBFILE[.web] [CHANGEFILE[.ch]]",
+    "  Tangle WEBFILE with CHANGEFILE into a Pascal program.",
+    "  Default CHANGEFILE is /dev/null;",
+    "  Pascal output goes to the basename of WEBFILE extended with `.p',",
+    "  and a string pool file, if necessary, to the same extended with `.pool'.",
+    "",
+    "-help       display this help and exit",
+    "-version    output version information and exit",
+    NULL
+};
+#endif /* LUATANGLE */
+
 #ifdef MFT
 const_string MFTHELP[] = {
     "Usage: mft [OPTION]... NAME[.mf|.mp]",
@@ -264,20 +266,6 @@ const_string OTANGLEHELP[] = {
 };
 #endif /* OTANGLE */
 
-#if defined (LUATANGLE) || defined (LUATANGLEBOOT)
-const_string LUATANGLEHELP[] = {
-    "Usage: luatangle [OPTION]... WEBFILE[.web] [CHANGEFILE[.ch]]",
-    "  Tangle WEBFILE with CHANGEFILE into a Pascal program.",
-    "  Default CHANGEFILE is /dev/null;",
-    "  Pascal output goes to the basename of WEBFILE extended with `.p',",
-    "  and a string pool file, if necessary, to the same extended with `.pool'.",
-    "",
-    "-help       display this help and exit",
-    "-version    output version information and exit",
-    NULL
-};
-#endif /* LUATANGLE */
-
 #ifdef OVF2OVP
 const_string OVF2OVPHELP[] = {
     "Usage: ovf2ovp [OPTION]... OVFNAME[.ovf] [OFMNAME[.ofm] [OVPFILE[.ovp]]]",
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index e5ab7fb1d5b..d9f49a01b81 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* texmfmp.c: remove all references to (Web2C version of) MP.
+
 2009-05-18  Karl Berry  <karl@tug.org>
 
 	* openclose.c (recorder_start): use output_directory for the .fls
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index 8735ad48e5c..2f3207b3c14 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -8,8 +8,8 @@
 #define	EXTERN /* Instantiate data from {tex,mf,mp}d.h here.  */
 
 /* This file is used to create texextra.c etc., with this line
-   changed to include texd.h, mfd.h, or mpd.h.  The ?d.h file is what
-   #defines TeX or MF or MP, which avoids the need for a special
+   changed to include texd.h or mfd.h.  The ?d.h file is what
+   #defines TeX or MF, which avoids the need for a special
    Makefile rule.  */
 #include "TEX-OR-MF-OR-MPd.h"
 
@@ -85,21 +85,6 @@
 #define VIR_PROGRAM "virmf"
 #define edit_var "MFEDIT"
 #endif /* MF */
-#ifdef MP
-#define BANNER "This is MetaPost, Version 1.005"
-#define COPYRIGHT_HOLDER "AT&T Bell Laboratories"
-#define AUTHOR "John Hobby.\nCurrent maintainer of MetaPost: Taco Hoekwater"
-#define PROGRAM_HELP MPHELP
-#define BUG_ADDRESS "tex-k@mail.tug.org"
-#define DUMP_VAR MPmemdefault
-#define DUMP_LENGTH_VAR memdefaultlength
-#define DUMP_OPTION "mem"
-#define DUMP_EXT ".mem"
-#define INPUT_FORMAT kpse_mp_format
-#define INI_PROGRAM "inimpost"
-#define VIR_PROGRAM "virmpost"
-#define edit_var "MPEDIT"
-#endif /* MP */
 
 /* Shell escape.
 
@@ -560,11 +545,6 @@ static int eightbitp;
 char *ptexbanner;
 #endif
 
-#ifdef MP
-/* name of TeX program to pass to makempx */
-static string mpost_tex_program = "";
-#endif
-
 /* Get a true/false value for a variable from texmf.cnf and the environment. */
 static boolean
 texmf_yesno(const_string var)
@@ -761,10 +741,6 @@ maininit P2C(int, ac, string *, av)
   kpse_set_program_enabled (kpse_base_format, MAKE_TEX_FMT_BY_DEFAULT,
                             kpse_src_compile);
 #endif /* MF */
-#ifdef MP
-  kpse_set_program_enabled (kpse_mem_format, MAKE_TEX_FMT_BY_DEFAULT,
-                            kpse_src_compile);
-#endif /* MP */
 #ifdef TeX
 #if defined (Aleph)
   kpse_set_program_enabled (kpse_ocp_format, MAKE_OMEGA_OCP_BY_DEFAULT,
@@ -1091,7 +1067,7 @@ ipcpage P1C(int, is_eof)
 }
 #endif /* TeX && IPC */
 
-#if defined (TeX) || defined (MF) || defined (MP)
+#if defined (TeX) || defined (MF)
   /* TCX and Aleph&Co get along like sparks and gunpowder. */
 #if !defined(Aleph) && !defined(XeTeX) && !defined(luaTeX) 
 
@@ -1195,7 +1171,7 @@ readtcxfile P1H(void)
   }
 }
 #endif /* !Aleph && !XeTeX && !luaTeX */
-#endif /* TeX || MF || MP [character translation] */
+#endif /* TeX || MF [character translation] */
 
 #ifdef XeTeX /* XeTeX handles this differently, and allows odd quotes within names */
 string
@@ -1359,7 +1335,7 @@ static struct option long_options[]
       { "synctex",                   1, 0, 0 },
 #endif
 #endif /* TeX */
-#if defined (TeX) || defined (MF) || defined (MP)
+#if defined (TeX) || defined (MF)
       { "file-line-error-style",     0, &filelineerrorstylep, 1 },
       { "no-file-line-error-style",  0, &filelineerrorstylep, -1 },
       /* Shorter option names for the above. */
@@ -1381,16 +1357,9 @@ static struct option long_options[]
       { "output-driver",          1, 0, 0 },
       { "papersize",              1, 0, 0 },
 #endif /* XeTeX */
-#endif /* TeX || MF || MP */
-#if defined (TeX) || defined (MF)
       { "mktex",                     1, 0, 0 },
       { "no-mktex",                  1, 0, 0 },
 #endif /* TeX or MF */
-#ifdef MP
-      { "T",                         0, &troffmode, 1 },
-      { "troff",                     0, &troffmode, 1 },
-      { "tex",                       1, 0, 0 },
-#endif /* MP */
       { 0, 0, 0, 0 } };
 
 
@@ -1510,7 +1479,7 @@ parse_options P2C(int, argc,  string *, argv)
       pdfdraftmodeoption = 1;
       pdfdraftmodevalue = 1;
 #endif /* pdfTeX */
-#if defined (TeX) || defined (MF) || defined (MP)
+#if defined (TeX) || defined (MF)
     } else if (ARGUMENT_IS ("translate-file")) {
       translate_filename = optarg;
     } else if (ARGUMENT_IS ("default-translate-file")) {
@@ -1519,19 +1488,12 @@ parse_options P2C(int, argc,  string *, argv)
     } else if (ARGUMENT_IS ("8bit")) {
       /* FIXME: print snippy message? Possibly also for above? */
 #endif /* !Aleph */
-#endif /* TeX || MF || MP */
-
-#if defined (TeX) || defined (MF)
     } else if (ARGUMENT_IS ("mktex")) {
       kpse_maketex_option (optarg, true);
 
     } else if (ARGUMENT_IS ("no-mktex")) {
       kpse_maketex_option (optarg, false);
 #endif /* TeX or MF */
-#if defined (MP)
-    } else if (ARGUMENT_IS ("tex")) {
-      mpost_tex_program = optarg;
-#endif /* MP */
     } else if (ARGUMENT_IS ("interaction")) {
         /* These numbers match @d's in *.ch */
       if (STREQ (optarg, "batchmode")) {
@@ -2367,7 +2329,7 @@ setupboundvariable P3C(integer *, var,  const_string, var_name,  integer, dflt)
 }
 
 /* FIXME -- some (most?) of this can/should be moved to the Pascal/WEB side. */
-#if defined(TeX) || defined(MP) || defined(MF)
+#if defined(TeX) || defined(MF)
 #if !defined(pdfTeX) && !defined(luaTeX)
 static void
 checkpoolpointer (poolpointer poolptr, size_t len)
@@ -2379,8 +2341,6 @@ checkpoolpointer (poolpointer poolptr, size_t len)
   }
 }
 
-#ifndef MP  /* MP has its own in mpdir/utils.c */
-
 #ifndef XeTeX	/* XeTeX uses this from XeTeX_mac.c */
 static
 #endif
@@ -2422,7 +2382,6 @@ maketexstring(const_string s)
 
   return (makestring());
 }
-#endif /* !MP */
 #endif /* !pdfTeX */
 
 strnumber
@@ -2582,55 +2541,6 @@ makesrcspecial P2C(strnumber, srcfilename,
 }
 #endif
 
-#ifdef MP
-/* Invoke makempx (or troffmpx) to make sure there is an up-to-date
-   .mpx file for a given .mp file.  (Original from John Hobby 3/14/90)  */
-
-#include <kpathsea/concatn.h>
-
-#ifndef MPXCOMMAND
-#define MPXCOMMAND "makempx"
-#endif
-
-boolean
-callmakempx P2C(string, mpname,  string, mpxname)
-{
-  int ret;
-  string cnf_cmd = kpse_var_value ("MPXCOMMAND");
-  
-  if (cnf_cmd && STREQ (cnf_cmd, "0")) {
-    /* If they turned off this feature, just return success.  */
-    ret = 0;
-
-  } else {
-    /* We will invoke something. Compile-time default if nothing else.  */
-    string cmd;
-    string qmpname = normalize_quotes(mpname, "mpname");
-    string qmpxname = normalize_quotes(mpxname, "mpxname");
-    if (!cnf_cmd)
-      cnf_cmd = xstrdup (MPXCOMMAND);
-
-    if (troffmode)
-      cmd = concatn (cnf_cmd, " -troff ",
-                     qmpname, " ", qmpxname, NULL);
-    else if (mpost_tex_program && *mpost_tex_program)
-      cmd = concatn (cnf_cmd, " -tex=", mpost_tex_program, " ",
-                     qmpname, " ", qmpxname, NULL);
-    else
-      cmd = concatn (cnf_cmd, " -tex ", qmpname, " ", qmpxname, NULL);
-
-    /* Run it.  */
-    ret = system (cmd);
-    free (cmd);
-    free (qmpname);
-    free (qmpxname);
-  }
-
-  free (cnf_cmd);
-  return ret == 0;
-}
-#endif /* MP */
-
 /* Metafont/MetaPost fraction routines. Replaced either by assembler or C.
    The assembler syntax doesn't work on Solaris/x86.  */
 #ifndef TeX
@@ -2814,7 +2724,7 @@ zmakescaled P2C(integer, p, integer, q)		/* Approximate 2^16*p/q */
 
 #endif /* not FIXPT */
 #endif /* not assembler */
-#endif /* not TeX, i.e., MF or MP */
+#endif /* not TeX, i.e., MF */
 
 #ifdef MF
 /* On-line display routines for Metafont.  Here we use a dispatch table
diff --git a/Build/source/texk/web2c/texmfmp-help.h b/Build/source/texk/web2c/texmfmp-help.h
index de6b6b1296f..6097ad4be17 100644
--- a/Build/source/texk/web2c/texmfmp-help.h
+++ b/Build/source/texk/web2c/texmfmp-help.h
@@ -244,53 +244,6 @@ const_string MFHELP[] = {
 };
 #endif /* MF */
 
-#ifdef MP
-const_string MPHELP[] = {
-    "Usage: mpost [OPTION]... [MPNAME[.mp]] [COMMANDS]",
-    "   or: mpost [OPTION]... \\FIRST-LINE",
-    "   or: mpost [OPTION]... &MEM ARGS",
-    "  Run MetaPost on MPNAME, usually creating MPNAME.NNN (and perhaps",
-    "  MPNAME.tfm), where NNN are the character numbers generated.",
-    "  Any remaining COMMANDS are processed as MetaPost input,",
-    "  after MPNAME is read.",
-    "  If the first line of MPNAME is %&MEM, and MEM is an existing .mem file,",
-    "  use it.  Else use `NAME.mem', where NAME is the program invocation name,",
-    "  most commonly `mpost'.",
-    "",
-    "  Alternatively, if the first non-option argument begins with a backslash,",
-    "  interpret all non-option arguments as a line of MetaPost input.",
-    "",
-    "  Alternatively, if the first non-option argument begins with a &, the",
-    "  next word is taken as the MEM to read, overriding all else.  Any",
-    "  remaining arguments are processed as above.",
-    "",
-    "  If no arguments or options are specified, prompt for input.",
-    "",
-    "[-no]-file-line-error   disable/enable file:line:error style messages",
-    "-halt-on-error          stop processing at the first error",
-    "-ini                    be inimpost, for dumping mems; this is implicitly",
-    "                          true if the program name is `inimpost'",
-    "-interaction=STRING     set interaction mode (STRING=batchmode/nonstopmode/",
-    "                          scrollmode/errorstopmode)",
-    "-jobname=STRING         set the job name to STRING",
-    "-kpathsea-debug=NUMBER  set path searching debugging flags according to",
-    "                          the bits of NUMBER",
-    "-mem=MEMNAME            use MEMNAME instead of program name or a %& line",
-    "-output-directory=DIR   use DIR as the directory to write files to",
-    "[-no]-parse-first-line  disable/enable parsing of the first line of the",
-    "                          input file",
-    "-progname=STRING        set program (and mem) name to STRING",
-    "-recorder               enable filename recorder",
-    "-tex=TEXPROGRAM         use TEXPROGRAM for text labels.",
-    "-translate-file=TCXNAME use the TCX file TCXNAME",
-    "-8bit                   make all characters printable by default",
-    "-T, -troff              set the prologues variable, use `makempx -troff'",
-    "-help                   display this help and exit",
-    "-version                output version information and exit",
-    NULL
-};
-#endif /* MP */
-
 #ifdef pdfTeX
 const_string PDFTEXHELP[] = {
     "Usage: pdftex [OPTION]... [TEXNAME[.tex]] [COMMANDS]",
diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index 11e99f7478c..ff758123912 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* convert: remove all references to mp.
+
 2009-05-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* coerce.h: Modify #define of synch_p_with_c for luaTeX.
diff --git a/Build/source/texk/web2c/web2c/convert b/Build/source/texk/web2c/web2c/convert
index 545aca8c96e..271cdcb7edd 100755
--- a/Build/source/texk/web2c/web2c/convert
+++ b/Build/source/texk/web2c/web2c/convert
@@ -53,7 +53,7 @@ case $basefile in
     midcmd="| sed -f $srcdir/web2c/cvtbib.sed"
     ;;
 
-  mf) # MF and MP are almost the same.
+  mf)
     more_defines="$srcdir/web2c/texmf.defines $srcdir/web2c/mfmp.defines"
     precmd="| sed -f $srcdir/web2c/cvtmf1.sed"
     web2c_options="-m -c${basefile}coerce"
@@ -66,23 +66,6 @@ case $basefile in
 ${basefile}coerce.h"
     ;;
 
-  mp) # MP now needs mp.defines for font inclusion library
-    more_defines="$srcdir/web2c/texmf.defines $srcdir/web2c/mfmp.defines"
-    prog_defines="$srcdir/${basefile}dir/$basefile.defines"
-    if test -f $prog_defines; then
-       more_defines="$more_defines $prog_defines"
-     fi
-    precmd="| sed -f $srcdir/web2c/cvtmf1.sed"
-    web2c_options="-m -c${basefile}coerce"
-    hfile=texmfmp.h
-    midcmd="| sed -f $srcdir/web2c/cvtmf2.sed"
-    postcmd="| ./web2c/splitup $splitup_options $basefile"
-    cfile=${basefile}2.c # last output file, or thereabouts
-    output=
-    output_files="$basefile[0-9].c ${basefile}ini.c ${basefile}d.h \
-${basefile}coerce.h"
-    ;;
-
   tex|etex|pdftex|aleph|xetex)
     more_defines="$srcdir/web2c/texmf.defines $srcdir/synctexdir/synctex.defines"
     prog_defines="$srcdir/${basefile}dir/$basefile.defines"
@@ -146,7 +129,7 @@ case $basefile in
     sed -e 's/(buftype)//g' -e 's/(pdstype)//g' <bibtex.h >xbibtex.h
     mv xbibtex.h bibtex.h
     ;;
-  tex|etex|luatex|pdftex|aleph|mf|mp|xetex)
+  tex|etex|luatex|pdftex|aleph|mf|xetex)
     sleep 2 # so timestamps are definitely later, to avoid make weirdness
     cat $srcdir/web2c/coerce.h >>${basefile}coerce.h
     touch ${basefile}d.h