lcdf-typetools 2.88

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

97 files changed, 232 insertions, 212 deletions

diff --git a/Build/source/texk/README b/Build/source/texk/README
index 313133aea9d..a50e20781ae 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -68,9 +68,9 @@ kpathsea - maintained here by Karl Berry, Akira Kakuto, ...
 lacheck - checked 10dec10
   http://mirror.ctan.org/support/lacheck/lacheck-1.26.tar.gz
 
-lcdf-typetools - checked 04oct10
+lcdf-typetools - checked 9mar11
   http://www.lcdf.org/type/
-  http://www.lcdf.org/type/lcdf-typetools-2.85.tar.bz2
+  http://www.lcdf.org/type/lcdf-typetools-2.88.tar.bz2
 
 makeindexk - maintained here, by us
 
diff --git a/Build/source/texk/lcdf-typetools/Makefile.am b/Build/source/texk/lcdf-typetools/Makefile.am
index 46d7108d618..148be5b761f 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/Makefile.am
@@ -91,7 +91,7 @@ cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1tes
 	cd $@ && $(MAKE)
 
 versionize:
-	perl -pi -e 's/^\.ds V.*/.ds V $(VERSION)/;' $(top_srcdir)/cfftot1/cfftot1.1 $(top_srcdir)/mmafm/mmafm.1 $(top_srcdir)/mmpfb/mmpfb.1 $(top_srcdir)/otfinfo/otfinfo.1 $(top_srcdir)/otftotfm/otftotfm.1 $(top_srcdir)/t1dotlessj/t1dotlessj.1 $(top_srcdir)/t1lint/t1lint.1 $(top_srcdir)/t1reencode/t1reencode.1 $(top_srcdir)/t1testpage/t1testpage.1 $(top_srcdir)/ttftotype42/ttftotype42.1
+	perl -pi -e 's/^\.ds V.*/.ds V $(VERSION)/;' $(top_srcdir)/cfftot1/cfftot1.1 $(top_srcdir)/mmafm/mmafm.1 $(top_srcdir)/mmpfb/mmpfb.1 $(top_srcdir)/otfinfo/otfinfo.1 $(top_srcdir)/otftotfm/otftotfm.1 $(top_srcdir)/t1dotlessj/t1dotlessj.1 $(top_srcdir)/t1lint/t1lint.1 $(top_srcdir)/t1rawafm/t1rawafm.1 $(top_srcdir)/t1reencode/t1reencode.1 $(top_srcdir)/t1testpage/t1testpage.1 $(top_srcdir)/ttftotype42/ttftotype42.1
 	perl -pi -e 's/^(\U$(PACKAGE)\E) [\d.ab]+$$/$$1 $(VERSION)/;' $(top_srcdir)/README
 	perl -pi -e 's/^Version: [\d.ab]+$$/Version: $(VERSION)/;' $(top_srcdir)/lcdf-typetools.spec
 
diff --git a/Build/source/texk/lcdf-typetools/Makefile.am.orig b/Build/source/texk/lcdf-typetools/Makefile.am.orig
index 7dbf588b52e..8f31ca92058 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.am.orig
+++ b/Build/source/texk/lcdf-typetools/Makefile.am.orig
@@ -69,7 +69,7 @@ cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1tes
 	cd $@ && $(MAKE)
 
 versionize:
-	perl -pi -e 's/^\.ds V.*/.ds V $(VERSION)/;' $(top_srcdir)/cfftot1/cfftot1.1 $(top_srcdir)/mmafm/mmafm.1 $(top_srcdir)/mmpfb/mmpfb.1 $(top_srcdir)/otfinfo/otfinfo.1 $(top_srcdir)/otftotfm/otftotfm.1 $(top_srcdir)/t1dotlessj/t1dotlessj.1 $(top_srcdir)/t1lint/t1lint.1 $(top_srcdir)/t1reencode/t1reencode.1 $(top_srcdir)/t1testpage/t1testpage.1 $(top_srcdir)/ttftotype42/ttftotype42.1
+	perl -pi -e 's/^\.ds V.*/.ds V $(VERSION)/;' $(top_srcdir)/cfftot1/cfftot1.1 $(top_srcdir)/mmafm/mmafm.1 $(top_srcdir)/mmpfb/mmpfb.1 $(top_srcdir)/otfinfo/otfinfo.1 $(top_srcdir)/otftotfm/otftotfm.1 $(top_srcdir)/t1dotlessj/t1dotlessj.1 $(top_srcdir)/t1lint/t1lint.1 $(top_srcdir)/t1rawafm/t1rawafm.1 $(top_srcdir)/t1reencode/t1reencode.1 $(top_srcdir)/t1testpage/t1testpage.1 $(top_srcdir)/ttftotype42/ttftotype42.1
 	perl -pi -e 's/^(\U$(PACKAGE)\E) [\d.ab]+$$/$$1 $(VERSION)/;' $(top_srcdir)/README
 	perl -pi -e 's/^Version: [\d.ab]+$$/Version: $(VERSION)/;' $(top_srcdir)/lcdf-typetools.spec
 
diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in
index c9d14acbe46..8701aca6ccf 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/Makefile.in
@@ -895,7 +895,7 @@ cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1tes
 	cd $@ && $(MAKE)
 
 versionize:
-	perl -pi -e 's/^\.ds V.*/.ds V $(VERSION)/;' $(top_srcdir)/cfftot1/cfftot1.1 $(top_srcdir)/mmafm/mmafm.1 $(top_srcdir)/mmpfb/mmpfb.1 $(top_srcdir)/otfinfo/otfinfo.1 $(top_srcdir)/otftotfm/otftotfm.1 $(top_srcdir)/t1dotlessj/t1dotlessj.1 $(top_srcdir)/t1lint/t1lint.1 $(top_srcdir)/t1reencode/t1reencode.1 $(top_srcdir)/t1testpage/t1testpage.1 $(top_srcdir)/ttftotype42/ttftotype42.1
+	perl -pi -e 's/^\.ds V.*/.ds V $(VERSION)/;' $(top_srcdir)/cfftot1/cfftot1.1 $(top_srcdir)/mmafm/mmafm.1 $(top_srcdir)/mmpfb/mmpfb.1 $(top_srcdir)/otfinfo/otfinfo.1 $(top_srcdir)/otftotfm/otftotfm.1 $(top_srcdir)/t1dotlessj/t1dotlessj.1 $(top_srcdir)/t1lint/t1lint.1 $(top_srcdir)/t1rawafm/t1rawafm.1 $(top_srcdir)/t1reencode/t1reencode.1 $(top_srcdir)/t1testpage/t1testpage.1 $(top_srcdir)/ttftotype42/ttftotype42.1
 	perl -pi -e 's/^(\U$(PACKAGE)\E) [\d.ab]+$$/$$1 $(VERSION)/;' $(top_srcdir)/README
 	perl -pi -e 's/^Version: [\d.ab]+$$/Version: $(VERSION)/;' $(top_srcdir)/lcdf-typetools.spec
 
diff --git a/Build/source/texk/lcdf-typetools/NEWS b/Build/source/texk/lcdf-typetools/NEWS
index 346fe6cea54..7f217d8a3e7 100644
--- a/Build/source/texk/lcdf-typetools/NEWS
+++ b/Build/source/texk/lcdf-typetools/NEWS
@@ -1,5 +1,21 @@
 LCDF Typetools NEWS
 
+Version 2.88   8.Mar.2011
+
+* Warning reduction.
+
+
+Version 2.87   27.Jan.2011
+
+* Avoid double-free error in t1testpage.  Reported by Kurt Pfeifle.
+
+
+Version 2.86   16.Dec.2010
+
+* Support version 4 of the OpenType OS/2 table.  Reported by Thomas
+  Zumbrunn.
+
+
 Version 2.85   26.Sep.2010
 
 * Correct otftotfm bug with glyphlist.txt mappings like I_J.
