lcdf-typetools 2.97

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

209 files changed, 1019 insertions, 1436 deletions

diff --git a/Build/source/texk/README b/Build/source/texk/README
index 4a43459ab64..6d7c8f228d6 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -69,9 +69,9 @@ kpathsea - maintained here, by us
 lacheck - checked 25apr11
   http://mirror.ctan.org/support/lacheck/lacheck-1.26.tar.gz
 
-lcdf-typetools 2.95 - checked 25sep12
+lcdf-typetools 2.97 - checked 26oct12
   http://www.lcdf.org/type/
-  http://www.lcdf.org/type/lcdf-typetools-2.95.tar.gz
+  http://www.lcdf.org/type/lcdf-typetools-2.97.tar.gz
 
 makeindexk - maintained here, by us
 
diff --git a/Build/source/texk/lcdf-typetools/ChangeLog b/Build/source/texk/lcdf-typetools/ChangeLog
index b498278161f..fc0356635c6 100644
--- a/Build/source/texk/lcdf-typetools/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-26  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import lcdf-typetools-2.97.
+	* version.ac, configure.ac: Adapted.
+
 2012-10-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* tests/tfm.test: Add to PATH because otftotfm may need to run
diff --git a/Build/source/texk/lcdf-typetools/autoconf.h.in b/Build/source/texk/lcdf-typetools/autoconf.h.in
index 091417a2327..20d78acacdd 100644
--- a/Build/source/texk/lcdf-typetools/autoconf.h.in
+++ b/Build/source/texk/lcdf-typetools/autoconf.h.in
@@ -6,6 +6,9 @@
 /* Define to 1 if the `closedir' function returns void instead of `int'. */
 #undef CLOSEDIR_VOID
 
+/* Directory for glyphlist.txt files. */
+#undef GLYPHLISTDIR
+
 /* Define if the va_list type is addressable. */
 #undef HAVE_ADDRESSABLE_VA_LIST
 
@@ -269,9 +272,6 @@
 /* kpsewhich's $SELFAUTOPARENT variable */
 #undef SELFAUTOPARENT
 
-/* Data directory. */
-#undef SHAREDIR
-
 /* The size of `unsigned int', as computed by sizeof. */
 #undef SIZEOF_UNSIGNED_INT
 
diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure
index 0b1afa2a3f1..afac07789ea 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 for TeX Live 2.95.
+# Generated by GNU Autoconf 2.69 for LCDF typetools for TeX Live 2.97.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,12 +590,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='LCDF typetools for TeX Live'
 PACKAGE_TARNAME='lcdf-typetools-for-tex-live'
