pdftex[847] branches/stable/source/src: sync with tl 57772, still for

commits+karl at tug.org commits+karl at tug.org
Wed Feb 17 20:27:39 CET 2021


Revision: 847
          http://tug.org/svn/pdftex?view=revision&revision=847
Author:   karl
Date:     2021-02-17 20:27:38 +0100 (Wed, 17 Feb 2021)
Log Message:
-----------
sync with tl 57772, still for version numbers

Modified Paths:
--------------
    branches/stable/source/src/texk/web2c/ChangeLog
    branches/stable/source/src/texk/web2c/Makefile.in
    branches/stable/source/src/texk/web2c/am/bootstrap.am
    branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
    branches/stable/source/src/texk/web2c/cwebdir/Makefile
    branches/stable/source/src/texk/web2c/cwebdir/cweave.w
    branches/stable/source/src/texk/web2c/doc/web2c.info
    branches/stable/source/src/texk/web2c/doc/web2c.texi
    branches/stable/source/src/texk/web2c/etexdir/am/etex.am
    branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
    branches/stable/source/src/texk/web2c/pdftexdir/char-warning-pdftex.ch
    branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web
    branches/stable/source/src/texk/web2c/pdftexdir/pdftex_version.h
    branches/stable/source/src/texk/web2c/pdftexdir/pdftexextra.h
    branches/stable/source/src/texk/web2c/web2c/configure
    branches/stable/source/src/utils/configure
    branches/stable/source/src/version.ac

Modified: branches/stable/source/src/texk/web2c/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/ChangeLog	2021-02-17 19:06:29 UTC (rev 846)
+++ branches/stable/source/src/texk/web2c/ChangeLog	2021-02-17 19:27:38 UTC (rev 847)
@@ -1,3 +1,8 @@
+2021-02-16  Andreas Scherer  <https://ascherer.github.io>
+
+	* Makefile.in,
+	* am/bootstrap.am: Main CWEB modules depend on COMMON interface.
+
 2021-02-17  Karl Berry  <karl at tug.org>
 
 	* NEWS,

Modified: branches/stable/source/src/texk/web2c/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/Makefile.in	2021-02-17 19:06:29 UTC (rev 846)
+++ branches/stable/source/src/texk/web2c/Makefile.in	2021-02-17 19:27:38 UTC (rev 847)
@@ -21063,12 +21063,11 @@
 .pin.p:
 	$(cp_silent)cp -f $< $@
 $(tangleboot_OBJECTS): $(tangleboot_DEPENDENCIES)
-ctangle.c: ctangleboot$(EXEEXT) cwebdir/comm-w2c.h cwebdir/ctangle.w cwebdir/ctang-w2c.ch ctangleboot-sh
+ctangle.c: common-ctangle cwebdir/ctangle.w cwebdir/ctang-w2c.ch
 	@$(ctangleboot) ctangle ctang-w2c
-cweb.c: common-ctangle
+cweb.c: common-ctangle cwebdir/common.w cwebdir/comm-w2c.ch
 	@$(ctangleboot) common comm-w2c cweb.c
-common-ctangle: ctangleboot$(EXEEXT) cwebdir/common.w cwebdir/comm-w2c.ch ctangleboot-sh
-	@$(ctangleboot) common comm-w2c cweb.c
+common-ctangle: ctangleboot$(EXEEXT) cwebdir/comm-w2c.h ctangleboot-sh
 $(ctangleboot_OBJECTS): $(ctangleboot_DEPENDENCIES)
 # ctangleboot.cin and cwebboot.cin are in the distribution
 .cin.c:

Modified: branches/stable/source/src/texk/web2c/am/bootstrap.am
===================================================================
--- branches/stable/source/src/texk/web2c/am/bootstrap.am	2021-02-17 19:06:29 UTC (rev 846)
+++ branches/stable/source/src/texk/web2c/am/bootstrap.am	2021-02-17 19:27:38 UTC (rev 847)
@@ -62,12 +62,11 @@
 # ctangle.c and cweb.c are special cases, since they are needed to compile
 # themselves.  We depend on ctangleboot, even though we might not use it.
 ctangleboot = AM_V_P=$(AM_V_P) $(SHELL) ./ctangleboot-sh $@
-ctangle.c: ctangleboot$(EXEEXT) cwebdir/comm-w2c.h cwebdir/ctangle.w cwebdir/ctang-w2c.ch ctangleboot-sh
+ctangle.c: common-ctangle cwebdir/ctangle.w cwebdir/ctang-w2c.ch
 	@$(ctangleboot) ctangle ctang-w2c
-cweb.c: common-ctangle
+cweb.c: common-ctangle cwebdir/common.w cwebdir/comm-w2c.ch
 	@$(ctangleboot) common comm-w2c cweb.c
-common-ctangle: ctangleboot$(EXEEXT) cwebdir/common.w cwebdir/comm-w2c.ch ctangleboot-sh
-	@$(ctangleboot) common comm-w2c cweb.c
+common-ctangle: ctangleboot$(EXEEXT) cwebdir/comm-w2c.h ctangleboot-sh
 EXTRA_DIST += cwebdir
 NEVER_DIST += cwebdir/cweave.log cwebdir/cweave.trs
 NEVER_DIST += cwebdir/ctwill.log cwebdir/ctwill.trs

Modified: branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ChangeLog	2021-02-17 19:06:29 UTC (rev 846)
+++ branches/stable/source/src/texk/web2c/cwebdir/ChangeLog	2021-02-17 19:27:38 UTC (rev 847)
@@ -1,3 +1,11 @@
+2021-02-17  Andreas Scherer  <https://ascherer.github.io>
+
+	* cweave.w: Fix 'Illegal hardware instruction on MacOS.
+
+2021-02-17  Andreas Scherer  <https://ascherer.github.io>
+
+	* Makefile: Main CWEB modules depend on COMMON inteface.
+
 2021-02-16  Andreas Scherer  <https://ascherer.github.io>
 
 	* common.c,

Modified: branches/stable/source/src/texk/web2c/cwebdir/Makefile
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/Makefile	2021-02-17 19:06:29 UTC (rev 846)
+++ branches/stable/source/src/texk/web2c/cwebdir/Makefile	2021-02-17 19:27:38 UTC (rev 847)
@@ -125,7 +125,7 @@
 SAVEcommon.c:
 	$(CP) common.c SAVEcommon.c
 
