fontools (19nov19)

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

4 files changed, 41 insertions, 28 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/fontools/afm2afm b/Build/source/texk/texlive/linked_scripts/fontools/afm2afm
index 5aba6725a4d..c05b55fd363 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 = "20191029";
+my $VERSION = "20191118";
 
 parse_commandline();
 
@@ -421,7 +421,7 @@ See the GNU General Public License for more details.
 
 =head1 VERSION
 
-This document describes B<afm2afm> version 20191029.
+This document describes B<afm2afm> version 20191118.
 
 
 =head1 RECENT CHANGES
diff --git a/Build/source/texk/texlive/linked_scripts/fontools/autoinst b/Build/source/texk/texlive/linked_scripts/fontools/autoinst
index c8ce5a3c2e9..30a6a0f0ed6 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 = '20191029';
+my $VERSION = '20191118';
 
 my ($d, $m, $y) = (localtime time)[3 .. 5];
 my $TODAY = sprintf "%04d/%02d/%02d", $y + 1900, $m + 1, $d;
@@ -150,16 +150,16 @@ for my $full (keys %ABBREV) {
 =cut
 
 my @NFSS_WEIGHT = (
-    ul  =>  [ qw( ultralight thin hairline eight four two ) ],
-    el  =>  [ qw( extralight ) ],
-    l   =>  [ qw( light ) ],
+    ul  =>  [ qw( ultralight thin 100 hairline eight four two ) ],
+    el  =>  [ qw( extralight 200 ) ],
+    l   =>  [ qw( light 300 ) ],
     sl  =>  [ qw( semilight blond ) ],
-    ''  =>  [ qw( regular text book ) ],
-    sb  =>  [ qw( semibold demibold medium ) ],
-    b   =>  [ qw( bold ) ],
-    eb  =>  [ qw( extrabold ) ],
-    ub  =>  [ qw( ultrabold black heavy extrablack ultrablack
-                  ultraheavy poster super ) ],
+    ''  =>  [ qw( regular text book 400 ) ],
+    sb  =>  [ qw( semibold demibold 600 medium 500 ) ],
+    b   =>  [ qw( bold 700 ) ],
+    eb  =>  [ qw( extrabold 800 ) ],
+    ub  =>  [ qw( ultrabold black heavy extrablack ultrablack 900
+                  ultraheavy poster super 1000 ) ],
 );
 my %NFSS_WEIGHT = @NFSS_WEIGHT;
 @NFSS_WEIGHT = grep { !ref } @NFSS_WEIGHT;
@@ -709,10 +709,13 @@ sub decide_nfss_mappings {
 
     # Special case: if we don't have Regular but we *do* have Medium,
     # move Medium from the "sb" list to the "m" (i.e., Regular) one.
-    if ( !@{$NFSS_WEIGHT{''}} and $weight{medium} ) {
-        $NFSS_WEIGHT{''} = [ 'medium' ];
-        $NFSS_WEIGHT{sb}
-            = [ grep { $_ ne 'medium' } @{$NFSS_WEIGHT{medium}} ];
+    if ( !@{$NFSS_WEIGHT{''}} ) {
+        my $alternate = ( grep { $weight{$_} } qw(medium 500) )[0];
+        if ($alternate) {
+            $NFSS_WEIGHT{''} = [ $alternate ];
+            $NFSS_WEIGHT{sb}
+                = [ grep { $_ ne $alternate } @{$NFSS_WEIGHT{sb}} ];
+        }
     }
 
     # Some more trickery to map the sl code to Book or Text (but of course
@@ -1292,9 +1295,11 @@ sub parse_options {
 END_WARNING_TARGET_UPDMAP
     }
     elsif (!$ARGV{target}) {
-        my $kpsepath = eval {
-            qx( kpsewhich -expand-var='\$TEXMFLOCAL:\$TEXMFHOME' );
-        };
+        my $is_windows_os = ( $^O =~ /^MSWin/i );
+        my $kpsepath = $is_windows_os
+            ? eval { qx( kpsewhich -expand-var=\$TEXMFLOCAL;\$TEXMFHOME ) }
+            : eval { qx( kpsewhich -expand-var='\$TEXMFLOCAL:\$TEXMFHOME' ) }
+            ;
         if (!$kpsepath) {
             warn <<"END_WARNING_KPSEWHICH";
 [WARNING]   Call to "kpsewhich" failed.
@@ -1305,7 +1310,8 @@ END_WARNING_TARGET_UPDMAP
 END_WARNING_KPSEWHICH
         }
         else {
-            for my $dir ( split m/[:;]/xms, substr $kpsepath, 0, -1 ) {
+            my $pathsep = $is_windows_os ? ';' : ':';
+            for my $dir ( split m/$pathsep/xms, substr $kpsepath, 0, -1 ) {
                 if (-w $dir) { $ARGV{target} = $dir; last }
                 if (-e $dir) { next }
                 my $par = File::Spec->catdir( $dir, File::Spec->updir() );
@@ -1787,6 +1793,7 @@ sub write_stylefile {
     $fn = File::Spec->catfile($dir, $fn);
     open my $STY, '>', $fn
         or die "[ERROR]     Can't create '$fn': $!";
+    binmode $STY;
 
     print {$STY} <<"END_STY_HEADER";
 %% Generated by autoinst on $TODAY
@@ -1995,6 +2002,7 @@ sub write_fdfile {
     $fn = File::Spec->catfile($dir, $fn);
     open my $FD, '>', $fn
         or die "[ERROR]     Can't create '$fn': $!";
+    binmode $FD;
 
     print {$FD} <<"END_FD_HEADER";
 %% Generated by autoinst on $TODAY
@@ -2825,7 +2833,7 @@ GNU General Public License for more details.
 
 =head1 VERSION
 
-This document describes B<autoinst> version 20191029.
+This document describes B<autoinst> version 20191118.
 
 
 =head1 RECENT CHANGES
@@ -2834,6 +2842,11 @@ This document describes B<autoinst> version 20191029.
 
 =over 12
 
+=item I<2019-11-18>
+
+Fine-tuned calling of F<kpsewhich> on Windows (patch by Akira Kakuto).
+The font info parsing now also recognises numerical weights, e.g. in Museo.
+
 =item I<2019-10-29>
 
 The generated style files now use T1 as the default text encoding.
diff --git a/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx b/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx
index b81d227ee27..b26a9c79423 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 = "20191029";
+my $VERSION = "20191118";
 
 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 20191029.
+This document describes B<ot2kpx> version 20191118.
 
 
 =head1 RECENT CHANGES
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 9ba7326ccd5..2c456aaa813 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,12 +1,12 @@
 #!/usr/bin/env perl
-# $Id: tlmgr.pl 52830 2019-11-17 17:05:39Z karl $
+# $Id: tlmgr.pl 52848 2019-11-17 22:43:11Z karl $
 #
 # Copyright 2008-2019 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
-my $svnrev = '$Revision: 52830 $';
-my $datrev = '$Date: 2019-11-17 18:05:39 +0100 (Sun, 17 Nov 2019) $';
+my $svnrev = '$Revision: 52848 $';
+my $datrev = '$Date: 2019-11-17 23:43:11 +0100 (Sun, 17 Nov 2019) $';
 my $tlmgrrevision;
 my $tlmgrversion;
 my $prg;
@@ -9076,7 +9076,7 @@ is equivalent to
   tlmgr remove --force foobar
 
 Again, since packages are sometimes renamed or replaced, using this
-option is not ecommended.
+option is not recommended.
 
 =item B<--reinstall-forcibly-removed>
 
@@ -9952,7 +9952,7 @@ This script and its documentation were written for the TeX Live
 distribution (L<https://tug.org/texlive>) and both are licensed under the
 GNU General Public License Version 2 or later.
 
-$Id: tlmgr.pl 52830 2019-11-17 17:05:39Z karl $
+$Id: tlmgr.pl 52848 2019-11-17 22:43:11Z karl $
 =cut
 
 # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html