From d9d7e6fe15daa2a560f825930dec08be64216b9d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 29 Oct 2019 21:23:51 +0000 Subject: fontools (29oct19) git-svn-id: svn://tug.org/texlive/trunk@52571 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/fontools/afm2afm | 4 +-- .../texk/texlive/linked_scripts/fontools/autoinst | 33 +++++++++++---------- .../texk/texlive/linked_scripts/fontools/ot2kpx | 4 +-- Master/texmf-dist/doc/man/man1/afm2afm.1 | 4 +-- Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf | Bin 27004 -> 26950 bytes Master/texmf-dist/doc/man/man1/autoinst.1 | 26 ++++++++-------- Master/texmf-dist/doc/man/man1/autoinst.man1.pdf | Bin 70572 -> 70667 bytes Master/texmf-dist/doc/man/man1/ot2kpx.1 | 4 +-- Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf | Bin 27300 -> 27248 bytes Master/texmf-dist/doc/support/fontools/splitttc | 4 +-- Master/texmf-dist/scripts/fontools/afm2afm | 4 +-- Master/texmf-dist/scripts/fontools/autoinst | 33 +++++++++++---------- Master/texmf-dist/scripts/fontools/ot2kpx | 4 +-- 13 files changed, 64 insertions(+), 56 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 version 20191027. +This document describes B 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, 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 package to change the text encoding. - By default, B 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 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 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. @@ -2826,7 +2825,7 @@ GNU General Public License for more details. =head1 VERSION -This document describes B version 20191027. +This document describes B version 20191029. =head1 RECENT CHANGES @@ -2835,15 +2834,19 @@ This document describes B 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 files between font series and standard NFSS attributes now uses the new I function instead of I (based on code by -Frank Mittelbach). The generated F files no longer change -the default text encoding. +Frank Mittelbach). The way F 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 version 20191027. +This document describes B version 20191029. =head1 RECENT CHANGES diff --git a/Master/texmf-dist/doc/man/man1/afm2afm.1 b/Master/texmf-dist/doc/man/man1/afm2afm.1 index 50c17337e50..cb7644f06bd 100644 --- a/Master/texmf-dist/doc/man/man1/afm2afm.1 +++ b/Master/texmf-dist/doc/man/man1/afm2afm.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "AFM2AFM 1" -.TH AFM2AFM 1 "2019-10-27" "fontools" "Marc Penninga" +.TH AFM2AFM 1 "2019-10-29" "fontools" "Marc Penninga" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -223,7 +223,7 @@ but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of See the \s-1GNU\s0 General Public License for more details. .SH "VERSION" .IX Header "VERSION" -This document describes \fBafm2afm\fR version 20191027. +This document describes \fBafm2afm\fR version 20191029. .SH "RECENT CHANGES" .IX Header "RECENT CHANGES" (See the source code for the rest of the story.) diff --git a/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf b/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf index 4397fdc5739..9b1f2a9c005 100644 Binary files a/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf and b/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf differ diff --git a/Master/texmf-dist/doc/man/man1/autoinst.1 b/Master/texmf-dist/doc/man/man1/autoinst.1 index e1f945e408e..be4c53bf213 100644 --- a/Master/texmf-dist/doc/man/man1/autoinst.1 +++ b/Master/texmf-dist/doc/man/man1/autoinst.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "AUTOINST 1" -.TH AUTOINST 1 "2019-10-27" "fontools" "Marc Penninga" +.TH AUTOINST 1 "2019-10-29" "fontools" "Marc Penninga" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -381,12 +381,9 @@ Also these commands are built on top of \fIfontaxes\fR, so if that package cannot be found, you're limited to using the lower-level commands from standard \s-1NFSS\s0 (\f(CW\*(C`\efontfamily\*(C'\fR, \f(CW\*(C`\efontseries\*(C'\fR, \f(CW\*(C`\efontshape\*(C'\fR etc.). .PP -Since version 2019\-10\-27, the generated style file no longer explicitly -chooses a text encoding, so LaTeX will by default use \s-1OT1.\s0 -Use the \fIfontenc\fR package to change the text encoding. -.PP By default, \fBautoinst\fR generates text fonts with \s-1OT1, LY1\s0 and T1 -encodings; other encodings can be chosen using the \fI\-encoding\fR option +encodings, and the generated style files use T1 as the default text encoding. +Other encodings can be chosen using the \fI\-encoding\fR option (see \*(L"COMMAND-LINE \s-1OPTIONS\*(R"\s0 below). .SS "\s-1NFSS\s0 codes" .IX Subsection "NFSS codes" @@ -486,9 +483,11 @@ Add more details to the log file. Repeat this option for even more info. .IX Item "-encoding=encoding[,encoding]" Generate the specified encoding(s) for the text fonts. Multiple encodings may be specified as a comma-separated list: -\&\f(CW\*(C`\-encoding=OT1,T1,LY1\*(C'\fR (without spaces!). +\&\f(CW\*(C`\-encoding=OT1,LY1,T1\*(C'\fR (without spaces!). +The style file passes these to \fIotftotfm\fR in the specified order, +so the \fIlast\fR one will become the default text encoding of your document. .Sp -The default choice of encodings is \*(L"\s-1OT1,T1,LY1\*(R".\s0 +The default choice of encodings is \*(L"\s-1OT1,LY1,T1\*(R".\s0 For each encoding, a file \fI.enc\fR (in all \fIlowercase\fR!) should be somewhere where \fIotftotfm\fR can find it. Suitable encoding files for \s-1OT1, T1/TS1, LY1, LGR, T2A/B/C\s0 and T3/TS3 come with \fBautoinst\fR. @@ -742,19 +741,22 @@ but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of \&\s-1GNU\s0 General Public License for more details. .SH "VERSION" .IX Header "VERSION" -This document describes \fBautoinst\fR version 20191027. +This document describes \fBautoinst\fR version 20191029. .SH "RECENT CHANGES" .IX Header "RECENT CHANGES" (See the source for the full story, all the way back to 2005.) +.IP "\fI2019\-10\-29\fR" 12 +.IX Item "2019-10-29" +The generated style files now use T1 as the default text encoding. .IP "\fI2019\-10\-27\fR" 12 .IX Item "2019-10-27" The mapping in \fIfd\fR files between font series and standard \s-1NFSS\s0 attributes now uses the new \fIalias\fR function instead of \fIssub\fR (based on code by -Frank Mittelbach). The generated \fIsty\fR files no longer change -the default text encoding. +Frank Mittelbach). The way \fIotftotfm\fR is called was changed to work around a Perl/Windows bug; the old way might cause the process to hang. -Using \fI\-target\fR now automatically activates \fI\-noupdmap\fR. +Using the \fI\-target\fR option now implies \fI\-noupdmap\fR, since choosing +a non-standard target directory interferes with kpathsea/texhash and updmap. .IP "\fI2019\-10\-01\fR" 12 .IX Item "2019-10-01" Handle \fI\-target\fR directories with spaces in their path names. diff --git a/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf b/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf index f759db39fbc..bac1ceb768b 100644 Binary files a/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf and b/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf differ diff --git a/Master/texmf-dist/doc/man/man1/ot2kpx.1 b/Master/texmf-dist/doc/man/man1/ot2kpx.1 index 061eb4eb630..233dab60427 100644 --- a/Master/texmf-dist/doc/man/man1/ot2kpx.1 +++ b/Master/texmf-dist/doc/man/man1/ot2kpx.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "OT2KPX 1" -.TH OT2KPX 1 "2019-10-27" "fontools" "Marc Penninga" +.TH OT2KPX 1 "2019-10-29" "fontools" "Marc Penninga" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -228,7 +228,7 @@ but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of See the \s-1GNU\s0 General Public License for more details. .SH "VERSION" .IX Header "VERSION" -This document describes \fBot2kpx\fR version 20191027. +This document describes \fBot2kpx\fR version 20191029. .SH "RECENT CHANGES" .IX Header "RECENT CHANGES" (See the source code for the rest of the story.) diff --git a/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf b/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf index e829ed6d26f..476a6761385 100644 Binary files a/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf and b/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf differ diff --git a/Master/texmf-dist/doc/support/fontools/splitttc b/Master/texmf-dist/doc/support/fontools/splitttc index 42aa6ddbb69..fcd36cba2d5 100755 --- a/Master/texmf-dist/doc/support/fontools/splitttc +++ b/Master/texmf-dist/doc/support/fontools/splitttc @@ -37,7 +37,7 @@ use File::Basename; use Getopt::Long; use Pod::Usage; -my $VERSION = "20191027"; +my $VERSION = "20191029"; parse_commandline(); @@ -245,7 +245,7 @@ See the GNU General Public License for more details. =head1 VERSION -This document describes B version 20191027. +This document describes B version 20191029. =head1 RECENT CHANGES diff --git a/Master/texmf-dist/scripts/fontools/afm2afm b/Master/texmf-dist/scripts/fontools/afm2afm index 50060564910..5aba6725a4d 100755 --- a/Master/texmf-dist/scripts/fontools/afm2afm +++ b/Master/texmf-dist/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 version 20191027. +This document describes B version 20191029. =head1 RECENT CHANGES diff --git a/Master/texmf-dist/scripts/fontools/autoinst b/Master/texmf-dist/scripts/fontools/autoinst index 7981beac873..c8ce5a3c2e9 100755 --- a/Master/texmf-dist/scripts/fontools/autoinst +++ b/Master/texmf-dist/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, 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 package to change the text encoding. - By default, B 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 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 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. @@ -2826,7 +2825,7 @@ GNU General Public License for more details. =head1 VERSION -This document describes B version 20191027. +This document describes B version 20191029. =head1 RECENT CHANGES @@ -2835,15 +2834,19 @@ This document describes B 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 files between font series and standard NFSS attributes now uses the new I function instead of I (based on code by -Frank Mittelbach). The generated F files no longer change -the default text encoding. +Frank Mittelbach). The way F 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/Master/texmf-dist/scripts/fontools/ot2kpx b/Master/texmf-dist/scripts/fontools/ot2kpx index c49260d7189..b81d227ee27 100755 --- a/Master/texmf-dist/scripts/fontools/ot2kpx +++ b/Master/texmf-dist/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 version 20191027. +This document describes B version 20191029. =head1 RECENT CHANGES -- cgit v1.2.3