mpost no longer creates or uses mems

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

3 files changed, 166 insertions, 229 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 47b5a03ab55..897d62f9762 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-06  Karl Berry  <karl@tug.org>
+
+	* doc/web2c.texi: update MetaPost description, .mem's are
+	no longer created or used.
+
 2011-05-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Use ../am/bin_links.am for $(bindir) links.
diff --git a/Build/source/texk/web2c/doc/web2c.info b/Build/source/texk/web2c/doc/web2c.info
index ab0a4196194..2fccd20508a 100644
--- a/Build/source/texk/web2c/doc/web2c.info
+++ b/Build/source/texk/web2c/doc/web2c.info
@@ -516,8 +516,7 @@ common:
 `-ini'
      Enable the "initial" form of the program (*note Initial and
      virgin::).  This is implicitly set if the program name is `initex'
-     resp. `inimf' resp. `inimpost', although these variants are no
-     longer typically installed.
+     resp. `inimf'.
 
 `-interaction=STRING'
      Set the interaction mode from the command line.  The STRING must
@@ -651,7 +650,7 @@ Runtime options::.
 * Menu:
 
 * Initial and virgin::          Making memory dumps vs. production runs.
-* Memory dumps::                .fmt/.base/.mem files for fast startup.
+* Memory dumps::                .fmt/.base files for fast startup.
 * Editor invocation::           The `e' response at errors.
 * \input filenames::            ~ and $ expansion in TeX/MF/MP.
 
@@ -661,16 +660,13 @@ File: web2c.info,  Node: Initial and virgin,  Next: Memory dumps,  Up: Three pro
 3.5.1 Initial and virgin
 ------------------------
 
-The TeX, Metafont, and MetaPost programs each have two main variants,
-called "initial" and "virgin".  As of Web2c 7, one executable suffices
-for both variants, and in fact, the `ini...' executables are no longer
-created.
+The TeX and Metafont programs each have two main variants, called
+"initial" and "virgin".  MetaPost no longer makes this distinction.
 
    The initial form is enabled if:
   1. the `-ini' option was specified; or
 
-  2. the program name is `initex' resp. `inimf' resp.  `inimpost'
-     (these variants are no longer typically installed); or
+  2. the program name is `initex' resp. `inimf'; or
 
   3. the first line of the main input file is `%&ini';
         otherwise, the virgin form is used.
@@ -690,9 +686,9 @@ File: web2c.info,  Node: Memory dumps,  Next: Editor invocation,  Prev: Initial
 3.5.2 Memory dumps
 ------------------
 
-In typical use, TeX, Metafont, and MetaPost require a large number of
-macros to be predefined; therefore, they support "memory dump" files,
-which can be read much more efficiently than ordinary source code.
+In typical use, TeX and Metafont require a large number of macros to be
+predefined; therefore, they support "memory dump" files, which can be
+read much more efficiently than ordinary source code.
 
 * Menu:
 
@@ -725,9 +721,6 @@ TeX
 Metafont
      (`.base') *Note Initial Metafont::.
 
