From d5a0ab6993150abb027407eb92646ed3bd2a93a3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 7 Feb 2013 22:51:16 +0000 Subject: fontools (7feb13) git-svn-id: svn://tug.org/texlive/trunk@29051 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/support/fontools/README | 2 +- Master/texmf-dist/scripts/fontools/autoinst | 28 ++++++++++++++++---------- Master/texmf/doc/man/man1/afm2afm.man1.pdf | Bin 5402 -> 5402 bytes Master/texmf/doc/man/man1/autoinst.1 | 12 +++++++---- Master/texmf/doc/man/man1/autoinst.man1.pdf | Bin 29493 -> 29639 bytes Master/texmf/doc/man/man1/ot2kpx.man1.pdf | Bin 7543 -> 7543 bytes 6 files changed, 26 insertions(+), 16 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/support/fontools/README b/Master/texmf-dist/doc/support/fontools/README index 4dcea32a834..13eb3f60874 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, 2013/01/03 + Marc Penninga, 2013/02/06 diff --git a/Master/texmf-dist/scripts/fontools/autoinst b/Master/texmf-dist/scripts/fontools/autoinst index f05c021b075..d925b1ca2a3 100755 --- a/Master/texmf-dist/scripts/fontools/autoinst +++ b/Master/texmf-dist/scripts/fontools/autoinst @@ -291,7 +291,7 @@ sub main { my @fonts = map { Fontinfo::parse_fontinfo($_) } @ARGV; Fontinfo::assert_unique(@fonts); - # For each font, figure out the shapes, styles and encodings to generate + # For each font, figure out the styles, shapes and encodings to generate my @worklist = cleanup(expand_encodings(expand_shapes(expand_styles(@fonts)))); @@ -310,7 +310,7 @@ sub main { [ $minsize, $maxsize, $item->{fontname} ]; } - # Create the :aTeX support files + # Create the LaTeX support files while (my ($fam, $famdata) = each %fddata) { LaTeX::write_stylefile($fam, $famdata); while (my ($enc, $encdata) = each %$famdata) { @@ -501,6 +501,8 @@ sub make_cmdline { #----------------------------------------------------------------------- # Return a string with all "directory" options for otftotfm set #----------------------------------------------------------------------- +my @FILETYPES = qw(tfm vf type1 truetype); + sub set_targetdirs { my $family = shift; @@ -511,16 +513,15 @@ sub set_targetdirs { $ARGV{vendor}, $ARGV{typeface} || $family)) } - qw(tfm vf pl vpl type1 truetype type42); + @FILETYPES; $dir{$_} = File::Spec->catdir( - $ARGV{target}, 'fonts', $_, 'dvips', $ARGV{vendor}) + $ARGV{target}, 'fonts', $_, 'dvips', $ARGV{typeface} || $family) for qw(enc map); File::Path::make_path(values %dir); - my $result = join ' ', map { "--${_}-directory=$dir{$_}" } - qw(tfm vf pl vpl type1 truetype type42); + my $result = join ' ', map { "--${_}-directory=$dir{$_}" } @FILETYPES; $result .= " --encoding-directory=$dir{enc} --map-file=" . File::Spec->catfile($dir{map}, "${family}.map"); @@ -1286,8 +1287,8 @@ END_FD_SSUB } } - if (!exists $data->{bx}) { - for my $shape (keys %{$data->{b}}) { + for my $shape (keys %{$data->{b}}) { + if (!exists $data->{bx}{$shape}) { print {$FD} <<"END_FD_SSUB_BX"; \\DeclareFontShape{$enc}{${fam}-${sty}}{bx}{$shape}{ <-> ssub * ${fam}-${sty}/b/${shape} @@ -1598,7 +1599,7 @@ for these font parameters, which means that these fonts cannot be used in NFSS. In this case, B will split the font family into multiple subfamilies (based on each font file's "Subfamily" value) and try again. (Since many font vendors misunderstand the "Subfamily" concept -and make each font file a separate subfamily, +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, @@ -1892,8 +1893,8 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. -A copy of the GNU General Public License is included with B; -see the file F. +A copy of the text of the GNU General Public License is included in +the I distribution; see the file F. =head1 DISCLAIMER @@ -1911,6 +1912,11 @@ GNU General Public License for more details. =over 12 +=item I<2013-02-06> + +Bugfix: the directory names for map and encoding files contained +the "vendor" instead of the "typeface". + =item I<2013-01-03> Added extra "ssub" rules to the F files that substitute "b" for "bx". diff --git a/Master/texmf/doc/man/man1/afm2afm.man1.pdf b/Master/texmf/doc/man/man1/afm2afm.man1.pdf index a6e0777d9e0..2e6b61eeac4 100644 Binary files a/Master/texmf/doc/man/man1/afm2afm.man1.pdf and b/Master/texmf/doc/man/man1/afm2afm.man1.pdf differ diff --git a/Master/texmf/doc/man/man1/autoinst.1 b/Master/texmf/doc/man/man1/autoinst.1 index 504e9866a23..ffb1ffaca14 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 "2013-01-03" "fontools" "Marc Penninga" +.TH AUTOINST 1 "2013-02-06" "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 @@ -345,7 +345,7 @@ for these font parameters, which means that these fonts cannot be used in \s-1NF In this case, \fBautoinst\fR will split the font family into multiple subfamilies (based on each font file's \*(L"Subfamily\*(R" value) and try again. (Since many font vendors misunderstand the \*(L"Subfamily\*(R" concept -and make each font file a separate subfamily, +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, @@ -617,8 +617,8 @@ This program is free software; you can redistribute it and/or modify it under the terms of the \s-1GNU\s0 General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. -A copy of the \s-1GNU\s0 General Public License is included with \fBautoinst\fR; -see the file \fIGPLv2.txt\fR. +A copy of the text of the \s-1GNU\s0 General Public License is included in +the \fIfontools\fR distribution; see the file \fIGPLv2.txt\fR. .SH "DISCLAIMER" .IX Header "DISCLAIMER" This program is distributed in the hope that it will be useful, @@ -628,6 +628,10 @@ 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\-02\-06\fR" 12 +.IX Item "2013-02-06" +Bugfix: the directory names for map and encoding files contained +the \*(L"vendor\*(R" instead of the \*(L"typeface\*(R". .IP "\fI2013\-01\-03\fR" 12 .IX Item "2013-01-03" Added extra \*(L"ssub\*(R" rules to the \fIfd\fR files that substitute \*(L"b\*(R" for \*(L"bx\*(R". diff --git a/Master/texmf/doc/man/man1/autoinst.man1.pdf b/Master/texmf/doc/man/man1/autoinst.man1.pdf index ad26c472c3b..ae6a665e9b0 100644 Binary files a/Master/texmf/doc/man/man1/autoinst.man1.pdf and b/Master/texmf/doc/man/man1/autoinst.man1.pdf differ diff --git a/Master/texmf/doc/man/man1/ot2kpx.man1.pdf b/Master/texmf/doc/man/man1/ot2kpx.man1.pdf index 88a5bd8f304..e8cbce9096b 100644 Binary files a/Master/texmf/doc/man/man1/ot2kpx.man1.pdf and b/Master/texmf/doc/man/man1/ot2kpx.man1.pdf differ -- cgit v1.2.3