texlive[51148] trunk: fontools (17may19)
commits+karl at tug.org
commits+karl at tug.org
Fri May 17 22:56:07 CEST 2019
Revision: 51148
http://tug.org/svn/texlive?view=revision&revision=51148
Author: karl
Date: 2019-05-17 22:56:07 +0200 (Fri, 17 May 2019)
Log Message:
-----------
fontools (17may19)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/fontools/autoinst
trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
trunk/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf
trunk/Master/texmf-dist/doc/man/man1/autoinst.1
trunk/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf
trunk/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf
trunk/Master/texmf-dist/doc/support/fontools/README
trunk/Master/texmf-dist/scripts/fontools/autoinst
Modified: trunk/Build/source/texk/texlive/linked_scripts/fontools/autoinst
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/fontools/autoinst 2019-05-17 20:55:46 UTC (rev 51147)
+++ trunk/Build/source/texk/texlive/linked_scripts/fontools/autoinst 2019-05-17 20:56:07 UTC (rev 51148)
@@ -868,6 +868,9 @@
sub make_cmdline {
my $item = shift;
+ if ( !$ARGV{ligatures} ) {
+ @{$item->{features}} = grep { $_ ne 'liga' } @{$item->{features}};
+ }
return join ' ', 'otftotfm',
($ARGV{manual} ? '--pl' : '--automatic'),
"--encoding=$item->{encoding}[0]",
@@ -1005,7 +1008,7 @@
inferiors => 'none', # possible values: none, auto, subs, sinf, dnom
ornaments => '1', # 0 = no, 1 = yes
fractions => '0', # 0 = no, 1 = yes
- ligatures => '0', # 0 = no, 1 = yes
+ ligatures => '2', # 0 = no, 1 = yes, 2 = (nfss ne 'tt' ? yes : no)
nfss => 'rm',
fig_height => 'lnum',
fig_width => 'tnum',
@@ -1113,6 +1116,11 @@
delete $SHAPE{textcomp};
}
+ # If the user didn't explicitly say anything about ligatures,
+ # activate them unless the font is a typewriter font.
+ if ($ARGV{ligatures} == 2) {
+ $ARGV{ligatures} = $ARGV{nfss} ne 'tt' ? 1 : 0;
+ }
# Fix the %STYLE table to take 'default' figure styles into account.
$STYLE_DEFAULTS{$ARGV{fig_height}}();
$STYLE_DEFAULTS{$ARGV{fig_width}}();
@@ -2354,10 +2362,11 @@
but don't provide a "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.
-Since this option is rarely necessary
-(most fonts with f-ligatures do provide the matching "liga" feature),
-the default is B<-noligatures>.
+The default is B<-ligatures>, unless the user specified the I<ligatures> option.
+Specify B<-noligatures> to disable the generation of ligatures even for fonts
+that do contain a "liga" feature.
+
=item B<-defaultlining> / B<-defaultoldstyle>
=item B<-defaulttabular> / B<-defaultproportional>
@@ -2534,6 +2543,12 @@
=over 12
+=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).
+
=item I<2019-05-11>
Separate small caps families are now also recognised when the family name
@@ -2553,7 +2568,7 @@
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.
-Only add f-ligatures to fonts when explicitly asked to (<-fligatures>).
+Only add f-ligatures to fonts when explicitly asked to (I<-ligatures>).
=item I<2019-04-11>
Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2019-05-17 20:55:46 UTC (rev 51147)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2019-05-17 20:56:07 UTC (rev 51148)
@@ -1,12 +1,12 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 51076 2019-05-10 22:23:09Z karl $
+# $Id: tlmgr.pl 51141 2019-05-16 11:18:52Z preining $
#
# Copyright 2008-2019 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 51076 $';
-my $datrev = '$Date: 2019-05-11 00:23:09 +0200 (Sat, 11 May 2019) $';
+my $svnrev = '$Revision: 51141 $';
+my $datrev = '$Date: 2019-05-16 13:18:52 +0200 (Thu, 16 May 2019) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -4545,6 +4545,27 @@
$localtlpdb->save;
return ($F_OK);
}
+ if ($what eq "status") {
+ if (!defined($remotetlpdb)) {
+ init_tlmedia_or_die();
+ }
+ if (!$remotetlpdb->is_virtual) {
+ my $verstat = $remotetlpdb->verification_status;
+ print "main ", $remotetlpdb->location, " ",
+ ($::machinereadable ? "$verstat " : ""),
+ $VerificationStatusDescription{$verstat}, "\n";
+ return ($F_OK);
+ } else {
+ for my $t ($remotetlpdb->virtual_get_tags()) {
+ my $tlpdb = $remotetlpdb->virtual_get_tlpdb($t);
+ my $verstat = $tlpdb->verification_status;
+ print "$t ", $tlpdb->location, " ",
+ ($::machinereadable ? "$verstat " : ""),
+ $VerificationStatusDescription{$verstat}, "\n";
+ }
+ return($F_OK);
+ }
+ }
# we are still here, unknown command to repository
tlwarn("$prg: unknown subaction for tlmgr repository: $what\n");
return ($F_ERROR);
@@ -8606,6 +8627,8 @@
=item B<repository set I<path>[#I<tag>] [I<path>[#I<tag>] ...]>
+=item B<repository status>
+
This action manages the list of repositories. See L<MULTIPLE
REPOSITORIES> below for detailed explanations.
@@ -8620,9 +8643,18 @@
The third form (C<add>) adds a repository
(optionally attaching a tag) to the list of repositories. The forth
form (C<remove>) removes a repository, either by full path/url, or by
-tag. The last form (C<set>) sets the list of repositories to the items
-given on the command line, not keeping previous settings
+tag. The fifth form (C<set>) sets the list of repositories to the items
+given on the command line, not keeping previous settings.
+The last form (C<status>) reports the verification status of the
+loaded repositories in the following format: One repository per line with
+4 fields separated with a single space: The tag (which can be the same
+as the URL), the URL, the verification code (a number), and the
+verbal description of the verification status (last field extending to
+the end of line). This format is valid under machine readable output,
+while in normal output the third field (numeric verification status)
+is not present.
+
In all cases, one of the repositories must be tagged as C<main>;
otherwise, all operations will fail!
@@ -9798,7 +9830,7 @@
distribution (L<https://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: tlmgr.pl 51076 2019-05-10 22:23:09Z karl $
+$Id: tlmgr.pl 51141 2019-05-16 11:18:52Z preining $
=cut
# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
Modified: trunk/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/man/man1/autoinst.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/autoinst.1 2019-05-17 20:55:46 UTC (rev 51147)
+++ trunk/Master/texmf-dist/doc/man/man1/autoinst.1 2019-05-17 20:56:07 UTC (rev 51148)
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "AUTOINST 1"
-.TH AUTOINST 1 "2019-05-11" "fontools" "Marc Penninga"
+.TH AUTOINST 1 "2019-05-17" "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
@@ -558,9 +558,10 @@
but don't provide a \*(L"liga\*(R" feature to access these.
This option tells \fBautoinst\fR to add extra \f(CW\*(C`LIGKERN\*(C'\fR rules to
the generated fonts to enable the use of these ligatures.
-Since this option is rarely necessary
-(most fonts with f\-ligatures do provide the matching \*(L"liga\*(R" feature),
-the default is \fB\-noligatures\fR.
+The default is \fB\-ligatures\fR, unless the user specified the \fIligatures\fR option.
+.Sp
+Specify \fB\-noligatures\fR to disable the generation of ligatures even for fonts
+that do contain a \*(L"liga\*(R" feature.
.IP "\fB\-defaultlining\fR / \fB\-defaultoldstyle\fR" 4
.IX Item "-defaultlining / -defaultoldstyle"
.PD 0
@@ -714,6 +715,11 @@
.SH "RECENT CHANGES"
.IX Header "RECENT CHANGES"
(See the source for the full story, all the way back to 2005.)
+.IP "\fI2019\-05\-17\fR" 12
+.IX Item "2019-05-17"
+Changed the way the \fI\-ligatures\fR option works:
+\&\fI\-ligatures\fR enables f\-ligatures (even without a \*(L"liga\*(R" feature),
+\&\fI\-noligatures\fR now disables f\-ligatures (overriding a \*(L"liga\*(R" feature).
.IP "\fI2019\-05\-11\fR" 12
.IX Item "2019-05-11"
Separate small caps families are now also recognised when the family name
@@ -730,7 +736,7 @@
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.
-Only add f\-ligatures to fonts when explicitly asked to (<\-fligatures>).
+Only add f\-ligatures to fonts when explicitly asked to (\fI\-ligatures\fR).
.IP "\fI2019\-04\-11\fR" 12
.IX Item "2019-04-11"
Tried to make the log file more relevant.
Modified: trunk/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/support/fontools/README
===================================================================
--- trunk/Master/texmf-dist/doc/support/fontools/README 2019-05-17 20:55:46 UTC (rev 51147)
+++ trunk/Master/texmf-dist/doc/support/fontools/README 2019-05-17 20:56:07 UTC (rev 51148)
@@ -69,4 +69,4 @@
the license conditions.
- Marc Penninga, 2019/05/11
+ Marc Penninga, 2019/05/17
Modified: trunk/Master/texmf-dist/scripts/fontools/autoinst
===================================================================
--- trunk/Master/texmf-dist/scripts/fontools/autoinst 2019-05-17 20:55:46 UTC (rev 51147)
+++ trunk/Master/texmf-dist/scripts/fontools/autoinst 2019-05-17 20:56:07 UTC (rev 51148)
@@ -868,6 +868,9 @@
sub make_cmdline {
my $item = shift;
+ if ( !$ARGV{ligatures} ) {
+ @{$item->{features}} = grep { $_ ne 'liga' } @{$item->{features}};
+ }
return join ' ', 'otftotfm',
($ARGV{manual} ? '--pl' : '--automatic'),
"--encoding=$item->{encoding}[0]",
@@ -1005,7 +1008,7 @@
inferiors => 'none', # possible values: none, auto, subs, sinf, dnom
ornaments => '1', # 0 = no, 1 = yes
fractions => '0', # 0 = no, 1 = yes
- ligatures => '0', # 0 = no, 1 = yes
+ ligatures => '2', # 0 = no, 1 = yes, 2 = (nfss ne 'tt' ? yes : no)
nfss => 'rm',
fig_height => 'lnum',
fig_width => 'tnum',
@@ -1113,6 +1116,11 @@
delete $SHAPE{textcomp};
}
+ # If the user didn't explicitly say anything about ligatures,
+ # activate them unless the font is a typewriter font.
+ if ($ARGV{ligatures} == 2) {
+ $ARGV{ligatures} = $ARGV{nfss} ne 'tt' ? 1 : 0;
+ }
# Fix the %STYLE table to take 'default' figure styles into account.
$STYLE_DEFAULTS{$ARGV{fig_height}}();
$STYLE_DEFAULTS{$ARGV{fig_width}}();
@@ -2354,10 +2362,11 @@
but don't provide a "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.
-Since this option is rarely necessary
-(most fonts with f-ligatures do provide the matching "liga" feature),
-the default is B<-noligatures>.
+The default is B<-ligatures>, unless the user specified the I<ligatures> option.
+Specify B<-noligatures> to disable the generation of ligatures even for fonts
+that do contain a "liga" feature.
+
=item B<-defaultlining> / B<-defaultoldstyle>
=item B<-defaulttabular> / B<-defaultproportional>
@@ -2534,6 +2543,12 @@
=over 12
+=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).
+
=item I<2019-05-11>
Separate small caps families are now also recognised when the family name
@@ -2553,7 +2568,7 @@
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.
-Only add f-ligatures to fonts when explicitly asked to (<-fligatures>).
+Only add f-ligatures to fonts when explicitly asked to (I<-ligatures>).
=item I<2019-04-11>
More information about the tex-live-commits
mailing list