fmtutil/updmap/etc. doc update

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

9 files changed, 282 insertions, 127 deletions

diff --git a/Master/texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf b/Master/texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf
index 1c63dda8539..2a12aeb761c 100644
--- a/Master/texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/fmtutil-user.man1.pdf b/Master/texmf-dist/doc/man/man1/fmtutil-user.man1.pdf
index 764878a4ed5..9e077fe31e9 100644
--- a/Master/texmf-dist/doc/man/man1/fmtutil-user.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/fmtutil-user.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/fmtutil.1 b/Master/texmf-dist/doc/man/man1/fmtutil.1
index 1b4357cdfa9..2aa27e7fd08 100644
--- a/Master/texmf-dist/doc/man/man1/fmtutil.1
+++ b/Master/texmf-dist/doc/man/man1/fmtutil.1
@@ -1,42 +1,60 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.5.
-.TH FMTUTIL "1" "April 2015" "TeX Live" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.1.
+.TH FMTUTIL "1" "March 2022" "TeX Live" "User Commands"
 .SH NAME
-fmtutil \- manage TeX formats, Metafont bases and Metapost mems, per-user
+fmtutil \- manage TeX formats and Metafont bases, per-user
 .br
-fmtutil-sys \- manage TeX formats, Metafont bases and Metapost mems, system-wide
+fmtutil-sys \- manage TeX formats and Metafont bases, system-wide
 .br
-mktexfmt \- create a TeX format, Metafont base, or Metapost mem
+mktexfmt \- create a TeX format or Metafont base
 .SH SYNOPSIS
 .B fmtutil
-[\fI\,OPTION\/\fR] ... [\fI\,COMMAND\/\fR]
+[\fI\,-user|-sys\/\fR] [\fI\,OPTION\/\fR] ... [\fI\,COMMAND\/\fR]
 .br
 .B fmtutil-sys
 [\fI\,OPTION\/\fR] ... [\fI\,COMMAND\/\fR]
 .br
+.B fmtutil-user
+[\fI\,OPTION\/\fR] ... [\fI\,COMMAND\/\fR]
+.br
 .B mktexfmt
-\fI\,FORMAT.fmt|BASE.base|MEM.mem|FMTNAME.EXT\/\fR
+\fI\,FORMAT.fmt|BASE.base|FMTNAME\/\fR
 .SH DESCRIPTION
-fmtutil version svn36788 (2015\-04\-13 00:53:26 +0900)
+fmtutil version r60154 (2021\-08\-03 23:55:56 +0200)
 .PP
-Rebuild and manage TeX formats, Metafont bases and MetaPost mems.
+Rebuild and manage TeX fmts and Metafont bases, collectively called
+"formats" here. (MetaPost no longer uses the past\-equivalent "mems".)
+.PP
+If not operating in mktexfmt mode, exactly one command must be given,
+filename suffixes should generally not be specified, no non\-option
+arguments are allowed, and multiple formats can be generated.
 .PP
 If the command name ends in mktexfmt, only one format can be created.
 The only options supported are \fB\-\-help\fR and \fB\-\-version\fR, and the command
-line must consist of either a format name, with its extension, or a
-plain name that is passed as the argument to \fB\-\-byfmt\fR (see below).  The
-full name of the generated file (if any) is written to stdout, and
-nothing else.
+line must be either a format name, with extension, or a plain name that
+is passed as the argument to \fB\-\-byfmt\fR (see below).  The full name of the
+generated file (if any) is written to stdout, and nothing else.  The
+system directories are used if they are writable, else the user directories.
 .PP
-If not operating in mktexfmt mode, the command line can be more general,
-and multiple formats can be generated, as follows.
+By default, the return status is zero if all formats requested are
+successfully built, else nonzero.
 .SH OPTIONS
 .TP
+\fB\-\-sys\fR
+use TEXMFSYS{VAR,CONFIG}
+.TP
+\fB\-\-user\fR
+use TEXMF{VAR,CONFIG}
+.TP
 \fB\-\-cnffile\fR FILE
 read FILE instead of fmtutil.cnf
 (can be given multiple times, in which case
 all the files are used)