-MetaPost
-     (`.mem') *Note Initial MetaPost::.
-
    When making memory dumps, the programs read environment variables and
 configuration files for path searching and other values as usual.  If
 you are making a new installation and have environment variables
@@ -749,8 +742,7 @@ programs determine the memory dump to use in the same way:
      name.  For example, running `tex \&super' reads `super.fmt'.  (The
      backslash protects the `&' against interpretation by the shell.)
 
-  2. If the `-fmt' resp. `-base' resp. `-mem' option is specified, its
-     value is used.
+  2. If the `-fmt' resp. `-base' option is specified, its value is used.
 
   3. If the `-progname' option is specified, its value is used.
 
@@ -767,9 +759,8 @@ programs determine the memory dump to use in the same way:
      If this is done, the name of the dump must be given first.
 
   5. Otherwise, the program uses the program invocation name, most
-     commonly `tex' resp. `mf' resp. `mpost'.  For example, if `latex'
-     is a link to `tex', and the user runs `latex foo', `latex.fmt'
-     will be used.
+     commonly `tex' resp. `mf'.  For example, if `latex' is a link to
+     `tex', and the user runs `latex foo', `latex.fmt' will be used.
 
 
 
@@ -799,8 +790,8 @@ files cannot be guaranteed to work.  Floating-point values are always
 written in native format, and hence will generally not be readable
 across platforms.  Fortunately, TeX uses floating point only to
 represent glue ratios, and all common formats (plain, LaTeX, AMSTeX,
-...) do not do any glue setting at `.fmt'-creation time.  Metafont and
-MetaPost do not use floating point in any dumped value at all.
+...) do not do any glue setting at `.fmt'-creation time.  Metafont does
+not use floating point in any dumped value at all.
 
    Incidentally, different memory dump files will never compare equal
 byte-for-byte, because the program always dumps the current date and
@@ -838,13 +829,15 @@ File: web2c.info,  Node: Editor invocation,  Next: \input filenames,  Prev: Memo
 -----------------------
 
 TeX, Metafont, and MetaPost all (by default) stop and ask for user
-intervention at an error.  If the user responds with `e' or `E', the
-program invokes an editor.
+intervention at an error.  If the input came from a file, and the user
+responds with `e' or `E', the program invokes an editor.
 
    Specifying `--with-editor=CMD' to `configure' sets the default
 editor command string to CMD.  The environment variables/configuration
 values `TEXEDIT', `MFEDIT', and `MPEDIT' (respectively) override this.
-If `--with-editor' is not specified, the default is `vi +%d %s'.
+If `--with-editor' is not specified, the default is `vi +%d %s' on
+Unix, and an invocation of the TeXworks editor on Windows.  (See
+`texmf.cnf' for the precise values.)
 
    In this string, `%d' is replaced by the line number of the error,
 and `%s' is replaced by the name of the current input file.
@@ -2194,37 +2187,21 @@ File: web2c.info,  Node: Initial MetaPost,  Next: dvitomp invocation,  Prev: mpo
 6.2 Initial MetaPost
 ====================
 
-`inimpost' is the "initial" form of MetaPost, which does lengthy
-initializations avoided by the "virgin" (`vir') form, so as to be
-capable of dumping `.mem' files (*note Memory dumps::).  For a detailed
-comparison of virgin and initial forms, see *note Initial and virgin::.
-In past releases, a separate program `inimpost' was installed for the
-initial form, but this is no longer the case.
+As of MetaPost 1.504 (TeX Live 2011), MetaPost no longer dumps `.mem'
+files (*note Memory dumps::) and does not distinguish virgin and
+initial forms (*note Initial and virgin::).  Instead, the "initial"
+file name is read in its source form--that is, `mpost.mp' when the
+program is invoked as `mpost'.
 
    For a list of options and other information, see *note mpost
 invocation::.
 
-   The principal memory dump file used with MetaPost is the default,
-`plain.mem', also known as `mpost.mem' (again, *note Memory dumps::).
-It is created by default during installation, but you can also do so by
-hand if necessary (e.g., if a `plain.mp' update is issued):
-     mpost -ini '\input plain dump'
-   (The quotes prevent interpretation of the backslashes from the
-shell.)  Then install the resulting `plain.mem' in `$(memdir)'
-(`/usr/local/share/texmf/web2c' by default), and link `mpost.mem' to it.
-
-   MetaPost also provides a mem file with all the features of plain
-Metafont, called `mfplain.mem'.  You can create that in the same way;
-just replace `plain' in the above command with `mfplain'.
-`mfplain.mem' file lets you directly process Metafont source files with
-MetaPost, producing character proofs (one file for each character)
-similar to those produced with Metafont in proof mode and GFtoDVI
-(*note gftodvi invocation::).
-
-   Another MetaPost mem file, named MetaFun, provides many advanced
-features.  It was developed and maintained by Pragma ADE.  The home
-page for MetaFun, other MetaPost-related things, and lots more from
-Pragma: `http://www.pragma-ade.com/'.
+   MetaPost provides a format with all the features of plain Metafont,
+called `mfplain'.  You can use that in the same way; just run `mfplain'
+instead of `mpost'.  This lets you directly process Metafont source
+files with MetaPost, producing character proofs (one file for each
+character) similar to those produced with Metafont in proof mode and
+GFtoDVI (*note gftodvi invocation::).
 
 
 File: web2c.info,  Node: dvitomp invocation,  Prev: Initial MetaPost,  Up: MetaPost
@@ -3514,7 +3491,7 @@ Index
                                                               (line   6)
 * $ expansion in filenames:              \input filenames.    (line  48)
 * %& magic number:                       Determining the memory dump to use.
-                                                              (line  20)
+                                                              (line  19)
 * - starting a filename:                 Option conventions.  (line  19)
 * - starts option names:                 Option conventions.  (line  11)
 * -- starts option names:                Option conventions.  (line  11)
@@ -3547,7 +3524,7 @@ Index
                                                               (line  59)
 * --with-x:                              Online Metafont graphics.
                                                               (line  57)
-* -8bit:                                 Common options.      (line 106)
+* -8bit:                                 Common options.      (line 105)
 * -base=BASE:                            Determining the memory dump to use.
                                                               (line  15)
 * -base=DUMPNAME:                        Common options.      (line  34)
@@ -3569,13 +3546,13 @@ Index
                                                               (line  69)
 * -halt-on-error:                        Common options.      (line  41)
 * -images:                               gftype invocation.   (line  26)
-* -ini <1>:                              Initial and virgin.  (line  12)
+* -ini <1>:                              Initial and virgin.  (line  10)
 * -ini:                                  Common options.      (line  45)
-* -interaction=STRING:                   Common options.      (line  51)
+* -interaction=STRING:                   Common options.      (line  50)
 * -ipc:                                  tex invocation.      (line  95)
 * -ipc-start:                            tex invocation.      (line  95)
-* -jobname=STRING:                       Common options.      (line  56)
-* -kpathsea-debug=NUMBER:                Common options.      (line  60)
+* -jobname=STRING:                       Common options.      (line  55)
+* -kpathsea-debug=NUMBER:                Common options.      (line  59)
 * -length=NUMBER:                        tangle invocation.   (line  27)
 * -loose:                                tangle invocation.   (line  46)
 * -lowercase:                            tangle invocation.   (line  35)
@@ -3584,8 +3561,6 @@ Index
 * -max-pages=N <1>:                      dvitype invocation.  (line  33)
 * -max-pages=N:                          dvicopy invocation.  (line  25)
 * -mem=DUMPNAME:                         Common options.      (line  34)
-* -mem=MEM:                              Determining the memory dump to use.
-                                                              (line  15)
 * -min-crossrefs=N:                      bibtex invocation.   (line  31)
 * -mixedcase:                            tangle invocation.   (line  35)
 * -mktex=FILETYPE <1>:                   mf invocation.       (line  87)
@@ -3595,22 +3570,22 @@ Index
 * -no-file-line-error:                   Common options.      (line  26)
 * -no-mktex=FILETYPE <1>:                mf invocation.       (line  87)
 * -no-mktex=FILETYPE:                    tex invocation.      (line 105)
-* -no-parse-first-line:                  Common options.      (line  73)
+* -no-parse-first-line:                  Common options.      (line  72)
 * -no-shell-escape:                      tex invocation.      (line 123)
-* -oem:                                  Common options.      (line 111)
+* -oem:                                  Common options.      (line 110)
 * -output-comment=STRING:                tex invocation.      (line 115)
 * -output-directory <1>:                 Output file location.
                                                               (line  15)
-* -output-directory:                     Common options.      (line  67)
+* -output-directory:                     Common options.      (line  66)
 * -output-level=N:                       dvitype invocation.  (line  36)
 * -overflow-label-offset=POINTS:         gftodvi invocation.  (line  59)
 * -page-start=PAGE-SPEC <1>:             dvitype invocation.  (line  50)
 * -page-start=PAGE-SPEC:                 dvicopy invocation.  (line  28)
-* -parse-first-line:                     Common options.      (line  72)
+* -parse-first-line:                     Common options.      (line  71)
 * -progname=STRING <1>:                  Determining the memory dump to use.
-                                                              (line  18)
-* -progname=STRING:                      Common options.      (line  78)
-* -recorder:                             Common options.      (line  85)
+                                                              (line  17)
+* -progname=STRING:                      Common options.      (line  77)
+* -recorder:                             Common options.      (line  84)
 * -shell-escape:                         tex invocation.      (line 122)
 * -shell-restricted:                     tex invocation.      (line 124)
 * -show-opcodes:                         dvitype invocation.  (line  56)
@@ -3619,7 +3594,7 @@ Index
 * -T:                                    mpost invocation.    (line 118)
 * -terse:                                bibtex invocation.   (line  28)
 * -tex=TEXPROGRAM:                       mpost invocation.    (line 121)
-* -translate-file=TCXFILE:               Common options.      (line  99)
+* -translate-file=TCXFILE:               Common options.      (line  98)
 * -troff:                                mpost invocation.    (line 118)
 * -underline:                            tangle invocation.   (line  41)
 * -uppercase:                            tangle invocation.   (line  35)
@@ -3633,14 +3608,13 @@ Index
 * .bib bibliography databases:           bibtex invocation.   (line   6)
 * .blg BibTeX log file:                  bibtex invocation.   (line  14)
 * .fmt:                                  Initial TeX.         (line   6)
-* .mem:                                  Initial MetaPost.    (line   6)
 * .mf:                                   mf invocation.       (line  24)
 * .mp:                                   mpost invocation.    (line  31)
 * .mps files and PDF:                    mpost invocation.    (line  89)
 * .NNN PostScript figures:               mpost invocation.    (line  37)
 * .NNNgf generic fonts:                  mf invocation.       (line  34)
 * .tcx character translation files <1>:  TCX files.           (line   6)
-* .tcx character translation files:      Common options.      (line  99)
+* .tcx character translation files:      Common options.      (line  98)
 * .tex:                                  tex invocation.      (line  20)
 * .tfm output <1>:                       mpost invocation.    (line  37)
 * .tfm output:                           mf invocation.       (line  43)
@@ -3649,8 +3623,8 @@ Index
 * .Xresources:                           Online Metafont graphics.
                                                               (line  69)
 * 2602gf:                                mf invocation.       (line  48)
-* 8 bit clean:                           Common options.      (line 106)
-* 8 bit clean output, specifying:        Common options.      (line 106)
+* 8 bit clean:                           Common options.      (line 105)
+* 8 bit clean output, specifying:        Common options.      (line 105)
 * 8-bit characters:                      TCX files.           (line   6)
 * \bibliography:                         bibtex invocation.   (line  18)
 * \bibliographystyle:                    bibtex invocation.   (line  18)
@@ -3734,7 +3708,7 @@ Index
                                                               (line   6)
 * BigEndian machines:                    Hardware and memory dumps.
                                                               (line   6)
-* binaries, linking:                     Common options.      (line  78)
+* binaries, linking:                     Common options.      (line  77)
 * blank lines, in TCX files:             TCX files.           (line  67)
 * boxes, memory for:                     Runtime options.     (line  20)
 * breakpoints, memory for:               Runtime options.     (line  20)
@@ -3813,7 +3787,7 @@ Index
 * date and time, in memory dumps:        Hardware and memory dumps.
                                                               (line  30)
 * debugging DVI utilities:               dvitype invocation.  (line  56)
-* debugging flags, specifying:           Common options.      (line  60)
+* debugging flags, specifying:           Common options.      (line  59)
 * decimal character codes, in TCX files: TCX files.           (line  78)
 * dependencies, hardware:                Hardware and memory dumps.
                                                               (line   6)
@@ -3879,10 +3853,10 @@ Index
 * FAMILY property:                       tftopl invocation.   (line  96)
 * Ferguson, Michael:                     MLTeX.               (line   6)
 * file formats for fonts:                Font file formats.   (line   6)
-* file recorder:                         Common options.      (line  85)
+* file recorder:                         Common options.      (line  84)
 * filename conventions, in input files:  \input filenames.    (line   6)
 * filenames starting with -:             Option conventions.  (line  19)
-* first line of the main input file:     Common options.      (line  99)
+* first line of the main input file:     Common options.      (line  98)
 * fixed-point arithmetic:                Compile-time options.
                                                               (line  22)
 * FIXPT:                                 Compile-time options.
@@ -3992,9 +3966,9 @@ Index
 * initial form, enabling:                Common options.      (line  45)
 * initial Metafont:                      Initial Metafont.    (line   6)
 * initial MetaPost:                      Initial MetaPost.    (line   6)
-* initial programs:                      Initial and virgin.  (line  24)
+* initial programs:                      Initial and virgin.  (line  21)
 * initial TeX:                           Initial TeX.         (line   6)
-* initializations, lengthy:              Initial and virgin.  (line  24)
+* initializations, lengthy:              Initial and virgin.  (line  21)
 * input filenames:                       \input filenames.    (line   6)
 * install-bases Make target:             Additional targets.  (line  29)
 * install-fmts Make target:              Additional targets.  (line  25)
@@ -4002,19 +3976,19 @@ Index
 * install-mems Make target:              Additional targets.  (line  34)
 * installation:                          Installation.        (line   6)
 * interaction between TCX files and -8bit.: TCX files.        (line 105)
-* interaction mode:                      Common options.      (line  51)
+* interaction mode:                      Common options.      (line  50)
 * international characters:              TCX files.           (line   6)
 * introduction:                          Introduction.        (line   6)
 * IPC:                                   IPC and TeX.         (line   6)
 * IPC_DEBUG <1>:                         IPC and TeX.         (line  13)
 * IPC_DEBUG:                             Compile-time options.
                                                               (line  29)
-* job name:                              Common options.      (line  56)
+* job name:                              Common options.      (line  55)
 * kerning table, in TFM files:           tftopl invocation.   (line 102)
 * keyboard character code, translating:  TCX files.           (line 102)
 * Knuth, Donald E. <1>:                  mft invocation.      (line  58)
 * Knuth, Donald E.:                      Introduction.        (line   9)
-* KPATHSEA_DEBUG:                        Common options.      (line  60)
+* KPATHSEA_DEBUG:                        Common options.      (line  59)
 * KRN property:                          tftopl invocation.   (line 102)
 * label font:                            gftodvi invocation.  (line  36)
 * LABEL property:                        tftopl invocation.   (line 102)
@@ -4031,9 +4005,9 @@ Index
 * LIG property:                          tftopl invocation.   (line 102)
 * ligature table, in TFM files:          tftopl invocation.   (line 102)
 * LIGTABLE property:                     tftopl invocation.   (line 102)
-* linking binaries:                      Common options.      (line  78)
+* linking binaries:                      Common options.      (line  77)
 * links to binaries:                     Determining the memory dump to use.
-                                                              (line  32)
+                                                              (line  31)
 * literate programming:                  WEB.                 (line   6)
 * LittleEndian machines:                 Hardware and memory dumps.
                                                               (line   6)
@@ -4059,8 +4033,6 @@ Index
 * mathematical typesetting:              TeX.                 (line   6)
 * mem file, determining:                 Determining the memory dump to use.
                                                               (line   6)
-* mem files:                             Initial MetaPost.    (line   6)
-* mem files, plain only:                 Initial MetaPost.    (line  16)
 * mem files, sharing:                    Hardware and memory dumps.
                                                               (line   6)
 * memory dump to use, determining:       Determining the memory dump to use.
@@ -4085,14 +4057,12 @@ Index
 * Metafont online support, new devices:  Online Metafont graphics.
                                                               (line  80)
 * Metafont source, prettyprinting:       mft invocation.      (line   6)
-* Metafont, compatibility in MetaPost:   Initial MetaPost.    (line  25)
+* Metafont, compatibility in MetaPost:   Initial MetaPost.    (line  15)
 * Metafont, initial:                     Initial Metafont.    (line   6)
 * Metafont, MetaPost, and TeX:           Three programs.      (line   6)
-* MetaFun, enhanced MetaPost:            Initial MetaPost.    (line  33)
-* metafun.mp:                            Initial MetaPost.    (line  33)
 * MetaPost:                              MetaPost.            (line   6)
 * MetaPost and plain Metafont compatibility: Initial MetaPost.
-                                                              (line  25)
+                                                              (line  15)
 * MetaPost input files:                  mpost invocation.    (line  31)
 * MetaPost invocation:                   mpost invocation.    (line   6)
 * MetaPost source, prettyprinting:       mft invocation.      (line  80)
@@ -4103,7 +4073,7 @@ Index
 * mf:                                    mf invocation.       (line   6)
 * mf.base:                               Initial Metafont.    (line  16)
 * MFEDIT:                                Editor invocation.   (line  10)
-* mfplain.mem:                           Initial MetaPost.    (line  25)
+* mfplain:                               Initial MetaPost.    (line  15)
 * mfput:                                 mf invocation.       (line  34)
 * mft:                                   mft invocation.      (line   6)
 * mftalk:                                Online Metafont graphics.
@@ -4128,7 +4098,6 @@ Index
 * mpman.ps:                              mpost invocation.    (line   6)
 * mpost:                                 mpost invocation.    (line   6)
 * mpost, reason for name change:         Installation.        (line  19)
-* mpost.mem:                             Initial MetaPost.    (line  16)
 * mpout:                                 mpost invocation.    (line  37)
 * mproof.tex:                            mpost invocation.    (line  73)
 * mptrap Make target:                    Additional targets.  (line  41)
@@ -4158,7 +4127,7 @@ Index
 * origin:                                pktype invocation.   (line  66)
 * output directory, specifying <1>:      Output file location.
                                                               (line  15)
-* output directory, specifying:          Common options.      (line  67)
+* output directory, specifying:          Common options.      (line  66)
 * output file location:                  Output file location.
                                                               (line   6)
 * output files, written by TeX programs: tex invocation.      (line  51)
@@ -4167,11 +4136,11 @@ Index
 * packet length:                         pktype invocation.   (line  50)
 * page, starting <1>:                    dvitype invocation.  (line  50)
 * page, starting:                        dvicopy invocation.  (line  28)
-* parsing the first line:                Common options.      (line  73)
+* parsing the first line:                Common options.      (line  72)
 * Pascal, creating from WEB:             tangle invocation.   (line   6)
 * patgen:                                patgen invocation.   (line   6)
 * path searching:                        Path searching.      (line   6)
-* path searching debugging:              Common options.      (line  60)
+* path searching debugging:              Common options.      (line  59)
 * PDF:                                   TeX extensions.      (line  20)
 * PDF, and .mps files:                   mpost invocation.    (line  89)
 * pdfTeX:                                TeX extensions.      (line  20)
@@ -4196,7 +4165,7 @@ Index
 * pktype.web:                            Font utilities.      (line  11)
 * PL files, explained:                   Font file formats.   (line  47)
 * plain Metafont, compatibility in MetaPost: Initial MetaPost.
-                                                              (line  25)
+                                                              (line  15)
 * plain text, converting DVI to:         dvitype invocation.  (line   6)
 * plain text, converting GF to:          gftype invocation.   (line   6)
 * plain text, converting PK to:          pktype invocation.   (line   6)
@@ -4206,7 +4175,6 @@ Index
 * plain.bst:                             Basic BibTeX style files.
                                                               (line  11)
 * plain.fmt:                             Initial TeX.         (line  15)
-* plain.mem:                             Initial MetaPost.    (line  16)
 * plain.mft:                             mft invocation.      (line  68)
 * pltotf:                                pltotf invocation.   (line   6)
 * pool file, writing:                    tangle invocation.   (line  16)
@@ -4224,16 +4192,15 @@ Index
 * PostScript, and font scaling:          Font file formats.   (line  22)
 * potrace:                               Font utilities available elsewhere.
                                                               (line  46)
-* Pragma ADE:                            Initial MetaPost.    (line  33)
 * predefined macros and memory dumps:    Memory dumps.        (line   6)
 * prettyprinting Metafont source:        mft invocation.      (line   6)
 * prettyprinting WEB programs:           weave invocation.    (line   6)
 * primitives, new:                       TeX extensions.      (line  10)
 * printable characters, specifying:      TCX files.           (line  88)
 * printer characteristics, for Metafont: Modes.               (line   6)
-* production use:                        Initial and virgin.  (line  20)
+* production use:                        Initial and virgin.  (line  17)
 * program name, determines memory dump:  Determining the memory dump to use.
-                                                              (line  32)
+                                                              (line  31)
 * program names, special <1>:            tex invocation.      (line 110)
 * program names, special:                Common options.      (line  45)
 * prologues:                             mpost invocation.    (line 118)
@@ -4380,7 +4347,7 @@ Index
 * toolkits, X:                           Online Metafont graphics.
                                                               (line  59)
 * torture tests:                         Triptrap.            (line   6)
-* translation file for TeX, specifying:  Common options.      (line  99)
+* translation file for TeX, specifying:  Common options.      (line  98)
 * translation from WEB to C:             Introduction.        (line  17)
 * trap Make target:                      Additional targets.  (line  41)
 * trap test:                             Triptrap.            (line   6)
@@ -4411,7 +4378,7 @@ Index
                                                               (line  50)
 * unsrt.bst:                             Basic BibTeX style files.
                                                               (line  39)
-* using local codepage to display messages: Common options.   (line 111)
+* using local codepage to display messages: Common options.   (line 110)
 * UTF-8 input:                           tex invocation.      (line  89)
 * validation, of DVI files:              dvitype invocation.  (line   6)
 * validation, of GF files:               gftype invocation.   (line   6)
@@ -4424,7 +4391,7 @@ Index
 * vertical escapement:                   gftype invocation.   (line 107)
 * VF files, converting property lists to: vptovf invocation.  (line   6)
 * vftovp:                                vftovp invocation.   (line   6)
-* virgin programs:                       Initial and virgin.  (line  20)
+* virgin programs:                       Initial and virgin.  (line  17)
 * virtual font creation:                 Font utilities available elsewhere.
                                                               (line  53)
 * virtual fonts, expanding:              dvicopy invocation.  (line   6)
@@ -4493,64 +4460,64 @@ Node: Runtime options15162
 Node: Commonalities16934
 Node: Option conventions17539
 Node: Common options18763
-Node: Path searching23417
-Node: Output file location24439
-Node: Three programs25764
-Node: Initial and virgin26523
-Node: Memory dumps27623
-Node: Creating memory dumps28090
-Node: Determining the memory dump to use29351
-Node: Hardware and memory dumps30975
-Node: Editor invocation33444
-Node: \input filenames34174
-Node: TeX37167
-Node: tex invocation38313
-Node: Initial TeX45283
-Node: Formats46772
-Node: Languages and hyphenation49711
-Node: MLTeX50141
-Node: \charsubdef51636
-Node: \tracingcharsubdef53962
-Node: TCX files54537
-Node: patgen invocation59961
-Node: Shell escapes60678
-Node: IPC and TeX64242
-Node: TeX extensions64812
-Node: Metafont65944
-Node: mf invocation67232
-Node: Initial Metafont71115
-Node: Modes72868
-Node: Online Metafont graphics75124
-Node: gftodvi invocation78539
-Node: mft invocation81372
-Node: MetaPost85427
-Node: mpost invocation86189
-Node: Initial MetaPost91447
-Node: dvitomp invocation93258
-Node: BibTeX93923
-Node: bibtex invocation94284
-Node: Basic BibTeX style files96609
-Node: WEB97951
-Node: tangle invocation99159
-Node: weave invocation101282
-Node: pooltype invocation102690
-Node: DVI utilities103820
-Node: dvicopy invocation104764
-Node: dvitype invocation106062
-Node: dvitype output example108417
-Node: Font utilities111468
-Node: Font file formats112648
-Node: gftopk invocation115947
-Node: pktogf invocation117151
-Node: pktype invocation118330
-Node: gftype invocation121165
-Node: tftopl invocation125681
-Node: pltotf invocation130315
-Node: vftovp invocation131380
-Node: vptovf invocation133664
-Node: Font utilities available elsewhere134718
-Node: Legalisms137126
-Node: References139297
-Node: Index143869
+Node: Path searching23336
+Node: Output file location24358
+Node: Three programs25683
+Node: Initial and virgin26437
+Node: Memory dumps27376
+Node: Creating memory dumps27832
+Node: Determining the memory dump to use29043
+Node: Hardware and memory dumps30630
+Node: Editor invocation33088
+Node: \input filenames33954
+Node: TeX36947
+Node: tex invocation38093
+Node: Initial TeX45063
+Node: Formats46552
+Node: Languages and hyphenation49491
+Node: MLTeX49921
+Node: \charsubdef51416
+Node: \tracingcharsubdef53742
+Node: TCX files54317
+Node: patgen invocation59741
+Node: Shell escapes60458
+Node: IPC and TeX64022
+Node: TeX extensions64592
+Node: Metafont65724
+Node: mf invocation67012
+Node: Initial Metafont70895
+Node: Modes72648
+Node: Online Metafont graphics74904
+Node: gftodvi invocation78319
+Node: mft invocation81152
+Node: MetaPost85207
+Node: mpost invocation85969
+Node: Initial MetaPost91227
+Node: dvitomp invocation92149
+Node: BibTeX92814
+Node: bibtex invocation93175
+Node: Basic BibTeX style files95500
+Node: WEB96842
+Node: tangle invocation98050
+Node: weave invocation100173
+Node: pooltype invocation101581
+Node: DVI utilities102711
+Node: dvicopy invocation103655
+Node: dvitype invocation104953
+Node: dvitype output example107308
+Node: Font utilities110359
+Node: Font file formats111539
+Node: gftopk invocation114838
+Node: pktogf invocation116042
+Node: pktype invocation117221
+Node: gftype invocation120056
+Node: tftopl invocation124572
+Node: pltotf invocation129206
+Node: vftovp invocation130271
+Node: vptovf invocation132555
+Node: Font utilities available elsewhere133609
+Node: Legalisms136017
+Node: References138188
+Node: Index142760
 
 End Tag Table
diff --git a/Build/source/texk/web2c/doc/web2c.texi b/Build/source/texk/web2c/doc/web2c.texi
index 530d41dff51..50534222330 100644
--- a/Build/source/texk/web2c/doc/web2c.texi
+++ b/Build/source/texk/web2c/doc/web2c.texi
@@ -350,8 +350,7 @@ process of trying to recover and continue.
 @cindex initial form, enabling
 Enable the ``initial'' form of the program (@pxref{Initial and
 virgin}).  This is implicitly set if the program name is @code{initex}
-resp.@: @code{inimf} resp.@: @code{inimpost}, although these variants
-are no longer typically installed.
+resp.@: @code{inimf}.
 
 @item -interaction=@var{string}
 @opindex -interaction=@var{string}
@@ -530,7 +529,7 @@ control some array sizes and other features are described in
 
 @menu
 * Initial and virgin::          Making memory dumps vs. production runs.
-* Memory dumps::                .fmt/.base/.mem files for fast startup.
+* Memory dumps::                .fmt/.base files for fast startup.
 * Editor invocation::           The `e' response at errors.
 * \input filenames::            ~ and $ expansion in TeX/MF/MP.
 @end menu
@@ -540,10 +539,9 @@ control some array sizes and other features are described in
 @subsection Initial and virgin
 
 @cindex executables, shared initial and virgin
-The @TeX{}, Metafont, and MetaPost programs each have two main
-variants, called @dfn{initial} and @dfn{virgin}.  As of Web2c 7, one
-executable suffices for both variants, and in fact, the @code{ini...}
-executables are no longer created.
+The @TeX{} and Metafont programs each have two main variants, called
+@dfn{initial} and @dfn{virgin}.  MetaPost no longer makes this
+distinction.
 
 The initial form is enabled if:
 @enumerate
@@ -551,8 +549,7 @@ The initial form is enabled if:
 @opindex -ini
 the @samp{-ini} option was specified; or
 @item
-the program name is @file{initex} resp.@: @file{inimf} resp.@:
-@file{inimpost} (these variants are no longer typically installed); or
+the program name is @file{initex} resp.@: @file{inimf}; or
 @item
 the first line of the main input file is @samp{%&ini};
 @end enumerate
@@ -581,7 +578,7 @@ memory dump file.
 @cindex dumping memory
 @cindex macros, predefining in memory dumps
 @cindex predefined macros and memory dumps
-In typical use, @TeX{}, Metafont, and MetaPost require a large number of
+In typical use, @TeX{} and Metafont require a large number of
 macros to be predefined; therefore, they support @dfn{memory dump}
 files, which can be read much more efficiently than ordinary source
 code. 
@@ -620,9 +617,6 @@ creating memory dumps:
 
 @item Metafont
 (@samp{.base}) @xref{Initial Metafont}.
-
-@item MetaPost
-(@samp{.mem}) @xref{Initial MetaPost}.
 @end table
 
 When making memory dumps, the programs read environment variables and
@@ -654,8 +648,7 @@ backslash protects the @samp{&} against interpretation by the shell.)
 @item
 @opindex -fmt=@var{fmt}
 @opindex -base=@var{base}
-@opindex -mem=@var{mem}
-If the @samp{-fmt} resp.@: @samp{-base} resp.@: @samp{-mem} option is
+If the @samp{-fmt} resp.@: @samp{-base} option is
 specified, its value is used.
 
 @item
@@ -681,9 +674,9 @@ must be given first.
 @cindex program name, determines memory dump
 @cindex links to binaries
 Otherwise, the program uses the program invocation name, most commonly
-@file{tex} resp.@: @file{mf} resp.@: @file{mpost}.  For example, if
-@file{latex} is a link to @file{tex}, and the user runs @samp{latex
-foo}, @file{latex.fmt} will be used.
+@file{tex} resp.@: @file{mf}.  For example, if @file{latex} is a link
+to @file{tex}, and the user runs @samp{latex foo}, @file{latex.fmt}
+will be used.
 
 @end enumerate
 
@@ -728,11 +721,11 @@ may wish to get maximum speed.
 @TeX{}nically, even without @samp{--disable-dump-share}, sharing of
 @file{.fmt} files cannot be guaranteed to work.  Floating-point values
 are always written in native format, and hence will generally not be
-readable across platforms.  Fortunately, @TeX{} uses floating point only
-to represent glue ratios, and all common formats (plain, @LaTeX{},
-AMS@TeX{}, @dots{}) do not do any glue setting at @file{.fmt}-creation
-time.  Metafont and MetaPost do not use floating point in any dumped
-value at all.
+readable across platforms.  Fortunately, @TeX{} uses floating point
+only to represent glue ratios, and all common formats (plain,
+@LaTeX{}, AMS@TeX{}, @dots{}) do not do any glue setting at
+@file{.fmt}-creation time.  Metafont does not use floating point in
+any dumped value at all.
 
 @cindex date and time, in memory dumps
 @cindex time and date, in memory dumps
@@ -779,8 +772,8 @@ main ()
 @opindex e @r{response at error prompt}
 
 @TeX{}, Metafont, and MetaPost all (by default) stop and ask for user
-intervention at an error.  If the user responds with @kbd{e} or @kbd{E},
-the program invokes an editor.
+intervention at an error.  If the input came from a file, and the user
+responds with @kbd{e} or @kbd{E}, the program invokes an editor.
 
 @vindex TEXEDIT
 @vindex MFEDIT
@@ -790,7 +783,9 @@ Specifying @samp{--with-editor=@var{cmd}} to @code{configure} sets the
 default editor command string to @var{cmd}.  The environment
 variables/configuration values @code{TEXEDIT}, @code{MFEDIT}, and
 @code{MPEDIT} (respectively) override this.  If @samp{--with-editor} is
-not specified, the default is @code{vi +%d %s}.
+not specified, the default is @code{vi +%d %s} on Unix, and an
+invocation of the @TeX{}works editor on Windows.  (See
+@file{texmf.cnf} for the precise values.)
 
 In this string, @samp{%d} is replaced by the line number of the error,
 and @samp{%s} is replaced by the name of the current input file.
@@ -2592,54 +2587,24 @@ typeset the labels.
 @cindex initial MetaPost
 @cindex MetaPost, initial
 
-@flindex .mem
-@cindex mem files
-@code{inimpost} is the ``initial'' form of MetaPost, which does
-lengthy initializations avoided by the ``virgin'' (@code{vir}) form,
-so as to be capable of dumping @file{.mem} files (@pxref{Memory
-dumps}).  For a detailed comparison of virgin and initial forms, see
-@ref{Initial and virgin}.  In past releases, a separate program
-@command{inimpost} was installed for the initial form, but this is no
-longer the case.
+As of MetaPost 1.504 (@TeX{} Live 2011), MetaPost no longer dumps
+@file{.mem} files (@pxref{Memory dumps}) and does not distinguish
+virgin and initial forms (@pxref{Initial and virgin}).  Instead, the
+``initial'' file name is read in its source form---that is,
+@file{mpost.mp} when the program is invoked as @command{mpost}.
 
 For a list of options and other information, see @ref{mpost invocation}.
 
-@flindex plain.mem
-@flindex mpost.mem
-@cindex mem files, plain only
-The principal memory dump file used with MetaPost is the default,
-@file{plain.mem}, also known as @file{mpost.mem} (again, @pxref{Memory
-dumps}).  It is created by default during installation, but you can
-also do so by hand if necessary (e.g., if a @file{plain.mp} update is
-issued):
-@example
-mpost -ini '\input plain dump'
-@end example
-@noindent
-(The quotes prevent interpretation of the backslashes from the shell.)
-Then install the resulting @file{plain.mem} in @samp{$(memdir)}
-(@file{/usr/local/share/texmf/web2c} by default), and link
-@file{mpost.mem} to it.
-
 @cindex Metafont, compatibility in MetaPost
 @cindex plain Metafont, compatibility in MetaPost
 @cindex MetaPost and plain Metafont compatibility
-@flindex mfplain.mem
-MetaPost also provides a mem file with all the features of plain
-Metafont, called @file{mfplain.mem}.  You can create that in the same
-way; just replace @samp{plain} in the above command with @samp{mfplain}.
-@file{mfplain.mem} file lets you directly process Metafont source files
-with MetaPost, producing character proofs (one file for each character)
-similar to those produced with Metafont in proof mode and GFtoDVI
-(@pxref{gftodvi invocation}).
-
-@flindex metafun.mp
-@cindex MetaFun, enhanced MetaPost
-@cindex Pragma ADE
-Another MetaPost mem file, named MetaFun, provides many advanced
-features.  It was developed and maintained by Pragma ADE.  The home
-page for MetaFun, other MetaPost-related things, and lots more from
-Pragma: @url{http://www.pragma-ade.com/}.
+@flindex mfplain
+MetaPost provides a format with all the features of plain Metafont,
+called @file{mfplain}.  You can use that in the same way; just run
+@command{mfplain} instead of @command{mpost}.  This lets you directly
+process Metafont source files with MetaPost, producing character
+proofs (one file for each character) similar to those produced with
+Metafont in proof mode and GFtoDVI (@pxref{gftodvi invocation}).
 
 
 @node dvitomp invocation