mention [e][u]pTeX in list of extended engines

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

2 files changed, 110 insertions, 83 deletions

diff --git a/Build/source/texk/web2c/doc/web2c.info b/Build/source/texk/web2c/doc/web2c.info
index 513ce70d432..601087e854f 100644
--- a/Build/source/texk/web2c/doc/web2c.info
+++ b/Build/source/texk/web2c/doc/web2c.info
@@ -58,7 +58,7 @@ Web2c
 
 This document describes how to install and use the programs in the Web2c
 implementation of the TeX system, especially for Unix systems.  It
-corresponds to Web2c version 2020, released in June 2020.
+corresponds to Web2c version 2020, released in July 2020.
 
 * Menu:
 
@@ -83,7 +83,7 @@ File: web2c.info,  Node: Introduction,  Next: Installation,  Prev: Top,  Up: Top
 1 Introduction
 **************
 
-This manual corresponds to version 2020 of Web2c, released in June 2020.
+This manual corresponds to version 2020 of Web2c, released in July 2020.
 
    "Web2c" is the name of a TeX implementation, originally for Unix, but
 now also running under various operating systems.  By "TeX
@@ -866,9 +866,10 @@ or other special characters, as described in the sections below.
 there is no way to read files whose names contain a '"'.
 
    However, for maximal portability of your document across systems, use
-only the characters 'a'-'z', '0'-'9', and '.'.  Do not use anything but
-simple filenames, since directory separators vary among systems;
-instead, add the necessary directories to the appropriate search path.
+only the characters 'a'-'z', '0'-'9', and at most one '.'.  Do not use
+anything but simple filenames, since directory separators vary among
+systems; instead, add the necessary directories to the appropriate
+search path.
 
 * Menu:
 
@@ -980,7 +981,7 @@ Many other books on TeX, introductory and otherwise, are available.
 * Languages and hyphenation::   TeX supports many human languages.
 * Shell escapes::               Running subprograms from TeX.
 * IPC and TeX::                 DVI output to a socket.
-* TeX extensions::              Changes to the TeX language.
+* TeX extensions::              Additional engines with additional features.
 
 
 File: web2c.info,  Node: tex invocation,  Next: Initial TeX,  Up: TeX
@@ -1596,8 +1597,8 @@ its socket operations.  This may be helpful if you are, well, debugging.
 
 File: web2c.info,  Node: TeX extensions,  Prev: IPC and TeX,  Up: TeX
 
-5.7 TeX extensions
-==================
+5.7 Extended TeX engines
+========================
 
 The base TeX program has been extended in many ways.  Here's a partial
 list.
@@ -1617,18 +1618,22 @@ Aleph
 pdfTeX
      Can produce PDF as well as DVI files.  It also incorporates the
      e-TeX extensions, new primitives for hypertext and