-common.c: common.w $(CCHANGES)
+common.c: common.w $(CCHANGES) common.h
 	$(CTANGLE) common $(CCHANGES)
 
 common.o: common.c
@@ -134,13 +134,13 @@
 ctangle: ctangle.o common.o
 	$(CC) $(LINKFLAGS) -o ctangle ctangle.o common.o 
 
-ctangle.c: ctangle.w $(TCHANGES)
+ctangle.c: ctangle.w $(TCHANGES) common.h
 	$(CTANGLE) ctangle $(TCHANGES)
 
 cweave: cweave.o common.o
 	$(CC) $(LINKFLAGS) -o cweave cweave.o common.o
 
-cweave.c: cweave.w $(WCHANGES)
+cweave.c: cweave.w $(WCHANGES) common.h prod.w
 	$(CTANGLE) cweave $(WCHANGES)
 
 doc: $(SOURCES:.w=.dvi)

Modified: branches/stable/source/src/texk/web2c/cwebdir/cweave.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweave.w	2021-02-17 19:06:29 UTC (rev 846)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweave.w	2021-02-17 19:27:38 UTC (rev 847)
@@ -1333,7 +1333,7 @@
       if (*j--=='%' && (j==out_buf || *j!='\\')) {
         *b--='%'; break;
       }
-  if (b<out_ptr) strncpy(out_buf+1,b+1,(size_t)(out_ptr-b));
+  if (b<out_ptr) memcpy(out_buf+1,b+1,(size_t)(out_ptr-b));
   out_ptr-=b-out_buf;
 }
 

Modified: branches/stable/source/src/texk/web2c/doc/web2c.info
===================================================================
--- branches/stable/source/src/texk/web2c/doc/web2c.info	2021-02-17 19:06:29 UTC (rev 846)
+++ branches/stable/source/src/texk/web2c/doc/web2c.info	2021-02-17 19:27:38 UTC (rev 847)
@@ -1,10 +1,10 @@
-This is web2c.info, produced by makeinfo version 6.7 from web2c.texi.
+This is web2c.info, produced by makeinfo version 5.1 from web2c.texi.
 
 This file documents the installation and use of the programs in Web2c,
 an implementation of Donald Knuth's TeX system.
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2007, 2008, 2009, 2010-2021 Karl Berry & Olaf Weber.
+2005, 2007, 2008, 2009, 2010-2020 Karl Berry & Olaf Weber.
 
    Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -439,11 +439,6 @@
    TeX, Metafont, and MetaPost have a number of additional options in
 common:
 
-'-cnf-line=STR'
-     Parse STR as if it were a line in the 'texmf.cnf' configuration
-     file, overriding all other settings.  *Note (kpathsea)Path
-     searching options::.
-
 '-file-line-error'
 '-no-file-line-error'
      Change (or do not change) the way error messages are printed.  The
@@ -527,8 +522,7 @@
 '-8bit'
      This option specifies that by default all characters should be
      considered printable.  If '-translate-file' was given as well, then
-     the TCX file may mark characters as non-printable.  This is a no-op
-     in engines supporting native Unicode.
+     the TCX file may mark characters as non-printable.
 
 
 File: web2c.info,  Node: Path searching,  Next: Output file location,  Prev: Common options,  Up: Commonalities
@@ -2425,9 +2419,9 @@
 
 * Menu:
 
-* tangle invocation::
-* weave invocation::
-* pooltype invocation::
+* tangle invocation::           
+* weave invocation::            
+* pooltype invocation::         
 
 
 File: web2c.info,  Node: tangle invocation,  Next: weave invocation,  Up: WEB
@@ -2666,7 +2660,7 @@
 
 * Menu:
 
-* dvitype output example::
+* dvitype output example::      
 
 
 File: web2c.info,  Node: dvitype output example,  Up: dvitype invocation
@@ -3501,8 +3495,8 @@
  [index ]
 * Menu:
 
-* " character, ignored in filenames:     \input filenames.    (line  22)
-* #define options:                       Compile-time options.
+* '"' character, ignored in filenames:   \input filenames.    (line  22)
+* '#define' options:                     Compile-time options.
                                                               (line   6)
 * $ expansion in filenames:              \input filename caveats.
                                                               (line  17)
@@ -3540,14 +3534,13 @@
                                                               (line  59)
 * --with-x:                              Online Metafont graphics.
                                                               (line  57)
-* -8bit:                                 Common options.      (line 110)
+* -8bit:                                 Common options.      (line 105)
 * -base=BASE:                            Determining the memory dump to use.
                                                               (line  15)
-* -base=DUMPNAME:                        Common options.      (line  39)
-* -change=CHFILE:                        mft invocation.      (line  63)
+* -base=DUMPNAME:                        Common options.      (line  34)
+* -change=CHFILE:                        mft invocation.      (line  62)
 * -charcode-format=TYPE:                 tftopl invocation.   (line  27)
 * -charcode-format=TYPE <1>:             vftovp invocation.   (line  30)
-* -cnf-line:                             Common options.      (line  25)
 * -D compiler options:                   Compile-time options.
                                                               (line   6)
 * -disable-write18:                      tex invocation.      (line 127)
@@ -3554,22 +3547,22 @@
 * -dpi=REAL:                             dvitype invocation.  (line  24)
 * -enable-write18:                       tex invocation.      (line 126)
 * -enc:                                  tex invocation.      (line  86)
-* -file-line-error:                      Common options.      (line  30)
-* -file-line-error-style:                Common options.      (line  31)
-* -fmt=DUMPNAME:                         Common options.      (line  39)
+* -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  69)
-* -halt-on-error:                        Common options.      (line  46)
+* -halt-on-error:                        Common options.      (line  41)
 * -images:                               gftype invocation.   (line  26)
-* -ini:                                  Common options.      (line  50)
+* -ini:                                  Common options.      (line  45)
 * -ini <1>:                              Initial and virgin.  (line  10)
-* -interaction=STRING:                   Common options.      (line  55)
+* -interaction=STRING:                   Common options.      (line  50)
 * -ipc:                                  tex invocation.      (line  92)
 * -ipc-start:                            tex invocation.      (line  92)
