2022 pretest start

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

28 files changed, 1006 insertions, 74 deletions

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 98eb015e3b6..bc1ce361562 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -2620,7 +2620,7 @@ am__can_run_installinfo = \
 man1dir = $(mandir)/man1
 man5dir = $(mandir)/man5
 NROFF = nroff
-MANS = $(dist_man_MANS) $(nodist_man_MANS)
+MANS = $(dist_man_MANS) $(man1_MANS) $(nodist_man_MANS)
 DATA = $(pkgconfig_DATA)
 am__syncinclude_HEADERS_DIST = synctexdir/synctex_parser.h \
 	synctexdir/synctex_version.h synctexdir/synctex_parser_utils.h
@@ -4643,6 +4643,11 @@ euptex_ch_srcs = \
 # e-upTeX Tests
 #
 euptex_tests = euptexdir/euptriptest.test euptexdir/pdfprimitive.test euptexdir/eupver.test
+
+# At the moment, these are the only man pages handled in the
+# conglomerated web2c/Makefile[.am]. (All the others are in man/.)
+# If that changes, have to set at top level and use +=.
+@HITEX_TRUE@man1_MANS = hitexdir/hishrink.man hitexdir/histretch.man hitexdir/hitex.man
 hitex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) -I$(srcdir)/libmd5 \
 	-DINIT -DSTAT -DDEBUG
 hitex_LDADD = $(KPATHSEA_LIBS) $(ZLIB_LIBS) libmd5.a libmd5.a
@@ -19194,9 +19199,9 @@ clean-libtool:
 
 distclean-libtool:
 	-rm -f libtool config.lt
-install-man1: $(dist_man_MANS) $(nodist_man_MANS)
+install-man1: $(dist_man_MANS) $(man1_MANS) $(nodist_man_MANS)
 	@$(NORMAL_INSTALL)
-	@list1=''; \
+	@list1='$(man1_MANS)'; \
 	list2='$(dist_man_MANS) $(nodist_man_MANS)'; \
 	test -n "$(man1dir)" \
 	  && test -n "`echo $$list1$$list2`" \
@@ -19230,7 +19235,7 @@ install-man1: $(dist_man_MANS) $(nodist_man_MANS)
 
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man1dir)" || exit 0; \
+	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	l2='$(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 	  sed -n '/\.1[a-z]*$$/p'; \
@@ -22412,7 +22417,7 @@ euptrip-clean:
 # (end of euptex.am)
 
 # convenience target to build all the programs here.
-hiall: hitex hishrink histretch
+@HITEX_TRUE@hiall: hitex hishrink histretch
 
 $(hiformat_c_h_l_y): hiformat-tangle
 
diff --git a/Build/source/texk/web2c/hitexdir/ChangeLog b/Build/source/texk/web2c/hitexdir/ChangeLog
index 2b359ac17b7..50772884cce 100644
--- a/Build/source/texk/web2c/hitexdir/ChangeLog
+++ b/Build/source/texk/web2c/hitexdir/ChangeLog
@@ -1,3 +1,13 @@
+2022-02-26  Karl Berry  <karl@tug.org>
+
+	* am/hitex.am (man1_MANS): install hi*.man directly from here,
+	not using the man/ subdir as for all others.
+
+2022-02-24  Karl Berry  <karl@tug.org>
+
+	* hiformat.w (DESCRIPTION) x2: consistent quoting.
+	(explain usage): newline before options list.
+
 2022-01-10  Karl Berry  <karl@freefriends.org>
 
 	* am/hitex.am: do not silence tangle-sh.
diff --git a/Build/source/texk/web2c/hitexdir/am/hitex.am b/Build/source/texk/web2c/hitexdir/am/hitex.am
index 1f19c0d305f..2032a317960 100644
--- a/Build/source/texk/web2c/hitexdir/am/hitex.am
+++ b/Build/source/texk/web2c/hitexdir/am/hitex.am
@@ -7,11 +7,16 @@
 if HITEX
 bin_PROGRAMS += hitex hishrink histretch
 noinst_PROGRAMS += himktables
-endif HITEX
 
 # convenience target to build all the programs here.
 hiall: hitex hishrink histretch
 
+# At the moment, these are the only man pages handled in the
+# conglomerated web2c/Makefile[.am]. (All the others are in man/.)
+# If that changes, have to set at top level and use +=.
+man1_MANS = hitexdir/hishrink.man hitexdir/histretch.man hitexdir/hitex.man
+endif HITEX
+
 ## Debugging for the parser as usual.
 ## Except we eschew all lex/yacc steps in the Makefile here; see below.
 ## AM_YFLAGS = -d -v -Wno-yacc
diff --git a/Build/source/texk/web2c/man/ChangeLog b/Build/source/texk/web2c/man/ChangeLog
index 0d6f4b8d165..708354705c1 100644
--- a/Build/source/texk/web2c/man/ChangeLog
+++ b/Build/source/texk/web2c/man/ChangeLog
@@ -1,3 +1,7 @@
+2022-02-26  Karl Berry  <karl@tug.org>
+
+	* Makefile.am (web_man_sources): add twill.man.
+
 2022-02-02  Andreas Scherer  <https://ascherer.github.io>
 
 	* ctwill.man: CWEB 4.7 release.
diff --git a/Build/source/texk/web2c/man/Makefile.am b/Build/source/texk/web2c/man/Makefile.am
index 4c51c664487..4af456725c0 100644
--- a/Build/source/texk/web2c/man/Makefile.am
+++ b/Build/source/texk/web2c/man/Makefile.am
@@ -19,7 +19,8 @@ endif WEB
 EXTRA_DIST += $(web_man_sources)
 web_man_sources = bibtex.man dvicopy.man dvitomp.man dvitype.man gftodvi.man \
 	gftopk.man gftype.man mft.man patgen.man pktogf.man pktype.man \
-	pltotf.man pooltype.man tftopl.man vftovp.man vptovf.man weave.man
+	pltotf.man pooltype.man tftopl.man twill.man \
+	vftovp.man vptovf.man weave.man
 
 if TEX
 man_sources += tex.man
diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in
index 342f1b670a3..121896fd8dc 100644
--- a/Build/source/texk/web2c/man/Makefile.in
+++ b/Build/source/texk/web2c/man/Makefile.in
@@ -468,7 +468,8 @@ man1_links = cweb:ctangle cweb:cweave ctwill:ctwill-refsort \
 	latex-dev:uplatex-dev
 web_man_sources = bibtex.man dvicopy.man dvitomp.man dvitype.man gftodvi.man \
 	gftopk.man gftype.man mft.man patgen.man pktogf.man pktype.man \
-	pltotf.man pooltype.man tftopl.man vftovp.man vptovf.man weave.man
+	pltotf.man pooltype.man tftopl.man twill.man \
+	vftovp.man vptovf.man weave.man
 
 pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man
 otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.man ovp2ovf.man
diff --git a/Master/.mkisofsrc b/Master/.mkisofsrc
index 4206e860939..d1b21ea04c1 100644
--- a/Master/.mkisofsrc
+++ b/Master/.mkisofsrc
@@ -1,4 +1,4 @@
 APPI=Complete TeX system
 COPY=LICENSE.TL
 PUBL=TeX Live <tex-live@tug.org>
