towards TL2010: texk/web2c

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

3 files changed, 220 insertions, 219 deletions

diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in
index 22a686436f4..bf076747675 100644
--- a/Build/source/texk/web2c/doc/Makefile.in
+++ b/Build/source/texk/web2c/doc/Makefile.in
@@ -37,7 +37,8 @@ subdir = doc
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(web2c_TEXINFOS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
+	$(top_srcdir)/../../m4/kpse-asm.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-cross.m4 \
 	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
@@ -195,6 +196,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
diff --git a/Build/source/texk/web2c/doc/web2c.info b/Build/source/texk/web2c/doc/web2c.info
index 708cb6e1ad1..f24379d1525 100644
--- a/Build/source/texk/web2c/doc/web2c.info
+++ b/Build/source/texk/web2c/doc/web2c.info
@@ -1,5 +1,4 @@
-This is ../../../../texk/web2c/doc/web2c.info, produced by makeinfo
-version 4.13 from ../../../../texk/web2c/doc/web2c.texi.
+This is web2c.info, produced by makeinfo version 4.13 from web2c.texi.
 
 INFO-DIR-SECTION TeX
 START-INFO-DIR-ENTRY
@@ -560,7 +559,7 @@ common:
 `-recorder'
      Enable the filename recorder.  This makes the program save a list
      of the opened files into a file with (by default) extension
-     `.fls'.  For Omega, this option is always on, and the file has
+     `.fls'.  For Aleph, this option is always on, and the file has
      extension `.ofl'.
 
 `-translate-file=TCXFILE'
@@ -988,24 +987,18 @@ of the EC fonts, which can be generated at any size.
    TeX can write output files, via the `\openout' primitive; this opens
 a security hole vulnerable to Trojan horse attack: an unwitting user
 could run a TeX program that overwrites, say, `~/.rhosts'.  (MetaPost
-has a `write' primitive with similar implications).  To alleviate this,
-there is a configuration variable `openout_any', which selects one of
-three levels of security.  When it is set to `a' (for "any"), no
-restrictions are imposed.  When it is set to `r' (for "restricted"),
-filenames beginning with `.' are disallowed (except `.tex' because
-LaTeX needs it).  When it is set to `p' (for "paranoid") additional
-restrictions are imposed: an absolute filename must refer to a file in
-(a subdirectory) of `TEXMFOUTPUT', and any attempt to go up a directory
-level is forbidden (that is, paths may not contain a `..'  component).
-The paranoid setting is the default.  (For backwards compatibility, `y'
-and `1' are synonyms of `a', while `n' and `0' are synonyms for `r'.)
+has a `write' primitive with similar implications).  To alleviate this
+and similar problems the functions `kpathsea_out_name_ok' and
+`kpathsea_in_name_ok' from the Kpathse library (*note Calling sequence:
+(kpathsea)Calling sequence.) are used to determine if a given filename
+is acceptable to be opened for output or input, depending on the
+setting of the configuration variables `openout_any' and `openin_any':
+`a' (for "any", the default for `openin_any'), `r' (for "restricted"),
+or `p' (for "paranoid", the default for `openout_any').
 
    In any case, all `\openout' filenames are recorded in the log file,
 except those opened on the first line of input, which is processed when
-the log file has not yet been opened.  (If you as a TeX administrator
-wish to implement more stringent rules on `\openout', modifying the
-function `openoutnameok' in `web2c/lib/texmfmp.c' is intended to
-suffice.)
+the log file has not yet been opened.
 
    The program accepts the following options, as well as the standard
 `-help' and `-version' (*note Common options::):
@@ -1570,11 +1563,10 @@ e-TeX
      Adds many new primitives, including right-to-left typesetting and
      more registers.  Now frozen.
 
-Omega
 Aleph
-     These add Unicode support, right-to-left typesetting, and more.
+     This adds Unicode support, right-to-left typesetting, and more.
      Omega was the original program.  Aleph is an updated version with
-     a variety of bug fixes, and includes e-TeX.  Neither is actively
+     a variety of bug fixes, and includes e-TeX.  Aleph is not actively
      maintained.
 
 pdfTeX
