fontools (5apr21)

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

3 files changed, 147 insertions, 138 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/fontools/afm2afm b/Build/source/texk/texlive/linked_scripts/fontools/afm2afm
index e5ace31b1c0..b1233e0c521 100755
--- a/Build/source/texk/texlive/linked_scripts/fontools/afm2afm
+++ b/Build/source/texk/texlive/linked_scripts/fontools/afm2afm
@@ -4,7 +4,7 @@
 
 ----------------------------------------------------------------------------
 
-    Copyright (C) 2005-2020 Marc Penninga.
+    Copyright (C) 2005-2021 Marc Penninga.
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
@@ -37,7 +37,7 @@ use File::Basename;
 use Getopt::Long;
 use Pod::Usage;
 
-my $VERSION = "20201218";
+my $VERSION = "20210401";
 
 parse_commandline();
 
@@ -398,7 +398,7 @@ Marc Penninga <marcpenninga@gmail.com>
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2020 Marc Penninga.
+Copyright (C) 2005-2021 Marc Penninga.
 
 
 =head1 LICENSE
@@ -421,7 +421,7 @@ See the GNU General Public License for more details.
 
 =head1 VERSION
 
-This document describes B<afm2afm> version 20201218.
+This document describes B<afm2afm> version 20210401.
 
 
 =head1 RECENT CHANGES
diff --git a/Build/source/texk/texlive/linked_scripts/fontools/autoinst b/Build/source/texk/texlive/linked_scripts/fontools/autoinst
index 79eb1e13024..77e17aa92e9 100755
--- a/Build/source/texk/texlive/linked_scripts/fontools/autoinst
+++ b/Build/source/texk/texlive/linked_scripts/fontools/autoinst
@@ -4,7 +4,7 @@
 
 ----------------------------------------------------------------------------
 
-    Copyright (C) 2005-2020 Marc Penninga.
+    Copyright (C) 2005-2021 Marc Penninga.
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
@@ -34,13 +34,14 @@ use strict;
 use warnings;
 
 use Cwd ();
+use File::Basename ();
 use File::Path ();
 use File::Spec ();
 use Getopt::Long ();
 use Pod::Usage ();
 use POSIX ();
 
-my $VERSION = '20201218';
+my $VERSION = '20210401';
 
 my ($d, $m, $y) = (localtime time)[3 .. 5];
 my $TODAY = sprintf "%04d/%02d/%02d", $y + 1900, $m + 1, $d;
