fontools (26mar18)

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

5 files changed, 84 insertions, 89 deletions

diff --git a/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf b/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf
index 9074a16ee18..f64e33d3979 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 94b80903be8..76152e54b2d 100644
--- a/Master/texmf-dist/doc/man/man1/autoinst.1
+++ b/Master/texmf-dist/doc/man/man1/autoinst.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "AUTOINST 1"
-.TH AUTOINST 1 "2018-01-09" "fontools" "Marc Penninga"
+.TH AUTOINST 1 "2018-03-26" "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
@@ -160,7 +160,7 @@ and proportional variants), all with the following shapes:
 .RS 2
 .IP "\fIn\fR" 8
 .IX Item "n"
-Roman text
+Roman (i.e., upright) text
 .IP "\fIit\fR, \fIsl\fR" 8
 .IX Item "it, sl"
 Italic and slanted (sometimes called oblique) text
@@ -172,8 +172,7 @@ Small caps
 Swash
 .IP "\fItl\fR" 8
 .IX Item "tl"
-Titling shape. Meant for all-caps text only (even though it sometimes contains
-lowercase glyphs as well), where letterspacing and the positioning of
+Titling shape. Meant for all-caps text; letterspacing and the positioning of 
 punctuation characters have been adjusted to suit all-caps text.
 (This shape is only generated for the families with lining digits, 
 since old-style digits make no sense with all-caps text.)
@@ -200,15 +199,15 @@ in roman, italic and slanted shapes.
 Families with superiors, inferiors, numerators and denominators,
 in roman, italic and slanted shapes.
 .IP "\-" 3
-An ornament family, in roman, italic and slanted shapes.
+An ornament family, also in roman, italic and slanted shapes.
 .RE
 .RS 2
 .RE
 .PP
-Of course, if the fonts don't contain italics, oldstyle digits, small caps 
+Of course, if your fonts don't contain italics, oldstyle digits, small caps 
 etc., the corresponding shapes and families are not created.
 In addition, the creation of most families and shapes can be controlled 
