fontools (26oct12)

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

5 files changed, 70 insertions, 41 deletions

diff --git a/Master/texmf-dist/scripts/fontools/autoinst b/Master/texmf-dist/scripts/fontools/autoinst
index 79fb13a9b19..5a6dc94d8c7 100755
--- a/Master/texmf-dist/scripts/fontools/autoinst
+++ b/Master/texmf-dist/scripts/fontools/autoinst
@@ -120,6 +120,24 @@ my %FD_SHAPE = (
     romanii         => 'it',    # we map the second one to 'it'
 );
 
+=begin Comment
+
+    The next table is used to generate extra DeclareFontShape rules
+    in the .fd files that map slanted shapes to italic. 
+
+    Note that the rules should be read 'backwards': so "it => 'sl'" 
+    means that 'it' replaces 'sl'. Sorry about that.
+
+=end Comment
+
+=cut
+
+my %FD_SSUB = (
+    it      => 'sl',
+    scit    => 'scsl',
+    tlit    => 'tlsl',
+);
+
 
 =begin Comment
 
@@ -535,24 +553,21 @@ Possible options:
 
     -sanserif               Install font as sanserif font
     -typewriter             Install font as typewriter font
-
     -extra="TEXT"           Add TEXT to the command line for 'otftotfm'
     -target="DIRECTORY"     Install files into specified TEXMF tree
-    -vendor="VENDOR"        Specify part of directory name for installation
-    -typeface="TYPEFACE"    Specify part of directory name for installation
+    -vendor="VENDOR"        Only used for naming directories
+    -typeface="TYPEFACE"    Only used for naming directories
     -(no)updmap             Toggle running of updmap
-    
     -manual                 Manual mode (see documentation)
     
     -(no)figurekern         Keep or remove kerns between tabular figures
 
-    -help                   Prints this text and exit
-    -verbose                Prints detailed info about operation
+    -help                   Print this text
+    -verbose                Make some noise
 
     font[s]                 The fonts (either .otf or .ttf) to install.
 
 Please report any bugs or suggestions to <marcpenninga@gmail.com>.
-
 END_USAGE
 
 # Default values for the command-line arguments
@@ -1256,6 +1271,13 @@ END_FD_HEADER
                             " \\${fam}\@\@scale $item->[2]\n";
             }
             print {$FD} "}{}\n\n";
+            if (exists $FD_SSUB{$shape}) {
+                print {$FD} <<"END_FD_SSUB";
+\\DeclareFontShape{$enc}{${fam}-${sty}}{$series}{$FD_SSUB{$shape}}{
+    <-> ssub * ${fam}-${sty}/${series}/${shape}
+}{}
+END_FD_SSUB
+            }
         }
     }
     print {$FD} "\\endinput\n";
@@ -1670,14 +1692,14 @@ specified, so the last one will be the default text encoding.
 
 Install the font as a sanserif font, accessed via C<\sffamily> and C<\textsf>.
 Note that the generated style file redefines C<\familydefault>,
-so including it will make this font the default text font.
+so including it will still make this font the default text font.
 
 =item B<-typewriter>
 
 Install the font as a typewriter font, accessed via C<\ttfamily> and
 C<\texttt>.
 Note that the generated style file redefines C<\familydefault>,
-so including it will make this font the default text font.
+so including it will still make this font the default text font.
 
 =item B<-ts1>
 
@@ -1735,8 +1757,7 @@ Turn the creation of ornament fonts on or off. The default is B<-ornaments>.
 
 =item B<-verbose>
 
-Verbose mode; print detailed info about what B<autoinst> thinks it's doing,
-especially during font info parsing.
+Verbose mode; print detailed info about what B<autoinst> thinks it's doing.
 
 =item B<-extra>=I<text>
 
@@ -1748,12 +1769,12 @@ being interpreted as options to B<autoinst>, it should be properly quoted.
 =item B<-nofigurekern>
 
 Some fonts provide kerning pairs for tabular figures.
