diff options
| -rwxr-xr-x | Build/source/texk/texlive/linked_scripts/fontools/autoinst | 173 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/support/fontools/README | 2 | ||||
| -rwxr-xr-x | Master/texmf-dist/scripts/fontools/autoinst | 173 | ||||
| -rw-r--r-- | Master/texmf/doc/man/man1/afm2afm.man1.pdf | bin | 5398 -> 5398 bytes | |||
| -rw-r--r-- | Master/texmf/doc/man/man1/autoinst.1 | 167 | ||||
| -rw-r--r-- | Master/texmf/doc/man/man1/autoinst.man1.pdf | bin | 29293 -> 28967 bytes | |||
| -rw-r--r-- | Master/texmf/doc/man/man1/ot2kpx.man1.pdf | bin | 7539 -> 7539 bytes |
7 files changed, 301 insertions, 214 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/fontools/autoinst b/Build/source/texk/texlive/linked_scripts/fontools/autoinst index 4b3d50fa935..79fb13a9b19 100755 --- a/Build/source/texk/texlive/linked_scripts/fontools/autoinst +++ b/Build/source/texk/texlive/linked_scripts/fontools/autoinst @@ -421,7 +421,7 @@ sub make_commands { my @commands = map { make_cmdline($_) } @worklist; # make sure the last command *does* call updmap - $commands[-1] =~ s/--no-updmap//xms; + $commands[-1] =~ s/--no-updmap//xms if $ARGV{updmap}; if ($ARGV{manual}) { open my $BAT, '>', 'autoinst.bat' @@ -486,12 +486,16 @@ sub set_targetdirs { my $family = shift; my %dir = map { ($_ => File::Spec->catdir( - $ARGV{target}, 'fonts', $_, 'lcdftools', $family)) + $ARGV{target}, + 'fonts', + $_, + $ARGV{vendor}, + $ARGV{typeface} || $family)) } qw(tfm vf pl vpl type1 truetype type42); $dir{$_} = File::Spec->catdir( - $ARGV{target}, 'fonts', $_, 'dvips', 'lcdftools') + $ARGV{target}, 'fonts', $_, 'dvips', $ARGV{vendor}) for qw(enc map); File::Path::make_path(values %dir); @@ -531,18 +535,24 @@ 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 + -(no)updmap Toggle running of updmap + -manual Manual mode (see documentation) - + -(no)figurekern Keep or remove kerns between tabular figures - -help Print this text - -verbose Make some noise + -help Prints this text and exit + -verbose Prints detailed info about operation 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 @@ -559,6 +569,9 @@ END_USAGE nfss => 'rm', extra => '', target => '', + vendor => 'lcdftools', + typeface => '', + updmap => '1', # 0 = no, 1 = yes manual => '0', # 0 = no, 1 = yes verbose => '0', # 0 = no, 1 = yes figurekern => '1', # 0 = no, 1 = yes @@ -585,6 +598,9 @@ sub parse_options { 'typewriter' => sub { $ARGV{nfss} = 'tt' }, 'extra=s' => \$ARGV{extra}, 'target=s' => \$ARGV{target}, + 'vendor=s' => \$ARGV{vendor}, + 'typeface=s' => \$ARGV{typeface}, + 'updmap!' => \$ARGV{updmap}, 'manual' => \$ARGV{manual}, 'figurekern!' => \$ARGV{figurekern}, 'verbose' => \$ARGV{verbose}, @@ -717,7 +733,7 @@ $info->{filename} END_FONTINFO } - + return $info; } @@ -1002,7 +1018,8 @@ sub write_stylefile { my %seen = %{ get_keys($data) }; my $fn = sprintf "%s.sty", $fam; - my $dir = File::Spec->catdir($ARGV{target}, 'tex', 'latex', $fam); + my $dir = File::Spec->catdir( + $ARGV{target}, 'tex', 'latex', $ARGV{typeface} || $fam); File::Path::make_path($dir); $fn = File::Spec->catfile($dir, $fn); open my $STY, '>', $fn or die "[ERROR] Can't create '$fn': $!"; @@ -1204,7 +1221,8 @@ sub write_fdfile { my ($fam, $enc, $sty, $data) = @_; my $fn = sprintf "%s%s-%s.fd", $enc, $fam, $sty; - my $dir = File::Spec->catdir($ARGV{target}, 'tex', 'latex', $fam); + my $dir = File::Spec->catdir( + $ARGV{target}, 'tex', 'latex', $ARGV{typeface} || $fam); File::Path::make_path($dir); $fn = File::Spec->catfile($dir, $fn); open my $FD, '>', $fn or die "[ERROR] Can't create '$fn': $!"; @@ -1300,8 +1318,8 @@ B<autoinst> will create several LaTeX font families: =item - -Four text families (with lining and oldstyle digits, in tabular and -proportional variants), each with the following shapes: +Four text families (with lining and oldstyle digits, in both tabular +and proportional variants), each with the following shapes: =over 2 @@ -1394,9 +1412,9 @@ tabular oldstyle figures =item I<Sup> -superior characters (many fonts have only an incomplete set of superiors: -digits, punctuation and the letters I<abdeilmnorst>; -normal forms will be used for the other characters) +superior characters (many fonts have only an incomplete set of superior +characters: digits, some punctuation and the letters I<abdeilmnorst>; +normal forms will then be used for the other characters) =item I<Inf> @@ -1509,8 +1527,8 @@ LaTeX installation) and supplying the name of the ornament font. To access the ornaments, B<autoinst> creates a font-specific encoding file F<< <FontFamily>_orn.enc >>, but only if that file doesn't yet exist. -This means you can provide your own encoding vector, -e.g. if your fonts use non-standard glyph names for ornaments. +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 @@ -1534,16 +1552,17 @@ NFSS identifies fonts by a combination of family, series (weight plus width), shape and size. B<autoinst> parses the output of C<otfinfo --info> to determine these parameters. When this fails -(e.g., because the font family contains unusual widths or weights), +(e.g., because the font family contains uncommon widths or weights), B<autoinst> ends up with different fonts having the I<same> values for the font parameters, which means that these fonts cannot be used in NFSS. B<autoinst> will then split the font family into multiple subfamilies -(based on the font's "Subfamily" value) and try again. -(Since many font families overdo the "Subfamily" by making each font -a separate subfamily, this strategy is only used as a last resort.) +(based on each font file's "Subfamily" value) and try again. +(Since many font families misunderstand the "Subfamily" concept +and make each font file a separate subfamily, +this strategy is only used as a last resort.) If this proliferation of font families is unwanted, -either rerun B<autoinst> on a smaller set of fonts (omitting the ones that +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>, C<%FD_WEIGHT> and C<%FD_SHAPE>, near the top of the source code. @@ -1629,7 +1648,8 @@ and TeXLive (F<http://tug.org/texlive>) don't have this problem. You may use either one or two dashes before options, and option names may be shortened to a unique prefix -(e.g., B<-enc> instead of B<-encoding>). +(e.g., B<-encoding> may be abbreviated to B<-enc> or even B<-en>, +but B<-e> is ambiguous (B<-encoding>, B<-extra>). =over 4 @@ -1650,14 +1670,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 still make this font the default text font. +so including it will 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 still make this font the default text font. +so including it will make this font the default text font. =item B<-ts1> @@ -1713,20 +1733,31 @@ The default is B<-nofractions>. Turn the creation of ornament fonts on or off. The default is B<-ornaments>. -=item B<-target>=I<DIRECTORY> +=item B<-verbose> -Install all generated files into the TEXMF tree at I<DIRECTORY>. +Verbose mode; print detailed info about what B<autoinst> thinks it's doing, +especially during font info parsing. -By default, B<autoinst> searches your $TEXMFLOCAL and $TEXMFHOME paths -and installs all files into subdirectories of the first writable TEXMF tree -it finds (or into subdirectories of the current directory, -if no writable directory is found). +=item B<-extra>=I<text> + +Pass I<text> as options to I<otftotfm>. To prevent I<text> from accidentily +being interpreted as options to B<autoinst>, it should be properly quoted. -B<Note>: this option gets overriden by the B<-manual> option! +=item B<-figurekern> + +=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). +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>. =item B<-manual> -Manual mode. By default, B<autoinst> immediately executes all F<otftotfm> +Manual mode. By default, B<autoinst> executes all F<otftotfm> command lines 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 @@ -1738,30 +1769,42 @@ 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<vf> files to F<tfm> and F<vf> format. +to convert the F<pl> and F<vpl> files to F<tfm> and F<vf> format. -B<Note>: this option overrides the B<-target> option! +=back -=item B<-verbose> +The following options are only meaningful in automatic mode, +and hence ignored in manual mode: -Verbose mode; print detailed info about what B<autoinst> thinks it's doing. +=over 4 -=item B<-extra>=I<text> +=item B<-target>=I<DIRECTORY> -Pass I<text> as options to I<otftotfm>. To prevent I<text> from accidentily -being interpreted as options to B<autoinst>, it should be properly quoted. +Install all generated files into the TEXMF tree at I<DIRECTORY>. -=item B<-figurekern> +By default, B<autoinst> searches your $TEXMFLOCAL and $TEXMFHOME paths +and installs all files into subdirectories of the first writable TEXMF tree +it finds (or into subdirectories of the current directory, +if no writable directory is found). -=item B<-nofigurekern> +=item B<-vendor>=I<VENDOR> -Some fonts provide kerning pairs for tabular figures. -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 B<-figurekern>. +=item B<-typeface>=I<TYPEFACE> + +These options are equivalent to F<otftotfm>'s I< --vendor> and I< --typeface> +options: they change the "vendor" and "typeface" parts of the names of the +subdirectories in the TEXMF tree where generated files will be stored. +The default values are "lcdftools" and the font's FontFamily name. + +Please note that these options change I<only> directory names, +not the names of any generated files. + +=item B<-updmap> + +=item B<-noupdmap> + +Control whether or not F<updmap> is called after the last call to F<otftotfm>. +The default is B<-updmap>. =back @@ -1770,21 +1813,21 @@ and the problem affects only few fonts, the default is B<-figurekern>. Eddie Kohler's 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>) -or Strawberry Perl (F<http://strawberryperl.com>). +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. 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. John Owens' F<otfinst> (available from CTAN) is another wrapper -around F<otftotfm>, and may work when B<autoinst> doesn't. +around F<otftotfm>, and may work for you when B<autoinst> doesn't. -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>). =head1 AUTHOR @@ -1827,6 +1870,10 @@ GNU General Public License for more details. =over 12 +=item I<2012-10-03> + +Added the I<-vendor>, I<-typeface> and I<-(no)updmap> command line options. + =item I<2012-07-06> Documentation update. @@ -1855,6 +1902,13 @@ Generate OT1, T1 and LY1 encoded text fonts by default. Made I<-titling> a default option (instead of I<-notitling>). Updated the documentation. +=back + + +=begin Really_old_history + +=over 12 + =item I<2011-06-15> Fixed the font info parsing code for some fonts that are @@ -1893,13 +1947,6 @@ A small patch to the C<get_orn> subroutine: it now also recognises the I<bullet.xxx> ornament glyphs in Adobe Kepler Pro. -=back - - -=begin Really_old_history - -=over 12 - =item I<2007-08-07> Fixed a small bug with filename quoting on Windows. diff --git a/Master/texmf-dist/doc/support/fontools/README b/Master/texmf-dist/doc/support/fontools/README index 35fa5b0c4f7..385e37155b4 100644 --- a/Master/texmf-dist/doc/support/fontools/README +++ b/Master/texmf-dist/doc/support/fontools/README @@ -55,4 +55,4 @@ the terms of the GNU General Public Licence. See the file GPLv2.txt for the license conditions. - Marc Penninga, 2012/07/06 + Marc Penninga, 2012/10/03 diff --git a/Master/texmf-dist/scripts/fontools/autoinst b/Master/texmf-dist/scripts/fontools/autoinst index 4b3d50fa935..79fb13a9b19 100755 --- a/Master/texmf-dist/scripts/fontools/autoinst +++ b/Master/texmf-dist/scripts/fontools/autoinst @@ -421,7 +421,7 @@ sub make_commands { my @commands = map { make_cmdline($_) } @worklist; # make sure the last command *does* call updmap - $commands[-1] =~ s/--no-updmap//xms; + $commands[-1] =~ s/--no-updmap//xms if $ARGV{updmap}; if ($ARGV{manual}) { open my $BAT, '>', 'autoinst.bat' @@ -486,12 +486,16 @@ sub set_targetdirs { my $family = shift; my %dir = map { ($_ => File::Spec->catdir( - $ARGV{target}, 'fonts', $_, 'lcdftools', $family)) + $ARGV{target}, + 'fonts', + $_, + $ARGV{vendor}, + $ARGV{typeface} || $family)) } qw(tfm vf pl vpl type1 truetype type42); $dir{$_} = File::Spec->catdir( - $ARGV{target}, 'fonts', $_, 'dvips', 'lcdftools') + $ARGV{target}, 'fonts', $_, 'dvips', $ARGV{vendor}) for qw(enc map); File::Path::make_path(values %dir); @@ -531,18 +535,24 @@ 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 + -(no)updmap Toggle running of updmap + -manual Manual mode (see documentation) - + -(no)figurekern Keep or remove kerns between tabular figures - -help Print this text - -verbose Make some noise + -help Prints this text and exit + -verbose Prints detailed info about operation 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 @@ -559,6 +569,9 @@ END_USAGE nfss => 'rm', extra => '', target => '', + vendor => 'lcdftools', + typeface => '', + updmap => '1', # 0 = no, 1 = yes manual => '0', # 0 = no, 1 = yes verbose => '0', # 0 = no, 1 = yes figurekern => '1', # 0 = no, 1 = yes @@ -585,6 +598,9 @@ sub parse_options { 'typewriter' => sub { $ARGV{nfss} = 'tt' }, 'extra=s' => \$ARGV{extra}, 'target=s' => \$ARGV{target}, + 'vendor=s' => \$ARGV{vendor}, + 'typeface=s' => \$ARGV{typeface}, + 'updmap!' => \$ARGV{updmap}, 'manual' => \$ARGV{manual}, 'figurekern!' => \$ARGV{figurekern}, 'verbose' => \$ARGV{verbose}, @@ -717,7 +733,7 @@ $info->{filename} END_FONTINFO } - + return $info; } @@ -1002,7 +1018,8 @@ sub write_stylefile { my %seen = %{ get_keys($data) }; my $fn = sprintf "%s.sty", $fam; - my $dir = File::Spec->catdir($ARGV{target}, 'tex', 'latex', $fam); + my $dir = File::Spec->catdir( + $ARGV{target}, 'tex', 'latex', $ARGV{typeface} || $fam); File::Path::make_path($dir); $fn = File::Spec->catfile($dir, $fn); open my $STY, '>', $fn or die "[ERROR] Can't create '$fn': $!"; @@ -1204,7 +1221,8 @@ sub write_fdfile { my ($fam, $enc, $sty, $data) = @_; my $fn = sprintf "%s%s-%s.fd", $enc, $fam, $sty; - my $dir = File::Spec->catdir($ARGV{target}, 'tex', 'latex', $fam); + my $dir = File::Spec->catdir( + $ARGV{target}, 'tex', 'latex', $ARGV{typeface} || $fam); File::Path::make_path($dir); $fn = File::Spec->catfile($dir, $fn); open my $FD, '>', $fn or die "[ERROR] Can't create '$fn': $!"; @@ -1300,8 +1318,8 @@ B<autoinst> will create several LaTeX font families: =item - -Four text families (with lining and oldstyle digits, in tabular and -proportional variants), each with the following shapes: +Four text families (with lining and oldstyle digits, in both tabular +and proportional variants), each with the following shapes: =over 2 @@ -1394,9 +1412,9 @@ tabular oldstyle figures =item I<Sup> -superior characters (many fonts have only an incomplete set of superiors: -digits, punctuation and the letters I<abdeilmnorst>; -normal forms will be used for the other characters) +superior characters (many fonts have only an incomplete set of superior +characters: digits, some punctuation and the letters I<abdeilmnorst>; +normal forms will then be used for the other characters) =item I<Inf> @@ -1509,8 +1527,8 @@ LaTeX installation) and supplying the name of the ornament font. To access the ornaments, B<autoinst> creates a font-specific encoding file F<< <FontFamily>_orn.enc >>, but only if that file doesn't yet exist. -This means you can provide your own encoding vector, -e.g. if your fonts use non-standard glyph names for ornaments. +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 @@ -1534,16 +1552,17 @@ NFSS identifies fonts by a combination of family, series (weight plus width), shape and size. B<autoinst> parses the output of C<otfinfo --info> to determine these parameters. When this fails -(e.g., because the font family contains unusual widths or weights), +(e.g., because the font family contains uncommon widths or weights), B<autoinst> ends up with different fonts having the I<same> values for the font parameters, which means that these fonts cannot be used in NFSS. B<autoinst> will then split the font family into multiple subfamilies -(based on the font's "Subfamily" value) and try again. -(Since many font families overdo the "Subfamily" by making each font -a separate subfamily, this strategy is only used as a last resort.) +(based on each font file's "Subfamily" value) and try again. +(Since many font families misunderstand the "Subfamily" concept +and make each font file a separate subfamily, +this strategy is only used as a last resort.) If this proliferation of font families is unwanted, -either rerun B<autoinst> on a smaller set of fonts (omitting the ones that +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>, C<%FD_WEIGHT> and C<%FD_SHAPE>, near the top of the source code. @@ -1629,7 +1648,8 @@ and TeXLive (F<http://tug.org/texlive>) don't have this problem. You may use either one or two dashes before options, and option names may be shortened to a unique prefix -(e.g., B<-enc> instead of B<-encoding>). +(e.g., B<-encoding> may be abbreviated to B<-enc> or even B<-en>, +but B<-e> is ambiguous (B<-encoding>, B<-extra>). =over 4 @@ -1650,14 +1670,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 still make this font the default text font. +so including it will 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 still make this font the default text font. +so including it will make this font the default text font. =item B<-ts1> @@ -1713,20 +1733,31 @@ The default is B<-nofractions>. Turn the creation of ornament fonts on or off. The default is B<-ornaments>. -=item B<-target>=I<DIRECTORY> +=item B<-verbose> -Install all generated files into the TEXMF tree at I<DIRECTORY>. +Verbose mode; print detailed info about what B<autoinst> thinks it's doing, +especially during font info parsing. -By default, B<autoinst> searches your $TEXMFLOCAL and $TEXMFHOME paths -and installs all files into subdirectories of the first writable TEXMF tree -it finds (or into subdirectories of the current directory, -if no writable directory is found). +=item B<-extra>=I<text> + +Pass I<text> as options to I<otftotfm>. To prevent I<text> from accidentily +being interpreted as options to B<autoinst>, it should be properly quoted. -B<Note>: this option gets overriden by the B<-manual> option! +=item B<-figurekern> + +=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). +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>. =item B<-manual> -Manual mode. By default, B<autoinst> immediately executes all F<otftotfm> +Manual mode. By default, B<autoinst> executes all F<otftotfm> command lines 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 @@ -1738,30 +1769,42 @@ 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<vf> files to F<tfm> and F<vf> format. +to convert the F<pl> and F<vpl> files to F<tfm> and F<vf> format. -B<Note>: this option overrides the B<-target> option! +=back -=item B<-verbose> +The following options are only meaningful in automatic mode, +and hence ignored in manual mode: -Verbose mode; print detailed info about what B<autoinst> thinks it's doing. +=over 4 -=item B<-extra>=I<text> +=item B<-target>=I<DIRECTORY> -Pass I<text> as options to I<otftotfm>. To prevent I<text> from accidentily -being interpreted as options to B<autoinst>, it should be properly quoted. +Install all generated files into the TEXMF tree at I<DIRECTORY>. -=item B<-figurekern> +By default, B<autoinst> searches your $TEXMFLOCAL and $TEXMFHOME paths +and installs all files into subdirectories of the first writable TEXMF tree +it finds (or into subdirectories of the current directory, +if no writable directory is found). -=item B<-nofigurekern> +=item B<-vendor>=I<VENDOR> -Some fonts provide kerning pairs for tabular figures. -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 B<-figurekern>. +=item B<-typeface>=I<TYPEFACE> + +These options are equivalent to F<otftotfm>'s I< --vendor> and I< --typeface> +options: they change the "vendor" and "typeface" parts of the names of the +subdirectories in the TEXMF tree where generated files will be stored. +The default values are "lcdftools" and the font's FontFamily name. + +Please note that these options change I<only> directory names, +not the names of any generated files. + +=item B<-updmap> + +=item B<-noupdmap> + +Control whether or not F<updmap> is called after the last call to F<otftotfm>. +The default is B<-updmap>. =back @@ -1770,21 +1813,21 @@ and the problem affects only few fonts, the default is B<-figurekern>. Eddie Kohler's 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>) -or Strawberry Perl (F<http://strawberryperl.com>). +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. 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. John Owens' F<otfinst> (available from CTAN) is another wrapper -around F<otftotfm>, and may work when B<autoinst> doesn't. +around F<otftotfm>, and may work for you when B<autoinst> doesn't. -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>). =head1 AUTHOR @@ -1827,6 +1870,10 @@ GNU General Public License for more details. =over 12 +=item I<2012-10-03> + +Added the I<-vendor>, I<-typeface> and I<-(no)updmap> command line options. + =item I<2012-07-06> Documentation update. @@ -1855,6 +1902,13 @@ Generate OT1, T1 and LY1 encoded text fonts by default. Made I<-titling> a default option (instead of I<-notitling>). Updated the documentation. +=back + + +=begin Really_old_history + +=over 12 + =item I<2011-06-15> Fixed the font info parsing code for some fonts that are @@ -1893,13 +1947,6 @@ A small patch to the C<get_orn> subroutine: it now also recognises the I<bullet.xxx> ornament glyphs in Adobe Kepler Pro. -=back - - -=begin Really_old_history - -=over 12 - =item I<2007-08-07> Fixed a small bug with filename quoting on Windows. diff --git a/Master/texmf/doc/man/man1/afm2afm.man1.pdf b/Master/texmf/doc/man/man1/afm2afm.man1.pdf Binary files differindex 319d11a598b..5017efd4d06 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 d997f505ccb..09214c17007 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-07-06" "fontools" "Marc Penninga" +.TH AUTOINST 1 "2012-10-03" "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 @@ -149,8 +149,8 @@ Given a family of font files (in either \fIotf\fR or \fIttf\fR format), \&\fBautoinst\fR will create several LaTeX font families: .RS 2 .IP "\-" 3 -Four text families (with lining and oldstyle digits, in tabular and -proportional variants), each with the following shapes: +Four text families (with lining and oldstyle digits, in both tabular +and proportional variants), each with the following shapes: .RS 3 .RS 2 .IP "\fIn\fR" 6 @@ -221,9 +221,9 @@ proportional oldstyle figures tabular oldstyle figures .IP "\fISup\fR" 8 .IX Item "Sup" -superior characters (many fonts have only an incomplete set of superiors: -digits, punctuation and the letters \fIabdeilmnorst\fR; -normal forms will be used for the other characters) +superior characters (many fonts have only an incomplete set of superior +characters: digits, some punctuation and the letters \fIabdeilmnorst\fR; +normal forms will then be used for the other characters) .IP "\fIInf\fR" 8 .IX Item "Inf" inferior characters; usually only digits and punctuation, @@ -316,8 +316,8 @@ LaTeX installation) and supplying the name of the ornament font. .PP To access the ornaments, \fBautoinst\fR creates a font-specific encoding file \&\fI<FontFamily>_orn.enc\fR, but only if that file doesn't yet exist. -This means you can provide your own encoding vector, -e.g. if your fonts use non-standard glyph names for ornaments. +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 @@ -337,16 +337,17 @@ are incompatible with those generated by newer versions. shape and size. \&\fBautoinst\fR parses the output of \f(CW\*(C`otfinfo \-\-info\*(C'\fR to determine these parameters. When this fails -(e.g., because the font family contains unusual widths or weights), +(e.g., because the font family contains uncommon widths or weights), \&\fBautoinst\fR ends up with different fonts having the \fIsame\fR values for the font parameters, which means that these fonts cannot be used in \s-1NFSS\s0. \&\fBautoinst\fR will then split the font family into multiple subfamilies -(based on the font's \*(L"Subfamily\*(R" value) and try again. -(Since many font families overdo the \*(L"Subfamily\*(R" by making each font -a separate subfamily, this strategy is only used as a last resort.) +(based on each font file's \*(L"Subfamily\*(R" value) and try again. +(Since many font families misunderstand the \*(L"Subfamily\*(R" concept +and make each font file a separate subfamily, +this strategy is only used as a last resort.) .PP If this proliferation of font families is unwanted, -either rerun \fBautoinst\fR on a smaller set of fonts (omitting the ones that +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, \&\f(CW%FD_WEIGHT\fR and \f(CW%FD_SHAPE\fR, near the top of the source code. @@ -422,7 +423,8 @@ and TeXLive (\fIhttp://tug.org/texlive\fR) don't have this problem. .IX Header "COMMAND-LINE OPTIONS" You may use either one or two dashes before options, and option names may be shortened to a unique prefix -(e.g., \fB\-enc\fR instead of \fB\-encoding\fR). +(e.g., \fB\-encoding\fR may be abbreviated to \fB\-enc\fR or even \fB\-en\fR, +but \fB\-e\fR is ambiguous (\fB\-encoding\fR, \fB\-extra\fR). .IP "\fB\-encoding\fR=\fIencoding[,encoding]\fR" 4 .IX Item "-encoding=encoding[,encoding]" Use the specified encodings for the text fonts. The default is \*(L"\s-1OT1\s0,T1,LY1\*(R". @@ -439,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 still make this font the default text font. +so including it will 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 still make this font the default text font. +so including it will make this font the default text font. .IP "\fB\-ts1\fR" 4 .IX Item "-ts1" .PD 0 @@ -508,36 +510,10 @@ The default is \fB\-nofractions\fR. .IX Item "-noornaments" .PD Turn the creation of ornament fonts on or off. The default is \fB\-ornaments\fR. -.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, -if no writable directory is found). -.Sp -\&\fBNote\fR: this option gets overriden by the \fB\-manual\fR option! -.IP "\fB\-manual\fR" 4 -.IX Item "-manual" -Manual mode. By default, \fBautoinst\fR immediately executes all \fIotftotfm\fR -command lines 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 -(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 -leave all generated files in the current directory, rather than install -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 \fIvf\fR files to \fItfm\fR and \fIvf\fR format. -.Sp -\&\fBNote\fR: this option overrides the \fB\-target\fR option! .IP "\fB\-verbose\fR" 4 .IX Item "-verbose" -Verbose mode; print detailed info about what \fBautoinst\fR thinks it's doing. +Verbose mode; print detailed info about what \fBautoinst\fR thinks it's doing, +especially during font info parsing. .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 @@ -549,31 +525,78 @@ 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 probably unwanted (e.g., numbers in tables won't line up exactly). +This is very 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 \fB\-figurekern\fR. +and the problem affects only few fonts, the default is however \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 +instead written to a file \fIautoinst.bat\fR. +Also, the generated \fIotftotfm\fR command lines 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 +leave all generated files in the current directory, rather than install +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. +.PP +The following options are only meaningful in automatic mode, +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, +if no writable directory is found). +.IP "\fB\-vendor\fR=\fI\s-1VENDOR\s0\fR" 4 +.IX Item "-vendor=VENDOR" +.PD 0 +.IP "\fB\-typeface\fR=\fI\s-1TYPEFACE\s0\fR" 4 +.IX Item "-typeface=TYPEFACE" +.PD +These options are equivalent to \fIotftotfm\fR's \fI \-\-vendor\fR and \fI \-\-typeface\fR +options: they change the \*(L"vendor\*(R" and \*(L"typeface\*(R" parts of the names of the +subdirectories in the \s-1TEXMF\s0 tree where generated files will be stored. +The default values are \*(L"lcdftools\*(R" and the font's FontFamily name. +.Sp +Please note that these options change \fIonly\fR directory names, +not the names of any generated files. +.IP "\fB\-updmap\fR" 4 +.IX Item "-updmap" +.PD 0 +.IP "\fB\-noupdmap\fR" 4 +.IX Item "-noupdmap" +.PD +Control whether or not \fIupdmap\fR is called after the last call to \fIotftotfm\fR. +The default is \fB\-updmap\fR. .SH "SEE ALSO" .IX Header "SEE ALSO" Eddie Kohler's TypeTools (\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) -or Strawberry Perl (\fIhttp://strawberryperl.com\fR). +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 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 John Owens' \fIotfinst\fR (available from \s-1CTAN\s0) is another wrapper -around \fIotftotfm\fR, and may work when \fBautoinst\fR doesn't. +around \fIotftotfm\fR, and may work for you when \fBautoinst\fR doesn't. .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). .SH "AUTHOR" .IX Header "AUTHOR" Marc Penninga <marcpenninga@gmail.com> @@ -602,6 +625,9 @@ 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" +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" Documentation update. @@ -626,36 +652,3 @@ the same \s-1TEXMF\s0 tree as the other generated files. Generate \s-1OT1\s0, T1 and \s-1LY1\s0 encoded text fonts by default. Made \fI\-titling\fR a default option (instead of \fI\-notitling\fR). Updated the documentation. -.IP "\fI2011\-06\-15\fR" 12 -.IX Item "2011-06-15" -Fixed the font info parsing code for some fonts that are -too lazy to spell out \*(L"Italic\*(R" in full. -.IP "\fI2010\-04\-29\fR" 12 -.IX Item "2010-04-29" -The \fI \-\-feature=kern\fR option is only used for fonts that -contain either a \fIkern\fR feature or a \fIkern\fR table. -Font feature selection commands in the \fIsty\fR file are only -generated for shapes and figure styles that are supported -by the current font, and whose generation has not been -turned off using the command-line options. -Fixed the font info parsing to work with the Condensed fonts -in the Minion Pro family. -.IP "\fI2010\-04\-23\fR" 12 -.IX Item "2010-04-23" -Always provide the \fI \-\-feature=kern\fR option to \fIotftotfm\fR, -even if the font doesn't have a \fIkern\fR feature; -this will make \fIotftotfm\fR use the \fIkern\fR table if present. -For fonts without a \fIliga\fR feature, add \fI \-\-ligkern\fR -options for the common f\-ligatures to the \fIotftotfm\fR command line, -so that any ligatures present in the font will still be used. -Bug fix: the generated \fIsty\fR files now work for font families -with names containing digits. -.IP "\fI2009\-04\-09\fR" 12 -.IX Item "2009-04-09" -Prefixed the filenames of the included encoding files with -\&\fIfontools_\fR, to prevent name clashes with other packages. -.IP "\fI2009\-04\-06\fR" 12 -.IX Item "2009-04-06" -A small patch to the \f(CW\*(C`get_orn\*(C'\fR subroutine: -it now also recognises the \fIbullet.xxx\fR ornament glyphs -in Adobe Kepler Pro. diff --git a/Master/texmf/doc/man/man1/autoinst.man1.pdf b/Master/texmf/doc/man/man1/autoinst.man1.pdf Binary files differindex 6f3cc744463..f0a1cd29aee 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 Binary files differindex 577a98d15b3..1b9abc13c99 100644 --- a/Master/texmf/doc/man/man1/ot2kpx.man1.pdf +++ b/Master/texmf/doc/man/man1/ot2kpx.man1.pdf |