fontools (7aug13)

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

6 files changed, 43 insertions, 16 deletions

diff --git a/Master/texmf-dist/doc/man/man1/afm2afm.1 b/Master/texmf-dist/doc/man/man1/afm2afm.1
index 3f66df9a8bb..c434e40beb3 100644
--- a/Master/texmf-dist/doc/man/man1/afm2afm.1
+++ b/Master/texmf-dist/doc/man/man1/afm2afm.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "AFM2AFM 1"
-.TH AFM2AFM 1 "2012-03-06" "fontools" "Marc Penninga"
+.TH AFM2AFM 1 "2013-08-07" "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
@@ -137,6 +137,7 @@ afm2afm \- reencode an afm file
 .IX Item "afm2afm"
 [\fB\-help\fR]
 [\fB\-encoding\fR \fIencodingfile\fR]
+[\fB\-kpx\fR \fIkpxfile\fR]
 [\fB\-output\fR \fIoutputfile\fR]
 \&\fBafmfile\fR
 .SH "DESCRIPTION"
@@ -145,10 +146,12 @@ afm2afm \- reencode an afm file
 .PP
 Metrics (including kerning data) for characters not present in the
 chosen encoding are excluded from the output, which resuls in
-much smaller files.
+(potentially much) smaller files.
 .PP
-Note that if you don't specify an encoding file, the \fIafm\fR file
-isn't re-encoded, but the unused data is still pruned.
+Additional kerning pairs can be added to the output file.
+If you don't specify an encoding file, 
+the \fIafm\fR file isn't re-encoded; 
+however, all unused (unencoded) data is still pruned.
 .PP
 The program also generates an entry for a \fIdvips\fR\-style map file,
 but only if the \fIafm\fR file has been re-encoded and
@@ -162,6 +165,20 @@ Print a short description of the syntax
 .IP "\fB\-encoding\fR \fIencodingfile\fR" 4
 .IX Item "-encoding encodingfile"
 Re-encode to the enconding in \fIencodingfile\fR
+.IP "\fB\-kpx\fR \fIkpxfile\fR" 4
+.IX Item "-kpx kpxfile"
+Read additional kerning pairs from \fIkpxfile\fR and add these to the output.
+This option cannot be used to override values from the input \fIafm\fR file, 
+since \fBafm2afm\fR will write both old and new values to the output!
+.Sp
+The \fIkpxfile\fR should contain kerning data in standard \fIafm\fR format,
+i.e. for each kerning pair there should be a line
+.Sp
+.Vb 1
+\&    KPX <left_glyph> <right_glyph> <amount>
+.Ve
+.Sp
+All other lines in the \fIkpxfile\fR are ignored.
 .IP "\fB\-output\fR \fIoutputfile\fR" 4
 .IX Item "-output outputfile"
 Write the result to \fIoutputfile\fR instead of \f(CW\*(C`stdout\*(C'\fR.
@@ -169,20 +186,21 @@ Write the result to \fIoutputfile\fR instead of \f(CW\*(C`stdout\*(C'\fR.
 .IX Item "afmfile"
 The \fIafm\fR file to be re-encoded.
 .PP
-Option names may be shortened to a unique prefix.
+You may use either one or two dashes before options,
+and option names may be shortened to a unique prefix.
 .SH "AUTHOR"
 .IX Header "AUTHOR"
 Marc Penninga <marcpenninga@gmail.com>
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
-Copyright (C) 2005\-2012 Marc Penninga.
+Copyright (C) 2005\-2013 Marc Penninga.
 .SH "LICENSE"
 .IX Header "LICENSE"
 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;
+A copy of the \s-1GNU\s0 General Public License is included with \fBafm2afm\fR;
 see the file \fIGPLv2.txt\fR.
 .SH "DISCLAIMER"
 .IX Header "DISCLAIMER"
@@ -193,6 +211,11 @@ See the \s-1GNU\s0 General Public License for more details.
 .SH "RECENT CHANGES"
 .IX Header "RECENT CHANGES"
 (See the source code for the rest of the story.)
+.IP "\fI2013\-08\-07\fR" 12
+.IX Item "2013-08-07"
+Added the \fI\-kpx\fR command-line option.
+Replaced all \f(CW\*(C`given/when\*(C'\fR constructions in the source code by \f(CW\*(C`if\*(C'\fR's,
+to avoid warnings about experimental features in Perl 5.18 and later.
 .IP "\fI2012\-02\-01\fR" 12
 .IX Item "2012-02-01"
 Refactored the code; added the \*(L"no re-encoding, only pruning\*(R"
diff --git a/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf b/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf
index 0f87038f515..8c8501ab793 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.man1.pdf b/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf
index 989320d17d8..bb1d6d508d1 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.1 b/Master/texmf-dist/doc/man/man1/ot2kpx.1
index 853982cfffb..f7a598a6b09 100644
--- a/Master/texmf-dist/doc/man/man1/ot2kpx.1
+++ b/Master/texmf-dist/doc/man/man1/ot2kpx.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "OT2KPX 1"
-.TH OT2KPX 1 "2012-03-06" "fontools" "Marc Penninga"
+.TH OT2KPX 1 "2013-08-07" "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
@@ -155,12 +155,12 @@ multiple fonts, LookupTables with LookupTypes other than 2,
 \&\*(L"kern\*(R" tables with format other than 0 and ValueRecords with
 other types of data than just XAdvance data.
 .Sp
-Most of these limitations don't really matter, since the missing features
+Most of these limitations won't matter, since the missing features
 are rare (the only fonts I know of that use them are the non-western fonts
-that come with Adobe Reader). Furthermore, some of these features concern
-(according to the OpenType specification) \fI\*(L"define subtle, device-dependent
-adjustments at specific font sizes or device resolutions\*(R"\fR.
-Since there's no way to express such adjustments in \fIafm\fR format,
+that come with Adobe Reader). Furthermore, many of these features define
+(according to the OpenType specification) \fI\*(L"subtle, device-dependent
+adjustments at specific font sizes or device resolutions\*(R"\fR;
+since there's no way to express such adjustments in \fIafm\fR format,
 ignoring them seems to be the only option anyway.
 .IP "\fB\-\fR" 4
 .IX Item "-"
@@ -189,14 +189,14 @@ wouldn't make any difference (apart from further complicating the code).
 Marc Penninga <marcpenninga@gmail.com>
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
-Copyright (C) 2005\-2012 Marc Penninga.
+Copyright (C) 2005\-2013 Marc Penninga.
 .SH "LICENSE"
 .IX Header "LICENSE"
 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;
+A copy of the \s-1GNU\s0 General Public License is included with \fBot2kpx\fR;
 see the file \fIGPLv2.txt\fR.
 .SH "DISCLAIMER"
 .IX Header "DISCLAIMER"
@@ -207,6 +207,10 @@ See the \s-1GNU\s0 General Public License for more details.
 .SH "RECENT CHANGES"
 .IX Header "RECENT CHANGES"
 (See the source code for the rest of the story.)
+.IP "\fI2013\-08\-07\fR" 12
+.IX Item "2013-08-07"
+Replaced all \f(CW\*(C`given/when\*(C'\fR constructions in the source code by \f(CW\*(C`if\*(C'\fR's,
+to avoid warnings about experimental features in Perl 5.18 and later.
 .IP "\fI2012\-02\-01\fR" 12
 .IX Item "2012-02-01"
 Refactored the code, and fixed a number of bugs in the process.
diff --git a/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf b/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf
index 9d5ddb95a7c..921f9cec8d3 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 f22d4900896..1c83931f109 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, 2013/07/25
+                                                Marc Penninga, 2013/08/07