Hello community,
here is the log from the commit of package lcdf-typetools for openSUSE:Factory checked in at 2013-08-14 22:45:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lcdf-typetools (Old)
and /work/SRC/openSUSE:Factory/.lcdf-typetools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lcdf-typetools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/lcdf-typetools/lcdf-typetools.changes 2013-06-05 13:28:33.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.lcdf-typetools.new/lcdf-typetools.changes 2013-08-14 22:45:18.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 24 12:30:34 UTC 2013 - schubert.seb@gmail.com
+
+- update to 2.99
++ Fix a cfftot1 bug that could corrupt some output fonts.
+
+-------------------------------------------------------------------
Old:
----
lcdf-typetools-2.98.tar.gz
New:
----
lcdf-typetools-2.99.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lcdf-typetools.spec ++++++
--- /var/tmp/diff_new_pack.jneDf8/_old 2013-08-14 22:45:19.000000000 +0200
+++ /var/tmp/diff_new_pack.jneDf8/_new 2013-08-14 22:45:19.000000000 +0200
@@ -19,7 +19,7 @@
Summary: Programs to manipulate OpenType and multiple-master fonts
Name: lcdf-typetools
-Version: 2.98
+Version: 2.99
Release: 0
License: GPL-2.0
Url: http://www.lcdf.org/type/
++++++ lcdf-typetools-2.98.tar.gz -> lcdf-typetools-2.99.tar.gz ++++++
++++ 3472 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/NEWS new/lcdf-typetools-2.99/NEWS
--- old/lcdf-typetools-2.98/NEWS 2013-04-10 14:49:15.000000000 +0200
+++ new/lcdf-typetools-2.99/NEWS 2013-08-13 23:31:28.000000000 +0200
@@ -1,5 +1,11 @@
LCDF Typetools NEWS
+Version 2.99 13.Aug.2013
+
+* cfftot1: Correct bug that rarely corrupted Type 1 output fonts.
+ Reported by Sebastian Schubert.
+
+
Version 2.98 10.Apr.2013
* Fix alignment bug that corrupted output fonts on some platforms
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/README new/lcdf-typetools-2.99/README
--- old/lcdf-typetools-2.98/README 2013-04-11 04:01:04.000000000 +0200
+++ new/lcdf-typetools-2.99/README 2013-08-13 23:33:01.000000000 +0200
@@ -1,58 +1,54 @@
-LCDF-TYPETOOLS 2.98
-===================
+LCDF-TYPETOOLS
+==============
-USAGE
------
- The LCDF Typetools package contains several programs for manipulating
-PostScript Type 1, Type 1 multiple master, and PostScript-flavored OpenType
-fonts. LCDF Typetools includes the mmafm and mmpfb programs, which were
-formerly distributed as part of a different package (mminstance).
+ LCDF Typetools comprises several programs for manipulating
+PostScript Type 1, Type 1 multiple master, and OpenType fonts.
Cfftot1 translates a Compact Font Format (CFF) font, or a PostScript-
flavored OpenType font, into PostScript Type 1 format. It correctly
-handles subroutines and hints. See the manual page 'cfftot1/cfftot1.1' for
+handles subroutines and hints. See the manual page `cfftot1/cfftot1.1` for
more information.
Mmafm creates an AFM file (font metrics) corresponding to an instance of
a multiple-master font. It reads the AMFM and AFM files distributed with
-the font. See MMINSTANCE NOTES, below, and the manual page 'mmafm/mmafm.1'
+the font. See MMAFM AND MMPFB, below, and the manual page `mmafm/mmafm.1`
for more information.
Mmpfb creates a normal, single-master font program which looks like an
instance of a multiple-master font. It reads the multiple master font
-program in PFA or PFB format. See MMINSTANCE NOTES, below, and the manual
-page 'mmpfb/mmpfb.1' for more information.
+program in PFA or PFB format. See MMAFM AND MMPFB, below, and the manual
+page `mmpfb/mmpfb.1` for more information.
Otfinfo reports information about OpenType fonts, such as the features
they support and the contents of their 'size' optical size features. See
-the manual page 'otfinfo/otfinfo.1' for more information.
+the manual page `otfinfo/otfinfo.1` for more information.
- Otftotfm creates TeX font metrics and encodings that correspond to a
-PostScript-flavored OpenType font. It will interpret glyph positionings,
-substitutions, and ligatures as far as it is able. You can say which
-OpenType features should be activated. See the manual page
-'otftotfm/otftotfm.1' for more information.
+ Otftotfm creates TeX font metrics and encodings that correspond to
+a OpenType font. It will interpret glyph positionings, substitutions,
+and ligatures as far as it is able. You can say which OpenType
+features should be activated. See the manual page
+`otftotfm/otftotfm.1` for more information.
T1dotlessj reads a Type 1 font, then creates a new Type 1 font whose
only character is a dotless "j" matching the input font's design. See the
-manual page 't1dotlessj/t1dotlessj.1' for more information.
+manual page `t1dotlessj/t1dotlessj.1` for more information.
T1lint checks Type 1 fonts for correctness. It tests most of the
requirements listed in Adobe Systems' Black Book ("Adobe Type 1 Font
-Format"), and some others. See the manual page 't1lint/t1lint.1' for more
+Format"), and some others. See the manual page `t1lint/t1lint.1` for more
information.
T1reencode reencodes a Type 1 font, replacing its internal encoding with
-one you specify. See the manual page 't1reencode/t1reencode.1' for more
+one you specify. See the manual page `t1reencode/t1reencode.1` for more
information.
Ttftotype42 creates a Type 42 wrapper for a TrueType or
TrueType-flavored OpenType font. See the manual page
-'ttftotype42/ttftotype42.1' for more information.
+`ttftotype42/ttftotype42.1` for more information.
- The final program is preliminary: t1testpage creates a PostScript test
-page for a given font file. See the manual page 't1testpage/t1testpage.1'
-for more information.
+ Finally, t1testpage creates a PostScript test page for a given font
+file. See the manual page `t1testpage/t1testpage.1` for more
+information.
Please write me with problems, patches, and suggestions at the address
below.
@@ -61,28 +57,28 @@
REQUIREMENTS
------------
UNIX; gmake; C & C++ compilers. To build, just run ./configure, then
-gmake. See 'INSTALL' in this directory for more detailed information about
-'./configure'.
+gmake. See `INSTALL` in this directory for more detailed information about
+`./configure`.
Some programs can link with additional libraries. Otftotfm can use the
Kpathsea TeX-related path searching library; if your kpathsea library is in
-a nonstandard place, supply 'configure' with the '--with-kpathsea=PREFIX'
+a nonstandard place, supply `./configure` with the `--with-kpathsea=PREFIX`
option to find it.
-
- You can also disable individual programs by supplying 'configure' with
-'--disable-PROGNAME' options. See './configure --help' for more
+
+ You can also disable individual programs by supplying `./configure` with
+`--disable-PROGNAME` options. See `./configure --help` for more
information.
-MMINSTANCE NOTES
-----------------
+MMAFM AND MMPFB
+---------------
Examples
........
% mmafm MyriadMM.amfm --weight=300 --width=585 > MyriadMM_300_585_.afm
% mmpfb MyriadMM.pfb --weight=300 --width=585 > MyriadMM_300_585_.pfb
- Run `mmafm --help' and `mmpfb --help' for a full option summary.
+ Run `mmafm --help` and `mmpfb --help` for a full option summary.
Running mmafm
.............
@@ -94,38 +90,38 @@
conventions:
1) The AFM files are in the same directory as the AMFM file. They are
-named `FONTNAME.afm' -- `MyriadMM-LightCn.afm', for example.
+named `FONTNAME.afm` -- `MyriadMM-LightCn.afm`, for example.
- 2) There is a `PSres.upr' file that lists the AFMs by font name, and the
-`PSRESOURCEPATH' environment variable contains the directory with that
-`PSres.upr' file. (`ps2pk' comes with a sample `PSres.upr' file.)
+ 2) There is a `PSres.upr` file that lists the AFMs by font name, and the
+`PSRESOURCEPATH` environment variable contains the directory with that
+`PSres.upr` file. (`ps2pk` comes with a sample `PSres.upr` file.)
Intermediate masters
....................
Mmpfb can handle intermediate-master fonts transparently. If you use
-`PSres.upr' files, as described above, mmafm will also work transparently
+`PSres.upr` files, as described above, mmafm will also work transparently
on intermediate-master fonts: it'll call mmpfb to get the information it
-needs. If you don't use `PSres.upr' files, you need to use mmpfb ahead of
+needs. If you don't use `PSres.upr` files, you need to use mmpfb ahead of
time to set up some auxiliary files. Say you want to use an intermediate
-master font `FONT', and FONT's AMFM file is in the `DIR' directory. Here's
+master font `FONT`, and FONT's AMFM file is in the `DIR` directory. Here's
what you need to do:
% mmpfb FONT.pfb --amcp-info > DIR/FONT.amcp
- When you run mmafm on 'DIR/FONT.amfm', it will automatically look for
-'DIR/FONT.amcp'. An example using Adobe Jenson:
+ When you run mmafm on `DIR/FONT.amfm`, it will automatically look for
+`DIR/FONT.amcp`. An example using Adobe Jenson:
% cd ~/Fonts/AJensonMM
% mmpfb AJensonMM.pfb --amcp-info > AJensonMM.amcp
Most multiple master fonts don't have intermediate masters, so you won't
-usually need to make '.amcp' files. Mmafm will tell you if it is necessary
+usually need to make `.amcp` files. Mmafm will tell you if it is necessary
for a particular font.
COPYRIGHT/LICENSE
-----------------
- All source code is Copyright (c) 1997-2011 Eddie Kohler.
+ All source code is Copyright (c) 1997-2013 Eddie Kohler.
This code is distributed under the GNU General Public License, Version 2
(and only Version 2). The GNU General Public License is available via the
@@ -135,10 +131,10 @@
AUTHOR
------
- Eddie Kohler,
+ Eddie Kohler
http://www.lcdf.org/
The current version of the lcdf-typetools package is available on the
-Web at 'http://www.lcdf.org/type/'.
+Web at http://www.lcdf.org/type/
LCDF stands for Little Cambridgeport Design Factory.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/cfftot1/Makefile.am new/lcdf-typetools-2.99/cfftot1/Makefile.am
--- old/lcdf-typetools-2.98/cfftot1/Makefile.am 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/cfftot1/Makefile.am 2013-08-13 22:13:04.000000000 +0200
@@ -9,7 +9,7 @@
cfftot1_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
CLEANFILES = @TEMPLATE_OBJS@
EXTRA_DIST = cfftot1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/cfftot1/cfftot1.1 new/lcdf-typetools-2.99/cfftot1/cfftot1.1
--- old/lcdf-typetools-2.98/cfftot1/cfftot1.1 2013-04-11 04:01:04.000000000 +0200
+++ new/lcdf-typetools-2.99/cfftot1/cfftot1.1 2013-08-13 23:33:01.000000000 +0200
@@ -1,4 +1,4 @@
-.ds V 2.98
+.ds V 2.99
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/cfftot1/cfftot1.cc new/lcdf-typetools-2.99/cfftot1/cfftot1.cc
--- old/lcdf-typetools-2.98/cfftot1/cfftot1.cc 2012-11-21 23:30:45.000000000 +0100
+++ new/lcdf-typetools-2.99/cfftot1/cfftot1.cc 2013-08-13 22:19:17.000000000 +0200
@@ -1,6 +1,6 @@
/* cfftot1.cc -- driver for translating CFF fonts to Type 1 fonts
*
- * Copyright (c) 2002-2012 Eddie Kohler
+ * Copyright (c) 2002-2013 Eddie Kohler
*
* 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
@@ -217,7 +217,7 @@
case VERSION_OPT:
printf("cfftot1 (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 2002-2012 Eddie Kohler\n\
+ printf("Copyright (C) 2002-2013 Eddie Kohler\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty, not even for merchantability or fitness for a\n\
particular purpose.\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/cfftot1/maket1font.cc new/lcdf-typetools-2.99/cfftot1/maket1font.cc
--- old/lcdf-typetools-2.98/cfftot1/maket1font.cc 2012-11-21 23:30:45.000000000 +0100
+++ new/lcdf-typetools-2.99/cfftot1/maket1font.cc 2013-08-13 23:27:11.000000000 +0200
@@ -86,7 +86,9 @@
Subr *subr;
int pos;
int len;
- Caller(Subr *s, int p, int l) : subr(s), pos(p), len(l) { }
+ Caller(Subr *s, int p, int l)
+ : subr(s), pos(p), len(l) {
+ }
String charstring(MakeType1CharstringInterp *mcsi) const {
Type1Charstring *t1cs = subr->charstring(mcsi);
return t1cs->substring(pos, len);
@@ -97,7 +99,7 @@
const Caller &caller(int i) const { return _callers[i]; }
void add_call(Subr *s) { _calls.push_back(s); }
- void add_caller(Subr *, int, int);
+ void add_caller(Subr *s, int pos, int len);
int output_subrno() const { return _output_subrno; }
void set_output_subrno(int n) { _output_subrno = n; }
@@ -266,12 +268,13 @@
/* nada */;
else if (pos <= c.pos && c.pos + c.len <= right) {
// erase
- //fprintf(stderr, " ERASE caller %08x:%d+%d\n", c.subr->_csr, c.pos, c.len);
+ //if (c.debug) fprintf(stderr, " ERASE caller %08x:%d+%d [%d+%d]\n", c.subr->_csr, c.pos, c.len, pos, length);
c.subr = 0;
} else if (right <= c.pos) {
- //fprintf(stderr, " ADJUST caller %08x:%d+%d -> %d+%d\n", c.subr->_csr, c.pos, c.len, c.pos+delta, c.len);
+ //if (c.debug) fprintf(stderr, " ADJUST caller %08x:%d+%d -> %d+%d [%d+%d]\n", c.subr->_csr, c.pos, c.len, c.pos+delta, c.len, pos, length);
c.pos += delta;
} else if (c.pos <= pos && right <= c.pos + c.len) {
+ //if (c.debug) fprintf(stderr, " ADJUST caller %08x:%d+%d -> %d+%d [%d+%d]\n", c.subr->_csr, c.pos, c.len, c.pos, c.len+delta, pos, length);
c.len += delta;
} else
c.subr = 0;
@@ -293,7 +296,7 @@
return false;
assert(!_calls.size()); // because this hasn't been unified yet
- // Find the smallest shared substring.
+ // Find the smallest shared complete charstring.
String substr = _callers[0].charstring(mcsi);
int suboff = 0;
for (int i = 1; i < _callers.size(); i++) {
@@ -302,7 +305,18 @@
const char *dx = substr.data() + substr.length(), *d1x = d1 + substr1.length();
while (dx > d && d1x > d1 && dx[-1] == d1x[-1])
dx--, d1x--;
- suboff = dx - substr.data();
+ if (d1x != d1) {
+ // 8.13.2013 -- We might have stopped in the middle of a number
+ // or command in d1 -- even if we absorbed all of d! For
+ // example, maybe d's version is "15 rlineto" (encoded "154 5"),
+ // and our version is "518 rlineto" (encoded "248 154 5")! So
+ // whenever we stop before the end of d1, we must adjust our
+ // position to the next caret in d1, which, in the example,
+ // would be after "248 154" and before "5".
+ int suboff1 = Type1Charstring(substr1).first_caret_after(d1x - d1);
+ dx += suboff1 - (d1x - d1);
+ }
+ suboff = dx - substr.data();
}
substr = substr.substring(Type1Charstring(substr).first_caret_after(suboff));
if (!substr.length())
@@ -310,6 +324,7 @@
for (int i = 0; i < _callers.size(); i++) {
Caller &c = _callers[i];
if (int delta = c.len - substr.length()) {
+ //if (c.debug) fprintf(stderr, " PREFIX caller %08x:%d+%d -> %d+%d [%s]\n", c.subr->_csr, c.pos, c.len, c.pos+delta, c.len+delta, CharstringUnparser::unparse(Type1Charstring(substr)).c_str());
c.pos += delta;
c.len -= delta;
}
@@ -418,9 +433,10 @@
run(program->glyph_context(i), receptacle, errh);
#if 0
PermString n = program->glyph_name(i);
- if (i == 2301 || i == 2302) {
- fprintf(stderr, "%s was %s\n", n.c_str(), CharstringUnparser::unparse(*program->glyph(i)).c_str());
- fprintf(stderr, "%s == %s\n", n.c_str(), CharstringUnparser::unparse(receptacle).c_str());
+ if (i == 408 || i == 20) {
+ fprintf(stderr, "%d: %s was %s\n", i, n.c_str(), CharstringUnparser::unparse(*program->glyph(i)).c_str());
+ fprintf(stderr, " now %s\n", CharstringUnparser::unparse(receptacle).c_str());
+ fprintf(stderr, " *** %d.%d: %s\n", 134, 30, CharstringUnparser::unparse(Type1Charstring(receptacle.data_string().substring(134, 30))).c_str());
}
#endif
PermString name = program->glyph_name(i);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/configure.ac new/lcdf-typetools-2.99/configure.ac
--- old/lcdf-typetools-2.98/configure.ac 2013-04-10 14:49:25.000000000 +0200
+++ new/lcdf-typetools-2.99/configure.ac 2013-08-13 23:31:39.000000000 +0200
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([lcdf-typetools], [2.98])
+AC_INIT([lcdf-typetools], [2.99])
AC_CONFIG_SRCDIR([NEWS])
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([autoconf.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/lcdf-typetools.spec new/lcdf-typetools-2.99/lcdf-typetools.spec
--- old/lcdf-typetools-2.98/lcdf-typetools.spec 2013-04-11 04:01:04.000000000 +0200
+++ new/lcdf-typetools-2.99/lcdf-typetools.spec 2013-08-13 23:33:01.000000000 +0200
@@ -1,6 +1,6 @@
Summary: Programs to manipulate OpenType and multiple-master fonts
Name: lcdf-typetools
-Version: 2.98
+Version: 2.99
Copyright: GPL
Vendor: Little Cambridgeport Design Factory http://www.lcdf.org/
Group: Utilities/Printing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/libefont/Makefile.am new/lcdf-typetools-2.99/libefont/Makefile.am
--- old/lcdf-typetools-2.98/libefont/Makefile.am 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/libefont/Makefile.am 2013-08-13 22:13:06.000000000 +0200
@@ -40,4 +40,4 @@
libefont_a_LIBADD = @TEMPLATE_OBJS@
CLEANFILES = @TEMPLATE_OBJS@
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/libefont/cff.cc new/lcdf-typetools-2.99/libefont/cff.cc
--- old/lcdf-typetools-2.98/libefont/cff.cc 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/libefont/cff.cc 2013-08-13 22:22:52.000000000 +0200
@@ -541,7 +541,7 @@
if (!font_name)
errh->error("no fonts in CFF");
else
- errh->error("font '%s' not found", font_name.c_str());
+ errh->error("font %<%s%> not found", font_name.c_str());
return 0;
}
@@ -606,7 +606,7 @@
if (_error >= 0)
for (int g = 0; g < _sids.size(); g++) {
if (_gids[_sids[g]] >= 0) {
- errh->error("glyph '%s' in charset twice", cff->sid_permstring(_sids[g]).c_str());
+ errh->error("glyph %<%s%> in charset twice", cff->sid_permstring(_sids[g]).c_str());
_error = -EEXIST;
}
_gids[_sids[g]] = g;
@@ -1006,7 +1006,7 @@
if (op >= operators_used.size())
operators_used.resize(op + 1, 0);
if (operators_used[op] && (type & tTypeMask) != tNone)
- errh->error("%s: operator '%s' specified twice", dict_name, operator_names[op]);
+ errh->error("%s: operator %<%s%> specified twice", dict_name, operator_names[op]);
operators_used[op]++;
// check data
@@ -1014,9 +1014,9 @@
case tNone:
if (op >= 32)
- errh->warning("%s: unknown operator '12 %d'", dict_name, op - 32);
+ errh->warning("%s: unknown operator %<12 %d%>", dict_name, op - 32);
else
- errh->warning("%s: unknown operator '%d'", dict_name, op);
+ errh->warning("%s: unknown operator %<%d%>", dict_name, op);
continue;
case tSID:
@@ -1033,7 +1033,7 @@
if (arity != 1)
goto bad_data;
else if (num != 0 && num != 1)
- errh->warning("%s: data for Boolean operator '%s' not 0 or 1", dict_name, operator_names[op]);
+ errh->warning("%s: data for Boolean operator %<%s%> not 0 or 1", dict_name, operator_names[op]);
break;
case tNumber:
@@ -1073,12 +1073,12 @@
// check dict location
if (((type & tPrivate) != 0) != is_private)
- errh->warning("%s: operator '%s' in wrong DICT", dict_name, operator_names[op]);
+ errh->warning("%s: operator %<%s%> in wrong DICT", dict_name, operator_names[op]);
continue;
bad_data:
- errh->error("%s: bad data for operator '%s'", dict_name, operator_names[op]);
+ errh->error("%s: bad data for operator %<%s%>", dict_name, operator_names[op]);
}
return (errh->nerrors() != before_nerrors ? -1 : 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/libefont/otf.cc new/lcdf-typetools-2.99/libefont/otf.cc
--- old/lcdf-typetools-2.98/libefont/otf.cc 2013-04-09 17:40:20.000000000 +0200
+++ new/lcdf-typetools-2.99/libefont/otf.cc 2013-08-13 22:23:45.000000000 +0200
@@ -76,7 +76,7 @@
if (tag <= last_tag)
return errh->error("tags out of order"), -EINVAL;
if (offset + length > (uint32_t) len)
- return errh->error("OTF data for '%s' out of range", Tag(tag).text().c_str()), -EFAULT;
+ return errh->error("OTF data for %<%s%> out of range", Tag(tag).text().c_str()), -EFAULT;
last_tag = tag;
}
@@ -486,7 +486,7 @@
if (_str.length() < offset + LANGSYS_HEADERSIZE
|| (featureCount = Data::u16_aligned(data + offset + 4),
(_str.length() < offset + LANGSYS_HEADERSIZE + featureCount*FEATURE_RECSIZE)))
- return (errh ? errh->error("OTF LangSys table for '%s/%s' out of range", script.text().c_str(), langsys.text().c_str()) : -1);
+ return (errh ? errh->error("OTF LangSys table for %<%s/%s%> out of range", script.text().c_str(), langsys.text().c_str()) : -1);
// search langsys table
int f = Data::u16_aligned(data + offset + 2);
@@ -553,17 +553,17 @@
int len = _str.length();
int nfeatures = Data::u16_aligned(data);
if (fid < 0 || fid >= nfeatures)
- return errh->error("OTF feature ID '%d' out of range", fid), String();
+ return errh->error("OTF feature ID %<%d%> out of range", fid), String();
int foff = Data::u16_aligned(data + FEATURELIST_HEADERSIZE + fid*FEATURE_RECSIZE + 4);
if (len < foff + FEATURE_HEADERSIZE)
- return errh->error("OTF LookupList for feature ID '%d' too short", fid), String();
+ return errh->error("OTF LookupList for feature ID %<%d%> too short", fid), String();
int poff = Data::u16_aligned(data + foff);
if (poff == 0)
return String();
if (!old_style_offset)
poff += foff;
if (len < poff + length)
- return errh->error("OTF feature parameters for feature ID '%d' out of range", fid), String();
+ return errh->error("OTF feature parameters for feature ID %<%d%> out of range", fid), String();
else
return _str.substring(poff, length);
}
@@ -673,13 +673,13 @@
int len = _str.length();
int nfeatures = Data::u16_aligned(data);
if (fid < 0 || fid >= nfeatures)
- return errh->error("OTF feature ID '%d' out of range", fid);
+ return errh->error("OTF feature ID %<%d%> out of range", fid);
int foff = Data::u16_aligned(data + FEATURELIST_HEADERSIZE + fid*FEATURE_RECSIZE + 4);
int lookupCount;
if (len < foff + FEATURE_HEADERSIZE
|| (lookupCount = Data::u16_aligned(data + foff + 2),
len < foff + FEATURE_HEADERSIZE + lookupCount*LOOKUPLIST_RECSIZE))
- return errh->error("OTF LookupList for feature ID '%d' too short", fid);
+ return errh->error("OTF LookupList for feature ID %<%d%> too short", fid);
const uint8_t *ldata = data + foff + FEATURE_HEADERSIZE;
for (int j = 0; j < lookupCount; j++, ldata += LOOKUPLIST_RECSIZE)
results.push_back(Data::u16_aligned(ldata));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/liblcdf/Makefile.am new/lcdf-typetools-2.99/liblcdf/Makefile.am
--- old/lcdf-typetools-2.98/liblcdf/Makefile.am 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/liblcdf/Makefile.am 2013-08-13 22:13:09.000000000 +0200
@@ -26,6 +26,6 @@
liblcdf_a_LIBADD = @TEMPLATE_OBJS@
CLEANFILES = @TEMPLATE_OBJS@
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
EXTRA_DIST = fixlibc.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/mmafm/Makefile.am new/lcdf-typetools-2.99/mmafm/Makefile.am
--- old/lcdf-typetools-2.98/mmafm/Makefile.am 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/mmafm/Makefile.am 2013-08-13 22:13:09.000000000 +0200
@@ -8,7 +8,7 @@
mmafm_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
CLEANFILES = @TEMPLATE_OBJS@
EXTRA_DIST = mmafm.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/mmafm/main.cc new/lcdf-typetools-2.99/mmafm/main.cc
--- old/lcdf-typetools-2.98/mmafm/main.cc 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/mmafm/main.cc 2013-08-13 22:19:29.000000000 +0200
@@ -1,6 +1,6 @@
/* main.cc -- driver for mmafm program
*
- * Copyright (c) 1997-2012 Eddie Kohler
+ * Copyright (c) 1997-2013 Eddie Kohler
*
* 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
@@ -322,7 +322,7 @@
case VERSION_OPT:
printf("mmafm (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 1997-2012 Eddie Kohler\n\
+ printf("Copyright (C) 1997-2013 Eddie Kohler\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty, not even for merchantability or fitness for a\n\
particular purpose.\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/mmafm/mmafm.1 new/lcdf-typetools-2.99/mmafm/mmafm.1
--- old/lcdf-typetools-2.98/mmafm/mmafm.1 2013-04-11 04:01:04.000000000 +0200
+++ new/lcdf-typetools-2.99/mmafm/mmafm.1 2013-08-13 23:33:01.000000000 +0200
@@ -1,5 +1,5 @@
.\" -*-nroff-*-
-.ds V 2.98
+.ds V 2.99
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/mmpfb/Makefile.am new/lcdf-typetools-2.99/mmpfb/Makefile.am
--- old/lcdf-typetools-2.98/mmpfb/Makefile.am 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/mmpfb/Makefile.am 2013-08-13 22:13:09.000000000 +0200
@@ -11,7 +11,7 @@
mmpfb_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
CLEANFILES = @TEMPLATE_OBJS@
EXTRA_DIST = mmpfb.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/mmpfb/main.cc new/lcdf-typetools-2.99/mmpfb/main.cc
--- old/lcdf-typetools-2.98/mmpfb/main.cc 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/mmpfb/main.cc 2013-08-13 22:19:37.000000000 +0200
@@ -1,6 +1,6 @@
/* main.cc -- driver for mmpfb program
*
- * Copyright (c) 1997-2012 Eddie Kohler
+ * Copyright (c) 1997-2013 Eddie Kohler
*
* 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
@@ -355,7 +355,7 @@
case VERSION_OPT:
printf("mmpfb (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 1997-2012 Eddie Kohler\n\
+ printf("Copyright (C) 1997-2013 Eddie Kohler\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty, not even for merchantability or fitness for a\n\
particular purpose.\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/mmpfb/mmpfb.1 new/lcdf-typetools-2.99/mmpfb/mmpfb.1
--- old/lcdf-typetools-2.98/mmpfb/mmpfb.1 2013-04-11 04:01:04.000000000 +0200
+++ new/lcdf-typetools-2.99/mmpfb/mmpfb.1 2013-08-13 23:33:01.000000000 +0200
@@ -1,5 +1,5 @@
.\" -*-nroff-*-
-.ds V 2.98
+.ds V 2.99
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/otfinfo/Makefile.am new/lcdf-typetools-2.99/otfinfo/Makefile.am
--- old/lcdf-typetools-2.98/otfinfo/Makefile.am 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/otfinfo/Makefile.am 2013-08-13 22:13:10.000000000 +0200
@@ -10,7 +10,7 @@
otfinfo_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
otfinfo_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
CLEANFILES = @TEMPLATE_OBJS@
EXTRA_DIST = otfinfo.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/otfinfo/otfinfo.1 new/lcdf-typetools-2.99/otfinfo/otfinfo.1
--- old/lcdf-typetools-2.98/otfinfo/otfinfo.1 2013-04-11 04:01:04.000000000 +0200
+++ new/lcdf-typetools-2.99/otfinfo/otfinfo.1 2013-08-13 23:33:01.000000000 +0200
@@ -1,5 +1,5 @@
'\"t
-.ds V 2.98
+.ds V 2.99
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/otfinfo/otfinfo.cc new/lcdf-typetools-2.99/otfinfo/otfinfo.cc
--- old/lcdf-typetools-2.98/otfinfo/otfinfo.cc 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/otfinfo/otfinfo.cc 2013-08-13 22:19:48.000000000 +0200
@@ -1,6 +1,6 @@
/* otfinfo.cc -- driver for reporting information about OpenType fonts
*
- * Copyright (c) 2003-2012 Eddie Kohler
+ * Copyright (c) 2003-2013 Eddie Kohler
*
* 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
@@ -558,7 +558,7 @@
case VERSION_OPT:
printf("otfinfo (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 2003-2012 Eddie Kohler\n\
+ printf("Copyright (C) 2003-2013 Eddie Kohler\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty, not even for merchantability or fitness for a\n\
particular purpose.\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/otftotfm/Makefile.am new/lcdf-typetools-2.99/otftotfm/Makefile.am
--- old/lcdf-typetools-2.98/otftotfm/Makefile.am 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/otftotfm/Makefile.am 2013-08-13 22:13:11.000000000 +0200
@@ -18,14 +18,14 @@
otftotfm_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
otftotfm_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
CLEANFILES = @TEMPLATE_OBJS@
EXTRA_DIST = otftotfm.1
if have_kpathsea
otftotfm_SOURCES += kpseinterface.c kpseinterface.h
-INCLUDES += $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS += $(KPATHSEA_INCLUDES)
otftotfm_LDADD += $(KPATHSEA_LIBS)
otftotfm_DEPENDENCIES += $(KPATHSEA_DEPEND)
endif have_kpathsea
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/otftotfm/otftotfm.1 new/lcdf-typetools-2.99/otftotfm/otftotfm.1
--- old/lcdf-typetools-2.98/otftotfm/otftotfm.1 2013-04-11 04:01:04.000000000 +0200
+++ new/lcdf-typetools-2.99/otftotfm/otftotfm.1 2013-08-13 23:33:01.000000000 +0200
@@ -1,5 +1,5 @@
'\"t
-.ds V 2.98
+.ds V 2.99
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/otftotfm/otftotfm.cc new/lcdf-typetools-2.99/otftotfm/otftotfm.cc
--- old/lcdf-typetools-2.98/otftotfm/otftotfm.cc 2012-11-21 23:30:45.000000000 +0100
+++ new/lcdf-typetools-2.99/otftotfm/otftotfm.cc 2013-08-13 22:19:58.000000000 +0200
@@ -1,6 +1,6 @@
/* otftotfm.cc -- driver for translating OpenType fonts to TeX metrics
*
- * Copyright (c) 2003-2012 Eddie Kohler
+ * Copyright (c) 2003-2013 Eddie Kohler
*
* 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
@@ -2117,7 +2117,7 @@
case VERSION_OPT:
printf("otftotfm (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 2002-2012 Eddie Kohler\n\
+ printf("Copyright (C) 2002-2013 Eddie Kohler\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty, not even for merchantability or fitness for a\n\
particular purpose.\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/t1dotlessj/Makefile.am new/lcdf-typetools-2.99/t1dotlessj/Makefile.am
--- old/lcdf-typetools-2.98/t1dotlessj/Makefile.am 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/t1dotlessj/Makefile.am 2013-08-13 22:13:13.000000000 +0200
@@ -8,7 +8,7 @@
t1dotlessj_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
CLEANFILES = @TEMPLATE_OBJS@
EXTRA_DIST = t1dotlessj.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/t1dotlessj/t1dotlessj.1 new/lcdf-typetools-2.99/t1dotlessj/t1dotlessj.1
--- old/lcdf-typetools-2.98/t1dotlessj/t1dotlessj.1 2013-04-11 04:01:04.000000000 +0200
+++ new/lcdf-typetools-2.99/t1dotlessj/t1dotlessj.1 2013-08-13 23:33:01.000000000 +0200
@@ -1,4 +1,4 @@
-.ds V 2.98
+.ds V 2.99
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/t1dotlessj/t1dotlessj.cc new/lcdf-typetools-2.99/t1dotlessj/t1dotlessj.cc
--- old/lcdf-typetools-2.98/t1dotlessj/t1dotlessj.cc 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/t1dotlessj/t1dotlessj.cc 2013-08-13 22:20:06.000000000 +0200
@@ -1,6 +1,6 @@
/* t1dotlessj.cc -- driver for creating dotlessj characters from Type 1 fonts
*
- * Copyright (c) 2003-2012 Eddie Kohler
+ * Copyright (c) 2003-2013 Eddie Kohler
*
* 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
@@ -310,7 +310,7 @@
case VERSION_OPT:
printf("t1dotlessj (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 2003-2012 Eddie Kohler\n\
+ printf("Copyright (C) 2003-2013 Eddie Kohler\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty, not even for merchantability or fitness for a\n\
particular purpose.\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/t1lint/Makefile.am new/lcdf-typetools-2.99/t1lint/Makefile.am
--- old/lcdf-typetools-2.98/t1lint/Makefile.am 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/t1lint/Makefile.am 2013-08-13 22:13:13.000000000 +0200
@@ -9,7 +9,7 @@
t1lint_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
CLEANFILES = @TEMPLATE_OBJS@
EXTRA_DIST = t1lint.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/t1lint/t1lint.1 new/lcdf-typetools-2.99/t1lint/t1lint.1
--- old/lcdf-typetools-2.98/t1lint/t1lint.1 2013-04-11 04:01:04.000000000 +0200
+++ new/lcdf-typetools-2.99/t1lint/t1lint.1 2013-08-13 23:33:01.000000000 +0200
@@ -1,4 +1,4 @@
-.ds V 2.98
+.ds V 2.99
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/t1lint/t1lint.cc new/lcdf-typetools-2.99/t1lint/t1lint.cc
--- old/lcdf-typetools-2.98/t1lint/t1lint.cc 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/t1lint/t1lint.cc 2013-08-13 22:20:18.000000000 +0200
@@ -1,6 +1,6 @@
/* t1lint.cc -- driver for checking Type 1 fonts for validity
*
- * Copyright (c) 1999-2012 Eddie Kohler
+ * Copyright (c) 1999-2013 Eddie Kohler
*
* 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
@@ -412,7 +412,7 @@
case VERSION_OPT:
printf("t1lint (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 1999-2012 Eddie Kohler\n\
+ printf("Copyright (C) 1999-2013 Eddie Kohler\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty, not even for merchantability or fitness for a\n\
particular purpose.\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/t1rawafm/Makefile.am new/lcdf-typetools-2.99/t1rawafm/Makefile.am
--- old/lcdf-typetools-2.98/t1rawafm/Makefile.am 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/t1rawafm/Makefile.am 2013-08-13 22:13:13.000000000 +0200
@@ -8,7 +8,7 @@
t1rawafm_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
CLEANFILES = @TEMPLATE_OBJS@
EXTRA_DIST = t1rawafm.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/t1rawafm/t1rawafm.1 new/lcdf-typetools-2.99/t1rawafm/t1rawafm.1
--- old/lcdf-typetools-2.98/t1rawafm/t1rawafm.1 2013-04-11 04:01:04.000000000 +0200
+++ new/lcdf-typetools-2.99/t1rawafm/t1rawafm.1 2013-08-13 23:33:01.000000000 +0200
@@ -1,4 +1,4 @@
-.ds V 2.98
+.ds V 2.99
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/t1rawafm/t1rawafm.cc new/lcdf-typetools-2.99/t1rawafm/t1rawafm.cc
--- old/lcdf-typetools-2.98/t1rawafm/t1rawafm.cc 2012-11-21 23:30:45.000000000 +0100
+++ new/lcdf-typetools-2.99/t1rawafm/t1rawafm.cc 2013-08-13 22:20:27.000000000 +0200
@@ -1,6 +1,6 @@
/* t1rawafm.cc -- driver for generating a raw AFM file from a font
*
- * Copyright (c) 2008-2012 Eddie Kohler
+ * Copyright (c) 2008-2013 Eddie Kohler
*
* 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
@@ -308,7 +308,7 @@
case VERSION_OPT:
printf("t1rawafm (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 2008-2012 Eddie Kohler\n\
+ printf("Copyright (C) 2008-2013 Eddie Kohler\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty, not even for merchantability or fitness for a\n\
particular purpose.\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/t1reencode/Makefile.am new/lcdf-typetools-2.99/t1reencode/Makefile.am
--- old/lcdf-typetools-2.98/t1reencode/Makefile.am 2012-11-21 23:30:45.000000000 +0100
+++ new/lcdf-typetools-2.99/t1reencode/Makefile.am 2013-08-13 22:13:14.000000000 +0200
@@ -9,7 +9,7 @@
t1reencode_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
CLEANFILES = @TEMPLATE_OBJS@
EXTRA_DIST = t1reencode.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/t1reencode/t1reencode.1 new/lcdf-typetools-2.99/t1reencode/t1reencode.1
--- old/lcdf-typetools-2.98/t1reencode/t1reencode.1 2013-04-11 04:01:04.000000000 +0200
+++ new/lcdf-typetools-2.99/t1reencode/t1reencode.1 2013-08-13 23:33:01.000000000 +0200
@@ -1,4 +1,4 @@
-.ds V 2.98
+.ds V 2.99
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/t1reencode/t1reencode.cc new/lcdf-typetools-2.99/t1reencode/t1reencode.cc
--- old/lcdf-typetools-2.98/t1reencode/t1reencode.cc 2012-11-21 23:30:45.000000000 +0100
+++ new/lcdf-typetools-2.99/t1reencode/t1reencode.cc 2013-08-13 22:20:37.000000000 +0200
@@ -1,6 +1,6 @@
/* t1reencode.cc -- driver for reencoding Type 1 fonts
*
- * Copyright (c) 2005-2012 Eddie Kohler
+ * Copyright (c) 2005-2013 Eddie Kohler
*
* 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
@@ -978,7 +978,7 @@
case VERSION_OPT:
printf("t1reencode (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 1999-2012 Eddie Kohler\n\
+ printf("Copyright (C) 1999-2013 Eddie Kohler\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty, not even for merchantability or fitness for a\n\
particular purpose.\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/t1testpage/Makefile.am new/lcdf-typetools-2.99/t1testpage/Makefile.am
--- old/lcdf-typetools-2.98/t1testpage/Makefile.am 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/t1testpage/Makefile.am 2013-08-13 22:13:14.000000000 +0200
@@ -8,7 +8,7 @@
t1testpage_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
CLEANFILES = @TEMPLATE_OBJS@
EXTRA_DIST = t1testpage.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/t1testpage/t1testpage.1 new/lcdf-typetools-2.99/t1testpage/t1testpage.1
--- old/lcdf-typetools-2.98/t1testpage/t1testpage.1 2013-04-11 04:01:04.000000000 +0200
+++ new/lcdf-typetools-2.99/t1testpage/t1testpage.1 2013-08-13 23:33:01.000000000 +0200
@@ -1,4 +1,4 @@
-.ds V 2.98
+.ds V 2.99
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/t1testpage/t1testpage.cc new/lcdf-typetools-2.99/t1testpage/t1testpage.cc
--- old/lcdf-typetools-2.98/t1testpage/t1testpage.cc 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/t1testpage/t1testpage.cc 2013-08-13 22:20:45.000000000 +0200
@@ -1,6 +1,6 @@
/* t1testpage.cc -- driver for generating Type 1 fonts' test pages
*
- * Copyright (c) 1999-2012 Eddie Kohler
+ * Copyright (c) 1999-2013 Eddie Kohler
*
* 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
@@ -624,7 +624,7 @@
case VERSION_OPT:
printf("t1testpage (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 1999-2012 Eddie Kohler\n\
+ printf("Copyright (C) 1999-2013 Eddie Kohler\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty, not even for merchantability or fitness for a\n\
particular purpose.\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/ttftotype42/Makefile.am new/lcdf-typetools-2.99/ttftotype42/Makefile.am
--- old/lcdf-typetools-2.98/ttftotype42/Makefile.am 2012-08-16 15:02:19.000000000 +0200
+++ new/lcdf-typetools-2.99/ttftotype42/Makefile.am 2013-08-13 22:13:15.000000000 +0200
@@ -8,7 +8,7 @@
ttftotype42_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
CLEANFILES = @TEMPLATE_OBJS@
EXTRA_DIST = ttftotype42.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/ttftotype42/ttftotype42.1 new/lcdf-typetools-2.99/ttftotype42/ttftotype42.1
--- old/lcdf-typetools-2.98/ttftotype42/ttftotype42.1 2013-04-11 04:01:04.000000000 +0200
+++ new/lcdf-typetools-2.99/ttftotype42/ttftotype42.1 2013-08-13 23:33:01.000000000 +0200
@@ -1,4 +1,4 @@
-.ds V 2.98
+.ds V 2.99
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lcdf-typetools-2.98/ttftotype42/ttftotype42.cc new/lcdf-typetools-2.99/ttftotype42/ttftotype42.cc
--- old/lcdf-typetools-2.98/ttftotype42/ttftotype42.cc 2012-11-21 23:30:45.000000000 +0100
+++ new/lcdf-typetools-2.99/ttftotype42/ttftotype42.cc 2013-08-13 22:20:54.000000000 +0200
@@ -1,6 +1,6 @@
/* ttftotype42.cc -- driver for translating TrueType fonts to Type 42 fonts
*
- * Copyright (c) 2006-2012 Eddie Kohler
+ * Copyright (c) 2006-2013 Eddie Kohler
*
* 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
@@ -355,7 +355,7 @@
case VERSION_OPT:
printf("ttftotype42 (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 2006-2012 Eddie Kohler\n\
+ printf("Copyright (C) 2006-2013 Eddie Kohler\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty, not even for merchantability or fitness for a\n\
particular purpose.\n");