-.HP
-\fB\-\-fmtdir\fR DIRECTORY
+.TP
+\fB\-\-dry\-run\fR, \fB\-n\fR
+don't actually build formts
+.TP
+\fB\-\-fmtdir\fR DIR
+write formats under DIR instead of TEXMF[SYS]VAR
 .TP
 \fB\-\-no\-engine\-subdir\fR
 don't use engine\-specific subdir of the fmtdir
@@ -45,21 +63,39 @@ don't use engine\-specific subdir of the fmtdir
 exit successfully if no format is selected
 .TP
 \fB\-\-no\-error\-if\-no\-engine\fR=\fI\,ENGINE1\/\fR,ENGINE2,...
-exit successfully even if the required engine
+exit successfully even if a required ENGINE
 .IP
 is missing, if it is included in the list.
 .TP
+\fB\-\-no\-strict\fR
+exit successfully even if a format fails to build
+.TP
+\fB\-\-nohash\fR
+don't update ls\-R files
+.TP
+\fB\-\-recorder\fR
+pass the \fB\-recorder\fR option and save .fls files
+.TP
+\fB\-\-refresh\fR
+recreate only existing format files
+.TP
+\fB\-\-status\-file\fR FILE
+append status information about built formats to FILE
+.TP
 \fB\-\-quiet\fR
 be silent
 .TP
-\fB\-\-test\fR
-(not implemented, just for compatibility)
+\fB\-\-catcfg\fR
+(does nothing, exists for compatibility)
 .TP
 \fB\-\-dolinks\fR
-(not implemented, just for compatibility)
+(does nothing, exists for compatibility)
 .TP
 \fB\-\-force\fR
-(not implemented, just for compatibility)
+(does nothing, exists for compatibility)
+.TP
+\fB\-\-test\fR
+(does nothing, exists for compatibility)
 .SS "Commands:"
 .TP
 \fB\-\-all\fR
@@ -68,33 +104,30 @@ recreate all format files
 \fB\-\-missing\fR
 create all missing format files
 .TP
-\fB\-\-refresh\fR
-recreate only existing format files
-.TP
-\fB\-\-byengine\fR ENGINENAME
-(re)create formats using ENGINENAME
+\fB\-\-byengine\fR ENGINE
+(re)create formats built with ENGINE
 .TP
-\fB\-\-byfmt\fR FORMATNAME
-(re)create format for FORMATNAME
+\fB\-\-byfmt\fR FORMAT
+(re)create format FORMAT
 .TP
 \fB\-\-byhyphen\fR HYPHENFILE
 (re)create formats that depend on HYPHENFILE
 .TP
-\fB\-\-enablefmt\fR FORMATNAME
-enable formatname in config file
+\fB\-\-enablefmt\fR
+FORMAT[/ENGINE]  enable FORMAT, as built with ENGINE
 .TP
-\fB\-\-disablefmt\fR FORMATNAME
-disable formatname in config file
+\fB\-\-disablefmt\fR FORMAT[/ENGINE]
+disable FORMAT, as built with ENGINE
+If multiple formats have the same name and
+.IP
+different engines, \fI\,/ENGINE\/\fP specifier is required.
 .TP
 \fB\-\-listcfg\fR
 list (enabled and disabled) configurations,
 filtered to available formats
 .TP
-\fB\-\-catcfg\fR
-output the content of the config file
-.TP
-\fB\-\-showhyphen\fR FORMATNAME
-print name of hyphenfile for format FORMATNAME
+\fB\-\-showhyphen\fR FORMAT
+print name of hyphen file for FORMAT
 .TP
 \fB\-\-version\fR
 show version information and exit
@@ -107,8 +140,10 @@ Explanation of trees and files normally used:
 .IP
 If \fB\-\-cnffile\fR is specified on the command line (possibly multiple
 times), its value(s) are used.  Otherwise, fmtutil reads all the
