fontools (29oct19)

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

3 files changed, 22 insertions, 19 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/fontools/afm2afm b/Build/source/texk/texlive/linked_scripts/fontools/afm2afm
index 50060564910..5aba6725a4d 100755
--- a/Build/source/texk/texlive/linked_scripts/fontools/afm2afm
+++ b/Build/source/texk/texlive/linked_scripts/fontools/afm2afm
@@ -37,7 +37,7 @@ use File::Basename;
 use Getopt::Long;
 use Pod::Usage;
 
-my $VERSION = "20191027";
+my $VERSION = "20191029";
 
 parse_commandline();
 
@@ -421,7 +421,7 @@ See the GNU General Public License for more details.
 
 =head1 VERSION
 
-This document describes B<afm2afm> version 20191027.
+This document describes B<afm2afm> version 20191029.
 
 
 =head1 RECENT CHANGES
diff --git a/Build/source/texk/texlive/linked_scripts/fontools/autoinst b/Build/source/texk/texlive/linked_scripts/fontools/autoinst
index 7981beac873..c8ce5a3c2e9 100755
--- a/Build/source/texk/texlive/linked_scripts/fontools/autoinst
+++ b/Build/source/texk/texlive/linked_scripts/fontools/autoinst
@@ -40,7 +40,7 @@ use Getopt::Long ();
 use Pod::Usage ();
 use POSIX ();
 
-my $VERSION = '20191027';
+my $VERSION = '20191029';
 
 my ($d, $m, $y) = (localtime time)[3 .. 5];
 my $TODAY = sprintf "%04d/%02d/%02d", $y + 1900, $m + 1, $d;
@@ -1047,7 +1047,7 @@ my $USAGE =<<'END_USAGE';
 Usage: autoinst [options] font[s]
 
 Possible options:
-    -encoding=ENC[,ENC]*    Specify text encoding(s) (default: OT1,T1,LY1)
+    -encoding=ENC[,ENC]*    Specify text encoding(s) (default: OT1,LY1,T1)
 
     -(no)lining             Toggle creation of lining digits
     -(no)oldstyle           Toggle creation of oldstyle digits
@@ -1103,7 +1103,7 @@ END_USAGE
 
 # Default values for the command-line arguments
 %ARGV = (
-    encoding        => 'OT1,T1,LY1',
+    encoding        => 'OT1,LY1,T1',
     textcomp        => '2',     # 0 = no, 1 = yes, 2 = ('T1' ? yes : no)
     lining          => '1',     # 0 = no, 1 = yes
     oldstyle        => '1',     # 0 = no, 1 = yes
@@ -1799,7 +1799,7 @@ END_STY_HEADER
 
     my $enc = join ',', grep { $_ ne 'OT1' } @{$ARGV{encoding}};
 
-    print {$STY} "\\RequirePackage{fontenc}\n" if $enc;
+    print {$STY} "\\RequirePackage[$enc]{fontenc}\n" if $enc;
     print {$STY} "\\RequirePackage{textcomp}\n" if $seen{TS1};
 
     print {$STY} <<'END_STY_FONTAXES_START';
@@ -2422,12 +2422,9 @@ 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.).
 
-Since version 2019-10-27, the generated style file no longer explicitly
-chooses a text encoding, so LaTeX will by default use OT1.
-Use the F<fontenc> package to change the text encoding.
-
 By default, B<autoinst> generates text fonts with OT1, LY1 and T1
-encodings; other encodings can be chosen using the I<-encoding> option
+encodings, and the generated style files use T1 as the default text encoding.
+Other encodings can be chosen using the I<-encoding> option
 (see L</"COMMAND-LINE OPTIONS"> below).
 
 
@@ -2538,9 +2535,11 @@ Add more details to the log file. Repeat this option for even more info.
 
 Generate the specified encoding(s) for the text fonts.
 Multiple encodings may be specified as a comma-separated list:
-C<-encoding=OT1,T1,LY1> (without spaces!).
+C<-encoding=OT1,LY1,T1> (without spaces!).
+The style file passes these to F<otftotfm> in the specified order,
+so the I<last> one will become the default text encoding of your document.
 
-The default choice of encodings is "OT1,T1,LY1".
+The default choice of encodings is "OT1,LY1,T1".
 For each encoding, a file F<< <encoding>.enc >> (in all I<lowercase>!)
 should be somewhere where F<otftotfm> can find it. Suitable encoding files
 for OT1, T1/TS1, LY1, LGR, T2A/B/C and T3/TS3 come with B<autoinst>.
@@ -2826,7 +2825,7 @@ GNU General Public License for more details.
 
 =head1 VERSION
 
-This document describes B<autoinst> version 20191027.
+This document describes B<autoinst> version 20191029.
 
 
 =head1 RECENT CHANGES
@@ -2835,15 +2834,19 @@ This document describes B<autoinst> version 20191027.
 
 =over 12
 
+=item I<2019-10-29>
+
+The generated style files now use T1 as the default text encoding.
+
 =item I<2019-10-27>
 
 The mapping in F<fd> files between font series and standard NFSS attributes
 now uses the new I<alias> function instead of I<ssub> (based on code by
-Frank Mittelbach). The generated F<sty> files no longer change
-the default text encoding.
+Frank Mittelbach).
 The way F<otftotfm> is called was changed to work around a Perl/Windows bug;
 the old way might cause the process to hang.
-Using I<-target> now automatically activates I<-noupdmap>.
+Using the I<-target> option now implies I<-noupdmap>, since choosing
+a non-standard target directory interferes with kpathsea/texhash and updmap.
 
 =item I<2019-10-01>
 
diff --git a/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx b/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx
index c49260d7189..b81d227ee27 100755
--- a/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx
+++ b/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx
@@ -38,7 +38,7 @@ use Getopt::Long ();
 use List::Util @List::Util::EXPORT_OK;
 use Pod::Usage;
 
-my $VERSION = "20191027";
+my $VERSION = "20191029";
 
 our ($NUM_GLYPHS, $UNITS_PER_EM, %kern);
 
@@ -858,7 +858,7 @@ See the GNU General Public License for more details.
 
 =head1 VERSION
 
-This document describes B<ot2kpx> version 20191027.
+This document describes B<ot2kpx> version 20191029.
 
 
 =head1 RECENT CHANGES