fontools (23may19)

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

6 files changed, 73 insertions, 59 deletions

diff --git a/Master/texmf-dist/doc/man/man1/afm2afm.1 b/Master/texmf-dist/doc/man/man1/afm2afm.1
index 540dbeaa4d0..d8d2f760d71 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 "2013-08-07" "fontools" "Marc Penninga"
+.TH AFM2AFM 1 "2019-05-22" "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
@@ -145,6 +145,7 @@ afm2afm \- reencode an afm file
 .IP "\fBafm2afm\fR" 8
 .IX Item "afm2afm"
 [\fB\-help\fR]
+[\fB\-version\fR]
 [\fB\-encoding\fR \fIencodingfile\fR]
 [\fB\-kpx\fR \fIkpxfile\fR]
 [\fB\-output\fR \fIoutputfile\fR]
@@ -158,8 +159,8 @@ chosen encoding are excluded from the output, which resuls in
 (potentially much) smaller files.
 .PP
 Additional kerning pairs can be added to the output file.
-If you don't specify an encoding file, 
-the \fIafm\fR file isn't re-encoded; 
+If you don't specify an encoding file,
+the \fIafm\fR file isn't re-encoded;
 however, all unused (unencoded) data is still pruned.
 .PP
 The program also generates an entry for a \fIdvips\fR\-style map file,
@@ -171,13 +172,16 @@ the output was written to file
 .IP "\fB\-help\fR" 4
 .IX Item "-help"
 Print a short description of the syntax
+.IP "\fB\-version\fR" 4
+.IX Item "-version"
+Print version number and exit
 .IP "\fB\-encoding\fR \fIencodingfile\fR" 4
 .IX Item "-encoding encodingfile"
 Re-encode to the enconding in \fIencodingfile\fR
 .IP "\fB\-kpx\fR \fIkpxfile\fR" 4
 .IX Item "-kpx kpxfile"
 Read additional kerning pairs from \fIkpxfile\fR and add these to the output.
-This option cannot be used to override values from the input \fIafm\fR file, 
+This option cannot be used to override values from the input \fIafm\fR file,
 since \fBafm2afm\fR will write both old and new values to the output!
 .Sp
 The \fIkpxfile\fR should contain kerning data in standard \fIafm\fR format,
@@ -202,7 +206,7 @@ and option names may be shortened to a unique prefix.
 Marc Penninga <marcpenninga@gmail.com>
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
-Copyright (C) 2005\-2013 Marc Penninga.
+Copyright (C) 2005\-2019 Marc Penninga.
 .SH "LICENSE"
 .IX Header "LICENSE"
 This program is free software; you can redistribute it and/or modify
@@ -217,15 +221,12 @@ This program is distributed in the hope that it will be useful,
 but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of
 \&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0
 See the \s-1GNU\s0 General Public License for more details.
+.SH "VERSION"
+.IX Header "VERSION"
+This document describes \fBafm2afm\fR version 20190522.
 .SH "RECENT CHANGES"
 .IX Header "RECENT CHANGES"
 (See the source code for the rest of the story.)