diff --git a/Build/source/texk/lcdf-typetools/README b/Build/source/texk/lcdf-typetools/README
index ddc74b7b5af..b1b67bfab8c 100644
--- a/Build/source/texk/lcdf-typetools/README
+++ b/Build/source/texk/lcdf-typetools/README
@@ -1,4 +1,4 @@
-LCDF-TYPETOOLS 2.85
+LCDF-TYPETOOLS 2.88
 ===================
 
 USAGE
@@ -125,7 +125,7 @@ for a particular font.
 
 COPYRIGHT/LICENSE
 -----------------
-   All source code is Copyright (c) 1997-2010 Eddie Kohler.
+   All source code is Copyright (c) 1997-2011 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
diff --git a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1 b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1
index 7518f8e2515..d6f6f9f7980 100644
--- a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1
+++ b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1
@@ -1,4 +1,4 @@
-.ds V 2.85
+.ds V 2.88
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.cc b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.cc
index 9e5e7c1a009..945d0d606bc 100644
--- a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.cc
+++ b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.cc
@@ -1,6 +1,6 @@
 /* cfftot1.cc -- driver for translating CFF fonts to Type 1 fonts
  *
- * Copyright (c) 2002-2010 Eddie Kohler
+ * Copyright (c) 2002-2011 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
@@ -125,10 +125,16 @@ do_file(const char *infn, const char *outfn, PermString name, ErrorHandler *errh
 	errh->fatal("%s: empty file", infn);
     if (c == 1 || c == 'O') {
 	StringAccum sa(150000);
-	while (!feof(f)) {
-	    int forward = fread(sa.reserve(32768), 1, 32768, f);
-	    sa.adjust_length(forward);
-	}
+	int amt;
+	do {
+	    if (char *x = sa.reserve(32768)) {
+		amt = fread(x, 1, 32768, f);
+		sa.adjust_length(amt);
+	    } else
+		amt = 0;
+	} while (amt != 0);
+	if (!feof(f) || ferror(f))
+	    errh->lerror(infn, "%s", strerror(errno));
 	if (f != stdin)
 	    fclose(f);
 
@@ -210,7 +216,7 @@ main(int argc, char *argv[])
 
 	  case VERSION_OPT:
 	    printf("cfftot1 (LCDF typetools) %s\n", VERSION);
-	    printf("Copyright (C) 2002-2010 Eddie Kohler\n\
+	    printf("Copyright (C) 2002-2011 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 --git a/Build/source/texk/lcdf-typetools/cfftot1/maket1font.cc b/Build/source/texk/lcdf-typetools/cfftot1/maket1font.cc
index 68a35f62303..44541d5e208 100644
--- a/Build/source/texk/lcdf-typetools/cfftot1/maket1font.cc
+++ b/Build/source/texk/lcdf-typetools/cfftot1/maket1font.cc
@@ -1,6 +1,6 @@
 /* maket1font.{cc,hh} -- translate CFF fonts to Type 1 fonts
  *
- * Copyright (c) 2002-2010 Eddie Kohler
+ * Copyright (c) 2002-2011 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
diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure
index cc3a5214dde..5410039e0f6 100755
--- a/Build/source/texk/lcdf-typetools/configure
+++ b/Build/source/texk/lcdf-typetools/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for LCDF typetools for TeX Live 2.85.
+# Generated by GNU Autoconf 2.68 for LCDF typetools for TeX Live 2.88.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='LCDF typetools for TeX Live'
 PACKAGE_TARNAME='lcdf-typetools-for-tex-live'
-PACKAGE_VERSION='2.85'
-PACKAGE_STRING='LCDF typetools for TeX Live 2.85'
+PACKAGE_VERSION='2.88'
+PACKAGE_STRING='LCDF typetools for TeX Live 2.88'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1345,7 +1345,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures LCDF typetools for TeX Live 2.85 to adapt to many kinds of systems.
+\`configure' configures LCDF typetools for TeX Live 2.88 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1416,7 +1416,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of LCDF typetools for TeX Live 2.85:";;
+     short | recursive ) echo "Configuration of LCDF typetools for TeX Live 2.88:";;
    esac
   cat <<\_ACEOF
 
@@ -1551,7 +1551,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-LCDF typetools for TeX Live configure 2.85
+LCDF typetools for TeX Live configure 2.88
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2467,7 +2467,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by LCDF typetools for TeX Live $as_me 2.85, which was
+It was created by LCDF typetools for TeX Live $as_me 2.88, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -7820,7 +7820,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='lcdf-typetools-for-tex-live'
- VERSION='2.85'
+ VERSION='2.88'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13006,7 +13006,7 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 
 
-LCDF_TYPETOOLS_VERSION=2.85
+LCDF_TYPETOOLS_VERSION=2.88
 
 
 ac_config_headers="$ac_config_headers autoconf.h"
@@ -17658,7 +17658,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-LCDF typetools for TeX Live config.lt 2.85
+LCDF typetools for TeX Live config.lt 2.88
 configured by $0, generated by GNU Autoconf 2.68.
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -20413,7 +20413,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by LCDF typetools for TeX Live $as_me 2.85, which was
+This file was extended by LCDF typetools for TeX Live $as_me 2.88, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20479,7 +20479,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-LCDF typetools for TeX Live config.status 2.85
+LCDF typetools for TeX Live config.status 2.88
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac
index fdf2be5b8fb..48d8032cb32 100644
--- a/Build/source/texk/lcdf-typetools/configure.ac
+++ b/Build/source/texk/lcdf-typetools/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl Adapted for TeX Live.
-m4_define([lcdf_typetools_version], [2.85])[]dnl using unmodified lcdf-typetools source tree
+m4_define([lcdf_typetools_version], [2.88])[]dnl using unmodified lcdf-typetools source tree
 AC_INIT([LCDF typetools for TeX Live], lcdf_typetools_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([NEWS])
diff --git a/Build/source/texk/lcdf-typetools/configure.ac.orig b/Build/source/texk/lcdf-typetools/configure.ac.orig
index 6d3dbef27e6..3c393b80563 100644
--- a/Build/source/texk/lcdf-typetools/configure.ac.orig
+++ b/Build/source/texk/lcdf-typetools/configure.ac.orig
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([lcdf-typetools], [2.85])
+AC_INIT([lcdf-typetools], [2.88])
 AC_CONFIG_SRCDIR([NEWS])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER([autoconf.h])
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/clp.h b/Build/source/texk/lcdf-typetools/include/lcdf/clp.h
index 15476d52d35..233182d76dc 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/clp.h
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/clp.h
@@ -8,7 +8,7 @@ extern "C" {
 /* clp.h - Public interface to CLP.
  * This file is part of CLP, the command line parser package.
  *
- * Copyright (c) 1997-2010 Eddie Kohler, ekohler@gmail.com
+ * Copyright (c) 1997-2011 Eddie Kohler, ekohler@gmail.com
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/straccum.hh b/Build/source/texk/lcdf-typetools/include/lcdf/straccum.hh
index 59f5b118f9f..ec2a95bf036 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/straccum.hh
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/straccum.hh
@@ -215,7 +215,9 @@ class StringAccum { public:
      * In a frequent usage pattern, code calls reserve(), passing an upper
      * bound on the characters that could be written by a series of
      * operations.  After writing into the returned buffer, adjust_length() is
-     * called to account for the number of characters actually written. */
+     * called to account for the number of characters actually written.
+     *
+     * On failure, null is returned and errno is set to ENOMEM. */
     inline char *reserve(int n) {
 	assert(n >= 0);
 	if (_len + n <= _cap || grow(_len + n))
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/string.hh b/Build/source/texk/lcdf-typetools/include/lcdf/string.hh
index a6950833cf1..adbf6ef7904 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/string.hh
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/string.hh
@@ -600,11 +600,11 @@ class String { public:
 	memo_t **pprev;
 	memo_t *next;
 #endif
-	char real_data[1];	// but it is almost certainly more
+	char real_data[8];	// but it might be more or less
     };
 
     enum {
-	MEMO_SPACE = offsetof(memo_t, real_data)
+	MEMO_SPACE = sizeof(memo_t) - 8
     };
 
     struct rep_t {
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/vector.cc b/Build/source/texk/lcdf-typetools/include/lcdf/vector.cc
index 559d3766f2d..e1487f35c25 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/vector.cc
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/vector.cc
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1999-2000 Massachusetts Institute of Technology
  * Copyright (c) 2001-2003 International Computer Science Institute
- * Copyright (c) 1999-2010 Eddie Kohler
+ * Copyright (c) 1999-2011 Eddie Kohler
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.85-PATCHES/patch-02-warnings b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.85-PATCHES/patch-02-warnings
deleted file mode 100644
index a1d7d715c61..00000000000
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.85-PATCHES/patch-02-warnings
+++ /dev/null
@@ -1,35 +0,0 @@
-	Avoid some compiler warnings:
-		remove unused variables
-		add explicit cast for `-1' used as `uint32_t'
-
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.85.orig/liblcdf/straccum.cc lcdf-typetools-2.85/liblcdf/straccum.cc
---- lcdf-typetools-2.85.orig/liblcdf/straccum.cc	2010-09-06 20:55:31.000000000 +0200
-+++ lcdf-typetools-2.85/liblcdf/straccum.cc	2011-03-08 11:13:12.000000000 +0100
-@@ -139,7 +139,6 @@
-     else {
- 	unsigned char *old_s = _s;
- 	int old_len = _len;
--	int old_cap = _cap;
- 
- 	_s = 0;
- 	_len = 0;
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.85.orig/otftotfm/dvipsencoding.cc lcdf-typetools-2.85/otftotfm/dvipsencoding.cc
---- lcdf-typetools-2.85.orig/otftotfm/dvipsencoding.cc	2010-09-27 04:17:32.000000000 +0200
-+++ lcdf-typetools-2.85/otftotfm/dvipsencoding.cc	2011-03-08 11:24:32.000000000 +0100
-@@ -30,7 +30,7 @@
-        GLYPHLIST_USEMAP = GLYPHLIST_ALTERNATIVE,
-        U_EMPTYSLOT = 0xD801,
-        U_ALTSELECTOR = 0xD802 };
--static HashMap<String, uint32_t> glyphlist(-1);
-+static HashMap<String, uint32_t> glyphlist((uint32_t)-1);
- static Vector<uint32_t> glyphmap;
- static PermString::Initializer perm_initializer;
- PermString DvipsEncoding::dot_notdef(".notdef");
-@@ -162,7 +162,6 @@
- 		   // 16.Aug.2008: Some texnansx.enc have incorrect "Uni"
- 		   // prefix, but we might as well understand it.
- 		   || memcmp(component.data(), "Uni", 3) == 0)) {
--	int old_size = unis.size();
- 	for (const char *s = component.begin() + 3;
- 	     s < component.end();
- 	     s += 4)
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.85-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.88-PATCHES/ChangeLog
index 8601fbc8e66..9659147f0bf 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.85-PATCHES/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.88-PATCHES/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import lcdf-typetools-2.88.
+	* configure.ac, Makefile.am: Adapt.
+	* patch-02-warnings(removed): Now distributed.
+
 2011-03-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-02-warnings (new): Remove unused variables; add explicit
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.85-PATCHES/TL-Changes b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.88-PATCHES/TL-Changes
index 721bc117fe1..eba9e2e324d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.85-PATCHES/TL-Changes
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.88-PATCHES/TL-Changes
@@ -1,5 +1,5 @@
 Changes applied to the lcdf-typetools tree as obtained from:
-	http://www.lcdf.org/type/lcdf-typetools-2.85.tar.gz
+	http://www.lcdf.org/type/lcdf-typetools-2.88.tar.gz
 
 Removed:
 	depcomp
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools.spec b/Build/source/texk/lcdf-typetools/lcdf-typetools.spec
index 19f748cf496..fd0ac262e85 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools.spec
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools.spec
@@ -1,6 +1,6 @@
 Summary: Programs to manipulate OpenType and multiple-master fonts
 Name: lcdf-typetools
-Version: 2.85
+Version: 2.88
 Copyright: GPL
 Vendor: Little Cambridgeport Design Factory <http://www.lcdf.org/>
 Group: Utilities/Printing
diff --git a/Build/source/texk/lcdf-typetools/libefont/afm.cc b/Build/source/texk/lcdf-typetools/libefont/afm.cc
index 5a558c181c7..fc17d035dbb 100644
--- a/Build/source/texk/lcdf-typetools/libefont/afm.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/afm.cc
@@ -2,7 +2,7 @@
 
 /* afm.{cc,hh} -- Adobe Font Metrics files
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/afmparse.cc b/Build/source/texk/lcdf-typetools/libefont/afmparse.cc
index f6e2640ce57..e3cd55689b8 100644
--- a/Build/source/texk/lcdf-typetools/libefont/afmparse.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/afmparse.cc
@@ -2,7 +2,7 @@
 
 /* afmparse.{cc,hh} -- Adobe Font Metrics parsing
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/afmw.cc b/Build/source/texk/lcdf-typetools/libefont/afmw.cc
index 0d7a4a21d95..9e44cd7886d 100644
--- a/Build/source/texk/lcdf-typetools/libefont/afmw.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/afmw.cc
@@ -2,7 +2,7 @@
 
 /* afmw.{cc,hh} -- Adobe Font Metrics writing
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/amfm.cc b/Build/source/texk/lcdf-typetools/libefont/amfm.cc
index 77a3d83c6a7..687869c5137 100644
--- a/Build/source/texk/lcdf-typetools/libefont/amfm.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/amfm.cc
@@ -2,7 +2,7 @@
 
 /* amfm.{cc,hh} -- Adobe Multiple-Master Font Metrics
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/cff.cc b/Build/source/texk/lcdf-typetools/libefont/cff.cc
index 29c950a0932..2c2b304fc2f 100644
--- a/Build/source/texk/lcdf-typetools/libefont/cff.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/cff.cc
@@ -2,7 +2,7 @@
 
 /* cff.{cc,hh} -- Compact Font Format fonts
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/encoding.cc b/Build/source/texk/lcdf-typetools/libefont/encoding.cc
index 7547415138a..02933a8b879 100644
--- a/Build/source/texk/lcdf-typetools/libefont/encoding.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/encoding.cc
@@ -2,7 +2,7 @@
 
 /* encoding.{cc,hh} -- 8-bit encodings
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/findmet.cc b/Build/source/texk/lcdf-typetools/libefont/findmet.cc
index 4abf938d5fc..c6e2bafaa1d 100644
--- a/Build/source/texk/lcdf-typetools/libefont/findmet.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/findmet.cc
@@ -2,7 +2,7 @@
 
 /* findmet.{cc,hh} -- find font metrics
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/metrics.cc b/Build/source/texk/lcdf-typetools/libefont/metrics.cc
index a1d5af8a79d..264ecffd9a0 100644
--- a/Build/source/texk/lcdf-typetools/libefont/metrics.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/metrics.cc
@@ -2,7 +2,7 @@
 
 /* metrics.{cc,hh} -- generic font metrics
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/otf.cc b/Build/source/texk/lcdf-typetools/libefont/otf.cc
index 414f3f6ef86..1bc5c6c6cc9 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otf.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otf.cc
@@ -2,7 +2,7 @@
 
 /* otf.{cc,hh} -- OpenType font basics
  *
- * Copyright (c) 2002-2010 Eddie Kohler
+ * Copyright (c) 2002-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/otfcmap.cc b/Build/source/texk/lcdf-typetools/libefont/otfcmap.cc
index c918d08c02a..526a266a058 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otfcmap.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otfcmap.cc
@@ -2,7 +2,7 @@
 
 /* otfcmap.{cc,hh} -- OpenType cmap table
  *
- * Copyright (c) 2002-2010 Eddie Kohler
+ * Copyright (c) 2002-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/otfdata.cc b/Build/source/texk/lcdf-typetools/libefont/otfdata.cc
index 79052a716a4..bcb92549d49 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otfdata.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otfdata.cc
@@ -2,7 +2,7 @@
 
 /* otfdata.{cc,hh} -- OpenType bounds-checked string type
  *
- * Copyright (c) 2003-2010 Eddie Kohler
+ * Copyright (c) 2003-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/otfdescrip.cc b/Build/source/texk/lcdf-typetools/libefont/otfdescrip.cc
index 3e48f597f6c..1267df342a0 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otfdescrip.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otfdescrip.cc
@@ -1,6 +1,6 @@
 /* otfdescrip.cc -- descriptions for OpenType tags
  *
- * Copyright (c) 2002-2010 Eddie Kohler
+ * Copyright (c) 2002-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/otfgpos.cc b/Build/source/texk/lcdf-typetools/libefont/otfgpos.cc
index a66a4dd31f2..2fb9afbbc61 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otfgpos.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otfgpos.cc
@@ -2,7 +2,7 @@
 
 /* otfgpos.{cc,hh} -- OpenType GPOS table
  *
- * Copyright (c) 2003-2010 Eddie Kohler
+ * Copyright (c) 2003-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/otfgsub.cc b/Build/source/texk/lcdf-typetools/libefont/otfgsub.cc
index 5ecaa5209e1..dac053cca7d 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otfgsub.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otfgsub.cc
@@ -2,7 +2,7 @@
 
 /* otfgsub.{cc,hh} -- OpenType GSUB table
  *
- * Copyright (c) 2003-2010 Eddie Kohler
+ * Copyright (c) 2003-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/otfname.cc b/Build/source/texk/lcdf-typetools/libefont/otfname.cc
index 298ca0bd982..28d8320a83d 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otfname.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otfname.cc
@@ -2,7 +2,7 @@
 
 /* otfname.{cc,hh} -- OpenType name table
  *
- * Copyright (c) 2003-2010 Eddie Kohler
+ * Copyright (c) 2003-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/otfos2.cc b/Build/source/texk/lcdf-typetools/libefont/otfos2.cc
index 21d4e0cd8cb..fab565eeb0f 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otfos2.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otfos2.cc
@@ -2,7 +2,7 @@
 
 /* otfos2.{cc,hh} -- OpenType OS/2 table
  *
- * Copyright (c) 2005-2010 Eddie Kohler
+ * Copyright (c) 2005-2011 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
@@ -37,11 +37,10 @@ Os2::parse_header(ErrorHandler *errh)
 {
     // HEADER FORMAT:
     // USHORT	version
-    // USHORT	numTables
     if (HEADER_SIZE > _data.length())
 	return errh->error("OTF OS/2 too small for header"), -EFAULT;
-    if (_data.u16(0) > 3)
-	return errh->error("bad OS/2 version number"), -ERANGE;
+    if (_data.u16(0) > 4)
+	return errh->error("unexpected OS/2 version number %d", _data.u16(0)), -ERANGE;
     return 0;
 }
 
diff --git a/Build/source/texk/lcdf-typetools/libefont/otfpost.cc b/Build/source/texk/lcdf-typetools/libefont/otfpost.cc
index a217576ef6b..2630102154f 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otfpost.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otfpost.cc
@@ -2,7 +2,7 @@
 
 /* otfpost.{cc,hh} -- OpenType post table
  *
- * Copyright (c) 2006-2010 Eddie Kohler
+ * Copyright (c) 2006-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/pairop.cc b/Build/source/texk/lcdf-typetools/libefont/pairop.cc
index 22b86b29a47..5f015a41d84 100644
--- a/Build/source/texk/lcdf-typetools/libefont/pairop.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/pairop.cc
@@ -2,7 +2,7 @@
 
 /* pairop.{cc,hh} -- ligature/kern font metrics
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/psres.cc b/Build/source/texk/lcdf-typetools/libefont/psres.cc
index 6c691317ac1..5bdfd652263 100644
--- a/Build/source/texk/lcdf-typetools/libefont/psres.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/psres.cc
@@ -2,7 +2,7 @@
 
 /* psres.{cc,hh} -- PSres.upr files
  *
- * Copyright (c) 1999-2010 Eddie Kohler
+ * Copyright (c) 1999-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1bounds.cc b/Build/source/texk/lcdf-typetools/libefont/t1bounds.cc
index 2e26c22303e..bb85d26e9c3 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1bounds.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1bounds.cc
@@ -2,7 +2,7 @@
 
 /* t1bounds.{cc,hh} -- charstring bounding box finder
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1cs.cc b/Build/source/texk/lcdf-typetools/libefont/t1cs.cc
index d7c6652aeae..c2d9c6d752d 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1cs.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1cs.cc
@@ -2,7 +2,7 @@
 
 /* t1cs.{cc,hh} -- Type 1/2 charstrings
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1csgen.cc b/Build/source/texk/lcdf-typetools/libefont/t1csgen.cc
index ce21daa3d23..6e78d3ecf00 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1csgen.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1csgen.cc
@@ -2,7 +2,7 @@
 
 /* t1csgen.{cc,hh} -- Type 1 charstring generation
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1font.cc b/Build/source/texk/lcdf-typetools/libefont/t1font.cc
index feae7914827..1c92e41e249 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1font.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1font.cc
@@ -2,7 +2,7 @@
 
 /* t1font.{cc,hh} -- Type 1 font
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1fontskel.cc b/Build/source/texk/lcdf-typetools/libefont/t1fontskel.cc
index bb591777815..3e775182e20 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1fontskel.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1fontskel.cc
@@ -1,6 +1,6 @@
 /* t1fontskel.cc -- Type 1 font skeleton
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1interp.cc b/Build/source/texk/lcdf-typetools/libefont/t1interp.cc
index 5b093fe7c57..513330567f7 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1interp.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1interp.cc
@@ -2,7 +2,7 @@
 
 /* t1interp.{cc,hh} -- Type 1/2 charstring interpretation
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1item.cc b/Build/source/texk/lcdf-typetools/libefont/t1item.cc
index 5fa32404093..3c405b2f3f7 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1item.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1item.cc
@@ -2,7 +2,7 @@
 
 /* t1item.{cc,hh} -- items in a Type 1 font
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1mm.cc b/Build/source/texk/lcdf-typetools/libefont/t1mm.cc
index e95a3350774..413d5f1aa92 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1mm.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1mm.cc
@@ -2,7 +2,7 @@
 
 /* t1mm.{cc,hh} -- Type 1 multiple master font information
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1rw.cc b/Build/source/texk/lcdf-typetools/libefont/t1rw.cc
index c7008631b05..9a09a16a90d 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1rw.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1rw.cc
@@ -2,7 +2,7 @@
 
 /* t1rw.{cc,hh} -- Type 1 font reading and writing
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1unparser.cc b/Build/source/texk/lcdf-typetools/libefont/t1unparser.cc
index 38a22d60e06..363b5c3a746 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1unparser.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1unparser.cc
@@ -2,7 +2,7 @@
 
 /* t1unparser.{cc,hh} -- debug printing of Type 1 fonts
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/ttfcs.cc b/Build/source/texk/lcdf-typetools/libefont/ttfcs.cc
index c5b1d9bb437..422b7eb3299 100644
--- a/Build/source/texk/lcdf-typetools/libefont/ttfcs.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/ttfcs.cc
@@ -2,7 +2,7 @@
 
 /* ttfcs.{cc,hh} -- TrueType "charstring" emulation
  *
- * Copyright (c) 2006-2010 Eddie Kohler
+ * Copyright (c) 2006-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/ttfhead.cc b/Build/source/texk/lcdf-typetools/libefont/ttfhead.cc
index 869f9a80e4a..7aacb646778 100644
--- a/Build/source/texk/lcdf-typetools/libefont/ttfhead.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/ttfhead.cc
@@ -2,7 +2,7 @@
 
 /* ttfhead.{cc,hh} -- TrueType head table
  *
- * Copyright (c) 2007-2010 Eddie Kohler
+ * Copyright (c) 2007-2011 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
diff --git a/Build/source/texk/lcdf-typetools/libefont/ttfkern.cc b/Build/source/texk/lcdf-typetools/libefont/ttfkern.cc
index 59cee8c30dd..c4adecb8065 100644
--- a/Build/source/texk/lcdf-typetools/libefont/ttfkern.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/ttfkern.cc
@@ -2,7 +2,7 @@
 
 /* ttfkern.{cc,hh} -- TrueType kern table
  *
- * Copyright (c) 2009-2010 Eddie Kohler
+ * Copyright (c) 2009-2011 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
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/bezier.cc b/Build/source/texk/lcdf-typetools/liblcdf/bezier.cc
index d5c084e5e91..1ee46b39fcb 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/bezier.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/bezier.cc
@@ -2,7 +2,7 @@
 
 /* bezier.{cc,hh} -- cubic Bezier curves
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/clp.c b/Build/source/texk/lcdf-typetools/liblcdf/clp.c
index f4a52f72f1d..b4a70c538c4 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/clp.c
+++ b/Build/source/texk/lcdf-typetools/liblcdf/clp.c
@@ -2,7 +2,7 @@
 /* clp.c - Complete source code for CLP.
  * This file is part of CLP, the command line parser package.
  *
- * Copyright (c) 1997-2010 Eddie Kohler, ekohler@gmail.com
+ * Copyright (c) 1997-2011 Eddie Kohler, ekohler@gmail.com
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/error.cc b/Build/source/texk/lcdf-typetools/liblcdf/error.cc
index e756058d825..03b1e27269c 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/error.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/error.cc
@@ -4,7 +4,7 @@
  * Eddie Kohler
  *
  * Copyright (c) 1999-2000 Massachusetts Institute of Technology
- * Copyright (c) 2001-2010 Eddie Kohler
+ * Copyright (c) 2001-2011 Eddie Kohler
  * Copyright (c) 2008 Meraki, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/filename.cc b/Build/source/texk/lcdf-typetools/liblcdf/filename.cc
index 30c2fcf1096..6fb0f3079d9 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/filename.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/filename.cc
@@ -2,7 +2,7 @@
 
 /* filename.{cc,hh} -- filenames
  *
- * Copyright (c) 1999-2010 Eddie Kohler
+ * Copyright (c) 1999-2011 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
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/globmatch.cc b/Build/source/texk/lcdf-typetools/liblcdf/globmatch.cc
index 98ad98ed6c1..73861c0b672 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/globmatch.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/globmatch.cc
@@ -2,7 +2,7 @@
 
 /* globmatch.{cc,hh} -- glob_match() function for shell globbing
  *
- * Copyright (c) 2000-2010 Eddie Kohler
+ * Copyright (c) 2000-2011 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
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/landmark.cc b/Build/source/texk/lcdf-typetools/liblcdf/landmark.cc
index 18bf36b5c8a..b26714dda9f 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/landmark.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/landmark.cc
@@ -2,7 +2,7 @@
 
 /* landmark.{cc,hh} -- FILE:LINE type landmarks
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/permstr.cc b/Build/source/texk/lcdf-typetools/liblcdf/permstr.cc
index 41fb02e64c8..aea480a0c85 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/permstr.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/permstr.cc
@@ -2,7 +2,7 @@
 
 /* permstr.{cc,hh} -- permanent strings
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/point.cc b/Build/source/texk/lcdf-typetools/liblcdf/point.cc
index 49c375b3335..9da16b89781 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/point.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/point.cc
@@ -2,7 +2,7 @@
 
 /* point.{cc,hh} -- 2D points
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/slurper.cc b/Build/source/texk/lcdf-typetools/liblcdf/slurper.cc
index 2d8d822edd2..3afcb26d184 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/slurper.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/slurper.cc
@@ -2,7 +2,7 @@
 
 /* slurper.{cc,hh} -- reading from files a line at a time
  *
- * Copyright (c) 1998-2010 Eddie Kohler
+ * Copyright (c) 1998-2011 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
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/straccum.cc b/Build/source/texk/lcdf-typetools/liblcdf/straccum.cc
index 90c8366b125..df0380369c4 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/straccum.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/straccum.cc
@@ -4,7 +4,7 @@
  * Eddie Kohler
  *
  * Copyright (c) 1999-2000 Massachusetts Institute of Technology
- * Copyright (c) 2001-2010 Eddie Kohler
+ * Copyright (c) 2001-2011 Eddie Kohler
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,6 +25,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <errno.h>
 
 /** @class StringAccum
  * @brief Efficiently build up Strings from pieces.
@@ -70,8 +71,10 @@ bool
 StringAccum::grow(int want)
 {
     // can't append to out-of-memory strings
-    if (_cap < 0)
+    if (_cap < 0) {
+	errno = ENOMEM;
 	return false;
+    }
 
     int ncap = (_cap ? (_cap + MEMO_SPACE) * 2 : 128) - MEMO_SPACE;
     while (ncap <= want)
@@ -80,6 +83,7 @@ StringAccum::grow(int want)
     unsigned char *n = new unsigned char[ncap + MEMO_SPACE];
     if (!n) {
 	assign_out_of_memory();
+	errno = ENOMEM;
 	return false;
     }
     n += MEMO_SPACE;
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/string.cc b/Build/source/texk/lcdf-typetools/liblcdf/string.cc
index 6fbe7fbc76f..b221f7aefcd 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/string.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/string.cc
@@ -4,7 +4,7 @@
  * Eddie Kohler
  *
  * Copyright (c) 1999-2000 Massachusetts Institute of Technology
- * Copyright (c) 2001-2010 Eddie Kohler
+ * Copyright (c) 2001-2011 Eddie Kohler
  * Copyright (c) 2008-2009 Meraki, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/transform.cc b/Build/source/texk/lcdf-typetools/liblcdf/transform.cc
index b8b4b123379..b65978122dc 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/transform.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/transform.cc
@@ -2,7 +2,7 @@
 
 /* transform.{cc,hh} -- planar affine transformations
  *
- * Copyright (c) 2000-2010 Eddie Kohler
+ * Copyright (c) 2000-2011 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
diff --git a/Build/source/texk/lcdf-typetools/mmafm/main.cc b/Build/source/texk/lcdf-typetools/mmafm/main.cc
index 7b7e5b3544d..ba76226b208 100644
--- a/Build/source/texk/lcdf-typetools/mmafm/main.cc
+++ b/Build/source/texk/lcdf-typetools/mmafm/main.cc
@@ -1,6 +1,6 @@
 /* main.cc -- driver for mmafm program
  *
- * Copyright (c) 1997-2010 Eddie Kohler
+ * Copyright (c) 1997-2011 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 @@ main(int argc, char *argv[])
 
      case VERSION_OPT:
       printf("mmafm (LCDF typetools) %s\n", VERSION);
-      printf("Copyright (C) 1997-2010 Eddie Kohler\n\
+      printf("Copyright (C) 1997-2011 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 --git a/Build/source/texk/lcdf-typetools/mmafm/mmafm.1 b/Build/source/texk/lcdf-typetools/mmafm/mmafm.1
index dc23c0e9603..6265b9d6cfd 100644
--- a/Build/source/texk/lcdf-typetools/mmafm/mmafm.1
+++ b/Build/source/texk/lcdf-typetools/mmafm/mmafm.1
@@ -1,5 +1,5 @@
 .\" -*-nroff-*-
-.ds V 2.85
+.ds V 2.88
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/main.cc b/Build/source/texk/lcdf-typetools/mmpfb/main.cc
index f84b6b0685e..747e4757f56 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/main.cc
+++ b/Build/source/texk/lcdf-typetools/mmpfb/main.cc
@@ -1,6 +1,6 @@
 /* main.cc -- driver for mmpfb program
  *
- * Copyright (c) 1997-2010 Eddie Kohler
+ * Copyright (c) 1997-2011 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 @@ main(int argc, char *argv[])
 
      case VERSION_OPT:
       printf("mmpfb (LCDF typetools) %s\n", VERSION);
-      printf("Copyright (C) 1997-2010 Eddie Kohler\n\
+      printf("Copyright (C) 1997-2011 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 --git a/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1 b/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1
index 8e14b579ad1..34c1817c23c 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1
+++ b/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1
@@ -1,5 +1,5 @@
 .\" -*-nroff-*-
-.ds V 2.85
+.ds V 2.88
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/myfont.cc b/Build/source/texk/lcdf-typetools/mmpfb/myfont.cc
index 5caaa584976..25976ba8a86 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/myfont.cc
+++ b/Build/source/texk/lcdf-typetools/mmpfb/myfont.cc
@@ -1,6 +1,6 @@
 /* myfont.cc -- general multiple- to single-master conversion
  *
- * Copyright (c) 1997-2010 Eddie Kohler
+ * Copyright (c) 1997-2011 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
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/t1minimize.cc b/Build/source/texk/lcdf-typetools/mmpfb/t1minimize.cc
index 7ceecf1d9cb..1b589c24f9c 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/t1minimize.cc
+++ b/Build/source/texk/lcdf-typetools/mmpfb/t1minimize.cc
@@ -1,6 +1,6 @@
 /* t1minimize.cc -- make minimal copy of a Type 1 font
  *
- * Copyright (c) 2003-2010 Eddie Kohler
+ * Copyright (c) 2003-2011 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
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/t1rewrit.cc b/Build/source/texk/lcdf-typetools/mmpfb/t1rewrit.cc
index 22f35440213..25e657be2b4 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/t1rewrit.cc
+++ b/Build/source/texk/lcdf-typetools/mmpfb/t1rewrit.cc
@@ -1,6 +1,6 @@
 /* t1rewrit.cc -- routines for multiple- to single-master charstring conversion
  *
- * Copyright (c) 1997-2010 Eddie Kohler
+ * Copyright (c) 1997-2011 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
diff --git a/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1 b/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1
index 2c5b08b823e..344f1f3e283 100644
--- a/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1
+++ b/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1
@@ -1,5 +1,5 @@
 '\"t
-.ds V 2.85
+.ds V 2.88
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.cc b/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.cc
index 978be47c15b..db638fa1389 100644
--- a/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.cc
+++ b/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.cc
@@ -1,6 +1,6 @@
 /* otfinfo.cc -- driver for reporting information about OpenType fonts
  *
- * Copyright (c) 2003-2010 Eddie Kohler
+ * Copyright (c) 2003-2011 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
@@ -136,6 +136,7 @@ String
 read_file(String filename, ErrorHandler *errh, bool warning = false)
 {
     FILE *f;
+    int f_errno;
     if (!filename || filename == "-") {
 	filename = "<stdin>";
 	f = stdin;
@@ -143,21 +144,28 @@ read_file(String filename, ErrorHandler *errh, bool warning = false)
 	// Set the file mode to binary
 	_setmode(_fileno(f), _O_BINARY);
 #endif
-    } else if (!(f = fopen(filename.c_str(), "rb"))) {
-	errh->xmessage((warning ? errh->e_warning : errh->e_error) + ErrorHandler::make_landmark_anno(filename), strerror(errno));
+    } else {
+	f = fopen(filename.c_str(), "rb");
+	f_errno = errno;
+    }
+
+    String error_anno = (warning ? errh->e_warning : errh->e_error) + ErrorHandler::make_landmark_anno(filename);
+    if (!f) {
+	errh->xmessage(error_anno, strerror(f_errno));
 	return String();
     }
 
     StringAccum sa;
-    while (!feof(f)) {
+    int amt;
+    do {
 	if (char *x = sa.reserve(8192)) {
-	    int amt = fread(x, 1, 8192, f);
+	    amt = fread(x, 1, 8192, f);
 	    sa.adjust_length(amt);
-	} else {
-	    errh->xmessage((warning ? errh->e_warning : errh->e_error) + ErrorHandler::make_landmark_anno(filename), "Out of memory!");
-	    break;
-	}
-    }
+	} else
+	    amt = 0;
+    } while (amt != 0);
+    if (!feof(f) || ferror(f))
+	errh->xmessage(error_anno, strerror(errno));
     if (f != stdin)
 	fclose(f);
     return sa.take_string();
@@ -409,7 +417,7 @@ do_info(const OpenType::Font &otf, ErrorHandler *errh, ErrorHandler *result_errh
 	}
     }
 
-    if (errh->nerrors() == before_nerrors)
+    if (sa || errh->nerrors() == before_nerrors)
 	result_errh->message("%s", (sa ? sa.c_str() : "no information"));
 }
 
@@ -550,7 +558,7 @@ main(int argc, char *argv[])
 
 	  case VERSION_OPT:
 	    printf("otfinfo (LCDF typetools) %s\n", VERSION);
-	    printf("Copyright (C) 2003-2010 Eddie Kohler\n\
+	    printf("Copyright (C) 2003-2011 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 --git a/Build/source/texk/lcdf-typetools/otftotfm/automatic.cc b/Build/source/texk/lcdf-typetools/otftotfm/automatic.cc
index ee38173c762..9c503e072d4 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/automatic.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/automatic.cc
@@ -1,6 +1,6 @@
 /* automatic.{cc,hh} -- code for automatic mode and interfacing with kpathsea
  *
- * Copyright (c) 2003-2010 Eddie Kohler
+ * Copyright (c) 2003-2011 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
@@ -578,7 +578,7 @@ update_autofont_map(const String &fontname, String mapline, ErrorHandler *errh)
 
 	int fd = open(map_file.c_str(), O_RDWR | O_CREAT, 0666);
 	if (fd < 0)
-	    return errh->error("%s: %s", map_file.c_str(), strerror(errno));
+	    return errh->lerror(map_file, "%s", strerror(errno));
 	FILE *f = fdopen(fd, "r+");
 	// NB: also change encoding logic if you change this code
 
@@ -602,14 +602,16 @@ update_autofont_map(const String &fontname, String mapline, ErrorHandler *errh)
 
 	// read old data from map file
 	StringAccum sa;
-	while (!feof(f))
+	int amt;
+	do {
 	    if (char *x = sa.reserve(8192)) {
-		int amt = fread(x, 1, 8192, f);
+		amt = fread(x, 1, 8192, f);
 		sa.adjust_length(amt);
-	    } else {
-		fclose(f);
-		return errh->error("Out of memory!");
-	    }
+	    } else
+		amt = 0;
+	} while (amt != 0);
+	if (!feof(f))
+	    return errh->error("%s: %s", map_file.c_str(), strerror(errno));
 	String text = sa.take_string();
 
 	// add comment if necessary
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.cc b/Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.cc
index 7ff0dd3f49f..d81a6ed913e 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.cc
@@ -1,6 +1,6 @@
 /* dvipsencoding.{cc,hh} -- store a DVIPS encoding
  *
- * Copyright (c) 2003-2010 Eddie Kohler
+ * Copyright (c) 2003-2011 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
@@ -30,7 +30,7 @@ enum { GLYPHLIST_ALTERNATIVE = 0x40000000,
        GLYPHLIST_USEMAP = GLYPHLIST_ALTERNATIVE,
        U_EMPTYSLOT = 0xD801,
        U_ALTSELECTOR = 0xD802 };
-static HashMap<String, uint32_t> glyphlist((uint32_t)-1);
+static HashMap<String, uint32_t> glyphlist((uint32_t) -1);
 static Vector<uint32_t> glyphmap;
 static PermString::Initializer perm_initializer;
 PermString DvipsEncoding::dot_notdef(".notdef");
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.cc b/Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.cc
index 1e9ba03d27e..d8e3214862d 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.cc
@@ -1,6 +1,6 @@
 /* glyphfilter.{cc,hh} -- define subsets of characters
  *
- * Copyright (c) 2004-2010 Eddie Kohler
+ * Copyright (c) 2004-2011 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
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/kpseinterface.c b/Build/source/texk/lcdf-typetools/otftotfm/kpseinterface.c
index 0df5c25ed00..7616bf7aa44 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/kpseinterface.c
+++ b/Build/source/texk/lcdf-typetools/otftotfm/kpseinterface.c
@@ -1,6 +1,6 @@
 /* kpseinterface.{c,h} -- interface with the kpathsea library
  *
- * Copyright (c) 2003-2010 Eddie Kohler
+ * Copyright (c) 2003-2011 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
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/metrics.cc b/Build/source/texk/lcdf-typetools/otftotfm/metrics.cc
index 1b41e81964b..ecc6ee0f443 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/metrics.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/metrics.cc
@@ -1,6 +1,6 @@
 /* metrics.{cc,hh} -- an encoding during and after OpenType features
  *
- * Copyright (c) 2003-2010 Eddie Kohler
+ * Copyright (c) 2003-2011 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
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1 b/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1
index fbeb186950f..247f130d104 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1
+++ b/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1
@@ -1,5 +1,5 @@
 '\"t
-.ds V 2.85
+.ds V 2.88
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.cc b/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.cc
index e7207672e07..c19d9257caf 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.cc
@@ -1,6 +1,6 @@
 /* otftotfm.cc -- driver for translating OpenType fonts to TeX metrics
  *
- * Copyright (c) 2003-2010 Eddie Kohler
+ * Copyright (c) 2003-2011 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
@@ -956,14 +956,16 @@ write_encoding_file(String &filename, const String &encoding_name,
 
     // read old data from encoding file
     StringAccum sa;
-    while (!feof(f))
+    int amt;
+    do {
 	if (char *x = sa.reserve(8192)) {
-	    int amt = fread(x, 1, 8192, f);
+	    amt = fread(x, 1, 8192, f);
 	    sa.adjust_length(amt);
-	} else {
-	    fclose(f);
-	    return errh->error("Out of memory!");
-	}
+	} else
+	    amt = 0;
+    } while (amt != 0);
+    if (!feof(f) || ferror(f))
+	return errh->error("%s: %s", filename.c_str(), strerror(errno));
     String old_encodings = sa.take_string();
     bool created = (!old_encodings);
 
@@ -2092,7 +2094,7 @@ main(int argc, char *argv[])
 
 	  case VERSION_OPT:
 	    printf("otftotfm (LCDF typetools) %s\n", VERSION);
-	    printf("Copyright (C) 2002-2010 Eddie Kohler\n\
+	    printf("Copyright (C) 2002-2011 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 --git a/Build/source/texk/lcdf-typetools/otftotfm/secondary.cc b/Build/source/texk/lcdf-typetools/otftotfm/secondary.cc
index 3d040bc9a44..d7d33c351b7 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/secondary.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/secondary.cc
@@ -1,6 +1,6 @@
 /* secondary.{cc,hh} -- code for generating fake glyphs
  *
- * Copyright (c) 2003-2010 Eddie Kohler
+ * Copyright (c) 2003-2011 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
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/uniprop.cc b/Build/source/texk/lcdf-typetools/otftotfm/uniprop.cc
index e37d66e6599..8f522b9ed8f 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/uniprop.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/uniprop.cc
@@ -1,6 +1,6 @@
 /* uniprop.{cc,hh} -- code for Unicode character properties
  *
- * Copyright (c) 2004-2010 Eddie Kohler
+ * Copyright (c) 2004-2011 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
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/util.cc b/Build/source/texk/lcdf-typetools/otftotfm/util.cc
index e2769da429b..58095b48050 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/util.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/util.cc
@@ -1,6 +1,6 @@
 /* util.{cc,hh} -- various bits
  *
- * Copyright (c) 2003-2010 Eddie Kohler
+ * Copyright (c) 2003-2011 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
@@ -49,15 +49,16 @@ read_file(String filename, ErrorHandler *errh, bool warning)
     }
 
     StringAccum sa;
-    while (!feof(f)) {
+    int amt;
+    do {
 	if (char *x = sa.reserve(8192)) {
-	    int amt = fread(x, 1, 8192, f);
+	    amt = fread(x, 1, 8192, f);
 	    sa.adjust_length(amt);
-	} else {
-	    errh->xmessage((warning ? errh->e_warning : errh->e_error) + ErrorHandler::make_landmark_anno(filename), "Out of memory!");
-	    break;
-	}
-    }
+	} else
+	    amt = 0;
+    } while (amt != 0);
+    if (!feof(f) || ferror(f))
+	errh->xmessage((warning ? errh->e_warning : errh->e_error) + ErrorHandler::make_landmark_anno(filename), strerror(errno));
     if (f != stdin)
 	fclose(f);
     return sa.take_string();
@@ -231,15 +232,18 @@ shell_command_output(String cmdline, const String &input, ErrorHandler *errh, bo
 	errh->fatal("%<%s%>: %s", cmdline.c_str(), strerror(errno));
 
     StringAccum sa;
-    while (!feof(p) && !ferror(p) && sa.length() < 200000) {
-	int x = fread(sa.reserve(2048), 1, 2048, p);
-	if (x > 0)
-	    sa.adjust_length(x);
-	else if (x < 0 && errno != EAGAIN)
-	    errh->error("%<%s%>: %s", cmdline.c_str(), strerror(errno));
-    }
-    if (!feof(p) && !ferror(p))
+    int amt;
+    do {
+	if (char *x = sa.reserve(2048)) {
+	    amt = fread(x, 1, 2048, p);
+	    sa.adjust_length(amt);
+	} else
+	    amt = 0;
+    } while (amt != 0 && sa.length() < 200000);
+    if (amt != 0)
 	errh->warning("%<%s%> output too long, truncated", cmdline.c_str());
+    else if (!feof(p) || ferror(p))
+	errh->error("%<%s%>: %s", cmdline.c_str(), strerror(errno));
 
     fclose(f);
     pclose(p);
diff --git a/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1 b/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1
index a7c8496c74a..8584816fa7f 100644
--- a/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1
+++ b/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1
@@ -1,4 +1,4 @@
-.ds V 2.85
+.ds V 2.88
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc b/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc
index d267ae0980e..86d708f6ed7 100644
--- a/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc
+++ b/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc
@@ -1,6 +1,6 @@
 /* t1dotlessj.cc -- driver for creating dotlessj characters from Type 1 fonts
  *
- * Copyright (c) 2003-2010 Eddie Kohler
+ * Copyright (c) 2003-2011 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 @@ main(int argc, char *argv[])
 
 	  case VERSION_OPT:
 	    printf("t1dotlessj (LCDF typetools) %s\n", VERSION);
-	    printf("Copyright (C) 2003-2010 Eddie Kohler\n\
+	    printf("Copyright (C) 2003-2011 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 --git a/Build/source/texk/lcdf-typetools/t1lint/cscheck.cc b/Build/source/texk/lcdf-typetools/t1lint/cscheck.cc
index 5afa31c194b..486a5b3a399 100644
--- a/Build/source/texk/lcdf-typetools/t1lint/cscheck.cc
+++ b/Build/source/texk/lcdf-typetools/t1lint/cscheck.cc
@@ -1,6 +1,6 @@
 /* cscheck.{cc,hh} -- checking Type 1 charstrings for validity
  *
- * Copyright (c) 1999-2010 Eddie Kohler
+ * Copyright (c) 1999-2011 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
diff --git a/Build/source/texk/lcdf-typetools/t1lint/t1lint.1 b/Build/source/texk/lcdf-typetools/t1lint/t1lint.1
index 59f91cb6ad8..1367ca41c70 100644
--- a/Build/source/texk/lcdf-typetools/t1lint/t1lint.1
+++ b/Build/source/texk/lcdf-typetools/t1lint/t1lint.1
@@ -1,4 +1,4 @@
-.ds V 2.85
+.ds V 2.88
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/t1lint/t1lint.cc b/Build/source/texk/lcdf-typetools/t1lint/t1lint.cc
index 0ca81e928a4..1c083c909d7 100644
--- a/Build/source/texk/lcdf-typetools/t1lint/t1lint.cc
+++ b/Build/source/texk/lcdf-typetools/t1lint/t1lint.cc
@@ -1,6 +1,6 @@
 /* t1lint.cc -- driver for checking Type 1 fonts for validity
  *
- * Copyright (c) 1999-2010 Eddie Kohler
+ * Copyright (c) 1999-2011 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 @@ main(int argc, char *argv[])
 
      case VERSION_OPT:
       printf("t1lint (LCDF typetools) %s\n", VERSION);
-      printf("Copyright (C) 1999-2010 Eddie Kohler\n\
+      printf("Copyright (C) 1999-2011 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 --git a/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.1 b/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.1
index a2833471a09..459c8a8d88c 100644
--- a/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.1
+++ b/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.1
@@ -1,4 +1,4 @@
-.ds V 2.70
+.ds V 2.88
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.cc b/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.cc
index 7cd4249ee2d..e9176663bbf 100644
--- a/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.cc
+++ b/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.cc
@@ -1,6 +1,6 @@
 /* t1rawafm.cc -- driver for generating a raw AFM file from a font
  *
- * Copyright (c) 2008-2010 Eddie Kohler
+ * Copyright (c) 2008-2011 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
@@ -307,7 +307,7 @@ main(int argc, char *argv[])
 
 	  case VERSION_OPT:
 	    printf("t1rawafm (LCDF typetools) %s\n", VERSION);
-	    printf("Copyright (C) 2008-2010 Eddie Kohler\n\
+	    printf("Copyright (C) 2008-2011 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 --git a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1 b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1
index 1d1e50fa984..5b6c2e294f5 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1
+++ b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1
@@ -1,4 +1,4 @@
-.ds V 2.85
+.ds V 2.88
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc
index caba5dc0e33..b07857e1632 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc
+++ b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc
@@ -1,6 +1,6 @@
 /* t1reencode.cc -- driver for reencoding Type 1 fonts
  *
- * Copyright (c) 2005-2010 Eddie Kohler
+ * Copyright (c) 2005-2011 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 @@ main(int argc, char *argv[])
 
 	  case VERSION_OPT:
 	    printf("t1reencode (LCDF typetools) %s\n", VERSION);
-	    printf("Copyright (C) 1999-2010 Eddie Kohler\n\
+	    printf("Copyright (C) 1999-2011 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 --git a/Build/source/texk/lcdf-typetools/t1reencode/util.cc b/Build/source/texk/lcdf-typetools/t1reencode/util.cc
index 1666555e5ff..89f43391152 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/util.cc
+++ b/Build/source/texk/lcdf-typetools/t1reencode/util.cc
@@ -43,15 +43,16 @@ read_file(String filename, ErrorHandler *errh, bool warning)
     }
 
     StringAccum sa;
-    while (!feof(f)) {
+    int amt;
+    do {
 	if (char *x = sa.reserve(8192)) {
-	    int amt = fread(x, 1, 8192, f);
+	    amt = fread(x, 1, 8192, f);
 	    sa.adjust_length(amt);
-	} else {
-	    errh->xmessage((warning ? errh->e_warning : errh->e_error) + ErrorHandler::make_landmark_anno(filename), "Out of memory!");
-	    break;
-	}
-    }
+	} else
+	    amt = 0;
+    } while (amt != 0);
+    if (!feof(f) || ferror(f))
+	errh->xmessage((warning ? errh->e_warning : errh->e_error) + ErrorHandler::make_landmark_anno(filename), strerror(errno));
     if (f != stdin)
 	fclose(f);
     return sa.take_string();
diff --git a/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1 b/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1
index bd9338299b5..3323fc03b93 100644
--- a/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1
+++ b/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1
@@ -1,4 +1,4 @@
-.ds V 2.85
+.ds V 2.88
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc b/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc
index cc19692b6bd..81948e8bfd5 100644
--- a/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc
+++ b/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc
@@ -1,6 +1,6 @@
 /* t1testpage.cc -- driver for generating Type 1 fonts' test pages
  *
- * Copyright (c) 1999-2010 Eddie Kohler
+ * Copyright (c) 1999-2011 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
@@ -119,7 +119,6 @@ class Testpager { public:
     virtual void font(Type1Font *font, const Vector<PermString>& glyph_names) = 0;
     virtual void epilog() {
 	fprintf(_f, "%%%%EOF\n");
-	fclose(_f);
     }
   protected:
     FILE *_f;
@@ -625,7 +624,7 @@ main(int argc, char *argv[])
 
 	  case VERSION_OPT:
 	    printf("t1testpage (LCDF typetools) %s\n", VERSION);
-	    printf("Copyright (C) 1999-2010 Eddie Kohler\n\
+	    printf("Copyright (C) 1999-2011 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 --git a/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1 b/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1
index 1d834799e8b..fcaab74be29 100644
--- a/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1
+++ b/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1
@@ -1,4 +1,4 @@
-.ds V 2.85
+.ds V 2.88
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.cc b/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.cc
index caec39fd7f9..babbff15573 100644
--- a/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.cc
+++ b/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.cc
@@ -1,6 +1,6 @@
 /* ttftotype42.cc -- driver for translating TrueType fonts to Type 42 fonts
  *
- * Copyright (c) 2006-2010 Eddie Kohler
+ * Copyright (c) 2006-2011 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
@@ -180,10 +180,16 @@ do_file(const char *infn, const char *outfn, ErrorHandler *errh)
 	errh->fatal("%s: empty file", infn);
 
     StringAccum sa(150000);
-    while (!feof(f)) {
-	int forward = fread(sa.reserve(32768), 1, 32768, f);
-	sa.adjust_length(forward);
-    }
+    int amt;
+    do {
+	if (char *x = sa.reserve(32768)) {
+	    amt = fread(x, 1, 32768, f);
+	    sa.adjust_length(amt);
+	} else
+	    amt = 0;
+    } while (amt != 0);
+    if (!feof(f) || ferror(f))
+	errh->error("%s: %s", infn, strerror(errno));
     if (f != stdin)
 	fclose(f);
 
@@ -338,7 +344,7 @@ main(int argc, char *argv[])
 
 	  case VERSION_OPT:
 	    printf("ttftotype42 (LCDF typetools) %s\n", VERSION);
-	    printf("Copyright (C) 2006-2010 Eddie Kohler\n\
+	    printf("Copyright (C) 2006-2011 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");