-This is very probably unwanted (e.g., numbers in tables won't line up exactly).
+This is probably unwanted (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 only for the "TLF" and "TOsF" families).
 Since this leads to very long command lines (it adds one hundred such options)
-and the problem affects only few fonts, the default is however B<-figurekern>.
+and the problem affects only few fonts, the default is B<-figurekern>.
 
 =item B<-manual>
 
@@ -1769,7 +1790,7 @@ them into your TEXMF tree).
 
 When using this option, you should run F<pltotf> and F<vptovf> after
 executing all commands,
-to convert the F<pl> and F<vpl> files to F<tfm> and F<vf> format.
+to convert the F<pl> and F<vf> files to F<tfm> and F<vf> format.
 
 =back
 
@@ -1813,22 +1834,22 @@ The default is B<-updmap>.
 
 Eddie Kohler's TypeTools (F<http://www.lcdf.org/type>).
 
-The FontPro project (F<https://github.com/sebschub/FontPro>)
-offers very complete support for Adobe's Minion Pro and Myriad Pro
-(including math), and is currently working on Cronos Pro as well.
+Perl is pre-installed on most Linux and Unix systems;
+on Windows, try ActiveState's ActivePerl
+(available from 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 any font (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
+(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.
 
-Perl is pre-installed on most Linux and Unix systems;
-on Windows, try ActiveState's ActivePerl
-(available from F<http://www.activestate.com>)
-or Strawberry Perl (F<http://strawberryperl.com>).
-
 
 =head1 AUTHOR
 
@@ -1870,7 +1891,12 @@ GNU General Public License for more details.
 
 =over 12
 
-=item I<2012-10-03>
+=item I<2012-10-25>
+
+Added extra "ssub" rules to the F<fd> files that substitute italic
+shapes for slanted ones.
+
+=item I<2012-09-25>
 
 Added the I<-vendor>, I<-typeface> and I<-(no)updmap> command line options.
 
diff --git a/Master/texmf/doc/man/man1/afm2afm.man1.pdf b/Master/texmf/doc/man/man1/afm2afm.man1.pdf
index d98aeb968fb..ece9326d809 100644
--- a/Master/texmf/doc/man/man1/afm2afm.man1.pdf
+++ b/Master/texmf/doc/man/man1/afm2afm.man1.pdf
diff --git a/Master/texmf/doc/man/man1/autoinst.1 b/Master/texmf/doc/man/man1/autoinst.1
index 09214c17007..d2d7a3e025d 100644
--- a/Master/texmf/doc/man/man1/autoinst.1
+++ b/Master/texmf/doc/man/man1/autoinst.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "AUTOINST 1"
-.TH AUTOINST 1 "2012-10-03" "fontools" "Marc Penninga"
+.TH AUTOINST 1 "2012-10-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
@@ -441,13 +441,13 @@ specified, so the last one will be the default text encoding.
 .IX Item "-sanserif"
 Install the font as a sanserif font, accessed via \f(CW\*(C`\esffamily\*(C'\fR and \f(CW\*(C`\etextsf\*(C'\fR.
 Note that the generated style file redefines \f(CW\*(C`\efamilydefault\*(C'\fR,
-so including it will make this font the default text font.
+so including it will still make this font the default text font.
 .IP "\fB\-typewriter\fR" 4
 .IX Item "-typewriter"
 Install the font as a typewriter font, accessed via \f(CW\*(C`\ettfamily\*(C'\fR and
 \&\f(CW\*(C`\etexttt\*(C'\fR.
 Note that the generated style file redefines \f(CW\*(C`\efamilydefault\*(C'\fR,
-so including it will make this font the default text font.
+so including it will still make this font the default text font.
 .IP "\fB\-ts1\fR" 4
 .IX Item "-ts1"
 .PD 0
@@ -512,8 +512,7 @@ The default is \fB\-nofractions\fR.
 Turn the creation of ornament fonts on or off. The default is \fB\-ornaments\fR.
 .IP "\fB\-verbose\fR" 4
 .IX Item "-verbose"
-Verbose mode; print detailed info about what \fBautoinst\fR thinks it's doing,
-especially during font info parsing.
+Verbose mode; print detailed info about what \fBautoinst\fR thinks it's doing.
 .IP "\fB\-extra\fR=\fItext\fR" 4
 .IX Item "-extra=text"
 Pass \fItext\fR as options to \fIotftotfm\fR. To prevent \fItext\fR from accidentily
@@ -525,12 +524,12 @@ being interpreted as options to \fBautoinst\fR, it should be properly quoted.
 .IX Item "-nofigurekern"
 .PD
 Some fonts provide kerning pairs for tabular figures.
-This is very probably unwanted (e.g., numbers in tables won't line up exactly).
+This is probably unwanted (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 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)
-and the problem affects only few fonts, the default is however \fB\-figurekern\fR.
+and the problem affects only 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
@@ -545,7 +544,7 @@ them into your \s-1TEXMF\s0 tree).
 .Sp
 When using this option, you should run \fIpltotf\fR and \fIvptovf\fR after
 executing all commands,
-to convert the \fIpl\fR and \fIvpl\fR files to \fItfm\fR and \fIvf\fR format.
+to convert the \fIpl\fR and \fIvf\fR files to \fItfm\fR and \fIvf\fR format.
 .PP
 The following options are only meaningful in automatic mode,
 and hence ignored in manual mode:
@@ -582,21 +581,21 @@ The default is \fB\-updmap\fR.
 .IX Header "SEE ALSO"
 Eddie Kohler's TypeTools (\fIhttp://www.lcdf.org/type\fR).
 .PP
-The FontPro project (\fIhttps://github.com/sebschub/FontPro\fR)
-offers very complete support for Adobe's Minion Pro and Myriad Pro
-(including math), and is currently working on Cronos Pro as well.
+Perl is pre-installed on most Linux and Unix systems;
+on Windows, try ActiveState's ActivePerl
+(available from \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 any font (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
+(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.
-.PP
-Perl is pre-installed on most Linux and Unix systems;
-on Windows, try ActiveState's ActivePerl
-(available from \fIhttp://www.activestate.com\fR)
-or Strawberry Perl (\fIhttp://strawberryperl.com\fR).
 .SH "AUTHOR"
 .IX Header "AUTHOR"
 Marc Penninga <marcpenninga@gmail.com>
@@ -625,8 +624,12 @@ 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 "\fI2012\-10\-03\fR" 12
-.IX Item "2012-10-03"
+.IP "\fI2012\-10\-25\fR" 12
+.IX Item "2012-10-25"
+Added extra \*(L"ssub\*(R" rules to the \fIfd\fR files that substitute italic
+shapes for slanted ones.
+.IP "\fI2012\-09\-25\fR" 12
+.IX Item "2012-09-25"
 Added the \fI\-vendor\fR, \fI\-typeface\fR and \fI\-(no)updmap\fR command line options.
 .IP "\fI2012\-07\-06\fR" 12
 .IX Item "2012-07-06"
diff --git a/Master/texmf/doc/man/man1/autoinst.man1.pdf b/Master/texmf/doc/man/man1/autoinst.man1.pdf
index ffd141b8901..55c530aebe9 100644
--- a/Master/texmf/doc/man/man1/autoinst.man1.pdf
+++ b/Master/texmf/doc/man/man1/autoinst.man1.pdf
diff --git a/Master/texmf/doc/man/man1/ot2kpx.man1.pdf b/Master/texmf/doc/man/man1/ot2kpx.man1.pdf
index da9a63bed07..d964f99c7d0 100644
--- a/Master/texmf/doc/man/man1/ot2kpx.man1.pdf
+++ b/Master/texmf/doc/man/man1/ot2kpx.man1.pdf