-* -jobname=STRING:                       Common options.      (line  60)
-* -kpathsea-debug=NUMBER:                Common options.      (line  64)
+* -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)
@@ -3577,7 +3570,7 @@
 * -magnification=INTEGER <1>:            dvitype invocation.  (line  28)
 * -max-pages=N:                          dvicopy invocation.  (line  25)
 * -max-pages=N <1>:                      dvitype invocation.  (line  33)
-* -mem=DUMPNAME:                         Common options.      (line  39)
+* -mem=DUMPNAME:                         Common options.      (line  34)
 * -min-crossrefs=N:                      bibtex invocation.   (line  31)
 * -mixedcase:                            tangle invocation.   (line  35)
 * -mktex=FILETYPE:                       tex invocation.      (line 102)
@@ -3584,13 +3577,13 @@
 * -mktex=FILETYPE <1>:                   mf invocation.       (line  87)
 * -mltex:                                tex invocation.      (line 107)
 * -mnemonics:                            gftype invocation.   (line  29)
-* -no-file-line-error:                   Common options.      (line  31)
+* -no-file-line-error:                   Common options.      (line  26)
 * -no-mktex=FILETYPE:                    tex invocation.      (line 102)
 * -no-mktex=FILETYPE <1>:                mf invocation.       (line  87)
-* -no-parse-first-line:                  Common options.      (line  77)
+* -no-parse-first-line:                  Common options.      (line  72)
 * -no-shell-escape:                      tex invocation.      (line 120)
 * -output-comment=STRING:                tex invocation.      (line 112)
-* -output-directory:                     Common options.      (line  71)
+* -output-directory:                     Common options.      (line  66)
 * -output-directory <1>:                 Output file location.
                                                               (line  15)
 * -output-level=N:                       dvitype invocation.  (line  36)
@@ -3597,20 +3590,20 @@
 * -overflow-label-offset=POINTS:         gftodvi invocation.  (line  59)
 * -page-start=PAGE-SPEC:                 dvicopy invocation.  (line  28)
 * -page-start=PAGE-SPEC <1>:             dvitype invocation.  (line  46)
-* -parse-first-line:                     Common options.      (line  76)
-* -progname=STRING:                      Common options.      (line  82)
+* -parse-first-line:                     Common options.      (line  71)
+* -progname=STRING:                      Common options.      (line  77)
 * -progname=STRING <1>:                  Determining the memory dump to use.
                                                               (line  17)
-* -recorder:                             Common options.      (line  89)
+* -recorder:                             Common options.      (line  84)
 * -shell-escape:                         tex invocation.      (line 119)
 * -shell-restricted:                     tex invocation.      (line 121)
 * -show-opcodes:                         dvitype invocation.  (line  52)
 * -strict:                               tangle invocation.   (line  46)
-* -style=MFTFILE:                        mft invocation.      (line  67)
+* -style=MFTFILE:                        mft invocation.      (line  66)
 * -T:                                    mpost invocation.    (line 115)
 * -terse:                                bibtex invocation.   (line  28)
 * -tex=TEXPROGRAM:                       mpost invocation.    (line 118)
-* -translate-file=TCXFILE:               Common options.      (line 103)
+* -translate-file=TCXFILE:               Common options.      (line  98)
 * -troff:                                mpost invocation.    (line 115)
 * -underline:                            tangle invocation.   (line  41)
 * -uppercase:                            tangle invocation.   (line  35)
@@ -3626,10 +3619,10 @@
 * .fmt:                                  Initial TeX.         (line   6)
 * .mf:                                   mf invocation.       (line  24)
 * .mp:                                   mpost invocation.    (line  30)
-* .mps files and PDF:                    mpost invocation.    (line  86)
+* '.mps' files and PDF:                  mpost invocation.    (line  86)
 * .NNN PostScript figures:               mpost invocation.    (line  35)
 * .NNNgf generic fonts:                  mf invocation.       (line  34)
-* .tcx character translation files:      Common options.      (line 103)
+* .tcx character translation files:      Common options.      (line  98)
 * .tcx character translation files <1>:  TCX files.           (line   6)
 * .tex:                                  tex invocation.      (line  20)
 * .tfm output:                           mf invocation.       (line  43)
@@ -3639,8 +3632,8 @@
 * .Xresources:                           Online Metafont graphics.
                                                               (line  69)
 * 2602gf:                                mf invocation.       (line  48)
-* 8 bit clean:                           Common options.      (line 110)
-* 8 bit clean output, specifying:        Common options.      (line 110)
+* 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)
@@ -3650,12 +3643,12 @@
 * \font and dynamic generation:          tex invocation.      (line  41)
 * \fontdimen:                            tftopl invocation.   (line  99)
 * \immediate\write18:                    Shell escapes.       (line   6)
-* \input braced (grouped) filename:      \input braced filename.
+* '\input' braced (grouped) filename:    \input braced filename.
                                                               (line   6)
-* \input filename caveats:               \input filename caveats.
+* '\input' filename caveats:             \input filename caveats.
                                                               (line   6)
 * \input filenames:                      \input filenames.    (line   6)
-* \input quoted filename:                \input quoted filename.
+* '\input' quoted filename:              \input quoted filename.
                                                               (line   6)
 * \input, and pipes:                     Shell escapes.       (line  64)
 * \mag:                                  dvicopy invocation.  (line  20)
@@ -3663,9 +3656,9 @@
 * \openin, and pipes:                    Shell escapes.       (line  64)
 * \openout and security:                 tex invocation.      (line  48)
 * \openout, and pipes:                   Shell escapes.       (line  64)
-* \output routine, and \write:           Shell escapes.       (line  28)
+* \output routine, and '\write':         Shell escapes.       (line  28)
 * \pdfshellescape:                       Shell escapes.       (line  64)
-* \string, and \input filenames:         \input filename caveats.
+* \string, and '\input filenames':       \input filename caveats.
                                                               (line  29)
 * \tracingcharsubdef and MLTeX:          \tracingcharsubdef.  (line   6)
 * \tracinglostchars and MLTeX:           \tracingcharsubdef.  (line  11)
@@ -3732,10 +3725,10 @@
                                                               (line   6)
 * BigEndian machines:                    Hardware and memory dumps.
                                                               (line   6)
