fontools (17may19)

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

6 files changed, 32 insertions, 11 deletions

diff --git a/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf b/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf
index 0804775c5ab..219a4958b1f 100644
--- a/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/autoinst.1 b/Master/texmf-dist/doc/man/man1/autoinst.1
index 4892027d7f7..db247f9d597 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-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 @@ Some fonts create glyphs for the standard f\-ligatures (ff, fi, fl, ffi, ffl),
 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 @@ but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of
 .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 @@ Added the <\-mergesmallcaps> option, to handle cases where
 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.
diff --git a/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf b/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf
index 56eeb557a3d..90e64fce89f 100644
--- a/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf b/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf
index 58c0503160c..94d5bf7ee29 100644
--- a/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf
diff --git a/Master/texmf-dist/doc/support/fontools/README b/Master/texmf-dist/doc/support/fontools/README
index 62e113bb027..93b11098eea 100644
--- a/Master/texmf-dist/doc/support/fontools/README
+++ b/Master/texmf-dist/doc/support/fontools/README
@@ -69,4 +69,4 @@ the terms of the GNU General Public Licence; see the file GPLv2.txt for
 the license conditions.
 
 
-                                                Marc Penninga, 2019/05/11
+                                                Marc Penninga, 2019/05/17
diff --git a/Master/texmf-dist/scripts/fontools/autoinst b/Master/texmf-dist/scripts/fontools/autoinst
index 7abd34c9fdd..d01043cc8ee 100755
--- a/Master/texmf-dist/scripts/fontools/autoinst
+++ b/Master/texmf-dist/scripts/fontools/autoinst
@@ -868,6 +868,9 @@ my %SCHEME = (
 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 @@ END_USAGE
     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 @@ sub parse_options {
         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,9 +2362,10 @@ Some fonts create glyphs for the standard f-ligatures (ff, fi, fl, ffi, ffl),
 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>
 
@@ -2534,6 +2543,12 @@ GNU General Public License for more details.
 
 =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 @@ Added the <-mergesmallcaps> option, to handle cases where
 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>