200 files changed, 284 insertions, 255 deletions

diff --git a/Build/source/texk/lcdf-typetools/ChangeLog b/Build/source/texk/lcdf-typetools/ChangeLog
index 92424172495..65839057ef1 100644
--- a/Build/source/texk/lcdf-typetools/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import lcdf-typetools-2.99.
+	* version.ac: Adjusted.
+
 2013-09-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Drop ACLOCAL_AMFLAGS.
diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure
index a7b60f23dc4..ec6b860b83e 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.69 for LCDF typetools (TeX Live) 2.98.
+# Generated by GNU Autoconf 2.69 for LCDF typetools (TeX Live) 2.99.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,12 +590,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='LCDF typetools (TeX Live)'
 PACKAGE_TARNAME='lcdf-typetools--tex-live-'
-PACKAGE_VERSION='2.98'
-PACKAGE_STRING='LCDF typetools (TeX Live) 2.98'
+PACKAGE_VERSION='2.99'
+PACKAGE_STRING='LCDF typetools (TeX Live) 2.99'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="lcdf-typetools-2.98/NEWS"
+ac_unique_file="lcdf-typetools-2.99/NEWS"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1366,7 +1366,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 (TeX Live) 2.98 to adapt to many kinds of systems.
+\`configure' configures LCDF typetools (TeX Live) 2.99 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1437,7 +1437,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of LCDF typetools (TeX Live) 2.98:";;
+     short | recursive ) echo "Configuration of LCDF typetools (TeX Live) 2.99:";;
    esac
   cat <<\_ACEOF
 
@@ -1579,7 +1579,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-LCDF typetools (TeX Live) configure 2.98
+LCDF typetools (TeX Live) configure 2.99
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2739,7 +2739,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 (TeX Live) $as_me 2.98, which was
+It was created by LCDF typetools (TeX Live) $as_me 2.99, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8229,7 +8229,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='lcdf-typetools--tex-live-'
- VERSION='2.98'
+ VERSION='2.99'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13529,7 +13529,7 @@ fi
 
 
 
-LCDF_TYPETOOLS_VERSION=2.98
+LCDF_TYPETOOLS_VERSION=2.99
 
 
 ac_config_headers="$ac_config_headers autoconf.h"
@@ -19205,7 +19205,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-LCDF typetools (TeX Live) config.lt 2.98
+LCDF typetools (TeX Live) config.lt 2.99
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -20694,24 +20694,24 @@ _ACEOF
 
 
 
-LCDF_TYPETOOLS_TREE=lcdf-typetools-2.98
+LCDF_TYPETOOLS_TREE=lcdf-typetools-2.99
 
 
-ac_config_files="$ac_config_files Makefile lcdf-typetools-2.98/Makefile"
+ac_config_files="$ac_config_files Makefile lcdf-typetools-2.99/Makefile"
 
-ac_config_files="$ac_config_files lcdf-typetools-2.98/liblcdf/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.98/libefont/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.98/cfftot1/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.98/mmafm/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.98/mmpfb/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.98/otfinfo/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.98/otftotfm/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.98/t1dotlessj/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.98/t1lint/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.98/t1rawafm/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.98/t1reencode/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.98/t1testpage/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.98/ttftotype42/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.99/liblcdf/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.99/libefont/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.99/cfftot1/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.99/mmafm/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.99/mmpfb/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.99/otfinfo/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.99/otftotfm/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.99/t1dotlessj/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.99/t1lint/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.99/t1rawafm/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.99/t1reencode/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.99/t1testpage/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.99/ttftotype42/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -21265,7 +21265,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 (TeX Live) $as_me 2.98, which was
+This file was extended by LCDF typetools (TeX Live) $as_me 2.99, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21331,7 +21331,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 (TeX Live) config.status 2.98
+LCDF typetools (TeX Live) config.status 2.99
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -21844,20 +21844,20 @@ do
     "autoconf.h") CONFIG_HEADERS="$CONFIG_HEADERS autoconf.h" ;;
     "CXXLD.sh") CONFIG_COMMANDS="$CONFIG_COMMANDS CXXLD.sh" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "lcdf-typetools-2.98/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/Makefile" ;;
-    "lcdf-typetools-2.98/liblcdf/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/liblcdf/Makefile" ;;
-    "lcdf-typetools-2.98/libefont/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/libefont/Makefile" ;;
-    "lcdf-typetools-2.98/cfftot1/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/cfftot1/Makefile" ;;
-    "lcdf-typetools-2.98/mmafm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/mmafm/Makefile" ;;
-    "lcdf-typetools-2.98/mmpfb/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/mmpfb/Makefile" ;;
-    "lcdf-typetools-2.98/otfinfo/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/otfinfo/Makefile" ;;
-    "lcdf-typetools-2.98/otftotfm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/otftotfm/Makefile" ;;
-    "lcdf-typetools-2.98/t1dotlessj/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/t1dotlessj/Makefile" ;;
-    "lcdf-typetools-2.98/t1lint/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/t1lint/Makefile" ;;
-    "lcdf-typetools-2.98/t1rawafm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/t1rawafm/Makefile" ;;
-    "lcdf-typetools-2.98/t1reencode/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/t1reencode/Makefile" ;;
-    "lcdf-typetools-2.98/t1testpage/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/t1testpage/Makefile" ;;
-    "lcdf-typetools-2.98/ttftotype42/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/ttftotype42/Makefile" ;;
+    "lcdf-typetools-2.99/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.99/Makefile" ;;
+    "lcdf-typetools-2.99/liblcdf/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.99/liblcdf/Makefile" ;;
+    "lcdf-typetools-2.99/libefont/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.99/libefont/Makefile" ;;
+    "lcdf-typetools-2.99/cfftot1/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.99/cfftot1/Makefile" ;;
+    "lcdf-typetools-2.99/mmafm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.99/mmafm/Makefile" ;;
+    "lcdf-typetools-2.99/mmpfb/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.99/mmpfb/Makefile" ;;
+    "lcdf-typetools-2.99/otfinfo/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.99/otfinfo/Makefile" ;;
+    "lcdf-typetools-2.99/otftotfm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.99/otftotfm/Makefile" ;;
+    "lcdf-typetools-2.99/t1dotlessj/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.99/t1dotlessj/Makefile" ;;
+    "lcdf-typetools-2.99/t1lint/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.99/t1lint/Makefile" ;;
+    "lcdf-typetools-2.99/t1rawafm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.99/t1rawafm/Makefile" ;;
+    "lcdf-typetools-2.99/t1reencode/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.99/t1reencode/Makefile" ;;
+    "lcdf-typetools-2.99/t1testpage/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.99/t1testpage/Makefile" ;;
+    "lcdf-typetools-2.99/ttftotype42/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.99/ttftotype42/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/ChangeLog
index be18029d465..1d913f6c0aa 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/ChangeLog
@@ -1,3 +1,9 @@
+2013-00-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import lcdf-typetools-2.99.
+
+	* patch-20-TL-binary, patch-21-TL-paths, patch-30-W32TeX: Adapted.
+
 2013-04-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import lcdf-typetools-2.98.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/TL-Changes b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/TL-Changes
index 80d1c47900a..70fd3473645 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/TL-Changes
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-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.98.tar.gz
+	http://www.lcdf.org/type/lcdf-typetools-2.99.tar.gz
 
 Removed:
 	aclocal.m4
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/patch-20-TL-binary b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/patch-20-TL-binary
index 464df8f52f9..18148fac41a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/patch-20-TL-binary
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/patch-20-TL-binary
@@ -1,8 +1,8 @@
 	In TeX Live we treat all output files as binary.
 
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/liblcdf/filename.cc lcdf-typetools-2.98/liblcdf/filename.cc
---- lcdf-typetools-2.98.orig/liblcdf/filename.cc	2012-08-16 15:02:19.000000000 +0200
-+++ lcdf-typetools-2.98/liblcdf/filename.cc	2013-04-11 09:17:37.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.99.orig/liblcdf/filename.cc lcdf-typetools-2.99/liblcdf/filename.cc
+--- lcdf-typetools-2.99.orig/liblcdf/filename.cc	2013-08-13 22:18:57.000000000 +0200
++++ lcdf-typetools-2.99/liblcdf/filename.cc	2013-09-10 11:00:57.000000000 +0200
 @@ -126,5 +126,5 @@
      if (_actual || !_path)
  	return _actual;
@@ -10,9 +10,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
 -	return fopen(_path.c_str(), binary ? "wb" : "w");
 +	return fopen(_path.c_str(), "wb");
  }
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/otftotfm/automatic.cc lcdf-typetools-2.98/otftotfm/automatic.cc
---- lcdf-typetools-2.98.orig/otftotfm/automatic.cc	2012-11-21 23:30:45.000000000 +0100
-+++ lcdf-typetools-2.98/otftotfm/automatic.cc	2013-04-11 09:17:37.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.99.orig/otftotfm/automatic.cc lcdf-typetools-2.99/otftotfm/automatic.cc
+--- lcdf-typetools-2.99.orig/otftotfm/automatic.cc	2013-08-13 22:18:57.000000000 +0200
++++ lcdf-typetools-2.99/otftotfm/automatic.cc	2013-09-10 11:00:57.000000000 +0200
 @@ -311,7 +311,7 @@
      String ls_r = writable_texdir + "ls-R";
      bool success = false;
@@ -31,9 +31,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
  	    fd = fileno(f);
  	}
  
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/otftotfm/otftotfm.cc lcdf-typetools-2.98/otftotfm/otftotfm.cc
---- lcdf-typetools-2.98.orig/otftotfm/otftotfm.cc	2012-11-21 23:30:45.000000000 +0100
-+++ lcdf-typetools-2.98/otftotfm/otftotfm.cc	2013-04-11 09:17:37.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.99.orig/otftotfm/otftotfm.cc lcdf-typetools-2.99/otftotfm/otftotfm.cc
+--- lcdf-typetools-2.99.orig/otftotfm/otftotfm.cc	2013-08-13 22:19:58.000000000 +0200
++++ lcdf-typetools-2.99/otftotfm/otftotfm.cc	2013-09-10 11:00:57.000000000 +0200
 @@ -555,7 +555,7 @@
  
      if (verbose)
@@ -52,9 +52,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
  	fd = fileno(f);
      }
  
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/t1dotlessj/t1dotlessj.cc lcdf-typetools-2.98/t1dotlessj/t1dotlessj.cc
---- lcdf-typetools-2.98.orig/t1dotlessj/t1dotlessj.cc	2012-08-16 15:02:19.000000000 +0200
-+++ lcdf-typetools-2.98/t1dotlessj/t1dotlessj.cc	2013-04-11 09:17:37.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.99.orig/t1dotlessj/t1dotlessj.cc lcdf-typetools-2.99/t1dotlessj/t1dotlessj.cc
+--- lcdf-typetools-2.99.orig/t1dotlessj/t1dotlessj.cc	2013-08-13 22:20:06.000000000 +0200
++++ lcdf-typetools-2.99/t1dotlessj/t1dotlessj.cc	2013-09-10 11:00:57.000000000 +0200
 @@ -403,10 +403,10 @@
      // write it to output
      if (!outputf)
@@ -68,9 +68,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
  	Type1PFBWriter w(outputf);
  	dotless_font->write(w);
      } else {
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/t1rawafm/t1rawafm.cc lcdf-typetools-2.98/t1rawafm/t1rawafm.cc
---- lcdf-typetools-2.98.orig/t1rawafm/t1rawafm.cc	2012-11-21 23:30:45.000000000 +0100
-+++ lcdf-typetools-2.98/t1rawafm/t1rawafm.cc	2013-04-11 09:17:37.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.99.orig/t1rawafm/t1rawafm.cc lcdf-typetools-2.99/t1rawafm/t1rawafm.cc
+--- lcdf-typetools-2.99.orig/t1rawafm/t1rawafm.cc	2013-08-13 22:20:27.000000000 +0200
++++ lcdf-typetools-2.99/t1rawafm/t1rawafm.cc	2013-09-10 11:00:57.000000000 +0200
 @@ -352,6 +352,9 @@
  	if (!outf)
  	    errh->fatal("%s: %s", output_file, strerror(errno));
@@ -81,9 +81,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
  
      write_afm(outf, font);
  
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/t1reencode/t1reencode.cc lcdf-typetools-2.98/t1reencode/t1reencode.cc
---- lcdf-typetools-2.98.orig/t1reencode/t1reencode.cc	2012-11-21 23:30:45.000000000 +0100
-+++ lcdf-typetools-2.98/t1reencode/t1reencode.cc	2013-04-11 09:17:37.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.99.orig/t1reencode/t1reencode.cc lcdf-typetools-2.99/t1reencode/t1reencode.cc
+--- lcdf-typetools-2.99.orig/t1reencode/t1reencode.cc	2013-08-13 22:20:37.000000000 +0200
++++ lcdf-typetools-2.99/t1reencode/t1reencode.cc	2013-09-10 11:00:57.000000000 +0200
 @@ -1094,10 +1094,10 @@
  	if (!outf)
  	    errh->fatal("%s: %s", output_file, strerror(errno));
@@ -97,9 +97,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
  	Type1PFBWriter w(outf);
  	font->write(w);
      } else {
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/t1testpage/t1testpage.cc lcdf-typetools-2.98/t1testpage/t1testpage.cc
---- lcdf-typetools-2.98.orig/t1testpage/t1testpage.cc	2012-08-16 15:02:19.000000000 +0200
-+++ lcdf-typetools-2.98/t1testpage/t1testpage.cc	2013-04-11 09:17:37.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.99.orig/t1testpage/t1testpage.cc lcdf-typetools-2.99/t1testpage/t1testpage.cc
+--- lcdf-typetools-2.99.orig/t1testpage/t1testpage.cc	2013-08-13 22:20:45.000000000 +0200
++++ lcdf-typetools-2.99/t1testpage/t1testpage.cc	2013-09-10 11:00:57.000000000 +0200
 @@ -665,6 +665,9 @@
  	if (!outf)
  	    errh->fatal("%s: %s", output_file, strerror(errno));
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/patch-21-TL-paths b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/patch-21-TL-paths
index 3f7507c3dd7..5cedfc73e8e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/patch-21-TL-paths
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/patch-21-TL-paths
@@ -1,6 +1,6 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/otftotfm/automatic.cc lcdf-typetools-2.98/otftotfm/automatic.cc
---- lcdf-typetools-2.98.orig/otftotfm/automatic.cc	2013-04-11 09:17:37.000000000 +0200
-+++ lcdf-typetools-2.98/otftotfm/automatic.cc	2013-04-11 09:20:12.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.99.orig/otftotfm/automatic.cc lcdf-typetools-2.99/otftotfm/automatic.cc
+--- lcdf-typetools-2.99.orig/otftotfm/automatic.cc	2013-09-10 11:00:57.000000000 +0200
++++ lcdf-typetools-2.99/otftotfm/automatic.cc	2013-09-10 11:05:27.000000000 +0200
 @@ -321,7 +321,11 @@
      if (!success && writable_texdir.find_left('\'') < 0 && directory.find_left('\'') < 0 && file.find_left('\'') < 0) {
  	// look for mktexupd script
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/patch-30-W32TeX b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/patch-30-W32TeX
index 761a12d7113..bddeaacd6c3 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/patch-30-W32TeX
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/patch-30-W32TeX
@@ -1,6 +1,6 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/otftotfm/automatic.cc lcdf-typetools-2.98/otftotfm/automatic.cc
---- lcdf-typetools-2.98.orig/otftotfm/automatic.cc	2013-04-11 09:20:12.000000000 +0200
-+++ lcdf-typetools-2.98/otftotfm/automatic.cc	2013-04-11 09:21:35.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.99.orig/otftotfm/automatic.cc lcdf-typetools-2.99/otftotfm/automatic.cc
+--- lcdf-typetools-2.99.orig/otftotfm/automatic.cc	2013-09-10 11:05:27.000000000 +0200
++++ lcdf-typetools-2.99/otftotfm/automatic.cc	2013-09-10 11:06:31.000000000 +0200
 @@ -124,7 +124,18 @@
  static void
  find_writable_texdir(ErrorHandler *errh, const char *)
@@ -35,9 +35,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
  	    String command = "updmap --nomkmap --enable Map " + shell_quote(filename) + CMD_SEP " updmap";
  	    if (verbose)
  		command += " 1>&2";
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/otftotfm/kpseinterface.c lcdf-typetools-2.98/otftotfm/kpseinterface.c
---- lcdf-typetools-2.98.orig/otftotfm/kpseinterface.c	2012-08-16 15:02:19.000000000 +0200
-+++ lcdf-typetools-2.98/otftotfm/kpseinterface.c	2013-04-11 09:21:35.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.99.orig/otftotfm/kpseinterface.c lcdf-typetools-2.99/otftotfm/kpseinterface.c
+--- lcdf-typetools-2.99.orig/otftotfm/kpseinterface.c	2013-08-13 22:18:57.000000000 +0200
++++ lcdf-typetools-2.99/otftotfm/kpseinterface.c	2013-09-10 11:06:31.000000000 +0200
 @@ -11,24 +11,112 @@
   * Public License for more details.
   */
@@ -229,9 +229,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
 +    return (char *)pkpse_var_value(var);
 +}
 +#endif
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/otftotfm/kpseinterface.h lcdf-typetools-2.98/otftotfm/kpseinterface.h
---- lcdf-typetools-2.98.orig/otftotfm/kpseinterface.h	2010-05-30 02:00:16.000000000 +0200
-+++ lcdf-typetools-2.98/otftotfm/kpseinterface.h	2013-04-11 09:21:35.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.99.orig/otftotfm/kpseinterface.h lcdf-typetools-2.99/otftotfm/kpseinterface.h
+--- lcdf-typetools-2.99.orig/otftotfm/kpseinterface.h	2013-08-13 22:12:16.000000000 +0200
++++ lcdf-typetools-2.99/otftotfm/kpseinterface.h	2013-09-10 11:06:31.000000000 +0200
 @@ -13,6 +13,13 @@
  char* kpsei_find_file(const char* name, int format);
  void kpsei_set_debug_flags(unsigned flags);
@@ -246,9 +246,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
  #ifdef __cplusplus
  }
  #endif
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/otftotfm/otftotfm.cc lcdf-typetools-2.98/otftotfm/otftotfm.cc
---- lcdf-typetools-2.98.orig/otftotfm/otftotfm.cc	2013-04-11 09:17:37.000000000 +0200
-+++ lcdf-typetools-2.98/otftotfm/otftotfm.cc	2013-04-11 09:21:35.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.99.orig/otftotfm/otftotfm.cc lcdf-typetools-2.99/otftotfm/otftotfm.cc
+--- lcdf-typetools-2.99.orig/otftotfm/otftotfm.cc	2013-09-10 11:00:57.000000000 +0200
++++ lcdf-typetools-2.99/otftotfm/otftotfm.cc	2013-09-10 11:06:31.000000000 +0200
 @@ -1739,6 +1739,11 @@
      }
  }
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/7t.enc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/7t.enc
index 727f29e5f8c..727f29e5f8c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/7t.enc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/7t.enc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/COPYING b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/COPYING
index 67572846722..67572846722 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/COPYING
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/COPYING
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/INSTALL b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/INSTALL
index 95d84c820fb..95d84c820fb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/INSTALL
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/INSTALL
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/Makefile.am
index de0535c5252..de0535c5252 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/Makefile.in
index 9a1c08daf6f..36f5fd145d2 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/Makefile.in
@@ -78,7 +78,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = lcdf-typetools-2.98
+subdir = lcdf-typetools-2.99
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am COPYING \
 	INSTALL NEWS README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -418,9 +418,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.99/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.98/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.99/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/NEWS b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/NEWS
index d146d746d0c..31d09b53693 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/NEWS
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/NEWS
@@ -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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ONEWS b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/ONEWS
index 6bd9dc8c42d..6bd9dc8c42d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ONEWS
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/ONEWS
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/README b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/README
index 9451c0fb4ce..d9c7aaa409c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/README
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/README
@@ -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 @@ below.
 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 @@ automatically. For the automatic method, you must follow one of these 2
 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 @@ this directory.
 
 AUTHOR
 ------
-   Eddie Kohler, <kohler@cs.ucla.edu>
+   Eddie Kohler <ekohler@gmail.com>
    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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/autoconf.h.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/autoconf.h.in
index 353e9a004a9..353e9a004a9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/autoconf.h.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/autoconf.h.in
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/cfftot1/Makefile.am
index 81d5365b976..8f63f7a06e8 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/cfftot1/Makefile.am
@@ -9,7 +9,7 @@ cfftot1_SOURCES = cfftot1.cc \
 
 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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/cfftot1/Makefile.in
index d92a5f3cdc6..53cfae40056 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/cfftot1/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = cfftot1$(EXEEXT)
-subdir = lcdf-typetools-2.98/cfftot1
+subdir = lcdf-typetools-2.99/cfftot1
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -357,7 +357,7 @@ cfftot1_SOURCES = cfftot1.cc \
 	maket1font.cc maket1font.hh
 
 cfftot1_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = cfftot1.1
 all: all-am
@@ -373,9 +373,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/cfftot1/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.99/cfftot1/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.98/cfftot1/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.99/cfftot1/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/cfftot1.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/cfftot1/cfftot1.1
index f5d13744645..ed021682682 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/cfftot1.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/cfftot1/cfftot1.1
@@ -1,4 +1,4 @@
-.ds V 2.98
+.ds V 2.99
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/cfftot1.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/cfftot1/cfftot1.cc
index fe719e86d56..b0938909599 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/cfftot1.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/cfftot1/cfftot1.cc
@@ -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 @@ main(int argc, char *argv[])
 
 	  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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/maket1font.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/cfftot1/maket1font.cc
index 21b632e50d9..ff17b98b5d9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/maket1font.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/cfftot1/maket1font.cc
@@ -86,7 +86,9 @@ class MakeType1CharstringInterp::Subr { public:
 	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 @@ class MakeType1CharstringInterp::Subr { public:
     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 @@ MakeType1CharstringInterp::Subr::change_callers(Subr *caller, int pos, int lengt
 	    /* 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 @@ MakeType1CharstringInterp::Subr::unify(MakeType1CharstringInterp *mcsi)
 	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 @@ MakeType1CharstringInterp::Subr::unify(MakeType1CharstringInterp *mcsi)
 	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 @@ MakeType1CharstringInterp::Subr::unify(MakeType1CharstringInterp *mcsi)
     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 @@ MakeType1CharstringInterp::run(const CharstringProgram *program, Type1Font *outp
 	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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/maket1font.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/cfftot1/maket1font.hh
index 75f2527897f..75f2527897f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/maket1font.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/cfftot1/maket1font.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/configure.ac b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/configure.ac
index d08fc566265..1951e6da3b8 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/configure.ac
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/configure.ac
@@ -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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/glyphlist.txt b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/glyphlist.txt
index 0304ffc6674..0304ffc6674 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/glyphlist.txt
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/glyphlist.txt
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/glyphtounicode.tex b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/glyphtounicode.tex
index adaf8c82fc1..adaf8c82fc1 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/glyphtounicode.tex
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/glyphtounicode.tex
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/config.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/config.h
index 26a90a97b14..26a90a97b14 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/config.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/config.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/afm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/afm.hh
index f462e0079a4..f462e0079a4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/afm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/afm.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/afmparse.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/afmparse.hh
index c29d990ceab..c29d990ceab 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/afmparse.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/afmparse.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/afmw.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/afmw.hh
index 4eda701b688..4eda701b688 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/afmw.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/afmw.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/amfm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/amfm.hh
index 6cc1db90b6e..6cc1db90b6e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/amfm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/amfm.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/cff.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/cff.hh
index f965bd60c07..f965bd60c07 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/cff.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/cff.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/encoding.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/encoding.hh
index fd8d749acec..fd8d749acec 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/encoding.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/encoding.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/findmet.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/findmet.hh
index 74b3ecee141..74b3ecee141 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/findmet.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/findmet.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/metrics.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/metrics.hh
index 21a5f1796fb..21a5f1796fb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/metrics.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/metrics.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otf.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/otf.hh
index c7ea95a813d..c7ea95a813d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otf.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/otf.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfcmap.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/otfcmap.hh
index f95a3dc5c41..f95a3dc5c41 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfcmap.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/otfcmap.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfdata.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/otfdata.hh
index cdc004ce044..cdc004ce044 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfdata.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/otfdata.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfgpos.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/otfgpos.hh
index 84de5a2126b..84de5a2126b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfgpos.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/otfgpos.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfgsub.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/otfgsub.hh
index 98a2e0f945a..98a2e0f945a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfgsub.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/otfgsub.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfname.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/otfname.hh
index 42f08e614be..42f08e614be 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfname.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/otfname.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfos2.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/otfos2.hh
index db26b674522..db26b674522 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfos2.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/otfos2.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfpost.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/otfpost.hh
index 58651583fcb..58651583fcb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfpost.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/otfpost.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/pairop.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/pairop.hh
index bbb42073e44..bbb42073e44 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/pairop.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/pairop.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/psres.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/psres.hh
index ee302821fdb..ee302821fdb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/psres.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/psres.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1bounds.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/t1bounds.hh
index c5e50634f4c..c5e50634f4c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1bounds.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/t1bounds.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1cs.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/t1cs.hh
index 1a3f8e8f039..1a3f8e8f039 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1cs.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/t1cs.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1csgen.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/t1csgen.hh
index 226497a4a6b..226497a4a6b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1csgen.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/t1csgen.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1font.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/t1font.hh
index 4ec827e7e24..4ec827e7e24 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1font.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/t1font.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1interp.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/t1interp.hh
index 0b693b08c70..0b693b08c70 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1interp.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/t1interp.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1item.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/t1item.hh
index 056ba0e71d4..056ba0e71d4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1item.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/t1item.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1mm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/t1mm.hh
index bf2e81a00e9..bf2e81a00e9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1mm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/t1mm.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1rw.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/t1rw.hh
index d59f4089742..d59f4089742 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1rw.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/t1rw.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1unparser.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/t1unparser.hh
index 3a6e446e3c7..3a6e446e3c7 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1unparser.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/t1unparser.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/ttfcs.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/ttfcs.hh
index a2c04461872..a2c04461872 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/ttfcs.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/ttfcs.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/ttfhead.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/ttfhead.hh
index 2611a405b1b..2611a405b1b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/ttfhead.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/ttfhead.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/ttfkern.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/ttfkern.hh
index 717a72b6912..717a72b6912 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/ttfkern.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/efont/ttfkern.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/bezier.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/bezier.hh
index ebb93ce9aea..ebb93ce9aea 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/bezier.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/bezier.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/clp.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/clp.h
index 1b658a17190..1b658a17190 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/clp.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/clp.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/error.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/error.hh
index 2af4a77763d..2af4a77763d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/error.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/error.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/filename.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/filename.hh
index 9424a4c04fa..9424a4c04fa 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/filename.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/filename.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/globmatch.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/globmatch.hh
index 963035e0ead..963035e0ead 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/globmatch.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/globmatch.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/hashcode.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/hashcode.hh
index 53a0e428989..53a0e428989 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/hashcode.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/hashcode.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/hashmap.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/hashmap.cc
index 4851463c560..4851463c560 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/hashmap.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/hashmap.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/hashmap.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/hashmap.hh
index 3d4179e5b5f..3d4179e5b5f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/hashmap.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/hashmap.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/inttypes.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/inttypes.h
index b88e9e9faf0..b88e9e9faf0 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/inttypes.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/inttypes.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/landmark.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/landmark.hh
index 183ab936ee8..183ab936ee8 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/landmark.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/landmark.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/md5.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/md5.h
index 7d7f8641d23..7d7f8641d23 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/md5.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/md5.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/permstr.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/permstr.hh
index 684878ed464..684878ed464 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/permstr.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/permstr.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/point.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/point.hh
index aad59b53ccf..aad59b53ccf 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/point.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/point.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/slurper.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/slurper.hh
index 2e400d3c3f2..2e400d3c3f2 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/slurper.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/slurper.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/straccum.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/straccum.hh
index f62c2984978..f62c2984978 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/straccum.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/straccum.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/string.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/string.hh
index ad83d7cb496..ad83d7cb496 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/string.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/string.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/strtonum.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/strtonum.h
index ee8745a4a42..ee8745a4a42 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/strtonum.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/strtonum.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/transform.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/transform.hh
index 496658a4911..496658a4911 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/transform.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/transform.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/vector.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/vector.cc
index 8ad11c18810..8ad11c18810 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/vector.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/vector.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/vector.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/vector.hh
index 86e64e238ba..86e64e238ba 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/vector.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/include/lcdf/vector.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/lcdf-typetools.spec b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/lcdf-typetools.spec
index f8f235104f1..69ffe86b26a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/lcdf-typetools.spec
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/lcdf-typetools.spec
@@ -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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/Makefile.am
index eb09a9686ad..a783e28e640 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/Makefile.am
@@ -40,4 +40,4 @@ libefont_a_SOURCES = \
 libefont_a_LIBADD = @TEMPLATE_OBJS@
 CLEANFILES = @TEMPLATE_OBJS@
 
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/Makefile.in
index d165a330978..16f1e848ce0 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/Makefile.in
@@ -78,7 +78,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = lcdf-typetools-2.98/libefont
+subdir = lcdf-typetools-2.99/libefont
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -355,7 +355,7 @@ libefont_a_SOURCES = \
 
 libefont_a_LIBADD = @TEMPLATE_OBJS@
 CLEANFILES = @TEMPLATE_OBJS@
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
 all: all-am
 
 .SUFFIXES:
@@ -369,9 +369,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/libefont/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.99/libefont/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.98/libefont/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.99/libefont/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/afm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/afm.cc
index 9705f91c97f..9705f91c97f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/afm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/afm.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/afmparse.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/afmparse.cc
index 313b63ec362..313b63ec362 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/afmparse.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/afmparse.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/afmw.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/afmw.cc
index 20840be1332..20840be1332 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/afmw.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/afmw.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/amfm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/amfm.cc
index b38532d55fb..b38532d55fb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/amfm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/amfm.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/cff.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/cff.cc
index 822d57ec94d..73ccdb25303 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/cff.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/cff.cc
@@ -541,7 +541,7 @@ Cff::font(PermString font_name, ErrorHandler *errh)
     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 @@ Cff::Charset::assign(const Cff *cff, int pos, int nglyphs, int max_sid, ErrorHan
     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 @@ Cff::Dict::check(bool is_private, ErrorHandler *errh, const char *dict_name) con
 	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 @@ Cff::Dict::check(bool is_private, ErrorHandler *errh, const char *dict_name) con
 
 	  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 @@ Cff::Dict::check(bool is_private, ErrorHandler *errh, const char *dict_name) con
 	    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 @@ Cff::Dict::check(bool is_private, ErrorHandler *errh, const char *dict_name) con
 
 	// 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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/encoding.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/encoding.cc
index a55ecc4db25..a55ecc4db25 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/encoding.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/encoding.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/findmet.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/findmet.cc
index aa5b8167156..aa5b8167156 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/findmet.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/findmet.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/metrics.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/metrics.cc
index 0dd308056e2..0dd308056e2 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/metrics.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/metrics.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otf.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/otf.cc
index 187dd10dd92..93dc1e7e81b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otf.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/otf.cc
@@ -76,7 +76,7 @@ Font::parse_header(ErrorHandler *errh)
 	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 @@ ScriptList::features(Tag script, Tag langsys, int &required_fid, Vector<int> &fi
     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 @@ FeatureList::params(int fid, int length, ErrorHandler *errh, bool old_style_offs
     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 @@ FeatureList::lookups(int fid, Vector<int> &results, ErrorHandler *errh, bool cle
     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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfcmap.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/otfcmap.cc
index d7a74c85968..d7a74c85968 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfcmap.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/otfcmap.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfdata.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/otfdata.cc
index 46c7c885c59..46c7c885c59 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfdata.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/otfdata.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfdescrip.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/otfdescrip.cc
index 307f0b3cb61..307f0b3cb61 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfdescrip.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/otfdescrip.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfgpos.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/otfgpos.cc
index eb477256c5c..eb477256c5c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfgpos.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/otfgpos.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfgsub.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/otfgsub.cc
index 10597847270..10597847270 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfgsub.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/otfgsub.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfname.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/otfname.cc
index ee2151b92ca..ee2151b92ca 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfname.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/otfname.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfos2.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/otfos2.cc
index 9831fb49543..9831fb49543 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfos2.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/otfos2.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfpost.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/otfpost.cc
index eb45845d468..eb45845d468 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfpost.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/otfpost.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/pairop.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/pairop.cc
index 5b64be1ac41..5b64be1ac41 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/pairop.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/pairop.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/psres.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/psres.cc
index 2136a6b3237..2136a6b3237 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/psres.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/psres.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1bounds.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1bounds.cc
index ccea404d4d3..ccea404d4d3 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1bounds.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1bounds.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1cs.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1cs.cc
index 4db3afa5a9d..4db3afa5a9d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1cs.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1cs.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1csgen.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1csgen.cc
index b24c8f21307..b24c8f21307 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1csgen.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1csgen.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1font.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1font.cc
index 05b97fa346e..05b97fa346e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1font.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1font.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1fontskel.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1fontskel.cc
index e5e48023348..e5e48023348 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1fontskel.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1fontskel.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1interp.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1interp.cc
index 7b607bb407d..7b607bb407d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1interp.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1interp.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1item.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1item.cc
index 5e169b66f13..5e169b66f13 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1item.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1item.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1mm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1mm.cc
index 404335a8f20..404335a8f20 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1mm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1mm.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1rw.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1rw.cc
index 846297e6b67..846297e6b67 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1rw.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1rw.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1unparser.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1unparser.cc
index 993253deec9..993253deec9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1unparser.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/t1unparser.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/ttfcs.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/ttfcs.cc
index d427cf17bcc..d427cf17bcc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/ttfcs.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/ttfcs.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/ttfhead.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/ttfhead.cc
index 5be8676c64c..5be8676c64c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/ttfhead.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/ttfhead.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/ttfkern.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/ttfkern.cc
index 824922457ac..824922457ac 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/ttfkern.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/libefont/ttfkern.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/Makefile.am
index 0cc406d4e70..f096b1c41bf 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/Makefile.am
@@ -26,6 +26,6 @@ endif FIXLIBC
 liblcdf_a_LIBADD = @TEMPLATE_OBJS@
 CLEANFILES = @TEMPLATE_OBJS@
 
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
 
 EXTRA_DIST = fixlibc.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/Makefile.in
index 8c83bb1e4a8..5c19bd59f17 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @FIXLIBC_TRUE@am__append_1 = fixlibc.c
-subdir = lcdf-typetools-2.98/liblcdf
+subdir = lcdf-typetools-2.99/liblcdf
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -343,7 +343,7 @@ liblcdf_a_SOURCES = bezier.cc clp.c error.cc filename.cc globmatch.cc \
 	string.cc strtonum.c transform.cc vectorv.cc $(am__append_1)
 liblcdf_a_LIBADD = @TEMPLATE_OBJS@
 CLEANFILES = @TEMPLATE_OBJS@
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
 EXTRA_DIST = fixlibc.c
 all: all-am
 
@@ -358,9 +358,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/liblcdf/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.99/liblcdf/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.98/liblcdf/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.99/liblcdf/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/bezier.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/bezier.cc
index 95c8d8b9fb0..95c8d8b9fb0 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/bezier.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/bezier.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/clp.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/clp.c
index b8aaafd2096..b8aaafd2096 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/clp.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/clp.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/error.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/error.cc
index cfef2f07de9..cfef2f07de9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/error.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/error.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/filename.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/filename.cc
index 396e81cd3c5..396e81cd3c5 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/filename.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/filename.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/fixlibc.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/fixlibc.c
index d41238daf85..d41238daf85 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/fixlibc.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/fixlibc.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/globmatch.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/globmatch.cc
index dcd7afc135c..dcd7afc135c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/globmatch.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/globmatch.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/landmark.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/landmark.cc
index 68511055ddc..68511055ddc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/landmark.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/landmark.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/md5.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/md5.c
index 557a39bef95..557a39bef95 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/md5.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/md5.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/permstr.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/permstr.cc
index c6aebab31e7..c6aebab31e7 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/permstr.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/permstr.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/point.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/point.cc
index 8b23fdcb571..8b23fdcb571 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/point.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/point.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/slurper.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/slurper.cc
index e089617705d..e089617705d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/slurper.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/slurper.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/straccum.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/straccum.cc
index f31b9e216fc..f31b9e216fc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/straccum.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/straccum.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/string.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/string.cc
index ec14c378f20..ec14c378f20 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/string.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/string.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/strtonum.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/strtonum.c
index 36898c5a7ad..36898c5a7ad 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/strtonum.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/strtonum.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/transform.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/transform.cc
index 5eb0ff58728..5eb0ff58728 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/transform.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/transform.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/vectorv.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/vectorv.cc
index f5f12b52c90..f5f12b52c90 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/vectorv.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/liblcdf/vectorv.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/m4/lcdf-typetools.m4 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/m4/lcdf-typetools.m4
index 7aaff4c33af..7aaff4c33af 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/m4/lcdf-typetools.m4
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/m4/lcdf-typetools.m4
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmafm/Makefile.am
index 6438927eb5f..acabc098098 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmafm/Makefile.am
@@ -8,7 +8,7 @@ mmafm_SOURCES = main.cc
 
 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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmafm/Makefile.in
index 0f8c75c1848..c637c5fd70d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmafm/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = mmafm$(EXEEXT)
-subdir = lcdf-typetools-2.98/mmafm
+subdir = lcdf-typetools-2.99/mmafm
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -337,7 +337,7 @@ AUTOMAKE_OPTIONS = foreign
 man_MANS = mmafm.1
 mmafm_SOURCES = main.cc
 mmafm_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = mmafm.1
 all: all-am
@@ -353,9 +353,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/mmafm/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.99/mmafm/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.98/mmafm/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.99/mmafm/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/main.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmafm/main.cc
index 99e320f94bd..d3dd50b20b6 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/main.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmafm/main.cc
@@ -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 @@ main(int argc, char *argv[])
 
      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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/mmafm.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmafm/mmafm.1
index d70a6b8743b..5ff2e3729c7 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/mmafm.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmafm/mmafm.1
@@ -1,5 +1,5 @@
 .\" -*-nroff-*-
-.ds V 2.98
+.ds V 2.99
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/Makefile.am
index 527b7d14937..d1b8d0370d1 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/Makefile.am
@@ -11,7 +11,7 @@ mmpfb_SOURCES = myfont.cc myfont.hh \
 
 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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/Makefile.in
index a89dab7a3c7..7d1f6e65c1f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = mmpfb$(EXEEXT)
-subdir = lcdf-typetools-2.98/mmpfb
+subdir = lcdf-typetools-2.99/mmpfb
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -360,7 +360,7 @@ mmpfb_SOURCES = myfont.cc myfont.hh \
 	t1rewrit.cc t1rewrit.hh
 
 mmpfb_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = mmpfb.1
 all: all-am
@@ -376,9 +376,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/mmpfb/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.99/mmpfb/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.98/mmpfb/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.99/mmpfb/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/main.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/main.cc
index 1d685f18eff..71d4ff3d45d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/main.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/main.cc
@@ -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 @@ main(int argc, char *argv[])
 
      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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/mmpfb.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/mmpfb.1
index e2f20aa9b7d..5d69ba84492 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/mmpfb.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/mmpfb.1
@@ -1,5 +1,5 @@
 .\" -*-nroff-*-
-.ds V 2.98
+.ds V 2.99
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/myfont.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/myfont.cc
index 1325b44d3e6..1325b44d3e6 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/myfont.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/myfont.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/myfont.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/myfont.hh
index ffe35668f94..ffe35668f94 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/myfont.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/myfont.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1minimize.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/t1minimize.cc
index 2c4b1bcb015..2c4b1bcb015 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1minimize.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/t1minimize.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1minimize.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/t1minimize.hh
index a5c3ea04906..a5c3ea04906 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1minimize.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/t1minimize.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1rewrit.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/t1rewrit.cc
index 86382ca239b..86382ca239b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1rewrit.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/t1rewrit.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1rewrit.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/t1rewrit.hh
index eac9d75beeb..eac9d75beeb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1rewrit.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/mmpfb/t1rewrit.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otfinfo/Makefile.am
index 837eb83ef0f..b2f3dbfa52a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otfinfo/Makefile.am
@@ -10,7 +10,7 @@ otfinfo_SOURCES = \
 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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otfinfo/Makefile.in
index 58bba61c5e5..f4b2da9f0da 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otfinfo/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = otfinfo$(EXEEXT)
-subdir = lcdf-typetools-2.98/otfinfo
+subdir = lcdf-typetools-2.99/otfinfo
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -339,7 +339,7 @@ otfinfo_SOURCES = \
 
 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
 all: all-am
@@ -355,9 +355,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/otfinfo/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.99/otfinfo/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.98/otfinfo/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.99/otfinfo/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/otfinfo.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otfinfo/otfinfo.1
index 746e14dd8b5..984808ff5ad 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/otfinfo.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otfinfo/otfinfo.1
@@ -1,5 +1,5 @@
 '\"t
-.ds V 2.98
+.ds V 2.99
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/otfinfo.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otfinfo/otfinfo.cc
index 74d340c3d45..a4af422a88a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/otfinfo.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otfinfo/otfinfo.cc
@@ -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 @@ main(int argc, char *argv[])
 
 	  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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/Makefile.am
index d75c552f12e..7bbb038146d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/Makefile.am
@@ -18,14 +18,14 @@ EXTRA_otftotfm_SOURCES = kpseinterface.c kpseinterface.h
 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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/Makefile.in
index ce6131e27d1..f23eaa14b5e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/Makefile.in
@@ -83,7 +83,7 @@ bin_PROGRAMS = otftotfm$(EXEEXT)
 @have_kpathsea_TRUE@am__append_2 = $(KPATHSEA_INCLUDES)
 @have_kpathsea_TRUE@am__append_3 = $(KPATHSEA_LIBS)
 @have_kpathsea_TRUE@am__append_4 = $(KPATHSEA_DEPEND)
-subdir = lcdf-typetools-2.98/otftotfm
+subdir = lcdf-typetools-2.99/otftotfm
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -376,7 +376,7 @@ otftotfm_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a \
 	$(am__append_3)
 otftotfm_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a \
 	$(am__append_4)
-INCLUDES = -I$(srcdir)/../include $(am__append_2)
+AM_CPPFLAGS = -I$(srcdir)/../include $(am__append_2)
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = otftotfm.1
 all: all-am
@@ -392,9 +392,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/otftotfm/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.99/otftotfm/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.98/otftotfm/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.99/otftotfm/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/automatic.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/automatic.cc
index aae70b16b58..aae70b16b58 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/automatic.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/automatic.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/automatic.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/automatic.hh
index 4c973347715..4c973347715 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/automatic.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/automatic.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/dvipsencoding.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/dvipsencoding.cc
index 870c7d02885..870c7d02885 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/dvipsencoding.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/dvipsencoding.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/dvipsencoding.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/dvipsencoding.hh
index a80631c3038..a80631c3038 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/dvipsencoding.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/dvipsencoding.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/glyphfilter.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/glyphfilter.cc
index a4120660bfc..a4120660bfc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/glyphfilter.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/glyphfilter.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/glyphfilter.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/glyphfilter.hh
index 753e5714d5c..753e5714d5c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/glyphfilter.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/glyphfilter.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/kpseinterface.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/kpseinterface.c
index e42b81fa24a..e42b81fa24a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/kpseinterface.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/kpseinterface.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/kpseinterface.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/kpseinterface.h
index c822a24fa1e..c822a24fa1e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/kpseinterface.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/kpseinterface.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/metrics.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/metrics.cc
index b4427f3f6fa..b4427f3f6fa 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/metrics.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/metrics.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/metrics.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/metrics.hh
index b032e6b348f..b032e6b348f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/metrics.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/metrics.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/otftotfm.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/otftotfm.1
index 96e9ac64383..da0ea1ac205 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/otftotfm.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/otftotfm.1
@@ -1,5 +1,5 @@
 '\"t
-.ds V 2.98
+.ds V 2.99
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/otftotfm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/otftotfm.cc
index e36e1c63edf..cc45f9b6f81 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/otftotfm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/otftotfm.cc
@@ -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
@@ -2131,7 +2131,7 @@ main(int argc, char *argv[])
 
 	  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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/otftotfm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/otftotfm.hh
index 67c0e0b32ab..67c0e0b32ab 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/otftotfm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/otftotfm.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/secondary.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/secondary.cc
index a951bc7d304..a951bc7d304 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/secondary.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/secondary.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/secondary.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/secondary.hh
index c349a48dcf6..c349a48dcf6 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/secondary.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/secondary.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/uniprop.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/uniprop.cc
index 228661394a9..228661394a9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/uniprop.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/uniprop.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/uniprop.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/uniprop.hh
index 4dd6b135eb7..4dd6b135eb7 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/uniprop.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/uniprop.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/util.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/util.cc
index b50ff9566d3..b50ff9566d3 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/util.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/util.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/util.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/util.hh
index a3e42b63d9f..a3e42b63d9f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/util.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/util.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1dotlessj/Makefile.am
index 9b9b16ca77b..41360807e13 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1dotlessj/Makefile.am
@@ -8,7 +8,7 @@ t1dotlessj_SOURCES = t1dotlessj.cc
 
 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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1dotlessj/Makefile.in
index 3ea3a0ebe34..ce04566802e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1dotlessj/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1dotlessj$(EXEEXT)
-subdir = lcdf-typetools-2.98/t1dotlessj
+subdir = lcdf-typetools-2.99/t1dotlessj
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -337,7 +337,7 @@ AUTOMAKE_OPTIONS = foreign
 man_MANS = t1dotlessj.1
 t1dotlessj_SOURCES = t1dotlessj.cc
 t1dotlessj_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = t1dotlessj.1
 all: all-am
@@ -353,9 +353,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1dotlessj/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.99/t1dotlessj/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1dotlessj/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.99/t1dotlessj/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/t1dotlessj.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1dotlessj/t1dotlessj.1
index b51f210dcb2..18444da4a6e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/t1dotlessj.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1dotlessj/t1dotlessj.1
@@ -1,4 +1,4 @@
-.ds V 2.98
+.ds V 2.99
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/t1dotlessj.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1dotlessj/t1dotlessj.cc
index aa1bae00aee..fb66c8f5a67 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/t1dotlessj.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1dotlessj/t1dotlessj.cc
@@ -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 @@ main(int argc, char *argv[])
 
 	  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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1lint/Makefile.am
index 42cd92087d4..c76b5671fe5 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1lint/Makefile.am
@@ -9,7 +9,7 @@ t1lint_SOURCES = cscheck.hh cscheck.cc \
 
 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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1lint/Makefile.in
index 18c26f4cf0a..bfae1d0fbd6 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1lint/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1lint$(EXEEXT)
-subdir = lcdf-typetools-2.98/t1lint
+subdir = lcdf-typetools-2.99/t1lint
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -357,7 +357,7 @@ t1lint_SOURCES = cscheck.hh cscheck.cc \
 	t1lint.cc
 
 t1lint_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = t1lint.1
 all: all-am
@@ -373,9 +373,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1lint/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.99/t1lint/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1lint/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.99/t1lint/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/cscheck.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1lint/cscheck.cc
index f39a040a014..f39a040a014 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/cscheck.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1lint/cscheck.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/cscheck.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1lint/cscheck.hh
index 9ba167b1588..9ba167b1588 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/cscheck.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1lint/cscheck.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/t1lint.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1lint/t1lint.1
index b29c432a507..9a8cae1e26f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/t1lint.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1lint/t1lint.1
@@ -1,4 +1,4 @@
-.ds V 2.98
+.ds V 2.99
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/t1lint.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1lint/t1lint.cc
index e2ac1012382..b05d7842c0f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/t1lint.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1lint/t1lint.cc
@@ -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 @@ main(int argc, char *argv[])
 
      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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1rawafm/Makefile.am
index 815d0efad89..035c5cb1c9d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1rawafm/Makefile.am
@@ -8,7 +8,7 @@ t1rawafm_SOURCES = t1rawafm.cc
 
 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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1rawafm/Makefile.in
index 1f07d308065..0b80fe6b34d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1rawafm/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1rawafm$(EXEEXT)
-subdir = lcdf-typetools-2.98/t1rawafm
+subdir = lcdf-typetools-2.99/t1rawafm
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -337,7 +337,7 @@ AUTOMAKE_OPTIONS = foreign
 man_MANS = t1rawafm.1
 t1rawafm_SOURCES = t1rawafm.cc
 t1rawafm_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = t1rawafm.1
 all: all-am
@@ -353,9 +353,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1rawafm/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.99/t1rawafm/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1rawafm/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.99/t1rawafm/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/t1rawafm.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1rawafm/t1rawafm.1
index 9227baa5955..a3536c87c95 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/t1rawafm.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1rawafm/t1rawafm.1
@@ -1,4 +1,4 @@
-.ds V 2.98
+.ds V 2.99
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/t1rawafm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1rawafm/t1rawafm.cc
index 8ba7c7531fb..682aad6c575 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/t1rawafm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1rawafm/t1rawafm.cc
@@ -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 @@ main(int argc, char *argv[])
 
 	  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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1reencode/Makefile.am
index 1cb4c402f15..b022669f5d3 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1reencode/Makefile.am
@@ -9,7 +9,7 @@ t1reencode_SOURCES = t1reencode.cc \
 
 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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1reencode/Makefile.in
index 983e64287f2..7bb1df96279 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1reencode/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1reencode$(EXEEXT)
-subdir = lcdf-typetools-2.98/t1reencode
+subdir = lcdf-typetools-2.99/t1reencode
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -357,7 +357,7 @@ t1reencode_SOURCES = t1reencode.cc \
 	util.cc util.hh
 
 t1reencode_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = t1reencode.1
 all: all-am
@@ -373,9 +373,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1reencode/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.99/t1reencode/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1reencode/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.99/t1reencode/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/t1reencode.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1reencode/t1reencode.1
index 1dbf7b0ffc4..11db7751185 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/t1reencode.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1reencode/t1reencode.1
@@ -1,4 +1,4 @@
-.ds V 2.98
+.ds V 2.99
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/t1reencode.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1reencode/t1reencode.cc
index 952d3f87bdc..c35fbdf01d9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/t1reencode.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1reencode/t1reencode.cc
@@ -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 @@ main(int argc, char *argv[])
 
 	  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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/util.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1reencode/util.cc
index 89f43391152..89f43391152 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/util.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1reencode/util.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/util.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1reencode/util.hh
index 34b9c9c5a22..34b9c9c5a22 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/util.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1reencode/util.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1testpage/Makefile.am
index eac56ee9066..3e530d8f469 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1testpage/Makefile.am
@@ -8,7 +8,7 @@ t1testpage_SOURCES = t1testpage.cc
 
 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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1testpage/Makefile.in
index 1d4d0bbe13a..c9771fa60b8 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1testpage/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1testpage$(EXEEXT)
-subdir = lcdf-typetools-2.98/t1testpage
+subdir = lcdf-typetools-2.99/t1testpage
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -337,7 +337,7 @@ AUTOMAKE_OPTIONS = foreign
 man_MANS = t1testpage.1
 t1testpage_SOURCES = t1testpage.cc
 t1testpage_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = t1testpage.1
 all: all-am
@@ -353,9 +353,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1testpage/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.99/t1testpage/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1testpage/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.99/t1testpage/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/t1testpage.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1testpage/t1testpage.1
index 201b9632e46..4f47b296c9f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/t1testpage.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1testpage/t1testpage.1
@@ -1,4 +1,4 @@
-.ds V 2.98
+.ds V 2.99
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/t1testpage.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1testpage/t1testpage.cc
index ed3d7330a13..507428b4c4f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/t1testpage.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/t1testpage/t1testpage.cc
@@ -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 @@ main(int argc, char *argv[])
 
 	  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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/texglyphlist-g2u.txt b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/texglyphlist-g2u.txt
index 2340809a4de..2340809a4de 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/texglyphlist-g2u.txt
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/texglyphlist-g2u.txt
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/texglyphlist.txt b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/texglyphlist.txt
index b9c5fa9af0f..b9c5fa9af0f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/texglyphlist.txt
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/texglyphlist.txt
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/ttftotype42/Makefile.am
index a55d65d82c4..d1c220870e9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/ttftotype42/Makefile.am
@@ -8,7 +8,7 @@ ttftotype42_SOURCES = ttftotype42.cc
 
 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 --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/ttftotype42/Makefile.in
index 63b6f39d3a5..6cceb77927e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/ttftotype42/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = ttftotype42$(EXEEXT)
-subdir = lcdf-typetools-2.98/ttftotype42
+subdir = lcdf-typetools-2.99/ttftotype42
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -337,7 +337,7 @@ AUTOMAKE_OPTIONS = foreign
 man_MANS = ttftotype42.1
 ttftotype42_SOURCES = ttftotype42.cc
 ttftotype42_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
+AM_CPPFLAGS = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = ttftotype42.1
 all: all-am
@@ -353,9 +353,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/ttftotype42/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.99/ttftotype42/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.98/ttftotype42/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.99/ttftotype42/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/ttftotype42.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/ttftotype42/ttftotype42.1
index 0dcab2a2053..6e6c1c220d6 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/ttftotype42.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/ttftotype42/ttftotype42.1
@@ -1,4 +1,4 @@
-.ds V 2.98
+.ds V 2.99
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/ttftotype42.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/ttftotype42/ttftotype42.cc
index 0c3567e874c..3d1c9c7625d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/ttftotype42.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/ttftotype42/ttftotype42.cc
@@ -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 @@ main(int argc, char *argv[])
 
 	  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");
diff --git a/Build/source/texk/lcdf-typetools/version.ac b/Build/source/texk/lcdf-typetools/version.ac
index 57c78c5f88b..b1644cad31f 100644
--- a/Build/source/texk/lcdf-typetools/version.ac
+++ b/Build/source/texk/lcdf-typetools/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current lcdf-typetools version
-m4_define([lcdf_typetools_version], [2.98])
+m4_define([lcdf_typetools_version], [2.99])