From 09aef51981d5f356b77306646b3a48b74e8c3266 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 23 Oct 2019 21:49:50 +0000 Subject: fontools (22oct19) git-svn-id: svn://tug.org/texlive/trunk@52508 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/fontools/afm2afm | 4 +-- .../texk/texlive/linked_scripts/fontools/autoinst | 38 ++++++++++++---------- .../texk/texlive/linked_scripts/fontools/ot2kpx | 4 +-- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 35 +++++++++++--------- 4 files changed, 44 insertions(+), 37 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/texlive/linked_scripts/fontools/afm2afm b/Build/source/texk/texlive/linked_scripts/fontools/afm2afm index 6b745936263..85b2fbda94a 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 = "20191001"; +my $VERSION = "20191021"; parse_commandline(); @@ -421,7 +421,7 @@ See the GNU General Public License for more details. =head1 VERSION -This document describes B version 20191001. +This document describes B version 20191021. =head1 RECENT CHANGES diff --git a/Build/source/texk/texlive/linked_scripts/fontools/autoinst b/Build/source/texk/texlive/linked_scripts/fontools/autoinst index b265e43e319..4d67fe07ab2 100755 --- a/Build/source/texk/texlive/linked_scripts/fontools/autoinst +++ b/Build/source/texk/texlive/linked_scripts/fontools/autoinst @@ -40,8 +40,9 @@ use Getopt::Long (); use IPC::Open3 (); use Pod::Usage (); use POSIX (); +use Scalar::Util (); -my $VERSION = '20191001'; +my $VERSION = '20191021'; my ($d, $m, $y) = (localtime time)[3 .. 5]; my $TODAY = sprintf "%04d/%02d/%02d", $y + 1900, $m + 1, $d; @@ -938,7 +939,11 @@ sub make_commands { waitpid($pid, 0); if ($?) { - my $msg = "$command\n" . do { local $/; <$child_err> } . "\n"; + $child_out = Scalar::Util::openhandle($child_out); + my $out = $child_out ? do { local $/; <$child_out> } : ""; + $child_err = Scalar::Util::openhandle($child_err); + my $err = $child_err ? do { local $/; <$child_err> } : ""; + my $msg = "\n$command\n\n$out\n$err\n"; warn $msg; print {$ARGV{logfile}} $msg; $oops = 1; @@ -948,8 +953,8 @@ sub make_commands { $| = 0; if ($oops) { warn <<"END_OTFTOTFM_WARNING"; -[ERROR] One or more calls to 'otftotfm' failed; - please see the error messages in the log file. +[ERROR] One or more calls to 'otftotfm' returned a non-zero status code; + please check the messages above and in the log file. END_OTFTOTFM_WARNING } } @@ -1052,7 +1057,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 @@ -1108,7 +1113,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 @@ -1331,7 +1336,7 @@ END_WARNING_DUMPING_FILES "$ARGV{target}" I'll do my best to work around this. Fingers crossed! - If you do experience any problems, try to re-run autoinst + If you do experience any problems, try re-running autoinst with a target directory without spaces in its name. END_WARNING_SPACES_IN_PATHS } @@ -2410,13 +2415,8 @@ Also these commands are built on top of F, 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.). - -=head2 On the choice of text encoding - -By default, B generates text fonts with OT1, T1 and LY1 -encodings, and the generated style files use LY1 as the default text encoding. -LY1 has been chosen over T1 because it has some empty slots to accommodate -the additional ligatures found in many OpenType fonts. +By default, B generates text fonts with OT1, LY1 and T1 +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 below). @@ -2528,11 +2528,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 in the specified order, so the I 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<< .enc >> (in all I!) should be somewhere where F can find it. Suitable encoding files for OT1, T1/TS1, LY1, LGR, T2A/B/C and T3/TS3 come with B. @@ -2811,7 +2811,7 @@ GNU General Public License for more details. =head1 VERSION -This document describes B version 20191001. +This document describes B version 20191021. =head1 RECENT CHANGES @@ -2820,6 +2820,10 @@ This document describes B version 20191001. =over 12 +=item I<2019-10-21> + +The generated F files now use T1 encoding by default. + =item I<2019-10-01> Handle I<-target> directories with spaces in their path names. diff --git a/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx b/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx index f45c0110780..615e3131566 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 = "20191001"; +my $VERSION = "20191021"; 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 version 20191001. +This document describes B version 20191021. =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 fc6c96906ed..37f30c9ffe8 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 52123 2019-09-19 18:18:41Z karl $ +# $Id: tlmgr.pl 52467 2019-10-20 22:10:34Z 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: 52123 $'; -my $datrev = '$Date: 2019-09-19 20:18:41 +0200 (Thu, 19 Sep 2019) $'; +my $svnrev = '$Revision: 52467 $'; +my $datrev = '$Date: 2019-10-21 00:10:34 +0200 (Mon, 21 Oct 2019) $'; my $tlmgrrevision; my $tlmgrversion; my $prg; @@ -7817,10 +7817,12 @@ If C<-v> has been given the revisions of the used modules are reported, too. If the C<--clean> option is not specified, this action makes a backup of the given packages, or all packages given C<--all>. These backups are -saved to the value of the C<--backupdir> option, if that is an existing and -writable directory. If C<--backupdir> is not given, the C -option setting in the TLPDB is used, if present. If both are missing, -no backups are made. +saved to the value of the C<--backupdir> option, if that is an existing +and writable directory. If C<--backupdir> is not given, the C +option setting in the TLPDB is used, if present. If both are missing, no +backups are made. (The installer sets C to +C<.../tlpkg/backups>, under the TL root installation directory, so it is +usually defined; see the L description for more information.) If the C<--clean> option is specified, backups are pruned (removed) instead of saved. The optional integer value I may be specified to @@ -8385,10 +8387,11 @@ testing installations, etc. When disabled, the respective files are not downloaded at all. The options C and C determine the defaults for -the actions C, C and C. These three actions -need a directory in which to read or write the backups. If +the actions C, C and C. These three actions +need a directory in which to read or write the backups. If C<--backupdir> is not specified on the command line, the C -option value is used (if set). +option value is used (if set). The TL installer sets C to +C<.../tlpkg/backups>, under the TL root installation directory. The C option (de)activates automatic generation of backups. Its value is an integer. If the C value is C<-1>, no @@ -9052,8 +9055,8 @@ installation with the server's idea of what is available: =item B<--backupdir> I These two options control the creation of backups of packages I -updating; that is, backup of packages as currently installed. If -neither options is given, no backup will made. If C<--backupdir> is +updating; that is, backing up packages as currently installed. If +neither option is given, no backup will made. If C<--backupdir> is given and specifies a writable directory then a backup will be made in that location. If only C<--backup> is given, then a backup will be made to the directory previously set via the L action (see @@ -9835,9 +9838,9 @@ If xz is available (either from the system or TL) and working, use that. =back -lz4 and gzip are much faster in creating tlmgr's local backups. -The unconditional use of xz for the tlnet containers is unaffected, -to minimize download sizes. +lz4 and gzip are faster in creating tlmgr's local backups, hence they +are preferred. The unconditional use of xz for the tlnet containers is +unaffected, to minimize download sizes. =item C @@ -9908,7 +9911,7 @@ This script and its documentation were written for the TeX Live distribution (L) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 52123 2019-09-19 18:18:41Z karl $ +$Id: tlmgr.pl 52467 2019-10-20 22:10:34Z karl $ =cut # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html -- cgit v1.2.3