-PACKAGE_VERSION='2.95'
-PACKAGE_STRING='LCDF typetools for TeX Live 2.95'
+PACKAGE_VERSION='2.97'
+PACKAGE_STRING='LCDF typetools for TeX Live 2.97'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="lcdf-typetools-2.95/NEWS"
+ac_unique_file="lcdf-typetools-2.97/NEWS"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1360,7 +1360,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures LCDF typetools for TeX Live 2.95 to adapt to many kinds of systems.
+\`configure' configures LCDF typetools for TeX Live 2.97 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1431,7 +1431,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of LCDF typetools for TeX Live 2.95:";;
+     short | recursive ) echo "Configuration of LCDF typetools for TeX Live 2.97:";;
    esac
   cat <<\_ACEOF
 
@@ -1569,7 +1569,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-LCDF typetools for TeX Live configure 2.95
+LCDF typetools for TeX Live configure 2.97
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2729,7 +2729,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by LCDF typetools for TeX Live $as_me 2.95, which was
+It was created by LCDF typetools for TeX Live $as_me 2.97, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8121,7 +8121,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='lcdf-typetools-for-tex-live'
- VERSION='2.95'
+ VERSION='2.97'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13374,7 +13374,7 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 
 
-LCDF_TYPETOOLS_VERSION=2.95
+LCDF_TYPETOOLS_VERSION=2.97
 
 
 ac_config_headers="$ac_config_headers autoconf.h"
@@ -19039,7 +19039,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-LCDF typetools for TeX Live config.lt 2.95
+LCDF typetools for TeX Live config.lt 2.97
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -20515,36 +20515,37 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 shell_expand datadir
 
 if test "x$enable_native_texlive_build" = xyes; then
-  sharedir=/nonesuch
+  gdir=/nonesuch
 else
-  sharedir=$datadir/lcdf-typetools
+  gdir="$glyphlistdir"
+  for i in data dataroot pkgdata g; do shell_expand ${i}dir; done
 fi
 
 cat >>confdefs.h <<_ACEOF
-#define SHAREDIR "$sharedir"
+#define GLYPHLISTDIR "$gdir"
 _ACEOF
 
 
 
 
-LCDF_TYPETOOLS_TREE=lcdf-typetools-2.95
+LCDF_TYPETOOLS_TREE=lcdf-typetools-2.97
 
 
-ac_config_files="$ac_config_files Makefile lcdf-typetools-2.95/Makefile"
+ac_config_files="$ac_config_files Makefile lcdf-typetools-2.97/Makefile"
 
-ac_config_files="$ac_config_files lcdf-typetools-2.95/liblcdf/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.95/libefont/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.95/cfftot1/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.95/mmafm/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.95/mmpfb/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.95/otfinfo/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.95/otftotfm/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.95/t1dotlessj/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.95/t1lint/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.95/t1rawafm/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.95/t1reencode/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.95/t1testpage/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.95/ttftotype42/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.97/liblcdf/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.97/libefont/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.97/cfftot1/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.97/mmafm/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.97/mmpfb/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.97/otfinfo/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.97/otftotfm/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.97/t1dotlessj/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.97/t1lint/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.97/t1rawafm/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.97/t1reencode/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.97/t1testpage/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.97/ttftotype42/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -21098,7 +21099,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by LCDF typetools for TeX Live $as_me 2.95, which was
+This file was extended by LCDF typetools for TeX Live $as_me 2.97, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21164,7 +21165,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-LCDF typetools for TeX Live config.status 2.95
+LCDF typetools for TeX Live config.status 2.97
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -21677,20 +21678,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.95/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.95/Makefile" ;;
-    "lcdf-typetools-2.95/liblcdf/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.95/liblcdf/Makefile" ;;
-    "lcdf-typetools-2.95/libefont/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.95/libefont/Makefile" ;;
-    "lcdf-typetools-2.95/cfftot1/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.95/cfftot1/Makefile" ;;
-    "lcdf-typetools-2.95/mmafm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.95/mmafm/Makefile" ;;
-    "lcdf-typetools-2.95/mmpfb/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.95/mmpfb/Makefile" ;;
-    "lcdf-typetools-2.95/otfinfo/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.95/otfinfo/Makefile" ;;
-    "lcdf-typetools-2.95/otftotfm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.95/otftotfm/Makefile" ;;
-    "lcdf-typetools-2.95/t1dotlessj/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.95/t1dotlessj/Makefile" ;;
-    "lcdf-typetools-2.95/t1lint/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.95/t1lint/Makefile" ;;
-    "lcdf-typetools-2.95/t1rawafm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.95/t1rawafm/Makefile" ;;
-    "lcdf-typetools-2.95/t1reencode/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.95/t1reencode/Makefile" ;;
-    "lcdf-typetools-2.95/t1testpage/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.95/t1testpage/Makefile" ;;
-    "lcdf-typetools-2.95/ttftotype42/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.95/ttftotype42/Makefile" ;;
+    "lcdf-typetools-2.97/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/Makefile" ;;
+    "lcdf-typetools-2.97/liblcdf/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/liblcdf/Makefile" ;;
+    "lcdf-typetools-2.97/libefont/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/libefont/Makefile" ;;
+    "lcdf-typetools-2.97/cfftot1/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/cfftot1/Makefile" ;;
+    "lcdf-typetools-2.97/mmafm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/mmafm/Makefile" ;;
+    "lcdf-typetools-2.97/mmpfb/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/mmpfb/Makefile" ;;
+    "lcdf-typetools-2.97/otfinfo/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/otfinfo/Makefile" ;;
+    "lcdf-typetools-2.97/otftotfm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/otftotfm/Makefile" ;;
+    "lcdf-typetools-2.97/t1dotlessj/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/t1dotlessj/Makefile" ;;
+    "lcdf-typetools-2.97/t1lint/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/t1lint/Makefile" ;;
+    "lcdf-typetools-2.97/t1rawafm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/t1rawafm/Makefile" ;;
+    "lcdf-typetools-2.97/t1reencode/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/t1reencode/Makefile" ;;
+    "lcdf-typetools-2.97/t1testpage/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/t1testpage/Makefile" ;;
+    "lcdf-typetools-2.97/ttftotype42/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/ttftotype42/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac
index d422c46c8c9..4abd878ec46 100644
--- a/Build/source/texk/lcdf-typetools/configure.ac
+++ b/Build/source/texk/lcdf-typetools/configure.ac
@@ -335,14 +335,14 @@ Either supply the correct PREFIX to --with-kpathsea, or supply
 
 =========================================])
     fi
-    AC_DEFINE_UNQUOTED(SELFAUTOLOC, "$SELFAUTOLOC", [kpsewhich's $SELFAUTOLOC variable])
-    AC_DEFINE_UNQUOTED(SELFAUTODIR, "$SELFAUTODIR", [kpsewhich's $SELFAUTODIR variable])
-    AC_DEFINE_UNQUOTED(SELFAUTOPARENT, "$SELFAUTOPARENT", [kpsewhich's $SELFAUTOPARENT variable])
+    AC_DEFINE_UNQUOTED([SELFAUTOLOC], "$SELFAUTOLOC", [kpsewhich's $SELFAUTOLOC variable])
+    AC_DEFINE_UNQUOTED([SELFAUTODIR], "$SELFAUTODIR", [kpsewhich's $SELFAUTODIR variable])
+    AC_DEFINE_UNQUOTED([SELFAUTOPARENT], "$SELFAUTOPARENT", [kpsewhich's $SELFAUTOPARENT variable])
 fi
 
 
 dnl
-dnl directories for data files
+dnl glyphlist.txt and *.enc installation locations
 dnl
 glyphlistdir='${datarootdir}/texmf-dist/fonts/map/glyphlist'
 encdir='${datarootdir}/texmf-dist/fonts/enc/dvips/base'
@@ -376,11 +376,12 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 shell_expand datadir
 
 if test "x$enable_native_texlive_build" = xyes; then
-  sharedir=/nonesuch
+  gdir=/nonesuch
 else
-  sharedir=$datadir/lcdf-typetools
+  gdir="$glyphlistdir"
+  for i in data dataroot pkgdata g; do shell_expand ${i}dir; done
 fi
-AC_DEFINE_UNQUOTED(SHAREDIR, "$sharedir", [Data directory.])
+AC_DEFINE_UNQUOTED([GLYPHLISTDIR], ["$gdir"], [Directory for glyphlist.txt files.])
 
 
 dnl
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-07-typos b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-07-typos
deleted file mode 100644
index fdbce1834ea..00000000000
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-07-typos
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.95.orig/t1rawafm/t1rawafm.1 lcdf-typetools-2.95/t1rawafm/t1rawafm.1
---- lcdf-typetools-2.95.orig/t1rawafm/t1rawafm.1	2012-09-22 05:30:11.000000000 +0200
-+++ lcdf-typetools-2.95/t1rawafm/t1rawafm.1	2012-09-24 18:37:57.000000000 +0200
-@@ -10,7 +10,7 @@
- .SH NAME
- t1rawafm \- produce raw AFM metrics from a PostScript Type 1 font
- .SH SYNOPSIS
--\fBt1rawafm\fR \%[OPTIONS...] \fIfont\fR [\fIoutputfile\fR]
-+\fBt1rawafm\fR \%[OPTIONS...] [\fIfont\fR [\fIoutputfile\fR]]
- .SH DESCRIPTION
- .BR T1rawafm
- generates an AFM file with the information available in a PostScript
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.95.orig/t1rawafm/t1rawafm.cc lcdf-typetools-2.95/t1rawafm/t1rawafm.cc
---- lcdf-typetools-2.95.orig/t1rawafm/t1rawafm.cc	2012-09-17 00:17:57.000000000 +0200
-+++ lcdf-typetools-2.95/t1rawafm/t1rawafm.cc	2012-09-24 18:38:53.000000000 +0200
-@@ -85,7 +85,7 @@
- font file from the standard input.\n\
- \n\
- Options:\n\
--  -o, --output=OUTPUT          Write output to FILE instead of standard output.\n\
-+  -o, --output=FILE            Write output to FILE instead of standard output.\n\
-   -h, --help                   Print this message and exit.\n\
-       --version                Print version number and exit.\n\
- \n\
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-08-future b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-08-future
deleted file mode 100644
index 748d61f064e..00000000000
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-08-future
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.95.orig/Makefile.am lcdf-typetools-2.95/Makefile.am
---- lcdf-typetools-2.95.orig/Makefile.am	2012-09-17 00:17:57.000000000 +0200
-+++ lcdf-typetools-2.95/Makefile.am	2012-09-24 18:44:31.000000000 +0200
-@@ -4,7 +4,8 @@
- SUBDIRS = liblcdf libefont @SELECTED_SUBDIRS@
- DIST_SUBDIRS = liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42
- 
--pkgdata_DATA = glyphlist.txt texglyphlist.txt 7t.enc
-+glyphlist_DATA = glyphlist.txt texglyphlist.txt
-+enc_DATA = 7t.enc
- 
- EXTRA_DIST = \
- 	ONEWS \
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.95.orig/configure.ac lcdf-typetools-2.95/configure.ac
---- lcdf-typetools-2.95.orig/configure.ac	2012-09-22 05:29:26.000000000 +0200
-+++ lcdf-typetools-2.95/configure.ac	2012-09-25 09:47:23.000000000 +0200
-@@ -433,6 +433,15 @@
- 
- 
- dnl
-+dnl directories for data files
-+dnl
-+glyphlistdir='${pkgdatadir}'
-+encdir='${pkgdatadir}'
-+AC_SUBST([glyphlistdir])
-+AC_SUBST([encdir])
-+
-+
-+dnl
- dnl TeX Live build stub
- dnl
- 
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-31-WIN32 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-31-WIN32
deleted file mode 100644
index 6d31ab0bfae..00000000000
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-31-WIN32
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.95.orig/otftotfm/util.cc lcdf-typetools-2.95/otftotfm/util.cc
---- lcdf-typetools-2.95.orig/otftotfm/util.cc	2012-09-17 00:17:57.000000000 +0200
-+++ lcdf-typetools-2.95/otftotfm/util.cc	2012-09-24 19:01:33.000000000 +0200
-@@ -184,9 +184,18 @@
- 	errh->error("temporary file %<%s%>: %s", filename.c_str(), strerror(errno));
-     return fd;
- #else  // !HAVE_MKSTEMP
-+# ifdef WIN32
-+    const char *tmp_dir = getenv("TEMP");
-+    if (!tmp_dir)
-+	tmp_dir = ".";
-+    for (int tries = 0; tries < 5; tries++) {
-+	if (!(filename = _tempnam(tmp_dir, "otftmp.")))
-+	    return errh->error("cannot create temporary file");
-+# else
-     for (int tries = 0; tries < 5; tries++) {
- 	if (!(filename = tmpnam(0)))
- 	    return errh->error("cannot create temporary file");
-+# endif
- # ifdef O_EXCL
- 	int fd = ::open(filename.c_str(), O_RDWR | O_CREAT | O_EXCL | O_TRUNC, 0600);
- # else
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/Makefile.in
deleted file mode 100644
index 408745c5424..00000000000
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/Makefile.in
+++ /dev/null
@@ -1,709 +0,0 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = t1reencode$(EXEEXT)
-subdir = lcdf-typetools-2.95/t1reencode
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/../../build-aux/depcomp
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
-	$(top_srcdir)/../../m4/kpse-common.m4 \
-	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
-	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 \
-	$(top_srcdir)/../../m4/libtool.m4 \
-	$(top_srcdir)/../../m4/ltoptions.m4 \
-	$(top_srcdir)/../../m4/ltsugar.m4 \
-	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
-	$(top_srcdir)/ac/lcdf-typetools.ac $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/autoconf.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
-PROGRAMS = $(bin_PROGRAMS)
-am_t1reencode_OBJECTS = md5.$(OBJEXT) t1reencode.$(OBJEXT) \
-	util.$(OBJEXT)
-t1reencode_OBJECTS = $(am_t1reencode_OBJECTS)
-t1reencode_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(t1reencode_SOURCES)
-DIST_SOURCES = $(t1reencode_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-man1dir = $(mandir)/man1
-NROFF = nroff
-MANS = $(man_MANS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
-KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
-KPATHSEA_LIBS = @KPATHSEA_LIBS@
-LCDF_TYPETOOLS_TREE = @LCDF_TYPETOOLS_TREE@
-LCDF_TYPETOOLS_VERSION = @LCDF_TYPETOOLS_VERSION@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SED = @SED@
-SELECTED_SUBDIRS = @SELECTED_SUBDIRS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TEMPLATE_OBJS = @TEMPLATE_OBJS@
-VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-encdir = @encdir@
-exec_prefix = @exec_prefix@
-glyphlistdir = @glyphlistdir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = foreign
-man_MANS = t1reencode.1
-t1reencode_SOURCES = md5.c md5.h \
-	t1reencode.cc \
-	util.cc util.hh
-
-t1reencode_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(srcdir)/../include
-CLEANFILES = @TEMPLATE_OBJS@
-EXTRA_DIST = t1reencode.1
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .cc .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.95/t1reencode/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/t1reencode/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-t1reencode$(EXEEXT): $(t1reencode_OBJECTS) $(t1reencode_DEPENDENCIES) $(EXTRA_t1reencode_DEPENDENCIES) 
-	@rm -f t1reencode$(EXEEXT)
-	$(CXXLINK) $(t1reencode_OBJECTS) $(t1reencode_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t1reencode.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-.cc.o:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
-
-.cc.obj:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cc.lo:
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-man1: $(man_MANS)
-	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man1dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.1[a-z]*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically 'make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) $(MANS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-man
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man: install-man1
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-man
-
-uninstall-man: uninstall-man1
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool cscopelist ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man1 install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-man uninstall-man1
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/md5.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/md5.c
deleted file mode 100644
index 107de8061c2..00000000000
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/md5.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8 -*- */
-/* md5.c - MD5 Message-Digest Algorithm
- *	Copyright (C) 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
- *
- * according to the definition of MD5 in RFC 1321 from April 1992.
- * NOTE: This is *not* the same file as the one from glibc.
- *
- * 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 Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
-/* heavily modified for GnuPG by <werner.koch@guug.de> */
-/* modified again for Sylpheed by <wk@gnupg.org> 2001-02-11 */
-/* modified again for LCDF by Eddie Kohler <kohler@icir.org> */
-
-
-/* Test values:
- * ""                  D4 1D 8C D9 8F 00 B2 04  E9 80 09 98 EC F8 42 7E
- * "a"                 0C C1 75 B9 C0 F1 B6 A8  31 C3 99 E2 69 77 26 61
- * "abc                90 01 50 98 3C D2 4F B0  D6 96 3F 7D 28 E1 7F 72
- * "message digest"    F9 6B 69 7D 7C B7 93 8D  52 5A 2F 31 AA F1 61 D0
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <lcdf/inttypes.h>
-
-#include "md5.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/****************
- * Rotate a 32 bit integer by n bytes
- */
-#if defined(__GNUC__) && defined(__i386__)
-static inline uint32_t
-rol( uint32_t x, int n)
-{
-	__asm__("roll %%cl,%0"
-		:"=r" (x)
-		:"0" (x),"c" (n));
-	return x;
-}
-#else
-#define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) )
-#endif
-
-
-void
-md5_init(MD5_CONTEXT *ctx)
-{
-	ctx->A = 0x67452301;
-	ctx->B = 0xefcdab89;
-	ctx->C = 0x98badcfe;
-	ctx->D = 0x10325476;
-
-	ctx->nblocks = 0;
-	ctx->count = 0;
-	ctx->finalized = 0;
-}
-
-/* These are the four functions used in the four steps of the MD5 algorithm
-   and defined in the RFC 1321.  The first function is a little bit optimized
-   (as found in Colin Plumbs public domain implementation).  */
-/* #define FF(b, c, d) ((b & c) | (~b & d)) */
-#define FF(b, c, d) (d ^ (b & (c ^ d)))
-#define FG(b, c, d) FF (d, b, c)
-#define FH(b, c, d) (b ^ c ^ d)
-#define FI(b, c, d) (c ^ (b | ~d))
-
-
-/****************
- * transform n*64 bytes
- */
-static void
-transform(MD5_CONTEXT *ctx, const unsigned char *data)
-{
-	uint32_t correct_words[16];
-	uint32_t A = ctx->A;
-	uint32_t B = ctx->B;
-	uint32_t C = ctx->C;
-	uint32_t D = ctx->D;
-	uint32_t *cwp = correct_words;
-
-#ifdef BIG_ENDIAN_HOST
-	{
-		int i;
-		unsigned char *p2, *p1;
-
-		for (i = 0, p1 = data, p2 = (unsigned char*)correct_words;
-		     i < 16; i++, p2 += 4) {
-			p2[3] = *p1++;
-			p2[2] = *p1++;
-			p2[1] = *p1++;
-			p2[0] = *p1++;
-		}
-	}
-#else
-	memcpy(correct_words, data, 64);
-#endif
-
-
-#define OP(a, b, c, d, s, T)				\
-	do {						\
-		a += FF (b, c, d) + (*cwp++) + T;	\
-		a = rol(a, s);				\
-		a += b;					\
-	} while (0)
-
-	/* Before we start, one word about the strange constants.
-	   They are defined in RFC 1321 as
-
-	   T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
-	 */
-
-	/* Round 1.  */
-	OP (A, B, C, D,  7, 0xd76aa478);
-	OP (D, A, B, C, 12, 0xe8c7b756);
-	OP (C, D, A, B, 17, 0x242070db);
-	OP (B, C, D, A, 22, 0xc1bdceee);
-	OP (A, B, C, D,  7, 0xf57c0faf);
-	OP (D, A, B, C, 12, 0x4787c62a);
-	OP (C, D, A, B, 17, 0xa8304613);
-	OP (B, C, D, A, 22, 0xfd469501);
-	OP (A, B, C, D,  7, 0x698098d8);
-	OP (D, A, B, C, 12, 0x8b44f7af);
-	OP (C, D, A, B, 17, 0xffff5bb1);
-	OP (B, C, D, A, 22, 0x895cd7be);
-	OP (A, B, C, D,  7, 0x6b901122);
-	OP (D, A, B, C, 12, 0xfd987193);
-	OP (C, D, A, B, 17, 0xa679438e);
-	OP (B, C, D, A, 22, 0x49b40821);
-
-#undef OP
-#define OP(f, a, b, c, d, k, s, T)  \
-	do {							\
-		a += f (b, c, d) + correct_words[k] + T;	\
-		a = rol(a, s);					\
-		a += b;					\
-	} while (0)
-
-	/* Round 2.  */
-	OP (FG, A, B, C, D,  1,  5, 0xf61e2562);
-	OP (FG, D, A, B, C,  6,  9, 0xc040b340);
-	OP (FG, C, D, A, B, 11, 14, 0x265e5a51);
-	OP (FG, B, C, D, A,  0, 20, 0xe9b6c7aa);
-	OP (FG, A, B, C, D,  5,  5, 0xd62f105d);
-	OP (FG, D, A, B, C, 10,  9, 0x02441453);
-	OP (FG, C, D, A, B, 15, 14, 0xd8a1e681);
-	OP (FG, B, C, D, A,  4, 20, 0xe7d3fbc8);
-	OP (FG, A, B, C, D,  9,  5, 0x21e1cde6);
-	OP (FG, D, A, B, C, 14,  9, 0xc33707d6);
-	OP (FG, C, D, A, B,  3, 14, 0xf4d50d87);
-	OP (FG, B, C, D, A,  8, 20, 0x455a14ed);
-	OP (FG, A, B, C, D, 13,  5, 0xa9e3e905);
-	OP (FG, D, A, B, C,  2,  9, 0xfcefa3f8);
-	OP (FG, C, D, A, B,  7, 14, 0x676f02d9);
-	OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
-
-	/* Round 3.  */
-	OP (FH, A, B, C, D,  5,  4, 0xfffa3942);
-	OP (FH, D, A, B, C,  8, 11, 0x8771f681);
-	OP (FH, C, D, A, B, 11, 16, 0x6d9d6122);
-	OP (FH, B, C, D, A, 14, 23, 0xfde5380c);
-	OP (FH, A, B, C, D,  1,  4, 0xa4beea44);
-	OP (FH, D, A, B, C,  4, 11, 0x4bdecfa9);
-	OP (FH, C, D, A, B,  7, 16, 0xf6bb4b60);
-	OP (FH, B, C, D, A, 10, 23, 0xbebfbc70);
-	OP (FH, A, B, C, D, 13,  4, 0x289b7ec6);
-	OP (FH, D, A, B, C,  0, 11, 0xeaa127fa);
-	OP (FH, C, D, A, B,  3, 16, 0xd4ef3085);
-	OP (FH, B, C, D, A,  6, 23, 0x04881d05);
-	OP (FH, A, B, C, D,  9,  4, 0xd9d4d039);
-	OP (FH, D, A, B, C, 12, 11, 0xe6db99e5);
-	OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8);
-	OP (FH, B, C, D, A,  2, 23, 0xc4ac5665);
-
-	/* Round 4.  */
-	OP (FI, A, B, C, D,  0,  6, 0xf4292244);
-	OP (FI, D, A, B, C,  7, 10, 0x432aff97);
-	OP (FI, C, D, A, B, 14, 15, 0xab9423a7);
-	OP (FI, B, C, D, A,  5, 21, 0xfc93a039);
-	OP (FI, A, B, C, D, 12,  6, 0x655b59c3);
-	OP (FI, D, A, B, C,  3, 10, 0x8f0ccc92);
-	OP (FI, C, D, A, B, 10, 15, 0xffeff47d);
-	OP (FI, B, C, D, A,  1, 21, 0x85845dd1);
-	OP (FI, A, B, C, D,  8,  6, 0x6fa87e4f);
-	OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
-	OP (FI, C, D, A, B,  6, 15, 0xa3014314);
-	OP (FI, B, C, D, A, 13, 21, 0x4e0811a1);
-	OP (FI, A, B, C, D,  4,  6, 0xf7537e82);
-	OP (FI, D, A, B, C, 11, 10, 0xbd3af235);
-	OP (FI, C, D, A, B,  2, 15, 0x2ad7d2bb);
-	OP (FI, B, C, D, A,  9, 21, 0xeb86d391);
-
-	/* Put checksum in context given as argument.  */
-	ctx->A += A;
-	ctx->B += B;
-	ctx->C += C;
-	ctx->D += D;
-}
-
-
-
-/* The routine updates the message-digest context to
- * account for the presence of each of the characters inBuf[0..inLen-1]
- * in the message whose digest is being computed.
- */
-void
-md5_update(MD5_CONTEXT *hd, const unsigned char *inbuf, size_t inlen)
-{
-	if (hd->count == 64) { /* flush the buffer */
-		transform( hd, hd->buf );
-		hd->count = 0;
-		hd->nblocks++;
-	}
-	if (!inbuf)
-		return;
-	if (hd->count) {
-		for (; inlen && hd->count < 64; inlen--)
-			hd->buf[hd->count++] = *inbuf++;
-		md5_update(hd, NULL, 0);
-		if (!inlen)
-			return;
-	}
-
-	while (inlen >= 64) {
-		transform(hd, inbuf);
-		hd->count = 0;
-		hd->nblocks++;
-		inlen -= 64;
-		inbuf += 64;
-	}
-
-	for (; inlen && hd->count < 64; inlen--)
-		hd->buf[hd->count++] = *inbuf++;
-}
-
-
-
-/* The routine final terminates the message-digest computation and
- * ends with the desired message digest in mdContext->digest[0...15].
- * The handle is prepared for a new MD5 cycle.
- * Returns 16 bytes representing the digest.
- */
-
-static void
-do_final(MD5_CONTEXT *hd)
-{
-	uint32_t t, msb, lsb;
-	unsigned char *p;
-
-	md5_update(hd, NULL, 0); /* flush */
-
-	msb = 0;
-	t = hd->nblocks;
-	if ((lsb = t << 6) < t) /* multiply by 64 to make a byte count */
-		msb++;
-	msb += t >> 26;
-	t = lsb;
-	if ((lsb = t + hd->count) < t) /* add the count */
-		msb++;
-	t = lsb;
-	if ((lsb = t << 3) < t) /* multiply by 8 to make a bit count */
-		msb++;
-	msb += t >> 29;
-
-	if (hd->count < 56) { /* enough room */
-		hd->buf[hd->count++] = 0x80; /* pad */
-		while(hd->count < 56)
-			hd->buf[hd->count++] = 0;  /* pad */
-	} else { /* need one extra block */
-		hd->buf[hd->count++] = 0x80; /* pad character */
-		while (hd->count < 64)
-			hd->buf[hd->count++] = 0;
-		md5_update(hd, NULL, 0);  /* flush */
-		memset(hd->buf, 0, 56); /* fill next block with zeroes */
-	}
-
-	/* append the 64 bit count */
-	hd->buf[56] = lsb      ;
-	hd->buf[57] = lsb >>  8;
-	hd->buf[58] = lsb >> 16;
-	hd->buf[59] = lsb >> 24;
-	hd->buf[60] = msb      ;
-	hd->buf[61] = msb >>  8;
-	hd->buf[62] = msb >> 16;
-	hd->buf[63] = msb >> 24;
-	transform(hd, hd->buf);
-
-	p = hd->buf;
-#ifdef BIG_ENDIAN_HOST
-#define X(a) do { *p++ = hd->a      ; *p++ = hd->a >> 8;      \
-		  *p++ = hd->a >> 16; *p++ = hd->a >> 24; } while(0)
-#else /* little endian */
-	/*#define X(a) do { *(uint32_t*)p = hd->##a ; p += 4; } while(0)*/
-	/* Unixware's cpp doesn't like the above construct so we do it his way:
-	 * (reported by Allan Clark) */
-#define X(a) do { *(uint32_t*)p = (*hd).a ; p += 4; } while(0)
-#endif
-	X(A);
-	X(B);
-	X(C);
-	X(D);
-#undef X
-	hd->finalized = 1;
-}
-
-void
-md5_final(unsigned char *digest, MD5_CONTEXT *ctx)
-{
-	if (!ctx->finalized)
-		do_final(ctx);
-	memcpy(digest, ctx->buf, 16);
-}
-
-void
-md5_final_text(char *buf, MD5_CONTEXT *ctx)
-{
-	static const char *chars = "abcdefghijklmnopqrstuvwxyz234567";
-	int bit;
-	if (!ctx->finalized)
-		do_final(ctx);
-	for (bit = 0; bit < 16*8; bit += 5) {
-		int first_char = bit / 8;
-		int val = ctx->buf[first_char] >> (bit % 8);
-		if (bit + 8 > (first_char + 1) * 8 && first_char < 15)
-			val += ctx->buf[first_char + 1] << (8 - (bit % 8));
-		*buf++ = chars[val & 0x1F];
-	}
-	*buf++ = 0;
-}
-
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/md5.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/md5.h
deleted file mode 100644
index 228c45f615c..00000000000
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/md5.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* md5.h - MD5 Message-Digest Algorithm
- *	Copyright (C) 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
- *
- * according to the definition of MD5 in RFC 1321 from April 1992.
- * NOTE: This is *not* the same file as the one from glibc
- *
- * 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 Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef _MD5_HDR_
-#define _MD5_HDR_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define MD5_DIGEST_SIZE		16
-#define MD5_TEXT_DIGEST_SIZE	26 /* + 1 for the terminating NUL */
-
-typedef struct {  /* Hmm, should be private */
-    uint32_t A,B,C,D;
-    uint32_t nblocks;
-    unsigned char buf[64];
-    int  count;
-    int  finalized;
-} MD5_CONTEXT;
-
-void md5_init(MD5_CONTEXT *ctx);
-void md5_update(MD5_CONTEXT *hd, const unsigned char *inbuf, size_t inlen);
-void md5_final(unsigned char digest[MD5_DIGEST_SIZE], MD5_CONTEXT *ctx);
-void md5_final_text(char *text_digest, MD5_CONTEXT *ctx);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _MD5_HDR_ */
-
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/ChangeLog
index 451596a2009..5b913b05971 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/ChangeLog
@@ -1,7 +1,15 @@
+2012-10-26  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import lcdf-typetools-2.97.
+	* patch-07-typos, patch-08-future, patch-31-WIN32 (removed):
+	Now all distributed.
+
+	* patch-20-TL-binary, patch-21-TL-paths, patch-30-W32TeX: Adapted.
+
 2012-10-20  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
-	* patch-30-W32TeX: use a texmf.cnf variable jtex_filetype to distinguish
-	TeX Live and W32TeX.
+	* patch-30-W32TeX: use a texmf.cnf variable jtex_filetype to
+	distinguish TeX Live and W32TeX.
 
 2012-09-25  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/TL-Changes b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/TL-Changes
index b152b6d0469..a82f6b8da36 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/TL-Changes
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-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.95.tar.gz
+	http://www.lcdf.org/type/lcdf-typetools-2.97.tar.gz
 
 Removed:
 	aclocal.m4
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-20-TL-binary b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/patch-20-TL-binary
index 1704861c174..86a06130411 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-20-TL-binary
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-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.95.orig/liblcdf/filename.cc lcdf-typetools-2.95/liblcdf/filename.cc
---- lcdf-typetools-2.95.orig/liblcdf/filename.cc	2012-09-17 00:17:57.000000000 +0200
-+++ lcdf-typetools-2.95/liblcdf/filename.cc	2012-09-24 19:11:32.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/liblcdf/filename.cc lcdf-typetools-2.97/liblcdf/filename.cc
+--- lcdf-typetools-2.97.orig/liblcdf/filename.cc	2012-08-15 17:33:48.000000000 +0200
++++ lcdf-typetools-2.97/liblcdf/filename.cc	2012-10-26 08:31:26.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.95.orig/otftotfm/automatic.cc lcdf-typetools-2.95/otftotfm/automatic.cc
---- lcdf-typetools-2.95.orig/otftotfm/automatic.cc	2012-09-17 00:17:57.000000000 +0200
-+++ lcdf-typetools-2.95/otftotfm/automatic.cc	2012-09-24 19:13:32.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/otftotfm/automatic.cc lcdf-typetools-2.97/otftotfm/automatic.cc
+--- lcdf-typetools-2.97.orig/otftotfm/automatic.cc	2012-10-25 15:54:40.000000000 +0200
++++ lcdf-typetools-2.97/otftotfm/automatic.cc	2012-10-26 08:31:26.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.95.orig/otftotfm/otftotfm.cc lcdf-typetools-2.95/otftotfm/otftotfm.cc
---- lcdf-typetools-2.95.orig/otftotfm/otftotfm.cc	2012-09-17 00:17:57.000000000 +0200
-+++ lcdf-typetools-2.95/otftotfm/otftotfm.cc	2012-09-24 19:15:23.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/otftotfm/otftotfm.cc lcdf-typetools-2.97/otftotfm/otftotfm.cc
+--- lcdf-typetools-2.97.orig/otftotfm/otftotfm.cc	2012-10-25 14:25:12.000000000 +0200
++++ lcdf-typetools-2.97/otftotfm/otftotfm.cc	2012-10-26 08:31:26.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.95.orig/t1dotlessj/t1dotlessj.cc lcdf-typetools-2.95/t1dotlessj/t1dotlessj.cc
---- lcdf-typetools-2.95.orig/t1dotlessj/t1dotlessj.cc	2012-09-17 00:17:57.000000000 +0200
-+++ lcdf-typetools-2.95/t1dotlessj/t1dotlessj.cc	2012-09-24 19:21:49.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/t1dotlessj/t1dotlessj.cc lcdf-typetools-2.97/t1dotlessj/t1dotlessj.cc
+--- lcdf-typetools-2.97.orig/t1dotlessj/t1dotlessj.cc	2012-08-15 17:34:28.000000000 +0200
++++ lcdf-typetools-2.97/t1dotlessj/t1dotlessj.cc	2012-10-26 08:31:26.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.95.orig/t1rawafm/t1rawafm.cc lcdf-typetools-2.95/t1rawafm/t1rawafm.cc
---- lcdf-typetools-2.95.orig/t1rawafm/t1rawafm.cc	2012-09-24 18:38:53.000000000 +0200
-+++ lcdf-typetools-2.95/t1rawafm/t1rawafm.cc	2012-09-24 19:20:16.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/t1rawafm/t1rawafm.cc lcdf-typetools-2.97/t1rawafm/t1rawafm.cc
+--- lcdf-typetools-2.97.orig/t1rawafm/t1rawafm.cc	2012-10-25 15:54:40.000000000 +0200
++++ lcdf-typetools-2.97/t1rawafm/t1rawafm.cc	2012-10-26 08:31:26.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.95.orig/t1reencode/t1reencode.cc lcdf-typetools-2.95/t1reencode/t1reencode.cc
---- lcdf-typetools-2.95.orig/t1reencode/t1reencode.cc	2012-09-17 00:17:57.000000000 +0200
-+++ lcdf-typetools-2.95/t1reencode/t1reencode.cc	2012-09-24 19:19:25.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/t1reencode/t1reencode.cc lcdf-typetools-2.97/t1reencode/t1reencode.cc
+--- lcdf-typetools-2.97.orig/t1reencode/t1reencode.cc	2012-10-25 15:54:40.000000000 +0200
++++ lcdf-typetools-2.97/t1reencode/t1reencode.cc	2012-10-26 08:31:26.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.95.orig/t1testpage/t1testpage.cc lcdf-typetools-2.95/t1testpage/t1testpage.cc
---- lcdf-typetools-2.95.orig/t1testpage/t1testpage.cc	2012-09-17 00:17:57.000000000 +0200
-+++ lcdf-typetools-2.95/t1testpage/t1testpage.cc	2012-09-24 19:17:41.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/t1testpage/t1testpage.cc lcdf-typetools-2.97/t1testpage/t1testpage.cc
+--- lcdf-typetools-2.97.orig/t1testpage/t1testpage.cc	2012-08-15 17:34:38.000000000 +0200
++++ lcdf-typetools-2.97/t1testpage/t1testpage.cc	2012-10-26 08:31:26.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.95-PATCHES/patch-21-TL-paths b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/patch-21-TL-paths
index 954a4d95770..138dc4f46a2 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-21-TL-paths
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-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.95.orig/otftotfm/automatic.cc lcdf-typetools-2.95/otftotfm/automatic.cc
---- lcdf-typetools-2.95.orig/otftotfm/automatic.cc	2012-09-24 19:13:32.000000000 +0200
-+++ lcdf-typetools-2.95/otftotfm/automatic.cc	2012-09-24 19:31:55.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/otftotfm/automatic.cc lcdf-typetools-2.97/otftotfm/automatic.cc
+--- lcdf-typetools-2.97.orig/otftotfm/automatic.cc	2012-10-26 08:31:26.000000000 +0200
++++ lcdf-typetools-2.97/otftotfm/automatic.cc	2012-10-26 08:35:40.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.95-PATCHES/patch-30-W32TeX b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/patch-30-W32TeX
index 6fd75d133b8..7eb0899e84b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-30-W32TeX
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-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.95.orig/otftotfm/automatic.cc lcdf-typetools-2.95/otftotfm/automatic.cc
---- lcdf-typetools-2.95.orig/otftotfm/automatic.cc	2012-09-24 19:31:55.000000000 +0200
-+++ lcdf-typetools-2.95/otftotfm/automatic.cc	2012-09-25 10:40:10.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/otftotfm/automatic.cc lcdf-typetools-2.97/otftotfm/automatic.cc
+--- lcdf-typetools-2.97.orig/otftotfm/automatic.cc	2012-10-26 08:35:40.000000000 +0200
++++ lcdf-typetools-2.97/otftotfm/automatic.cc	2012-10-26 08:36:32.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.95.orig/otftotfm/kpseinterface.c lcdf-typetools-2.95/otftotfm/kpseinterface.c
---- lcdf-typetools-2.95.orig/otftotfm/kpseinterface.c	2012-09-17 00:17:57.000000000 +0200
-+++ lcdf-typetools-2.95/otftotfm/kpseinterface.c	2012-09-25 10:59:20.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/otftotfm/kpseinterface.c lcdf-typetools-2.97/otftotfm/kpseinterface.c
+--- lcdf-typetools-2.97.orig/otftotfm/kpseinterface.c	2012-10-25 14:25:12.000000000 +0200
++++ lcdf-typetools-2.97/otftotfm/kpseinterface.c	2012-10-26 08:36:32.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.95.orig/otftotfm/kpseinterface.h lcdf-typetools-2.95/otftotfm/kpseinterface.h
---- lcdf-typetools-2.95.orig/otftotfm/kpseinterface.h	2008-12-07 02:17:20.000000000 +0100
-+++ lcdf-typetools-2.95/otftotfm/kpseinterface.h	2012-09-25 11:00:41.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/otftotfm/kpseinterface.h lcdf-typetools-2.97/otftotfm/kpseinterface.h
+--- lcdf-typetools-2.97.orig/otftotfm/kpseinterface.h	2011-11-03 17:51:58.000000000 +0100
++++ lcdf-typetools-2.97/otftotfm/kpseinterface.h	2012-10-26 08:36:32.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.95.orig/otftotfm/otftotfm.cc lcdf-typetools-2.95/otftotfm/otftotfm.cc
---- lcdf-typetools-2.95.orig/otftotfm/otftotfm.cc	2012-09-24 19:15:23.000000000 +0200
-+++ lcdf-typetools-2.95/otftotfm/otftotfm.cc	2012-09-25 11:09:15.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/otftotfm/otftotfm.cc lcdf-typetools-2.97/otftotfm/otftotfm.cc
+--- lcdf-typetools-2.97.orig/otftotfm/otftotfm.cc	2012-10-26 08:31:26.000000000 +0200
++++ lcdf-typetools-2.97/otftotfm/otftotfm.cc	2012-10-26 08:36:32.000000000 +0200
 @@ -1739,6 +1739,11 @@
      }
  }
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/7t.enc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/7t.enc
index 727f29e5f8c..727f29e5f8c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/7t.enc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/7t.enc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/COPYING b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/COPYING
index 67572846722..67572846722 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/COPYING
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/COPYING
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/INSTALL b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/INSTALL
index 95d84c820fb..95d84c820fb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/INSTALL
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/INSTALL
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/Makefile.am
index c91a420d711..de0535c5252 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/Makefile.am
@@ -2,10 +2,8 @@
 AUTOMAKE_OPTIONS = foreign check-news
 
 SUBDIRS = liblcdf libefont @SELECTED_SUBDIRS@
-DIST_SUBDIRS = liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42
-
-glyphlist_DATA = glyphlist.txt texglyphlist.txt
-enc_DATA = 7t.enc
+DIST_SUBDIRS = liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm \
+	t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42
 
 EXTRA_DIST = \
 	ONEWS \
@@ -64,10 +62,14 @@ EXTRA_DIST = \
 	texglyphlist-g2u.txt \
 	7t.enc
 
+glyphlist_DATA = glyphlist.txt texglyphlist.txt
+enc_DATA = 7t.enc
+
 liblcdf libefont:
 	cd $@ && $(MAKE)
 libefont: liblcdf
-cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42: liblcdf libefont
+cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm \
+t1reencode t1testpage ttftotype42: liblcdf libefont
 	cd $@ && $(MAKE)
 
 versionize:
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/Makefile.in
index df84f67df12..b9af7ea6274 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/Makefile.in
@@ -50,7 +50,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = lcdf-typetools-2.95
+subdir = lcdf-typetools-2.97
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	COPYING INSTALL NEWS
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -282,9 +282,9 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign check-news
 SUBDIRS = liblcdf libefont @SELECTED_SUBDIRS@
-DIST_SUBDIRS = liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42
-glyphlist_DATA = glyphlist.txt texglyphlist.txt
-enc_DATA = 7t.enc
+DIST_SUBDIRS = liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm \
+	t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42
+
 EXTRA_DIST = \
 	ONEWS \
 	lcdf-typetools.spec \
@@ -342,6 +342,8 @@ EXTRA_DIST = \
 	texglyphlist-g2u.txt \
 	7t.enc
 
+glyphlist_DATA = glyphlist.txt texglyphlist.txt
+enc_DATA = 7t.enc
 all: all-recursive
 
 .SUFFIXES:
@@ -354,9 +356,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.95/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.97/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -736,7 +738,8 @@ uninstall-am: uninstall-encDATA uninstall-glyphlistDATA
 liblcdf libefont:
 	cd $@ && $(MAKE)
 libefont: liblcdf
-cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42: liblcdf libefont
+cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm \
+t1reencode t1testpage ttftotype42: liblcdf libefont
 	cd $@ && $(MAKE)
 
 versionize:
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/NEWS b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/NEWS
index c5fd7fc87fb..3ecdf0b7252 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/NEWS
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/NEWS
@@ -1,5 +1,15 @@
 LCDF Typetools NEWS
 
+Version 2.97   25.Oct.2012
+
+* Same.
+
+
+Version 2.96   25.Oct.2012
+
+* Build improvements inspired by Peter Breitenlohner.
+
+
 Version 2.95   21.Sep.2012
 
 * Fix cfftot1: Don't crash on problematic fonts. Bob Tennent report.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ONEWS b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ONEWS
index 6bd9dc8c42d..6bd9dc8c42d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ONEWS
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ONEWS
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/README b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/README
index de2388a2088..fbd7bdd85b9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/README
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/README
@@ -1,4 +1,4 @@
-LCDF-TYPETOOLS 2.95
+LCDF-TYPETOOLS 2.97
 ===================
 
 USAGE
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/autoconf.h.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/autoconf.h.in
index 127a78753f2..112122b274d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/autoconf.h.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/autoconf.h.in
@@ -3,6 +3,9 @@
 /* Define if building universal (internal helper macro) */
 #undef AC_APPLE_UNIVERSAL_BUILD
 
+/* Directory for glyphlist.txt files. */
+#undef GLYPHLISTDIR
+
 /* Define if the va_list type is addressable. */
 #undef HAVE_ADDRESSABLE_VA_LIST
 
@@ -190,9 +193,6 @@
 /* kpsewhich's $SELFAUTOPARENT variable */
 #undef SELFAUTOPARENT
 
-/* Data directory. */
-#undef SHAREDIR
-
 /* The size of `unsigned int', as computed by sizeof. */
 #undef SIZEOF_UNSIGNED_INT
 
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/Makefile.am
index 81d5365b976..81d5365b976 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/Makefile.in
index cd4418e58ec..40006c95f55 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = cfftot1$(EXEEXT)
-subdir = lcdf-typetools-2.95/cfftot1
+subdir = lcdf-typetools-2.97/cfftot1
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -293,9 +293,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.95/cfftot1/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/cfftot1/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/cfftot1/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.97/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.95/cfftot1/cfftot1.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/cfftot1.1
index 01da90f92b1..a7589aa08c3 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/cfftot1.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/cfftot1.1
@@ -1,4 +1,4 @@
-.ds V 2.95
+.ds V 2.97
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/cfftot1.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/cfftot1.cc
index fe719e86d56..fe719e86d56 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/cfftot1.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/cfftot1.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/maket1font.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/maket1font.cc
index 21b632e50d9..21b632e50d9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/maket1font.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/maket1font.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/maket1font.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/maket1font.hh
index 75f2527897f..75f2527897f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/maket1font.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/maket1font.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/configure.ac b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/configure.ac
index 5d3d3db545c..a7c07e6534f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/configure.ac
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([lcdf-typetools], [2.95])
+AC_INIT([lcdf-typetools], [2.97])
 AC_CONFIG_SRCDIR([NEWS])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER([autoconf.h])
