fontools (25jul13)

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

5 files changed, 77 insertions, 57 deletions

diff --git a/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf b/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf
index 2e6b61eeac4..0f87038f515 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 ffb1ffaca14..74faf19e2ff 100644
--- a/Master/texmf-dist/doc/man/man1/autoinst.1
+++ b/Master/texmf-dist/doc/man/man1/autoinst.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "AUTOINST 1"
-.TH AUTOINST 1 "2013-02-06" "fontools" "Marc Penninga"
+.TH AUTOINST 1 "2013-07-25" "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
@@ -134,15 +134,15 @@ autoinst \- wrapper around the LCDF TypeTools,
 for installing OpenType fonts in LaTeX.
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
-\&\fBautoinst\fR [\fIoptions\fR] \fBfont(s)\fR
+\&\fBautoinst\fR [\fIoptions\fR] \fBfontfile(s)\fR
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
-Eddie Kohler's \fITypeTools\fR, especially \fIotftotfm\fR, are superb tools
-for installing OpenType fonts in LaTeX, but their use
-(even in automatic mode) is complicated: they need many long
-command lines and don't generate the \fIfd\fR and \fIsty\fR files LaTeX needs.
-\&\fBautoinst\fR simplifies the font installation process with \fIotftotfm\fR
-by generating and executing all command lines
+Eddie Kohler's \fI\s-1LCDF\s0 TypeTools\fR are superb tools for installing 
+OpenType fonts in LaTeX, but their use (even in automatic mode) 
+is complicated: they need many, often long, commands 
+and don't generate the \fIfd\fR and \fIsty\fR files LaTeX needs.
+\&\fBautoinst\fR simplifies the use of the \fITypeTools\fR for font installation
+by automatically generating and executing all commands 
 and by creating and installing all \fIfd\fR and \fIsty\fR files.
 .PP
 Given a family of font files (in either \fIotf\fR or \fIttf\fR format),
@@ -161,7 +161,7 @@ Roman text
 Small caps
 .IP "\fInw\fR" 6
 .IX Item "nw"