-     micro-typography, reading/writing from pipes, and much more.  Home
-     page: <http://pdftex.org>.
+     micro-typography, reading/writing from pipes, and much more.  In
+     TeX Live, the command 'etex' invokes pdfTeX to make all these
+     additions available with DVI output.  Home page:
+     <http://pdftex.org>.
 
 LuaTeX
      Embeds the Lua programming language (<http://lua.org>) and opens up
-     the TeX typesetting engine to control from Lua.  Also supports
-     Unicode input and OpenType- and system fonts.  Home page:
+     the TeX typesetting engine to control from Lua, starting from the
+     pdfTeX capabilities as a base.  Also natively supports Unicode
+     input and OpenType- and system fonts.  Home page:
      <http://luatex.org>.
 
 XeTeX
      Combines support for Unicode input and OpenType- and system fonts
-     with the capabilities of pdfTeX.  Home page:
+     with the capabilities of pdfTeX, with the exception of the font
+     expansion part of micro-typography.  Home page:
      <https://tug.org/xetex>.
 
 pTeX
@@ -1638,6 +1643,11 @@ upTeX
      Chinese and Korean.  More info: <https://ctan.org/pkg/ptex>,
      <https://ctan.org/pkg/uptex>.
 
+epTeX
+eupTeX
+     Further extends pTeX and upTeX with the e-TeX extensions.  More
+     info: <https://ctan.org/pkg/eptex>, <https://ctan.org/pkg/euptex>.
+
 
 File: web2c.info,  Node: Metafont,  Next: MetaPost,  Prev: TeX,  Up: Top
 
@@ -3851,11 +3861,14 @@ Index
 * Eplain:                                Formats.             (line  54)
 * epsf:                                  Online Metafont graphics.
                                                               (line  19)
+* epTeX:                                 TeX extensions.      (line  51)
 * errors, editor invoked at:             Editor invocation.   (line   6)
 * escapement, horizontal:                pktype invocation.   (line  57)
 * escapement, horizontal <1>:            gftype invocation.   (line 106)
 * escapement, vertical:                  gftype invocation.   (line 106)
 * etex for MetaPost labels:              mpost invocation.    (line  48)
+* etex is pdfTeX:                        TeX extensions.      (line  22)
+* eupTeX:                                TeX extensions.      (line  51)
 * executables, shared initial and virgin: Initial and virgin. (line   6)
 * exit status, of shell escape:          Shell escapes.       (line  34)
 * expanded plain format:                 Formats.             (line  54)
@@ -4030,8 +4043,8 @@ Index
                                                               (line   6)
 * location of texmf.cnf in TeX Live:     Runtime options.     (line  56)
 * log file, BibTeX:                      bibtex invocation.   (line  14)
-* Lua:                                   TeX extensions.      (line  28)
-* LuaTeX:                                TeX extensions.      (line  28)
+* Lua:                                   TeX extensions.      (line  30)
+* LuaTeX:                                TeX extensions.      (line  30)
 * machine dependencies:                  Hardware and memory dumps.
                                                               (line   6)
 * machine-readable, converting property lists to: pltotf invocation.
@@ -4239,7 +4252,7 @@ Index
 * ps2pk:                                 Font utilities available elsewhere.
                                                               (line  35)
 * psfonts.map, read by MetaPost:         mpost invocation.    (line  80)
-* pTeX:                                  TeX extensions.      (line  40)
+* pTeX:                                  TeX extensions.      (line  44)
 * PXL files, explained:                  Font file formats.   (line  39)
 * pxtoch:                                Font utilities available elsewhere.
                                                               (line  23)
@@ -4417,13 +4430,13 @@ Index
                                                               (line  42)
 * typesetting:                           TeX.                 (line   6)
 * Unicode:                               TeX extensions.      (line  15)
-* Unicode <1>:                           TeX extensions.      (line  34)
+* Unicode <1>:                           TeX extensions.      (line  37)
 * Unicode input:                         tex invocation.      (line  86)
 * uniterm:                               Online Metafont graphics.
                                                               (line  50)
 * unsrt.bst:                             Basic BibTeX style files.
                                                               (line  39)
-* upTeX:                                 TeX extensions.      (line  40)
+* upTeX:                                 TeX extensions.      (line  44)
 * UTF-8 input:                           tex invocation.      (line  86)
 * validation, of DVI files:              dvitype invocation.  (line   6)
 * validation, of GF files:               gftype invocation.   (line   6)
@@ -4473,7 +4486,7 @@ Index
 * xampl.bib:                             bibtex invocation.   (line  55)
 * xbfe, bitmap font editor:              Font utilities available elsewhere.
                                                               (line  23)
-* XeTeX:                                 TeX extensions.      (line  34)
+* XeTeX:                                 TeX extensions.      (line  37)
 * xfed, bitmap font editor:              Font utilities available elsewhere.
                                                               (line  23)
 * xfedor, bitmap font editor:            Font utilities available elsewhere.
@@ -4514,58 +4527,58 @@ Node: Determining the memory dump to use29969
 Node: Hardware and memory dumps31546
 Node: Editor invocation33992
 Node: \input filenames34855
-Node: \input quoted filename36396
-Node: \input braced filename37173
-Node: \input filename caveats38103
-Node: TeX39617
-Node: tex invocation40769
-Node: Initial TeX47672
-Node: Formats49036
-Node: Languages and hyphenation51962
-Node: MLTeX52392
-Node: \charsubdef54020
-Node: \tracingcharsubdef56343
-Node: TCX files56918
-Node: patgen invocation62358
-Node: Shell escapes63064
-Node: IPC and TeX66644
-Node: TeX extensions67214
-Node: Metafont68764
-Node: mf invocation70052
-Node: Initial Metafont73889
-Node: Modes75519
-Node: Online Metafont graphics77769
-Node: gftodvi invocation81194
-Node: mft invocation84014
-Node: MetaPost88012
-Node: mpost invocation88848
-Node: Initial MetaPost94024
-Node: dvitomp invocation94946
-Node: BibTeX95611
-Node: bibtex invocation95972
-Node: Basic BibTeX style files98446
-Node: WEB99776
-Node: tangle invocation100985
-Node: weave invocation103108
-Node: pooltype invocation104515
-Node: DVI utilities105645
-Node: dvicopy invocation106579
-Node: dvitype invocation107864
-Node: dvitype output example110195
-Node: Font utilities113248
-Node: Font file formats114428
-Node: gftopk invocation117697
-Node: pktogf invocation118888
-Node: pktype invocation120054
-Node: gftype invocation122877
-Node: tftopl invocation127380
-Node: pltotf invocation131973
-Node: vftovp invocation133024
-Node: vptovf invocation135259
-Node: Font utilities available elsewhere136286
-Node: Legalisms138666
-Node: References140112
-Node: Index144200
+Node: \input quoted filename36408
+Node: \input braced filename37185
+Node: \input filename caveats38115
+Node: TeX39629
+Node: tex invocation40797
+Node: Initial TeX47700
+Node: Formats49064
+Node: Languages and hyphenation51990
+Node: MLTeX52420
+Node: \charsubdef54048
+Node: \tracingcharsubdef56371
+Node: TCX files56946
+Node: patgen invocation62386
+Node: Shell escapes63092
+Node: IPC and TeX66672
+Node: TeX extensions67242
+Node: Metafont69207
+Node: mf invocation70495
+Node: Initial Metafont74332
+Node: Modes75962
+Node: Online Metafont graphics78212
+Node: gftodvi invocation81637
+Node: mft invocation84457
+Node: MetaPost88455
+Node: mpost invocation89291
+Node: Initial MetaPost94467
+Node: dvitomp invocation95389
+Node: BibTeX96054
+Node: bibtex invocation96415
+Node: Basic BibTeX style files98889
+Node: WEB100219
+Node: tangle invocation101428
+Node: weave invocation103551
+Node: pooltype invocation104958
+Node: DVI utilities106088
+Node: dvicopy invocation107022
+Node: dvitype invocation108307
+Node: dvitype output example110638
+Node: Font utilities113691
+Node: Font file formats114871
+Node: gftopk invocation118140
+Node: pktogf invocation119331
+Node: pktype invocation120497
+Node: gftype invocation123320
+Node: tftopl invocation127823
+Node: pltotf invocation132416
+Node: vftovp invocation133467
+Node: vptovf invocation135702
+Node: Font utilities available elsewhere136729
+Node: Legalisms139109
+Node: References140555
+Node: Index144643
 
 End Tag Table
 
diff --git a/Build/source/texk/web2c/doc/web2c.texi b/Build/source/texk/web2c/doc/web2c.texi
index 41a3f29418a..5f9df311bff 100644
--- a/Build/source/texk/web2c/doc/web2c.texi
+++ b/Build/source/texk/web2c/doc/web2c.texi
@@ -12,7 +12,7 @@ The latest version is available from ftp://ftp.tug.org/tex/texinfo.tex.}
 @end tex
 
 @set version 2020
-@set month-year June 2020
+@set month-year July 2020
 
 @c Define new indices for commands in auxiliary files, filenames, and options.
 @defcodeindex cm
@@ -916,10 +916,10 @@ filename; there is no way to read files whose names contain a @code{"}.
 
 @cindex portable filenames
 However, for maximal portability of your document across systems, use
-only the characters @samp{a}--@samp{z}, @samp{0}--@samp{9}, and
-@samp{.}.  Do not use anything but simple filenames, since directory
-separators vary among systems; instead, add the necessary directories
-to the appropriate search path.
+only the characters @samp{a}--@samp{z}, @samp{0}--@samp{9}, and at
+most one @samp{.}.  Do not use anything but simple filenames, since
+directory separators vary among systems; instead, add the necessary
+directories to the appropriate search path.
 
 @menu
 * Quotes: \input quoted filename.   \input "some name"
@@ -1059,7 +1059,7 @@ otherwise, are available.
 * Languages and hyphenation::   TeX supports many human languages.
 * Shell escapes::               Running subprograms from TeX.
 * IPC and TeX::                 DVI output to a socket.
-* TeX extensions::              Changes to the TeX language.
+* TeX extensions::              Additional engines with additional features.
 @end menu
 
 
@@ -1875,7 +1875,7 @@ debugging.
 
 
 @node TeX extensions
-@section @TeX{} extensions
+@section Extended @TeX{} engines
 
 @cindex extensions to @TeX{}
 @cindex @TeX{}, extensions to
@@ -1904,24 +1904,29 @@ More info: @url{https://ctan.org/pkg/aleph}, @url{https://ctan.org/pkg/omega}.
 @cindex PDF
 @cindex micro-typography
 @cindex hypertext
+@pindex etex @r{is pdf@TeX{}}
 Can produce PDF as well as DVI files.  It also incorporates the
 e-@TeX{} extensions, new primitives for hypertext and
-micro-typography, reading/writing from pipes, and much more.  Home
-page: @url{http://pdftex.org}.
+micro-typography, reading/writing from pipes, and much more.  In
+@TeX{} Live, the command @command{etex} invokes pdf@TeX{} to make all
+these additions available with DVI output. Home page:
+@url{http://pdftex.org}.
 
 @item Lua@TeX{}
 @cindex Lua@TeX{}
 @cindex Lua
 Embeds the Lua programming language (@url{http://lua.org}) and opens
-up the @TeX{} typesetting engine to control from Lua.  Also supports
-Unicode input and OpenType- and system fonts. Home page:
+up the @TeX{} typesetting engine to control from Lua, starting from
+the pdf@TeX{} capabilities as a base.  Also natively supports Unicode
+input and OpenType- and system fonts. Home page:
 @url{http://luatex.org}.
 
 @item Xe@TeX{}
 @cindex Xe@TeX{}
 @cindex Unicode
 Combines support for Unicode input and OpenType- and system fonts
-with the capabilities of pdf@TeX{}.
+with the capabilities of pdf@TeX{}, with the exception of the font
+expansion part of micro-typography.
 Home page: @url{https://tug.org/xetex}.
 
 @item p@TeX{}
@@ -1932,6 +1937,15 @@ With additional support for Japanese; p@TeX{} was the original engine,
 and up@TeX{} has native Unicode support and thus is more useful for
 Chinese and Korean. More info: @url{https://ctan.org/pkg/ptex},
 @url{https://ctan.org/pkg/uptex}.
+
+@item ep@TeX{}
+@itemx eup@TeX{}
+@cindex ep@TeX{}
+@cindex eup@TeX{}
+Further extends p@TeX{} and up@TeX{} with the e-@TeX{} extensions.
+More info: @url{https://ctan.org/pkg/eptex},
+@url{https://ctan.org/pkg/euptex}.
+
 @end table