@@ -426,17 +426,26 @@ Either supply the correct PREFIX to --with-kpathsea, or supply
 
 =========================================])
     fi
-    AC_DEFINE_UNQUOTED(SELFAUTOLOC, "$SELFAUTOLOC", [kpsewhich's $SELFAUTOLOC variable])
-    AC_DEFINE_UNQUOTED(SELFAUTODIR, "$SELFAUTODIR", [kpsewhich's $SELFAUTODIR variable])
-    AC_DEFINE_UNQUOTED(SELFAUTOPARENT, "$SELFAUTOPARENT", [kpsewhich's $SELFAUTOPARENT variable])
+    AC_DEFINE_UNQUOTED([SELFAUTOLOC], "$SELFAUTOLOC", [kpsewhich's $SELFAUTOLOC variable])
+    AC_DEFINE_UNQUOTED([SELFAUTODIR], "$SELFAUTODIR", [kpsewhich's $SELFAUTODIR variable])
+    AC_DEFINE_UNQUOTED([SELFAUTOPARENT], "$SELFAUTOPARENT", [kpsewhich's $SELFAUTOPARENT variable])
 fi
 
 
 dnl
-dnl directories for data files
+dnl glyphlist.txt and *.enc installation locations
 dnl
-glyphlistdir='${pkgdatadir}'
-encdir='${pkgdatadir}'
+
+AC_ARG_ENABLE([glyphlistdir],
+  [AS_HELP_STRING([--enable-glyphlistdir=DIR], [store glyphlist.txt files in DIR [pkgdatadir]])], [glyphlistdir="$enableval"], [glyphlistdir=NONE])
+AC_ARG_ENABLE([encdir],
+  [AS_HELP_STRING([--enable-encdir=DIR], [store encoding files in DIR [pkgdatadir]])], [encdir="$enableval"], [encdir=NONE])
+
+test "x$glyphlistdir" = xNONE -o "x$glyphlistdir" = xno \
+     -o "x$glyphlistdir" = x && glyphlistdir='${pkgdatadir}'
+test "x$encdir" = xNONE -o "x$encdir" = xno \
+     -o "x$encdir" = x && encdir='${pkgdatadir}'
+
 AC_SUBST([glyphlistdir])
 AC_SUBST([encdir])
 
@@ -463,18 +472,20 @@ dnl set path variables
 dnl
 
 shell_expand () {
-  val=`eval echo '$'"$1"`
-  while echo "x$val" | fgrep '$' >/dev/null 2>&1; do val=`eval echo "$val"`; done
-  eval "$1='$val'"
+    val=`eval echo '$'"$1"`
+    while echo "x$val" | grep '\$' >/dev/null 2>&1; do val=`eval echo "$val"`; done
+    val=`echo "$val" | sed 's,//*,/,g'`
+    eval "$1='$val'"
 }
 
 dnl Preset $prefix and $exec_prefix.
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-shell_expand datadir
-
-AC_DEFINE_UNQUOTED(SHAREDIR, "$datadir/lcdf-typetools", [Data directory.])
+pkgdatadir="${datadir}/$PACKAGE"
+gdir="$glyphlistdir"
+for i in data dataroot pkgdata g; do shell_expand ${i}dir; done
+AC_DEFINE_UNQUOTED([GLYPHLISTDIR], ["$gdir"], [Directory for glyphlist.txt files.])
 
 
 dnl
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/glyphlist.txt b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/glyphlist.txt
index 0304ffc6674..0304ffc6674 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/glyphlist.txt
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/glyphlist.txt
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/glyphtounicode.tex b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/glyphtounicode.tex
index adaf8c82fc1..adaf8c82fc1 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/glyphtounicode.tex
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/glyphtounicode.tex
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/config.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/config.h
index 26a90a97b14..26a90a97b14 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/config.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/config.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/afm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/afm.hh
index f462e0079a4..f462e0079a4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/afm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/afm.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/afmparse.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/afmparse.hh
index c29d990ceab..c29d990ceab 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/afmparse.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/afmparse.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/afmw.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/afmw.hh
index 4eda701b688..4eda701b688 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/afmw.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/afmw.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/amfm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/amfm.hh
index 6cc1db90b6e..6cc1db90b6e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/amfm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/amfm.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/cff.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/cff.hh
index f965bd60c07..f965bd60c07 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/cff.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/cff.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/encoding.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/encoding.hh
index fd8d749acec..fd8d749acec 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/encoding.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/encoding.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/findmet.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/findmet.hh
index 74b3ecee141..74b3ecee141 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/findmet.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/findmet.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/metrics.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/metrics.hh
index 21a5f1796fb..21a5f1796fb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/metrics.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/metrics.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otf.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otf.hh
index 88e4fbfce4d..88e4fbfce4d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otf.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otf.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfcmap.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfcmap.hh
index f95a3dc5c41..f95a3dc5c41 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfcmap.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfcmap.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfdata.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfdata.hh
index 18fd894d5d2..18fd894d5d2 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfdata.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfdata.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfgpos.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfgpos.hh
index 84de5a2126b..84de5a2126b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfgpos.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfgpos.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfgsub.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfgsub.hh
index 98a2e0f945a..98a2e0f945a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfgsub.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfgsub.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfname.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfname.hh
index c91fc5af95f..c91fc5af95f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfname.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfname.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfos2.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfos2.hh
index db26b674522..db26b674522 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfos2.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfos2.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfpost.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfpost.hh
index 58651583fcb..58651583fcb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfpost.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfpost.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/pairop.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/pairop.hh
index bbb42073e44..bbb42073e44 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/pairop.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/pairop.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/psres.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/psres.hh
index ee302821fdb..ee302821fdb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/psres.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/psres.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1bounds.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1bounds.hh
index c5e50634f4c..c5e50634f4c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1bounds.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1bounds.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1cs.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1cs.hh
index 1a3f8e8f039..1a3f8e8f039 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1cs.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1cs.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1csgen.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1csgen.hh
index 226497a4a6b..226497a4a6b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1csgen.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1csgen.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1font.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1font.hh
index 4ec827e7e24..4ec827e7e24 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1font.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1font.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1interp.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1interp.hh
index 0b693b08c70..0b693b08c70 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1interp.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1interp.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1item.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1item.hh
index 056ba0e71d4..056ba0e71d4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1item.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1item.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1mm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1mm.hh
index bf2e81a00e9..bf2e81a00e9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1mm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1mm.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1rw.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1rw.hh
index d59f4089742..d59f4089742 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1rw.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1rw.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1unparser.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1unparser.hh
index 3a6e446e3c7..3a6e446e3c7 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1unparser.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1unparser.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/ttfcs.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/ttfcs.hh
index a2c04461872..a2c04461872 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/ttfcs.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/ttfcs.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/ttfhead.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/ttfhead.hh
index 2611a405b1b..2611a405b1b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/ttfhead.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/ttfhead.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/ttfkern.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/ttfkern.hh
index 717a72b6912..717a72b6912 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/ttfkern.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/ttfkern.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/bezier.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/bezier.hh
index ebb93ce9aea..ebb93ce9aea 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/bezier.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/bezier.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/clp.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/clp.h
index 1b658a17190..1b658a17190 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/clp.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/clp.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/error.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/error.hh
index f43d5d7157e..f43d5d7157e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/error.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/error.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/filename.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/filename.hh
index 9424a4c04fa..9424a4c04fa 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/filename.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/filename.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/globmatch.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/globmatch.hh
index 963035e0ead..963035e0ead 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/globmatch.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/globmatch.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/hashcode.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/hashcode.hh
index 53a0e428989..53a0e428989 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/hashcode.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/hashcode.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/hashmap.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/hashmap.cc
index 4851463c560..4851463c560 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/hashmap.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/hashmap.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/hashmap.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/hashmap.hh
index 3d4179e5b5f..3d4179e5b5f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/hashmap.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/hashmap.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/inttypes.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/inttypes.h
index b88e9e9faf0..b88e9e9faf0 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/inttypes.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/inttypes.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/landmark.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/landmark.hh
index 183ab936ee8..183ab936ee8 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/landmark.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/landmark.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/md5.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/md5.h
index 7d7f8641d23..7d7f8641d23 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/md5.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/md5.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/permstr.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/permstr.hh
index 684878ed464..684878ed464 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/permstr.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/permstr.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/point.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/point.hh
index aad59b53ccf..aad59b53ccf 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/point.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/point.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/slurper.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/slurper.hh
index 2e400d3c3f2..2e400d3c3f2 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/slurper.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/slurper.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/straccum.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/straccum.hh
index 9474421e85f..9474421e85f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/straccum.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/straccum.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/string.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/string.hh
index a704c201572..d3ca5e87bd2 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/string.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/string.hh
@@ -442,25 +442,9 @@ class String { public:
      * @sa String::compare(const String &a, const String &b) */
     bool starts_with(const char *s, int len) const;
 
-
-    /** @brief Return a lowercased version of this string.
-     *
-     * Translates the ASCII characters 'A' through 'Z' into their lowercase
-     * equivalents. */
     String lower() const;
-
-    /** @brief Return an uppercased version of this string.
-     *
-     * Translates the ASCII characters 'a' through 'z' into their uppercase
-     * equivalents. */
     String upper() const;
-
-    /** @brief Return a "printable" version of this string.
-     *
-     * Translates control characters 0-31 into "control" sequences, such as
-     * "^@" for the null character, and characters 127-255 into octal escape
-     * sequences, such as "\377" for 255. */
-    String printable() const;
+    String printable(int type = 0) const;
 
 
     /** @brief Assign this string to @a x. */
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/strtonum.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/strtonum.h
index ee8745a4a42..ee8745a4a42 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/strtonum.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/strtonum.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/transform.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/transform.hh
index 496658a4911..496658a4911 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/transform.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/transform.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/vector.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/vector.cc
index 8ad11c18810..8ad11c18810 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/vector.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/vector.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/vector.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/vector.hh
index 86e64e238ba..86e64e238ba 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/vector.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/vector.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/lcdf-typetools.spec b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/lcdf-typetools.spec
index 80d19169d3b..0dd5719fddc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/lcdf-typetools.spec
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/lcdf-typetools.spec
@@ -1,6 +1,6 @@
 Summary: Programs to manipulate OpenType and multiple-master fonts
 Name: lcdf-typetools
-Version: 2.95
+Version: 2.97
 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.95/libefont/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/Makefile.am
index eb09a9686ad..eb09a9686ad 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/Makefile.in
index 4e67d5bcc5a..5a43a6778fc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/Makefile.in
@@ -50,7 +50,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = lcdf-typetools-2.95/libefont
+subdir = lcdf-typetools-2.97/libefont
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -294,9 +294,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.95/libefont/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/libefont/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/libefont/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.97/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.95/libefont/afm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/afm.cc
index 9705f91c97f..9705f91c97f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/afm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/afm.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/afmparse.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/afmparse.cc
index 313b63ec362..313b63ec362 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/afmparse.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/afmparse.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/afmw.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/afmw.cc
index 20840be1332..20840be1332 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/afmw.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/afmw.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/amfm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/amfm.cc
index b38532d55fb..b38532d55fb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/amfm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/amfm.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/cff.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/cff.cc
index 822d57ec94d..822d57ec94d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/cff.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/cff.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/encoding.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/encoding.cc
index a55ecc4db25..a55ecc4db25 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/encoding.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/encoding.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/findmet.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/findmet.cc
index aa5b8167156..aa5b8167156 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/findmet.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/findmet.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/metrics.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/metrics.cc
index 0dd308056e2..0dd308056e2 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/metrics.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/metrics.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otf.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otf.cc
index fb0abe3806a..fb0abe3806a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otf.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otf.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfcmap.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfcmap.cc
index b62b7188b86..b62b7188b86 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfcmap.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfcmap.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfdata.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfdata.cc
index 46c7c885c59..46c7c885c59 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfdata.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfdata.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfdescrip.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfdescrip.cc
index 307f0b3cb61..307f0b3cb61 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfdescrip.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfdescrip.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfgpos.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfgpos.cc
index eb477256c5c..eb477256c5c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfgpos.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfgpos.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfgsub.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfgsub.cc
index 10597847270..10597847270 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfgsub.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfgsub.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfname.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfname.cc
index 642b41fb845..642b41fb845 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfname.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfname.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfos2.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfos2.cc
index 9831fb49543..9831fb49543 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfos2.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfos2.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfpost.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfpost.cc
index b514f234f4b..b514f234f4b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfpost.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfpost.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/pairop.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/pairop.cc
index 5b64be1ac41..5b64be1ac41 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/pairop.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/pairop.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/psres.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/psres.cc
index 2136a6b3237..2136a6b3237 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/psres.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/psres.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1bounds.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1bounds.cc
index ccea404d4d3..ccea404d4d3 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1bounds.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1bounds.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1cs.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1cs.cc
index 4db3afa5a9d..4db3afa5a9d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1cs.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1cs.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1csgen.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1csgen.cc
index b24c8f21307..b24c8f21307 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1csgen.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1csgen.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1font.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1font.cc
index 05b97fa346e..05b97fa346e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1font.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1font.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1fontskel.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1fontskel.cc
index e5e48023348..e5e48023348 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1fontskel.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1fontskel.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1interp.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1interp.cc
index 7b607bb407d..7b607bb407d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1interp.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1interp.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1item.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1item.cc
index 5e169b66f13..5e169b66f13 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1item.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1item.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1mm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1mm.cc
index 404335a8f20..404335a8f20 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1mm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1mm.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1rw.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1rw.cc
index 846297e6b67..846297e6b67 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1rw.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1rw.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1unparser.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1unparser.cc
index 993253deec9..993253deec9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1unparser.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1unparser.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/ttfcs.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/ttfcs.cc
index d427cf17bcc..d427cf17bcc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/ttfcs.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/ttfcs.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/ttfhead.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/ttfhead.cc
index 5be8676c64c..5be8676c64c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/ttfhead.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/ttfhead.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/ttfkern.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/ttfkern.cc
index 824922457ac..824922457ac 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/ttfkern.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/ttfkern.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/Makefile.am
index 0cc406d4e70..0cc406d4e70 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/Makefile.in
index 6ca6275b621..87e3eb10557 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @FIXLIBC_TRUE@am__append_1 = fixlibc.c
-subdir = lcdf-typetools-2.95/liblcdf
+subdir = lcdf-typetools-2.97/liblcdf
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -274,9 +274,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.95/liblcdf/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/liblcdf/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/liblcdf/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.97/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.95/liblcdf/bezier.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/bezier.cc
index 95c8d8b9fb0..95c8d8b9fb0 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/bezier.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/bezier.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/clp.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/clp.c
index b8aaafd2096..b8aaafd2096 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/clp.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/clp.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/error.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/error.cc
index 0ca36c703d5..0ca36c703d5 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/error.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/error.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/filename.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/filename.cc
index 396e81cd3c5..396e81cd3c5 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/filename.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/filename.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/fixlibc.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/fixlibc.c
index d41238daf85..d41238daf85 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/fixlibc.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/fixlibc.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/globmatch.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/globmatch.cc
index dcd7afc135c..dcd7afc135c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/globmatch.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/globmatch.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/landmark.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/landmark.cc
index 68511055ddc..68511055ddc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/landmark.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/landmark.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/md5.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/md5.c
index 8a45ee8b87a..557a39bef95 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/md5.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/md5.c
@@ -98,7 +98,7 @@ transform(MD5_CONTEXT *ctx, const unsigned char *data)
 	uint32_t D = ctx->D;
 	uint32_t *cwp = correct_words;
 
-#ifdef BIG_ENDIAN_HOST
+#if WORDS_BIGENDIAN
 	{
 		int i;
 		unsigned char *p2, *p1;
@@ -111,8 +111,10 @@ transform(MD5_CONTEXT *ctx, const unsigned char *data)
 			p2[0] = *p1++;
 		}
 	}
-#else
+#elif WORDS_LITTLEENDIAN
 	memcpy(correct_words, data, 64);
+#else
+# error "Neither WORDS_BIGENDIAN nor WORDS_LITTLEENDIAN is defined!"
 #endif
 
 
@@ -305,14 +307,16 @@ do_final(MD5_CONTEXT *hd)
 	transform(hd, hd->buf);
 
 	p = hd->buf;
-#ifdef BIG_ENDIAN_HOST
+#if WORDS_BIGENDIAN
 #define X(a) do { *p++ = hd->a      ; *p++ = hd->a >> 8;      \
 		  *p++ = hd->a >> 16; *p++ = hd->a >> 24; } while(0)
-#else /* little endian */
+#elif WORDS_LITTLEENDIAN
 	/*#define X(a) do { *(uint32_t*)p = hd->##a ; p += 4; } while(0)*/
 	/* Unixware's cpp doesn't like the above construct so we do it his way:
 	 * (reported by Allan Clark) */
 #define X(a) do { *(uint32_t*)p = (*hd).a ; p += 4; } while(0)
+#else
+# error "Neither WORDS_BIGENDIAN nor WORDS_LITTLEENDIAN is defined!"
 #endif
 	X(A);
 	X(B);
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/permstr.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/permstr.cc
index c6aebab31e7..c6aebab31e7 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/permstr.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/permstr.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/point.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/point.cc
index 8b23fdcb571..8b23fdcb571 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/point.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/point.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/slurper.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/slurper.cc
index e089617705d..e089617705d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/slurper.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/slurper.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/straccum.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/straccum.cc
index f31b9e216fc..f31b9e216fc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/straccum.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/straccum.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/string.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/string.cc
index cd0410de155..ec14c378f20 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/string.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/string.cc
@@ -28,6 +28,13 @@
 #include <ctype.h>
 #include <lcdf/inttypes.h>
 
+#ifndef likely
+#define likely(x) (x)
+#endif
+#ifndef unlikely
+#define unlikely(x) (x)
+#endif
+
 /** @file string.hh
  * @brief The LCDF String class.
  */
@@ -45,9 +52,9 @@
  * <h3>Out-of-memory strings</h3>
  *
  * When there is not enough memory to create a particular string, a special
- * "out-of-memory" string is returned instead.  Out-of-memory strings are
+ * "out-of-memory" string is returned instead. Out-of-memory strings are
  * contagious: the result of any concatenation operation involving an
- * out-of-memory string is another out-of-memory string.  Thus, the final
+ * out-of-memory string is another out-of-memory string. Thus, the final
  * result of a series of String operations will be an out-of-memory string,
  * even if the out-of-memory condition occurs in the middle.
  *
@@ -139,7 +146,6 @@ String::delete_memo(memo_t *memo)
 }
 
 
-
 #if HAVE_STRING_PROFILING
 void
 String::one_profile_report(StringAccum &sa, int i, int examples)
@@ -190,6 +196,7 @@ String::profile_report(StringAccum &sa, int examples)
 /** @endcond never */
 
 
+/** @brief Construct a base-10 string representation of @a x. */
 String::String(int x)
 {
     if (x >= 0 && x < 10)
@@ -201,6 +208,7 @@ String::String(int x)
     }
 }
 
+/** @overload */
 String::String(unsigned x)
 {
     if (x < 10)
@@ -212,6 +220,7 @@ String::String(unsigned x)
     }
 }
 
+/** @overload */
 String::String(long x)
 {
     if (x >= 0 && x < 10)
@@ -223,6 +232,7 @@ String::String(long x)
     }
 }
 
+/** @overload */
 String::String(unsigned long x)
 {
     if (x < 10)
@@ -276,21 +286,21 @@ String::assign_out_of_memory()
 }
 
 void
-String::assign(const char *str, int len, bool need_deref)
+String::assign(const char *s, int len, bool need_deref)
 {
-    if (!str) {
+    if (!s) {
 	assert(len <= 0);
 	len = 0;
     } else if (len < 0)
-	len = strlen(str);
+	len = strlen(s);
 
     // need to start with dereference
     if (need_deref) {
-	if (_r.memo
-	    && str >= _r.memo->real_data
-	    && str + len <= _r.memo->real_data + _r.memo->capacity) {
+	if (unlikely(_r.memo
+		     && s >= _r.memo->real_data
+		     && s + len <= _r.memo->real_data + _r.memo->capacity)) {
 	    // Be careful about "String s = ...; s = s.c_str();"
-	    _r.data = str;
+	    _r.data = s;
 	    _r.length = len;
 	    return;
 	} else
@@ -299,7 +309,7 @@ String::assign(const char *str, int len, bool need_deref)
 
     if (len == 0) {
 	_r.memo = 0;
-	_r.data = (str == &oom_data ? str : &null_data);
+	_r.data = (s == &oom_data ? s : &null_data);
 
     } else {
 	// Make the memo a multiple of 16 characters and bigger than 'len'.
@@ -309,18 +319,23 @@ String::assign(const char *str, int len, bool need_deref)
 	    assign_out_of_memory();
 	    return;
 	}
-	memcpy(_r.memo->real_data, str, len);
+	memcpy(_r.memo->real_data, s, len);
 	_r.data = _r.memo->real_data;
     }
 
     _r.length = len;
 }
 
+/** @brief Append @a len unknown characters to this string.
+ * @return Modifiable pointer to the appended characters.
+ *
+ * The caller may safely modify the returned memory. Null is returned if
+ * the string becomes out-of-memory. */
 char *
 String::append_uninitialized(int len)
 {
     // Appending anything to "out of memory" leaves it as "out of memory"
-    if (len <= 0 || _r.data == &oom_data)
+    if (unlikely(len <= 0) || out_of_memory())
 	return 0;
 
     // If we can, append into unused space. First, we check that there's
@@ -388,9 +403,9 @@ String::append(const char *s, int len, memo_t *memo)
     else if (_r.length == 0 && memo && !out_of_memory()) {
 	deref();
 	assign_memo(s, len, memo);
-    } else if (!(_r.memo
-		 && s >= _r.memo->real_data
-		 && s + len <= _r.memo->real_data + _r.memo->capacity)) {
+    } else if (likely(!(_r.memo
+			&& s >= _r.memo->real_data
+			&& s + len <= _r.memo->real_data + _r.memo->capacity))) {
 	if (char *space = append_uninitialized(len))
 	    memcpy(space, s, len);
     } else {
@@ -400,6 +415,7 @@ String::append(const char *s, int len, memo_t *memo)
     }
 }
 
+/** @brief Append @a len copies of character @a c to this string. */
 void
 String::append_fill(int c, int len)
 {
@@ -408,6 +424,8 @@ String::append_fill(int c, int len)
 	memset(space, c, len);
 }
 
+/** @brief Ensure the string's data is unshared and return a mutable
+    pointer to it. */
 char *
 String::mutable_data()
 {
@@ -434,6 +452,20 @@ String::mutable_c_str()
     return const_cast<char *>(_r.data);
 }
 
+/** @brief Return a substring of this string, consisting of the @a len
+    characters starting at index @a pos.
+    @param pos substring's first position relative to the string
+    @param len length of substring
+
+    If @a pos is negative, starts that far from the end of the string. If @a
+    len is negative, leaves that many characters off the end of the string.
+    If @a pos and @a len specify a substring that is partly outside the
+    string, only the part within the string is returned. If the substring is
+    beyond either end of the string, returns an empty string (but this
+    should be considered a programming error; a future version may generate
+    a warning for this case).
+
+    @note String::substring() is intended to behave like Perl's substr(). */
 String
 String::substring(int pos, int len) const
 {
@@ -475,16 +507,10 @@ String::find_left(const String &str, int start) const
 {
     if (start < 0)
 	start = 0;
-    if (start >= length())
-	return -1;
-    if (!str.length())
-	return 0;
-    int first_c = (unsigned char)str[0];
-    int pos = start, max_pos = length() - str.length();
-    for (pos = find_left(first_c, pos); pos >= 0 && pos <= max_pos;
-	 pos = find_left(first_c, pos + 1))
-	if (!memcmp(_r.data + pos, str._r.data, str.length()))
-	    return pos;
+    int max_pos = length() - str.length();
+    for (int i = start; i <= max_pos; ++i)
+	if (memcmp(_r.data + i, str.data(), str.length()) == 0)
+	    return i;
     return -1;
 }
 
@@ -510,13 +536,18 @@ hard_lower(const String &s, int pos)
     return new_s;
 }
 
+/** @brief Return a lowercased version of this string.
+
+    Translates the ASCII characters 'A' through 'Z' into their lowercase
+    equivalents. */
 String
 String::lower() const
 {
     // avoid copies
-    for (int i = 0; i < _r.length; i++)
-	if (_r.data[i] >= 'A' && _r.data[i] <= 'Z')
-	    return hard_lower(*this, i);
+    if (!out_of_memory())
+	for (int i = 0; i < _r.length; i++)
+	    if (_r.data[i] >= 'A' && _r.data[i] <= 'Z')
+		return hard_lower(*this, i);
     return *this;
 }
 
@@ -531,6 +562,10 @@ hard_upper(const String &s, int pos)
     return new_s;
 }
 
+/** @brief Return an uppercased version of this string.
+
+    Translates the ASCII characters 'a' through 'z' into their uppercase
+    equivalents. */
 String
 String::upper() const
 {
@@ -542,7 +577,7 @@ String::upper() const
 }
 
 static String
-hard_printable(const String &s, int pos)
+hard_printable(const String &s, int pos, int type)
 {
     StringAccum sa(s.length() * 2);
     sa.append(s.data(), pos);
@@ -551,7 +586,7 @@ hard_printable(const String &s, int pos)
     for (; pos < len; pos++) {
 	if (x[pos] >= 32 && x[pos] < 127)
 	    sa << x[pos];
-	else if (x[pos] < 32)
+	else if (x[pos] < 32 && type != 1)
 	    sa << '^' << (unsigned char)(x[pos] + 64);
 	else if (char *buf = sa.extend(4, 1))
 	    sprintf(buf, "\\%03o", x[pos]);
@@ -559,13 +594,22 @@ hard_printable(const String &s, int pos)
     return sa.take_string();
 }
 
+/** @brief Return a "printable" version of this string.
+    @param type quoting type
+
+    The default quoting type (0) translates control characters 0-31 into
+    "control" sequences, such as "^@" for the null character, and characters
+    127-255 into octal escape sequences, such as "\377" for 255. Quoting
+    type 1 translates all characters outside of 32-126 into octal escape
+    sequences. */
 String
-String::printable() const
+String::printable(int type) const
 {
     // avoid copies
-    for (int i = 0; i < _r.length; i++)
-	if (_r.data[i] < 32 || _r.data[i] > 126)
-	    return hard_printable(*this, i);
+    if (!out_of_memory())
+	for (int i = 0; i < _r.length; i++)
+	    if (_r.data[i] < 32 || _r.data[i] > 126)
+		return hard_printable(*this, i, type);
     return *this;
 }
 
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/strtonum.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/strtonum.c
index 36898c5a7ad..36898c5a7ad 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/strtonum.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/strtonum.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/transform.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/transform.cc
index 5eb0ff58728..5eb0ff58728 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/transform.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/transform.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/vectorv.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/vectorv.cc
index f5f12b52c90..f5f12b52c90 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/vectorv.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/vectorv.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/m4/lcdf-typetools.m4 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/m4/lcdf-typetools.m4
index 7aaff4c33af..7aaff4c33af 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/m4/lcdf-typetools.m4
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/m4/lcdf-typetools.m4
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmafm/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/Makefile.am
index 6438927eb5f..6438927eb5f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmafm/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmafm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/Makefile.in
index 5b32611dbb7..f2bbc2c5fff 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = mmafm$(EXEEXT)
-subdir = lcdf-typetools-2.95/mmafm
+subdir = lcdf-typetools-2.97/mmafm
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -282,9 +282,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.95/mmafm/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/mmafm/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/mmafm/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.97/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.95/mmafm/main.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/main.cc
index 99e320f94bd..99e320f94bd 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmafm/main.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/main.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmafm/mmafm.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/mmafm.1
index 6eea36ad475..2a118d8caa2 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmafm/mmafm.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/mmafm.1
@@ -1,5 +1,5 @@
 .\" -*-nroff-*-
-.ds V 2.95
+.ds V 2.97
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/Makefile.am
index 527b7d14937..527b7d14937 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/Makefile.in
index 928a837d9ce..abceddec4ae 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = mmpfb$(EXEEXT)
-subdir = lcdf-typetools-2.95/mmpfb
+subdir = lcdf-typetools-2.97/mmpfb
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -296,9 +296,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.95/mmpfb/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/mmpfb/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/mmpfb/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.97/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.95/mmpfb/main.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/main.cc
index 1d685f18eff..1d685f18eff 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/main.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/main.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/mmpfb.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/mmpfb.1
index c07ef72b151..d3795528ac4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/mmpfb.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/mmpfb.1
@@ -1,5 +1,5 @@
 .\" -*-nroff-*-
-.ds V 2.95
+.ds V 2.97
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/myfont.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/myfont.cc
index 1325b44d3e6..1325b44d3e6 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/myfont.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/myfont.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/myfont.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/myfont.hh
index ffe35668f94..ffe35668f94 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/myfont.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/myfont.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/t1minimize.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1minimize.cc
index 2c4b1bcb015..2c4b1bcb015 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/t1minimize.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1minimize.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/t1minimize.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1minimize.hh
index a5c3ea04906..a5c3ea04906 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/t1minimize.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1minimize.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/t1rewrit.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1rewrit.cc
index 86382ca239b..86382ca239b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/t1rewrit.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1rewrit.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/t1rewrit.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1rewrit.hh
index eac9d75beeb..eac9d75beeb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/t1rewrit.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1rewrit.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otfinfo/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/Makefile.am
index 837eb83ef0f..837eb83ef0f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otfinfo/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otfinfo/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/Makefile.in
index c095bdf9b3a..6356745e2b1 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otfinfo/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = otfinfo$(EXEEXT)
-subdir = lcdf-typetools-2.95/otfinfo
+subdir = lcdf-typetools-2.97/otfinfo
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -284,9 +284,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.95/otfinfo/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/otfinfo/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/otfinfo/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.97/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.95/otfinfo/otfinfo.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/otfinfo.1
index c8057737c90..a3367e28c7e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otfinfo/otfinfo.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/otfinfo.1
@@ -1,5 +1,5 @@
 '\"t
-.ds V 2.95
+.ds V 2.97
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otfinfo/otfinfo.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/otfinfo.cc
index 74d340c3d45..74d340c3d45 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otfinfo/otfinfo.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/otfinfo.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/Makefile.am
index d75c552f12e..d75c552f12e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/Makefile.in
index eabd0e6820d..f044107781a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/Makefile.in
@@ -55,7 +55,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.95/otftotfm
+subdir = lcdf-typetools-2.97/otftotfm
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -312,9 +312,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.95/otftotfm/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/otftotfm/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/otftotfm/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.97/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.95/otftotfm/automatic.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/automatic.cc
index b42e6734d36..aae70b16b58 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/automatic.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/automatic.cc
@@ -564,7 +564,7 @@ installed_type42(const String &ttf_filename, const String &ps_fontname, bool all
 #endif
 
 #if HAVE_AUTO_TTFTOTYPE42
-    // if not found, and can generate on the fly, run cfftot1
+    // if not found, and can generate on the fly, run ttftotype42
     if (allow_generate && ttf_filename && ttf_filename != "-" && getodir(O_TYPE42, errh)) {
 	String t42_filename = odir[O_TYPE42] + "/" + ps_fontname + ".t42";
 	if (t42_filename.find_left('\'') >= 0 || ttf_filename.find_left('\'') >= 0)
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/automatic.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/automatic.hh
index 4c973347715..4c973347715 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/automatic.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/automatic.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/dvipsencoding.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/dvipsencoding.cc
index 870c7d02885..870c7d02885 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/dvipsencoding.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/dvipsencoding.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/dvipsencoding.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/dvipsencoding.hh
index a80631c3038..a80631c3038 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/dvipsencoding.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/dvipsencoding.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/glyphfilter.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/glyphfilter.cc
index a4120660bfc..a4120660bfc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/glyphfilter.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/glyphfilter.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/glyphfilter.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/glyphfilter.hh
index 753e5714d5c..753e5714d5c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/glyphfilter.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/glyphfilter.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/kpseinterface.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/kpseinterface.c
index e42b81fa24a..e42b81fa24a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/kpseinterface.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/kpseinterface.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/kpseinterface.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/kpseinterface.h
index c822a24fa1e..c822a24fa1e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/kpseinterface.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/kpseinterface.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/metrics.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/metrics.cc
index b4427f3f6fa..b4427f3f6fa 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/metrics.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/metrics.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/metrics.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/metrics.hh
index b032e6b348f..b032e6b348f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/metrics.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/metrics.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/otftotfm.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/otftotfm.1
index 97581d1a04e..2f10c846def 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/otftotfm.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/otftotfm.1
@@ -1,5 +1,5 @@
 '\"t
-.ds V 2.95
+.ds V 2.97
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/otftotfm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/otftotfm.cc
index 1bd2b25b910..e36e1c63edf 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/otftotfm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/otftotfm.cc
@@ -2234,7 +2234,7 @@ particular purpose.\n");
 		    errh->message("glyphlist.txt found with kpathsea at %s", g.c_str());
 	    } else
 #endif
-		glyphlist_files.push_back(SHAREDIR "/glyphlist.txt");
+		glyphlist_files.push_back(GLYPHLISTDIR "/glyphlist.txt");
 #if HAVE_KPATHSEA
 	    if (String g = kpsei_find_file("texglyphlist.txt", KPSEI_FMT_MAP)) {
 		glyphlist_files.push_back(g);
@@ -2242,7 +2242,7 @@ particular purpose.\n");
 		    errh->message("texglyphlist.txt found with kpathsea at %s", g.c_str());
 	    } else
 #endif
-		glyphlist_files.push_back(SHAREDIR "/texglyphlist.txt");
+		glyphlist_files.push_back(GLYPHLISTDIR "/texglyphlist.txt");
 	}
 
 	// read glyphlist
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/otftotfm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/otftotfm.hh
index 67c0e0b32ab..67c0e0b32ab 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/otftotfm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/otftotfm.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/secondary.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/secondary.cc
index a951bc7d304..a951bc7d304 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/secondary.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/secondary.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/secondary.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/secondary.hh
index c349a48dcf6..c349a48dcf6 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/secondary.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/secondary.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/uniprop.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/uniprop.cc
index 228661394a9..228661394a9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/uniprop.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/uniprop.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/uniprop.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/uniprop.hh
index 4dd6b135eb7..4dd6b135eb7 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/uniprop.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/uniprop.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/util.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/util.cc
index 973f7ca87c9..b50ff9566d3 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/util.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/util.cc
@@ -162,13 +162,26 @@ mysystem(const char *command, ErrorHandler *errh)
     }
 }
 
+#if !HAVE_MKSTEMP
+static const char *
+my_tmpnam()
+{
+# ifndef WIN32
+    return tmpnam(0);
+# else
+    const char *dir = getenv("TEMP");
+    return _tempnam(dir ? dir : ".", "otftmp.");
+# endif
+}
+#endif
+
 int
 temporary_file(String &filename, ErrorHandler *errh)
 {
     if (no_create)
 	return 0;		// random number suffices
 
-#ifdef HAVE_MKSTEMP
+#if HAVE_MKSTEMP
     const char *tmpdir = getenv("TMPDIR");
     if (tmpdir)
 	filename = String(tmpdir) + "/otftotfm.XXXXXX";
@@ -184,18 +197,9 @@ temporary_file(String &filename, ErrorHandler *errh)
 	errh->error("temporary file %<%s%>: %s", filename.c_str(), strerror(errno));
     return fd;
 #else  // !HAVE_MKSTEMP
-# ifdef WIN32
-    const char *tmp_dir = getenv("TEMP");
-    if (!tmp_dir)
-	tmp_dir = ".";
     for (int tries = 0; tries < 5; tries++) {
-	if (!(filename = _tempnam(tmp_dir, "otftmp.")))
+	if (!(filename = my_tmpnam()))
 	    return errh->error("cannot create temporary file");
-# else
-    for (int tries = 0; tries < 5; tries++) {
-	if (!(filename = tmpnam(0)))
-	    return errh->error("cannot create temporary file");
-# endif
 # ifdef O_EXCL
 	int fd = ::open(filename.c_str(), O_RDWR | O_CREAT | O_EXCL | O_TRUNC, 0600);
 # else
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/util.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/util.hh
index a3e42b63d9f..a3e42b63d9f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/util.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/util.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1dotlessj/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/Makefile.am
index 9b9b16ca77b..9b9b16ca77b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1dotlessj/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1dotlessj/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/Makefile.in
index a9f7ab199a5..49acbec1a86 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1dotlessj/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1dotlessj$(EXEEXT)
-subdir = lcdf-typetools-2.95/t1dotlessj
+subdir = lcdf-typetools-2.97/t1dotlessj
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -282,9 +282,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.95/t1dotlessj/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/t1dotlessj/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/t1dotlessj/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.97/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.95/t1dotlessj/t1dotlessj.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/t1dotlessj.1
index d594e47b057..2cefd72e985 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1dotlessj/t1dotlessj.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/t1dotlessj.1
@@ -1,4 +1,4 @@
-.ds V 2.95
+.ds V 2.97
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1dotlessj/t1dotlessj.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/t1dotlessj.cc
index aa1bae00aee..aa1bae00aee 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1dotlessj/t1dotlessj.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/t1dotlessj.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/Makefile.am
index 42cd92087d4..42cd92087d4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/Makefile.in
index bf00864f41b..883418c03e3 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1lint$(EXEEXT)
-subdir = lcdf-typetools-2.95/t1lint
+subdir = lcdf-typetools-2.97/t1lint
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -293,9 +293,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.95/t1lint/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/t1lint/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/t1lint/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.97/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.95/t1lint/cscheck.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/cscheck.cc
index f39a040a014..f39a040a014 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/cscheck.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/cscheck.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/cscheck.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/cscheck.hh
index 9ba167b1588..9ba167b1588 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/cscheck.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/cscheck.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/t1lint.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/t1lint.1
index 99e54a412b8..add7cbd043a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/t1lint.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/t1lint.1
@@ -1,4 +1,4 @@
-.ds V 2.95
+.ds V 2.97
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/t1lint.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/t1lint.cc
index e2ac1012382..e2ac1012382 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/t1lint.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/t1lint.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1rawafm/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/Makefile.am
index 815d0efad89..815d0efad89 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1rawafm/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1rawafm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/Makefile.in
index b1a08d2a82f..bfddbd32f69 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1rawafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1rawafm$(EXEEXT)
-subdir = lcdf-typetools-2.95/t1rawafm
+subdir = lcdf-typetools-2.97/t1rawafm
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -282,9 +282,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.95/t1rawafm/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/t1rawafm/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/t1rawafm/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.97/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.95/t1rawafm/t1rawafm.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/t1rawafm.1
index 6de9e4c6573..90bb3ece91b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1rawafm/t1rawafm.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/t1rawafm.1
@@ -1,4 +1,4 @@
-.ds V 2.95
+.ds V 2.97
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1rawafm/t1rawafm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/t1rawafm.cc
index 8ba7c7531fb..8ba7c7531fb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1rawafm/t1rawafm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/t1rawafm.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/Makefile.am
index 4b6421f8942..1cb4c402f15 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/Makefile.am
@@ -4,8 +4,7 @@ AUTOMAKE_OPTIONS = foreign
 bin_PROGRAMS = t1reencode
 man_MANS = t1reencode.1
 
-t1reencode_SOURCES = md5.c md5.h \
-	t1reencode.cc \
+t1reencode_SOURCES = t1reencode.cc \
 	util.cc util.hh
 
 t1reencode_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/Makefile.in
new file mode 100644
index 00000000000..932c448a9fc
--- /dev/null
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/Makefile.in
@@ -0,0 +1,685 @@
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = t1reencode$(EXEEXT)
+subdir = lcdf-typetools-2.97/t1reencode
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/../../build-aux/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
+	$(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
+	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-warnings.m4 \
+	$(top_srcdir)/../../m4/kpse-win32.m4 \
+	$(top_srcdir)/../../m4/libtool.m4 \
+	$(top_srcdir)/../../m4/ltoptions.m4 \
+	$(top_srcdir)/../../m4/ltsugar.m4 \
+	$(top_srcdir)/../../m4/ltversion.m4 \
+	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/lcdf-typetools.ac $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/autoconf.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_t1reencode_OBJECTS = t1reencode.$(OBJEXT) util.$(OBJEXT)
+t1reencode_OBJECTS = $(am_t1reencode_OBJECTS)
+t1reencode_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(t1reencode_SOURCES)
+DIST_SOURCES = $(t1reencode_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+man1dir = $(mandir)/man1
+NROFF = nroff
+MANS = $(man_MANS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
+KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
+KPATHSEA_LIBS = @KPATHSEA_LIBS@
+LCDF_TYPETOOLS_TREE = @LCDF_TYPETOOLS_TREE@
+LCDF_TYPETOOLS_VERSION = @LCDF_TYPETOOLS_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SELECTED_SUBDIRS = @SELECTED_SUBDIRS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEMPLATE_OBJS = @TEMPLATE_OBJS@
+VERSION = @VERSION@
+WARNING_CFLAGS = @WARNING_CFLAGS@
+WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+encdir = @encdir@
+exec_prefix = @exec_prefix@
+glyphlistdir = @glyphlistdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = foreign
+man_MANS = t1reencode.1
+t1reencode_SOURCES = t1reencode.cc \
+	util.cc util.hh
+
+t1reencode_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
+INCLUDES = -I$(srcdir)/../include
+CLEANFILES = @TEMPLATE_OBJS@
+EXTRA_DIST = t1reencode.1
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cc .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/t1reencode/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.97/t1reencode/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+t1reencode$(EXEEXT): $(t1reencode_OBJECTS) $(t1reencode_DEPENDENCIES) $(EXTRA_t1reencode_DEPENDENCIES) 
+	@rm -f t1reencode$(EXEEXT)
+	$(CXXLINK) $(t1reencode_OBJECTS) $(t1reencode_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t1reencode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
+
+.cc.o:
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cc.lo:
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-man1: $(man_MANS)
+	@$(NORMAL_INSTALL)
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@list='$(MANS)'; if test -n "$$list"; then \
+	  list=`for p in $$list; do \
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+	  if test -n "$$list" && \
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+	    echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+	    echo "       typically 'make maintainer-clean' will remove them" >&2; \
+	    exit 1; \
+	  else :; fi; \
+	else :; fi
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-man
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man: install-man1
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-man
+
+uninstall-man: uninstall-man1
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool cscopelist ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-man1 install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-man uninstall-man1
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/t1reencode.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/t1reencode.1
index 42a063d0f53..dd77323ff47 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/t1reencode.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/t1reencode.1
@@ -1,4 +1,4 @@
-.ds V 2.95
+.ds V 2.97
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/t1reencode.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/t1reencode.cc
index bebcb1dad3a..952d3f87bdc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/t1reencode.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/t1reencode.cc
@@ -23,7 +23,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include "util.hh"
-#include "md5.h"
+#include <lcdf/md5.h>
 #ifdef HAVE_CTIME
 # include <time.h>
 #endif
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/util.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/util.cc
index 89f43391152..89f43391152 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/util.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/util.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/util.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/util.hh
index 34b9c9c5a22..34b9c9c5a22 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/util.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/util.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1testpage/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/Makefile.am
index eac56ee9066..eac56ee9066 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1testpage/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1testpage/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/Makefile.in
index ebbbeef6d78..61a95af317e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1testpage/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1testpage$(EXEEXT)
-subdir = lcdf-typetools-2.95/t1testpage
+subdir = lcdf-typetools-2.97/t1testpage
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -282,9 +282,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.95/t1testpage/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/t1testpage/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/t1testpage/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.97/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.95/t1testpage/t1testpage.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/t1testpage.1
index a1d6d3507b5..e67c23cd277 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1testpage/t1testpage.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/t1testpage.1
@@ -1,4 +1,4 @@
-.ds V 2.95
+.ds V 2.97
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1testpage/t1testpage.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/t1testpage.cc
index ed3d7330a13..ed3d7330a13 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1testpage/t1testpage.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/t1testpage.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/texglyphlist-g2u.txt b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/texglyphlist-g2u.txt
index 2340809a4de..2340809a4de 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/texglyphlist-g2u.txt
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/texglyphlist-g2u.txt
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/texglyphlist.txt b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/texglyphlist.txt
index b9c5fa9af0f..b9c5fa9af0f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/texglyphlist.txt
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/texglyphlist.txt
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ttftotype42/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/Makefile.am
index a55d65d82c4..a55d65d82c4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ttftotype42/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ttftotype42/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/Makefile.in
index 782ece3bef5..c3ccb87f150 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ttftotype42/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = ttftotype42$(EXEEXT)
-subdir = lcdf-typetools-2.95/ttftotype42
+subdir = lcdf-typetools-2.97/ttftotype42
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -282,9 +282,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.95/ttftotype42/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/ttftotype42/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/ttftotype42/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.97/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.95/ttftotype42/ttftotype42.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/ttftotype42.1
index 6a80b880dd8..bb84d6ad792 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ttftotype42/ttftotype42.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/ttftotype42.1
@@ -1,4 +1,4 @@
-.ds V 2.95
+.ds V 2.97
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ttftotype42/ttftotype42.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/ttftotype42.cc
index e7984e5d444..0c3567e874c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ttftotype42/ttftotype42.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/ttftotype42.cc
@@ -320,6 +320,17 @@ do_file(const char *infn, const char *outfn, ErrorHandler *errh)
 	fclose(f);
 }
 
+#if 0
+static void check_md5sum() {
+    MD5_CONTEXT md5;
+    md5_init(&md5);
+    md5_update(&md5, (const unsigned char *) "message digest", 14);
+    unsigned char result[MD5_DIGEST_SIZE];
+    md5_final(result, &md5);
+    assert(memcmp(result, "\xF9\x6B\x69\x7D\x7C\xB7\x93\x8D\x52\x5A\x2F\x31\xAA\xF1\x61\xD0", MD5_DIGEST_SIZE) == 0);
+}
+#endif
+
 int
 main(int argc, char *argv[])
 {
diff --git a/Build/source/texk/lcdf-typetools/version.ac b/Build/source/texk/lcdf-typetools/version.ac
index 6ce171b5367..329ba6e0426 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.95])
+m4_define([lcdf_typetools_version], [2.97])