-\&\*(L"Upright swash\*(R"; usually normal text with some extra \*(L"oldstyle\*(R" ligatures,
+\&\*(L"Upright swash\*(R"; usually normal text with some \*(L"oldstyle\*(R" ligatures,
 such as ct, sp and st.
 .IP "\fItl\fR" 6
 .IX Item "tl"
@@ -249,8 +249,8 @@ By default, \fBautoinst\fR generates text fonts with \s-1OT1\s0, T1 and \s-1LY1\
 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 accomodate
 the additional ligatures and alternate glyphs provided by many OpenType fonts.
-Different encodings can be selected using the \fI\-encoding\fR
-command-line option (see \*(L"COMMAND-LINE \s-1OPTIONS\s0\*(R" below).
+Encodings can be chosen using the \fI\-encoding\fR command-line option 
+(see \*(L"COMMAND-LINE \s-1OPTIONS\s0\*(R" 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,
@@ -262,24 +262,29 @@ in the preamble of your document.
 This style file defines a number of options:
 .IP "\fIlining, oldstyle, tabular, proportional\fR" 4
 .IX Item "lining, oldstyle, tabular, proportional"
-Choose which digits will be used for the text fonts.
+Choose which digit style to use. 
 The defaults are \*(L"oldstyle\*(R" and \*(L"proportional\*(R" (if available).
-.IP "\fIultrablack, ultrabold, heavy, extrablack, black, extrabold, demibold, semibold, bold\fR" 4
-.IX Item "ultrablack, ultrabold, heavy, extrablack, black, extrabold, demibold, semibold, bold"
-Choose the weight that LaTeX will use for the \*(L"bold\*(R" weight
-(i.e., the value of \f(CW\*(C`\ebfdefault\*(C'\fR).
-.IP "\fIlight, medium, regular\fR" 4
-.IX Item "light, medium, regular"
-Choose the weight that LaTeX will use for the \*(L"regular\*(R" weight
-(i.e., the value of \f(CW\*(C`\emddefault\*(C'\fR).
+.IP "\fIscale=<scale>\fR" 4
+.IX Item "scale=<scale>"
+.PD 0
 .IP "\fIscaled=<scale>\fR" 4
 .IX Item "scaled=<scale>"
+.PD
 Scale the font by a factor of \fI<scale>\fR.
 For example: to increase the size of the font by 5%, use the command
 \&\f(CW\*(C`\eusepackage[scaled=1.05]{\f(CI<FontFamily>\f(CW}\*(C'\fR.
 .Sp
 This option is only available when the \fIxkeyval\fR package is found
 in your TeX installation.
+.IP "\fIultrablack, ultrabold, heavy, extrablack, black, extrabold, demibold, semibold, bold\fR" 4
+.IX Item "ultrablack, ultrabold, heavy, extrablack, black, extrabold, demibold, semibold, bold"
+Choose the weight that LaTeX will use for the \*(L"bold\*(R" weight.
+.IP "\fIlight, medium, regular\fR" 4
+.IX Item "light, medium, regular"
+Choose the weight that LaTeX will use for the \*(L"regular\*(R" weight.
+.PP
+These last two groups of options will only work if
+you have the \fImweights\fR package installed.
 .PP
 The style file will also try to load the \fIfontaxes\fR package,
 which gives easy access to various font shapes and styles.
@@ -320,19 +325,21 @@ 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
 encoding vector, e.g. if your fonts use non-standard glyph names for ornaments.
 .PP
-These commands are only generated for shapes and number styles
-that actually exist; no commands are generated for shapes and styles
-that don't exist, or whose generation has been turned off 
-using command-line options (see below).
-Please also note that these commands are built on top of \fIfontaxes\fR;
+These commands are only generated for existing shapes and number styles;
+no commands are generated for shapes and styles that don't exist, 
+or whose generation has been turned off using command-line options.
+Also: these commands are built on top of \fIfontaxes\fR;
 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.).
 .SS "Using multiple font families in one document"
 .IX Subsection "Using multiple font families in one document"
-If you want to use more than one font family in a document, be aware
-that style files generated by versions of \fBautoinst\fR older dan 2009
-are incompatible with those generated by newer versions.
+Style files generated by versions of \fBautoinst\fR older dan 2013\-07\-25
+redefined \f(CW\*(C`\emddefault\*(C'\fR and \f(CW\*(C`\ebfdefault\*(C'\fR, whereas newer style files 
+use the \fImweights\fR package instead. 
+If you use multiple \fBautoinst\fR\-generated font familes in the same document, 
+it is best if all style files are generated by the same version of 
+\&\fBautoinst\fR; re-generate the older families if necessary.
 .SS "\s-1NFSS\s0 codes"
 .IX Subsection "NFSS codes"
 \&\s-1NFSS\s0 identifies fonts by a combination of family, series (weight plus width),
@@ -349,24 +356,23 @@ 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 (omitting the ones that
-failed to parse correctly)
-or else add the missing widths, weights and shapes to the tables \f(CW%FD_WIDTH\fR,
+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, near the top 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 both on the standard \fIFontname\fR scheme
-and on the tables in Philipp Lehman's \fIFont Installation Guide\fR,
-but some changes had to be made to avoid name clashes in font families
-with many different widths and weights.
+the following tables. These are based as much as possible
+on the standard \fIFontname\fR scheme 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 or weights.
 .PP
 .Vb 1
 \&    WEIGHT                              WIDTH
 \&
 \&    Thin           t                    Ultra Compressed    up
 \&    Ultra Light    ul                   Extra Compressed    ep
-\&    Extra Light    el                   Compressed, Compact p
+\&    Extra Light    el                   Compressed          p
 \&    Light          l                    Compact             p
 \&    Book                 [1]            Ultra Condensed     uc
 \&    Regular              [1]            Extra Condensed     ec
@@ -403,8 +409,7 @@ the first of these is mapped to \*(L"n\*(R", the second one to \*(L"it\*(R".
 Mapping the \*(L"Slanted\*(R", \*(L"Oblique\*(R" or \*(L"Inclined\*(R" shape to \*(L"it\*(R" instead of \*(L"sl\*(R"
 simplifies \fBautoinst\fR. Since font families with both italic and slanted
 shapes do \- to the best of my knowledge \- not exist
-(apart from Computer Modern, of course),
-this shouldn't cause problems in real life.
+(apart from Computer Modern), this shouldn't cause problems.
 .SS "A note for MiKTeX users"
 .IX Subsection "A note for MiKTeX users"
 Automatically installing the fonts into a suitable \s-1TEXMF\s0 tree
@@ -529,17 +534,17 @@ Some fonts provide kerning pairs for tabular figures.
 This is very probably not what you want 
 (e.g., numbers in tables won't line up exactly).
 The option \fB\-nofigurekern\fR adds extra \fI \-\-ligkern\fR options
-to the command lines for \fIotftotfm\fR to suppress such kerns
-(but of course only for the \*(L"\s-1TLF\s0\*(R" and \*(L"TOsF\*(R" families).
-Since this leads to very long command lines (it adds one hundred such options)
+to the commands for \fIotftotfm\fR to suppress such kerns
+(but of course only for the families with tabular figures).
+Since this leads to very long commands (one hundred such options in total!)
 and the problem only occurs in very few fonts, 
 the default is \fB\-figurekern\fR.
 .IP "\fB\-manual\fR" 4
 .IX Item "-manual"
 Manual mode. By default, \fBautoinst\fR executes all \fIotftotfm\fR
-command lines it generates; with the \fB\-manual\fR option, these commands are
+commands it generates; with the \fB\-manual\fR option, these commands are
 instead written to a file \fIautoinst.bat\fR.
-Also, the generated \fIotftotfm\fR command lines specify the \fI \-\-pl\fR option
+Also, the generated \fIotftotfm\fR commands specify the \fI \-\-pl\fR option
 (which tells \fIotftotfm\fR to generate readable/editable \fIpl\fR and \fIvpl\fR files
 instead of the default \fItfm\fR and \fIvf\fR files)
 and leave out the \fI \-\-automatic\fR option (which tells \fIotftotfm\fR to
@@ -583,23 +588,23 @@ Control whether or not \fIupdmap\fR is called after the last call to \fIotftotfm
 The default is \fB\-updmap\fR.
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
-Eddie Kohler's TypeTools (\fIhttp://www.lcdf.org/type\fR).
+Eddie Kohler's \fBTypeTools\fR (\fIhttp://www.lcdf.org/type\fR).
 .PP
-Perl is pre-installed on most Linux and Unix systems;
-on Windows, try ActiveState's ActivePerl
-(available from \fIhttp://www.activestate.com\fR)
+\&\fBPerl\fR can be downloaded from \fIhttp://www.perl.org\fR; it is often
+already installed on many Linux distros.
+For Windows, try ActivePerl (\fIhttp://www.activestate.com\fR)
 or Strawberry Perl (\fIhttp://strawberryperl.com\fR).
 .PP
-XeTeX (\fIhttp://www.tug.org/xetex\fR) and LuaTeX (\fIhttp://www.luatex.org\fR)
-are TeX extensions that can use many types of font 
+\&\fBXeTeX\fR (\fIhttp://www.tug.org/xetex\fR) and \fBLuaTeX\fR (\fIhttp://www.luatex.org\fR)
+are TeX engines that can use fonts in many formats 
 (including both flavours of OpenType) without TeX-specific support files.
 .PP
-The FontPro project (\fIhttps://github.com/sebschub/FontPro\fR)
-offers very complete support for Adobe's Minion Pro and Myriad Pro
+The \fBFontPro\fR project (\fIhttps://github.com/sebschub/FontPro\fR)
+offers very complete LaTeX support for Adobe's Minion Pro and Myriad Pro
 (including math), and is currently working on Cronos Pro as well.
 .PP
-John Owens' \fIotfinst\fR (available from \s-1CTAN\s0) is another wrapper
-around \fIotftotfm\fR, and may work for you when \fBautoinst\fR doesn't.
+John Owens' \fBotfinst\fR (available from \s-1CTAN\s0) is another wrapper
+around \fIotftotfm\fR.
 .SH "AUTHOR"
 .IX Header "AUTHOR"
 Marc Penninga <marcpenninga@gmail.com>
@@ -628,6 +633,11 @@ but \s-1WITHOUT\s0 \s-1ANY\s0 \s-1WARRANTY\s0; without even the implied warranty
 .SH "RECENT CHANGES"
 .IX Header "RECENT CHANGES"
 (See the source code for the rest of the story.)
+.IP "\fI2013\-07\-25\fR" 12
+.IX Item "2013-07-25"
+The generated \fIsty\fR files now use the \fImweights\fR package instead of
+redefining \f(CW\*(C`\emddefault\*(C'\fR and \f(CW\*(C`\ebfdefault\*(C'\fR. 
+Added \f(CW\*(C`scale\*(C'\fR as an alias for the package option \f(CW\*(C`scaled\*(C'\fR.
 .IP "\fI2013\-02\-06\fR" 12
 .IX Item "2013-02-06"
 Bugfix: the directory names for map and encoding files contained 
diff --git a/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf b/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf
index ae6a665e9b0..989320d17d8 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 e8cbce9096b..9d5ddb95a7c 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 13eb3f60874..f22d4900896 100644
--- a/Master/texmf-dist/doc/support/fontools/README
+++ b/Master/texmf-dist/doc/support/fontools/README
@@ -29,7 +29,7 @@ Perl
 
 LCDF TypeTools
     Of course, Autoinst needs the LCDF TypeTools; 
-    their installation directory should be in the PATH environment variable.
+    they should be installed in a directory on your PATH.
 
 Kpathsea
     Automatically installing the fonts into a suitable TEXMF tree
@@ -38,6 +38,7 @@ Kpathsea
     own directory searching (such as MiKTeX), Autoinst will complain that 
     it cannot find the kpsewhich program and install all generated files
     into subdirectories of the current directory. 
+    
     If you use such a TeX distribution, either move these files to their 
     destinations by hand, or use the -target command line option
     (please see the manual for more information).
@@ -47,12 +48,21 @@ Other
     somewhere where otftotfm can find them.
 
 
-LICENSE
--------
+DISCLAIMER
+----------
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+See the GNU General Public License for more details.
+
+
+LICENSE & COPYRIGHT
+-------------------
 
 This software is copyright (C) 2005-2013 Marc Penninga. It is released under 
 the terms of the GNU General Public Licence. See the file GPLv2.txt for 
 the license conditions.
 
 
-                                                Marc Penninga, 2013/02/06
+                                                Marc Penninga, 2013/07/25