-* binaries, linking:                     Common options.      (line  82)
+* binaries, linking:                     Common options.      (line  77)
 * blank lines, in TCX files:             TCX files.           (line  66)
 * boxes, memory for:                     Runtime options.     (line  20)
-* braced filename for \input:            \input braced filename.
+* braced filename for '\input':          \input braced filename.
                                                               (line   6)
 * breakpoints, memory for:               Runtime options.     (line  20)
 * Breitenlohner, Peter:                  Introduction.        (line   9)
@@ -3749,12 +3742,12 @@
 * byte swapping:                         Hardware and memory dumps.
                                                               (line  13)
 * c-sources Makefile target:             Additional targets.  (line  12)
-* caveats for \input filenames:          \input filename caveats.
+* caveats for '\input' filenames:        \input filename caveats.
                                                               (line   6)
-* change files, and MFT:                 mft invocation.      (line  63)
+* change files, and MFT:                 mft invocation.      (line  62)
 * change files, and Tangle:              tangle invocation.   (line  11)
 * change files, and Weave:               weave invocation.    (line  14)
-* changing error messages style:         Common options.      (line  31)
+* changing error messages style:         Common options.      (line  26)
 * character codes, in GFtype output:     gftype invocation.   (line  79)
 * character codes, in PKtype output:     pktype invocation.   (line  47)
 * character codes, in TCX files:         TCX files.           (line  77)
@@ -3771,7 +3764,7 @@
                                                               (line  69)
 * cm.base:                               Initial Metafont.    (line  26)
 * cmbase.mf:                             Initial Metafont.    (line  26)
-* cmbase.mft:                            mft invocation.      (line  73)
+* cmbase.mft:                            mft invocation.      (line  72)
 * cmmf.base not recommended:             Initial Metafont.    (line  26)
 * color, in DVItoMP:                     dvitomp invocation.  (line  15)
 * comments, in TCX files:                TCX files.           (line  70)
@@ -3784,7 +3777,7 @@
                                                               (line   6)
 * Computer Modern fonts, and Troff:      mpost invocation.    (line  65)
 * Computer Modern macros:                Initial Metafont.    (line  26)
-* Computer Modern Typefaces, production of: mft invocation.   (line  73)
+* 'Computer Modern Typefaces', production of: mft invocation. (line  72)
 * configuration:                         Installation.        (line   6)
 * configuration file reading:            Path searching.      (line   6)
 * configuration file values:             Runtime options.     (line   6)
@@ -3815,7 +3808,7 @@
 * date and time, in memory dumps:        Hardware and memory dumps.
                                                               (line  30)
 * debugging DVI utilities:               dvitype invocation.  (line  52)
-* debugging flags, specifying:           Common options.      (line  64)
+* debugging flags, specifying:           Common options.      (line  59)
 * decimal character codes, in TCX files: TCX files.           (line  77)
 * dependencies, hardware:                Hardware and memory dumps.
                                                               (line   6)
@@ -3832,7 +3825,7 @@
 * downloading of fonts for MetaPost labels: mpost invocation. (line  70)
 * DrawingServant:                        Online Metafont graphics.
                                                               (line  35)
-* dump file:                             Common options.      (line  39)
+* dump file:                             Common options.      (line  34)
 * dumping memory:                        Memory dumps.        (line   6)
 * DVI comment, specifying:               tex invocation.      (line 112)
 * DVI files, converting to MPX:          dvitomp invocation.  (line   6)
@@ -3850,12 +3843,12 @@
 * dx horizontal escapement <1>:          gftype invocation.   (line 106)
 * dy vertical escapement:                gftype invocation.   (line 106)
 * dynamic array allocation:              Runtime options.     (line  45)
-* dynamic Metafont mode definitions with smode: Modes.        (line  28)
+* dynamic Metafont mode definitions with 'smode': Modes.      (line  28)
 * dynamic packing variable:              pktype invocation.   (line  44)
 * e response at error prompt:            Editor invocation.   (line   6)
 * e-circumflex:                          \charsubdef.         (line  20)
 * e-TeX:                                 TeX extensions.      (line  10)
-* e.mft:                                 mft invocation.      (line  73)
+* e.mft:                                 mft invocation.      (line  72)
 * EC fonts:                              tex invocation.      (line  41)
 * EC fonts <1>:                          mf invocation.       (line  24)
 * editing of bitmap fonts:               Font utilities available elsewhere.
@@ -3883,7 +3876,7 @@
 * expanded plain format:                 Formats.             (line  54)
 * expand_depth:                          Runtime options.     (line  24)
 * expansion limit, recursive:            Runtime options.     (line  25)
-* expansion, and \input filenames:       \input filename caveats.
+* expansion, and '\input' filenames:     \input filename caveats.
                                                               (line   6)
 * extensions to TeX:                     TeX extensions.      (line   6)
 * extra_mem_bot:                         Runtime options.     (line  19)
@@ -3892,10 +3885,10 @@
 * FAMILY property <1>:                   tftopl invocation.   (line  99)
 * Ferguson, Michael:                     MLTeX.               (line   6)
 * file formats for fonts:                Font file formats.   (line   6)
-* file recorder:                         Common options.      (line  89)
+* 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 103)
+* filenames starting with '-':           Option conventions.  (line  19)
+* first line of the main input file:     Common options.      (line  98)
 * fixed-point arithmetic:                Compile-time options.
                                                               (line  21)
 * FIXPT:                                 Compile-time options.
@@ -3958,7 +3951,7 @@
 * glue, memory for:                      Runtime options.     (line  20)
 * glyph substitutions:                   MLTeX.               (line   6)
 * gray font:                             gftodvi invocation.  (line  29)
-* group-delimited filename for \input:   \input braced filename.
+* group-delimited filename for '\input': \input braced filename.
                                                               (line   6)
 * Gruff, Billy Goat:                     Triptrap.            (line   6)
 * gsftopk:                               Font utilities available elsewhere.
@@ -4001,7 +3994,7 @@
 * il1-t1.tcx:                            TCX files.           (line  48)
 * il2-t1.tcx:                            TCX files.           (line  48)
 * Info format:                           Formats.             (line  47)