-.IP "\fI2013\-08\-07\fR" 12
-.IX Item "2013-08-07"
-Added the \fI\-kpx\fR command-line option.
-Replaced all \f(CW\*(C`given/when\*(C'\fR constructions in the source code by \f(CW\*(C`if\*(C'\fR's,
-to avoid warnings about experimental features in Perl 5.18 and later.
-.IP "\fI2012\-02\-01\fR" 12
-.IX Item "2012-02-01"
-Refactored the code; added the \*(L"no re-encoding, only pruning\*(R"
-functionality.
+.IP "\fI2019\-05\-20\fR" 12
+.IX Item "2019-05-20"
+Added the \fI\-version\fR option.
diff --git a/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf b/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf
index 219a4958b1f..3b9276bc2e8 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 db247f9d597..2ecb719256c 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-17" "fontools" "Marc Penninga"
+.TH AUTOINST 1 "2019-05-22" "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
@@ -258,7 +258,7 @@ but this choice can be overridden by the user;
 see the \fI\-logfile\fR command-line option in \*(L"COMMAND-LINE \s-1OPTIONS\*(R"\s0 below.
 If this log file already exists, \fBautoinst\fR will append its data to the end
 rather than overwrite it.
-Use the \fI\-verbose\fR command-line option to ask for more detailed info.
+Use the \fI\-Verbose\fR command-line option to ask for more detailed info.
 .SS "A note for MiKTeX users"
 .IX Subsection "A note for MiKTeX users"
 Automatically installing the fonts into a suitable \s-1TEXMF\s0 tree
@@ -297,6 +297,15 @@ To use the fonts, add the command \f(CW\*(C`\eusepackage{\f(CI<FontFamily>\f(CW}
 to the preamble of your document.
 .PP
 This style file defines a number of options:
+.ie n .IP """mainfont""" 4
+.el .IP "\f(CWmainfont\fR" 4
+.IX Item "mainfont"
+Redefine \f(CW\*(C`\efamilydefault\*(C'\fR to make this font the main font
+for the document.
+This is a no-op if the font is installed as a serif font;
+but if the font is installed as a sanserif or typewriter font,
+this option saves you from having to redefine \f(CW\*(C`\efamilydefault\*(C'\fR
+yourself.
 .ie n .IP """lining"", ""oldstyle"", ""tabular"", ""proportional""" 4
 .el .IP "\f(CWlining\fR, \f(CWoldstyle\fR, \f(CWtabular\fR, \f(CWproportional\fR" 4
 .IX Item "lining, oldstyle, tabular, proportional"
@@ -379,19 +388,6 @@ 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"
-\&\fI\f(BI\s-1CAVEAT\s0\fI: this functionality was almost completely rewritten
-in release 2019\-03\-14.
-Older versions tried to map all fonts directly to short \s-1NFSS\s0 codes,
-but often had to invent non-standard codes in order to deal with the
-many different weights and widths that occur in the wild.
-Such non-standard \s-1NFSS\s0 codes will no longer
-work for fonts installed with newer versions; for those you'll have to either
-use the long names or stick to the standard \s-1NFSS\s0 codes.
-(This change mainly concerns very light or very heavy weights
-and very condensed widths;
-for more moderate weights and widths,
-existing code will very probably continue to work.)\fR
-.PP
 LaTeX's New Font Selection System (\s-1NFSS\s0)
 identifies fonts by a combination of family,
 series (the concatenation of weight and width), shape and size.
@@ -466,17 +462,23 @@ You may use either one or two dashes before options,
 and option names may be shortened to a unique prefix
 (e.g., \fB\-encoding\fR may be abbreviated to \fB\-enc\fR or even \fB\-en\fR,
 but \fB\-e\fR is ambiguous (it may mean either \fB\-encoding\fR or \fB\-extra\fR)).
+.IP "\fB\-version\fR" 4
+.IX Item "-version"
+Print \fBautoinst\fR's version number and exit.
+.IP "\fB\-help\fR" 4
+.IX Item "-help"
+Print a (relatively) short help text and exit.
 .IP "\fB\-dryrun\fR" 4
 .IX Item "-dryrun"
 Don't generate output; just parse input fonts and write
-a log file saying what it would have done.
+a log file saying what \fBautoinst\fR would have done.
 .IP "\fB\-logfile\fR=\fIfilename\fR" 4
 .IX Item "-logfile=filename"
 Write log data to \fIfilename\fR instead of the default \fI<fontfamily>.log\fR.
-If the file already exist, \fBautoinst\fR appends to it;
+If the file already exists, \fBautoinst\fR appends to it;
 it doesn't overwrite an existing file.
-.IP "\fB\-verbose\fR" 4
-.IX Item "-verbose"
+.IP "\fB\-Verbose\fR (\fInote:\fR uppercase 'V'!)" 4
+.IX Item "-Verbose (note: uppercase 'V'!)"
 Add more details to the log file. Repeat this option for even more info.
 .IP "\fB\-encoding\fR=\fIencoding[,encoding]\fR" 4
 .IX Item "-encoding=encoding[,encoding]"
@@ -497,13 +499,19 @@ the \*(L"fontools_\*(R" prefix may be omitted.)
 Control the creation of TS1\-encoded fonts. The default is \fB\-ts1\fR
 if the text encodings (see \fI\-encoding\fR above) include T1,
 \&\fB\-nots1\fR otherwise.
-.IP "\fB\-serif\fR, \fB\-sanserif\fR, \fB\-typewriter\fR" 4
-.IX Item "-serif, -sanserif, -typewriter"
+.IP "\fB\-serif\fR / \fB\-sanserif\fR / \fB\-typewriter\fR" 4
+.IX Item "-serif / -sanserif / -typewriter"
 Install the font as a serif, sanserif or typewriter font, respectively.
-This changes how you access the font in LaTeX: with \f(CW\*(C`\ermfamily\*(C'\fR/\f(CW\*(C`\etextrm\*(C'\fR,
-\&\f(CW\*(C`\esffamily\*(C'\fR/\f(CW\*(C`\etextsf\*(C'\fR or \f(CW\*(C`\ettfamily\*(C'\fR/\f(CW\*(C`\etexttt\*(C'\fR.
-The generated style file redefines \f(CW\*(C`\efamilydefault\*(C'\fR,
-so including it will still make this font the default text font.
+This changes how you access the font in LaTeX:
+with \f(CW\*(C`\ermfamily\*(C'\fR/\f(CW\*(C`\etextrm\*(C'\fR, \f(CW\*(C`\esffamily\*(C'\fR/\f(CW\*(C`\etextsf\*(C'\fR
+or \f(CW\*(C`\ettfamily\*(C'\fR/\f(CW\*(C`\etexttt\*(C'\fR.
+.Sp
+Installing the font as a typewriter font will cause two further changes:
+it will \- by default \- turn off the use of f\-ligatures
+(though this can be overridden with the \fI\-ligatures\fR option),
+and it will disable hyphenation for this font.
+This latter effect cannot be disabled in \fBautoinst\fR;
+if you want typewriter text to be hyphenated, use the \fIhyphenat\fR package.
 .IP "\fB\-lining\fR / \fB\-nolining\fR" 4
 .IX Item "-lining / -nolining"
 Control the creation of fonts with lining figures. The default is
@@ -542,7 +550,7 @@ as inferiors or subscripts: \*(L"Subscripts\*(R" (OpenType feature \*(L"subs\*(R
 This option allows the user to determine which of these styles \fBautoinst\fR
 should use for the inferior characters.
 Alternatively, the value \*(L"auto\*(R" tells \fBautoinst\fR to use the first value
-in the list \*(L"subs\*(R", \*(L"sinf\*(R" or \*(L"dnom\*(R" that is supported by the fonts.
+in \*(L"subs\*(R", \*(L"sinf\*(R" or \*(L"dnom\*(R" that is supported by the font.
 The default value is \*(L"none\*(R".
 .Sp
 \&\fIIf you specify a style of inferiors that isn't present in the font,
@@ -692,7 +700,7 @@ Marc Penninga (\fImarcpenninga@gmail.com\fR)
 .PP
 When sending a bug report, please give as much relevant information as possible;
 this usually includes (but may not be limited to) the log file
-(please add the \fI\-verbose\fR command-line option, for extra info).
+(please add the \fI\-Verbose\fR command-line option, for extra info).
 If you see any error messages, please include these \fIverbatim\fR;
 don't paraphase.
 .SH "COPYRIGHT"
@@ -712,9 +720,18 @@ This program is distributed in the hope that it will be useful,
 but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of
 \&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0 See the
 \&\s-1GNU\s0 General Public License for more details.
+.SH "VERSION"
+.IX Header "VERSION"
+This document describes \fBautoinst\fR version 20190522.
 .SH "RECENT CHANGES"
 .IX Header "RECENT CHANGES"
 (See the source for the full story, all the way back to 2005.)
+.IP "\fI2019\-05\-22\fR" 12
+.IX Item "2019-05-22"
+Added the \fImainfont\fR option to the generated \fIsty\fR files.
+Prevented hyphenation for typewriter fonts
+(added \f(CW\*(C`\ehyphenchar\efont=\-1\*(C'\fR to the \f(CW\*(C`\eDeclareFontFamily\*(C'\fR declarations).
+Added the \fI\-version\fR option, and renamed \fI\-verbose\fR to \fI\-Verbose\fR.
 .IP "\fI2019\-05\-17\fR" 12
 .IX Item "2019-05-17"
 Changed the way the \fI\-ligatures\fR option works:
@@ -759,8 +776,6 @@ Added \*(L"auto\*(R" value to the \fIinferiors\fR option,
 to tell \fBautoinst\fR to use whatever inferior characters are available.
 .IP "\fI2019\-03\-14\fR" 12
 .IX Item "2019-03-14"
-(never released to \s-1CTAN\s0)
-.Sp
 Overhauled the mapping of fonts (more specifically of weights and widths;
 the mapping of shapes didn't change) to \s-1NFSS\s0 codes.
 Instead of inventing our own codes to deal with every possible weight
@@ -769,9 +784,3 @@ in the font metadata.
 Then we add \*(L"ssub\*(R" rules to the \fIfd\fR files to map the standard \s-1NFSS\s0 codes
 to our fancy names (see the section \fB\s-1NFSS\s0 codes\fR;
 based on discussions with Frank Mittelbach and Bob Tennent).
-.IP "\fI2018\-08\-10\fR" 12
-.IX Item "2018-08-10"
-Added encoding files for \s-1LGR\s0 and T2A/B/C to \fIfontools\fR.
-.IP "\fI2018\-03\-26\fR" 12
-.IX Item "2018-03-26"
-Added the \fI\-(no)mergewidths\fR option; tried to improve the documentation.
diff --git a/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf b/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf
index 90e64fce89f..c76029fa682 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.1 b/Master/texmf-dist/doc/man/man1/ot2kpx.1
index 645fdf763c6..a7c582fff3e 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-04-15" "fontools" "Marc Penninga"
+.TH OT2KPX 1 "2019-05-22" "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
@@ -150,6 +150,12 @@ to \f(CW\*(C`stdout\*(C'\fR, either in Adobe's \s-1KPX\s0 format (for adding to
 or as a Luatex custom feature, for use with the \f(CW\*(C`\edirectlua\*(C'\fR command.
 .SH "OPTIONS AND ARGUMENTS"
 .IX Header "OPTIONS AND ARGUMENTS"
+.IP "\fB\-help\fR" 4
+.IX Item "-help"
+Print a short help text and exit.
+.IP "\fB\-version\fR" 4
+.IX Item "-version"
+Print \fBot2kpx\fR's version and exit.
 .IP "\fB\-afm\fR, \fB\-kpx\fR" 4
 .IX Item "-afm, -kpx"
 Output the kerning data in Adobe's \s-1KPX\s0 format, as used in \fIafm\fR files.
@@ -220,18 +226,16 @@ This program is distributed in the hope that it will be useful,
 but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of
 \&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0
 See the \s-1GNU\s0 General Public License for more details.
+.SH "VERSION"
+.IX Header "VERSION"
+This document describes \fBot2kpx\fR version 20190522.
 .SH "RECENT CHANGES"
 .IX Header "RECENT CHANGES"
 (See the source code for the rest of the story.)
+.IP "\fI2019\-05\-20\fR" 12
+.IX Item "2019-05-20"
+Added the \fI\-version\fR option.
 .IP "\fI2019\-04\-15\fR" 12
 .IX Item "2019-04-15"
-Added the \-lua command-line option to get output in Luatex's
+Added the \fI\-lua\fR command-line option to get output in Luatex's
 custom feature format.
-.IP "\fI2013\-08\-07\fR" 12
-.IX Item "2013-08-07"
-Replaced all \f(CW\*(C`given/when\*(C'\fR constructions in the source code by \f(CW\*(C`if\*(C'\fR's,
-to avoid warnings about experimental features in Perl 5.18 and later.
-.IP "\fI2012\-02\-01\fR" 12
-.IX Item "2012-02-01"
-Refactored the code, and fixed a number of bugs in the process.
-Updated the documentation.
diff --git a/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf b/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf
index 94d5bf7ee29..77b7ef322df 100644
--- a/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf