fontools (25jul13)

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

8 files changed, 304 insertions, 247 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/fontools/autoinst b/Build/source/texk/texlive/linked_scripts/fontools/autoinst
index d925b1ca2a3..f7cbf59792a 100755
--- a/Build/source/texk/texlive/linked_scripts/fontools/autoinst
+++ b/Build/source/texk/texlive/linked_scripts/fontools/autoinst
@@ -138,14 +138,11 @@ my %FD_SSUB = (
 
 =begin Comment
 
-    The following tables are used in deciding which font families and shapes
-    to generate. Each hash governs one of these aspects:
-    - 'figure style' (lining, oldstyle, tabular, proportional, superior,
-        inferior etc.); each of these will become a separate font family.
-    - 'shape' (normal, small caps, swash, titling or textcomp).
+    The %STYLE table is used in deciding which figure styles to generate. 
+    Each figure style (lining, oldstyle, tabular, proportional, superior,
+    inferior etc.) becomes a separate font family.
 
-
-    Each key in the %STYLE hash names a figure style; the corresponding
+    Each key in this table names a figure style; the corresponding
     value is an anonymous hash with four key/value pairs:
         reqd    A list of required OpenType features;
                 this style is built if the font supports at least *one*
@@ -160,26 +157,6 @@ my %FD_SSUB = (
     Ornaments are treated as a separate 'figure style'.
     This may seem a bit weird, but is actually the easiest way to do it.
 
-
-    Each key in the %SHAPE hash names a shape; the corresponding value
-    is (again) an anonymous hash with several key/value pairs:
-        code    An anonymous hash with two possible keys:
-                'n'  -> the NFSS code to use for this variant shape
-                        if the 'basic shape' is upright;
-                'it' -> the NFSS code to use for this variant shape
-                        if the 'basic shape' is italic, slanted or oblique;
-                If the 'n' or 'it' entry is missing, the upright or italic
-                version of this variant shape will not be built.
-        reqd    A list of required OpenType features;
-                this shape is built if the font supports at least *one*
-                of these features.
-        nice    A list of optional OpenType features;
-                these are used if the font supports them, but don't
-                prevent this shape from being built when missing.
-        extra   Extra options passed to otftotfm when creating this shape.
-        name    A string added to the name of the generated font,
-                to make it unique.
-
 =end Comment
 
 =cut
@@ -204,7 +181,7 @@ my %STYLE = (
         shapes => ['normal', 'smallcaps', 'swash', 'textcomp'],
     },
     OsF => {
-        reqd   => ['onum','pnum'],
+        reqd   => ['onum', 'pnum'],
         nice   => [],
         extra  => '',
         shapes => ['normal', 'smallcaps', 'swash', 'textcomp'],
@@ -241,6 +218,38 @@ my %STYLE = (
     },
 );
 
+
+=begin Comment
+
+    The %SHAPE table is used in deciding which font shapes 
+    (normal, small caps, swash, titling or textcomp) to generate.
+
+    Each key in this table names a shape; the corresponding value
+    is an anonymous hash with several key/value pairs:
+        code    An anonymous hash with two possible keys:
+                'n'  -> the NFSS code to use for this variant shape
+                        if the 'basic shape' is upright;
+                'it' -> the NFSS code to use for this variant shape
+                        if the 'basic shape' is italic, slanted or oblique;
+                If the 'n' or 'it' entry is missing, the upright or italic
+                version of this variant shape will not be built.
+        reqd    A list of required OpenType features;
+                this shape is built if the font supports at least *one*
+                of these features.
+        nice    A list of optional OpenType features;
+                these are used if the font supports them, but don't
+                prevent this shape from being built when missing.
+        extra   Extra options passed to otftotfm when creating this shape.
+        name    A string added to the name of the generated font,
+                to make it unique.
+    
+    Textcomp is treated as a 'shape' even though it is technically 
+    an encoding; that is just the easiest way to do things.
+
+=end Comment
+
+=cut
+
 my %SHAPE = (
     normal => {
         code  => {n => 'n', it => 'it'},
@@ -555,7 +564,7 @@ Possible options:
 
     -sanserif               Install font as sanserif font
     -typewriter             Install font as typewriter font
-    -extra="TEXT"           Add TEXT to the command line for 'otftotfm'
+    -extra="TEXT"           Add TEXT to the command for 'otftotfm'
     -target="DIRECTORY"     Install files into specified TEXMF tree
     -vendor="VENDOR"        Only used for naming directories
     -typeface="TYPEFACE"    Only used for naming directories
@@ -932,7 +941,7 @@ sub assert_unique {
     my @fonts = @_;
 
     # These attributes should uniquely identify each font
-    my @attributes = qw(family width weight shape minsize maxsize);
+    my @attributes = qw(family weight width shape minsize maxsize);
 
     ATTEMPT:
     for my $attempt (1 .. 2) {
@@ -1056,6 +1065,7 @@ END_STY_HEADER
     print {$STY} "\\RequirePackage{textcomp}\n" if $seen{TS1};
 
     print {$STY} <<'END_STY_FONTAXES_START';
+\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
 \IfFileExists{fontaxes.sty}{
     \RequirePackage{fontaxes}
 END_STY_FONTAXES_START
@@ -1141,6 +1151,7 @@ END_STY_FONTAXES_DNOM
 \\IfFileExists{xkeyval.sty}{
     \\newcommand*{\\$fam\@scale}{1}
     \\RequirePackage{xkeyval}
+    \\DeclareOptionX{scale}{\\renewcommand*{\\$fam\@scale}{##1}}
     \\DeclareOptionX{scaled}{\\renewcommand*{\\$fam\@scale}{##1}}
 }{
     \\let\\DeclareOptionX\\DeclareOption
@@ -1179,9 +1190,9 @@ END_STY_XKEYVAL
                         extrabold demibold semibold bold)) 
     {
         if ($seen{$FD_WEIGHT{$series}}) {
-            printf {$STY}
-                "\\DeclareOptionX{%s}{\\renewcommand*{\\bfdefault}{%s}}\n",
-                $series, $FD_WEIGHT{$series};
+            print {$STY}
+                "\\DeclareOptionX{$series}{\\edef\\bfseries\@$ARGV{nfss}",
+                "{$FD_WEIGHT{$series}}}\n";
             $default_bold = $series;
         }
     }
@@ -1190,9 +1201,9 @@ END_STY_XKEYVAL
     my $default_regular;
     for my $series (qw(light medium regular)) {
         if ($seen{$FD_WEIGHT{$series} || 'm'}) {
-            printf {$STY}
-                "\\DeclareOptionX{%s}{\\renewcommand*{\\mddefault}{%s}}\n",
-                $series, $FD_WEIGHT{$series} || 'm';
+            print {$STY}
+                "\\DeclareOptionX{$series}{\\edef\\mdseries\@$ARGV{nfss}",
+                "{@{[ $FD_WEIGHT{$series} || 'm' ]}}}\n";
             $default_regular = $series;
         }
     }
@@ -1335,17 +1346,17 @@ for installing OpenType fonts in LaTeX.
 
 =head1 SYNOPSIS
 
-B<autoinst> [I<options>] B<font(s)>
+B<autoinst> [I<options>] B<fontfile(s)>
 
 
 =head1 DESCRIPTION
 
-Eddie Kohler's F<TypeTools>, especially F<otftotfm>, 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 F<fd> and F<sty> files LaTeX needs.
-B<autoinst> simplifies the font installation process with F<otftotfm>
-by generating and executing all command lines
+Eddie Kohler's F<LCDF TypeTools> 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 F<fd> and F<sty> files LaTeX needs.
+B<autoinst> simplifies the use of the F<TypeTools> for font installation
+by automatically generating and executing all commands 
 and by creating and installing all F<fd> and F<sty> files.
 
 Given a family of font files (in either F<otf> or F<ttf> format),
@@ -1374,7 +1385,7 @@ Small caps
 
 =item I<nw>
 
-"Upright swash"; usually normal text with some extra "oldstyle" ligatures,
+"Upright swash"; usually normal text with some "oldstyle" ligatures,
 such as ct, sp and st.
 
 =item I<tl>
@@ -1487,8 +1498,8 @@ By default, B<autoinst> generates text fonts with OT1, T1 and LY1
 encodings, and the generated style files use LY1 as the default text encoding.
 LY1 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 I<-encoding>
-command-line option (see L</"COMMAND-LINE OPTIONS"> below).
+Encodings can be chosen using the I<-encoding> command-line option 
+(see L</"COMMAND-LINE OPTIONS"> below).
 
 
 =head2 Using the fonts in your LaTeX documents
@@ -1505,32 +1516,34 @@ This style file defines a number of options:
 
 =item I<lining, oldstyle, tabular, proportional>
 
-Choose which digits will be used for the text fonts.
+Choose which digit style to use. 
 The defaults are "oldstyle" and "proportional" (if available).
 
-=item I<ultrablack, ultrabold, heavy, extrablack, black, extrabold,
-    demibold, semibold, bold>
-
-Choose the weight that LaTeX will use for the "bold" weight
-(i.e., the value of C<\bfdefault>).
-
-=item I<light, medium, regular>
-
-Choose the weight that LaTeX will use for the "regular" weight
-(i.e., the value of C<\mddefault>).
-
+=item I<< scale=<scale> >>
 
 =item I<< scaled=<scale> >>
 
 Scale the font by a factor of I<< <scale> >>.
 For example: to increase the size of the font by 5%, use the command
-C<<< \usepackage[scaled=1.05]{I<< <FontFamily> >>} >>>.
+C<<< \usepackage[scaled=1.05]{I<< <FontFamily> >>} >>>. 
 
 This option is only available when the F<xkeyval> package is found
 in your TeX installation.
 
+=item I<ultrablack, ultrabold, heavy, extrablack, black, extrabold,
+    demibold, semibold, bold>
+
+Choose the weight that LaTeX will use for the "bold" weight.
+
+=item I<light, medium, regular>
+
+Choose the weight that LaTeX will use for the "regular" weight.
+
 =back
 
+These last two groups of options will only work if
+you have the F<mweights> package installed.
+
 The style file will also try to load the F<fontaxes> package,
 which gives easy access to various font shapes and styles.
 It is available from CTAN
@@ -1570,11 +1583,10 @@ 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.
 
-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 F<fontaxes>;
+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 F<fontaxes>;
 if that package cannot be found, you're limited to using the
 lower-level commands from standard NFSS (C<\fontfamily>, C<\fontseries>,
 C<\fontshape> etc.).
@@ -1582,9 +1594,12 @@ C<\fontshape> etc.).
 
 =head2 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 B<autoinst> older dan 2009
-are incompatible with those generated by newer versions.
+Style files generated by versions of B<autoinst> older dan 2013-07-25
+redefined C<\mddefault> and C<\bfdefault>, whereas newer style files 
+use the F<mweights> package instead. 
+If you use multiple B<autoinst>-generated font familes in the same document, 
+it is best if all style files are generated by the same version of 
+B<autoinst>; re-generate the older families if necessary.
 
 
 =head2 NFSS codes
@@ -1603,24 +1618,23 @@ and make each font file its own separate subfamily,
 this strategy is only used as a last resort.)
 
 If such a proliferation of font families is unwanted,
-either run B<autoinst> 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 C<%FD_WIDTH>,
+either run B<autoinst> on a smaller set of fonts or 
+add the missing widths, weights and shapes to the tables C<%FD_WIDTH>,
 C<%FD_WEIGHT> and C<%FD_SHAPE>, near the top of the source code.
 Please also send a bug report (see L<AUTHOR> below).
 
 B<autoinst> maps widths, weights and shapes to NFSS codes using
-the following tables. These are based both on the standard I<Fontname> scheme
-and on the tables in Philipp Lehman's F<Font Installation Guide>,
-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 I<Fontname> scheme and Philipp Lehman's 
+F<Font Installation Guide>, but some changes had to be made to avoid 
+name clashes in font families with many widths or weights.
 
 
     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
@@ -1661,8 +1675,7 @@ the first of these is mapped to "n", the second one to "it".
 Mapping the "Slanted", "Oblique" or "Inclined" shape to "it" instead of "sl"
 simplifies B<autoinst>. 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.
 
 =back
 
@@ -1791,18 +1804,18 @@ 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 B<-nofigurekern> adds extra I< --ligkern> options
-to the command lines for I<otftotfm> to suppress such kerns
-(but of course only for the "TLF" and "TOsF" families).
-Since this leads to very long command lines (it adds one hundred such options)
+to the commands for I<otftotfm> 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 B<-figurekern>.
 
 =item B<-manual>
 
 Manual mode. By default, B<autoinst> executes all F<otftotfm>
-command lines it generates; with the B<-manual> option, these commands are
+commands it generates; with the B<-manual> option, these commands are
 instead written to a file F<autoinst.bat>.
-Also, the generated F<otftotfm> command lines specify the I< --pl> option
+Also, the generated F<otftotfm> commands specify the I< --pl> option
 (which tells F<otftotfm> to generate readable/editable F<pl> and F<vpl> files
 instead of the default F<tfm> and F<vf> files)
 and leave out the I< --automatic> option (which tells F<otftotfm> to
@@ -1853,23 +1866,23 @@ The default is B<-updmap>.
 
 =head1 SEE ALSO
 
-Eddie Kohler's TypeTools (F<http://www.lcdf.org/type>).
+Eddie Kohler's B<TypeTools> (F<http://www.lcdf.org/type>).
 
-Perl is pre-installed on most Linux and Unix systems;
-on Windows, try ActiveState's ActivePerl
-(available from F<http://www.activestate.com>)
+B<Perl> can be downloaded from F<http://www.perl.org>; it is often
+already installed on many Linux distros.
+For Windows, try ActivePerl (F<http://www.activestate.com>)
 or Strawberry Perl (F<http://strawberryperl.com>).
 
-XeTeX (F<http://www.tug.org/xetex>) and LuaTeX (F<http://www.luatex.org>)
-are TeX extensions that can use many types of font 
+B<XeTeX> (F<http://www.tug.org/xetex>) and B<LuaTeX> (F<http://www.luatex.org>)
+are TeX engines that can use fonts in many formats 
 (including both flavours of OpenType) without TeX-specific support files.
 
-The FontPro project (F<https://github.com/sebschub/FontPro>)
-offers very complete support for Adobe's Minion Pro and Myriad Pro
+The B<FontPro> project (F<https://github.com/sebschub/FontPro>)
+offers very complete LaTeX support for Adobe's Minion Pro and Myriad Pro
 (including math), and is currently working on Cronos Pro as well.
 
-John Owens' F<otfinst> (available from CTAN) is another wrapper
-around F<otftotfm>, and may work for you when B<autoinst> doesn't.
+John Owens' B<otfinst> (available from CTAN) is another wrapper
+around F<otftotfm>.
 
 
 =head1 AUTHOR
@@ -1912,6 +1925,12 @@ GNU General Public License for more details.
 
 =over 12
 
+=item I<2013-07-25>
+
+The generated F<sty> files now use the I<mweights> package instead of
+redefining C<\mddefault> and C<\bfdefault>. 
+Added C<scale> as an alias for the package option C<scaled>.
+
 =item I<2013-02-06>
 
 Bugfix: the directory names for map and encoding files contained 
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 4f0b9d4f29b..526db1e9b59 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,12 +1,12 @@
 #!/usr/bin/env perl
-# $Id: tlmgr.pl 31082 2013-07-03 04:25:56Z preining $
+# $Id: tlmgr.pl 31259 2013-07-21 22:07:38Z karl $
 #
 # Copyright 2008-2013 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
-my $svnrev = '$Revision: 31082 $';
-my $datrev = '$Date: 2013-07-03 06:25:56 +0200 (Wed, 03 Jul 2013) $';
+my $svnrev = '$Revision: 31259 $';
+my $datrev = '$Date: 2013-07-22 00:07:38 +0200 (Mon, 22 Jul 2013) $';
 my $tlmgrrevision;
 my $prg;
 if ($svnrev =~ m/: ([0-9]+) /) {
@@ -681,7 +681,6 @@ sub handle_execute_actions
   chomp(my $TEXMFLOCAL = `kpsewhich -var-value=TEXMFLOCAL`);
   chomp(my $TEXMFDIST = `kpsewhich -var-value=TEXMFDIST`);
 
-  #
   # maps handling
   {
     my $updmap_run_needed = 0;
@@ -691,8 +690,9 @@ sub handle_execute_actions
     for my $m (keys %{$::execute_actions{'disable'}{'maps'}}) {
       $updmap_run_needed = 1;
     }
+    my $dest = $opts{"usermode"} ? "$::maintree/web2c/updmap.cfg" 
+               : "$TEXMFDIST/web2c/updmap.cfg";
     if ($updmap_run_needed) {
-      my $dest = "$TEXMFDIST/web2c/updmap.cfg";
       TeXLive::TLUtils::create_updmap($localtlpdb, $dest);
     }
     $errors += do_cmd_and_check("updmap$sysmode") if $updmap_run_needed;
@@ -702,7 +702,6 @@ sub handle_execute_actions
   # we first have to check if the config files, that is fmtutil.cnf 
   # or one of the language* files have changed, regenerate them
   # if necessary, and then run the necessary fmtutil calls.
-
   {
     # first check for language* files
     my $regenerate_language = 0;
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
diff --git a/Master/texmf-dist/scripts/fontools/autoinst b/Master/texmf-dist/scripts/fontools/autoinst
index d925b1ca2a3..f7cbf59792a 100755
--- a/Master/texmf-dist/scripts/fontools/autoinst
+++ b/Master/texmf-dist/scripts/fontools/autoinst
@@ -138,14 +138,11 @@ my %FD_SSUB = (
 
 =begin Comment
 
-    The following tables are used in deciding which font families and shapes
-    to generate. Each hash governs one of these aspects:
-    - 'figure style' (lining, oldstyle, tabular, proportional, superior,
-        inferior etc.); each of these will become a separate font family.
-    - 'shape' (normal, small caps, swash, titling or textcomp).
+    The %STYLE table is used in deciding which figure styles to generate. 
+    Each figure style (lining, oldstyle, tabular, proportional, superior,
+    inferior etc.) becomes a separate font family.
 
-
-    Each key in the %STYLE hash names a figure style; the corresponding
+    Each key in this table names a figure style; the corresponding
     value is an anonymous hash with four key/value pairs:
         reqd    A list of required OpenType features;
                 this style is built if the font supports at least *one*
@@ -160,26 +157,6 @@ my %FD_SSUB = (
     Ornaments are treated as a separate 'figure style'.
     This may seem a bit weird, but is actually the easiest way to do it.
 
-
-    Each key in the %SHAPE hash names a shape; the corresponding value
-    is (again) an anonymous hash with several key/value pairs:
-        code    An anonymous hash with two possible keys:
-                'n'  -> the NFSS code to use for this variant shape
-                        if the 'basic shape' is upright;
-                'it' -> the NFSS code to use for this variant shape
-                        if the 'basic shape' is italic, slanted or oblique;
-                If the 'n' or 'it' entry is missing, the upright or italic
-                version of this variant shape will not be built.
-        reqd    A list of required OpenType features;
-                this shape is built if the font supports at least *one*
-                of these features.
-        nice    A list of optional OpenType features;
-                these are used if the font supports them, but don't
-                prevent this shape from being built when missing.
-        extra   Extra options passed to otftotfm when creating this shape.
-        name    A string added to the name of the generated font,
-                to make it unique.
-
 =end Comment
 
 =cut
@@ -204,7 +181,7 @@ my %STYLE = (
         shapes => ['normal', 'smallcaps', 'swash', 'textcomp'],
     },
     OsF => {
-        reqd   => ['onum','pnum'],
+        reqd   => ['onum', 'pnum'],
         nice   => [],
         extra  => '',
         shapes => ['normal', 'smallcaps', 'swash', 'textcomp'],
@@ -241,6 +218,38 @@ my %STYLE = (
     },
 );
 
+
+=begin Comment
+
+    The %SHAPE table is used in deciding which font shapes 
+    (normal, small caps, swash, titling or textcomp) to generate.
+
+    Each key in this table names a shape; the corresponding value
+    is an anonymous hash with several key/value pairs:
+        code    An anonymous hash with two possible keys:
+                'n'  -> the NFSS code to use for this variant shape
+                        if the 'basic shape' is upright;
+                'it' -> the NFSS code to use for this variant shape
+                        if the 'basic shape' is italic, slanted or oblique;
+                If the 'n' or 'it' entry is missing, the upright or italic
+                version of this variant shape will not be built.
+        reqd    A list of required OpenType features;
+                this shape is built if the font supports at least *one*
+                of these features.
+        nice    A list of optional OpenType features;
+                these are used if the font supports them, but don't
+                prevent this shape from being built when missing.
+        extra   Extra options passed to otftotfm when creating this shape.
+        name    A string added to the name of the generated font,
+                to make it unique.
+    
+    Textcomp is treated as a 'shape' even though it is technically 
+    an encoding; that is just the easiest way to do things.
+
+=end Comment
+
+=cut
+
 my %SHAPE = (
     normal => {
         code  => {n => 'n', it => 'it'},
@@ -555,7 +564,7 @@ Possible options:
 
     -sanserif               Install font as sanserif font
     -typewriter             Install font as typewriter font
-    -extra="TEXT"           Add TEXT to the command line for 'otftotfm'
+    -extra="TEXT"           Add TEXT to the command for 'otftotfm'
     -target="DIRECTORY"     Install files into specified TEXMF tree
     -vendor="VENDOR"        Only used for naming directories
     -typeface="TYPEFACE"    Only used for naming directories
@@ -932,7 +941,7 @@ sub assert_unique {
     my @fonts = @_;
 
     # These attributes should uniquely identify each font
-    my @attributes = qw(family width weight shape minsize maxsize);
+    my @attributes = qw(family weight width shape minsize maxsize);
 
     ATTEMPT:
     for my $attempt (1 .. 2) {
@@ -1056,6 +1065,7 @@ END_STY_HEADER
     print {$STY} "\\RequirePackage{textcomp}\n" if $seen{TS1};
 
     print {$STY} <<'END_STY_FONTAXES_START';
+\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
 \IfFileExists{fontaxes.sty}{
     \RequirePackage{fontaxes}
 END_STY_FONTAXES_START
@@ -1141,6 +1151,7 @@ END_STY_FONTAXES_DNOM
 \\IfFileExists{xkeyval.sty}{
     \\newcommand*{\\$fam\@scale}{1}
     \\RequirePackage{xkeyval}
+    \\DeclareOptionX{scale}{\\renewcommand*{\\$fam\@scale}{##1}}
     \\DeclareOptionX{scaled}{\\renewcommand*{\\$fam\@scale}{##1}}
 }{
     \\let\\DeclareOptionX\\DeclareOption
@@ -1179,9 +1190,9 @@ END_STY_XKEYVAL
                         extrabold demibold semibold bold)) 
     {
         if ($seen{$FD_WEIGHT{$series}}) {
-            printf {$STY}
-                "\\DeclareOptionX{%s}{\\renewcommand*{\\bfdefault}{%s}}\n",
-                $series, $FD_WEIGHT{$series};
+            print {$STY}
+                "\\DeclareOptionX{$series}{\\edef\\bfseries\@$ARGV{nfss}",
+                "{$FD_WEIGHT{$series}}}\n";
             $default_bold = $series;
         }
     }
@@ -1190,9 +1201,9 @@ END_STY_XKEYVAL
     my $default_regular;
     for my $series (qw(light medium regular)) {
         if ($seen{$FD_WEIGHT{$series} || 'm'}) {
-            printf {$STY}
-                "\\DeclareOptionX{%s}{\\renewcommand*{\\mddefault}{%s}}\n",
-                $series, $FD_WEIGHT{$series} || 'm';
+            print {$STY}
+                "\\DeclareOptionX{$series}{\\edef\\mdseries\@$ARGV{nfss}",
+                "{@{[ $FD_WEIGHT{$series} || 'm' ]}}}\n";
             $default_regular = $series;
         }
     }
@@ -1335,17 +1346,17 @@ for installing OpenType fonts in LaTeX.
 
 =head1 SYNOPSIS
 
-B<autoinst> [I<options>] B<font(s)>
+B<autoinst> [I<options>] B<fontfile(s)>
 
 
 =head1 DESCRIPTION
 
-Eddie Kohler's F<TypeTools>, especially F<otftotfm>, 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 F<fd> and F<sty> files LaTeX needs.
-B<autoinst> simplifies the font installation process with F<otftotfm>
-by generating and executing all command lines
+Eddie Kohler's F<LCDF TypeTools> 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 F<fd> and F<sty> files LaTeX needs.
+B<autoinst> simplifies the use of the F<TypeTools> for font installation
+by automatically generating and executing all commands 
 and by creating and installing all F<fd> and F<sty> files.
 
 Given a family of font files (in either F<otf> or F<ttf> format),
@@ -1374,7 +1385,7 @@ Small caps
 
 =item I<nw>
 
-"Upright swash"; usually normal text with some extra "oldstyle" ligatures,
+"Upright swash"; usually normal text with some "oldstyle" ligatures,
 such as ct, sp and st.
 
 =item I<tl>
@@ -1487,8 +1498,8 @@ By default, B<autoinst> generates text fonts with OT1, T1 and LY1
 encodings, and the generated style files use LY1 as the default text encoding.
 LY1 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 I<-encoding>
-command-line option (see L</"COMMAND-LINE OPTIONS"> below).
+Encodings can be chosen using the I<-encoding> command-line option 
+(see L</"COMMAND-LINE OPTIONS"> below).
 
 
 =head2 Using the fonts in your LaTeX documents
@@ -1505,32 +1516,34 @@ This style file defines a number of options:
 
 =item I<lining, oldstyle, tabular, proportional>
 
-Choose which digits will be used for the text fonts.
+Choose which digit style to use. 
 The defaults are "oldstyle" and "proportional" (if available).
 
-=item I<ultrablack, ultrabold, heavy, extrablack, black, extrabold,
-    demibold, semibold, bold>
-
-Choose the weight that LaTeX will use for the "bold" weight
-(i.e., the value of C<\bfdefault>).
-
-=item I<light, medium, regular>
-
-Choose the weight that LaTeX will use for the "regular" weight
-(i.e., the value of C<\mddefault>).
-
+=item I<< scale=<scale> >>
 
 =item I<< scaled=<scale> >>
 
 Scale the font by a factor of I<< <scale> >>.
 For example: to increase the size of the font by 5%, use the command
-C<<< \usepackage[scaled=1.05]{I<< <FontFamily> >>} >>>.
+C<<< \usepackage[scaled=1.05]{I<< <FontFamily> >>} >>>. 
 
 This option is only available when the F<xkeyval> package is found
 in your TeX installation.
 
+=item I<ultrablack, ultrabold, heavy, extrablack, black, extrabold,
+    demibold, semibold, bold>
+
+Choose the weight that LaTeX will use for the "bold" weight.
+
+=item I<light, medium, regular>
+
+Choose the weight that LaTeX will use for the "regular" weight.
+
 =back
 
+These last two groups of options will only work if
+you have the F<mweights> package installed.
+
 The style file will also try to load the F<fontaxes> package,
 which gives easy access to various font shapes and styles.
 It is available from CTAN
@@ -1570,11 +1583,10 @@ 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.
 
-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 F<fontaxes>;
+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 F<fontaxes>;
 if that package cannot be found, you're limited to using the
 lower-level commands from standard NFSS (C<\fontfamily>, C<\fontseries>,
 C<\fontshape> etc.).
@@ -1582,9 +1594,12 @@ C<\fontshape> etc.).
 
 =head2 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 B<autoinst> older dan 2009
-are incompatible with those generated by newer versions.
+Style files generated by versions of B<autoinst> older dan 2013-07-25
+redefined C<\mddefault> and C<\bfdefault>, whereas newer style files 
+use the F<mweights> package instead. 
+If you use multiple B<autoinst>-generated font familes in the same document, 
+it is best if all style files are generated by the same version of 
+B<autoinst>; re-generate the older families if necessary.
 
 
 =head2 NFSS codes
@@ -1603,24 +1618,23 @@ and make each font file its own separate subfamily,
 this strategy is only used as a last resort.)
 
 If such a proliferation of font families is unwanted,
-either run B<autoinst> 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 C<%FD_WIDTH>,
+either run B<autoinst> on a smaller set of fonts or 
+add the missing widths, weights and shapes to the tables C<%FD_WIDTH>,
 C<%FD_WEIGHT> and C<%FD_SHAPE>, near the top of the source code.
 Please also send a bug report (see L<AUTHOR> below).
 
 B<autoinst> maps widths, weights and shapes to NFSS codes using
-the following tables. These are based both on the standard I<Fontname> scheme
-and on the tables in Philipp Lehman's F<Font Installation Guide>,
-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 I<Fontname> scheme and Philipp Lehman's 
+F<Font Installation Guide>, but some changes had to be made to avoid 
+name clashes in font families with many widths or weights.
 
 
     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
@@ -1661,8 +1675,7 @@ the first of these is mapped to "n", the second one to "it".
 Mapping the "Slanted", "Oblique" or "Inclined" shape to "it" instead of "sl"
 simplifies B<autoinst>. 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.
 
 =back
 
@@ -1791,18 +1804,18 @@ 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 B<-nofigurekern> adds extra I< --ligkern> options
-to the command lines for I<otftotfm> to suppress such kerns
-(but of course only for the "TLF" and "TOsF" families).
-Since this leads to very long command lines (it adds one hundred such options)
+to the commands for I<otftotfm> 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 B<-figurekern>.
 
 =item B<-manual>
 
 Manual mode. By default, B<autoinst> executes all F<otftotfm>
-command lines it generates; with the B<-manual> option, these commands are
+commands it generates; with the B<-manual> option, these commands are
 instead written to a file F<autoinst.bat>.
-Also, the generated F<otftotfm> command lines specify the I< --pl> option
+Also, the generated F<otftotfm> commands specify the I< --pl> option
 (which tells F<otftotfm> to generate readable/editable F<pl> and F<vpl> files
 instead of the default F<tfm> and F<vf> files)
 and leave out the I< --automatic> option (which tells F<otftotfm> to
@@ -1853,23 +1866,23 @@ The default is B<-updmap>.
 
 =head1 SEE ALSO
 
-Eddie Kohler's TypeTools (F<http://www.lcdf.org/type>).
+Eddie Kohler's B<TypeTools> (F<http://www.lcdf.org/type>).
 
-Perl is pre-installed on most Linux and Unix systems;
-on Windows, try ActiveState's ActivePerl
-(available from F<http://www.activestate.com>)
+B<Perl> can be downloaded from F<http://www.perl.org>; it is often
+already installed on many Linux distros.
+For Windows, try ActivePerl (F<http://www.activestate.com>)
 or Strawberry Perl (F<http://strawberryperl.com>).
 
-XeTeX (F<http://www.tug.org/xetex>) and LuaTeX (F<http://www.luatex.org>)
-are TeX extensions that can use many types of font 
+B<XeTeX> (F<http://www.tug.org/xetex>) and B<LuaTeX> (F<http://www.luatex.org>)
+are TeX engines that can use fonts in many formats 
 (including both flavours of OpenType) without TeX-specific support files.
 
-The FontPro project (F<https://github.com/sebschub/FontPro>)
-offers very complete support for Adobe's Minion Pro and Myriad Pro
+The B<FontPro> project (F<https://github.com/sebschub/FontPro>)
+offers very complete LaTeX support for Adobe's Minion Pro and Myriad Pro
 (including math), and is currently working on Cronos Pro as well.
 
-John Owens' F<otfinst> (available from CTAN) is another wrapper
-around F<otftotfm>, and may work for you when B<autoinst> doesn't.
+John Owens' B<otfinst> (available from CTAN) is another wrapper
+around F<otftotfm>.
 
 
 =head1 AUTHOR
@@ -1912,6 +1925,12 @@ GNU General Public License for more details.
 
 =over 12
 
+=item I<2013-07-25>
+
+The generated F<sty> files now use the I<mweights> package instead of
+redefining C<\mddefault> and C<\bfdefault>. 
+Added C<scale> as an alias for the package option C<scaled>.
+
 =item I<2013-02-06>
 
 Bugfix: the directory names for map and encoding files contained