-* initial form, enabling:                Common options.      (line  50)
+* 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  19)
@@ -4013,8 +4006,8 @@
 * install-formats Make target:           Additional targets.  (line  17)
 * install-mems Make target:              Additional targets.  (line  34)
 * installation:                          Installation.        (line   6)
-* interaction between TCX files and -8bit.: TCX files.        (line 104)
-* interaction mode:                      Common options.      (line  55)
+* interaction between TCX files and '-8bit'.: TCX files.      (line 104)
+* interaction mode:                      Common options.      (line  50)
 * international characters:              TCX files.           (line   6)
 * introduction:                          Introduction.        (line   6)
 * IPC:                                   IPC and TeX.         (line   6)
@@ -4021,12 +4014,12 @@
 * IPC_DEBUG:                             Compile-time options.
                                                               (line  28)
 * IPC_DEBUG <1>:                         IPC and TeX.         (line  13)
-* job name:                              Common options.      (line  60)
+* job name:                              Common options.      (line  55)
 * kerning table, in TFM files:           tftopl invocation.   (line 101)
 * keyboard character code, translating:  TCX files.           (line 101)
 * Knuth, Donald E.:                      Introduction.        (line   9)
 * Knuth, Donald E. <1>:                  mft invocation.      (line  56)
-* KPATHSEA_DEBUG:                        Common options.      (line  64)
+* KPATHSEA_DEBUG:                        Common options.      (line  59)
 * KRN property:                          tftopl invocation.   (line 101)
 * label font:                            gftodvi invocation.  (line  36)
 * LABEL property:                        tftopl invocation.   (line 101)
@@ -4044,13 +4037,13 @@
 * LIG property:                          tftopl invocation.   (line 101)
 * ligature table, in TFM files:          tftopl invocation.   (line 101)
 * LIGTABLE property:                     tftopl invocation.   (line 101)
-* linking binaries:                      Common options.      (line  82)
+* linking binaries:                      Common options.      (line  77)
 * links to binaries:                     Determining the memory dump to use.
                                                               (line  30)
 * literate programming:                  WEB.                 (line   6)
 * LittleEndian machines:                 Hardware and memory dumps.
                                                               (line   6)
-* location of texmf.cnf in TeX Live:     Runtime options.     (line  56)
+* location of 'texmf.cnf' in TeX Live:   Runtime options.     (line  56)
 * log file, BibTeX:                      bibtex invocation.   (line  14)
 * Lua:                                   TeX extensions.      (line  30)
 * LuaTeX:                                TeX extensions.      (line  30)
@@ -4106,7 +4099,7 @@
                                                               (line  15)
 * MetaPost input files:                  mpost invocation.    (line  30)
 * MetaPost invocation:                   mpost invocation.    (line   6)
-* MetaPost source, prettyprinting:       mft invocation.      (line  79)
+* MetaPost source, prettyprinting:       mft invocation.      (line  78)
 * MetaPost, initial:                     Initial MetaPost.    (line   6)
 * MetaPost, TeX, and Metafont:           Three programs.      (line   6)
 * metatype1:                             Font utilities available elsewhere.
@@ -4132,7 +4125,7 @@
 * modes.mf recommended modes file:       Modes.               (line  10)
 * mode_def:                              Modes.               (line  15)
 * mode_setup:                            Modes.               (line  15)
-* modifying texmf.cnf in TeX Live:       Runtime options.     (line  56)
+* modifying 'texmf.cnf' in TeX Live:     Runtime options.     (line  56)
 * Morgan, Tim:                           Introduction.        (line  43)
 * Morris, Bob:                           Introduction.        (line  54)
 * MPEDIT:                                Editor invocation.   (line  10)
@@ -4147,7 +4140,7 @@
 * mptrap.readme:                         Triptrap.            (line   6)
 * MPX files, converting from DVI files:  dvitomp invocation.  (line   6)
 * Multi-lingual TeX:                     MLTeX.               (line   6)
-* multiple spaces, and \input filenames: \input filename caveats.
+* multiple spaces, and '\input' filenames: \input filename caveats.
                                                               (line   6)
 * N tilde:                               \charsubdef.         (line  36)
 * new graphics support for Metafont:     Online Metafont graphics.
@@ -4171,7 +4164,7 @@
 * optical font scaling:                  Font file formats.   (line  21)
 * option conventions:                    Option conventions.  (line   6)
 * origin:                                pktype invocation.   (line  66)
-* output directory, specifying:          Common options.      (line  71)
+* output directory, specifying:          Common options.      (line  66)
 * output directory, specifying <1>:      Output file location.
                                                               (line  15)
 * output file location:                  Output file location.
@@ -4183,13 +4176,13 @@
 * packet length:                         pktype invocation.   (line  50)
 * page, starting:                        dvicopy invocation.  (line  28)
 * page, starting <1>:                    dvitype invocation.  (line  46)
-* parsing the first line:                Common options.      (line  77)
+* 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  64)
+* path searching debugging:              Common options.      (line  59)
 * PDF:                                   TeX extensions.      (line  22)
-* PDF, and .mps files:                   mpost invocation.    (line  86)
+* PDF, and '.mps' files:                 mpost invocation.    (line  86)
 * pdfTeX:                                TeX extensions.      (line  22)
 * permissions, legal:                    Legalisms.           (line   6)
 * PFA and PFB conversion:                Font utilities available elsewhere.
@@ -4222,7 +4215,7 @@
 * plain.bst:                             Basic BibTeX style files.
                                                               (line  11)
 * plain.fmt:                             Initial TeX.         (line  13)
-* plain.mft:                             mft invocation.      (line  67)
+* plain.mft:                             mft invocation.      (line  66)
 * pltotf:                                pltotf invocation.   (line   6)
 * pool file, writing:                    tangle invocation.   (line  16)
 * Poole, Simon:                          Online Metafont graphics.
@@ -4248,8 +4241,8 @@
 * production use:                        Initial and virgin.  (line  15)
 * program name, determines memory dump:  Determining the memory dump to use.
                                                               (line  30)
-* program names, special:                Common options.      (line  50)
-* program names, special <1>:            Common options.      (line  82)
+* program names, special:                Common options.      (line  45)
+* program names, special <1>:            Common options.      (line  77)
 * program names, special <2>:            tex invocation.      (line 107)
 * prologues:                             mpost invocation.    (line 115)
 * prologues, and EPSF output:            mpost invocation.    (line  80)