-VOLI=TeXLive2021
+VOLI=TeXLive2022
diff --git a/Master/release-texlive.txt b/Master/release-texlive.txt
index 407d8dbb17c..a34c01d30ce 100644
--- a/Master/release-texlive.txt
+++ b/Master/release-texlive.txt
@@ -1,4 +1,4 @@
-TeX Live (https://tug.org/texlive) version 2021
+TeX Live (https://tug.org/texlive) version 2022
 
 This file is public domain.  It is read by install-tl --version,
 tlmgr --version, and texconfig conf, and a final line appended with
diff --git a/Master/texmf-dist/doc/man/man1/hishrink.1 b/Master/texmf-dist/doc/man/man1/hishrink.1
new file mode 100644
index 00000000000..bf29ca9f440
--- /dev/null
+++ b/Master/texmf-dist/doc/man/man1/hishrink.1
@@ -0,0 +1,201 @@
+.TH HISHRINK 1 "11 November 2021" "Version 1.3"
+.\"=====================================================================
+.if n .ds MF Metafont
+.if t .ds MF Metafont
+.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
+.if n .ds TX TeX
+.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP
+.el .ds OX TeX
+.\" BX definition must follow TX so BX can use TX
+.if t .ds BX \fRB\s-2IB\s0\fP\*(TX
+.if n .ds BX BibTeX
+.\" LX definition must follow TX so LX can use TX
+.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX
+.if n .ds LX LaTeX
+.if t .ds AX \fRA\\h'-0.1667m'\\v'0.20v'M\\v'-0.20v'\\h'-0.125m'S\fP\*(TX
+.if n .ds AX AmSTeX
+.if t .ds AY \fRA\\h'-0.1667m'\\v'0.20v'M\\v'-0.20v'\\h'-0.125m'S\fP\*(LX
+.if n .ds AY AmSLaTeX
+.if n .ds WB Web
+.if t .ds WB W\s-2EB\s0
+.\"=====================================================================
+.SH NAME
+hishrink\- translating ASCII HINT files to binary files
+.SH SYNOPSIS
+.B hishrink
+.RI [ options ]
+.RI [ file ]
+.\"=====================================================================
+.SH DESCRIPTION
+Shrinking converts an ASCII HINT file, usually with the extension 
+.BR .hint ,
+into a binary HINT file, with the extension
+.BR .hnt .
+.PP
+The ASCII based HINT file format - also called `long' format - is optimized
+for readability. It can be edited using a text editor. Hence it allows
+simple modifications that would be difficult to achieve when using the binary
+format. It is also convenient when debugging.
+.PP
+The binary HINT file format - also called `short' format - is optimized
+for displaying HINT files. It can be parsed equally well in forward
+and backward direction to enable fast forward or backward navigation in the file.
+.PP
+The binary HINT file format is designed for on-screen reading of documents. 
+Using a HINT viewer to display a HINT file, its content will dynamically
+adapt to the available display area. For complete information on the
+HINT file format and programs to view HINT files, see
+.BR  https://hint.userweb.mwn.de .
+.\"=====================================================================
+.SH OPTIONS
+This version of 
+.B hishrink
+understands the following command line options:
+.TP
+.B -a
+Use only the localized names for auxiliary files as explained in the
+.B FILES
+section below.
+
+If you know that the auxiliary files can be found using the localized names,
+for example after creating them with 
+.B histretch
+using the 
+.B -a
+option, you can use 
+.B hishrink
+with the 
+.B -a
+option to limit the search for the auxiliar files.
+If you are unsure, you should use neither the 
+.B -a
+nor the
+.B -g
+option.
+.B hishrink
+will then search for auxiliar files first using the localized path names 
+and then using the path names as given.
+.TP
+.B -c
+Enable the use of compression for the HINT file. Compressed files are
+smaller but require decompression when viewing. Use only for large
+files if the file size matters.
+.TP
+.BI -d \ bitmask
+Sets HINT file debugging flags according to the 
+.IR bitmask .
+Use the
+.B --help
+option for details.
+.TP
+.B -g
+Do not use the localized names for auxiliary files as explained in the
+.B FILES
+section below.
+
+You may use this option if you know that all auxiliar files
+are at the locations described by the path names stored in the HINT file.
+If you are unsure, you should use neither the 
+.B -g
+nor the
+.B -a
+option.
+.B hishrink
+will then search for auxiliar files first using the localized path names 
+and then using the path names as given.
+.TP
+.B --help
+Print help message and exit.
+.TP
+.B -l
+Redirect standard error to a log file. The name of the log file is derived from
+the name of the input file replacing the extension
+.B .hint
+by the extension
+.BR .log .
+.TP
+.BI -o \ name
+Use
+.I name
+for the output file instead of deriving it from the name of the input file.
+Append the extension
+.B .hnt
+if the
+.I name
+does not already has that extension.
+.TP
+.B --version
+Print version information and exit.
+.\"=====================================================================
+.SH FILES
+Binary HINT files must contain all resources necessary to display the file,
+for example font and image files.  These files are called auxiliary files.
+ASCII HINT files contain only the path names of these files.
+
+When creating a binary HINT file from an ASCII HINT file, it is
+necessary to find these files, read them, and include them in the binary output file.
+When creating an ASCII HINT file from a binary HINT file, it is
+convenient if these files can be extracted and written to the file system.
+To avoid clobbering arbitrary directories with files when extracting auxiliary 
+files, it is possible to map the path names as stored in the HINT file
+to 
+.B localized
+path names before writing or reading auxiliar files.
+
+When computing a localized path name from a given path name,
+a distinction is made between global resources,
+like fonts, that are referenced by an absolute path name, and local
+resources, for example an image, that are referenced by a relative
+path name. The directory that starts the localized path name of the former 
+has the extension
+.B .abs
+and for the latter the extension
+.BR .rel 
+is used.
+To keep auxiliary files in these subdirectories even if their path
+contains links to a parent directory, parent links
+.RB ` .. ' 
+are replaced by
+.RB ` __ '
+links to subdirectories.
+
+For example,
+given an input file 
+.BR paper.hint,
+the global resources are stored in the
+.B paper.abs
+directory and local resources are stored in 
+.BR paper.rel .
+An absolute path like
+.B /usr/share/fonts/
+will then map to the localized path
+.BR paper.abs/usr/share/fonts/ 
+and a relative path like
+.B ../image/img1.jpg
+will then map to the localized path
+.BR paper.rel/__/image/img1.jpg .
+.\"=====================================================================
+.SH NOTES
+This manual page is not meant to be exhaustive.  The complete
+documentation can be found in the 
+.IR "HINT: The file format" .
+This document is available as a book or in electronic form from the 
+HINT project home page at 
+.BR https://hint.userweb.mwn.de .
+There you find additional software, most importantly viewers for HINT files,
+and further information.
+.\"=====================================================================
+.SH AVAILABILITY
+.B hishrink
+should compile on a large variety of machine architectures
+and operating systems.
+It is part of the \*(TX Live distribution.
+.PP
+.\"=====================================================================
+.SH "SEE ALSO"
+.BR histretch (1),
+.BR hitex (1),
+.\"=====================================================================
+.SH AUTHORS
+Martin Ruckert
+.\" vim: syntax=nroff
diff --git a/Master/texmf-dist/doc/man/man1/histretch.1 b/Master/texmf-dist/doc/man/man1/histretch.1
new file mode 100644
index 00000000000..cbc385f5f01
--- /dev/null
+++ b/Master/texmf-dist/doc/man/man1/histretch.1
@@ -0,0 +1,239 @@
+.TH HISTRETCH 1 "11 November 2021" "Version 1.3"
+.\"=====================================================================
+.if n .ds MF Metafont
+.if t .ds MF Metafont
+.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
+.if n .ds TX TeX
+.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP
+.el .ds OX TeX
+.\" BX definition must follow TX so BX can use TX
+.if t .ds BX \fRB\s-2IB\s0\fP\*(TX
+.if n .ds BX BibTeX
+.\" LX definition must follow TX so LX can use TX
+.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX
+.if n .ds LX LaTeX
+.if t .ds AX \fRA\\h'-0.1667m'\\v'0.20v'M\\v'-0.20v'\\h'-0.125m'S\fP\*(TX
+.if n .ds AX AmSTeX
+.if t .ds AY \fRA\\h'-0.1667m'\\v'0.20v'M\\v'-0.20v'\\h'-0.125m'S\fP\*(LX
+.if n .ds AY AmSLaTeX
+.if n .ds WB Web
+.if t .ds WB W\s-2EB\s0
+.\"=====================================================================
+.SH NAME
+histretch \- translating binary HINT files to ASCII files
+.SH SYNOPSIS
+.B histretch
+.RI [ options ]
+.RI [ file ]
+.\"=====================================================================
+.SH DESCRIPTION
+Stretching converts a binary HINT file, usually with the extension 
+.BR .hnt ,
+into an  ASCII based HINT file, with the extension
+.BR .hint .
+.PP
+The binary HINT file format - also called `short' format - is optimized
+for displaying HINT files. It can be parsed equally well in forward
+and backward direction to enable fast forward or backward navigation in the file.
+.PP
+The ASCII based HINT file format - also called `long' format - is optimized
+for readability. It can be edited using a text editor. Hence it allows
+simple modifications that would be difficult to achieve when using the binary
+format. It is also convenient when debugging.
+.PP
+The binary HINT file format is designed for on-screen reading of documents. 
+Using a HINT viewer to display a HINT file, its content will dynamically
+adapt to the available display area. For complete information on the
+HINT file format and programs to view HINT files, see
+.BR  https://hint.userweb.mwn.de .
+.\"=====================================================================
+.SH OPTIONS
+This version of 
+.B histretch
+understands the following command line options:
+.TP
+.B -a
+Write auxiliar files to disk using the localized path names as explained in the
+.B FILES
+section below.
+
+Use this option if you are stretching a HINT file that you later want
+to shrink back to its binary format unless you know that you have
+already all the auxiliary files contained in it. 
+.TP
+.BI -d \ bitmask
+Sets HINT file debugging flags according to the 
+.IR bitmask .
+See the
+.B --help
+option for details.
+.TP
+.B -f
+Force the replacement of existing auxiliary files. 
+Use this option together with the
+.B -g
+or 
+.B -a
+option to make sure that already exiting auxiliary files are replaced by the
+auxiliary files contained in the HINT file.
+
+.BR WARNING :
+This is a dangerous option especially together with the
+.B -g
+option. Never use it on a HINT file of unknown
+origin. It will possibly replace any file on your machine you have
+write access to.  If in doubt, don't use the
+.B -f
+option.
+.TP
+.B -g
+Write auxiliar files to disk using the path names as stored in the HINT file.
+This option is an alternative to the 
+.B -a
+option and takes precedence if given. 
+If in doubt, don't use the
+.B -g
+option.
+If you just want to stretch the HINT file, then edit it, and then shrink
+it back to the binary format, you should use the 
+.B -a
+option. 
+
+You may use this option if you are stretching a HINT file on the same machine and in
+the same directory where you have created the HINT file. Then all files
+will be copied to the location they came from in case they were deleted
+in the meantime.
+
+If you are stretching a HINT file on one machine and the file was created
+on a different machine, 
+.B histretch 
+will try to copy an auxiliary file
+into the same directory that was used when the HINT file was created, provided that 
+you have the necessary writing rights. 
+This is probably where you want the auxiliary file assuming that both machines have the
+same directory structure.
+
+.BR WARNING :
+This is a dangerous option especially together with the
+.B -f
+option. Never use it on a HINT file of unknown
+origin. It can possibly write (and replace) any file on your machine where you have
+write access.
+.TP
+.B --help
+Print help message and exit.
+.TP
+.B -l
+Redirect standard error to a log file. The name of the log file is derived from
+the name of the input file replacing the extension
+.B .hnt
+by the extension
+.BR .log .
+.TP
+.BI -o \ name
+Use
+.I name
+for the output file instead of deriving it from the name of the input file.
+Append the extension
+.B .hint
+if the
+.I name
+does not already has that extension.
+.TP
+.B -u
+Enable the use of UTF8 character codes. 
+Without this option, the output file is a pure ASCII file, because character codes
+outside the ASCII range are written using their numeric representation.
+With this option, the file will always represent printable characters using their UTF8 
+character codes. This might make the output file more readable if displayed 
+using an UTF8 enabled program; but it might be less readable if displayed
+by a program that does not handle UTF8 characters properly. See also the
+.B -x
+option.
+.TP
+.B --version
+Print version information and exit.
+.TP
+.B -x
+Enable the use of hexadecimal character codes.
+Without this option, characters that are not represented using their
+character codes are represented using a decimal representation of 
+the character code. With this option a hexadecimal representation is used.
+The range of character codes that have a numeric representation includes
+the non printable characters (character codes smaller than 32)
+and unless the 
+.B -u
+option is given, the character codes with a value of 127 and above.
+.\"=====================================================================
+.SH FILES
+Binary HINT files must contain all resources necessary to display the file,
+for example font and image files.  These files are called auxiliary files.
+ASCII HINT files contain only the path names of these files.
+
+When creating a binary HINT file from an ASCII HINT file, it is
+necessary to find these files, read them, and include them in the binary output file.
+When creating an ASCII HINT file from a binary HINT file, it is
+convenient if these files can be extracted and written to the file system.
+To avoid clobbering arbitrary directories with files when extracting auxiliary 
+files, it is possible to map the path names as stored in the HINT file
+to 
+.B localized
+path names before writing or reading auxiliar files.
+
+When computing a localized path name from a given path name,
+a distinction is made between global resources,
+like fonts, that are referenced by an absolute path name, and local
+resources, for example an image, that are referenced by a relative
+path name. The directory that starts the localized path name of the former 
+has the extension
+.B .abs
+and for the latter the extension
+.BR .rel 
+is used.
+To keep auxiliary files in these subdirectories even if their path
+contains links to a parent directory, parent links
+.RB ` .. ' 
+are replaced by
+.RB ` __ '
+links to subdirectories.
+
+For example,
+given an input file 
+.BR paper.hint,
+the global resources are stored in the
+.B paper.abs
+directory and local resources are stored in 
+.BR paper.rel .
+An absolute path like
+.B /usr/share/fonts/
+will then map to the localized path
+.BR paper.abs/usr/share/fonts/ 
+and a relative path like
+.B ../image/img1.jpg
+will then map to the localized path
+.BR paper.rel/__/image/img1.jpg .
+.\"=====================================================================
+.SH NOTES
+This manual page is not meant to be exhaustive.  The complete
+documentation can be found in
+.IR "HINT: The file format" .
+This document is available as a book or in electronic form from the 
+HINT project home page at 
+.BR https://hint.userweb.mwn.de .
+There you find additional software, most importantly viewers for HINT files,
+and further information.
+.\"=====================================================================
+.SH AVAILABILITY
+.B histretch
+should compile on a large variety of machine architectures
+and operating systems.
+It is part of the \*(TX Live distribution.
+.PP
+.\"=====================================================================
+.SH "SEE ALSO"
+.BR hishrink (1),
+.BR hitex (1),
+.\"=====================================================================
+.SH AUTHORS
+Martin Ruckert
+.\" vim: syntax=nroff
diff --git a/Master/texmf-dist/doc/man/man1/hitex.1 b/Master/texmf-dist/doc/man/man1/hitex.1
new file mode 100644
index 00000000000..ef1655d1b82
--- /dev/null
+++ b/Master/texmf-dist/doc/man/man1/hitex.1
@@ -0,0 +1,384 @@
+.TH HITEX 1 "11 November 2021" "Version 1.0"
+.\"=====================================================================
+.if n .ds MF Metafont
+.if t .ds MF Metafont
+.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
+.if n .ds TX TeX
+.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP
+.el .ds OX TeX
+.\" BX definition must follow TX so BX can use TX
+.if t .ds BX \fRB\s-2IB\s0\fP\*(TX
+.if n .ds BX BibTeX
+.\" LX definition must follow TX so LX can use TX
+.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX
+.if n .ds LX LaTeX
+.if t .ds AX \fRA\\h'-0.1667m'\\v'0.20v'M\\v'-0.20v'\\h'-0.125m'S\fP\*(TX
+.if n .ds AX AmSTeX
+.if t .ds AY \fRA\\h'-0.1667m'\\v'0.20v'M\\v'-0.20v'\\h'-0.125m'S\fP\*(LX
+.if n .ds AY AmSLaTeX
+.if n .ds WB Web
+.if t .ds WB W\s-2EB\s0
+.\"=====================================================================
+.SH NAME
+hitex \- HINT output from TeX
+.SH SYNOPSIS
+.B hitex
+.RI [ options ]
+.RI [ \fB&\fPformat ]
+.RI [ file | \fB\e\fPcommands ]
+.\"=====================================================================
+.SH DESCRIPTION
+Run the Hi\*(TX typesetter on
+.IR file ,
+usually creating
+.IR file.hnt .
+If the file argument has no extension, ".tex" will be appended to it. 
+Instead of a file name, a set of Hi\*(TX commands can be given, the first
+of which must start with a backslash.
+With a 
+.BI & format
+argument Hi\*(TX uses a different set of precompiled commands,
+contained in
+.IR format\fB.fmt\fP ;
+it is usually better to use the
+.B -fmt
+.I format
+option instead.
+.PP
+Hi\*(TX is a version of \*(TX that creates HINT files. The HINT file
+format is designed for on-screen reading of documents. Using a HINT
+viewer (see
+.BR  https://hint.userweb.mwn.de )
+to display a HINT file its content will dynamically adapt to the
+available display area.
+.PP
+The typical use of Hi\*(TX is with pre generated formats.
+The
+.B hitex
+command uses the equivalent of the plain \*(TX format, and the
+.B hilatex
+command uses the equivalent of the \*(LX format.
+To generate formats, use the
+.B -ini
+switch.
+.PP
+Hi\*(TX's handling of its command-line arguments is similar to that of
+of the other \*(TX programs in the
+.I web2c
+implementation.
+.PP
+Hi\*(TX incorporates the e-\*(TX
+extensions (see 
+.BR etex (1))
+if used with the 
+.B -etex
+switch.
+.PP
+Hi\*(TX incorporates the extensions needed for \*(LX
+(see 
+.BR latex (1))
+if used with the 
+.B -ltx
+switch.
+.\"=====================================================================
+.SH OPTIONS
+This version of Hi\*(TX understands the following command line options.
+.TP
+.BI -cnf-line \ string
+Parse
+.I string
+as a
+.I texmf.cnf
+configuration line.  See the Kpathsea manual.
+.TP
+.B -compress
+Enable the use of compression for the HINT file. Compressed files are
+smaller but require decompression when viewing. Use only for large
+files if the file size matters.
+.TP
+.B -empty-page
+When writing books, often empty pages are inserted - for example to
+begin chapters on a right hand side page. These empty pages are
+a nuisance for on-screen reading where there are no left or right
+hand side pages. This option keeps empty pages in the output.
+.TP
+.B -no-empty-page
+This option tries to eliminate empty pages in the output. It is set as a default.
+.TP
+.B -etex
+Enable the e-\*(TX extensions.  This option is only effective in
+combination with
+.BR -ini .
+See
+.BR etex (1).
+.TP
+.B -file-line-error
+Print error messages in the form
+.I file:line:error
+which is similar to the way many compilers format them.
+.TP
+.B -no-file-line-error
+Disable printing error messages in the
+.I file:line:error
+style.
+.TP
+.BI -fmt \ format
+Use
+.I format
+as the name of the format to be used, instead of the name by which
+Hi\*(TX was called or a
+.I %&
+line.
+.TP
+.B -help
+Print help message and exit.
+.TP
+.BI -hint-debug \ bitmask
+Sets HINT file debugging flags according to the 
+.IR bitmask .
+See the
+.B -hint-debug-help
+option for details.
+.TP
+.B -hint-debug-help
+Print an explanation of the HINT debugging flags and exit.
+.TP
+.B -hyphenate-first-word
+\*(TX will usually not attempt to insert hyphenation points into the first 
+word of a paragraph. If a HINT file must be displayed on a very small device
+such hyphenation points might prove necessary. This option is set by default
+and enables the generation of these hyphenation points.
+.TP
+.B -no-hyphenate-first-word
+Disable the automatic insertion of hyphenation points in the first word
+of a paragraph. Needed only if complete compatibility with \*(TX is required.
+.TP
+.B -ini
+Start in
+.I INI
+mode, which is used to dump formats.  The
+.I INI
+mode can be used for typesetting, but no format is preloaded, and
+basic initializations like setting catcodes may be required.
+.TP
+.BI -interaction \ mode
+Sets the interaction mode.  The mode can be either
+.IR batchmode ,
+.IR nonstopmode ,
+.IR scrollmode ,
+and
+.IR errorstopmode .
+The meaning of these modes is the same as that of the corresponding
+\ecommands.
+.TP
+.BI -jobname \ name
+Use
+.I name
+for the job name, instead of deriving it from the name of the input file.
+.TP
+.BI -kpathsea-debug \ bitmask
+Sets path searching debugging flags according to the bitmask.  See the
+.I Kpathsea
+manual for details.
+.TP
+.B -ltx
+Enable the \*(LX extensions.  This option is only effective in
+combination with
+.BR -ini .
+See
+.BR latex (1).
+.TP
+.BI -mfmode \ mode
+Use
+.I mode
+as the \*(MF 
+.I mode
+when generating missing fonts. See 
+.BR mf (1)
+for details.
+.TP
+.BI -mktex \ fmt
+Enable
+.RI mktex fmt ,
+where
+.I fmt
+must be either
+.IR tex ,
+.IR tfm ,
+.IR fmt ,
+or
+.IR pk .
+.TP
+.BI -no-mktex \ fmt
+Disable
+.RI mktex fmt ,
+where
+.I fmt
+must be either
+.IR tex ,
+.IR tfm ,
+.IR fmt ,
+or
+.IR pk .
+.TP
+.BI -output-directory \ directory
+Write output files in
+.I directory
+instead of the current directory.  Look up input files in
+.I directory
+first, then along the normal search path.
+.TP
+.B -parse-first-line
+If the first line of the main input file begins with
+.I %&
+parse it to look for a dump name.
+.TP
+.B -no-parse-first-line
+Disable parsing of the first line of the main input file.
+.TP
+.BI -progname \ name
+Pretend to be program
+.IR name .
+This affects both the format used and the search paths.
+.TP
+.BI -resolution \ number
+When using \*(MF to generate missing pk fonts, use a resolution of 
+.I number
+DPI.  See 
+.BR mf (1)
+for details.
+.TP
+.B -version
+Print version information and exit.
+.\"=====================================================================
+.SH ENVIRONMENT
+See the Kpathsea library documentation (e.g., the `Path specifications'
+node) for precise details of how the environment variables are used.
+The
+.B kpsewhich
+utility can be used to query the values of the variables.
+.PP
+One caveat: In most Hi\*(TX formats, you cannot use ~ in a file name you
+give directly to Hi\*(TX, because ~ is an active character in \*(TX,
+and hence is expanded, not taken as part of the file name. Other
+programs, such as \*(MF, do not have this problem.
+.PP
+.TP
+.B TEXMFOUTPUT
+Normally, Hi\*(TX puts its output files in the current directory.  If
+any output file cannot be opened there, it tries to open it in the
+directory specified in the environment variable TEXMFOUTPUT.
+There is no default value for that variable.  For example, if you say
+.I hitex paper
+and the current directory is not writable and TEXMFOUTPUT has
+the value
+.IR /tmp ,
+Hi\*(TX attempts to create
+.I /tmp/paper.log
+(and
+.IR /tmp/paper.hnt ,
+if any output is produced.)  TEXMFOUTPUT is also checked for input
+files, as \*(TX often generates files that need to be subsequently
+read; for input, no suffixes (such as ``.tex'') are added by default,
+the input name is simply checked as given.
+.TP
+.B TEXINPUTS
+Search path for
+.I \einput
+and
+.I \eopenin
+files.
+This normally starts with ``.'', so
+that user files are found before system files.  An empty path
+component will be replaced with the paths defined in the
+.I texmf.cnf
+file.  For example, set TEXINPUTS to ".:/home/user/tex:" to prepend the
+current directory and ``/home/user/tex'' to the standard search path.
+.TP
+.B TEXFORMATS
+Search path for format files.
+.TP
+.B TFMFONTS
+Search path for font metric
+.RI ( .tfm )
+files.
+.TP
+.B SOURCE_DATE_EPOCH
+If set, its value, taken to be in epoch-seconds, will be used for the
+creation date and as the reference moment for the time related 
+primitives of \*(LX. This is useful for making reproducible builds.
+.TP
+.B FORCE_SOURCE_DATE
+If set to the value "1", the time-related \*(TX primitives
+.RI ( \eyear ,
+.IR \emonth ,
+.IR \eday ,
+.IR \etime )
+are also initialized from the value of SOURCE_DATE_EPOCH.  This is not
+recommended if there is any viable alternative.
+.PP
+Many, many more environment variables may be consulted related to path
+searching.  See the Kpathsea manual.
+.\"=====================================================================
+.SH FILES
+The location of the files mentioned below varies from system to
+system.  Use the
+.B kpsewhich
+utility to find their locations.
+.TP
+.I *.tfm
+Metric files for Hi\*(TX's fonts.
+.TP
+.I *.fmt
+Predigested Hi\*(TX format files.
+.TP
+.I *.pk *.pfb
+Font files used by Hi\*(TX.
+.\"=====================================================================
+.SH NOTES
+This manual page is not meant to be exhaustive.  The complete
+documentation for Hi\*(TX can be found in the 
+.IR "Hi\*(TX user manual"
+Further information can be found in the  manual of the
+.I "Kpathsea library" 
+and in
+.I "HINT: The file format"
+which is available as a book or in electronic form from the 
+HINT project home page at 
+.BR https://hint.userweb.mwn.de .
+.\"=====================================================================
+.SH BUGS
+This version of Hi\*(TX fails to handle correctly glues and kerns with a 
+width that depends on \ehsize or \evsize. Similarly, when
+the layout of table entries or mathematical formulas depends on \ehsize 
+or \evsize their output might be distorted. 
+.\"=====================================================================
+.SH AVAILABILITY
+Hi\*(TX should compile on a large variety of machine architectures
+and operating systems.
+Hi\*(TX is part of the \*(TX Live distribution.
+.PP
+The Hi\*(TX home page is at 
+.BR https://hint.userweb.mwn.de .
+There you find additional software, most importantly viewers for HINT files,
+and further information.
+.\"=====================================================================
+.SH "SEE ALSO"
+.BR histretch (1),
+.BR hishrink (1),
+.BR latex (1),
+.BR tex (1),
+.BR kpsewhich (1),
+.\"=====================================================================
+.SH AUTHORS
+The primary author of Hi\*(TX is Martin Ruckert,
+with e\*(TX extensions by Peter Breitenlohner,
+\*(LX extensions by Thierry Laronde, and
+the kpathsearch library by Karl Berry.
+.PP
+\*(TX was designed by Donald E. Knuth,
+who implemented it using his \*(WB system for Pascal programs.
+.PP
+Many, many more contributed to the typesetting system now known as \*(TX;
+far too many to name all of them here.
+.\" vim: syntax=nroff
diff --git a/Master/texmf-dist/doc/man/man1/twill.1 b/Master/texmf-dist/doc/man/man1/twill.1
new file mode 100644
index 00000000000..6aabc5e40a1
--- /dev/null
+++ b/Master/texmf-dist/doc/man/man1/twill.1
@@ -0,0 +1,75 @@
+.TH WEAVE 1 "09 January 2022" "Web2C 2022"
+.\"=====================================================================
+.if n .ds MF Metafont
+.if t .ds MF Metafont
+.if n .ds TX TeX
+.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
+.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP
+.el .ds OX TeX
+.\" BX definition must follow TX so BX can use TX
+.if n .ds BX BibTeX
+.if t .ds BX \fRB\s-2IB\s0\fP\*(TX
+.\" LX definition must follow TX so LX can use TX
+.if n .ds LX LaTeX
+.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX
+.if n .ds WB Web
+.if t .ds WB W\s-2EB\s0
+.\"=====================================================================
+.SH NAME
+twill \- translate WEB to TeX
+.SH SYNOPSIS
+.B twill
+.RB [ \-x ]
+.IR webfile [ \fB.web\fP ]
+.RI [ changefile [ \fB.ch\fP ]]
+.\"=====================================================================
+.SH DESCRIPTION
+The
+.B twill
+program is used to create a \*(TX file for viewing a \*(WB program.
+It takes appropriate care of typographic details like page
+layout and the use of indentation, italics, boldface, etc., and it supplies
+extensive cross-index information in the form of 'mini-indexes' for each
+spread of pages and a 'master index' at the end that it gathers automatically.
+.PP
+The command line arguments are the same as for
+.B tangle
+except for the option:
+.B \-x
+says to omit the indexes, module name list, and table of contents pages.
+(A
+.I CONTENTS.tex
+file will still be written when the \*(TX file is processed,
+however, unless some macros in
+.I webmac.tex
+are redefined.)
+.PP
+The output \*(TX file name is formed by adding
+.B .tex
+to the root of the \*(WB file name.
+.PP
+There are several macros
+that probably should be redefined by
+the programmer at the beginning of the \*(WB file.
+It is a good idea to set \\title
+to the name of the program.
+And, to cause output of only changed modules, one can say
+\\let\\maybe=\\iffalse (usually as the first change in the
+change file).
+.\"=====================================================================
+.SH ENVIRONMENT
+The environment variable WEBINPUTS is used to search for the input files,
+or the system default if WEBINPUTS is not set.  See
+.BR tex (1)
+for the details of the searching.
+.\"=====================================================================
+.SH FILES
+.TP \w'@@'u+2n
+.I $TEXMFMAIN/tex/plain/knuth-lib/twimac-web.tex
+\*(TX macros used by
+.B twill
+output.
+.\"=====================================================================
+.SH "SEE ALSO"
+.BR tangle (1)
+for references, authors, and other information.
diff --git a/Master/texmf-dist/scripts/ps2eps/ps2eps.pl b/Master/texmf-dist/scripts/ps2eps/ps2eps.pl
index 7daa8752bff..dfa32b4d8a9 100755
--- a/Master/texmf-dist/scripts/ps2eps/ps2eps.pl
+++ b/Master/texmf-dist/scripts/ps2eps/ps2eps.pl
@@ -3,9 +3,7 @@
 # {#!/usr/bin/perl}.   
 # ps2eps - convert PostScript to EPS (Encapsulated PostScript) files
 # -------------------------------------------------------------------
-# $Id: ps2eps,v 1.68 2010-05-07 19:42:35 bless Exp $
-# -------------------------------------------------------
-# (C)opyright 1999-2009 Roland Bless
+# (C)opyright 1998-2018 Roland Bless
 #
 # This program is free software; you can redistribute it and/or modify     
 # it under the terms of the GNU General Public License as published by     
@@ -57,7 +55,7 @@ else
 
 $bboxver=`bbox >$NULLDEV -V`;
 $bboxname= ($?== -1) ? "" : "bbox";
-$version= '$Id: ps2eps,v 1.68 2010-05-07 19:42:35 bless Exp $'; #'
+$version= '$Id: ps2eps,v 1.70 2018-01-09 18:00:00 bless Exp $'; #'
 $insertPScode= 1;     # Insert surrounding Postscript code
 $infhandle = STDIN;   # Standard input is the default input file
 $outfhandle = STDOUT; # Standard output is default output if STDIN is input
@@ -75,6 +73,7 @@ $trytofixps= 1;       # try to fix postscript code
 $forcefixps= 0;       # fix postscript code unconditionally if eq 1
 $filterorientation= 1;# filter Orientation line
 $looseBB='';          # default: tight bounding box
+$bboxonly=0;          # output Bounding box only, no other output
 $clip=0;              # do not clip
 $warnings=0;          # do not print warnings concerning postscript sanity
 $debuggs=0;           # no debugging of ghostscript call, turn this on if you want to see the gs call
@@ -147,7 +146,7 @@ $licensetxt= "\
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n";
 
 @prgidtxt= ( "$prgname - convert PostScript to EPS (Encapsulated PostScript) files\n",
-	     "(C)opyright 1998-2009 Roland Bless\n\n" );
+	     "(C)opyright 1998-2018 Roland Bless\n\n" );
 
 @helptxt= ("Version: $ver[2]\n",
           "Operation:\n",
@@ -163,12 +162,13 @@ $licensetxt= "\
           " If BoundingBox in output seems to be wrong, please try options --size or --ignoreBB.\n\n" );
 
 @usagetxt= ("Syntax:\n",
-            " $prgname [-f] [-q] [-N] [-O] [-n] [-P] [-c] [-b] [-C] [-m] [-B] [-E] [-s <pagedim>] [-R +|-|^] [-t <x,y>] [-l] [-g] [-d] [-H] [-h|--help] [-g] [-a] [-W] [-L] [-V|--version] [--] [psfile1] [psfile2] [...]\n",
+            " $prgname [-f] [-q] [-N] [-O] [-X] [-n] [-P] [-c] [-b] [-C] [-m] [-B] [-E] [-s <pagedim>] [-R +|-|^] [-t <x,y>] [-l] [-g] [-d] [-H] [-h|--help] [-g] [-a] [-W] [-L] [-V|--version] [--] [psfile1] [psfile2] [...]\n",
             "Options:\n",
             " -f, --force                force overwriting existing files\n",
             " -q, --quiet                quiet operation (no output while processing files)\n",
             " -N, --noinsert             do not insert any postscript code\n",
             " -O, --preserveorientation  do not filter Orientation: header comment\n",
+	    " -X, --BBonly               print resulting bounding box(es) only, no other output\n",
             " -n, --nofix                do not try to fix postscript code\n",
             " -P, --removepreview        remove preview image (smaller file, but no preview)\n",
             " -F, --fixps                fix postscript code unconditionally\n",
@@ -185,7 +185,7 @@ $licensetxt= "\
 	    " -B, --ignoreBB             do not use existing bounding box as page size for rendering\n",
 	    " -E, --ignoreEOF            do not use %%EOF as hint for end of file\n",
 	    " -g, --gsbbox               use internal bbox device of ghostscript\n",
-	    " -H, --no-hires             do not use a HiResBoundingBox\n",
+	    " -H, --nohires              do not use a HiResBoundingBox\n",
             " -h, --help                 help information\n",
             " -L, --license              show licensing information\n",
             " -V, --version              show version information\n",
@@ -234,6 +234,7 @@ GetOptions('f|force'	=> \$forceoverwrite,
 	   'C|clip'	=> \$clip,
 	   'l|loose'	=> sub { $looseBB = '-l' },
 	   'B|ignoreBB'	=> \$ignoreBB,
+	   'X|BBonly'   => \$bboxonly,
 	   'E|ignoreEOF'=> \$ignoreEOFDSC,
 	   's|size=s'	=> \$opt_s,
 	   't|translate=s'	=> \$opt_t,
@@ -420,7 +421,7 @@ while ($infname= (shift @filenames))
     {
       $BBarg= $1;
       # accept even negative and fractional BBs
-      if ( $BBarg =~ /(\-?\d+\.?\d*\s+){3,}\d+/ ) # ignore %% BoundingBox: (atend) comments
+      if ( $BBarg =~ /(\-?\d+\.?\d*\s+){3,}\-?\d+\.?\d*/ ) # ignore %% BoundingBox: (atend) comments
       {
 	($eBBllx,$eBBlly,$eBBurx,$eBBury,$dummy)= split /\s/,$BBarg;
 	#print STDERR "Existing BB: $eBBllx,$eBBlly,$eBBurx,$eBBury\n";
@@ -636,6 +637,14 @@ while ($infname= (shift @filenames))
   $boundingbox = "%%BoundingBox: $cBBllx $cBBlly $cBBurx $cBBury\n";
 
   if (!$quiet) { print STDERR "ready. $boundingbox" };
+
+  if ($bboxonly) 
+  { 
+      print STDERR $boundingbox; 
+      if (defined($hiresboundingbox) && !defined($nohires)) 
+      { print STDERR $hiresboundingbox; }
+      exit 0 
+  };
   
   $before_startps= 1;
   $inserted_prolog= 0;
diff --git a/Master/texmf-dist/scripts/texdoctk/texdoctk.pl b/Master/texmf-dist/scripts/texdoctk/texdoctk.pl
index 9ef067a0192..45a0cf7e640 100755
--- a/Master/texmf-dist/scripts/texdoctk/texdoctk.pl
+++ b/Master/texmf-dist/scripts/texdoctk/texdoctk.pl
@@ -33,21 +33,10 @@ if ($IsWin32) {
 
 eval { require Tk; };
 if ($@) {
-  if ($IsWin32) {
-    $ENV{'RUNSCRIPT_ERROR_MESSAGE'} = "This Perl has no Perl/Tk module; aborting...";
-    my $vbsc = "";
-    $vbsc = `kpsewhich -format texmfscripts tl-errmess.vbs`;
-    if ($vbsc ne '') {
-      $vbsc =~ s!/!\\!g;
-      system("wscript $vbsc");
-      exit(0); # 0: prevent another error message from runscript
-    }
+  if (-x "/usr/bin/xmessage") {
+    `xmessage -center -buttons Quit "The program texdoctk needs the package perl-tk, please install it!"`;
   } else {
-    if (-x "/usr/bin/xmessage") {
-      `xmessage -center -buttons Quit "The program texdoctk needs the package perl-tk, please install it!"`;
-    } else {
-      printf STDERR "The program texdoctk needs the package perl-tk, please install it!\n";
-    }
+    printf STDERR "The program texdoctk needs the package perl-tk, please install it!\n";
   }
   exit(1);
   # that didn't work out, so warn the user and continue with text mode
diff --git a/Master/texmf-dist/web2c/texmf.cnf b/Master/texmf-dist/web2c/texmf.cnf
index c9e887339d2..fa71b3e3155 100644
--- a/Master/texmf-dist/web2c/texmf.cnf
+++ b/Master/texmf-dist/web2c/texmf.cnf
@@ -4,8 +4,8 @@
 % If you modify this original file, YOUR CHANGES WILL BE LOST when it is
 % updated.  Instead, put your changes -- and only your changes, not an
 % entire copy! -- in ../../texmf.cnf.  That is, if this file is
-% installed in /some/path/to/texlive/2021/texmf-dist/web2c/texmf.cnf,
-% put your custom settings in /some/path/to/texlive/2021/texmf.cnf.
+% installed in /some/path/to/texlive/2022/texmf-dist/web2c/texmf.cnf,
+% put your custom settings in /some/path/to/texlive/2022/texmf.cnf.
 % (Below, we use YYYY in place of the specific year.)
 % 
 % What follows is a super-summary of what this .cnf file can
@@ -84,10 +84,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
 TEXMFHOME = ~/texmf
 
 % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2021/texmf-var
+TEXMFVAR = ~/.texlive2022/texmf-var
 
 % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2021/texmf-config
+TEXMFCONFIG = ~/.texlive2022/texmf-config
 
 % This is the value manipulated by tlmgr's auxtrees subcommand in the
 % root texmf.cnf. Kpathsea warns about a literally empty string for a
@@ -835,7 +835,7 @@ nest_size = 500         % simultaneous semantic levels (e.g., groups)
 max_in_open = 15        % simultaneous input files and error insertions, 
                         % also applies to MetaPost
 param_size = 10000      % simultaneous macro parameters, also applies to MP
-save_size  = 80000      % for saving values outside current group
+save_size  = 200000     % for saving values outside current group
 stack_size = 5000       % simultaneous input sources
 
 % Limit on recursive expansion calls so TeX has a chance to quit nicely
diff --git a/Master/texmf-dist/web2c/texmfcnf.lua b/Master/texmf-dist/web2c/texmfcnf.lua
index c6cc5b959d8..b8954a02083 100644
--- a/Master/texmf-dist/web2c/texmfcnf.lua
+++ b/Master/texmf-dist/web2c/texmfcnf.lua
@@ -45,13 +45,13 @@ return {
             -- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live
 
             TEXMFSYSVAR     = "selfautoparent:texmf-var",
-            TEXMFVAR        = "home:.texlive2021/texmf-var",
+            TEXMFVAR        = "home:.texlive2022/texmf-var",
 
             -- We have only one cache path but there can be more. The first writable one
             -- will be chosen but there can be more readable paths.
 
             TEXMFCACHE      = "$TEXMFSYSVAR;$TEXMFVAR",
-            TEXMFCONFIG     = "home:.texlive2021/texmf-config",
+            TEXMFCONFIG     = "home:.texlive2022/texmf-config",
 
             -- I don't like this texmf under home and texmf-home would make more
             -- sense. One never knows what installers put under texmf anywhere and
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index d80063c895e..670541ade61 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -62,7 +62,7 @@ BEGIN {
 
 # the year of our release, will be used in the location of the
 # network packages, and in menu names, and other places.
-our $ReleaseYear = 2021;
+our $ReleaseYear = 2022;
 
 # users can upgrade from this year to the current year; might be the
 # same as the release year, or any number of releases earlier.
diff --git a/Master/tlpkg/bin/tl-update-images b/Master/tlpkg/bin/tl-update-images
index 08c84a601e3..19676eeec7f 100755
--- a/Master/tlpkg/bin/tl-update-images
+++ b/Master/tlpkg/bin/tl-update-images
@@ -2,7 +2,7 @@
 # $Id$
 # Create the .iso image(s) for TeX Live.
 # 
-# Copyright 2007-2021 Karl Berry.
+# Copyright 2007-2022 Karl Berry.
 # Copyright 2003, 2004, 2005 Sebastian Rahtz.
 #
 # This file is licensed under the GNU General Public License version 2
@@ -18,7 +18,7 @@ unset CDPATH  # avoid output from cd
 umask 022
 
 NAME=texlive
-V=2021
+V=2022
 D=`date +%Y%m%d`
 target=/home/ftp/texlive/Images/test
 
diff --git a/Master/tlpkg/bin/tl-update-messages b/Master/tlpkg/bin/tl-update-messages
index 82c459fd33e..301b6ba07bc 100755
--- a/Master/tlpkg/bin/tl-update-messages
+++ b/Master/tlpkg/bin/tl-update-messages
@@ -23,7 +23,7 @@ cat install-tl >>$tmpfile
 xgettext -o tlpkg/translations/messages.pot	\
 	--copyright-holder="TeX Live Team"	\
 	--msgid-bugs-address=tex-live@tug.org	\
-	--package-version=2021			\
+	--package-version=2022			\
 	--package-name="TeX Live"		\
         -k__ -k\$__ -k%__ -k__x -k__n:1,2 -k__nx:1,2 -k__xn:1,2 -kN__ -k  \
        texmf-dist/scripts/texlive/tlmgrgui.pl \
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index 73c0d92569e..b04f3c54169 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright 2008-2021 Norbert Preining
+# Copyright 2008-2022 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 # 
@@ -13,7 +13,7 @@ renice 20 $$ >/dev/null 2>&1
 unset CDPATH
 unset LS_COLORS
 
-yyyy=2021
+yyyy=2022
 
 check_consistency=true
 chicken=false
@@ -186,7 +186,7 @@ tlpdbopt_install_srcfiles 1
 tlpdbopt_create_formats 1
 instopt_letter 0
 instopt_adjustpath 0
-instopt_adjustrepo 1
+instopt_adjustrepo 0
 " >texlive.profile
 
 # silence envvar warnings and the welcome message.
diff --git a/Master/tlpkg/doc/graphics/GNUmakefile b/Master/tlpkg/doc/graphics/GNUmakefile
index cea5f86f609..571c06efb57 100644
--- a/Master/tlpkg/doc/graphics/GNUmakefile
+++ b/Master/tlpkg/doc/graphics/GNUmakefile
@@ -1,6 +1,8 @@
 # $Id$
 # Public domain. Originally written by Norbert Preining, 2018.
 
+all: texlive-installer-graphics-vert.png
+
 texlive-installer-graphics-vert.png: texlive-installer-graphics-horiz.png
 	convert $< -rotate 270 $@
 
@@ -10,8 +12,9 @@ texlive-installer-graphics-horiz.png: texlive-installer-graphics.pdf
 texlive-installer-graphics.pdf: texlive-installer-graphics.tex tl-lion-black.pdf
 	texfot pdflatex '\nonstopmode\input $<'
 
-texlive.png: texlive-installer-graphics-vert.png
-	convert $< -scale 97x480 $@
+# no longer used
+#texlive.png: texlive-installer-graphics-vert.png
+#	convert $< -scale 97x480 $@
 
 clean:
 	-rm -f texlive-installer-graphics.{pdf,aux,log,png}
diff --git a/Master/tlpkg/doc/graphics/texlive-installer-graphics-horiz.png b/Master/tlpkg/doc/graphics/texlive-installer-graphics-horiz.png
index 67f2a66f961..e71422307a4 100644
--- a/Master/tlpkg/doc/graphics/texlive-installer-graphics-horiz.png
+++ b/Master/tlpkg/doc/graphics/texlive-installer-graphics-horiz.png
diff --git a/Master/tlpkg/doc/graphics/texlive-installer-graphics-vert.png b/Master/tlpkg/doc/graphics/texlive-installer-graphics-vert.png
index e338f78736f..da1968e21c4 100644
--- a/Master/tlpkg/doc/graphics/texlive-installer-graphics-vert.png
+++ b/Master/tlpkg/doc/graphics/texlive-installer-graphics-vert.png
diff --git a/Master/tlpkg/doc/graphics/texlive-installer-graphics.pdf b/Master/tlpkg/doc/graphics/texlive-installer-graphics.pdf
index b41dd43f3b4..ff21d75c6d0 100644
--- a/Master/tlpkg/doc/graphics/texlive-installer-graphics.pdf
+++ b/Master/tlpkg/doc/graphics/texlive-installer-graphics.pdf
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 0220a01ef10..c5331cddf6b 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -79,16 +79,16 @@ The branch must be created right before the first pretest-specific
 commit (which is the next item, in Part II).
 
   cd /home/texlive/branch
-  rm -rf * .svn # clean out completely; trunk should also be clean
-  rev=57871 # for 2021 (svn info in trunk)
-  tlyear=`date +%Y -d "last year"` # presumably
+  rm -rf * .[^.]* # be sure .svn et al. are gone
+  rev=62180 # for 2022 (svn info in trunk)
+  tlyear=`date +%Y -d "last year"`; echo $tlyear # previous release
   umask 022 # keep TL files non-group-writable
   branch=branch$tlyear.final
   svn copy -r $rev \
     -m"$branch branch based on r$rev" \
     svn://tug.org/texlive/trunk svn://tug.org/texlive/branches/$branch
   # make working checkout:
-  svn co svn://tug.org/texlive/branches/$branch . >&out # ~30min
+  svn co svn://tug.org/texlive/branches/$branch . >&out # ~45min
 
 Do not create it earlier and merge from trunk, because then all the
 packages which got updated in the meantime, and have been updated in
@@ -101,7 +101,7 @@ and get updated again.
 0. Ensure that /home/texlive/branch from before last pretest-specific
 commit is created, clean, and up to date: see item 6 just above.
 
-0b. In crontab, disable trunk->tlnet entries.
+0b. In crontab, comment out "update tlnet from trunk" entry.
 
 1. When ready to start building tlpretest: on trunk, set
   option adjustrepo 0
@@ -109,14 +109,14 @@ in tl-update-tlnet since pretest users shouldn't go to CTAN for updates.
 This change should not go to the branch.
 
 1b. Set up tlpretest:
-Update /home/ftp/texlive/tlpretest/README.
+Update /home/ftp/texlive/tlpretest/README.md.
 Empty tlpretest except for that README and 00_TIME.txt (used for mirmon).
 
 2. Prepare for pretest in cron.tl:
+uncomment "# enable check during pretest" block.
 critical=--critical	 # tlcritical needed for new release version
-pretest=--pretest	 # update tlpretest, not tlnet (if not frozen)
-catalogue_compare=false  # just for the initial test, will set below
-net_frozen=true 	 # update tlnet|tlpretest (per $pretest)
+catalogue_compare=false  # avoid for initial test, will set below
+net_frozen=true 	 # stay local for now, no update of tlpretest
 First build happens below, after many more changes; don't start it yet.
 
 4. After setting up for pretest (not before), basic updates for release year:
@@ -138,28 +138,27 @@ Master/texmf-dist/web2c/texmf.cnf  # from Build/.../kpathsea
 Then install new binaries with tl-update-bindir. Ask tlbuild.
 Add new executables to appropriate .tlpsrc files (likewise removals).
   (svn status bin/x86_64-linux | grep '^[^M]')
+Add any man pages for the new executables (from Build/source/inst/...)
 Add new scripts to linked_scripts if not already handled.
 
-6. Run tex \\end to check that mktexfmt works. 
-Also run fmtutil-user --all to check that all formats build, no config file
-problems.  Ensure that web2c/texmf.cnf is updated for the current year
-(per above).  Then, so things will get redone later as another check:
-  rm -rf ~/.texlive`date +%Y`  # the new one
-(For karl@tug.org: create at least pdflatex.fmt and xelatex.fmt for bnb.)
+6. Run tex \\end to check that dynamic mktexfmt works. 
+Ensure that web2c/texmf.cnf is updated for the current year (per above).
+
+6a. Then run fmtutil-user --all to check that all formats build.
+
+6b. (For karl@tug.org: leave new ~karl/.texlive`date +%Y` for bnb,
+and update ~bnb/.cshrc after commit.)
 
 7. Check for Build-maintained updates to config files, new files, etc.
 (might have to merge back if Master was mistakenly updated):
   diff -ru0 --exclude=man --exclude=info \
     Build/source/inst/texmf-dist Master/texmf-dist
 
-7a. If new cjk release:
-cd Master/texmf-dist/doc
-for p in *conv hbf2gf; do cp /home/ftp/tex-archive/language/chinese/CJK/cjk-X.Y.Z/doc/pdf/$p.pdf $p; done
-
 8. Now, finally, try a first update of tlpretest:
-  force_rebuild=true cron.pretest
+  env force_rebuild=true ~karl/bin/cron.pretest
 This will fail because the pretest dir is not yet set up, but
 that's ok; the idea is to check the output and ensure all is basically ok.
+The complaints about unknown "svn status output line"s are ok.
 It's likely that .tlpsrc files will need to be adjusted for new binaries.
 
 8a. svn commit all the above.
diff --git a/Master/tlpkg/tlpsrc/cweb.tlpsrc b/Master/tlpkg/tlpsrc/cweb.tlpsrc
index 1a78e291105..54cef6e063a 100644
--- a/Master/tlpkg/tlpsrc/cweb.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cweb.tlpsrc
@@ -6,7 +6,8 @@ binpattern f bin/${ARCH}/cweave
 binpattern f bin/${ARCH}/ctwill
 binpattern f bin/${ARCH}/ctwill-refsort
 binpattern f bin/${ARCH}/ctwill-twinx
-#
+binpattern f bin/${ARCH}/twill
+
 docpattern +f texmf-dist/doc/man/man1/ctangle.*
 docpattern +f texmf-dist/doc/man/man1/cweave.*
 docpattern +f texmf-dist/doc/man/man1/cweb.*
@@ -14,4 +15,5 @@ docpattern +f texmf-dist/doc/man/man1/cweb.*
 docpattern +f texmf-dist/doc/man/man1/ctwill.*
 docpattern +f texmf-dist/doc/man/man1/ctwill-refsort.*
 docpattern +f texmf-dist/doc/man/man1/ctwill-twinx.*
-
+#
+docpattern +f texmf-dist/doc/man/man1/twill.*
diff --git a/Master/tlpkg/tlpsrc/hitex.tlpsrc b/Master/tlpkg/tlpsrc/hitex.tlpsrc
new file mode 100644
index 00000000000..4e5e25e7d8f
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/hitex.tlpsrc
@@ -0,0 +1,8 @@
+binpattern f bin/${ARCH}/hishrink
+binpattern f bin/${ARCH}/histretch
+binpattern f bin/${ARCH}/hitex
+
+docpattern f doc/man/man1/hishrink.1
+docpattern f doc/man/man1/histretch.1
+docpattern f doc/man/man1/hitex.1
+
diff --git a/Master/tlpkg/translations/ru.po b/Master/tlpkg/translations/ru.po
index bfb85902ccd..204ceb3bccd 100644
--- a/Master/tlpkg/translations/ru.po
+++ b/Master/tlpkg/translations/ru.po
@@ -672,7 +672,7 @@ msgstr "Размер листа по умолчанию для всех"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1350
 msgid "A4"
-msgstr "A4"
+msgstr "А4"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
 msgid "Letter"
@@ -2070,9 +2070,6 @@ msgstr ""
 #~ "Если нужно что-то изменить, нажмите кнопку «Назад»,\n"
 #~ "если всё в порядке, нажмите кнопку «Установить»."
 
-#~ msgid "A4"
-#~ msgstr "А4"
-
 #~ msgid "Please select a different mirror."
 #~ msgstr "Выберите другое зеркало."