-by options (see \*(L"COMMAND-LINE \s-1OPTIONS\*(R"\s0 below).
+by the user (see \*(L"COMMAND-LINE \s-1OPTIONS\*(R"\s0 below).
 .PP
 These families use the \fIFontPro\fR project's naming scheme: 
 \&\fI<FontFamily>\-<Suffix>\fR, where \fI<Suffix>\fR is:
@@ -243,7 +242,7 @@ numerators
 .IX Item "Dnom"
 denominators
 .PP
-The generated fonts are named \fI<FontName>\-<suffix>\-<shape>\-<enc>\fR,
+The individual fonts are named \fI<FontName>\-<suffix>\-<shape>\-<enc>\fR,
 where \fI<suffix>\fR is the same as above (but in lowercase),
 \&\fI<shape>\fR is either empty, \*(L"sc\*(R", \*(L"swash\*(R" or \*(L"titling\*(R",
 and \fI<enc>\fR is the encoding (also in lowercase).
@@ -253,16 +252,16 @@ A typical name in this scheme would be \*(L"FiraSans\-Light\-osf\-sc\-ly1\*(R".
 By default, \fBautoinst\fR generates text fonts with \s-1OT1, T1\s0 and \s-1LY1\s0
 encodings, and the generated style files use \s-1LY1\s0 as the default text encoding.
 \&\s-1LY1\s0 has been chosen over T1 because it has some empty slots to accommodate
-the additional ligatures provided by many OpenType fonts.
+the additional ligatures found in many OpenType fonts.
 Other encodings can be chosen using the \fI\-encoding\fR option 
 (see \*(L"COMMAND-LINE \s-1OPTIONS\*(R"\s0 below).
 .SS "Using the fonts in your LaTeX documents"
 .IX Subsection "Using the fonts in your LaTeX documents"
-\&\fBautoinst\fR generates a style file for using the font in LaTeX documents,
+\&\fBautoinst\fR generates a style file for using the fonts in LaTeX documents,
 named \fI<FontFamily>.sty\fR. This style file also takes care of loading the
 \&\fIfontenc\fR and \fItextcomp\fR packages.
-To use the font, put the command \f(CW\*(C`\eusepackage{\f(CI<FontFamily>\f(CW}\*(C'\fR
-in the preamble of your document.
+To use the fonts, add the command \f(CW\*(C`\eusepackage{\f(CI<FontFamily>\f(CW}\*(C'\fR
+to the preamble of your document.
 .PP
 This style file defines a number of options:
 .ie n .IP """lining"", ""oldstyle"", ""tabular"", ""proportional""" 4
@@ -279,14 +278,14 @@ E.g., to increase the size of the font by 5%, use
 May also be spelled \f(CW\*(C`scaled\*(C'\fR.
 .Sp
 This option is only available when you have the \fIxkeyval\fR package installed.
-.ie n .IP """light"", ""medium"", ""regular""" 4
-.el .IP "\f(CWlight\fR, \f(CWmedium\fR, \f(CWregular\fR" 4
-.IX Item "light, medium, regular"
+.ie n .IP """light"", ""medium"", ""book"", ""text"", ""regular""" 4
+.el .IP "\f(CWlight\fR, \f(CWmedium\fR, \f(CWbook\fR, \f(CWtext\fR, \f(CWregular\fR" 4
+.IX Item "light, medium, book, text, regular"
 Select the weight that LaTeX will use as the \*(L"regular\*(R" weight; 
 the default is \f(CW\*(C`regular\*(C'\fR.
-.ie n .IP """ultrablack"", ""ultrabold"", ""heavy"", ""extrablack"", ""black"", ""extrabold"", ""demibold"", ""semibold"", ""bold""" 4
-.el .IP "\f(CWultrablack\fR, \f(CWultrabold\fR, \f(CWheavy\fR, \f(CWextrablack\fR, \f(CWblack\fR, \f(CWextrabold\fR, \f(CWdemibold\fR, \f(CWsemibold\fR, \f(CWbold\fR" 4
-.IX Item "ultrablack, ultrabold, heavy, extrablack, black, extrabold, demibold, semibold, bold"
+.ie n .IP """heavy"", ""ultrablack"", ""extrablack"", ""black"", ""ultrabold"", ""extrabold"", ""demibold"", ""semibold"", ""bold""" 4
+.el .IP "\f(CWheavy\fR, \f(CWultrablack\fR, \f(CWextrablack\fR, \f(CWblack\fR, \f(CWultrabold\fR, \f(CWextrabold\fR, \f(CWdemibold\fR, \f(CWsemibold\fR, \f(CWbold\fR" 4
+.IX Item "heavy, ultrablack, extrablack, black, ultrabold, extrabold, demibold, semibold, bold"
 Select the weight that LaTeX will use as the \*(L"bold\*(R" weight; 
 the default is \f(CW\*(C`bold\*(C'\fR.
 .PP
@@ -310,7 +309,7 @@ characters:
 .Ve
 .PP
 In addition, the \f(CW\*(C`\eswshape\*(C'\fR and \f(CW\*(C`\etextsw\*(C'\fR commands are redefined to place
-swash on the secondary shape axis (\fIfontaxes\fR places it on the primary
+swash on \fIfontaxes\fR' secondary shape axis (\fIfontaxes\fR places it on the primary
 shape axis) to make them behave properly when nested, so that
 \&\f(CW\*(C`\eswshape\eupshape\*(C'\fR will give upright swash.
 .PP
@@ -325,7 +324,7 @@ series and shape. A list of all ornaments in a font can be created by
 running LaTeX on the file \fInfssfont.tex\fR (part of a standard
 LaTeX installation) and supplying the name of the ornament font.
 .PP
-To access the ornaments, \fBautoinst\fR creates a font-specific encoding file
+To access ornament glyphs, \fBautoinst\fR creates a font-specific encoding file
 \&\fI<FontFamily>_orn.enc\fR, 
 but only if that file doesn't yet exist in the current directory.
 This is a deliberate feature that allows you to provide your own
@@ -345,75 +344,65 @@ standard \s-1NFSS\s0 (\f(CW\*(C`\efontfamily\*(C'\fR, \f(CW\*(C`\efontseries\*(C
 these parameters. When this fails
 (e.g., because the font family contains uncommon widths or weights),
 \&\fBautoinst\fR ends up with different fonts having the \fIsame\fR values
-for these font parameters, which means that these fonts cannot be used in \s-1NFSS.\s0
+for these font parameters, and so cannot be used in \s-1NFSS.\s0
 In that case, \fBautoinst\fR will split the font family into multiple subfamilies
 (based on each font file's \*(L"Subfamily\*(R" value) and try again.
 (Since many font vendors misunderstand the \*(L"Subfamily\*(R" concept
 and make each font file its own separate subfamily,
 this strategy is only used as a last resort.)
 .PP
-If such a proliferation of font families is unwanted,
-either run \fBautoinst\fR on a smaller set of fonts or 
-add the missing widths, weights and shapes to the tables \f(CW%FD_WIDTH\fR,
-\&\f(CW%FD_WEIGHT\fR and \f(CW%FD_SHAPE\fR, at the beginning of the source code.
-Please also send a bug report (see \s-1AUTHOR\s0 below).
+If a proliferation of font families is unwanted, either run \fBautoinst\fR 
+on a smaller set of fonts or add the missing widths, weights and shapes to 
+the tables \f(CW%FD_WIDTH\fR, \f(CW%FD_WEIGHT\fR and \f(CW%FD_SHAPE\fR, at the beginning 
+of the source code. Please also send a bug report (see \s-1AUTHOR\s0 below).
 .PP
 \&\fBautoinst\fR maps widths, weights and shapes to \s-1NFSS\s0 codes using
 the following tables. These are based on the standard \fIFontname\fR scheme 
-and Philipp Lehman's \fIFont Installation Guide\fR, but some changes were made 
-to avoid name clashes in font families with many different widths and weights,
+and Philipp Lehman's \fIFont Installation Guide\fR, but some changes had to be made 
+to avoid name clashes in font families with many widths and weights,
 such as Helvetica Neue and Fira Sans.
 .PP
-.Vb 1
+.Vb 10
 \&    WEIGHT                              WIDTH
-\&
-\&    
-\&    Two            2     [1]            Ultra Compressed    up
-\&    Four           4     [1]            Extra Compressed    ep
-\&    Eight          8     [1]            Compressed          p
+\&    \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-            \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+\&    Two            2                    Ultra Compressed    up
+\&    Four           4                    Extra Compressed    ep
+\&    Eight          8                    Compressed          p
 \&    Hair           a                    Compact             p
-\&    Thin           t                    Ultra Condensed     uc
+\&    Thin           i                    Ultra Condensed     uc
 \&    Ultra Light    ul                   Extra Condensed     ec
 \&    Extra Light    el                   Condensed           c
 \&    Light          l                    Narrow              n
-\&    Book           sl    [2]            Semicondensed       sc
-\&    Regular              [3]            Regular                     [3]
-\&    Medium         mb                   Semiextended        sx
-\&    Demibold       db                   Extended            x
-\&    Semibold       sb                   Expanded            e
-\&    Bold           b                    Wide                w
-\&    Extra Bold     eb
-\&    Ultra          ub
-\&    Ultra Bold     ub                   SHAPE
-\&    Black          k
-\&    Extra Black    ek                   Roman, Upright      n       [4]
-\&    Ultra Black    uk                   Italic              it
-\&    Heavy          h                    Cursive, Kursiv     it
-\&    Poster         r                    Oblique             sl      [5]
-\&                                        Slanted             sl      [5]
-\&                                        Incline(d)          sl      [5]
+\&    Regular        \-     [1]            Semicondensed       sc
+\&    Text           t     [2]            Regular             \-       [1]
+\&    Book           o     [2]            Semiextended        sx
+\&    Medium         mb                   Extended            x
+\&    Demibold       db                   Expanded            e
+\&    Semibold       sb                   Wide                w
+\&    Bold           b                    
+\&    Extra Bold     eb                   SHAPE
+\&    Ultra (Bold)   ub                   \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+\&    Black          k                    Roman, Upright      n       [3]
+\&    Extra Black    ek                   Italic, Cursive,
+\&    Ultra Black    uk                       Kursiv          it
+\&    Heavy          h                    Oblique, Slanted,
+\&    Poster         r                        Incline(d)      sl
 .Ve
-.PP
-\fINotes\fR
-.IX Subsection "Notes"
 .IP "[1]" 4
 .IX Item "[1]"
-These weights only occur (as far as I know) in Fira Sans.
+When \fIboth\fR weight and width are empty, the \s-1NFSS\s0 \*(L"series\*(R" attribute becomes \*(L"m\*(R".
 .IP "[2]" 4
 .IX Item "[2]"
-Since release 2018\-01\-09, \fBautoinst\fR adds \*(L"ssub\*(R" rules to the \fIfd\fR files 
-to substitute \*(L"Book\*(R" weight for \*(L"Regular\*(R" when the latter is missing.
-Before that, \*(L"Book\*(R" was treated as a synonym for \*(L"Regular\*(R".
+Until release 2017\-06\-16, \*(L"Text\*(R" and \*(L"Book\*(R" were treated as synonyms for
+\&\*(L"Regular\*(R". As there are some fonts (\s-1IBM\s0 Plex, Fira Sans) that contain
+separate \*(L"Text\*(R" or \*(L"Book\*(R" in addition to \*(L"Regular\*(R" weights,
+I decided to give them their own codes.
+When there is no \*(L"Regular\*(R" weight, \fBautoinst\fR will generate \fIssub\fR rules 
+to substitute either the \*(L"Text\*(R" or the \*(L"Book\*(R" font in its place.
 .IP "[3]" 4
 .IX Item "[3]"
-When \fIboth\fR weight and width are empty, the \*(L"series\*(R" attribute becomes \*(L"m\*(R".
-.IP "[4]" 4
-.IX Item "[4]"
-Adobe Silentium Pro contains two \*(L"Roman\*(R" shapes (\*(L"RomanI\*(R" and \*(L"RomanII\*(R");
-the first of these is mapped to \*(L"n\*(R", the second one to \*(L"it\*(R".
-.IP "[5]" 4
-.IX Item "[5]"
-Since release 2014\-01\-21; before that, slanted shapes were mapped to \*(L"it\*(R".
+Adobe Silentium Pro contains two roman shapes;
+\&\*(L"Roman I\*(R" is mapped to \*(L"n\*(R", \*(L"Roman \s-1II\*(R"\s0 to \*(L"it\*(R".
 .SS "A note for MiKTeX users"
 .IX Subsection "A note for MiKTeX users"
 Automatically installing the fonts into a suitable \s-1TEXMF\s0 tree
@@ -433,7 +422,7 @@ and TeXLive (\fIhttp://tug.org/texlive\fR) don't seem to have this problem.
 .SH "COMMAND-LINE OPTIONS"
 .IX Header "COMMAND-LINE OPTIONS"
 \&\fBautoinst\fR tries hard to do The Right Thing (\s-1TM\s0) by default, 
-so in many cases you won't need these options;
+so you usually won't really need these options;
 but most aspects of its operation can be fine-tuned if you want to.
 .PP
 You may use either one or two dashes before options,
@@ -442,8 +431,8 @@ and option names may be shortened to a unique prefix
 but \fB\-e\fR is ambiguous (it may mean either \fB\-encoding\fR or \fB\-extra\fR)).
 .IP "\fB\-dryrun\fR" 4
 .IX Item "-dryrun"
-Don't actually do anything, only create the logfile \fIautoinst.log\fR 
-showing which fonts would have been generated.
+Don't generate any output files; only parse the input fonts and create 
+\&\fIautoinst.log\fR showing which fonts would have been generated.
 .IP "\fB\-encoding\fR=\fIencoding[,encoding]\fR" 4
 .IX Item "-encoding=encoding[,encoding]"
 Generate the specified encoding(s) for the text fonts. The default is 
@@ -513,11 +502,11 @@ This option allows the user to determine which of these styles \fBautoinst\fR
 should use for the inferior characters. The default is not to create fonts 
 with inferior characters.
 .Sp
-Note that many fonts contain only one (or even none) of these types
+\&\fINote that many fonts contain only one (or even none) of these types
 of inferior characters. If you specify a style of inferiors that isn't
-actually present in the font, \fBautoinst\fR silently falls back to its default
+actually present in the font, \f(BIautoinst\fI silently falls back to its default
 of not creating fonts with inferiors; it doesn't try to substitute one of
-the other features.
+the other features.\fR
 .IP "\fB\-fractions\fR / \fB\-nofractions\fR" 4
 .IX Item "-fractions / -nofractions"
 Control the creation of fonts with numerators and denominators.
@@ -548,6 +537,11 @@ This option adds extra \fI \-\-ligkern\fR options
 to the commands for \fIotftotfm\fR to suppress such kerns. 
 Note that this option leads to very long commands (it adds
 one hundred \fI \-\-ligkern\fR options), which may cause problems on some systems.
+.IP "\fB\-mergewidths\fR / \fB\-nomergewidths\fR" 4
+.IX Item "-mergewidths / -nomergewidths"
+Some font families put Condensed and Extended fonts in separate families;
+this option tells \fBautoinst\fR to merge those separate families into the \*(L"main\*(R" font family. 
+The default is \fB\-nomergewidths\fR.
 .IP "\fB\-extra\fR=\fItext\fR" 4
 .IX Item "-extra=text"
 Append \fItext\fR as extra options to the command lines for \fIotftotfm\fR. 
@@ -575,10 +569,10 @@ and hence ignored in manual mode:
 .IP "\fB\-target\fR=\fI\s-1DIRECTORY\s0\fR" 4
 .IX Item "-target=DIRECTORY"
 Install all generated files into the \s-1TEXMF\s0 tree at \fI\s-1DIRECTORY\s0\fR.
-.Sp
-By default, \fBautoinst\fR searches your \f(CW$TEXMFLOCAL\fR and \f(CW$TEXMFHOME\fR paths
-and installs all files into subdirectories of the first writable \s-1TEXMF\s0 tree
-it finds (or into subdirectories of the current directory,
+This option allows the user to override \fBautoinst\fR's default behaviour, 
+which is to search the \f(CW$TEXMFLOCAL\fR and \f(CW$TEXMFHOME\fR paths and install all files 
+into subdirectories of the first writable \s-1TEXMF\s0 tree it finds 
+(or into subdirectories of the current directory,
 if no writable directory is found).
 .IP "\fB\-vendor\fR=\fI\s-1VENDOR\s0\fR" 4
 .IX Item "-vendor=VENDOR"
@@ -602,29 +596,25 @@ The default is \fB\-updmap\fR.
 Eddie Kohler's \fBTypeTools\fR (\fIhttp://www.lcdf.org/type\fR).
 .PP
 \&\fBPerl\fR can be obtained from \fIhttp://www.perl.org\fR; 
-it is a standard part of many Linux distributions.
+it is included in most Linux distributions.
 For Windows, try ActivePerl (\fIhttp://www.activestate.com\fR)
 or Strawberry Perl (\fIhttp://strawberryperl.com\fR).
 .PP
 \&\fBXeTeX\fR (\fIhttp://www.tug.org/xetex\fR) and \fBLuaTeX\fR (\fIhttp://www.luatex.org\fR)
 are Unicode-aware TeX engines that can use OpenType fonts directly, 
-without the need for any (La)TeX\-specific support files.
+without any (La)TeX\-specific support files.
 .PP
 The \fBFontPro\fR project (\fIhttps://github.com/sebschub/FontPro\fR)
-offers very complete LaTeX support (including math) for Adobe's Minion Pro, 
-Myriad Pro and Cronos Pro font families.
-.PP
-John Owens' \fBotfinst\fR (available from \s-1CTAN\s0) is another wrapper
-around \fIotftotfm\fR.
+offers very complete LaTeX support (even for typesetting maths) for Adobe's 
+Minion Pro, Myriad Pro and Cronos Pro font families.
 .SH "AUTHOR"
 .IX Header "AUTHOR"
-Marc Penninga <marcpenninga@gmail.com>
+Marc Penninga (\fImarcpenninga@gmail.com\fR)
 .PP
 When sending a bug report, please give as much relevant information as
-possible; this includes at least (but may not be limited to) 
-the log file \fIautoinst.log\fR.
+possible.
 If you see any error messages (either from \fBautoinst\fR itself, from the \fI\s-1LCDF\s0 TypeTools\fR,
-from Perl or from the \s-1OS\s0), please include these \fIverbatim\fR as well; don't paraphrase them.
+from Perl or from the \s-1OS\s0), include these \fIverbatim\fR; don't paraphrase.
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
 Copyright (C) 2005\-2018 Marc Penninga.
@@ -645,11 +635,16 @@ 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 "\fI2018\-03\-26\fR" 12
+.IX Item "2018-03-26"
+Added the \*(L"Text\*(R" weight and the \fI\-(no)mergewidths\fR option.
+Changed the \s-1NFSS\s0 codes for \*(L"Thin\*(R" and \*(L"Book\*(R" to \*(L"i\*(R" and \*(L"o\*(R", respectively.
+Tried to improve the documentation.
 .IP "\fI2018\-01\-09\fR" 12
 .IX Item "2018-01-09"
 Added the \*(L"sl\*(R" weight for font families (such as Fira Sans) that contain both
 \&\*(L"Book\*(R" and \*(L"Regular\*(R" weights (reported by Bob Tennent). 
-Added the \*(L"Two\*(R", \*(L"Four\*(R", \*(L"Eight\*(R" and \*(L"Hair\*(R" weights.
+Added the \*(L"Two\*(R", \*(L"Four\*(R", \*(L"Eight\*(R" and \*(L"Hair\*(R" weights (for Fira Sans).
 .IP "\fI2017\-06\-16\fR" 12
 .IX Item "2017-06-16"
 Changed the \fI\-inferiors\fR option from a binary yes-or-no choice to allow
diff --git a/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf b/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf
index 4a84556458a..c31b17f9246 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 f1f2a80e92a..f29529b5028 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 edef4b0c661..93d3cbba3c7 100644
--- a/Master/texmf-dist/doc/support/fontools/README
+++ b/Master/texmf-dist/doc/support/fontools/README
@@ -65,4 +65,4 @@ the terms of the GNU General Public Licence; see the file GPLv2.txt for
 the license conditions.
 
 
-                                                Marc Penninga, 2018/01/09
+                                                Marc Penninga, 2018/03/26