@@ -4265,7 +4258,7 @@
 * PXL files, explained:                  Font file formats.   (line  39)
 * pxtoch:                                Font utilities available elsewhere.
                                                               (line  23)
-* quoted filename for \input:            \input quoted filename.
+* quoted filename for '\input':          \input quoted filename.
                                                               (line   6)
 * Raichle, Bernd:                        MLTeX.               (line   6)
 * reading, additional:                   Introduction.        (line  62)
@@ -4300,8 +4293,8 @@
                                                               (line  42)
 * security, and output files:            tex invocation.      (line  48)
 * security, and shell escapes:           Shell escapes.       (line   6)
-* security, and write:                   mpost invocation.    (line  92)
-* security, and \openout:                tex invocation.      (line  48)
+* security, and 'write':                 mpost invocation.    (line  92)
+* security, and '\openout':              tex invocation.      (line  48)
 * segmentation fault:                    Runtime options.     (line  25)
 * shapes:                                Metafont.            (line   6)
 * sharing memory dumps:                  Hardware and memory dumps.
@@ -4327,13 +4320,13 @@
 * starting page <1>:                     dvitype invocation.  (line  46)
 * Steele Jr., Guy L.:                    Hardware and memory dumps.
                                                               (line  34)
-* stopping at the first error:           Common options.      (line  46)
+* stopping at the first error:           Common options.      (line  41)
 * strategy, overall:                     Introduction.        (line  17)
 * string numbers, displaying:            pooltype invocation. (line   6)
 * string pool, writing:                  tangle invocation.   (line  16)
 * string representation:                 pooltype invocation. (line  30)
 * style design, for BibTeX:              bibtex invocation.   (line  49)
-* style files:                           mft invocation.      (line  67)
+* style files:                           mft invocation.      (line  66)
 * substitutions of font glyphs:          MLTeX.               (line   6)
 * sun:                                   Online Metafont graphics.
                                                               (line  42)
@@ -4350,7 +4343,7 @@
 * system C library function:             Shell escapes.       (line   6)
 * system command:                        Shell escapes.       (line   6)
 * T1 encoding and ISO input:             TCX files.           (line  48)
-* tabs, and \input filenames:            \input filename caveats.
+* tabs, and '\input' filenames:          \input filename caveats.
                                                               (line   6)
 * Tachikawa, Elizabeth:                  Font file formats.   (line  62)
 * tangle:                                tangle invocation.   (line   6)
@@ -4392,7 +4385,7 @@
                                                               (line  79)
 * TEXMFOUTPUT, used for reading:         Output file location.
                                                               (line  25)
-* TEXMFOUTPUT, used if . unwritable:     Output file location.
+* TEXMFOUTPUT, used if '.' unwritable:   Output file location.
                                                               (line  19)
 * texmf_casefold_search:                 Runtime options.     (line  42)
 * texput:                                tex invocation.      (line  33)
@@ -4407,12 +4400,12 @@
 * time and date, in memory dumps:        Hardware and memory dumps.
                                                               (line  30)
 * title font:                            gftodvi invocation.  (line  33)
-* tokenization, and \input filenames:    \input filename caveats.
+* tokenization, and '\input' filenames:  \input filename caveats.
                                                               (line   6)
 * toolkits, X:                           Online Metafont graphics.
                                                               (line  59)
 * torture tests:                         Triptrap.            (line   6)
-* translation file for TeX, specifying:  Common options.      (line 103)
+* 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)
@@ -4525,73 +4518,68 @@
 Node: Commonalities15122
 Node: Option conventions15655
 Node: Common options16878
-Node: Path searching21494
-Node: Output file location22466
-Node: Three programs23768
-Node: Runtime options24475
-Node: Initial and virgin27616
-Node: Memory dumps28565
-Node: Creating memory dumps29017
-Node: Determining the memory dump to use30224
-Node: Hardware and memory dumps31801
-Node: Editor invocation34247
-Node: \input filenames35110
-Node: \input quoted filename36663
-Node: \input braced filename37440
-Node: \input filename caveats38370
-Node: TeX39884
-Node: tex invocation41052
-Node: Initial TeX47955
-Node: Formats49319
-Node: Languages and hyphenation52245
-Node: MLTeX52675
-Node: \charsubdef54303
-Node: \tracingcharsubdef56626
-Node: TCX files57201
-Node: patgen invocation62641
-Node: Shell escapes63347
-Node: IPC and TeX66927
-Node: TeX extensions67497
-Node: Metafont69462
-Node: mf invocation70750
-Node: Initial Metafont74587
-Node: Modes76217
-Node: Online Metafont graphics78467
-Node: gftodvi invocation81892
-Node: mft invocation84712
-Node: MetaPost88710
-Node: mpost invocation89546
-Node: Initial MetaPost94722
-Node: dvitomp invocation95644
-Node: BibTeX96309
-Node: bibtex invocation96670
-Node: Basic BibTeX style files99144
-Node: WEB100474
-Node: tangle invocation101683
-Node: weave invocation103806
-Node: pooltype invocation105213
-Node: DVI utilities106343
-Node: dvicopy invocation107277
-Node: dvitype invocation108562
-Node: dvitype output example110893
-Node: Font utilities113946
-Node: Font file formats115126
-Node: gftopk invocation118395
-Node: pktogf invocation119586
-Node: pktype invocation120752
-Node: gftype invocation123575
-Node: tftopl invocation128078
-Node: pltotf invocation132671
-Node: vftovp invocation133722
-Node: vptovf invocation135957
-Node: Font utilities available elsewhere136984
-Node: Legalisms139364
-Node: References140810
-Node: Index144898
+Node: Path searching21258
+Node: Output file location22230
+Node: Three programs23532
+Node: Runtime options24239
+Node: Initial and virgin27380
+Node: Memory dumps28329
+Node: Creating memory dumps28781
+Node: Determining the memory dump to use29988
+Node: Hardware and memory dumps31565
+Node: Editor invocation34011
+Node: \input filenames34874
+Node: \input quoted filename36427
+Node: \input braced filename37204
+Node: \input filename caveats38134
+Node: TeX39648
+Node: tex invocation40816
+Node: Initial TeX47719
+Node: Formats49083
+Node: Languages and hyphenation52009
+Node: MLTeX52439
+Node: \charsubdef54067
+Node: \tracingcharsubdef56390
+Node: TCX files56965
+Node: patgen invocation62405
+Node: Shell escapes63111
+Node: IPC and TeX66691
+Node: TeX extensions67261
+Node: Metafont69226
+Node: mf invocation70514
+Node: Initial Metafont74351
+Node: Modes75981
+Node: Online Metafont graphics78231
+Node: gftodvi invocation81656
+Node: mft invocation84476
+Node: MetaPost88474
+Node: mpost invocation89310
+Node: Initial MetaPost94486
+Node: dvitomp invocation95408
+Node: BibTeX96073
+Node: bibtex invocation96434
+Node: Basic BibTeX style files98908
+Node: WEB100238
+Node: tangle invocation101479
+Node: weave invocation103602
+Node: pooltype invocation105009
+Node: DVI utilities106139
+Node: dvicopy invocation107073
+Node: dvitype invocation108358
+Node: dvitype output example110695
+Node: Font utilities113748
+Node: Font file formats114928
+Node: gftopk invocation118197
+Node: pktogf invocation119388
+Node: pktype invocation120554
+Node: gftype invocation123377
+Node: tftopl invocation127880
+Node: pltotf invocation132473
+Node: vftovp invocation133524
+Node: vptovf invocation135759
+Node: Font utilities available elsewhere136786
+Node: Legalisms139166
+Node: References140612
+Node: Index144700
 
 End Tag Table
-
-
-Local Variables:
-coding: utf-8
-End:

Modified: branches/stable/source/src/texk/web2c/doc/web2c.texi
===================================================================
--- branches/stable/source/src/texk/web2c/doc/web2c.texi	2021-02-17 19:06:29 UTC (rev 846)
+++ branches/stable/source/src/texk/web2c/doc/web2c.texi	2021-02-17 19:27:38 UTC (rev 847)
@@ -63,7 +63,7 @@
 an implementation of Donald Knuth's TeX system.
 
 Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2007, 2008, 2009, 2010-2021 Karl Berry & Olaf Weber.
+2004, 2005, 2007, 2008, 2009, 2010-2020 Karl Berry & Olaf Weber.
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -93,7 +93,7 @@
 @subtitle @value{month-year}
 @author Karl Berry
 @author Olaf Weber
- at author @url{https://tug.org/web2c}
+ at author @url{http://tug.org/web2c}
 
 @page
 @vskip 0pt plus 1filll
@@ -162,6 +162,7 @@
 @cindex licensing terms
 @cindex freedom of Web2c
 @cindex ice cream
+ at cindex Henry, Patrick
 Availability: All of Web2c is freely available---``free'' both in the
 sense of no cost (free ice cream) and of having the source code to
 modify and/or redistribute (free speech).  @xref{unixtex.ftp,,,
@@ -315,12 +316,6 @@
 common:
 
 @table @samp
- at item -cnf-line=@var{str}
- at opindex -cnf-line
-Parse @var{str} as if it were a line in the @file{texmf.cnf}
-configuration file, overriding all other settings.  @xref{Path
-searching options,,,kpathsea,Kpathsea}.
-
 @item -file-line-error
 @opindex -file-line-error
 @itemx -no-file-line-error
@@ -444,8 +439,7 @@
 @flindex 8 bit clean output, specifying
 This option specifies that by default all characters should be
 considered printable.  If @samp{-translate-file} was given as well, then the
-TCX file may mark characters as non-printable.  This is a no-op in
-engines supporting native Unicode.
+TCX file may mark characters as non-printable.
 
 @end table
 

Modified: branches/stable/source/src/texk/web2c/etexdir/am/etex.am
===================================================================
--- branches/stable/source/src/texk/web2c/etexdir/am/etex.am	2021-02-17 19:06:29 UTC (rev 846)
+++ branches/stable/source/src/texk/web2c/etexdir/am/etex.am	2021-02-17 19:27:38 UTC (rev 847)
@@ -1,4 +1,4 @@
-## $Id$
+## $Id: etex.am 57769 2021-02-17 03:03:54Z karl $
 ## texk/web2c/etexdir/am/etex.am: Makefile fragment for e-TeX.
 ##
 ## Copyright 2015-2021 Karl Berry <tex-live at tug.org>

Modified: branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog	2021-02-17 19:06:29 UTC (rev 846)
+++ branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog	2021-02-17 19:27:38 UTC (rev 847)
@@ -1,3 +1,12 @@
+2021-02-17  Karl Berry  <karl at tug.org>
+
+        * NEWS,
+        * pdftex_version.h,
+        * pdftex.web (pdftex_revision, pdftex_version_string):
+        version [1.40.]22 for TL21.
+
+	* char-warning-pdftex.ch: doc tweak.
+	
 2021-02-13  Karl Berry  <karl at freefriends.org>
 
 	* am/pdftex.am (pdftex_ch_srcs): adjust for split enctex changes.

Modified: branches/stable/source/src/texk/web2c/pdftexdir/char-warning-pdftex.ch
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/char-warning-pdftex.ch	2021-02-17 19:06:29 UTC (rev 846)
+++ branches/stable/source/src/texk/web2c/pdftexdir/char-warning-pdftex.ch	2021-02-17 19:27:38 UTC (rev 847)
@@ -1,4 +1,4 @@
-% $Id: char-warning-pdftex.ch 55874 2020-07-19 15:42:51Z karl $
+% $Id: char-warning-pdftex.ch 57769 2021-02-17 03:03:54Z karl $
 % Public domain (from David Jones, tex-implementors 30jun2020).
 % Unfortunately this cannot be in pdftex.ch since the ordering
 % of changes gets messed up.
@@ -14,7 +14,7 @@
 % should get:
 %   ! Missing character: There is no c ("63) in font logo10.
 
- at x [30] If \tracinglostchars > 2, then promote full errors.
+ at x [30] If \tracinglostchars > 2, then promote to full error.
 @p procedure char_warning(@!f:internal_font_number;@!c:eight_bits);
 var old_setting: integer; {saved value of |tracing_online|}
 begin if tracing_lost_chars>0 then

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web	2021-02-17 19:06:29 UTC (rev 846)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web	2021-02-17 19:27:38 UTC (rev 847)
@@ -307,8 +307,8 @@
   {printed when \eTeX\ starts}
 @#
 @d pdftex_version==140 { \.{\\pdftexversion} }
- at d pdftex_revision=="21" { \.{\\pdftexrevision} }
- at d pdftex_version_string=='-1.40.21' {current \pdfTeX\ version}
+ at d pdftex_revision=="22" { \.{\\pdftexrevision} }
+ at d pdftex_version_string=='-1.40.22' {current \pdfTeX\ version}
 @#
 @d pdfTeX_banner=='This is pdfTeX, Version 3.141592653',eTeX_version_string,pdftex_version_string
    {printed when \pdfTeX\ starts}

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftex_version.h
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftex_version.h	2021-02-17 19:06:29 UTC (rev 846)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftex_version.h	2021-02-17 19:27:38 UTC (rev 847)
@@ -1 +1 @@
-#define PDFTEX_VERSION "1.40.21"
+#define PDFTEX_VERSION "1.40.22"

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftexextra.h
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftexextra.h	2021-02-17 19:06:29 UTC (rev 846)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftexextra.h	2021-02-17 19:27:38 UTC (rev 847)
@@ -1,5 +1,5 @@
 /*
-Copyright 1996-2016 Han The Thanh, <thanh at pdftex.org>
+Copyright 1996-2021 Han The Thanh, <thanh at pdftex.org>
 
 This file is part of pdfTeX.
 

Modified: branches/stable/source/src/texk/web2c/web2c/configure
===================================================================
--- branches/stable/source/src/texk/web2c/web2c/configure	2021-02-17 19:06:29 UTC (rev 846)
+++ branches/stable/source/src/texk/web2c/web2c/configure	2021-02-17 19:27:38 UTC (rev 847)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Web2C Tools 2021/dev.
+# Generated by GNU Autoconf 2.69 for Web2C Tools 2021.
 #
 # Report bugs to <tex-k at tug.org>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='Web2C Tools'
 PACKAGE_TARNAME='web2c-tools'
-PACKAGE_VERSION='2021/dev'
-PACKAGE_STRING='Web2C Tools 2021/dev'
+PACKAGE_VERSION='2021'
+PACKAGE_STRING='Web2C Tools 2021'
 PACKAGE_BUGREPORT='tex-k at tug.org'
 PACKAGE_URL=''
 
@@ -1328,7 +1328,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Web2C Tools 2021/dev to adapt to many kinds of systems.
+\`configure' configures Web2C Tools 2021 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1398,7 +1398,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Web2C Tools 2021/dev:";;
+     short | recursive ) echo "Configuration of Web2C Tools 2021:";;
    esac
   cat <<\_ACEOF
 
@@ -1521,7 +1521,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Web2C Tools configure 2021/dev
+Web2C Tools configure 2021
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2360,7 +2360,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Web2C Tools $as_me 2021/dev, which was
+It was created by Web2C Tools $as_me 2021, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8042,7 +8042,7 @@
 
 # Define the identity of the package.
  PACKAGE='web2c-tools'
- VERSION='2021/dev'
+ VERSION='2021'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14571,7 +14571,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Web2C Tools $as_me 2021/dev, which was
+This file was extended by Web2C Tools $as_me 2021, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14637,7 +14637,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Web2C Tools config.status 2021/dev
+Web2C Tools config.status 2021
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: branches/stable/source/src/utils/configure
===================================================================
--- branches/stable/source/src/utils/configure	2021-02-17 19:06:29 UTC (rev 846)
+++ branches/stable/source/src/utils/configure	2021-02-17 19:27:38 UTC (rev 847)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live utils 2021/dev.
+# Generated by GNU Autoconf 2.69 for TeX Live utils 2021.
 #
 # Report bugs to <tex-k at tug.org>.
 #
@@ -579,8 +579,8 @@
 # Identity of this package.
 PACKAGE_NAME='TeX Live utils'
 PACKAGE_TARNAME='tex-live-utils'
-PACKAGE_VERSION='2021/dev'
-PACKAGE_STRING='TeX Live utils 2021/dev'
+PACKAGE_VERSION='2021'
+PACKAGE_STRING='TeX Live utils 2021'
 PACKAGE_BUGREPORT='tex-k at tug.org'
 PACKAGE_URL=''
 
@@ -1394,7 +1394,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures TeX Live utils 2021/dev to adapt to many kinds of systems.
+\`configure' configures TeX Live utils 2021 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1464,7 +1464,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TeX Live utils 2021/dev:";;
+     short | recursive ) echo "Configuration of TeX Live utils 2021:";;
    esac
   cat <<\_ACEOF
 
@@ -1749,7 +1749,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TeX Live utils configure 2021/dev
+TeX Live utils configure 2021
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1850,7 +1850,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by TeX Live utils $as_me 2021/dev, which was
+It was created by TeX Live utils $as_me 2021, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -6106,7 +6106,7 @@
 
 # Define the identity of the package.
  PACKAGE='tex-live-utils'
- VERSION='2021/dev'
+ VERSION='2021'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7103,7 +7103,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by TeX Live utils $as_me 2021/dev, which was
+This file was extended by TeX Live utils $as_me 2021, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7160,7 +7160,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-TeX Live utils config.status 2021/dev
+TeX Live utils config.status 2021
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: branches/stable/source/src/version.ac
===================================================================
--- branches/stable/source/src/version.ac	2021-02-17 19:06:29 UTC (rev 846)
+++ branches/stable/source/src/version.ac	2021-02-17 19:27:38 UTC (rev 847)
@@ -1,5 +1,5 @@
-dnl $Id: version.ac 54634 2020-04-10 00:57:04Z karl $
-dnl   Copyright 2016-2020 Karl Berry <tex-live at tug.org>
+dnl $Id: version.ac 57769 2021-02-17 03:03:54Z karl $
+dnl   Copyright 2016-2021 Karl Berry <tex-live at tug.org>
 dnl   Copyright 2010-2015 Peter Breitenlohner <tex-live at tug.org>
 dnl
 dnl   This file is free software; the copyright holder
@@ -9,4 +9,4 @@
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current TeX Live version
-m4_define([tex_live_version], [2021/dev])
+m4_define([tex_live_version], [2021])



More information about the pdftex-commits mailing list.