@@ -1588,6 +1580,10 @@ luaTeX
      (`http://lua.org') and opens up the TeX typesetting engine to
      control from Lua.  Home page: `http://luatex.org'.
 
+XeTeX
+     This combines the capabilities of Aleph and pdfTeX, and more.
+     Home page: FIXME.
+
 
 
 File: web2c.info,  Node: Metafont,  Next: MetaPost,  Prev: TeX,  Up: Top
@@ -1815,7 +1811,7 @@ devices for which support has been compiled in can be selected.
 the corresponding `configure' option(s) in parentheses.
 
 `epsf'
-     (`--with-epsfwin') Pseudo-window server for Encapsulated
+     (`--enable-epsfwin') Pseudo-window server for Encapsulated
      PostScript (see `web2c/window/epsf.c'). This device produces an
      EPS file containing the graphics which would be displayed online on
      other devices. The name of the EPS file defaults to metafont.eps
@@ -1823,43 +1819,46 @@ the corresponding `configure' option(s) in parentheses.
      the new filename.  Contributed by Mathias Herberts.
 
 `hp2627'
-     (`--with-hp2627win') HP2627a color graphics terminals.
+     (`--enable-hp2627win') HP2627a color graphics terminals.
 
 `mftalk'
-     (`--with-mftalkwin') Generic window server (see
+     (`--enable-mftalkwin') Generic window server (see
      `web2c/window/mftalk.c').
 
 `next'
-     (`--with-next') NeXT window system. This requires a separate
+     (`--enable-next') NeXT window system. This requires a separate
      program, called `DrawingServant', available separately. See the
      `web2c/window/next.c'.
 
 `regis'
-     (`--with-regiswin') Regis terminals.
+     (`--enable-regiswin') Regis terminals.
 
 `sun'
-     (`--with-suntoolswin') The old Suntools (not any flavor of X)
+     (`--enable-suntoolswin') The old Suntools (not any flavor of X)
      window system. (You can get the even older SunWindows `gfx' system
      by using `sun-gfx.c'.)
 
 `tek'
-     (`--with-tektronixwin') Tektronix terminals.
+     (`--enable-tektronixwin') Tektronix terminals.
 
 `uniterm'
-     (`--with-unitermwin') Uniterm, Simon Poole's emulator of a smart
+     (`--enable-unitermwin') Uniterm, Simon Poole's emulator of a smart
      Tektronix 4014 terminal.  This may work with regular Tektronix
-     terminals as well; it's faster than the driver `--with-tek'
-     selects.
+     terminals as well; it's faster than the driver
+     `--enable-tektronixwin' selects.
 
 `xterm'
-     (`--with-x11win', `--with-x', `--with-x11') The X window system
-     (version 11).
+     `--with-x' The X window system (version 11).
 
      There are two variants of the X11 support, one that works with the
      Xt toolkit, and another that works directly with Xlib. The Xt
      support is more efficient and has more functionality, so it is the
      default. If you must use the Xlib support, use `configure --with-x
-     --with-x-toolkit=no'.
+     --with-kf-x-toolkit=no'.
+
+     Specify `--disable-mf-nowin' in order not to build a separate
+     non-windows-capable Metafont executable `mf-nowin' (or
+     `mf-nowin.exe').
 
      You cannot specify any of the usual X options (e.g., `-geometry')
      on the Metafont command line, but you can specify X resources in
@@ -3499,35 +3498,33 @@ Index
 * -- starts option names:                Option conventions.  (line  11)
 * --disable-dump-share configure option: Hardware and memory dumps.
                                                               (line   6)
-* --enable-ipc configure option:         tex invocation.      (line 101)
-* --help common option:                  Common options.      (line  11)
-* --verbose common option:               Common options.      (line  15)
-* --version common option:               Common options.      (line  18)
-* --with-editor=CMD:                     Editor invocation.   (line  10)
-* --with-epsfwin:                        Online Metafont graphics.
+* --disable-mf-nowin:                    Online Metafont graphics.
+                                                              (line  65)
+* --enable-epsfwin:                      Online Metafont graphics.
                                                               (line  20)
-* --with-hp2627win:                      Online Metafont graphics.
+* --enable-hp2627win:                    Online Metafont graphics.
                                                               (line  28)
-* --with-mftalkwin:                      Online Metafont graphics.
+* --enable-ipc configure option:         tex invocation.      (line  95)
+* --enable-mftalkwin:                    Online Metafont graphics.
                                                               (line  31)
-* --with-next:                           Online Metafont graphics.
+* --enable-next:                         Online Metafont graphics.
                                                               (line  35)
-* --with-regiswin:                       Online Metafont graphics.
+* --enable-regiswin:                     Online Metafont graphics.
                                                               (line  40)
-* --with-suntoolswin:                    Online Metafont graphics.
+* --enable-suntoolswin:                  Online Metafont graphics.
                                                               (line  43)
-* --with-tektronixwin:                   Online Metafont graphics.
+* --enable-tektronixwin:                 Online Metafont graphics.
                                                               (line  48)
-* --with-unitermwin:                     Online Metafont graphics.
+* --enable-unitermwin:                   Online Metafont graphics.
                                                               (line  51)
+* --help common option:                  Common options.      (line  11)
+* --verbose common option:               Common options.      (line  15)
+* --version common option:               Common options.      (line  18)
+* --with-editor=CMD:                     Editor invocation.   (line  10)
+* --with-mf-x-toolkit=KIT:               Online Metafont graphics.
+                                                              (line  59)
 * --with-x:                              Online Metafont graphics.
                                                               (line  57)
-* --with-x-toolkit=KIT:                  Online Metafont graphics.
-                                                              (line  60)
-* --with-x11:                            Online Metafont graphics.
-                                                              (line  57)
-* --with-x11win:                         Online Metafont graphics.
-                                                              (line  57)
 * -8bit:                                 Common options.      (line 103)
 * -base=BASE:                            Determining the memory dump to use.
                                                               (line  15)
@@ -3537,24 +3534,24 @@ Index
 * -charcode-format=TYPE:                 tftopl invocation.   (line  28)
 * -D compiler options:                   Compile-time options.
                                                               (line   6)
-* -disable-write18:                      tex invocation.      (line 136)
+* -disable-write18:                      tex invocation.      (line 130)
 * -dpi=REAL:                             dvitype invocation.  (line  24)
-* -enable-write18:                       tex invocation.      (line 135)
-* -enc:                                  tex invocation.      (line  95)
+* -enable-write18:                       tex invocation.      (line 129)
+* -enc:                                  tex invocation.      (line  89)
 * -file-line-error:                      Common options.      (line  25)
 * -file-line-error-style:                Common options.      (line  26)
 * -fmt=DUMPNAME:                         Common options.      (line  34)
 * -fmt=FMT:                              Determining the memory dump to use.
                                                               (line  15)
 * -geometry, supported with Xt:          Online Metafont graphics.
-                                                              (line  66)
+                                                              (line  69)
 * -halt-on-error:                        Common options.      (line  41)
 * -images:                               gftype invocation.   (line  26)
 * -ini <1>:                              Initial and virgin.  (line  12)
 * -ini:                                  Common options.      (line  45)
 * -interaction=STRING:                   Common options.      (line  51)
-* -ipc:                                  tex invocation.      (line 101)
-* -ipc-start:                            tex invocation.      (line 101)
+* -ipc:                                  tex invocation.      (line  95)
+* -ipc-start:                            tex invocation.      (line  95)
 * -jobname=STRING:                       Common options.      (line  56)
 * -kpathsea-debug=NUMBER:                Common options.      (line  60)
 * -length=NUMBER:                        tangle invocation.   (line  27)
@@ -3570,16 +3567,16 @@ Index
 * -min-crossrefs=N:                      bibtex invocation.   (line  31)
 * -mixedcase:                            tangle invocation.   (line  35)
 * -mktex=FILETYPE <1>:                   mf invocation.       (line  87)
-* -mktex=FILETYPE:                       tex invocation.      (line 111)
-* -mltex:                                tex invocation.      (line 116)
+* -mktex=FILETYPE:                       tex invocation.      (line 105)
+* -mltex:                                tex invocation.      (line 110)
 * -mnemonics:                            gftype invocation.   (line  29)
 * -no-file-line-error:                   Common options.      (line  26)
 * -no-mktex=FILETYPE <1>:                mf invocation.       (line  87)
-* -no-mktex=FILETYPE:                    tex invocation.      (line 111)
+* -no-mktex=FILETYPE:                    tex invocation.      (line 105)
 * -no-parse-first-line:                  Common options.      (line  78)
-* -no-shell-escape:                      tex invocation.      (line 129)
+* -no-shell-escape:                      tex invocation.      (line 123)
 * -oem:                                  Common options.      (line 108)
-* -output-comment=STRING:                tex invocation.      (line 121)
+* -output-comment=STRING:                tex invocation.      (line 115)
 * -output-directory <1>:                 Output file location.
                                                               (line  15)
 * -output-directory:                     Common options.      (line  67)
@@ -3592,8 +3589,8 @@ Index
                                                               (line  18)
 * -progname=STRING:                      Common options.      (line  83)
 * -recorder:                             Common options.      (line  90)
-* -shell-escape:                         tex invocation.      (line 128)
-* -shell-restricted:                     tex invocation.      (line 130)
+* -shell-escape:                         tex invocation.      (line 122)
+* -shell-restricted:                     tex invocation.      (line 124)
 * -show-opcodes:                         dvitype invocation.  (line  56)
 * -strict:                               tangle invocation.   (line  46)
 * -style=MFTFILE:                        mft invocation.      (line  68)
@@ -3625,9 +3622,9 @@ Index
 * .tfm output <1>:                       mpost invocation.    (line  37)
 * .tfm output:                           mf invocation.       (line  43)
 * .Xdefaults:                            Online Metafont graphics.
-                                                              (line  66)
+                                                              (line  69)
 * .Xresources:                           Online Metafont graphics.
-                                                              (line  66)
+                                                              (line  69)
 * 2602gf:                                mf invocation.       (line  48)
 * 8 bit clean:                           Common options.      (line 103)
 * 8 bit clean output, specifying:        Common options.      (line 103)
@@ -3670,6 +3667,7 @@ Index
                                                               (line  12)
 * afmtopl:                               Font utilities available elsewhere.
                                                               (line  12)
+* Aleph:                                 TeX extensions.      (line  14)
 * aliases for fonts:                     Path searching.      (line  15)
 * alpha.bst:                             Basic BibTeX style files.
                                                               (line  22)
@@ -3745,7 +3743,7 @@ Index
 * chtopx:                                Font utilities available elsewhere.
                                                               (line  23)
 * class name for Metafont:               Online Metafont graphics.
-                                                              (line  66)
+                                                              (line  69)
 * cm.base:                               Initial Metafont.    (line  28)
 * cmbase.mf:                             Initial Metafont.    (line  28)
 * cmbase.mft:                            mft invocation.      (line  75)
@@ -3802,14 +3800,14 @@ Index
 * device-independent width:              pktype invocation.   (line  53)
 * directory structure:                   Installation.        (line  34)
 * DISPLAY:                               Online Metafont graphics.
-                                                              (line  73)
+                                                              (line  76)
 * dot files, written by TeX programs:    tex invocation.      (line  51)
 * downloading of fonts for MetaPost labels: mpost invocation. (line  73)
 * DrawingServant:                        Online Metafont graphics.
                                                               (line  35)
 * dump file:                             Common options.      (line  34)
 * dumping memory:                        Memory dumps.        (line   6)
-* DVI comment, specifying:               tex invocation.      (line 121)
+* DVI comment, specifying:               tex invocation.      (line 115)
 * DVI files, converting to MPX:          dvitomp invocation.  (line   6)
 * DVI files, explained:                  Font file formats.   (line  30)
 * DVI format definition:                 DVI utilities.       (line  14)
@@ -3902,11 +3900,11 @@ Index
 * Free Software Foundation documentation system: Formats.     (line  47)
 * freedom of Web2c:                      Introduction.        (line  22)
 * ftp.math.utah.edu:                     bibtex invocation.   (line  54)
-* generating source specials:            tex invocation.      (line 142)
+* generating source specials:            tex invocation.      (line 136)
 * geometric designs:                     Metafont.            (line   6)
 * geometric font scaling:                Font file formats.   (line  22)
 * geometry for Metafont:                 Online Metafont graphics.
-                                                              (line  66)
+                                                              (line  69)
 * getopt_long_only:                      Option conventions.  (line   6)
 * GF files, explained:                   Font file formats.   (line  40)
 * GF files, output by Metafont:          mf invocation.       (line  34)
@@ -3954,7 +3952,7 @@ Index
 * human-readable text, converting PK to: pktype invocation.   (line   6)
 * human-readable text, converting TFM to: tftopl invocation.  (line   6)
 * human-readable text, converting VF to: vftovp invocation.   (line   6)
-* hypertext:                             TeX extensions.      (line  21)
+* hypertext:                             TeX extensions.      (line  20)
 * hyphenation and languages:             Languages and hyphenation.
                                                               (line   6)
 * hyphenation patterns, creating:        patgen invocation.   (line   6)
@@ -4017,8 +4015,8 @@ Index
 * LittleEndian machines:                 Hardware and memory dumps.
                                                               (line   6)
 * log file, BibTeX:                      bibtex invocation.   (line  14)
-* Lua:                                   TeX extensions.      (line  27)
-* luaTeX:                                TeX extensions.      (line  27)
+* Lua:                                   TeX extensions.      (line  26)
+* luaTeX:                                TeX extensions.      (line  26)
 * machine dependencies:                  Hardware and memory dumps.
                                                               (line   6)
 * machine-readable, converting property lists to <1>: vptovf invocation.
@@ -4055,14 +4053,14 @@ Index
 * meta characters in filenames:          \input filenames.    (line  35)
 * Metafont:                              Metafont.            (line   6)
 * Metafont geometry:                     Online Metafont graphics.
-                                                              (line  66)
+                                                              (line  69)
 * Metafont graphics:                     Online Metafont graphics.
                                                               (line   6)
 * Metafont input files:                  mf invocation.       (line  24)
 * Metafont invocation:                   mf invocation.       (line   6)
 * Metafont meets PostScript:             MetaPost.            (line   6)
 * Metafont online support, new devices:  Online Metafont graphics.
-                                                              (line  77)
+                                                              (line  80)
 * Metafont source, prettyprinting:       mft invocation.      (line   6)
 * Metafont, compatibility in MetaPost:   Initial MetaPost.    (line  25)
 * Metafont, initial:                     Initial Metafont.    (line   6)
@@ -4090,11 +4088,11 @@ Index
 * MFTERM:                                Online Metafont graphics.
                                                               (line  11)
 * mftmac.tex:                            mft invocation.      (line   6)
-* micro-typography:                      TeX extensions.      (line  21)
+* micro-typography:                      TeX extensions.      (line  20)
 * mktexmf, disabling:                    mf invocation.       (line  24)
 * mktextfM, disabling:                   tex invocation.      (line  44)
 * mltex:                                 MLTeX.               (line   6)
-* MLTeX, enabling:                       tex invocation.      (line 116)
+* MLTeX, enabling:                       tex invocation.      (line 110)
 * mode needed to run Metafont:           mf invocation.       (line  48)
 * mode_def:                              Modes.               (line  15)
 * mode_setup:                            Modes.               (line  15)
@@ -4117,17 +4115,18 @@ Index
 * Multi-lingual TeX:                     MLTeX.               (line   6)
 * N tilde:                               \charsubdef.         (line  37)
 * new graphics support for Metafont:     Online Metafont graphics.
-                                                              (line  77)
+                                                              (line  80)
 * newrow GF command:                     gftype invocation.   (line  93)
 * next:                                  Online Metafont graphics.
                                                               (line  34)
 * NO_X11WIN:                             Online Metafont graphics.
                                                               (line  56)
 * non-Unix system, compiling on:         Additional targets.  (line  12)
+* non-windows-capable Metafont:          Online Metafont graphics.
+                                                              (line  65)
 * NUL, not allowed in filenames:         \input filenames.    (line  35)
 * octal character codes, in TCX files:   TCX files.           (line  78)
 * offset for overflow labels:            gftodvi invocation.  (line  59)
-* Omega:                                 TeX extensions.      (line  15)
 * online Metafont graphics:              Online Metafont graphics.
                                                               (line   6)
 * opcodes, showing DVI:                  dvitype invocation.  (line  56)
@@ -4140,7 +4139,7 @@ Index
 * output file location:                  Output file location.
                                                               (line   6)
 * output files, written by TeX programs: tex invocation.      (line  51)
-* output_comment for DVI files:          tex invocation.      (line 121)
+* output_comment for DVI files:          tex invocation.      (line 115)
 * overflow label offset:                 gftodvi invocation.  (line  59)
 * packet length:                         pktype invocation.   (line  50)
 * page, starting <1>:                    dvitype invocation.  (line  50)
@@ -4150,8 +4149,8 @@ Index
 * patgen:                                patgen invocation.   (line   6)
 * path searching:                        Path searching.      (line   6)
 * path searching debugging:              Common options.      (line  60)
-* PDF:                                   TeX extensions.      (line  21)
-* pdfTeX:                                TeX extensions.      (line  21)
+* PDF:                                   TeX extensions.      (line  20)
+* pdfTeX:                                TeX extensions.      (line  20)
 * permissions, legal:                    Legalisms.           (line   6)
 * PFA and PFB conversion:                Font utilities available elsewhere.
                                                               (line  39)
@@ -4211,7 +4210,7 @@ Index
 * production use:                        Initial and virgin.  (line  20)
 * program name, determines memory dump:  Determining the memory dump to use.
                                                               (line  32)
-* program names, special <1>:            tex invocation.      (line 116)
+* program names, special <1>:            tex invocation.      (line 110)
 * program names, special:                Common options.      (line  45)
 * prologues:                             mpost invocation.    (line 112)
 * prologues, and EPSF output:            mpost invocation.    (line  83)
@@ -4238,7 +4237,7 @@ Index
                                                               (line  39)
 * Regis graphics support:                Online Metafont graphics.
                                                               (line  40)
-* regression testing:                    tex invocation.      (line 121)
+* regression testing:                    tex invocation.      (line 115)
 * repeated rows:                         pktype invocation.   (line  76)
 * representation of strings:             pooltype invocation. (line  30)
 * restricted shell escapes:              Shell escapes.       (line   6)
@@ -4335,8 +4334,7 @@ Index
 * Texinfo:                               Formats.             (line  47)
 * texmf.cnf:                             Path searching.      (line   6)
 * texmfmp.c:                             Online Metafont graphics.
-                                                              (line  77)
-* texmfmp.c and openoutnameok:           tex invocation.      (line  51)
+                                                              (line  80)
 * TEXMFOUTPUT, used if . unwritable:     Output file location.
                                                               (line  19)
 * texput:                                tex invocation.      (line  35)
@@ -4353,7 +4351,7 @@ Index
                                                               (line  30)
 * title font:                            gftodvi invocation.  (line  33)
 * toolkits, X:                           Online Metafont graphics.
-                                                              (line  60)
+                                                              (line  59)
 * torture tests:                         Triptrap.            (line   6)
 * translation file for TeX, specifying:  Common options.      (line  96)
 * translation from WEB to C:             Introduction.        (line  16)
@@ -4380,14 +4378,14 @@ Index
 * typeface specimen sheets:              Font utilities available elsewhere.
                                                               (line  42)
 * typesetting:                           TeX.                 (line   6)
-* Unicode:                               TeX extensions.      (line  15)
-* Unicode input:                         tex invocation.      (line  95)
+* Unicode:                               TeX extensions.      (line  14)
+* Unicode input:                         tex invocation.      (line  89)
 * uniterm:                               Online Metafont graphics.
                                                               (line  50)
 * unsrt.bst:                             Basic BibTeX style files.
                                                               (line  39)
 * using local codepage to display messages: Common options.   (line 108)
-* UTF-8 input:                           tex invocation.      (line  95)
+* UTF-8 input:                           tex invocation.      (line  89)
 * validation, of DVI files:              dvitype invocation.  (line   6)
 * validation, of GF files:               gftype invocation.   (line   6)
 * validation, of PK files:               pktype invocation.   (line   6)
@@ -4427,15 +4425,16 @@ Index
 * X bitmap fonts:                        Font utilities available elsewhere.
                                                               (line  15)
 * X class name for Metafont:             Online Metafont graphics.
-                                                              (line  66)
+                                                              (line  69)
 * x offset:                              pktype invocation.   (line  66)
 * X resources:                           Online Metafont graphics.
-                                                              (line  66)
+                                                              (line  69)
 * X toolkits and Metafont:               Online Metafont graphics.
-                                                              (line  60)
+                                                              (line  59)
 * xampl.bib:                             bibtex invocation.   (line  51)
 * xbfe, bitmap font editor:              Font utilities available elsewhere.
                                                               (line  23)
+* XeTeX:                                 TeX extensions.      (line  31)
 * xfed, bitmap font editor:              Font utilities available elsewhere.
                                                               (line  23)
 * xfedor, bitmap font editor:            Font utilities available elsewhere.
@@ -4443,11 +4442,11 @@ Index
 * Xlib:                                  Online Metafont graphics.
                                                               (line  56)
 * Xlib support:                          Online Metafont graphics.
-                                                              (line  60)
+                                                              (line  59)
 * Xt:                                    Online Metafont graphics.
                                                               (line  56)
 * Xt support:                            Online Metafont graphics.
-                                                              (line  60)
+                                                              (line  59)
 * xterm:                                 Online Metafont graphics.
                                                               (line  56)
 * y offset:                              pktype invocation.   (line  66)
@@ -4456,75 +4455,75 @@ Index
 
 
 Tag Table:
-Node: Top2812
-Node: Introduction3806
-Node: Installation6978
-Node: configure options9142
-Node: Compile-time options11224
-Node: Additional targets12350
-Node: Triptrap13631
-Node: Runtime options15160
-Node: Commonalities16932
-Node: Option conventions17537
-Node: Common options18761
-Node: Path searching23273
-Node: Output file location24295
-Node: Three programs25335
-Node: Initial and virgin26094
-Node: Memory dumps27194
-Node: Creating memory dumps27661
-Node: Determining the memory dump to use28922
-Node: Hardware and memory dumps30546
-Node: Editor invocation33015
-Node: \input filenames33745
-Node: TeX36738
-Node: tex invocation37884
-Node: Initial TeX45257
-Node: Formats46746
-Node: Languages and hyphenation49685
-Node: MLTeX50115
-Node: \charsubdef51610
-Node: \tracingcharsubdef53936
-Node: TCX files54511
-Node: patgen invocation59935
-Node: Shell escapes60652
-Node: IPC and TeX64216
-Node: TeX extensions64786
-Node: Metafont65765
-Node: mf invocation67053
-Node: Initial Metafont70936
-Node: Modes72689
-Node: Online Metafont graphics74945
-Node: gftodvi invocation78218
-Node: mft invocation81040
-Node: MetaPost85095
-Node: mpost invocation85857
-Node: Initial MetaPost90765
-Node: dvitomp invocation92576
-Node: BibTeX93241
-Node: bibtex invocation93602
-Node: Basic BibTeX style files95927
-Node: WEB97269
-Node: tangle invocation98477
-Node: weave invocation100600
-Node: pooltype invocation102008
-Node: DVI utilities103138
-Node: dvicopy invocation104082
-Node: dvitype invocation105380
-Node: dvitype output example107735
-Node: Font utilities110786
-Node: Font file formats111966
-Node: gftopk invocation115265
-Node: pktogf invocation116469
-Node: pktype invocation117648
-Node: gftype invocation120483
-Node: tftopl invocation124999
-Node: pltotf invocation129633
-Node: vftovp invocation130698
-Node: vptovf invocation132982
-Node: Font utilities available elsewhere134036
-Node: Legalisms136444
-Node: References138615
-Node: Index142997
+Node: Top2758
+Node: Introduction3752
+Node: Installation6924
+Node: configure options9088
+Node: Compile-time options11170
+Node: Additional targets12296
+Node: Triptrap13577
+Node: Runtime options15106
+Node: Commonalities16878
+Node: Option conventions17483
+Node: Common options18707
+Node: Path searching23219
+Node: Output file location24241
+Node: Three programs25281
+Node: Initial and virgin26040
+Node: Memory dumps27140
+Node: Creating memory dumps27607
+Node: Determining the memory dump to use28868
+Node: Hardware and memory dumps30492
+Node: Editor invocation32961
+Node: \input filenames33691
+Node: TeX36684
+Node: tex invocation37830
+Node: Initial TeX44800
+Node: Formats46289
+Node: Languages and hyphenation49228
+Node: MLTeX49658
+Node: \charsubdef51153
+Node: \tracingcharsubdef53479
+Node: TCX files54054
+Node: patgen invocation59478
+Node: Shell escapes60195
+Node: IPC and TeX63759
+Node: TeX extensions64329
+Node: Metafont65401
+Node: mf invocation66689
+Node: Initial Metafont70572
+Node: Modes72325
+Node: Online Metafont graphics74581
+Node: gftodvi invocation77996
+Node: mft invocation80818
+Node: MetaPost84873
+Node: mpost invocation85635
+Node: Initial MetaPost90543
+Node: dvitomp invocation92354
+Node: BibTeX93019
+Node: bibtex invocation93380
+Node: Basic BibTeX style files95705
+Node: WEB97047
+Node: tangle invocation98255
+Node: weave invocation100378
+Node: pooltype invocation101786
+Node: DVI utilities102916
+Node: dvicopy invocation103860
+Node: dvitype invocation105158
+Node: dvitype output example107513
+Node: Font utilities110564
+Node: Font file formats111744
+Node: gftopk invocation115043
+Node: pktogf invocation116247
+Node: pktype invocation117426
+Node: gftype invocation120261
+Node: tftopl invocation124777
+Node: pltotf invocation129411
+Node: vftovp invocation130476
+Node: vptovf invocation132760
+Node: Font utilities available elsewhere133814
+Node: Legalisms136222
+Node: References138393
+Node: Index142775
 
 End Tag Table
diff --git a/Build/source/texk/web2c/doc/web2c.texi b/Build/source/texk/web2c/doc/web2c.texi
index e2a9cfe5f20..03aa36a6dcd 100644
--- a/Build/source/texk/web2c/doc/web2c.texi
+++ b/Build/source/texk/web2c/doc/web2c.texi
@@ -415,7 +415,7 @@ name.  @xref{Memory dumps}.
 @cindex file recorder
 Enable the filename recorder.  This makes the program save a list of the
 opened files into a file with (by default) extension @samp{.fls}.  For
-Omega, this option is always on, and the file has extension @samp{.ofl}.
+Aleph, this option is always on, and the file has extension @samp{.ofl}.
 
 @item -translate-file=@var{tcxfile}
 @opindex -translate-file=@var{tcxfile}
@@ -977,30 +977,22 @@ sake of the EC fonts, which can be generated at any size.
 @cindex Trojan horses and @TeX{} programs
 @cindex dot files, written by @TeX{} programs
 @cindex security, and output files
-@flindex texmfmp.c @r{and @code{openoutnameok}}
-@TeX{} can write output files, via the @code{\openout} primitive; this
-opens a security hole vulnerable to Trojan horse attack: an unwitting
-user could run a @TeX{} program that overwrites, say, @file{~/.rhosts}.
-(MetaPost has a @code{write} primitive with similar implications).  To
-alleviate this, there is a configuration variable @code{openout_any},
-which selects one of three levels of security.  When it is set to
-@samp{a} (for ``any''), no restrictions are imposed.  When it is set to
-@samp{r} (for ``restricted''), filenames beginning with @samp{.} are
-disallowed (except @file{.tex} because @LaTeX{} needs it).  When it is set
-to @samp{p} (for ``paranoid'') additional restrictions are imposed: an
-absolute filename must refer to a file in (a subdirectory) of
-@code{TEXMFOUTPUT}, and any attempt to go up a directory level is
-forbidden (that is, paths may not contain a @samp{..}  component).  The
-paranoid setting is the default.  (For backwards compatibility, @samp{y}
-and @samp{1} are synonyms of @samp{a}, while @samp{n} and @samp{0} are
-synonyms for @samp{r}.)
+@TeX{} can write output files, via the @code{\openout} primitive; this opens
+a security hole vulnerable to Trojan horse attack: an unwitting user could
+run a @TeX{} program that overwrites, say, @file{~/.rhosts}.  (MetaPost has
+a @code{write} primitive with similar implications).  To alleviate this and
+similar problems the functions @code{kpathsea_out_name_ok} and
+@code{kpathsea_in_name_ok} from the Kpathse library (@pxref{Calling
+sequence,,, kpathsea, Kpathsea}) are used to determine if a given filename
+is acceptable to be opened for output or input, depending on the setting of
+the configuration variables @code{openout_any} and @code{openin_any}:
+@samp{a} (for ``any'', the default for @code{openin_any}), @samp{r} (for
+``restricted''), or @samp{p} (for ``paranoid'', the default for
+@code{openout_any}).
 
 In any case, all @code{\openout} filenames are recorded in the log file,
 except those opened on the first line of input, which is processed when
-the log file has not yet been opened.  (If you as a @TeX{} administrator
-wish to implement more stringent rules on @code{\openout}, modifying the
-function @code{openoutnameok} in @file{web2c/lib/texmfmp.c} is intended
-to suffice.)
+the log file has not yet been opened.
 
 The program accepts the following options, as well as the standard
 @samp{-help} and @samp{-version} (@pxref{Common options}):
@@ -1741,13 +1733,12 @@ partial list.
 Adds many new primitives, including right-to-left typesetting and more
 registers.  Now frozen.
 
-@item Omega
-@itemx Aleph
-@cindex Omega
+@item Aleph
+@cindex Aleph
 @cindex Unicode
-These add Unicode support, right-to-left typesetting, and more.  Omega
+This adds Unicode support, right-to-left typesetting, and more.  Omega
 was the original program.  Aleph is an updated version with a variety
-of bug fixes, and includes e-@TeX{}.  Neither is actively maintained.
+of bug fixes, and includes e-@TeX{}.  Aleph is not actively maintained.
 
 @item pdf@TeX{}
 @cindex pdf@TeX{}
@@ -1766,6 +1757,12 @@ Based on pdf@TeX{}, this also embeds the Lua programming language
 (@url{http://lua.org}) and opens up the @TeX{} typesetting engine to
 control from Lua.  Home page: @url{http://luatex.org}.
 
+@item Xe@TeX{}
+@cindex Xe@TeX{}
+@cindex Unicode
+This combines the capabilities of Aleph and pdf@TeX{}, and more.
+Home page: FIXME.
+
 @end table
 
 
@@ -2069,8 +2066,8 @@ and the corresponding @code{configure} option(s) in parentheses.
 @vtable @code
 @item epsf
 @cindex Herberts, Mathias
-@opindex --with-epsfwin
-(@samp{--with-epsfwin}) Pseudo-window server for Encapsulated
+@opindex --enable-epsfwin
+(@samp{--enable-epsfwin}) Pseudo-window server for Encapsulated
 PostScript (see @file{web2c/window/epsf.c}). This device produces an
 EPS file containing the graphics which would be displayed online on
 other devices. The name of the EPS file defaults to metafont.eps but
@@ -2078,59 +2075,56 @@ can be changed by setting the MFEPSF environment variable to the new
 filename.  Contributed by Mathias Herberts.
 
 @item hp2627
-@opindex --with-hp2627win
-(@samp{--with-hp2627win}) HP2627a color graphics terminals.
+@opindex --enable-hp2627win
+(@samp{--enable-hp2627win}) HP2627a color graphics terminals.
 
 @item mftalk
-@opindex --with-mftalkwin
-(@samp{--with-mftalkwin}) Generic window server (see
+@opindex --enable-mftalkwin
+(@samp{--enable-mftalkwin}) Generic window server (see
 @file{web2c/window/mftalk.c}).
 
 @item next
 @pindex DrawingServant
-@opindex --with-next
-(@samp{--with-next}) NeXT window system. This requires a separate
+@opindex --enable-next
+(@samp{--enable-next}) NeXT window system. This requires a separate
 program, called @code{DrawingServant}, available separately. See the
 @file{web2c/window/next.c}.
 
 @item regis
-@opindex --with-regiswin
+@opindex --enable-regiswin
 @cindex Regis graphics support
-(@samp{--with-regiswin}) Regis terminals.
+(@samp{--enable-regiswin}) Regis terminals.
 
 @item sun
 @cindex SunView
 @cindex Suntools
-@opindex --with-suntoolswin
+@opindex --enable-suntoolswin
 @flindex sun-gfx.c
-(@samp{--with-suntoolswin}) The old Suntools (not any flavor of X)
+(@samp{--enable-suntoolswin}) The old Suntools (not any flavor of X)
 window system. (You can get the even older SunWindows @code{gfx} system
 by using @file{sun-gfx.c}.)
 
 @item tek
 @cindex Tektronix
-@opindex --with-tektronixwin
-(@samp{--with-tektronixwin}) Tektronix terminals.
+@opindex --enable-tektronixwin
+(@samp{--enable-tektronixwin}) Tektronix terminals.
 
 @cindex Poole, Simon
 @item uniterm
 @cindex Tektronix 4014
-@opindex --with-unitermwin
-(@samp{--with-unitermwin}) Uniterm, Simon Poole's emulator of a smart
+@opindex --enable-unitermwin
+(@samp{--enable-unitermwin}) Uniterm, Simon Poole's emulator of a smart
 Tektronix 4014 terminal.  This may work with regular Tektronix terminals
-as well; it's faster than the driver @samp{--with-tek} selects.
+as well; it's faster than the driver @samp{--enable-tektronixwin} selects.
 
 @vindex NO_X11WIN
 @pindex Xt
 @pindex Xlib
 @item xterm
-@opindex --with-x11win
 @opindex --with-x
-@opindex --with-x11
-(@samp{--with-x11win}, @samp{--with-x}, @samp{--with-x11}) The X window
-system (version 11).
+@samp{--with-x} The X window system (version 11).
 
-@opindex --with-x-toolkit=@var{kit}
+@opindex --with-mf-x-toolkit=@var{kit}
 @cindex toolkits, X
 @cindex X toolkits and Metafont
 @cindex Xt support
@@ -2139,7 +2133,13 @@ There are two variants of the X11 support, one that works with the Xt
 toolkit, and another that works directly with Xlib. The Xt support is
 more efficient and has more functionality, so it is the default. If you
 must use the Xlib support, use @samp{configure --with-x
---with-x-toolkit=no}.
+--with-kf-x-toolkit=no}.
+
+@opindex --disable-mf-nowin
+@cindex non-windows-capable Metafont
+Specify @samp{--disable-mf-nowin} in order not to build a separate
+non-windows-capable Metafont executable @code{mf-nowin} (or
+@code{mf-nowin.exe}).
 
 @cindex X resources
 @cindex X class name for Metafont