From 82b92c6c6aca6368ee7e1c70c5b5b7ded0547e21 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 5 Apr 2014 22:21:21 +0000 Subject: fontools (5apr14) git-svn-id: svn://tug.org/texlive/trunk@33380 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf | Bin 7034 -> 7034 bytes Master/texmf-dist/doc/man/man1/autoinst.1 | 5 ++++- Master/texmf-dist/doc/man/man1/autoinst.man1.pdf | Bin 30602 -> 30638 bytes Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf | Bin 7754 -> 7754 bytes Master/texmf-dist/doc/support/fontools/README | 2 +- Master/texmf-dist/scripts/fontools/autoinst | 14 ++++++++++---- 6 files changed, 15 insertions(+), 6 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf b/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf index e1066b0fec2..21941eb6870 100644 Binary files a/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf and b/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf differ diff --git a/Master/texmf-dist/doc/man/man1/autoinst.1 b/Master/texmf-dist/doc/man/man1/autoinst.1 index a666eecc921..9cdf1404aaa 100644 --- a/Master/texmf-dist/doc/man/man1/autoinst.1 +++ b/Master/texmf-dist/doc/man/man1/autoinst.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "AUTOINST 1" -.TH AUTOINST 1 "2014-01-21" "fontools" "Marc Penninga" +.TH AUTOINST 1 "2014-04-04" "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 @@ -646,6 +646,9 @@ but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of .SH "RECENT CHANGES" .IX Header "RECENT CHANGES" (See the source code for the rest of the story.) +.IP "\fI2014\-04\-04\fR" 12 +.IX Item "2014-04-04" +Fixed a bug in the font info parsing code. .IP "\fI2014\-01\-21\fR" 12 .IX Item "2014-01-21" \&\*(L"Oblique\*(R" or \*(L"slanted\*(R" fonts are now mapped to \s-1NFSS\s0 code \*(L"sl\*(R" instead diff --git a/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf b/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf index 8950f9d3cf2..f8587e01600 100644 Binary files a/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf and b/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf differ diff --git a/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf b/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf index d86e083a750..f419c74866f 100644 Binary files a/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf and b/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf differ diff --git a/Master/texmf-dist/doc/support/fontools/README b/Master/texmf-dist/doc/support/fontools/README index e212f685129..03b8e86c74c 100644 --- a/Master/texmf-dist/doc/support/fontools/README +++ b/Master/texmf-dist/doc/support/fontools/README @@ -65,4 +65,4 @@ the terms of the GNU General Public Licence; see the file GPLv2.txt for the license conditions. - Marc Penninga, 2014/01/21 + Marc Penninga, 2014/04/04 diff --git a/Master/texmf-dist/scripts/fontools/autoinst b/Master/texmf-dist/scripts/fontools/autoinst index 5510ee8b31c..2e9ca6833f4 100755 --- a/Master/texmf-dist/scripts/fontools/autoinst +++ b/Master/texmf-dist/scripts/fontools/autoinst @@ -966,23 +966,25 @@ sub parse_basicinfo { $data{fullname} = lc $data{fullname}; $data{family} =~ s/\A(?: Adobe | ITC | LT | MT)//xms; $data{family} =~ s/(\d)/$DIGITS[$1]/xmsge; - + + my $fullinfo = lc "$data{subfamily} | $data{fullname}"; + for my $width (mqrs(keys %FD_WIDTH)) { - if ($data{fullname} =~ s/${width}//xmsi) { + if ($fullinfo =~ s/${width}//xmsi) { $info->{width} = $width; last; } } for my $weight (mqrs(keys %FD_WEIGHT)) { - if ($data{fullname} =~ s/${weight}//xmsi) { + if ($fullinfo =~ s/${weight}//xmsi) { $info->{weight} = $weight; last; } } for my $shape (mqrs(keys %FD_SHAPE)) { - if ($data{fullname} =~ s/${shape}//xmsi) { + if ($fullinfo =~ s/${shape}//xmsi) { $info->{shape} = $shape; last; } @@ -2152,6 +2154,10 @@ GNU General Public License for more details. =over 12 +=item I<2014-04-04> + +Fixed a bug in the font info parsing code. + =item I<2014-01-21> "Oblique" or "slanted" fonts are now mapped to NFSS code "sl" instead -- cgit v1.2.3