@@ -641,15 +642,14 @@ sub _parse_metadata {
     $data->{family}    =~ s/(\d)/$DIGITS[$1]/xmsge;
     $data->{family}    =~ s/[^A-Za-z]+//xmsg;
 
-    if ($data->{family} =~ m/\A DTL/xms) {
-        $data->{family}    =~ s/\A DTL//xms;
-        $data->{subfamily} =~ s/\A (?: ST | T)//xms;
+    if ($data->{family} =~ s/\A DTL//xms) {
+        $data->{subfamily} =~ s/\A (?: ST | T | SD | D)//xms;
     }
 
     # remove Adobe's SmallText size, to avoid mistaking it for Text weight
-    $data->{family}    =~ s/(?: SmallText | SmText )\z//xmsi;
-    $data->{subfamily} =~ s/(?: SmallText | SmText )\z//xmsi;
-    $data->{fullname}  =~ s/(?: SmallText | SmText )\z//xmsi;
+    for my $fieldname (qw(family subfamily fullname)) {
+        $data->{$fieldname} =~ s/(?: SmallText | SmText )\z//xmsi;
+    }
 
     # Sometimes the relevant info is in Fullname, sometimes in Subfamily;
     # so we need to test against both
@@ -2272,7 +2272,7 @@ sub create_command {
 
     return join q( ), 'otftotfm',
                       '--automatic',
-                      "--encoding=$workitem->{enc_file}",
+                      "--encoding='$workitem->{enc_file}'",
                       $targetdirs,
                       '--no-updmap',
                       '--force',
@@ -2676,12 +2676,11 @@ sub process_encoding_options {
 
     # All specified encodings should either be built-in,
     # or have an accompanying .enc file in the current directory.
-    $ARGV{encoding} =~ s/\s+//xmsg;
     my @encodings = split /,/, $ARGV{encoding};
     for my $enc (@encodings) {
         if ($enc !~ m/\A(OT1|T1|TS1|LY1|LGR|T2[ABC]|T3|TS3)\z/xmsi) {
             my $try = $enc;
-            $try .= '.enc' if $try !~ m/[.]enc\z/xms;
+            $try .= '.enc' if $try !~ m/[.]enc\z/xmsi;
             if (!-e $try) {
                 die "[ERROR]     No .enc file found for '$enc'";
             }
@@ -3052,9 +3051,11 @@ sub cleanup {
     # in the current directory, or to the name of one of our standard
     # encodings.  In the latter case, we add the 'fontools_' prefix.
     my $try = $workitem->{encoding};
-    $try .= '.enc' if $try !~ m/[.]enc\z/xms;
+    $try .= '.enc' if $try !~ m/[.]enc\z/xmsi;
     if (-e $try) {
         $workitem->{enc_file} = $try;
+        $workitem->{encoding}
+            = File::Basename::basename($try, '.enc', '.ENC');
     }
     else {
         ($workitem->{enc_file} = $workitem->{encoding})
@@ -3256,7 +3257,7 @@ OpenType fonts in LaTeX, but they can be hard to use:
 they need many, often long, command lines
 and don't generate the F<fd> and F<sty> files LaTeX needs.
 B<autoinst> simplifies the use of the I<TypeTools> for font installation
-by generating and executing all commands for I<otftotfm>
+by generating and executing all commands for I<otftotfm>,
 and by creating and installing all necessary F<fd> and F<sty> files.
 
 Given a family of font files (in F<otf> or F<ttf> format),
@@ -3298,7 +3299,7 @@ Swash
 
 =item I<nw>
 
-`Upright swash'
+"Upright swash"
 
 =back
 
@@ -3316,16 +3317,16 @@ in roman, italic and slanted shapes.
 
 =item -
 
-Families with `Titling' characters;
-these `... replace the default glyphs
+Families with "Titling" characters;
+these "... replace the default glyphs
 with corresponding forms designed specifically for titling.
 These may be all-capital and/or larger on the body,
-and adjusted for viewing at larger sizes'
+and adjusted for viewing at larger sizes"
 (according to the OpenType Specification).
 
 =item -
 
-An ornament family, also in roman, italic and slanted shapes.
+An ornament family; also in roman, italic and slanted shapes.
 
 =back
 
@@ -3384,20 +3385,20 @@ numerators and denominators
 
 The individual fonts are named I<< <FontName>-<suffix>-<shape>-<enc> >>,
 where I<< <suffix> >> is the same as above (but in lowercase),
-I<< <shape> >> is either empty, `sc' or `swash',
+I<< <shape> >> is either empty, "sc" or "swash",
 and I<< <enc> >> is the encoding (also in lowercase).
-A typical name in this scheme would be `FiraSans-Light-osf-sc-ly1'.
+A typical name in this scheme would be I<FiraSans-Light-osf-sc-ly1>.
 
 
 =head2 Using the fonts in your LaTeX documents
 
 B<autoinst> generates a style file for using the fonts in LaTeX documents,
-named F<< <FontFamily>.sty >>. This style file also takes care of loading
-the F<fontenc> and F<textcomp> packages.
+named F<< <FontFamily>.sty >>. This style file also loads the F<fontenc>
+and F<textcomp> packages, if necessary.
 To use the fonts, add the command C<<< \usepackage{I<< <FontFamily> >>} >>>
 to the preamble of your document.
 
-This style file defines a number of options:
+This style file has a few options:
 
 =over 4
 
@@ -3413,7 +3414,7 @@ yourself.
 =item C<lining>, C<oldstyle>, C<tabular>, C<proportional>
 
 Choose which figure style to use.
-The defaults are `oldstyle' and `proportional' (if available).
+The defaults are "oldstyle" and "proportional" (if available).
 
 =item C<<< scale=I<< <number> >> >>>, C<scale=MatchLowercase>
 
@@ -3421,25 +3422,25 @@ Scale the font by a factor of I<< <number> >>.
 E.g., to increase the size of the font by 5%, use
 C<<< \usepackage[scale=1.05]{I<< <FontFamily> >>} >>>.
 The special value C<MatchLowercase> may be used to scale the font
-so that its x-height matches that of the previously active font
-(which is usually Computer Modern, unless you have loaded another
-font package before this one).
+so that its x-height matches that of the current main font
+(which is usually Computer Modern Roman, unless you have loaded
+another font package before this one).
 The name C<scaled> may be used as a synonym for C<scale>.
 
 =item C<medium>, C<book>, C<text>, C<normal>, C<regular>
 
-Select the weight that LaTeX will use as the `regular' weight.
+Select the weight that LaTeX will use as the "regular" weight.
 
 =item C<heavy>, C<black>, C<extrabold>, C<demibold>, C<semibold>, C<bold>
 
-Select the weight that LaTeX will use as the `bold' weight.
+Select the weight that LaTeX will use as the "bold" weight.
 
 =back
 
 The last two groups of options will only work if
 you have the F<mweights> package installed.
 The default here is not to change LaTeX's default,
-i.e. use the `m' and `b' weights.
+i.e. use the "m" and "b" weights.
 
 The style file will also try to load the F<fontaxes> package
 (on CTAN), which gives easy access to various font shapes and styles.
@@ -3457,9 +3458,9 @@ characters:
     \inffigures     \textinferior   \textinf, \textin
 
 
-In addition, the C<\swshape> and C<\textsw> commands are redefined to place
-swash on F<fontaxes>' secondary shape axis (F<fontaxes> places it on the
-primary shape axis) to make them behave properly when nested, so that
+In addition, the existing C<\swshape> and C<\textsw> commands are redefined
+to place swash on F<fontaxes>' secondary shape axis (F<fontaxes> places it
+on the primary shape axis) to make them behave properly when nested, so that
 C<\swshape\upshape> will give upright swash.
 
 There are no commands for accessing the numerator and denominator
@@ -3467,8 +3468,8 @@ fonts; these can be selected using F<fontaxes>' standard commands,
 e.g., C<\fontfigurestyle{numerator}\selectfont>.
 
 These commands are only generated for existing shapes and number styles;
-no commands are generated for shapes and styles that don't exist,
-or whose generation was turned off by the user.
+no commands are generated for shapes and styles that are missing from
+your fonts.
 Also these commands are built on top of F<fontaxes>, so if that package
 cannot be found, you're limited to using the lower-level commands from
 standard NFSS (C<\fontfamily>, C<\fontseries>, C<\fontshape> etc.).
@@ -3499,13 +3500,13 @@ Use these fonts for the maths in your document.
 =item C<mathlining>, C<matholdstyle>
 
 Choose which figure style to use in maths.
-The default is `mathlining'.
+The default is "mathlining".
 
 =item C<mathcal>
 
 Use the swash characters from your fonts as the C<\mathcal> alphabet.
-(This option only exists if your fonts actually contain swash characters
-and a C<swsh> feature to access them).
+(This option will only exist if your fonts actually contain swash characters,
+plus a C<swsh> feature to access them).
 
 =item C<nomathgreek>
 
@@ -3513,7 +3514,7 @@ Don't redeclare greek letters in math.
 
 =item C<<< math-style=I<< <style> >> >>>
 
-Choose the `math style' to use.
+Choose the "math style" to use.
 With C<math-style=ISO>, all latin and greek letters in math are italic;
 with C<math-style=TeX> (the default), uppercase greek is upright;
 with C<math-style=french>, all greek as well as uppercase latin is upright;
@@ -3521,7 +3522,7 @@ and with C<math-style=upright> all letters are upright.
 
 =back
 
-Note that this `math' option only changes digits, latin and greek letters,
+Note that this C<math> option only affects digits, latin and greek letters,
 plus a few basic punctuation characters; all other mathematical symbols,
 operators, delimiters etc. are left as they were before.
 If you don't want to use TeX's default versions of those symbols,
@@ -3551,14 +3552,14 @@ series (the concatenation of weight and width), shape and size.
 B<autoinst> parses the font's metadata to determine these parameters.
 When this fails (usually because the font family contains uncommon weights,
 widths or shapes),
-B<autoinst> ends up with different fonts having the I<same> values
+B<autoinst> ends up with multiple fonts having the same values
 for these font parameters; such fonts cannot be used in NFSS,
 since there's no way distinguish them.
 When B<autoinst> detects such a situation, it will print an error message
 and abort.
 If that happens, either rerun B<autoinst> on a smaller set of fonts,
-or add the missing widths, weights and shapes to the tables C<WIDTH>,
-C<WEIGHT> and C<SHAPE> in the source code.
+or add the missing widths, weights and shapes to the tables C<@WIDTH>,
+C<@WEIGHT> and C<%SHAPE> in the source code.
 Please also send a bug report (see L<AUTHOR> below).
 
 The mapping of shapes to NFSS codes is done using the following table:
@@ -3570,7 +3571,7 @@ The mapping of shapes to NFSS codes is done using the following table:
     Oblique, Slant(ed), Incline(d)      sl
 
 (I<Exception:> Adobe Silentium Pro contains two Roman shapes;
-we map the first of these to `n', for the second one we (ab)use the `it' code
+we map the first of these to C<n>, for the second one we (ab)use the C<it> code
 as this family doesn't contain an Italic shape.)
 
 For weights and widths, B<autoinst> tries to the standard NFSS codes
@@ -3580,19 +3581,18 @@ as much as possible.
 Of course, not all 81 combinations of these NFSS weights and widths will map
 to existing fonts;
 and conversely it may not be possible to assign every existing font
-a unique code in a sane way (especially for the weights, some font families
-offer more choices or finer granularity than NFSS's codes can handle;
-e.g., Fira Sans contains fifteen(!) different weights,
-including an additional `Medium' weight between Regular and Semibold).
-Therefore every font is also assigned a `series' name that is simply
-the concatenation of its weight and width
-(after expanding any abbreviations and converting to lowercase).
-A font with `Cond' width and `Ultra' weight will then be known
-as `ultrablackcondensed'.
+a unique code in a sane way (especially for the weights,
+some font families offer more variants than NFSS's codes can handle;
+e.g., Fira Sans contains fifteen different weights!).
+Therefore every font is also assigned a "series" name that is
+the concatenation of its weight and width,
+after expanding any abbreviations and converting to lowercase.
+A font of "Cond" width and "Ultra" weight will then be known
+as "ultrablackcondensed".
 
 The exact mapping between fonts and NFSS codes can be found
 in the generated F<fd> files and in the log file
-(pro tip: run B<autoinst> with the I<-dryrun> option
+(you may want to run B<autoinst> with the I<-dryrun> option
 to check the chosen mapping beforehand).
 The I<-nfssweight> and I<-nfsswidth> command-line options can be used
 to finetune the mapping between NFSS codes and fonts.
@@ -3605,7 +3605,7 @@ one can always use the C<\fontseries> command with the full series name
 =head2 Ornaments
 
 Ornament fonts are regular LY1-encoded fonts, with a number of
-`regular' characters replaced by ornament glyphs.
+"regular" characters replaced by ornament glyphs.
 The OpenType specification says that fonts should only put their
 ornaments in place of the lowercase ASCII letters, but some fonts
 put them in other positions (such as those of the digits) as well.
@@ -3634,8 +3634,9 @@ However, many fonts (at least those licensed under the SIL Open Font License)
 do not allow distributing such converted versions under their original name.
 
 To meet these licensing requirements, B<autoinst> provides
-a C<-t1suffix> command-line option that appends
-a (user-defined) suffix to the names (both filename and internal font name)
+a I<-t1suffix> command-line option that appends
+a user-defined suffix to the names
+(both the filename and the internal font name)
 of all generated Type1 fonts; see L</COMMAND-LINE OPTIONS> below.
 
 
@@ -3644,9 +3645,9 @@ of all generated Type1 fonts; see L</COMMAND-LINE OPTIONS> below.
 Automatically installing the fonts into a suitable TEXMF tree
 (as B<autoinst> tries to do by default) only works for TeX-installations
 that use the F<kpathsea> library; with TeX distributions that implement
-their own directory searching (such as MiKTeX), B<autoinst> will complain
+their own directory searching, such as MiKTeX, B<autoinst> will complain
 that it cannot find the F<kpsewhich> program and move all generated files
-into a subdirectory C<./autoinst_output/> of the current directory.
+into a subdirectory C<autoinst_output/> of the current directory.
 If you use such a TeX distribution, you should either move these files
 to their correct destinations by hand, or use the I<-target> option
 (see L</COMMAND-LINE OPTIONS> below) to manually specify a TEXMF tree.
@@ -3668,7 +3669,7 @@ and hence MacTeX will not find the new fonts.
 To remedy this, either run B<autoinst> as root (so that it can install
 everything into $TEXMFLOCAL) or manually run C<updmap -user> to tell
 TeX about the files in $TEXMFHOME.
-The latter option does, however, have some caveats;
+This latter option does, however, come with some caveats;
 see F<https://tug.org/texlive/scripts-sys-user.html>.
 
 
@@ -3696,7 +3697,7 @@ Print a (relatively) short help text and exit.
 =item B<-dryrun>
 
 Don't generate output; just parse input fonts and write
-a log file saying what B<autoinst> would have done.
+the results to the log file.
 
 =item B<-verbose>
 
@@ -3717,15 +3718,16 @@ Print B<autoinst>'s version number and exit.
 
 Generate the specified encoding(s) for the text fonts.
 Multiple encodings may be specified as a comma-separated list
-(without spaces!); the default choice of encodings is `OT1,LY1,T1'.
+(without spaces!); the default choice of encodings is C<OT1,LY1,T1>.
 
-For each specified encoding XYZ, B<autoinst> will first see if there is
-an encoding file F<XYZ.enc> in the current directory, and if found it will
-use that; otherwise it will use one of its built-in encoding files.
-Currently B<autoinst> comes with support for the OT1, T1/TS1, LY1, LGR,
+For each encoding argument, B<autoinst> will first check if it is
+the filename of an encoding file, and if found it will use that;
+otherwise the argument is assumed to be the name of one of
+the built-in encodings.
+Currently B<autoinst> comes with built-in support for the OT1, T1/TS1, LY1, LGR,
 T2A/B/C and T3/TS3 encodings.
 (These files are called F<fontools_ot1.enc> etc. to avoid name clashes
-with other packages; the `fontools_' prefix may be omitted.)
+with other packages; the F<fontools_> prefix may be omitted.)
 
 =item B<-ts1>/B<-nots1>
 
@@ -3771,17 +3773,17 @@ Control the creation of titling families. The default is B<-titling>.
 Control the creation of fonts with superior characters.
 The default is B<-superiors>.
 
-=item B<-noinferiors>
-
 =item B<-inferiors> [ = B<none> | B<auto> | B<subs> | B<sinf> | B<dnom> ]
 
+=item B<-noinferiors>
+
 The OpenType standard defines several kinds of digits that might be used
-as inferiors or subscripts: `Subscripts' (OpenType feature `subs'),
-`Scientific Inferiors' ('sinf'), and `Denominators' ('dnom').
+as inferiors or subscripts: "Subscripts" (OpenType feature C<subs>),
+"Scientific Inferiors" (C<sinf>), and "Denominators" (C<dnom>).
 This option allows the user to determine which of these styles B<autoinst>
 should use for the inferior characters.
-Alternatively, the value `auto' tells B<autoinst> to use the first value
-in `sinf', `subs' or `dnom' that is supported by the font.
+Alternatively, the value "auto" tells B<autoinst> to use the first value
+in C<sinf>, C<subs> or C<dnom> that is supported by the font.
 Saying just B<-inferiors> is equivalent to B<-inferiors=auto>;
 otherwise the default is B<-noinferiors>.
 
@@ -3796,14 +3798,14 @@ The default is B<-nofractions>.
 
 =item B<-ligatures>/B<-noligatures>
 
-Some fonts create glyphs for the standard f-ligatures (ff, fi, fl, ffi, ffl),
-but don't provide a `liga' feature to access these.
+Some fonts contain glyphs for the standard f-ligatures (ff, fi, fl, ffi, ffl),
+but don't provide a C<liga> feature to access these.
 This option tells B<autoinst> to add extra C<LIGKERN> rules to
 the generated fonts to enable the use of these ligatures.
 The default is B<-ligatures>, except for typewriter fonts.
 
 Specify B<-noligatures> to disable generation of ligatures even for fonts
-that do contain a `liga' feature.
+that do contain a C<liga> feature.
 
 =item B<-ornaments>/B<-noornaments>
 
@@ -3824,10 +3826,10 @@ This latter effect cannot be re-enabled in B<autoinst>;
 if you want typewriter text to be hyphenated, use the F<hyphenat> package.
 
 If none of these options is specified, B<autoinst> tries to guess:
-if the font's filename contains the string `mono'
-or if the field C<isFixedPitch> in the font's I<post> table is True,
+if the font's filename contains the string "mono"
+or if the field C<isFixedPitch> in the font's C<post> table is True,
 it will select B<-typewriter>;
-else if the filename contains `sans' it will select B<-sanserif>;
+else if the filename contains "sans" it will select B<-sanserif>;
 otherwise it will opt for B<-serif>.
 
 =item B<-math>
@@ -3853,11 +3855,11 @@ when used in maths; some fonts need even more. Use your own judgement!
 Tell B<autoinst> to modify the font names of all generated Type1-fonts,
 by adding I<SUFFIX> to the family name.
 If you use this option without specifying a I<SUFFIX> value,
-B<autoinst> will use the value ``PS''.
+B<autoinst> will use the value "PS".
 The default behaviour when this option is not given
 is to not modify font names at all.
 
-See also L</OpenType fonts and licensing issues> above.
+See also L</OpenType fonts and licensing issues> in L<WARNINGS AND CAVEATS> above.
 
 =item B<-target>=I<DIRECTORY>
 
@@ -3868,7 +3870,7 @@ and installs all files into the first user-writable TEXMF tree it finds.
 If B<autoinst> cannot find such a user-writable directory
 (which shouldn't happen, since $TEXMFHOME is supposed to be user-writable)
 it will print a warning message and put all files into the subdirectory
-C<./autoinst_output/> of the current directory.
+C<autoinst_output/> of the current directory.
 It's then up to the user to move the generated files to a better location
 and update all relevant databases
 (usually by calling F<texhash> and F<updmap>).
@@ -3878,9 +3880,9 @@ and update all relevant databases
 =item B<-typeface>=I<TYPEFACE>
 
 These options are equivalent to F<otftotfm>'s I< --vendor> and I< --typeface>
-options: they change the `vendor' and `typeface' parts of the names of the
+options: they change the "vendor" and "typeface" parts of the names of the
 subdirectories in the TEXMF tree where generated files will be stored.
-The default values are `lcdftools' and the font's FontFamily name.
+The default values are "lcdftools" and the font's FontFamily name.
 These options change I<only> directory names,
 not the names of any generated files.
 
@@ -3918,16 +3920,16 @@ Map the NFSS code I<code> to the given weight or width,
 overriding the built-in tables.
 Each of these options may be given multiple times,
 to override more than one NFSS code.
-Example: to map the `ul' code to the `Thin' weight,
+Example: to map the C<ul> code to the "Thin" weight,
 use C<-nfssweight=ul=thin>.
-To inhibit the use of the `ul' code completely,
+To inhibit the use of the C<ul> code completely,
 use C<-nfssweight=ul=>.
 
-=item B<-extra>=I<extra>
+=item B<-extra>=I<extra options>
 
-Append I<extra> as extra options to the command lines for I<otftotfm>.
-To prevent I<extra> from accidentily being interpreted as options
-to B<autoinst>, it should be properly quoted.
+Pass I<extra options> to the commands for I<otftotfm>.
+To prevent I<extra options> from accidentily being interpreted as
+options to B<autoinst>, they should be properly quoted.
 
 =item B<-nofigurekern>
 
@@ -3937,7 +3939,8 @@ This is very probably not what you want
 This option adds extra I< --ligkern> options
 to the commands for I<otftotfm> to suppress such kerns.
 Note that this option leads to very long commands (it adds
-one hundred I< --ligkern> options), which may cause problems on some systems.
+one hundred I< --ligkern> options), which may cause problems on some systems;
+hence it is not active by default.
 
 =back
 
@@ -3974,7 +3977,7 @@ don't paraphase.
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2020 Marc Penninga.
+Copyright (C) 2005-2021 Marc Penninga.
 
 
 =head1 LICENSE
@@ -3997,7 +4000,7 @@ GNU General Public License for more details.
 
 =head1 VERSION
 
-This document describes B<autoinst> version 20201218.
+This document describes B<autoinst> version 20210401.
 
 
 =head1 RECENT CHANGES
@@ -4006,6 +4009,12 @@ This document describes B<autoinst> version 20201218.
 
 =over 12
 
+=item I<2021-04-01>
+
+The I<-encoding> option now also accepts filenames of encoding files
+in directories other than the current directory.
+Directory names containing spaces do (or at least should) also work.
+
 =item I<2020-12-18>
 
 Fixed a problem with files not being found on Windows.
@@ -4020,7 +4029,7 @@ Some changes in the generated F<sty> and F<fd> files,
 to improve compatibility with the F<microtype> package.
 Made sure that F<pfb> fonts are always generated whenever
 the input fonts are in F<otf> format.
-Added the C<-t1suffix> command-line option,
+Added the I<-t1suffix> command-line option,
 to modify the font and file names of those generated Type1 fonts.
 
 =item I<2020-06-19>
@@ -4034,7 +4043,7 @@ standards-conforming.
 Added basic (and still somewhat experimental) math support.
 Implemented the C<scale=MatchLowercase> option value
 in the generated style files.
-`Wide' fonts are mapped to the `sx' NFSS code instead of `x',
+"Wide" fonts are mapped to the C<sx> NFSS code instead of C<x>,
 to cater for League Mono Variable's Wide and Extended widths.
 The generated style files now use C<\textsup> and C<\textinf>
 instead of the more cryptic C<\textsu> and C<\textin> to access
@@ -4147,13 +4156,13 @@ Added the I<-version> option.
 =item I<2019-05-17>
 
 Changed the way the F<-ligatures> option works:
-F<-ligatures> enables f-ligatures (even without a `liga' feature),
-F<-noligatures> now disables f-ligatures (overriding a `liga' feature).
+F<-ligatures> enables f-ligatures (even without a C<liga> feature),
+F<-noligatures> now disables f-ligatures (overriding a C<liga> feature).
 
 =item I<2019-05-11>
 
 Separate small caps families are now also recognised when the family name
-ends with `SC' (previously B<autoinst> only looked for `SmallCaps').
+ends with "SC" (previously B<autoinst> only looked for "SmallCaps").
 
 =item I<2019-04-22>
 
@@ -4168,7 +4177,7 @@ Fixed a bug that affected -mergesmallcaps with multiple encodings.
 Added the <-mergesmallcaps> option, to handle cases where
 the small caps fonts are in separate font families.
 Titling shape is now treated as a separate family instead of a distinct shape;
-it is generated only for fonts with the `titl' feature.
+it is generated only for fonts with the C<titl> feature.
 Only add f-ligatures to fonts when explicitly asked to (I<-ligatures>).
 
 =item I<2019-04-11>
@@ -4190,7 +4199,7 @@ When we can't find a user-writable TEXMF tree,
 put all generated files into a subdirectory C<./autoinst_output/>
 instead of all over the current working directory.
 
-Added `auto' value to the I<inferiors> option,
+Added "auto" value to the I<inferiors> option,
 to tell B<autoinst> to use whatever inferior characters are available.
 
 =item I<2019-03-14>
@@ -4198,9 +4207,9 @@ to tell B<autoinst> to use whatever inferior characters are available.
 Overhauled the mapping of fonts (more specifically of weights and widths;
 the mapping of shapes didn't change) to NFSS codes.
 Instead of inventing our own codes to deal with every possible weight
-and width out there, we now create `long' codes based on the names
+and width out there, we now create "long" codes based on the names
 in the font metadata.
-Then we add `ssub' rules to the F<fd> files to map the standard NFSS codes
+Then we add C<ssub> rules to the F<fd> files to map the standard NFSS codes
 to our fancy names (see the section B<NFSS codes>;
 based on discussions with Frank Mittelbach and Bob Tennent).
 
@@ -4214,26 +4223,26 @@ Added the I<-(no)mergewidths> option; tried to improve the documentation.
 
 =item I<2018-03-26>
 
-Added the `Text' weight and the I<-(no)mergewidths> option.
-Changed the NFSS codes for `Thin' and `Book' to `i' and `o', respectively.
+Added the "Text" weight and the I<-(no)mergewidths> option.
+Changed the NFSS codes for "Thin" and "Book" to C<i> and C<o>, respectively.
 Tried to improve the documentation.
 
 =item I<2018-01-09>
 
-Added the `sl' weight for font families (such as Fira Sans) that contain both
-`Book' and `Regular' weights (reported by Bob Tennent).
-Added the `Two', `Four', `Eight' and `Hair' weights (for Fira Sans).
+Added the C<sl> weight for font families (such as Fira Sans) that contain both
+"Book" and "Regular" weights (reported by Bob Tennent).
+Added the "Two", "Four", "Eight" and "Hair" weights (for Fira Sans).
 
 =item I<2017-06-16>
 
 Changed the I<-inferiors> option from a binary yes-or-no choice to allow
-the user to choose one of the `subs', `sinf' and `dnom' features.
+the user to choose one of the C<subs>, C<sinf> and C<dnom> features.
 B<autoinst> now always creates a log file.
 
 =item I<2017-03-21>
 
-Updated the F<fontools_ot1.enc> encoding file to include the `Lslash'
-and `lslash' glyphs (thanks to Bob Tennent).
+Updated the F<fontools_ot1.enc> encoding file to include the "Lslash"
+and "lslash" glyphs (thanks to Bob Tennent).
 
 =item I<2015-11-22>
 
@@ -4249,8 +4258,8 @@ Fixed a bug in the font info parsing code.
 
 =item I<2014-01-21>
 
-`Oblique' or `slanted' fonts are now mapped to NFSS code `sl' instead
-of `it'; added `ssub' rules to the F<fd> files to substitute slanted fonts
+"Oblique" or "slanted" fonts are now mapped to NFSS code C<sl> instead
+of C<it>; added C<ssub> rules to the F<fd> files to substitute slanted fonts
 for italic ones if the latter are missing. Fixed a few bugs.
 
 =item I<2014-01-03>
@@ -4279,16 +4288,16 @@ Added C<scale> as an alias for the package option C<scaled>.
 =item I<2013-02-06>
 
 Bugfix: the directory names for map and encoding files contained
-the `vendor' instead of the `typeface'.
+the "vendor" instead of the "typeface".
 
 =item I<2013-01-03>
 
-Added extra `ssub' rules to the F<fd> files that substitute `b' for `bx'.
+Added extra C<ssub> rules to the F<fd> files that substitute C<b> for C<bx>.
 Verbose mode now also prints all generated commands before they're executed.
 
 =item I<2012-10-25>
 
-Added extra `ssub' rules to the F<fd> files that substitute italic
+Added extra C<ssub> rules to the F<fd> files that substitute italic
 shapes for slanted ones.
 
 =item I<2012-09-25>
@@ -4301,7 +4310,7 @@ Documentation update.
 
 =item I<2012-03-06>
 
-Implemented the `splitting the font family into multiple subfamilies'
+Implemented the "splitting the font family into multiple subfamilies"
 emergency strategy when font info parsing fails.
 Added recognition for a number of unusual widths, weights and shapes.
 
@@ -4309,8 +4318,8 @@ Added recognition for a number of unusual widths, weights and shapes.
 
 Fixed a bug in the font parsing code,
 where possible widths, weights and shapes where tested in the wrong order;
-this led to `ExtraLight' fonts being recognised as `Light'.
-Added recognition for `Narrow' and `Wide' widths.
+this led to "ExtraLight" fonts being recognised as "Light".
+Added recognition for "Narrow" and "Wide" widths.
 Also added the I<-(no)figurekern> command-line option.
 
 =item I<2012-02-01>
@@ -4326,7 +4335,7 @@ Updated the documentation.
 =item I<2011-06-15>
 
 Fixed the font info parsing code for some fonts that are
-too lazy to spell out `Italic' in full.
+too lazy to spell out "Italic" in full.
 
 =item I<2010-04-29>
 
@@ -4372,13 +4381,13 @@ in some extended families, different combinations of
 weight and width were mapped to the same series.
 Added a work-around for incorrect size info in some Kepler fonts.
 Fixed a small bug in the generated commands for otftotfm
-(sometimes, the `onum' feature was included twice).
+(sometimes, the C<onum> feature was included twice).
 Added encoding file for OT1 to the I<fontools> collection.
 
 =item I<2007-07-27>
 
 Two bugfixes: a closing brace was missing in the generated style file,
-and the NFSS series was formed as `width plus weight' instead of the reverse.
+and the NFSS series was formed as "width plus weight" instead of the reverse.
 
 =item I<2007-06-10>
 
@@ -4393,7 +4402,7 @@ Added the I< --no-updmap> option to all generated commands for F<otftotfm>
 families (suggested by Steven E. Harris).
 Tweaked the font info parsing to work around a bug in the naming of
 some FontFont fonts, where every font is in a family of its own.
-Added the `scaled' option (including the loading of F<xkeyval>)
+Added the C<scaled> option (including the loading of F<xkeyval>)
 to the generated style file.
 Extended the output of the I<-verbose> option.
 
@@ -4414,14 +4423,14 @@ Filenames with spaces now work as well.
 
 =item I<2006-08-31>
 
-Made the generated style files try to include `fontaxes.sty';
+Made the generated style files try to include F<fontaxes.sty>;
 changed the names of the generated fonts and families
 (to make the previous change possible);
 added command-line options for most font styles and shapes;
 tweaked the filename parsing code for Cronos Pro and Gill Sans Pro;
 added runtime generation of encoding vectors for ornament fonts
 (because GaramondPremier's ornament names differ from other fonts);
-changed the NFSS-code for italic small caps and titling to `scit' and `tlit'
+changed the NFSS-code for italic small caps and titling to C<scit> and C<tlit>
 (to work with F<fontaxes>);
 and edited (and hopefully improved) the documentation.
 
@@ -4453,25 +4462,25 @@ and improved the layout of the generated files.
 The generated commands weren't actually executed, only printed...
 Also added a small hack to cater for fonts
 (such as some recent versions of MinionPro)
-that contain swash characters but don't provide a `swsh' feature.
+that contain swash characters but don't provide a C<swsh> feature.
 
 =item I<2005-08-10>
 
-Dropped the `fontname' scheme in favor of a more verbose naming scheme,
+Dropped the "fontname" scheme in favor of a more verbose naming scheme,
 since many filenames were still more than eight characters long anyway.
 Added F<nfssext.sty>-like commands to the generated style file.
-Changed the default encoding to LY1 and added the `inferior' shape.
+Changed the default encoding to LY1 and added the "inferior" shape.
 
 =item I<2005-08-01>
 
 Rewrote (and hopefully improved) the user interface;
 changed the program to by default execute the generated F<otftotfm> command
 lines rather than writing them to a file;
-added automatic determination of the `fontname' code for the font family;
-changed the NFSS code for italic small caps to `si'; added titling shapes;
+added automatic determination of the "fontname" code for the font family;
+changed the NFSS code for italic small caps to C<si>; added titling shapes;
 changed the generated style
 file to include an interface for the ornaments and to load Lehman's NFSS
-extensions F<nfssext.sty> if this is installed; corrected the `fontname' codes
+extensions F<nfssext.sty> if this is installed; corrected the "fontname" codes
 for OT1, T1, LY1 and user-specific encodings; extended the output generated by
 the I<-verbose> option; and rewrote and extended the documentation.
 
diff --git a/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx b/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx
index 164fc2b1492..295c9177825 100755
--- a/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx
+++ b/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx
@@ -4,7 +4,7 @@
 
 ----------------------------------------------------------------------------
 
-    Copyright (C) 2005-2020 Marc Penninga.
+    Copyright (C) 2005-2021 Marc Penninga.
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
@@ -38,7 +38,7 @@ use Getopt::Long ();
 use List::Util @List::Util::EXPORT_OK;
 use Pod::Usage;
 
-my $VERSION = "20201218";
+my $VERSION = "20210401";
 
 our ($NUM_GLYPHS, $UNITS_PER_EM, %kern);
 
@@ -835,7 +835,7 @@ Marc Penninga <marcpenninga@gmail.com>
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2020 Marc Penninga.
+Copyright (C) 2005-2021 Marc Penninga.
 
 
 =head1 LICENSE
@@ -858,7 +858,7 @@ See the GNU General Public License for more details.
 
 =head1 VERSION
 
-This document describes B<ot2kpx> version 20201218.
+This document describes B<ot2kpx> version 20210401.
 
 
 =head1 RECENT CHANGES