-fmtutil.cnf files found by running `kpsewhich \fB\-all\fR fmtutil.cnf', in the
-order returned by kpsewhich.
+fmtutil.cnf files found by running "kpsewhich \fB\-all\fR fmtutil.cnf", in the
+order returned by kpsewhich.  Files specified via \fB\-\-cnffile\fR are
+first tried to be loaded directly, and if not found and the file names
+don't contain directory parts, are searched via kpsewhich.
 .IP
 In any case, if multiple fmtutil.cnf files are found, all the format
 definitions found in all the fmtutil.cnf files are merged.
@@ -124,7 +159,7 @@ TEXMFSYSVAR    \fI\,$TEXLIVE/YYYY/texmf\-var/web2c/fmtutil.cnf\/\fP
 TEXMFLOCAL     \fI\,$TEXLIVE/texmf\-local/web2c/fmtutil.cnf\/\fP
 TEXMFDIST      \fI\,$TEXLIVE/YYYY/texmf\-dist/web2c/fmtutil.cnf\/\fP
 .IP
-For fmtutil:
+For fmtutil\-user:
 TEXMFCONFIG    $HOME/.texliveYYYY/texmf\-config/web2c/fmtutil.cnf
 TEXMFVAR       $HOME/.texliveYYYY/texmf\-var/web2c/fmtutil.cnf
 TEXMFHOME      \fI\,$HOME/texmf/web2c/fmtutil.cnf\/\fP
@@ -136,28 +171,43 @@ TEXMFDIST      \fI\,$TEXLIVE/YYYY/texmf\-dist/web2c/fmtutil.cnf\/\fP
 (where YYYY is the TeX Live release version).
 .fi
 .IP
-According to the actions, fmtutil might write to one of the given files
-or create a new fmtutil.cnf, described further below.
+According to the actions, fmtutil might update one of the existing cnf
+files or create a new fmtutil.cnf, as described below.
 .PP
-Where changes are saved:
+Where format files are written:
+.IP
+By default, format files are (re)written in \fI\,$TEXMFSYSVAR/ENGINE\/\fP by
+fmtutil\-sys, and \fI\,$TEXMFVAR/ENGINE\/\fP by fmtutil\-user, where \fI\,/ENGINE\/\fP is
+a subdirectory named for the engine used, such as "pdftex".
+.IP
+For mktexfmt, TEXMFSYSVAR is used if it is writable, else TEXMFVAR.
+.IP
+If the \fB\-\-fmtdir\fR=\fI\,DIR\/\fR option is specified, DIR is used instead of
+TEXMF[SYS]VAR, but the \fI\,/ENGINE\/\fP subdir is still used by default.
+.IP
+In all cases, if the \fB\-\-no\-engine\-subdir\fR option is specified, the
+\fI\,/ENGINE\/\fP subdir is omitted.
+.PP
+Where configuration changes are saved:
 .IP
 If config files are given on the command line, then the first one
 given will be used to save any changes from \fB\-\-enable\fR or \fB\-\-disable\fR.
+.IP
 If the config files are taken from kpsewhich output, then the
-algorithm is more complex:
+algorithm is more complicated:
 .IP
-1) If \fI\,$TEXMFCONFIG/web2c/fmtutil.cnf\/\fP or \fI\,$TEXMFHOME/web2c/fmtutil.cnf\/\fP
-appears in the list of used files, then the one listed first by
-kpsewhich \fB\-\-all\fR (equivalently, the one returned by kpsewhich
-fmtutil.cnf), is used.
+1) If \fI\,$TEXMFCONFIG/web2c/fmtutil.cnf\/\fP or
+\fI\,$TEXMFHOME/web2c/fmtutil.cnf\/\fP appears in the list of used files,
+then the one listed first by kpsewhich \fB\-\-all\fR (equivalently, the one
+returned by "kpsewhich fmtutil.cnf"), is used.
 .IP
 2) If neither of the above two are present and changes are made, a
 new config file is created in \fI\,$TEXMFCONFIG/web2c/fmtutil.cnf\/\fP.
 .IP
 In general, the idea is that if a given config file is not writable, a
 higher\-level one can be used.  That way, the distribution's settings
-can be overridden for system\-wide using TEXMFLOCAL, and then system
-settings can be overridden again for a particular using using TEXMFHOME.
+can be overridden system\-wide using TEXMFLOCAL, and system settings
+can be overridden again in a particular user's TEXMFHOME or TEXMFCONF.
 .PP
 Resolving multiple definitions of a format:
 .IP
@@ -167,30 +217,43 @@ coming from the first\-listed fmtutil.cnf is used.
 Disabling formats:
 .IP
 fmtutil.cnf files with higher priority (listed earlier) can disable
-formats mentioned in lower priority (listed later) fmtutil.cnf files by
-writing, e.g.,
+formats in lower priority (listed later) fmtutil.cnf files by
+writing a line like this in the higher\-priority fmtutil.cnf file:
 .IP
 #! <fmtname> <enginename> <hyphen> <args>
 .IP
-in the higher\-priority fmtutil.cnf file.
+The #! must be at the beginning of the line, with at least one space
+or tab afterward, and there must be whitespace between each word on
+the list.
 .IP
-As an example, suppose you have want to disable the luajitlatex format.
-You can create the file \fI\,$TEXMFCONFIG/web2c/fmtutil.cnf\/\fP with the content
+For example, you can disable the luajitlatex format by creating
+the file \fI\,$TEXMFCONFIG/web2c/fmtutil.cnf\/\fP with the line
 .IP
 #! luajitlatex luajittex language.dat,language.dat.lua lualatex.ini
 .IP
-and call fmtutil.
+(As it happens, the luajittex\-related formats are precisely why the
+\fB\-\-no\-error\-if\-no\-engine\fR option exists, since luajittex cannot be
+compiled on all platforms. So this is not needed.)
 .PP
-fmtutil vs. fmtutil\-sys (fmtutil \fB\-\-sys\fR):
+fmtutil\-user (fmtutil \fB\-user\fR) vs. fmtutil\-sys (fmtutil \fB\-sys\fR):
 .IP
-When fmtutil\-sys is run or the command line option \fB\-\-sys\fR is used,
+When fmtutil\-sys is run or the command line option \fB\-sys\fR is used,
 TEXMFSYSCONFIG and TEXMFSYSVAR are used instead of TEXMFCONFIG and
-TEXMFVAR, respectively.  This is the primary difference between
-fmtutil\-sys and fmtutil.
+TEXMFVAR, respectively. This is the primary difference between
+fmtutil\-sys and fmtutil\-user.
+.IP
+See https://tug.org/texlive/scripts\-sys\-user.html for details.
 .IP
 Other locations may be used if you give them on the command line, or
 these trees don't exist, or you are not using the original TeX Live.
+.PP
+Supporting development binaries:
+.IP
+If an engine name ends with "\-dev", formats are created in
+the respective directory with the \fB\-dev\fR stripped.  This allows for
+easily running development binaries in parallel with the released
+binaries.
 .SH "REPORTING BUGS"
-Report bugs to: tex\-k@tug.org
+Report bugs to: tex\-live@tug.org
 .br
-TeX Live home page: <http://tug.org/texlive/>
+TeX Live home page: <https://tug.org/texlive/>
diff --git a/Master/texmf-dist/doc/man/man1/fmtutil.man1.pdf b/Master/texmf-dist/doc/man/man1/fmtutil.man1.pdf
index 075bd22f1ed..4b38a4b7ccf 100644
--- a/Master/texmf-dist/doc/man/man1/fmtutil.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/fmtutil.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/mktexfmt.man1.pdf b/Master/texmf-dist/doc/man/man1/mktexfmt.man1.pdf
index 8b128ab6c11..5df85da8ed6 100644
--- a/Master/texmf-dist/doc/man/man1/mktexfmt.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/mktexfmt.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/updmap-sys.man1.pdf b/Master/texmf-dist/doc/man/man1/updmap-sys.man1.pdf
index bd90cced110..c87469e580e 100644
--- a/Master/texmf-dist/doc/man/man1/updmap-sys.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/updmap-sys.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/updmap-user.man1.pdf b/Master/texmf-dist/doc/man/man1/updmap-user.man1.pdf
index e1b0496e358..d0fb0254888 100644
--- a/Master/texmf-dist/doc/man/man1/updmap-user.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/updmap-user.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/updmap.1 b/Master/texmf-dist/doc/man/man1/updmap.1
index c72ae139fec..e7059ffd7de 100644
--- a/Master/texmf-dist/doc/man/man1/updmap.1
+++ b/Master/texmf-dist/doc/man/man1/updmap.1
@@ -1,33 +1,60 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.45.1.
-.TH UPDMAP "1" "May 2014" "TeX Live" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.1.
+.TH UPDMAP "1" "March 2022" "TeX Live" "User Commands"
 .SH NAME
-updmap \- manage TeX font maps, per-user
+updmap \- manage TeX font maps
 .br
 updmap-sys \- manage TeX font maps, system-wide
+.br
+updmap-user \- manage TeX font maps, per-user
 .SH SYNOPSIS
 .B updmap
+[\fI\,-user|-sys\/\fR] [\fI\,OPTION\/\fR] ... [\fI\,COMMAND\/\fR]
+.br
+.B updmap-user
 [\fI\,OPTION\/\fR] ... [\fI\,COMMAND\/\fR]
 .br
 .B updmap-sys
 [\fI\,OPTION\/\fR] ... [\fI\,COMMAND\/\fR]
 .SH DESCRIPTION
-updmap version svn33988 (2014\-05\-12 15:39:32 +0900)
+updmap version r59152 (2021\-05\-09 23:49:52 +0200)
 .PP
-Update the default font map files used by pdftex, dvips, and dvipdfm(x),
-and optionally pxdvi, as determined by all configuration files updmap.cfg
-(the ones returned by running "kpsewhich \fB\-\-all\fR updmap.cfg", but see below).
+Update the default font map files used by pdftex and dvipdfm(x)
+(pdftex.map), dvips (psfonts.map), and optionally pxdvi, as determined
+by all configuration files updmap.cfg (usually the ones returned by
+running "kpsewhich \fB\-\-all\fR updmap.cfg", but see below).
 .PP
 Among other things, these map files are used to determine which fonts
 should be used as bitmaps and which as outlines, and to determine which
-font files are included in the PDF or PostScript output.
+font files are included, typically subsetted, in the PDF or PostScript output.
+.PP
+updmap\-sys (or updmap \fB\-sys\fR) is intended to affect the system\-wide
+configuration, while updmap\-user (or updmap \fB\-user\fR) affects personal
+configuration files only, overriding the system files.
 .PP
-updmap\-sys is intended to affect the system\-wide configuration, while
-updmap affects personal configuration files only, overriding the system
-files.  As a consequence, once updmap has been run, even a single time,
-running updmap\-sys no longer has any effect.  (updmap\-sys issues a
-warning in this situation.)
+As a consequence, once updmap\-user has been run, even a single time,
+running updmap\-sys no longer has any effect.  updmap\-sys issues a
+warning about this, since it is rarely desirable.
+See https://tug.org/texlive/scripts\-sys\-user.html for details.
 .PP
 By default, the TeX filename database (ls\-R) is also updated.
+.PP
+The updmap system is regrettably complicated, for both inherent and
+historical reasons.  A general overview:
+.PP
+\- updmap.cfg files are mainly about listing other files, namely the
+.IP
+font\-specific .maps, in which each line gives information about a
+different TeX (.tfm) font.
+.PP
+\- updmap reads the updmap.cfg files and then concatenates the
+.IP
+contents of those .map files into the main output files: psfonts.map
+for dvips and pdftex.map for pdftex and dvipdfmx.
+.PP
+\- The updmap.cfg files themselves are created and updated at package
+.IP
+installation time, by the system installer or the package manager or
+by hand, and not (by default) by updmap.
 .SH OPTIONS
 .TP
 \fB\-\-cnffile\fR FILE
@@ -60,11 +87,14 @@ recreate files even if config hasn't changed
 do not recreate map files
 .TP
 \fB\-\-nohash\fR
-do not run texhash
+do not run mktexlsr (a.k.a. texhash)
 .TP
 \fB\-\-sys\fR
 affect system\-wide files (equivalent to updmap\-sys)
 .TP
+\fB\-\-user\fR
+affect personal files (equivalent to updmap\-user)
+.TP
 \fB\-n\fR, \fB\-\-dry\-run\fR
 only show the configuration, no output
 .TP
@@ -96,29 +126,57 @@ where MAPTYPE is Map, MixedMap, or KanjiMap
 .TP
 \fB\-\-enable\fR Map=MAPFILE
 add "Map MAPFILE" to updmap.cfg
-.HP
-\fB\-\-enable\fR MixedMap=MAPFILE add "MixedMap MAPFILE" to updmap.cfg
-.HP
-\fB\-\-enable\fR KanjiMap=MAPFILE add "KanjiMap MAPFILE" to updmap.cfg
+.TP
+\fB\-\-enable\fR MixedMap=MAPFILE
+add "MixedMap MAPFILE" to updmap.cfg
+.TP
+\fB\-\-enable\fR KanjiMap=MAPFILE
+add "KanjiMap MAPFILE" to updmap.cfg
 .TP
 \fB\-\-disable\fR MAPFILE
 disable MAPFILE, of whatever type
 .TP
 \fB\-\-listmaps\fR
-list all active and inactive maps
+list all maps (details below)
 .TP
 \fB\-\-listavailablemaps\fR
-same as \fB\-\-listmaps\fR, but without
-unavailable map files
+list available maps (details below)
 .TP
 \fB\-\-syncwithtrees\fR
 disable unavailable map files in updmap.cfg
 .PP
-Explanation of the map types: the (only) difference between Map and
-MixedMap is that MixedMap entries are not added to psfonts_pk.map.
-The purpose is to help users with devices that render Type 1 outline
-fonts worse than mode\-tuned Type 1 bitmap fonts.  So, MixedMap is used
-for fonts that are available as both Type 1 and Metafont.
+The main output:
+.IP
+The main output of updmap is the files containing the individual font
+map lines which the drivers (dvips, pdftex, etc.) read to handle fonts.
+.IP
+The map files for dvips (psfonts.map) and pdftex and dvipdfmx
+(pdftex.map) are written to TEXMFVAR/fonts/map/updmap/{dvips,pdftex}/.
+.IP
+In addition, information about Kanji fonts is written to
+TEXMFVAR/fonts/map/updmap/dvipdfmx/kanjix.map, and optionally to
+TEXMFVAR/fonts/map/updmap/pxdvi/xdvi\-ptex.map.  These are for Kanji
+only and are not like other map files.  dvipdfmx reads pdftex.map for
+the map entries for non\-Kanji fonts.
+.IP
+If no option is given, so the invocation is just "updmap\-user" or
+"updmap\-sys", these output files are always recreated.
+.IP
+Otherwise, if an option such as \fB\-\-enable\fR or \fB\-\-disable\fR is given, the
+output files are recreated if the list of enabled map files (from
+updmap.cfg) has changed.  The \fB\-\-force\fR option overrides this,
+always recreating the output files.
+.PP
+Explanation of the map types:
+.IP
+The normal type is Map.
+.IP
+The only difference between Map and MixedMap is that MixedMap entries
+are not added to psfonts_pk.map.  The purpose is to help users with
+devices that render Type 1 outline fonts worse than mode\-tuned Type 3
+bitmap fonts.  So, MixedMap is used for fonts that are available as
+both Type 1 and Metafont.
+.IP
 KanjiMap entries are added to psfonts_t1.map and kanjix.map.
 .PP
 Explanation of the OPTION names for \fB\-\-showoptions\fR, \fB\-\-showoption\fR, \fB\-\-setoption\fR:
@@ -143,10 +201,19 @@ true,false  (default false)
 .IP
 Whether maps for pxdvi (Japanese\-patched xdvi) are under updmap's control.
 .TP
-kanjiEmbed
+jaEmbed
+(any string)
+.TP
+jaVariant
 (any string)
 .TP
-kanjiVariant
+scEmbed
+(any string)
+.TP
+tcEmbed
+(any string)
+.TP
+koEmbed
 (any string)
 .IP
 See below.
@@ -177,21 +244,24 @@ file which the programs read, so they can be overridden by specifying
 command\-line options or configuration files to the programs, as
 explained at the beginning of updmap.cfg.
 .IP
-The options kanjiEmbed and kanjiVariant specify special replacements
-in the map lines.  If a map contains the string @kanjiEmbed@, then
-this will be replaced by the value of that option; similarly for
-kanjiVariant.  In this way, users of Japanese TeX can select different
-fonts to be included in the final output.
+The options jaEmbed and jaVariant (formerly kanjiEmbed and kanjiVariant)
+specify special replacements in the map lines.  If a map contains the
+string @jaEmbed@, then this will be replaced by the value of that option;
+similarly for jaVariant.  In this way, users of Japanese TeX can select
+different fonts to be included in the final output.  The counterpart for
+Simplified Chinese, Traditional Chinese and Korean fonts are
+scEmbed, tcEmbed and koEmbed respectively.
 .SH ENVIRONMENT
 .PP
 Explanation of trees and files normally used:
 .IP
-If \fB\-\-cnffile\fR is specified on the command line (possibly multiple
-times), its value(s) are used.  Otherwise, updmap reads all the
-updmap.cfg files found by running `kpsewhich \fB\-all\fR updmap.cfg', in the
-order returned by kpsewhich.
+If \fB\-\-cnffile\fR is specified on the command line (can be given multiple
+times), its value(s) is(are) used.  Otherwise, updmap reads all the
+updmap.cfg files found by running `kpsewhich \fB\-all\fR updmap.cfg',
+in the order returned by kpsewhich (which is the order of trees
+defined in texmf.cnf).
 .IP
-In any case, if multiple updmap.cfg files are found, all the maps
+In either case, if multiple updmap.cfg files are found, all the maps
 mentioned in all the updmap.cfg files are merged.
 .IP
 Thus, if updmap.cfg files are present in all trees, and the default
@@ -205,7 +275,7 @@ TEXMFSYSVAR    \fI\,$TEXLIVE/YYYY/texmf\-var/web2c/updmap.cfg\/\fP
 TEXMFLOCAL     \fI\,$TEXLIVE/texmf\-local/web2c/updmap.cfg\/\fP
 TEXMFDIST      \fI\,$TEXLIVE/YYYY/texmf\-dist/web2c/updmap.cfg\/\fP
 .IP
-For updmap:
+For updmap\-user:
 TEXMFCONFIG    $HOME/.texliveYYYY/texmf\-config/web2c/updmap.cfg
 TEXMFVAR       $HOME/.texliveYYYY/texmf\-var/web2c/updmap.cfg
 TEXMFHOME      \fI\,$HOME/texmf/web2c/updmap.cfg\/\fP
@@ -220,25 +290,31 @@ TEXMFDIST      \fI\,$TEXLIVE/YYYY/texmf\-dist/web2c/updmap.cfg\/\fP
 According to the actions, updmap might write to one of the given files
 or create a new updmap.cfg, described further below.
 .PP
-Where changes are saved:
+Where and which updmap.cfg changes are saved:
+.IP
+When no options are given, the updmap.cfg file(s) are only read, not
+written.  It's when an option \fB\-\-setoption\fR, \fB\-\-enable\fR or \fB\-\-disable\fR is
+specified that an updmap.cfg needs to be updated.  In this case:
+.IP
+1) If config files are given on the command line, then the first one
+given is used to save any such changes.
 .IP
-If config files are given on the command line, then the first one
-given will be used to save any changes from \fB\-\-setoption\fR, \fB\-\-enable\fR
-or \fB\-\-disable\fR.  If the config files are taken from kpsewhich output,
-then the algorithm is more complex:
+2) If the config files are taken from kpsewhich output, then the
+algorithm is more complex:
 .IP
-1) If \fI\,$TEXMFCONFIG/web2c/updmap.cfg\/\fP or \fI\,$TEXMFHOME/web2c/updmap.cfg\/\fP
+2a) If \fI\,$TEXMFCONFIG/web2c/updmap.cfg\/\fP or \fI\,$TEXMFHOME/web2c/updmap.cfg\/\fP
 appears in the list of used files, then the one listed first by
 kpsewhich \fB\-\-all\fR (equivalently, the one returned by kpsewhich
 updmap.cfg), is used.
 .IP
-2) If neither of the above two are present and changes are made, a
+2b) If neither of the above two are present and changes are made, a
 new config file is created in \fI\,$TEXMFCONFIG/web2c/updmap.cfg\/\fP.
 .IP
-In general, the idea is that if a given config file is not writable, a
-higher\-level one can be used.  That way, the distribution's settings
-can be overridden for system\-wide using TEXMFLOCAL, and then system
-settings can be overridden again for a particular using using TEXMFHOME.
+In general, the idea is that if the user cannot write to a given
+config file, a higher\-level one can be used.  That way, the
+distribution's settings can be overridden system\-wide using
+TEXMFLOCAL, and system settings can be overridden again in a
+particular user's TEXMFHOME or TEXMFCONFIG.
 .PP
 Resolving multiple definitions of a font:
 .IP
@@ -258,8 +334,12 @@ writing, e.g.,
 or
 .IP
 #! MixedMap mapname.map
-.IP
+.TP
 in the higher\-priority updmap.cfg file.
+(The #! must be at the
+.IP
+beginning of the line, with at least one space or tab afterward, and
+whitespace between each word on the list.)
 .IP
 As an example, suppose you have a copy of MathTime Pro fonts
 and want to disable the Belleek version of the fonts; that is,
@@ -272,16 +352,26 @@ Map mt\-yy.map
 .IP
 and call updmap.
 .PP
-updmap writes the map files for dvips (psfonts.map) and pdftex
-(pdftex.map) to the TEXMFVAR/fonts/map/updmap/{dvips,pdftex}/
-directories.
-.PP
-The log file is written to TEXMFVAR/web2c/updmap.log.
+Listing of maps:
+.IP
+The two options \fB\-\-listmaps\fR and \fB\-\-listavailablemaps\fR list all maps
+defined in any of the updmap.cfg files (for \fB\-\-listmaps\fR), and
+only those actually found on the system (for \fB\-\-listavailablemaps\fR).
+The output format is one line per font map, with the following
+fields separated by tabs: map, type (Map, MixedMap, KanjiMap),
+status (enabled, disabled), origin (the updmap.cfg file where
+it is mentioned, or 'builtin' for the three basic maps).
+.IP
+In the case of \fB\-\-listmaps\fR there can be one additional fields
+(again separated by tab) containing '(not available)' for those
+map files that cannot be found.
 .PP
+updmap\-user vs. updmap\-sys:
+.IP
 When updmap\-sys is run, TEXMFSYSCONFIG and TEXMFSYSVAR are used
-instead of TEXMFCONFIG and TEXMFVAR, respectively.  This is the only
-difference between updmap\-sys and updmap.
-.PP
+instead of TEXMFCONFIG and TEXMFVAR, respectively.  This is the
+primary difference between updmap\-sys and updmap\-user.
+.IP
 Other locations may be used if you give them on the command line, or
 these trees don't exist, or you are not using the original TeX Live.
 .PP
@@ -289,9 +379,11 @@ To see the precise locations of the various files that
 will be read and written, give the \fB\-n\fR option (or read the source).
 .SH EXAMPLES
 .PP
+The log file is written to TEXMFVAR/web2c/updmap.log.
+.PP
 For step\-by\-step instructions on making new fonts known to TeX, read
-http://tug.org/fonts/fontinstall.html.  For even more terse
-instructions, read the beginning of the main updmap.cfg.
+https://tug.org/fonts/fontinstall.html.  For even more terse
+instructions, read the beginning of the main updmap.cfg file.
 .SH FILES
 Configuration and input files:
 .IP "\fIupdmap\&.cfg\fP"
@@ -357,7 +449,7 @@ Loads \fIpsfonts_t1\&.map\fP instead
 of \fIpsfonts\&.map\fP\&.
 .IP "\fIconfig\&.pdf\fP"
 Loads \fIpsfonts_t1\&.map\fP instead
-of \fIpsfonts\&.map\fP and has additional optimizations for PDF generation\&.
+of \fIpsfonts\&.map\fP and has additional settings for PDF generation\&.
 .IP "\fIconfig\&.pk\fP"
 Loads \fIpsfonts_pk\&.map\fP instead
 of \fIpsfonts\&.map\fP\&.
@@ -369,6 +461,6 @@ of \fIpsfonts\&.map\fP\&.
 Loads \fIpsfonts_t1\&.map\fP instead
 of \fIpsfonts\&.map\fP\&.
 .SH "REPORTING BUGS"
-Report bugs to: tex\-k@tug.org
+Report bugs to: tex\-live@tug.org
 .br
-TeX Live home page: <http://tug.org/texlive/>
+TeX Live home page: <https://tug.org/texlive/>
diff --git a/Master/texmf-dist/doc/man/man1/updmap.man1.pdf b/Master/texmf-dist/doc/man/man1/updmap.man1.pdf
index 1f6d378daca..b619addeeb6 100644
--- a/Master/texmf-dist/doc/man/man1/updmap.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/updmap.man1.pdf