220 files changed, 1819 insertions, 1020 deletions

diff --git a/Build/source/texk/README b/Build/source/texk/README
index f67724b3847..3359f93d408 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.94 - checked 5aug12
+lcdf-typetools 2.95 - checked 25sep12
   http://www.lcdf.org/type/
-  http://www.lcdf.org/type/lcdf-typetools-2.94.tar.gz
+  http://www.lcdf.org/type/lcdf-typetools-2.95.tar.gz
 
 makeindexk - maintained here, by us
 
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/ChangeLog
index 329dfc8515c..289fb15201e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/ChangeLog
@@ -1,13 +1,12 @@
-2012-09-21  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+2012-09-25  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-	* patch-31-WIN32 (new): Avoid that WIN32 puts temporary files
-	into the root directory resulting in 'Permission denied'.
+	Import lcdf-typetools-2.95, now into subdirectory.
+	* version.ac: Adapted.
+	* Makefile.am, configure.ac: Adapted to the new layout.
+	* tests/{t1,tfm,ttf}.test: Adapted to the new layout.
 
 2012-08-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-	* patch-06-enc_format (new): Bug fix.
-	* patch-30-W32TeX: Adapted.
-
 	* tfm.test: New shell script for an additional test.
 	* tests/antpolt-regular.otf, tests/texnansx.enc,
 	tests/Ant.{enc,map,pfb,pl}: Tfm test input and expected output.
@@ -15,9 +14,6 @@
 
 2012-08-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-	* patch-02-WIN32: Adapted from upstream.
-	* patch-05-backport (new): From upstream.
-
 	* tests/t1.test tests/ttf.test: New shell scripts for tests.
 	* tests/t2c.enc, tests/uhvrrc8a.pfb, tests/uhv_dl.{pfa,pfb,ps},
 	tests/uhv_re.{afm,pfa}: T1 test input and expected output.
@@ -26,29 +22,11 @@
 	Ttf test input and expected output.
 	* Makefile.am: Add the tests and their data.
 
-2012-08-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* patch-03-manpage (new): Fix manpages.
-	* patch-04-PFB_OPT (new): Correctly handle '-b' option.
-
-2012-08-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* patch-02-WIN32: More WIN32.
-	* patch-20-TL-binary: More binary mode for output files.
-	* patch-30-W32TeX: W32TeX specific changes (from Akira).
-
-2012-08-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* patch-02-WIN32 (new): Adapt for WIN32.
-	* patch-20-TL-binary (new): Use binary mode for output files.
-	From Akira Kakuto <kakuto@fuk.kindai.ac.jp> (W32TeX).
-
 2012-08-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import lcdf-typetools-2.94.
 	* version.ac: Adapted.
 	* configure.ac: Adapted.
-	* patch-01-const: Adapted
 
 2011-12-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
@@ -59,10 +37,6 @@
 
 	* Makefile.am (DISTCLEANFILES): Add CXXLD.sh.
 
-2011-09-25  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* patch-01-const (new): Avoid cast from const to non-const.
-
 2011-09-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Avoid pkgdata_DATA in order not to install an
@@ -72,12 +46,6 @@
 
 	Import lcdf-typetools-2.92.
 	* version.ac: Adapt.
-	* patch-01-void-func (removed): Now distributed.
-
-2011-06-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* patch-01-void-func (new): Patch from
-	Vladimir Volovich <vvv@vsu.ru>.
 
 2011-06-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
@@ -85,27 +53,16 @@
 	* version.ac: New file defining the lcdf-typetools version.
 	* configure.ac: Adapt. Define SHAREDIR as "/nonesuch" to avoid
 	useless build paths stored in the otftotfm binary.
-	* patch-03-warning (removed): Now distributed.
 
 2011-03-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import lcdf-typetools-2.88.
 	* configure.ac, Makefile.am: Adapt.
-	* patch-02-warnings (removed): Now distributed.
-
-	* patch-03-warning (new): Avoid `uninitialized' warning (the
-	compiler may not realize that this actually can'thappen).
-
-2011-03-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* patch-02-warnings (new): Remove unused variables; add explicit
-	cast for `-1' used as `uint32_t'.
 
 2010-10-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import lcdf-typetools-2.85.
 	* configure.ac, Makefile.am: Adapt.
-	* patch-01-otftotfm-Makefile (removed): Now distributed.
 
 2010-06-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
@@ -116,7 +73,6 @@
 
 	Import lcdf-typetools-2.83.
 	* configure.ac, Makefile.am: Adapt.
-	* patch-01-otftotfm-Makefile (new): Adapt otftotfm/Makefile.am.
 
 2010-02-21  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
@@ -156,3 +112,7 @@
 
 	Adapt to TL2009 build system.
 
+
+
+Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+You may freely use, modify and/or distribute this file.
diff --git a/Build/source/texk/lcdf-typetools/Makefile.am b/Build/source/texk/lcdf-typetools/Makefile.am
index cc162441c12..6fc60a02503 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/Makefile.am
@@ -1,10 +1,36 @@
-## Process this file with automake to produce Makefile.in
+## Makefile.am for the TeX Live subdirectory texk/lcdf-typetools/
+##
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+##
+#************************************************************************
+#
+#  Adapted for TeX Live from lcdf-typetools-2.88/Makefile.am
+#  Copyright (c) 2003-2011 Eddie Kohler
+#
+#************************************************************************
+##
 ACLOCAL_AMFLAGS = -I ../../m4 -I m4
 
-AM_DISTCHECK_CONFIGURE_FLAGS = --without-kpathsea
+## We use the original lcdf-typetools source tree.
+##
+SUBDIRS = . $(LCDF_TYPETOOLS_TREE)
+DIST_SUBDIRS = $(SUBDIRS)
+
+## Patches applied to the original source tree
+##
+EXTRA_DIST = $(LCDF_TYPETOOLS_TREE)-PATCHES
+
+## We must explicitly distribute some top-level files.
+##
+EXTRA_DIST += \
+	$(LCDF_TYPETOOLS_TREE)/autoconf.h.in \
+	$(LCDF_TYPETOOLS_TREE)/configure.ac \
+	$(LCDF_TYPETOOLS_TREE)/m4
 
-SUBDIRS = . liblcdf libefont @SELECTED_SUBDIRS@
-DIST_SUBDIRS = liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42
+# in case of an SVN repository
+dist-hook:
+	rm -rf `find $(distdir) -name .svn`
 
 all-local: config.force
 
@@ -14,106 +40,13 @@ config.force: $(KPATHSEA_DEPEND)
 
 DISTCLEANFILES = config.force CXXLD.sh
 
-if texlive_build
-glyphlistdir = $(datarootdir)/texmf-dist/fonts/map/glyphlist
-encdir = $(datarootdir)/texmf-dist/fonts/enc/dvips/base
-else !texlive_build
-glyphlistdir = $(pkgdatadir)
-encdir = $(pkgdatadir)
-endif !texlive_build
-
-glyphlist_DATA = glyphlist.txt texglyphlist.txt
-enc_DATA = 7t.enc
-
-EXTRA_DIST = \
-	ONEWS \
-	lcdf-typetools.spec \
-	include/config.h \
-	include/lcdf/bezier.hh \
-	include/lcdf/clp.h \
-	include/lcdf/error.hh \
-	include/lcdf/filename.hh \
-	include/lcdf/globmatch.hh \
-	include/lcdf/hashcode.hh \
-	include/lcdf/hashmap.hh include/lcdf/hashmap.cc \
-	include/lcdf/inttypes.h \
-	include/lcdf/landmark.hh \
-	include/lcdf/md5.h \
-	include/lcdf/permstr.hh \
-	include/lcdf/point.hh \
-	include/lcdf/slurper.hh \
-	include/lcdf/straccum.hh \
-	include/lcdf/string.hh \
-	include/lcdf/strtonum.h \
-	include/lcdf/transform.hh \
-	include/lcdf/vector.hh include/lcdf/vector.cc \
-	include/efont/afm.hh \
-	include/efont/afmparse.hh \
-	include/efont/afmw.hh \
-	include/efont/amfm.hh \
-	include/efont/cff.hh \
-	include/efont/encoding.hh \
-	include/efont/findmet.hh \
-	include/efont/metrics.hh \
-	include/efont/otf.hh \
-	include/efont/otfcmap.hh \
-	include/efont/otfdata.hh \
-	include/efont/otfgpos.hh \
-	include/efont/otfgsub.hh \
-	include/efont/otfname.hh \
-	include/efont/otfos2.hh \
-	include/efont/otfpost.hh \
-	include/efont/pairop.hh \
-	include/efont/psres.hh \
-	include/efont/t1bounds.hh \
-	include/efont/t1cs.hh \
-	include/efont/t1csgen.hh \
-	include/efont/t1font.hh \
-	include/efont/t1interp.hh \
-	include/efont/t1item.hh \
-	include/efont/t1mm.hh \
-	include/efont/t1rw.hh \
-	include/efont/t1unparser.hh \
-	include/efont/ttfcs.hh \
-	include/efont/ttfhead.hh \
-	include/efont/ttfkern.hh \
-	glyphlist.txt \
-	texglyphlist.txt \
-	texglyphlist-g2u.txt \
-	7t.enc
-
-liblcdf libefont:
-	cd $@ && $(MAKE)
-libefont: liblcdf
-cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42: liblcdf libefont
-	cd $@ && $(MAKE)
-
-versionize:
-	perl -pi -e 's/^\.ds V.*/.ds V $(VERSION)/;' $(top_srcdir)/cfftot1/cfftot1.1 $(top_srcdir)/mmafm/mmafm.1 $(top_srcdir)/mmpfb/mmpfb.1 $(top_srcdir)/otfinfo/otfinfo.1 $(top_srcdir)/otftotfm/otftotfm.1 $(top_srcdir)/t1dotlessj/t1dotlessj.1 $(top_srcdir)/t1lint/t1lint.1 $(top_srcdir)/t1rawafm/t1rawafm.1 $(top_srcdir)/t1reencode/t1reencode.1 $(top_srcdir)/t1testpage/t1testpage.1 $(top_srcdir)/ttftotype42/ttftotype42.1
-	perl -pi -e 's/^(\U$(PACKAGE)\E) [\d.ab]+$$/$$1 $(VERSION)/;' $(top_srcdir)/README
-	perl -pi -e 's/^Version: [\d.ab]+$$/Version: $(VERSION)/;' $(top_srcdir)/lcdf-typetools.spec
-
-dist-hook:
-	if test -f $(top_srcdir)/make-glyphtounicode.pl; then (cd $(top_srcdir); perl make-glyphtounicode.pl) > $(distdir)/glyphtounicode.tex; elif test -f $(top_srcdir)/glyphtounicode.tex; then cp -p $(top_srcdir)/glyphtounicode.tex $(distdir); fi
-
-$(top_srcdir)/glyphtounicode.tex: $(top_srcdir)/glyphlist.txt $(top_srcdir)/texglyphlist.txt $(top_srcdir)/texglyphlist-g2u.txt $(top_srcdir)/make-glyphtounicode.pl
-	cd $(top_srcdir); perl make-glyphtounicode.pl > glyphtounicode.tex
-
-.PHONY: rpm liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42
-
-## Changes for TeX Live
-##
-EXTRA_DIST += lcdf-typetools-$(LCDF_TYPETOOLS_VERSION)-PATCHES
-
-## Original files from lcdf-typetools distribution
-##
-EXTRA_DIST += Makefile.am.orig configure.ac.orig
-
 ## Tests
 ##
 TESTS = tests/t1.test tests/tfm.test tests/ttf.test
 EXTRA_DIST += $(TESTS)
 
+TESTS_ENVIRONMENT = LCDF_TYPETOOLS_TREE=$(LCDF_TYPETOOLS_TREE)
+
 ## tests/t1.test
 EXTRA_DIST += tests/t2c.enc tests/uhvrrc8a.pfb \
 	tests/uhv_dl.pfa tests/uhv_dl.pfb tests/uhv_dl.ps \
diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in
index 6b58ab44c20..f8947999c4d 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/Makefile.in
@@ -13,7 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 VPATH = @srcdir@
 am__make_dryrun = \
   { \
@@ -51,7 +50,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/autoconf.h.in \
 	$(top_srcdir)/../../build-aux/config.guess \
 	$(top_srcdir)/../../build-aux/config.sub \
@@ -61,8 +60,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	../../build-aux/config.guess ../../build-aux/config.sub \
 	../../build-aux/depcomp ../../build-aux/install-sh \
 	../../build-aux/ltmain.sh ../../build-aux/missing \
-	../../build-aux/texinfo.tex ../../build-aux/ylwrap COPYING \
-	INSTALL NEWS
+	../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
@@ -98,35 +96,6 @@ am__can_run_installinfo = \
     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; }; \
-  }
-am__installdirs = "$(DESTDIR)$(encdir)" "$(DESTDIR)$(glyphlistdir)"
-DATA = $(enc_DATA) $(glyphlist_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -220,6 +189,7 @@ 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@
@@ -281,7 +251,9 @@ 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@
@@ -310,55 +282,30 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+
+#************************************************************************
+#
+#  Adapted for TeX Live from lcdf-typetools-2.88/Makefile.am
+#  Copyright (c) 2003-2011 Eddie Kohler
+#
+#************************************************************************
 ACLOCAL_AMFLAGS = -I ../../m4 -I m4
-AM_DISTCHECK_CONFIGURE_FLAGS = --without-kpathsea
-SUBDIRS = . liblcdf libefont @SELECTED_SUBDIRS@
-DIST_SUBDIRS = liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42
-DISTCLEANFILES = config.force CXXLD.sh uhv* Ant* a_enhg3c.enc Fon* \
-	tmf.*
-@texlive_build_FALSE@glyphlistdir = $(pkgdatadir)
-@texlive_build_TRUE@glyphlistdir = $(datarootdir)/texmf-dist/fonts/map/glyphlist
-@texlive_build_FALSE@encdir = $(pkgdatadir)
-@texlive_build_TRUE@encdir = $(datarootdir)/texmf-dist/fonts/enc/dvips/base
-glyphlist_DATA = glyphlist.txt texglyphlist.txt
-enc_DATA = 7t.enc
-EXTRA_DIST = ONEWS lcdf-typetools.spec include/config.h \
-	include/lcdf/bezier.hh include/lcdf/clp.h \
-	include/lcdf/error.hh include/lcdf/filename.hh \
-	include/lcdf/globmatch.hh include/lcdf/hashcode.hh \
-	include/lcdf/hashmap.hh include/lcdf/hashmap.cc \
-	include/lcdf/inttypes.h include/lcdf/landmark.hh \
-	include/lcdf/md5.h include/lcdf/permstr.hh \
-	include/lcdf/point.hh include/lcdf/slurper.hh \
-	include/lcdf/straccum.hh include/lcdf/string.hh \
-	include/lcdf/strtonum.h include/lcdf/transform.hh \
-	include/lcdf/vector.hh include/lcdf/vector.cc \
-	include/efont/afm.hh include/efont/afmparse.hh \
-	include/efont/afmw.hh include/efont/amfm.hh \
-	include/efont/cff.hh include/efont/encoding.hh \
-	include/efont/findmet.hh include/efont/metrics.hh \
-	include/efont/otf.hh include/efont/otfcmap.hh \
-	include/efont/otfdata.hh include/efont/otfgpos.hh \
-	include/efont/otfgsub.hh include/efont/otfname.hh \
-	include/efont/otfos2.hh include/efont/otfpost.hh \
-	include/efont/pairop.hh include/efont/psres.hh \
-	include/efont/t1bounds.hh include/efont/t1cs.hh \
-	include/efont/t1csgen.hh include/efont/t1font.hh \
-	include/efont/t1interp.hh include/efont/t1item.hh \
-	include/efont/t1mm.hh include/efont/t1rw.hh \
-	include/efont/t1unparser.hh include/efont/ttfcs.hh \
-	include/efont/ttfhead.hh include/efont/ttfkern.hh \
-	glyphlist.txt texglyphlist.txt texglyphlist-g2u.txt 7t.enc \
-	lcdf-typetools-$(LCDF_TYPETOOLS_VERSION)-PATCHES \
-	Makefile.am.orig configure.ac.orig $(TESTS) tests/t2c.enc \
-	tests/uhvrrc8a.pfb tests/uhv_dl.pfa tests/uhv_dl.pfb \
-	tests/uhv_dl.ps tests/uhv_re.afm tests/uhv_re.pfa \
-	tests/antpolt-regular.otf tests/texnansx.enc tests/Ant.enc \
-	tests/Ant.map tests/Ant.pfb tests/Ant.pl \
+SUBDIRS = . $(LCDF_TYPETOOLS_TREE)
+DIST_SUBDIRS = $(SUBDIRS)
+EXTRA_DIST = $(LCDF_TYPETOOLS_TREE)-PATCHES \
+	$(LCDF_TYPETOOLS_TREE)/autoconf.h.in \
+	$(LCDF_TYPETOOLS_TREE)/configure.ac $(LCDF_TYPETOOLS_TREE)/m4 \
+	$(TESTS) tests/t2c.enc tests/uhvrrc8a.pfb tests/uhv_dl.pfa \
+	tests/uhv_dl.pfb tests/uhv_dl.ps tests/uhv_re.afm \
+	tests/uhv_re.pfa tests/antpolt-regular.otf tests/texnansx.enc \
+	tests/Ant.enc tests/Ant.map tests/Ant.pfb tests/Ant.pl \
 	tests/FonetikaDaniaIwonaeBold.ttf tests/texmfhome.otf \
 	tests/Fon.post tests/Fon.t42 tests/tmf.info tests/tmf.pfa \
 	tests/tmf.pfb tests/tmf.tables
+DISTCLEANFILES = config.force CXXLD.sh uhv* Ant* a_enhg3c.enc Fon* \
+	tmf.*
 TESTS = tests/t1.test tests/tfm.test tests/ttf.test
+TESTS_ENVIRONMENT = LCDF_TYPETOOLS_TREE=$(LCDF_TYPETOOLS_TREE)
 all: autoconf.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -421,48 +368,6 @@ clean-libtool:
 
 distclean-libtool:
 	-rm -f libtool config.lt
-install-encDATA: $(enc_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(enc_DATA)'; test -n "$(encdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(encdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(encdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(encdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(encdir)" || exit $$?; \
-	done
-
-uninstall-encDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(enc_DATA)'; test -n "$(encdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(encdir)'; $(am__uninstall_files_from_dir)
-install-glyphlistDATA: $(glyphlist_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(glyphlist_DATA)'; test -n "$(glyphlistdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(glyphlistdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(glyphlistdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(glyphlistdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(glyphlistdir)" || exit $$?; \
-	done
-
-uninstall-glyphlistDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(glyphlist_DATA)'; test -n "$(glyphlistdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(glyphlistdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
@@ -694,12 +599,6 @@ check-TESTS: $(TESTS)
 	else :; fi
 
 distdir: $(DISTFILES)
-	@case `sed 15q $(srcdir)/NEWS` in \
-	*"$(VERSION)"*) : ;; \
-	*) \
-	  echo "NEWS not updated; not releasing" 1>&2; \
-	  exit 1;; \
-	esac
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -886,12 +785,9 @@ distcleancheck: distclean
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-recursive
-all-am: Makefile $(DATA) autoconf.h all-local
+all-am: Makefile autoconf.h all-local
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(encdir)" "$(DESTDIR)$(glyphlistdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -945,7 +841,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-encDATA install-glyphlistDATA
+install-data-am:
 
 install-dvi: install-dvi-recursive
 
@@ -991,7 +887,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-encDATA uninstall-glyphlistDATA
+uninstall-am:
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \
 	cscopelist-recursive ctags-recursive install-am install-strip \
@@ -1007,16 +903,18 @@ uninstall-am: uninstall-encDATA uninstall-glyphlistDATA
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-dvi install-dvi-am \
-	install-encDATA install-exec install-exec-am \
-	install-glyphlistDATA install-html install-html-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man install-pdf \
 	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs installdirs-am \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-encDATA \
-	uninstall-glyphlistDATA
+	tags tags-recursive uninstall uninstall-am
+
 
+# in case of an SVN repository
+dist-hook:
+	rm -rf `find $(distdir) -name .svn`
 
 all-local: config.force
 
@@ -1024,25 +922,6 @@ config.force: $(KPATHSEA_DEPEND)
 	echo timestamp >config.force
 	$(SHELL) ./config.status --recheck
 
-liblcdf libefont:
-	cd $@ && $(MAKE)
-libefont: liblcdf
-cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42: liblcdf libefont
-	cd $@ && $(MAKE)
-
-versionize:
-	perl -pi -e 's/^\.ds V.*/.ds V $(VERSION)/;' $(top_srcdir)/cfftot1/cfftot1.1 $(top_srcdir)/mmafm/mmafm.1 $(top_srcdir)/mmpfb/mmpfb.1 $(top_srcdir)/otfinfo/otfinfo.1 $(top_srcdir)/otftotfm/otftotfm.1 $(top_srcdir)/t1dotlessj/t1dotlessj.1 $(top_srcdir)/t1lint/t1lint.1 $(top_srcdir)/t1rawafm/t1rawafm.1 $(top_srcdir)/t1reencode/t1reencode.1 $(top_srcdir)/t1testpage/t1testpage.1 $(top_srcdir)/ttftotype42/ttftotype42.1
-	perl -pi -e 's/^(\U$(PACKAGE)\E) [\d.ab]+$$/$$1 $(VERSION)/;' $(top_srcdir)/README
-	perl -pi -e 's/^Version: [\d.ab]+$$/Version: $(VERSION)/;' $(top_srcdir)/lcdf-typetools.spec
-
-dist-hook:
-	if test -f $(top_srcdir)/make-glyphtounicode.pl; then (cd $(top_srcdir); perl make-glyphtounicode.pl) > $(distdir)/glyphtounicode.tex; elif test -f $(top_srcdir)/glyphtounicode.tex; then cp -p $(top_srcdir)/glyphtounicode.tex $(distdir); fi
-
-$(top_srcdir)/glyphtounicode.tex: $(top_srcdir)/glyphlist.txt $(top_srcdir)/texglyphlist.txt $(top_srcdir)/texglyphlist-g2u.txt $(top_srcdir)/make-glyphtounicode.pl
-	cd $(top_srcdir); perl make-glyphtounicode.pl > glyphtounicode.tex
-
-.PHONY: rpm liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42
-
 # 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/autoconf.h.in b/Build/source/texk/lcdf-typetools/autoconf.h.in
index 939175deea0..091417a2327 100644
--- a/Build/source/texk/lcdf-typetools/autoconf.h.in
+++ b/Build/source/texk/lcdf-typetools/autoconf.h.in
@@ -48,6 +48,10 @@
 /* Define to 1 if you have the `ctime' function. */
 #undef HAVE_CTIME
 
+/* Define to 1 if you have the declaration of `kpse_enc_format', and to 0 if
+   you don't. */
+#undef HAVE_DECL_KPSE_ENC_FORMAT
+
 /* Define to 1 if you have the declaration of `kpse_opentype_format', and to 0
    if you don't. */
 #undef HAVE_DECL_KPSE_OPENTYPE_FORMAT
diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure
index 00cccdf17d1..0b1afa2a3f1 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.94.
+# Generated by GNU Autoconf 2.69 for LCDF typetools for TeX Live 2.95.
 #
 # 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.94'
-PACKAGE_STRING='LCDF typetools for TeX Live 2.94'
+PACKAGE_VERSION='2.95'
+PACKAGE_STRING='LCDF typetools for TeX Live 2.95'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="NEWS"
+ac_unique_file="lcdf-typetools-2.95/NEWS"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -636,6 +636,9 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+LCDF_TYPETOOLS_TREE
+encdir
+glyphlistdir
 have_kpathsea_FALSE
 have_kpathsea_TRUE
 KPATHSEA_RULE
@@ -1357,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.94 to adapt to many kinds of systems.
+\`configure' configures LCDF typetools for TeX Live 2.95 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1428,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.94:";;
+     short | recursive ) echo "Configuration of LCDF typetools for TeX Live 2.95:";;
    esac
   cat <<\_ACEOF
 
@@ -1566,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.94
+LCDF typetools for TeX Live configure 2.95
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2726,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.94, which was
+It was created by LCDF typetools for TeX Live $as_me 2.95, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8118,7 +8121,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='lcdf-typetools-for-tex-live'
- VERSION='2.94'
+ VERSION='2.95'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13371,7 +13374,7 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 
 
-LCDF_TYPETOOLS_VERSION=2.94
+LCDF_TYPETOOLS_VERSION=2.95
 
 
 ac_config_headers="$ac_config_headers autoconf.h"
@@ -19036,7 +19039,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-LCDF typetools for TeX Live config.lt 2.94
+LCDF typetools for TeX Live config.lt 2.95
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -20382,6 +20385,18 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_KPSE_OPENTYPE_FORMAT $ac_have_decl
 _ACEOF
 
+                  ac_fn_cxx_check_decl "$LINENO" "kpse_enc_format" "ac_cv_have_decl_kpse_enc_format" "#include <kpathsea/kpathsea.h>
+"
+if test "x$ac_cv_have_decl_kpse_enc_format" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_KPSE_ENC_FORMAT $ac_have_decl
+_ACEOF
+
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -20472,6 +20487,12 @@ _ACEOF
 fi
 
 
+glyphlistdir='${datarootdir}/texmf-dist/fonts/map/glyphlist'
+encdir='${datarootdir}/texmf-dist/fonts/enc/dvips/base'
+
+
+
+
 
 
 $as_echo "#define HAVE_PERMSTRING 1" >>confdefs.h
@@ -20506,19 +20527,24 @@ _ACEOF
 
 
 
-ac_config_files="$ac_config_files Makefile liblcdf/Makefile libefont/Makefile"
+LCDF_TYPETOOLS_TREE=lcdf-typetools-2.95
+
+
+ac_config_files="$ac_config_files Makefile lcdf-typetools-2.95/Makefile"
 
-ac_config_files="$ac_config_files cfftot1/Makefile"
-ac_config_files="$ac_config_files mmafm/Makefile"
-ac_config_files="$ac_config_files mmpfb/Makefile"
-ac_config_files="$ac_config_files otfinfo/Makefile"
-ac_config_files="$ac_config_files otftotfm/Makefile"
-ac_config_files="$ac_config_files t1dotlessj/Makefile"
-ac_config_files="$ac_config_files t1lint/Makefile"
-ac_config_files="$ac_config_files t1rawafm/Makefile"
-ac_config_files="$ac_config_files t1reencode/Makefile"
-ac_config_files="$ac_config_files t1testpage/Makefile"
-ac_config_files="$ac_config_files ttftotype42/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"
 
 
 cat >confcache <<\_ACEOF
@@ -21072,7 +21098,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.94, which was
+This file was extended by LCDF typetools for TeX Live $as_me 2.95, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21138,7 +21164,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.94
+LCDF typetools for TeX Live config.status 2.95
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -21651,19 +21677,20 @@ do
     "autoconf.h") CONFIG_HEADERS="$CONFIG_HEADERS autoconf.h" ;;
     "CXXLD.sh") CONFIG_COMMANDS="$CONFIG_COMMANDS CXXLD.sh" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "liblcdf/Makefile") CONFIG_FILES="$CONFIG_FILES liblcdf/Makefile" ;;
-    "libefont/Makefile") CONFIG_FILES="$CONFIG_FILES libefont/Makefile" ;;
-    "cfftot1/Makefile") CONFIG_FILES="$CONFIG_FILES cfftot1/Makefile" ;;
-    "mmafm/Makefile") CONFIG_FILES="$CONFIG_FILES mmafm/Makefile" ;;
-    "mmpfb/Makefile") CONFIG_FILES="$CONFIG_FILES mmpfb/Makefile" ;;
-    "otfinfo/Makefile") CONFIG_FILES="$CONFIG_FILES otfinfo/Makefile" ;;
-    "otftotfm/Makefile") CONFIG_FILES="$CONFIG_FILES otftotfm/Makefile" ;;
-    "t1dotlessj/Makefile") CONFIG_FILES="$CONFIG_FILES t1dotlessj/Makefile" ;;
-    "t1lint/Makefile") CONFIG_FILES="$CONFIG_FILES t1lint/Makefile" ;;
-    "t1rawafm/Makefile") CONFIG_FILES="$CONFIG_FILES t1rawafm/Makefile" ;;
-    "t1reencode/Makefile") CONFIG_FILES="$CONFIG_FILES t1reencode/Makefile" ;;
-    "t1testpage/Makefile") CONFIG_FILES="$CONFIG_FILES t1testpage/Makefile" ;;
-    "ttftotype42/Makefile") CONFIG_FILES="$CONFIG_FILES ttftotype42/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" ;;
 
   *) 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 fead57d2d39..d422c46c8c9 100644
--- a/Build/source/texk/lcdf-typetools/configure.ac
+++ b/Build/source/texk/lcdf-typetools/configure.ac
@@ -3,12 +3,12 @@ dnl Adapted for TeX Live.
 m4_include([version.ac])[] dnl define lcdf_typetools_version
 AC_INIT([LCDF typetools for TeX Live], lcdf_typetools_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([NEWS])
+AC_CONFIG_SRCDIR([lcdf-typetools-]lcdf_typetools_version[/NEWS])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIR([../../m4])
 
 dnl Common code for all programs using libkpathsea.
-KPSE_COMMON([lcdf-typetools], [check-news])
+KPSE_COMMON([lcdf-typetools])
 
 LCDF_TYPETOOLS_VERSION=lcdf_typetools_version
 AC_SUBST([LCDF_TYPETOOLS_VERSION])
@@ -288,6 +288,8 @@ if test "x$with_kpathsea" != xno; then
                                   [[kpse_tfm_format;]])],
                  [AC_MSG_RESULT([yes])
                   AC_CHECK_DECLS([kpse_opentype_format], , ,
+                                 [#include <kpathsea/kpathsea.h>])
+                  AC_CHECK_DECLS([kpse_enc_format], , ,
                                  [#include <kpathsea/kpathsea.h>])],
                  [AC_MSG_RESULT([no])
                   with_kpathsea=no])
@@ -340,6 +342,15 @@ fi
 
 
 dnl
+dnl directories for data files
+dnl
+glyphlistdir='${datarootdir}/texmf-dist/fonts/map/glyphlist'
+encdir='${datarootdir}/texmf-dist/fonts/enc/dvips/base'
+AC_SUBST([glyphlistdir])
+AC_SUBST([encdir])
+
+
+dnl
 dnl verbatim portions of the header
 dnl
 
@@ -376,8 +387,10 @@ dnl
 dnl Output
 dnl
 
-AC_CONFIG_FILES([Makefile liblcdf/Makefile libefont/Makefile])
-AC_FOREACH([Kpse_Prog], kpse_lcdf_typetools_progs,
-           [AC_CONFIG_FILES(Kpse_Prog[/Makefile])])
+AC_SUBST([LCDF_TYPETOOLS_TREE], [lcdf-typetools-]lcdf_typetools_version)
+
+AC_CONFIG_FILES([Makefile lcdf-typetools-]lcdf_typetools_version[/Makefile])
+AC_FOREACH([Kpse_Prog], [liblcdf libefont] kpse_lcdf_typetools_progs,
+           [AC_CONFIG_FILES([lcdf-typetools-]lcdf_typetools_version[/]Kpse_Prog[/Makefile])])
 
 AC_OUTPUT
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/TL-Changes b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/TL-Changes
deleted file mode 100644
index 754d53fe339..00000000000
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/TL-Changes
+++ /dev/null
@@ -1,16 +0,0 @@
-Changes applied to the lcdf-typetools tree as obtained from:
-	http://www.lcdf.org/type/lcdf-typetools-2.94.tar.gz
-
-Removed:
-	depcomp
-	install-sh
-	missing
-
-Renamed/Moved:
-	Makefile.am		-> Makefile.am.orig
-	configure.ac		-> configure.ac.orig
-	m4/lcdf-typetools.m4	-> ac/lcdf-typetools.ac
-
-Created Autoconf macro file m4/ac_cxx_template_objs.m4
-	adapting code in configure.ac.orig.
-
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-01-const b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-01-const
deleted file mode 100644
index 84ca97ef3f6..00000000000
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-01-const
+++ /dev/null
@@ -1,16 +0,0 @@
-	No need to cast from const to non-const.
-
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/liblcdf/permstr.cc lcdf-typetools-2.94/liblcdf/permstr.cc
---- lcdf-typetools-2.94.orig/liblcdf/permstr.cc	2011-11-03 17:51:58.000000000 +0100
-+++ lcdf-typetools-2.94/liblcdf/permstr.cc	2012-08-05 12:09:59.000000000 +0200
-@@ -110,8 +110,8 @@
- void
- PermString::initialize(const char* s, int length)
- {
--    register unsigned char* m = (unsigned char*) s;
--    register unsigned char* mm;
-+    register const unsigned char* m = (const unsigned char*) s;
-+    register const unsigned char* mm;
- 
-     if (length < 0)
- 	length = (s ? strlen(s) : 0);
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-02-WIN32 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-02-WIN32
deleted file mode 100644
index 26f2036a494..00000000000
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-02-WIN32
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/otftotfm/automatic.cc lcdf-typetools-2.94/otftotfm/automatic.cc
---- lcdf-typetools-2.94.orig/otftotfm/automatic.cc	2011-11-03 17:51:58.000000000 +0100
-+++ lcdf-typetools-2.94/otftotfm/automatic.cc	2012-08-11 17:49:05.000000000 +0200
-@@ -40,6 +40,20 @@
- 
- #ifdef WIN32
- # define mkdir(dir, access) mkdir(dir)
-+# define COPY_CMD "copy"
-+# define CMD_SEP "&"
-+#else
-+# define COPY_CMD "cp"
-+# define CMD_SEP ";"
-+#endif
-+
-+/* kpathsea may already have defined this */
-+#ifndef DEV_NULL
-+# ifdef WIN32
-+#  define DEV_NULL "NUL"
-+# else
-+#  define DEV_NULL "/dev/null"
-+# endif
- #endif
- 
- #if HAVE_AUTO_T1DOTLESSJ
-@@ -307,7 +321,11 @@
-     if (!success && writable_texdir.find_left('\'') < 0 && directory.find_left('\'') < 0 && file.find_left('\'') < 0) {
- 	// look for mktexupd script
- 	if (!mktexupd_tried) {
-+#ifdef WIN32
-+	    mktexupd = strdup("mktexupd");
-+#else
- 	    mktexupd = kpsei_string(kpsei_find_file("mktexupd", KPSEI_FMT_WEB2C));
-+#endif
- 	    mktexupd_tried = true;
- 	}
- 
-@@ -482,7 +498,7 @@
- 
- 	int retval;
- 	if (!same_filename(ttf_filename, installed_ttf_filename)) {
--	    String command = "cp " + shell_quote(ttf_filename) + " " + shell_quote(installed_ttf_filename);
-+	    String command = COPY_CMD " " + shell_quote(ttf_filename) + " " + shell_quote(installed_ttf_filename);
- 	    retval = mysystem(command.c_str(), errh);
- 	    if (retval == 127)
- 		errh->error("could not run %<%s%>", command.c_str());
-@@ -727,11 +741,11 @@
- 	    int slash = filename.find_right('\'');
- 	    if (slash >= 0)
- 		filename = filename.substring(slash + 1);
--	    String command = "updmap --nomkmap --enable Map " + shell_quote(filename) + "; updmap";
-+	    String command = "updmap --nomkmap --enable Map " + shell_quote(filename) + CMD_SEP " updmap";
- 	    if (verbose)
- 		command += " 1>&2";
- 	    else
--		command += " >/dev/null 2>&1";
-+		command += " >" DEV_NULL " 2>&1";
- 	    int retval = mysystem(command.c_str(), errh);
- 	    if (retval == 127)
- 		errh->warning("could not run %<%s%>", command.c_str());
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/otftotfm/otftotfm.cc lcdf-typetools-2.94/otftotfm/otftotfm.cc
---- lcdf-typetools-2.94.orig/otftotfm/otftotfm.cc	2011-11-03 17:51:58.000000000 +0100
-+++ lcdf-typetools-2.94/otftotfm/otftotfm.cc	2012-08-11 17:14:49.000000000 +0200
-@@ -50,6 +50,10 @@
- #include <signal.h>
- #include <algorithm>
- #include <math.h>
-+/* apparently M_PI isn't defined by <math.h> under VC++ */
-+#ifndef M_PI
-+#define M_PI 3.14159265358979323846
-+#endif
- #ifdef HAVE_CTIME
- # include <time.h>
- #endif
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/otftotfm/util.cc lcdf-typetools-2.94/otftotfm/util.cc
---- lcdf-typetools-2.94.orig/otftotfm/util.cc	2011-11-03 17:51:58.000000000 +0100
-+++ lcdf-typetools-2.94/otftotfm/util.cc	2012-08-11 17:42:50.000000000 +0200
-@@ -103,15 +103,34 @@ same_filename(const String &a, const String &b)
- String
- shell_quote(const String &str)
- {
--#if defined(_MSDOS) || defined(_WIN32)
--    return str;			// XXX
--#else
-     if (!str)
--	return String::make_stable("''");
-+	return String::make_stable("\"\"");
- 
-     const char *begin = str.begin();
-     const char *end = str.end();
-     StringAccum sa;
-+
-+#if defined(_MSDOS) || defined(_WIN32)
-+    sa.append('\"');
-+
-+    for (const char *s = begin; s < end; ++s)
-+	if (isalnum((unsigned char) *s) || *s == '_' || *s == '-' || *s == '+' || *s == '\\' || *s == ':' || *s == '.')
-+	    /* do nothing */;
-+	else if (*s == '\"') {
-+	    sa.append(begin, s);
-+	    sa.append("\"\"\"", 3);
-+	    begin = s + 1;
-+	} else {
-+	    sa.append(begin, s + 1);
-+	    begin = s + 1;
-+	}
-+
-+    if (sa.length() > 1) {
-+	sa.append(begin, end);
-+	sa.append('\"');
-+	return sa.take_string();
-+    }
-+#else
-     for (const char *s = begin; s < end; s++)
- 	if (isalnum((unsigned char) *s) || *s == '_' || *s == '-' || *s == '+' || *s == '/' || *s == ':' || *s == '.')
- 	    /* do nothing */;
-@@ -121,13 +140,13 @@ shell_quote(const String &str)
- 	    begin = s;
- 	}
- 
--    if (!sa)
--	return str;
--    else {
-+    if (sa.length()) {
- 	sa.append(begin, end);
- 	return sa.take_string();
-     }
- #endif
-+
-+    return str;
- }
- 
- int
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-03-manpage b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-03-manpage
deleted file mode 100644
index a7826be9d09..00000000000
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-03-manpage
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/otfinfo/otfinfo.1 lcdf-typetools-2.94/otfinfo/otfinfo.1
---- lcdf-typetools-2.94.orig/otfinfo/otfinfo.1	2012-08-03 18:19:11.000000000 +0200
-+++ lcdf-typetools-2.94/otfinfo/otfinfo.1	2012-08-14 10:14:03.000000000 +0200
-@@ -140,7 +140,7 @@
- '
- .Sp
- .TP 5
--.BR \-T ", " \-\-dump\-table \fItable\fR
-+.BR \-T " \fItable\fR, " \-\-dump\-table= \fItable\fR
- Print the contents of the font's OpenType table \fItable\fR.
- '
- .PD
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/t1rawafm/t1rawafm.1 lcdf-typetools-2.94/t1rawafm/t1rawafm.1
---- lcdf-typetools-2.94.orig/t1rawafm/t1rawafm.1	2012-08-03 18:19:11.000000000 +0200
-+++ lcdf-typetools-2.94/t1rawafm/t1rawafm.1	2012-08-14 20:53:34.000000000 +0200
-@@ -10,11 +10,7 @@
- .SH NAME
- t1rawafm \- produce raw AFM metrics from a PostScript Type 1 font
- .SH SYNOPSIS
--.B t1rawafm
--\%\-e ENCODING
--\%[OPTIONS...]
--.I font
--.RI [ outputfile ]
-+\fBt1rawafm\fR \%[OPTIONS...] \fIfont\fR
- .SH DESCRIPTION
- .BR T1rawafm
- generates an AFM file with the information available in a PostScript
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-04-PFB_OPT b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-04-PFB_OPT
deleted file mode 100644
index 3e14503139e..00000000000
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-04-PFB_OPT
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/t1dotlessj/t1dotlessj.cc lcdf-typetools-2.94/t1dotlessj/t1dotlessj.cc
---- lcdf-typetools-2.94.orig/t1dotlessj/t1dotlessj.cc	2011-11-03 17:51:58.000000000 +0100
-+++ lcdf-typetools-2.94/t1dotlessj/t1dotlessj.cc	2012-08-13 13:25:10.000000000 +0200
-@@ -56,7 +56,7 @@
-     { "name", 'n', NAME_OPT, Clp_ValString, 0 },
-     { "output", 'o', OUTPUT_OPT, Clp_ValString, 0 },
-     { "pfa", 'a', PFA_OPT, 0, 0 },
--    { "pfb", 'b', PFA_OPT, 0, 0 },
-+    { "pfb", 'b', PFB_OPT, 0, 0 },
-     { "quiet", 'q', QUIET_OPT, 0, Clp_Negate },
-     { "version", 0, VERSION_OPT, 0, 0 },
- };
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/t1reencode/t1reencode.cc lcdf-typetools-2.94/t1reencode/t1reencode.cc
---- lcdf-typetools-2.94.orig/t1reencode/t1reencode.cc	2011-11-03 17:51:58.000000000 +0100
-+++ lcdf-typetools-2.94/t1reencode/t1reencode.cc	2012-08-11 15:58:50.000000000 +0200
-@@ -48,7 +48,7 @@
-     { "help", 'h', HELP_OPT, 0, 0 },
-     { "output", 'o', OUTPUT_OPT, Clp_ValString, 0 },
-     { "pfa", 'a', PFA_OPT, 0, 0 },
--    { "pfb", 'b', PFA_OPT, 0, 0 },
-+    { "pfb", 'b', PFB_OPT, 0, 0 },
-     { "name", 'n', FONTNAME_OPT, Clp_ValString, 0 },
-     { "fullname", 'N', FULLNAME_OPT, Clp_ValString, 0 },
-     { "full-name", 'N', FULLNAME_OPT, Clp_ValString, 0 },
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-05-backport b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-05-backport
deleted file mode 100644
index 1dc59f07e87..00000000000
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-05-backport
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/t1rawafm/t1rawafm.cc lcdf-typetools-2.94/t1rawafm/t1rawafm.cc
---- lcdf-typetools-2.94.orig/t1rawafm/t1rawafm.cc	2011-11-03 17:51:58.000000000 +0100
-+++ lcdf-typetools-2.94/t1rawafm/t1rawafm.cc	2012-08-15 12:09:30.000000000 +0200
-@@ -81,8 +81,8 @@
- \n\
- Usage: %s [OPTION]... [FONT]\n\
- \n\
--FONT is the name of a PFA or PFB font file. If omitted, t1testpage will read\n\
--a font file from the standard input.\n\
-+FONT is the name of a PFA or PFB font file. If omitted, t1rawafm will read a\n\
-+font file from the standard input.\n\
- \n\
- Options:\n\
-   -o, --output=FILE            Write output to FILE instead of standard out.\n\
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-06-enc_format b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-06-enc_format
deleted file mode 100644
index 66a193a5c6c..00000000000
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-06-enc_format
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/otftotfm/kpseinterface.c lcdf-typetools-2.94/otftotfm/kpseinterface.c
---- lcdf-typetools-2.94.orig/otftotfm/kpseinterface.c	2011-11-03 17:51:58.000000000 +0100
-+++ lcdf-typetools-2.94/otftotfm/kpseinterface.c	2012-08-16 11:07:09.000000000 +0200
-@@ -53,7 +53,7 @@
-       case KPSEI_FMT_WEB2C:
- 	return kpse_find_file(name, kpse_web2c_format, true);
-       case KPSEI_FMT_ENCODING:
--	return kpse_find_file(name, kpse_tex_ps_header_format, true);
-+	return kpse_find_file(name, kpse_enc_format, true);
-       case KPSEI_FMT_TYPE1:
- 	return kpse_find_file(name, kpse_type1_format, false);
-       case KPSEI_FMT_TYPE42:
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/ChangeLog
new file mode 100644
index 00000000000..6dc05863688
--- /dev/null
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/ChangeLog
@@ -0,0 +1,96 @@
+2012-09-25  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import lcdf-typetools-2.95.
+	* patch-01-const, patch-02-WIN32, patch-03-manpage,
+	patch-04-PFB_OPT, patch-05-backport, patch-06-enc_format
+	(removed): Now all distributed.
+
+	* patch-07-typos (new): Fix some typos.
+	* patch-08-future (new): Use distributed top-level Makefile.
+	* patch-20-TL-binary: Adapted.
+	* patch-21-TL-paths (new): Use bin/win32/mktexupd.exe.
+	* patch-30-W32TeX, patch-31-WIN32: Adapted.
+
+2012-09-24  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* patch-31-WIN32: Update using _tempnam().
+
+2012-09-21  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* patch-31-WIN32 (new): Avoid that WIN32 puts temporary files
+	into the root directory resulting in 'Permission denied'.
+
+2012-08-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-06-enc_format (new): Bug fix.
+	* patch-30-W32TeX: Adapted.
+
+2012-08-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-02-WIN32: Adapted from upstream.
+	* patch-05-backport (new): From upstream.
+
+2012-08-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-03-manpage (new): Fix manpages.
+	* patch-04-PFB_OPT (new): Correctly handle '-b' option.
+
+2012-08-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-02-WIN32: More WIN32.
+	* patch-20-TL-binary: More binary mode for output files.
+	* patch-30-W32TeX: W32TeX specific changes (from Akira).
+
+2012-08-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-02-WIN32 (new): Adapt for WIN32.
+	* patch-20-TL-binary (new): Use binary mode for output files.
+	From Akira Kakuto <kakuto@fuk.kindai.ac.jp> (W32TeX).
+
+2012-08-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import lcdf-typetools-2.94.
+	* patch-01-const: Adapted
+
+2011-09-25  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-01-const (new): Avoid cast from const to non-const.
+
+2011-08-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import lcdf-typetools-2.92.
+	* patch-01-void-func (removed): Now distributed.
+
+2011-06-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-01-void-func (new): Patch from
+	Vladimir Volovich <vvv@vsu.ru>.
+
+2011-06-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import lcdf-typetools-2.90.
+	* patch-03-warning (removed): Now distributed.
+
+2011-03-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import lcdf-typetools-2.88.
+	* patch-02-warnings (removed): Now distributed.
+
+	* patch-03-warning (new): Avoid `uninitialized' warning (the
+	compiler may not realize that this actually can'thappen).
+
+2011-03-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-02-warnings (new): Remove unused variables; add explicit
+	cast for `-1' used as `uint32_t'.
+
+2010-10-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import lcdf-typetools-2.85.
+	* patch-01-otftotfm-Makefile (removed): Now distributed.
+
+2010-04-26  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import lcdf-typetools-2.83.
+	* patch-01-otftotfm-Makefile (new): Adapt otftotfm/Makefile.am.
+
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/TL-Changes b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/TL-Changes
new file mode 100644
index 00000000000..b152b6d0469
--- /dev/null
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/TL-Changes
@@ -0,0 +1,13 @@
+Changes applied to the lcdf-typetools tree as obtained from:
+	http://www.lcdf.org/type/lcdf-typetools-2.95.tar.gz
+
+Removed:
+	aclocal.m4
+	configure
+	depcomp
+	install-sh
+	missing
+
+Created Autoconf macro file ../m4/ac_cxx_template_objs.m4
+	adapting code in configure.ac.
+
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
new file mode 100644
index 00000000000..fdbce1834ea
--- /dev/null
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-07-typos
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 00000000000..748d61f064e
--- /dev/null
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-08-future
@@ -0,0 +1,32 @@
+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.94-PATCHES/patch-20-TL-binary b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-20-TL-binary
index a3d41be4b91..1704861c174 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-20-TL-binary
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-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.94.orig/liblcdf/filename.cc lcdf-typetools-2.94/liblcdf/filename.cc
---- lcdf-typetools-2.94.orig/liblcdf/filename.cc	2011-11-03 17:51:58.000000000 +0100
-+++ lcdf-typetools-2.94/liblcdf/filename.cc	2012-08-11 18:30:06.000000000 +0200
+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
 @@ -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.94.orig/otftotfm/automatic.cc lcdf-typetools-2.94/otftotfm/automatic.cc
---- lcdf-typetools-2.94.orig/otftotfm/automatic.cc	2012-08-11 17:49:05.000000000 +0200
-+++ lcdf-typetools-2.94/otftotfm/automatic.cc	2012-08-13 13:40:24.000000000 +0200
+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
 @@ -311,7 +311,7 @@
      String ls_r = writable_texdir + "ls-R";
      bool success = false;
@@ -22,7 +22,7 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
  	    fprintf(f, "./%s:\n%s\n", directory.c_str(), file.c_str());
  	    success = true;
  	    fclose(f);
-@@ -682,7 +682,7 @@
+@@ -678,7 +678,7 @@
  #endif
  	{
  	    fclose(f);
@@ -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.94.orig/otftotfm/otftotfm.cc lcdf-typetools-2.94/otftotfm/otftotfm.cc
---- lcdf-typetools-2.94.orig/otftotfm/otftotfm.cc	2012-08-11 17:14:49.000000000 +0200
-+++ lcdf-typetools-2.94/otftotfm/otftotfm.cc	2012-08-11 18:07:57.000000000 +0200
+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
 @@ -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.94.orig/t1dotlessj/t1dotlessj.cc lcdf-typetools-2.94/t1dotlessj/t1dotlessj.cc
---- lcdf-typetools-2.94.orig/t1dotlessj/t1dotlessj.cc	2012-08-13 13:25:10.000000000 +0200
-+++ lcdf-typetools-2.94/t1dotlessj/t1dotlessj.cc	2012-08-14 21:51:20.000000000 +0200
+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
 @@ -403,10 +403,10 @@
      // write it to output
      if (!outputf)
@@ -68,10 +68,10 @@ 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.94.orig/t1rawafm/t1rawafm.cc lcdf-typetools-2.94/t1rawafm/t1rawafm.cc
---- lcdf-typetools-2.94.orig/t1rawafm/t1rawafm.cc	2012-08-15 12:09:30.000000000 +0200
-+++ lcdf-typetools-2.94/t1rawafm/t1rawafm.cc	2012-08-11 16:01:57.000000000 +0200
-@@ -350,6 +350,9 @@
+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
+@@ -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.94.orig/t1reencode/t1reencode.cc lcdf-typetools-2.94/t1reencode/t1reencode.cc
---- lcdf-typetools-2.94.orig/t1reencode/t1reencode.cc	2012-08-11 15:58:50.000000000 +0200
-+++ lcdf-typetools-2.94/t1reencode/t1reencode.cc	2012-08-14 21:54:34.000000000 +0200
+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
 @@ -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.94.orig/t1testpage/t1testpage.cc lcdf-typetools-2.94/t1testpage/t1testpage.cc
---- lcdf-typetools-2.94.orig/t1testpage/t1testpage.cc	2011-11-03 17:51:58.000000000 +0100
-+++ lcdf-typetools-2.94/t1testpage/t1testpage.cc	2012-08-11 16:02:02.000000000 +0200
+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
 @@ -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.95-PATCHES/patch-21-TL-paths
new file mode 100644
index 00000000000..954a4d95770
--- /dev/null
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-21-TL-paths
@@ -0,0 +1,15 @@
+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
+@@ -321,7 +321,11 @@
+     if (!success && writable_texdir.find_left('\'') < 0 && directory.find_left('\'') < 0 && file.find_left('\'') < 0) {
+ 	// look for mktexupd script
+ 	if (!mktexupd_tried) {
++#ifdef WIN32
++	    mktexupd = "mktexupd";
++#else
+ 	    mktexupd = kpsei_string(kpsei_find_file("mktexupd", KPSEI_FMT_WEB2C));
++#endif
+ 	    mktexupd_tried = true;
+ 	}
+ 
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-30-W32TeX b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-30-W32TeX
index 933d9bb2d4d..c40f07620e4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-30-W32TeX
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-30-W32TeX
@@ -1,21 +1,6 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/libefont/psres.cc lcdf-typetools-2.94/libefont/psres.cc
---- lcdf-typetools-2.94.orig/libefont/psres.cc	2011-11-03 17:51:58.000000000 +0100
-+++ lcdf-typetools-2.94/libefont/psres.cc	2012-08-13 16:21:03.000000000 +0200
-@@ -36,6 +36,11 @@
- # endif
- #endif
- #include <string.h>
-+
-+#ifdef W32TEX
-+#include <windows.h>
-+#endif
-+
- namespace Efont {
- 
- PsresDatabase::PsresDatabase()
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/otftotfm/automatic.cc lcdf-typetools-2.94/otftotfm/automatic.cc
---- lcdf-typetools-2.94.orig/otftotfm/automatic.cc	2012-08-13 13:40:24.000000000 +0200
-+++ lcdf-typetools-2.94/otftotfm/automatic.cc	2012-08-13 16:55:59.000000000 +0200
+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
 @@ -124,7 +124,18 @@
  static void
  find_writable_texdir(ErrorHandler *errh, const char *)
@@ -50,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.94.orig/otftotfm/kpseinterface.c lcdf-typetools-2.94/otftotfm/kpseinterface.c
---- lcdf-typetools-2.94.orig/otftotfm/kpseinterface.c	2012-08-16 11:07:09.000000000 +0200
-+++ lcdf-typetools-2.94/otftotfm/kpseinterface.c	2012-08-13 17:05:15.000000000 +0200
+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
 @@ -11,24 +11,112 @@
   * Public License for more details.
   */
@@ -153,31 +138,31 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
  kpsei_init(const char* argv0, const char* progname)
  {
 +#ifdef W32TEX
-+  PROC pkpse_set_program_name;
-+  pkpse_set_program_name = GetProcAddress(Hinstance, "kpse_set_program_name");
-+  if(!pkpse_set_program_name) {
-+    fprintf(stderr, "Failed to find Kpathsea function.\n");
-+    return;
-+  }
-+  (void)pkpse_set_program_name(argv0, progname);
++    PROC pkpse_set_program_name;
++    pkpse_set_program_name = GetProcAddress(Hinstance, "kpse_set_program_name");
++    if(!pkpse_set_program_name) {
++	fprintf(stderr, "Failed to find Kpathsea function.\n");
++	return;
++    }
++    (void)pkpse_set_program_name(argv0, progname);
 +#else
      kpse_set_program_name(argv0, progname);
 +#endif
  #ifdef SELFAUTODIR
      putenv("SELFAUTODIR=" SELFAUTODIR);
  #endif
-@@ -43,12 +131,34 @@
+@@ -43,13 +131,35 @@
  char*
  kpsei_path_expand(const char* path)
  {
 +#ifdef W32TEX
-+  PROC pkpse_path_expand;
-+  pkpse_path_expand = GetProcAddress(Hinstance, "kpse_path_expand");
-+  if(!pkpse_path_expand) {
-+    fprintf(stderr, "Failed to find Kpathsea function.\n");
-+    return 0;
-+  }
-+  return (char *)pkpse_path_expand(path);
++    PROC pkpse_path_expand;
++    pkpse_path_expand = GetProcAddress(Hinstance, "kpse_path_expand");
++    if(!pkpse_path_expand) {
++	fprintf(stderr, "Failed to find Kpathsea function.\n");
++	return 0;
++    }
++    return (char *)pkpse_path_expand(path);
 +#else
      return kpse_path_expand(path);
 +#endif
@@ -190,29 +175,30 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
  char*
  kpsei_find_file(const char* name, int format)
  {
+     char *result;
 +#ifdef W32TEX
-+  PROC pkpse_find_file;
-+  pkpse_find_file = GetProcAddress(Hinstance, "kpse_find_file");
-+  if(!pkpse_find_file) {
-+    fprintf(stderr, "Failed to find Kpathsea function.\n");
-+    return 0;
-+  }
++    PROC pkpse_find_file;
++    pkpse_find_file = GetProcAddress(Hinstance, "kpse_find_file");
++    if(!pkpse_find_file) {
++	fprintf(stderr, "Failed to find Kpathsea function.\n");
++	return 0;
++    }
 +#endif
      switch (format) {
        case KPSEI_FMT_WEB2C:
  	return kpse_find_file(name, kpse_web2c_format, true);
-@@ -76,5 +186,41 @@
+@@ -81,5 +191,41 @@
  void
  kpsei_set_debug_flags(unsigned flags)
  {
 +#ifdef W32TEX
-+  unsigned int *pkpathsea_debug;
-+  pkpathsea_debug = (unsigned int *)GetProcAddress(Hinstance, "kpathsea_debug");
-+  if(!pkpathsea_debug) {
-+    fprintf(stderr, "Failed to find Kpathsea variable.\n");
-+    return;
-+  }
-+  *pkpathsea_debug = flags;
++    unsigned int *pkpathsea_debug;
++    pkpathsea_debug = (unsigned int *)GetProcAddress(Hinstance, "kpathsea_debug");
++    if(!pkpathsea_debug) {
++	fprintf(stderr, "Failed to find Kpathsea variable.\n");
++	return;
++    }
++    *pkpathsea_debug = flags;
 +#else
      kpathsea_debug = flags;
 +#endif
@@ -222,30 +208,30 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
 +int
 +kpsei_getlongpath(char *buff, char *input, int len)
 +{
-+  PROC pkpse_getlongpath;
-+  pkpse_getlongpath = GetProcAddress(Hinstance, "getlongpath");
-+  if(!pkpse_getlongpath) {
-+    fprintf(stderr, "Failed to find Kpathsea function.\n");
-+    return 0;
-+  }
-+  return (int)pkpse_getlongpath(buff, input, len);
++    PROC pkpse_getlongpath;
++    pkpse_getlongpath = GetProcAddress(Hinstance, "getlongpath");
++    if(!pkpse_getlongpath) {
++	fprintf(stderr, "Failed to find Kpathsea function.\n");
++	return 0;
++    }
++    return (int)pkpse_getlongpath(buff, input, len);
  }
 +
 +char *
 +kpsei_var_value(const char *var)
 +{
-+  PROC pkpse_var_value;
-+  pkpse_var_value = GetProcAddress(Hinstance, "kpse_var_value");
-+  if(!pkpse_var_value) {
-+    fprintf(stderr, "Failed to find Kpathsea function.\n");
-+    return NULL;
-+  }
-+  return (char *)pkpse_var_value(var);
++    PROC pkpse_var_value;
++    pkpse_var_value = GetProcAddress(Hinstance, "kpse_var_value");
++    if(!pkpse_var_value) {
++	fprintf(stderr, "Failed to find Kpathsea function.\n");
++	return NULL;
++    }
++    return (char *)pkpse_var_value(var);
 +}
 +#endif
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/otftotfm/kpseinterface.h lcdf-typetools-2.94/otftotfm/kpseinterface.h
---- lcdf-typetools-2.94.orig/otftotfm/kpseinterface.h	2011-11-03 17:51:58.000000000 +0100
-+++ lcdf-typetools-2.94/otftotfm/kpseinterface.h	2012-08-13 16:22:26.000000000 +0200
+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
 @@ -13,6 +13,13 @@
  char* kpsei_find_file(const char* name, int format);
  void kpsei_set_debug_flags(unsigned flags);
@@ -260,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.94.orig/otftotfm/otftotfm.cc lcdf-typetools-2.94/otftotfm/otftotfm.cc
---- lcdf-typetools-2.94.orig/otftotfm/otftotfm.cc	2012-08-11 18:07:57.000000000 +0200
-+++ lcdf-typetools-2.94/otftotfm/otftotfm.cc	2012-08-13 16:30:04.000000000 +0200
+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
 @@ -1739,6 +1739,11 @@
      }
  }
@@ -296,8 +282,8 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
  There is NO warranty, not even for merchantability or fitness for a\n\
  particular purpose.\n");
 +#ifdef W32TEX
-+            if(Hinstance != NULL)
-+              FreeLibrary(Hinstance);
++	    if(Hinstance != NULL)
++		FreeLibrary(Hinstance);
 +#endif
  	    exit(0);
  	    break;
@@ -305,8 +291,8 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
  	  case HELP_OPT:
  	    usage();
 +#ifdef W32TEX
-+            if(Hinstance != NULL)
-+              FreeLibrary(Hinstance);
++	    if(Hinstance != NULL)
++		FreeLibrary(Hinstance);
 +#endif
  	    exit(0);
  	    break;
@@ -319,7 +305,7 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
 +	if (errh->nerrors()) {
 +#ifdef W32TEX
 +	    if(Hinstance != NULL)
-+	      FreeLibrary(Hinstance);
++		FreeLibrary(Hinstance);
 +#endif
  	    exit(1);
 +	}
@@ -332,7 +318,7 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
      }
 +#ifdef W32TEX
 +    if(Hinstance != NULL)
-+      FreeLibrary(Hinstance);
++	FreeLibrary(Hinstance);
 +#endif
  
      return (errh->nerrors() == 0 ? 0 : 1);
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-31-WIN32 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-31-WIN32
index 1a81967f779..6d31ab0bfae 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-31-WIN32
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-31-WIN32
@@ -1,26 +1,22 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/otftotfm/util.cc lcdf-typetools-2.94/otftotfm/util.cc
---- lcdf-typetools-2.94.orig/otftotfm/util.cc	2012-08-11 17:42:50.000000000 +0200
-+++ lcdf-typetools-2.94/otftotfm/util.cc	2012-09-21 14:21:28.000000000 +0200
-@@ -184,9 +184,22 @@
+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
++# ifdef WIN32
 +    const char *tmp_dir = getenv("TEMP");
 +    if (!tmp_dir)
 +	tmp_dir = ".";
-+#endif
++    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");
-+#ifdef WIN32
-+	char *tmpp;
-+	if ((tmpp = strrchr(filename.c_str(), '/')))
-+	    filename = ++tmpp;
-+	if ((tmpp = strrchr(filename.c_str(), '\\')))
-+	    filename = ++tmpp;
-+	filename = String(tmp_dir) + "\\" + filename;
-+#endif
++# 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/7t.enc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/7t.enc
index 727f29e5f8c..727f29e5f8c 100644
--- a/Build/source/texk/lcdf-typetools/7t.enc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/7t.enc
diff --git a/Build/source/texk/lcdf-typetools/COPYING b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/COPYING
index 67572846722..67572846722 100644
--- a/Build/source/texk/lcdf-typetools/COPYING
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/COPYING
diff --git a/Build/source/texk/lcdf-typetools/INSTALL b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/INSTALL
index 95d84c820fb..95d84c820fb 100644
--- a/Build/source/texk/lcdf-typetools/INSTALL
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/INSTALL
diff --git a/Build/source/texk/lcdf-typetools/Makefile.am.orig b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/Makefile.am
index 1e0dd8d9cd7..c91a420d711 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.am.orig
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/Makefile.am
@@ -4,7 +4,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
 
-pkgdata_DATA = glyphlist.txt texglyphlist.txt 7t.enc
+glyphlist_DATA = glyphlist.txt texglyphlist.txt
+enc_DATA = 7t.enc
 
 EXTRA_DIST = \
 	ONEWS \
@@ -70,14 +71,14 @@ cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1tes
 	cd $@ && $(MAKE)
 
 versionize:
-	perl -pi -e 's/^\.ds V.*/.ds V $(VERSION)/;' $(top_srcdir)/cfftot1/cfftot1.1 $(top_srcdir)/mmafm/mmafm.1 $(top_srcdir)/mmpfb/mmpfb.1 $(top_srcdir)/otfinfo/otfinfo.1 $(top_srcdir)/otftotfm/otftotfm.1 $(top_srcdir)/t1dotlessj/t1dotlessj.1 $(top_srcdir)/t1lint/t1lint.1 $(top_srcdir)/t1rawafm/t1rawafm.1 $(top_srcdir)/t1reencode/t1reencode.1 $(top_srcdir)/t1testpage/t1testpage.1 $(top_srcdir)/ttftotype42/ttftotype42.1
-	perl -pi -e 's/^(\U$(PACKAGE)\E) [\d.ab]+$$/$$1 $(VERSION)/;' $(top_srcdir)/README
-	perl -pi -e 's/^Version: [\d.ab]+$$/Version: $(VERSION)/;' $(top_srcdir)/lcdf-typetools.spec
+	perl -pi -e 's/^\.ds V.*/.ds V $(VERSION)/;' $(srcdir)/cfftot1/cfftot1.1 $(srcdir)/mmafm/mmafm.1 $(srcdir)/mmpfb/mmpfb.1 $(srcdir)/otfinfo/otfinfo.1 $(srcdir)/otftotfm/otftotfm.1 $(srcdir)/t1dotlessj/t1dotlessj.1 $(srcdir)/t1lint/t1lint.1 $(srcdir)/t1rawafm/t1rawafm.1 $(srcdir)/t1reencode/t1reencode.1 $(srcdir)/t1testpage/t1testpage.1 $(srcdir)/ttftotype42/ttftotype42.1
+	perl -pi -e 's/^(\U$(PACKAGE)\E) [\d.ab]+$$/$$1 $(VERSION)/;' $(srcdir)/README
+	perl -pi -e 's/^Version: [\d.ab]+$$/Version: $(VERSION)/;' $(srcdir)/lcdf-typetools.spec
 
 dist-hook:
-	if test -f $(top_srcdir)/make-glyphtounicode.pl; then (cd $(top_srcdir); perl make-glyphtounicode.pl) > $(distdir)/glyphtounicode.tex; elif test -f $(top_srcdir)/glyphtounicode.tex; then cp $(top_srcdir)/glyphtounicode.tex $(distdir); fi
+	if test -f $(srcdir)/make-glyphtounicode.pl; then (cd $(srcdir); perl make-glyphtounicode.pl) > $(distdir)/glyphtounicode.tex; elif test -f $(srcdir)/glyphtounicode.tex; then cp $(srcdir)/glyphtounicode.tex $(distdir); fi
 
-$(top_srcdir)/glyphtounicode.tex: $(top_srcdir)/glyphlist.txt $(top_srcdir)/texglyphlist.txt $(top_srcdir)/texglyphlist-g2u.txt $(top_srcdir)/make-glyphtounicode.pl
-	cd $(top_srcdir); perl make-glyphtounicode.pl > glyphtounicode.tex
+$(srcdir)/glyphtounicode.tex: $(srcdir)/glyphlist.txt $(srcdir)/texglyphlist.txt $(srcdir)/texglyphlist-g2u.txt $(srcdir)/make-glyphtounicode.pl
+	cd $(srcdir); perl make-glyphtounicode.pl > glyphtounicode.tex
 
 .PHONY: rpm liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/Makefile.in
new file mode 100644
index 00000000000..94403693497
--- /dev/null
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/Makefile.in
@@ -0,0 +1,757 @@
+# Makefile.in generated by automake 1.12.3 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@
+subdir = lcdf-typetools-2.95
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	COPYING INSTALL NEWS
+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 =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+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; }; \
+  }
+am__installdirs = "$(DESTDIR)$(encdir)" "$(DESTDIR)$(glyphlistdir)"
+DATA = $(enc_DATA) $(glyphlist_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+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 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
+EXTRA_DIST = \
+	ONEWS \
+	lcdf-typetools.spec \
+	include/config.h \
+	include/lcdf/bezier.hh \
+	include/lcdf/clp.h \
+	include/lcdf/error.hh \
+	include/lcdf/filename.hh \
+	include/lcdf/globmatch.hh \
+	include/lcdf/hashcode.hh \
+	include/lcdf/hashmap.hh include/lcdf/hashmap.cc \
+	include/lcdf/inttypes.h \
+	include/lcdf/landmark.hh \
+	include/lcdf/md5.h \
+	include/lcdf/permstr.hh \
+	include/lcdf/point.hh \
+	include/lcdf/slurper.hh \
+	include/lcdf/straccum.hh \
+	include/lcdf/string.hh \
+	include/lcdf/strtonum.h \
+	include/lcdf/transform.hh \
+	include/lcdf/vector.hh include/lcdf/vector.cc \
+	include/efont/afm.hh \
+	include/efont/afmparse.hh \
+	include/efont/afmw.hh \
+	include/efont/amfm.hh \
+	include/efont/cff.hh \
+	include/efont/encoding.hh \
+	include/efont/findmet.hh \
+	include/efont/metrics.hh \
+	include/efont/otf.hh \
+	include/efont/otfcmap.hh \
+	include/efont/otfdata.hh \
+	include/efont/otfgpos.hh \
+	include/efont/otfgsub.hh \
+	include/efont/otfname.hh \
+	include/efont/otfos2.hh \
+	include/efont/otfpost.hh \
+	include/efont/pairop.hh \
+	include/efont/psres.hh \
+	include/efont/t1bounds.hh \
+	include/efont/t1cs.hh \
+	include/efont/t1csgen.hh \
+	include/efont/t1font.hh \
+	include/efont/t1interp.hh \
+	include/efont/t1item.hh \
+	include/efont/t1mm.hh \
+	include/efont/t1rw.hh \
+	include/efont/t1unparser.hh \
+	include/efont/ttfcs.hh \
+	include/efont/ttfhead.hh \
+	include/efont/ttfkern.hh \
+	glyphlist.txt \
+	texglyphlist.txt \
+	texglyphlist-g2u.txt \
+	7t.enc
+
+all: all-recursive
+
+.SUFFIXES:
+$(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/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/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):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-encDATA: $(enc_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(enc_DATA)'; test -n "$(encdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(encdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(encdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(encdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(encdir)" || exit $$?; \
+	done
+
+uninstall-encDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(enc_DATA)'; test -n "$(encdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(encdir)'; $(am__uninstall_files_from_dir)
+install-glyphlistDATA: $(glyphlist_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(glyphlist_DATA)'; test -n "$(glyphlistdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(glyphlistdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(glyphlistdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(glyphlistdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(glyphlistdir)" || exit $$?; \
+	done
+
+uninstall-glyphlistDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(glyphlist_DATA)'; test -n "$(glyphlistdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(glyphlistdir)'; $(am__uninstall_files_from_dir)
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+cscopelist-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
+	done
+
+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: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	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: ctags-recursive $(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: cscopelist-recursive $(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)
+	@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
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(encdir)" "$(DESTDIR)$(glyphlistdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+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:
+
+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-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-encDATA install-glyphlistDATA
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-encDATA uninstall-glyphlistDATA
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
+	cscopelist-recursive ctags-recursive install-am install-strip \
+	tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist cscopelist-recursive ctags ctags-recursive \
+	dist-hook distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-encDATA install-exec install-exec-am \
+	install-glyphlistDATA install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall 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
+	cd $@ && $(MAKE)
+
+versionize:
+	perl -pi -e 's/^\.ds V.*/.ds V $(VERSION)/;' $(srcdir)/cfftot1/cfftot1.1 $(srcdir)/mmafm/mmafm.1 $(srcdir)/mmpfb/mmpfb.1 $(srcdir)/otfinfo/otfinfo.1 $(srcdir)/otftotfm/otftotfm.1 $(srcdir)/t1dotlessj/t1dotlessj.1 $(srcdir)/t1lint/t1lint.1 $(srcdir)/t1rawafm/t1rawafm.1 $(srcdir)/t1reencode/t1reencode.1 $(srcdir)/t1testpage/t1testpage.1 $(srcdir)/ttftotype42/ttftotype42.1
+	perl -pi -e 's/^(\U$(PACKAGE)\E) [\d.ab]+$$/$$1 $(VERSION)/;' $(srcdir)/README
+	perl -pi -e 's/^Version: [\d.ab]+$$/Version: $(VERSION)/;' $(srcdir)/lcdf-typetools.spec
+
+dist-hook:
+	if test -f $(srcdir)/make-glyphtounicode.pl; then (cd $(srcdir); perl make-glyphtounicode.pl) > $(distdir)/glyphtounicode.tex; elif test -f $(srcdir)/glyphtounicode.tex; then cp $(srcdir)/glyphtounicode.tex $(distdir); fi
+
+$(srcdir)/glyphtounicode.tex: $(srcdir)/glyphlist.txt $(srcdir)/texglyphlist.txt $(srcdir)/texglyphlist-g2u.txt $(srcdir)/make-glyphtounicode.pl
+	cd $(srcdir); perl make-glyphtounicode.pl > glyphtounicode.tex
+
+.PHONY: rpm liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42
+
+# 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/NEWS b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/NEWS
index 2813b447abb..c5fd7fc87fb 100644
--- a/Build/source/texk/lcdf-typetools/NEWS
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/NEWS
@@ -1,5 +1,10 @@
 LCDF Typetools NEWS
 
+Version 2.95   21.Sep.2012
+
+* Fix cfftot1: Don't crash on problematic fonts. Bob Tennent report.
+
+
 Version 2.94   3.Aug.2012
 
 * More compilation updates.
diff --git a/Build/source/texk/lcdf-typetools/ONEWS b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ONEWS
index 6bd9dc8c42d..6bd9dc8c42d 100644
--- a/Build/source/texk/lcdf-typetools/ONEWS
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ONEWS
diff --git a/Build/source/texk/lcdf-typetools/README b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/README
index ef53cede953..de2388a2088 100644
--- a/Build/source/texk/lcdf-typetools/README
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/README
@@ -1,4 +1,4 @@
-LCDF-TYPETOOLS 2.94
+LCDF-TYPETOOLS 2.95
 ===================
 
 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.95/autoconf.h.in
new file mode 100644
index 00000000000..127a78753f2
--- /dev/null
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/autoconf.h.in
@@ -0,0 +1,225 @@
+/* autoconf.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
+/* Define if the va_list type is addressable. */
+#undef HAVE_ADDRESSABLE_VA_LIST
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#undef HAVE_ARPA_INET_H
+
+/* Define to run cfftot1 from otftotfm. */
+#undef HAVE_AUTO_CFFTOT1
+
+/* Define to run t1dotlessj from otftotfm. */
+#undef HAVE_AUTO_T1DOTLESSJ
+
+/* Define to run ttftotype42 from otftotfm. */
+#undef HAVE_AUTO_TTFTOTYPE42
+
+/* Define to run updmap from otftotfm. */
+#undef HAVE_AUTO_UPDMAP
+
+/* Define if strnlen is broken. */
+#undef HAVE_BROKEN_STRNLEN
+
+/* Define if strtod is broken. */
+#undef HAVE_BROKEN_STRTOD
+
+/* Define to 1 if you have the <byteorder.h> header file. */
+#undef HAVE_BYTEORDER_H
+
+/* Define to 1 if you have the `ctime' function. */
+#undef HAVE_CTIME
+
+/* Define to 1 if you have the declaration of `kpse_enc_format', and to 0 if
+   you don't. */
+#undef HAVE_DECL_KPSE_ENC_FORMAT
+
+/* Define to 1 if you have the declaration of `kpse_opentype_format', and to 0
+   if you don't. */
+#undef HAVE_DECL_KPSE_OPENTYPE_FORMAT
+
+/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
+   don't. */
+#undef HAVE_DECL_STRNLEN
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_DIRENT_H
+
+/* Define if intXX_t types are not available. */
+#undef HAVE_FAKE_INT_TYPES
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if you have the `ftruncate' function. */
+#undef HAVE_FTRUNCATE
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define if you want to use kpathsea. */
+#undef HAVE_KPATHSEA
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `mkstemp' function. */
+#undef HAVE_MKSTEMP
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#undef HAVE_NETINET_IN_H
+
+/* Define to 1 if you have the <new.h> header file. */
+#undef HAVE_NEW_H
+
+/* Define if <new> exists and works. */
+#undef HAVE_NEW_HDR
+
+/* Define if PermStrings are available. */
+#undef HAVE_PERMSTRING
+
+/* Define to 1 if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strdup' function. */
+#undef HAVE_STRDUP
+
+/* Define to 1 if you have the `strerror' function. */
+#undef HAVE_STRERROR
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strnlen' function. */
+#undef HAVE_STRNLEN
+
+/* Define to 1 if you have the `strtoul' function. */
+#undef HAVE_STRTOUL
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_DIR_H
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_NDIR_H
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <sys/wait.h> header file. */
+#undef HAVE_SYS_WAIT_H
+
+/* Define to 1 if the system has the type `uintptr_t'. */
+#undef HAVE_UINTPTR_T
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define if you have u_intXX_t types but not uintXX_t types. */
+#undef HAVE_U_INT_TYPES
+
+/* Define to 1 if you have the `vsnprintf' function. */
+#undef HAVE_VSNPRINTF
+
+/* Define to 1 if you have the `waitpid' function. */
+#undef HAVE_WAITPID
+
+/* Define to 0 if you don't want mmafm to run mmpfb when it needs to get an
+   intermediate master conversion program. */
+#undef MMAFM_RUN_MMPFB
+
+/* Define to 1 if you must include <arpa/inet.h> to get `ntohl'. */
+#undef NEED_ARPA_INET_H
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* kpsewhich's $SELFAUTODIR variable */
+#undef SELFAUTODIR
+
+/* kpsewhich's $SELFAUTOLOC variable */
+#undef SELFAUTOLOC
+
+/* kpsewhich's $SELFAUTOPARENT variable */
+#undef SELFAUTOPARENT
+
+/* Data directory. */
+#undef SHAREDIR
+
+/* The size of `unsigned int', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_INT
+
+/* The size of `unsigned long', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_LONG
+
+/* The size of `void *', as computed by sizeof. */
+#undef SIZEOF_VOID_P
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
+/* Define to 1 if your processor stores words with the least significant byte
+   first (like Intel and VAX, unlike Motorola and SPARC). */
+#undef WORDS_LITTLEENDIAN
diff --git a/Build/source/texk/lcdf-typetools/cfftot1/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/Makefile.am
index 6bfd3a37b6c..81d5365b976 100644
--- a/Build/source/texk/lcdf-typetools/cfftot1/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/Makefile.am
@@ -9,7 +9,7 @@ cfftot1_SOURCES = cfftot1.cc \
 
 cfftot1_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 
 EXTRA_DIST = cfftot1.1
diff --git a/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/Makefile.in
index 212b67cb68b..8e8aa15a6fc 100644
--- a/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = cfftot1$(EXEEXT)
-subdir = cfftot1
+subdir = lcdf-typetools-2.95/cfftot1
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -178,6 +178,7 @@ 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@
@@ -239,7 +240,9 @@ 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@
@@ -274,7 +277,7 @@ cfftot1_SOURCES = cfftot1.cc \
 	maket1font.cc maket1font.hh
 
 cfftot1_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = cfftot1.1
 all: all-am
@@ -290,9 +293,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign cfftot1/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.95/cfftot1/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign cfftot1/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/cfftot1/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/cfftot1.1
index 25e1d7ec834..01da90f92b1 100644
--- a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/cfftot1.1
@@ -1,4 +1,4 @@
-.ds V 2.94
+.ds V 2.95
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/cfftot1.cc
index 945d0d606bc..fe719e86d56 100644
--- a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/cfftot1.cc
@@ -1,6 +1,6 @@
 /* cfftot1.cc -- driver for translating CFF fonts to Type 1 fonts
  *
- * Copyright (c) 2002-2011 Eddie Kohler
+ * Copyright (c) 2002-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -123,38 +123,39 @@ do_file(const char *infn, const char *outfn, PermString name, ErrorHandler *errh
 
     if (c == EOF)
 	errh->fatal("%s: empty file", infn);
-    if (c == 1 || c == 'O') {
-	StringAccum sa(150000);
-	int amt;
-	do {
-	    if (char *x = sa.reserve(32768)) {
-		amt = fread(x, 1, 32768, f);
-		sa.adjust_length(amt);
-	    } else
-		amt = 0;
-	} while (amt != 0);
-	if (!feof(f) || ferror(f))
-	    errh->lerror(infn, "%s", strerror(errno));
-	if (f != stdin)
-	    fclose(f);
-
-	LandmarkErrorHandler cerrh(errh, infn);
-	String data = sa.take_string();
-	if (c == 'O')
-	    data = Efont::OpenType::Font(data, &cerrh).table("CFF");
-
-	Cff *cff = new Cff(data, &cerrh);
-	Cff::FontParent *fp = cff->font(name, &cerrh);
-	if (errh->nerrors() == 0
-	    && !(font = dynamic_cast<Cff::Font *>(fp)))
-	    errh->fatal("%s: CID-keyed fonts not supported", infn);
-    } else
+    if (c != 1 && c != 'O')
 	errh->fatal("%s: not a CFF or OpenType/CFF font", infn);
 
+    StringAccum sa(150000);
+    int amt;
+    do {
+	if (char *x = sa.reserve(32768)) {
+	    amt = fread(x, 1, 32768, f);
+	    sa.adjust_length(amt);
+	} else
+	    amt = 0;
+    } while (amt != 0);
+    if (!feof(f) || ferror(f))
+	errh->lerror(infn, "%s", strerror(errno));
+    if (f != stdin)
+	fclose(f);
+
+    ContextErrorHandler cerrh(errh, "While processing %s:", infn);
+    cerrh.set_indent(0);
+    String data = sa.take_string();
+    if (c == 'O')
+	data = Efont::OpenType::Font(data, &cerrh).table("CFF");
+
+    Cff *cff = new Cff(data, &cerrh);
+    Cff::FontParent *fp = cff->font(name, &cerrh);
+    if (errh->nerrors() == 0
+	&& !(font = dynamic_cast<Cff::Font *>(fp)))
+	errh->fatal("%s: CID-keyed fonts not supported", infn);
+
     if (errh->nerrors() > 0)
 	return;
 
-    Type1Font *font1 = create_type1_font(font, errh);
+    Type1Font *font1 = create_type1_font(font, &cerrh);
 
     if (!outfn || strcmp(outfn, "-") == 0) {
 	f = stdout;
@@ -216,7 +217,7 @@ main(int argc, char *argv[])
 
 	  case VERSION_OPT:
 	    printf("cfftot1 (LCDF typetools) %s\n", VERSION);
-	    printf("Copyright (C) 2002-2011 Eddie Kohler\n\
+	    printf("Copyright (C) 2002-2012 Eddie Kohler\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty, not even for merchantability or fitness for a\n\
 particular purpose.\n");
diff --git a/Build/source/texk/lcdf-typetools/cfftot1/maket1font.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/maket1font.cc
index 16249696f03..21b632e50d9 100644
--- a/Build/source/texk/lcdf-typetools/cfftot1/maket1font.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/maket1font.cc
@@ -1,6 +1,6 @@
 /* maket1font.{cc,hh} -- translate CFF fonts to Type 1 fonts
  *
- * Copyright (c) 2002-2011 Eddie Kohler
+ * Copyright (c) 2002-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -86,9 +86,11 @@ class MakeType1CharstringInterp::Subr { public:
 	Subr *subr;
 	int pos;
 	int len;
-	String s;
 	Caller(Subr *s, int p, int l)	: subr(s), pos(p), len(l) { }
-	String charstring(MakeType1CharstringInterp *mcsi) const { return subr->charstring(mcsi)->substring(pos, len); }
+	String charstring(MakeType1CharstringInterp *mcsi) const {
+	    Type1Charstring *t1cs = subr->charstring(mcsi);
+	    return t1cs->substring(pos, len);
+	}
     };
 
     int ncallers() const		{ return _callers.size(); }
@@ -104,8 +106,6 @@ class MakeType1CharstringInterp::Subr { public:
     void change_callers(Subr *, int pos, int length, int new_length);
     bool unify(MakeType1CharstringInterp *);
 
-    void caller_data(bool assign, MakeType1CharstringInterp *mcsi);
-
   private:
 
     CsRef _csr;
@@ -204,7 +204,10 @@ MakeType1CharstringInterp::Subr::name(const MakeType1CharstringInterp *mcsi) con
     case CSR_GSUBR:
 	return "gsubr" + String(n);
     case CSR_GLYPH:
-	return mcsi->output()->glyph_name(n);
+	if (String name = mcsi->output()->glyph_name(n))
+	    return name;
+	else
+	    return "??glyph" + String(n) + "??";
     default:
 	return "";
     }
@@ -275,24 +278,6 @@ MakeType1CharstringInterp::Subr::change_callers(Subr *caller, int pos, int lengt
     }
 }
 
-void
-MakeType1CharstringInterp::Subr::caller_data(bool assign, MakeType1CharstringInterp *mcsi)
-{
-    for (int i = 0; i < _callers.size(); i++) {
-	Caller &c = _callers[i];
-	if (!c.subr)
-	    continue;
-	String s = c.subr->charstring(mcsi)->substring(c.pos, c.len);
-	if (assign)
-	    c.s = s;
-	else if (c.s != s) {
-	    //fprintf(stderr, "FAIL %08x caller %08x:%d+%d\n", _csr, c.subr->_csr, c.pos, c.len);
-	    //assert(0);
-	}
-	assert(c.subr->has_call(this));
-    }
-}
-
 bool
 MakeType1CharstringInterp::Subr::unify(MakeType1CharstringInterp *mcsi)
 {
@@ -433,12 +418,21 @@ MakeType1CharstringInterp::run(const CharstringProgram *program, Type1Font *outp
 	run(program->glyph_context(i), receptacle, errh);
 #if 0
 	PermString n = program->glyph_name(i);
-	if (n == "integral.disp") {
+	if (i == 2301 || i == 2302) {
 	    fprintf(stderr, "%s was %s\n", n.c_str(), CharstringUnparser::unparse(*program->glyph(i)).c_str());
 	    fprintf(stderr, "%s == %s\n", n.c_str(), CharstringUnparser::unparse(receptacle).c_str());
 	}
 #endif
-	output->add_glyph(Type1Subr::make_glyph(program->glyph_name(i), receptacle, glyph_definer));
+	PermString name = program->glyph_name(i);
+	if (output->glyph(name)) {
+	    errh->warning("glyph %<%s%> defined more than once", name.c_str());
+	    int i = 1;
+	    do {
+		name = program->glyph_name(i) + String(".") + String(i);
+		++i;
+	    } while (output->glyph(name));
+	}
+	output->add_glyph(Type1Subr::make_glyph(name, receptacle, glyph_definer));
     }
 
     // unify Subrs
diff --git a/Build/source/texk/lcdf-typetools/cfftot1/maket1font.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/maket1font.hh
index 75f2527897f..75f2527897f 100644
--- a/Build/source/texk/lcdf-typetools/cfftot1/maket1font.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/cfftot1/maket1font.hh
diff --git a/Build/source/texk/lcdf-typetools/configure.ac.orig b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/configure.ac
index d9c25bbf013..5d3d3db545c 100644
--- a/Build/source/texk/lcdf-typetools/configure.ac.orig
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([lcdf-typetools], [2.94])
+AC_INIT([lcdf-typetools], [2.95])
 AC_CONFIG_SRCDIR([NEWS])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER([autoconf.h])
@@ -395,6 +395,9 @@ using --without-kpathsea.
 	AC_CHECK_DECLS([kpse_opentype_format], [], [], [#include <kpathsea/kpathsea.h>])
     fi
 
+    dnl does it have a separate format for encoding files?
+    AC_CHECK_DECLS([kpse_enc_format], [], [], [#include <kpathsea/kpathsea.h>])
+
     CPPFLAGS="$SAVE_CPPFLAGS"; LDFLAGS="$SAVE_LDFLAGS"
 fi
 
@@ -430,6 +433,15 @@ fi
 
 
 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/glyphlist.txt b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/glyphlist.txt
index 0304ffc6674..0304ffc6674 100644
--- a/Build/source/texk/lcdf-typetools/glyphlist.txt
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/glyphlist.txt
diff --git a/Build/source/texk/lcdf-typetools/glyphtounicode.tex b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/glyphtounicode.tex
index 8d382652472..adaf8c82fc1 100644
--- a/Build/source/texk/lcdf-typetools/glyphtounicode.tex
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/glyphtounicode.tex
@@ -1,9 +1,9 @@
-% lcdf-typetools glyphtounicode.tex, Version 2.84
+% lcdf-typetools glyphtounicode.tex, Version 2.95
 % Contents: Glyph mapping information for pdftex, used for PDF searching
 % Generated from:
 % - glyphlist.txt, Version 2.0
-% - texglyphlist.txt, Version 2.84
-% - texglyphlist-g2u.txt, Version 2.84
+% - texglyphlist.txt, Version 2.95
+% - texglyphlist-g2u.txt, Version 2.95
 \pdfglyphtounicode{A}{0041}
 \pdfglyphtounicode{AE}{00C6}
 \pdfglyphtounicode{AEacute}{01FC}
@@ -1538,6 +1538,7 @@
 \pdfglyphtounicode{cparen}{249E}
 \pdfglyphtounicode{cruzeiro}{20A2}
 \pdfglyphtounicode{cstretched}{0297}
+\pdfglyphtounicode{ct}{0063 0074}
 \pdfglyphtounicode{curlyand}{22CF}
 \pdfglyphtounicode{curlyleft}{21AB}
 \pdfglyphtounicode{curlyor}{22CE}
@@ -2679,7 +2680,12 @@
 \pdfglyphtounicode{logicalnotreversed}{2310}
 \pdfglyphtounicode{logicalor}{2228}
 \pdfglyphtounicode{lolingthai}{0E25}
+\pdfglyphtounicode{longdbls}{017F 017F}
 \pdfglyphtounicode{longs}{017F}
+\pdfglyphtounicode{longsh}{017F 0068}
+\pdfglyphtounicode{longsi}{017F 0069}
+\pdfglyphtounicode{longsl}{017F 006C}
+\pdfglyphtounicode{longst}{017F 0074}
 \pdfglyphtounicode{lowlinecenterline}{FE4E}
 \pdfglyphtounicode{lowlinecmb}{0332}
 \pdfglyphtounicode{lowlinedashed}{FE4D}
@@ -3852,6 +3858,7 @@
 \pdfglyphtounicode{ssangsioskorean}{3146}
 \pdfglyphtounicode{ssangtikeutkorean}{3138}
 \pdfglyphtounicode{ssuperior}{0073}
+\pdfglyphtounicode{st}{0073 0074}
 \pdfglyphtounicode{star}{22C6}
 \pdfglyphtounicode{sterling}{00A3}
 \pdfglyphtounicode{sterlingmonospace}{FFE1}
diff --git a/Build/source/texk/lcdf-typetools/include/config.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/config.h
index 26a90a97b14..26a90a97b14 100644
--- a/Build/source/texk/lcdf-typetools/include/config.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/config.h
diff --git a/Build/source/texk/lcdf-typetools/include/efont/afm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/afm.hh
index f462e0079a4..f462e0079a4 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/afm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/afm.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/afmparse.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/afmparse.hh
index c29d990ceab..c29d990ceab 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/afmparse.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/afmparse.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/afmw.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/afmw.hh
index 4eda701b688..4eda701b688 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/afmw.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/afmw.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/amfm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/amfm.hh
index 6cc1db90b6e..6cc1db90b6e 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/amfm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/amfm.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/cff.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/cff.hh
index f965bd60c07..f965bd60c07 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/cff.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/cff.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/encoding.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/encoding.hh
index fd8d749acec..fd8d749acec 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/encoding.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/encoding.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/findmet.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/findmet.hh
index 74b3ecee141..74b3ecee141 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/findmet.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/findmet.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/metrics.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/metrics.hh
index 21a5f1796fb..21a5f1796fb 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/metrics.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/metrics.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/otf.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otf.hh
index 88e4fbfce4d..88e4fbfce4d 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/otf.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otf.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/otfcmap.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfcmap.hh
index f95a3dc5c41..f95a3dc5c41 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/otfcmap.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfcmap.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/otfdata.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfdata.hh
index 18fd894d5d2..18fd894d5d2 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/otfdata.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfdata.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/otfgpos.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfgpos.hh
index 84de5a2126b..84de5a2126b 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/otfgpos.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfgpos.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/otfgsub.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfgsub.hh
index 98a2e0f945a..98a2e0f945a 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/otfgsub.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfgsub.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/otfname.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfname.hh
index c91fc5af95f..c91fc5af95f 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/otfname.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfname.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/otfos2.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfos2.hh
index db26b674522..db26b674522 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/otfos2.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfos2.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/otfpost.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfpost.hh
index 58651583fcb..58651583fcb 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/otfpost.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/otfpost.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/pairop.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/pairop.hh
index bbb42073e44..bbb42073e44 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/pairop.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/pairop.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/psres.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/psres.hh
index ee302821fdb..ee302821fdb 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/psres.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/psres.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/t1bounds.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1bounds.hh
index c5e50634f4c..c5e50634f4c 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/t1bounds.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1bounds.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/t1cs.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1cs.hh
index ea5adaa59b4..1a3f8e8f039 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/t1cs.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1cs.hh
@@ -219,7 +219,7 @@ class CharstringProgram { public:
     inline int xsubr_bias(bool g) const;
 
     virtual int nglyphs() const			{ return 0; }
-    virtual PermString glyph_name(int) const	{ return PermString();}
+    virtual PermString glyph_name(int) const	{ return PermString(); }
     virtual void glyph_names(Vector<PermString> &) const;
     virtual Charstring *glyph(int) const	{ return 0; }
     virtual Charstring *glyph(PermString) const	{ return 0; }
diff --git a/Build/source/texk/lcdf-typetools/include/efont/t1csgen.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1csgen.hh
index 226497a4a6b..226497a4a6b 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/t1csgen.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1csgen.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/t1font.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1font.hh
index 4ec827e7e24..4ec827e7e24 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/t1font.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1font.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/t1interp.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1interp.hh
index 0b693b08c70..0b693b08c70 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/t1interp.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1interp.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/t1item.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1item.hh
index 056ba0e71d4..056ba0e71d4 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/t1item.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1item.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/t1mm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1mm.hh
index bf2e81a00e9..bf2e81a00e9 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/t1mm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1mm.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/t1rw.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1rw.hh
index d59f4089742..d59f4089742 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/t1rw.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1rw.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/t1unparser.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1unparser.hh
index 3a6e446e3c7..3a6e446e3c7 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/t1unparser.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/t1unparser.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/ttfcs.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/ttfcs.hh
index a2c04461872..a2c04461872 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/ttfcs.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/ttfcs.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/ttfhead.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/ttfhead.hh
index 2611a405b1b..2611a405b1b 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/ttfhead.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/ttfhead.hh
diff --git a/Build/source/texk/lcdf-typetools/include/efont/ttfkern.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/ttfkern.hh
index 717a72b6912..717a72b6912 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/ttfkern.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/efont/ttfkern.hh
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/bezier.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/bezier.hh
index ebb93ce9aea..ebb93ce9aea 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/bezier.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/bezier.hh
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/clp.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/clp.h
index 81d59bd99e9..1b658a17190 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/clp.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/clp.h
@@ -8,7 +8,7 @@ extern "C" {
 /* clp.h - Public interface to CLP.
  * This file is part of CLP, the command line parser package.
  *
- * Copyright (c) 1997-2011 Eddie Kohler, ekohler@gmail.com
+ * Copyright (c) 1997-2012 Eddie Kohler, ekohler@gmail.com
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/error.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/error.hh
index f43d5d7157e..f43d5d7157e 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/error.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/error.hh
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/filename.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/filename.hh
index 9424a4c04fa..9424a4c04fa 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/filename.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/filename.hh
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/globmatch.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/globmatch.hh
index 963035e0ead..963035e0ead 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/globmatch.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/globmatch.hh
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/hashcode.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/hashcode.hh
index 53a0e428989..53a0e428989 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/hashcode.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/hashcode.hh
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/hashmap.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/hashmap.cc
index 4851463c560..4851463c560 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/hashmap.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/hashmap.cc
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/hashmap.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/hashmap.hh
index 3d4179e5b5f..3d4179e5b5f 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/hashmap.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/hashmap.hh
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/inttypes.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/inttypes.h
index b88e9e9faf0..b88e9e9faf0 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/inttypes.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/inttypes.h
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/landmark.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/landmark.hh
index 183ab936ee8..183ab936ee8 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/landmark.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/landmark.hh
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/md5.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/md5.h
index 7d7f8641d23..7d7f8641d23 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/md5.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/md5.h
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/permstr.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/permstr.hh
index 684878ed464..684878ed464 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/permstr.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/permstr.hh
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/point.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/point.hh
index aad59b53ccf..aad59b53ccf 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/point.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/point.hh
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/slurper.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/slurper.hh
index 2e400d3c3f2..2e400d3c3f2 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/slurper.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/slurper.hh
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/straccum.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/straccum.hh
index 9474421e85f..9474421e85f 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/straccum.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/straccum.hh
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/string.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/string.hh
index a704c201572..a704c201572 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/string.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/string.hh
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/strtonum.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/strtonum.h
index ee8745a4a42..ee8745a4a42 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/strtonum.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/strtonum.h
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/transform.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/transform.hh
index 496658a4911..496658a4911 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/transform.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/transform.hh
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/vector.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/vector.cc
index e1487f35c25..8ad11c18810 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/vector.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/vector.cc
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1999-2000 Massachusetts Institute of Technology
  * Copyright (c) 2001-2003 International Computer Science Institute
- * Copyright (c) 1999-2011 Eddie Kohler
+ * Copyright (c) 1999-2012 Eddie Kohler
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/vector.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/vector.hh
index 86e64e238ba..86e64e238ba 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/vector.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/include/lcdf/vector.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools.spec b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/lcdf-typetools.spec
index 84bc70f1a1b..80d19169d3b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools.spec
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/lcdf-typetools.spec
@@ -1,6 +1,6 @@
 Summary: Programs to manipulate OpenType and multiple-master fonts
 Name: lcdf-typetools
-Version: 2.94
+Version: 2.95
 Copyright: GPL
 Vendor: Little Cambridgeport Design Factory <http://www.lcdf.org/>
 Group: Utilities/Printing
diff --git a/Build/source/texk/lcdf-typetools/libefont/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/Makefile.am
index a967616d6f8..eb09a9686ad 100644
--- a/Build/source/texk/lcdf-typetools/libefont/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/Makefile.am
@@ -40,4 +40,4 @@ libefont_a_SOURCES = \
 libefont_a_LIBADD = @TEMPLATE_OBJS@
 CLEANFILES = @TEMPLATE_OBJS@
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
diff --git a/Build/source/texk/lcdf-typetools/libefont/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/Makefile.in
index 501195404d2..88efa389fb0 100644
--- a/Build/source/texk/lcdf-typetools/libefont/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/Makefile.in
@@ -50,7 +50,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = libefont
+subdir = lcdf-typetools-2.95/libefont
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -149,6 +149,7 @@ 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@
@@ -210,7 +211,9 @@ 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@
@@ -277,7 +280,7 @@ libefont_a_SOURCES = \
 
 libefont_a_LIBADD = @TEMPLATE_OBJS@
 CLEANFILES = @TEMPLATE_OBJS@
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 all: all-am
 
 .SUFFIXES:
@@ -291,9 +294,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libefont/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.95/libefont/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign libefont/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/libefont/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/libefont/afm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/afm.cc
index fc17d035dbb..9705f91c97f 100644
--- a/Build/source/texk/lcdf-typetools/libefont/afm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/afm.cc
@@ -2,7 +2,7 @@
 
 /* afm.{cc,hh} -- Adobe Font Metrics files
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/afmparse.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/afmparse.cc
index d2bbd70ef6f..313b63ec362 100644
--- a/Build/source/texk/lcdf-typetools/libefont/afmparse.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/afmparse.cc
@@ -2,7 +2,7 @@
 
 /* afmparse.{cc,hh} -- Adobe Font Metrics parsing
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/afmw.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/afmw.cc
index 9e44cd7886d..20840be1332 100644
--- a/Build/source/texk/lcdf-typetools/libefont/afmw.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/afmw.cc
@@ -2,7 +2,7 @@
 
 /* afmw.{cc,hh} -- Adobe Font Metrics writing
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/amfm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/amfm.cc
index 687869c5137..b38532d55fb 100644
--- a/Build/source/texk/lcdf-typetools/libefont/amfm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/amfm.cc
@@ -2,7 +2,7 @@
 
 /* amfm.{cc,hh} -- Adobe Multiple-Master Font Metrics
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/cff.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/cff.cc
index 2c2b304fc2f..822d57ec94d 100644
--- a/Build/source/texk/lcdf-typetools/libefont/cff.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/cff.cc
@@ -2,7 +2,7 @@
 
 /* cff.{cc,hh} -- Compact Font Format fonts
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/encoding.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/encoding.cc
index 02933a8b879..a55ecc4db25 100644
--- a/Build/source/texk/lcdf-typetools/libefont/encoding.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/encoding.cc
@@ -2,7 +2,7 @@
 
 /* encoding.{cc,hh} -- 8-bit encodings
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/findmet.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/findmet.cc
index c6e2bafaa1d..aa5b8167156 100644
--- a/Build/source/texk/lcdf-typetools/libefont/findmet.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/findmet.cc
@@ -2,7 +2,7 @@
 
 /* findmet.{cc,hh} -- find font metrics
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/metrics.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/metrics.cc
index 264ecffd9a0..0dd308056e2 100644
--- a/Build/source/texk/lcdf-typetools/libefont/metrics.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/metrics.cc
@@ -2,7 +2,7 @@
 
 /* metrics.{cc,hh} -- generic font metrics
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/otf.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otf.cc
index 8b6d988d451..fb0abe3806a 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otf.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otf.cc
@@ -2,7 +2,7 @@
 
 /* otf.{cc,hh} -- OpenType font basics
  *
- * Copyright (c) 2002-2011 Eddie Kohler
+ * Copyright (c) 2002-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/otfcmap.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfcmap.cc
index b62b7188b86..b62b7188b86 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otfcmap.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfcmap.cc
diff --git a/Build/source/texk/lcdf-typetools/libefont/otfdata.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfdata.cc
index bcb92549d49..46c7c885c59 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otfdata.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfdata.cc
@@ -2,7 +2,7 @@
 
 /* otfdata.{cc,hh} -- OpenType bounds-checked string type
  *
- * Copyright (c) 2003-2011 Eddie Kohler
+ * Copyright (c) 2003-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/otfdescrip.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfdescrip.cc
index ed8c1e2078c..307f0b3cb61 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otfdescrip.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfdescrip.cc
@@ -1,6 +1,6 @@
 /* otfdescrip.cc -- descriptions for OpenType tags
  *
- * Copyright (c) 2002-2011 Eddie Kohler
+ * Copyright (c) 2002-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/otfgpos.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfgpos.cc
index 2fb9afbbc61..eb477256c5c 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otfgpos.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfgpos.cc
@@ -2,7 +2,7 @@
 
 /* otfgpos.{cc,hh} -- OpenType GPOS table
  *
- * Copyright (c) 2003-2011 Eddie Kohler
+ * Copyright (c) 2003-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/otfgsub.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfgsub.cc
index f4d82134310..10597847270 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otfgsub.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfgsub.cc
@@ -2,7 +2,7 @@
 
 /* otfgsub.{cc,hh} -- OpenType GSUB table
  *
- * Copyright (c) 2003-2011 Eddie Kohler
+ * Copyright (c) 2003-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/otfname.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfname.cc
index c140da4f39d..642b41fb845 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otfname.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfname.cc
@@ -2,7 +2,7 @@
 
 /* otfname.{cc,hh} -- OpenType name table
  *
- * Copyright (c) 2003-2011 Eddie Kohler
+ * Copyright (c) 2003-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/otfos2.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfos2.cc
index fab565eeb0f..9831fb49543 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otfos2.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfos2.cc
@@ -2,7 +2,7 @@
 
 /* otfos2.{cc,hh} -- OpenType OS/2 table
  *
- * Copyright (c) 2005-2011 Eddie Kohler
+ * Copyright (c) 2005-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/otfpost.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfpost.cc
index 2630102154f..b514f234f4b 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otfpost.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/otfpost.cc
@@ -2,7 +2,7 @@
 
 /* otfpost.{cc,hh} -- OpenType post table
  *
- * Copyright (c) 2006-2011 Eddie Kohler
+ * Copyright (c) 2006-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/pairop.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/pairop.cc
index 5f015a41d84..5b64be1ac41 100644
--- a/Build/source/texk/lcdf-typetools/libefont/pairop.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/pairop.cc
@@ -2,7 +2,7 @@
 
 /* pairop.{cc,hh} -- ligature/kern font metrics
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/psres.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/psres.cc
index 4905205675f..2136a6b3237 100644
--- a/Build/source/texk/lcdf-typetools/libefont/psres.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/psres.cc
@@ -2,7 +2,7 @@
 
 /* psres.{cc,hh} -- PSres.upr files
  *
- * Copyright (c) 1999-2011 Eddie Kohler
+ * Copyright (c) 1999-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -36,11 +36,6 @@
 # endif
 #endif
 #include <string.h>
-
-#ifdef W32TEX
-#include <windows.h>
-#endif
-
 namespace Efont {
 
 PsresDatabase::PsresDatabase()
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1bounds.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1bounds.cc
index bb85d26e9c3..ccea404d4d3 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1bounds.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1bounds.cc
@@ -2,7 +2,7 @@
 
 /* t1bounds.{cc,hh} -- charstring bounding box finder
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1cs.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1cs.cc
index c2d9c6d752d..4db3afa5a9d 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1cs.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1cs.cc
@@ -2,7 +2,7 @@
 
 /* t1cs.{cc,hh} -- Type 1/2 charstrings
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1csgen.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1csgen.cc
index 6e78d3ecf00..b24c8f21307 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1csgen.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1csgen.cc
@@ -2,7 +2,7 @@
 
 /* t1csgen.{cc,hh} -- Type 1 charstring generation
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1font.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1font.cc
index 1c92e41e249..05b97fa346e 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1font.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1font.cc
@@ -2,7 +2,7 @@
 
 /* t1font.{cc,hh} -- Type 1 font
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1fontskel.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1fontskel.cc
index 3e775182e20..e5e48023348 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1fontskel.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1fontskel.cc
@@ -1,6 +1,6 @@
 /* t1fontskel.cc -- Type 1 font skeleton
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1interp.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1interp.cc
index 513330567f7..7b607bb407d 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1interp.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1interp.cc
@@ -2,7 +2,7 @@
 
 /* t1interp.{cc,hh} -- Type 1/2 charstring interpretation
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1item.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1item.cc
index d6f133045e0..5e169b66f13 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1item.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1item.cc
@@ -2,7 +2,7 @@
 
 /* t1item.{cc,hh} -- items in a Type 1 font
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1mm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1mm.cc
index 413d5f1aa92..404335a8f20 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1mm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1mm.cc
@@ -2,7 +2,7 @@
 
 /* t1mm.{cc,hh} -- Type 1 multiple master font information
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1rw.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1rw.cc
index 9a09a16a90d..846297e6b67 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1rw.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1rw.cc
@@ -2,7 +2,7 @@
 
 /* t1rw.{cc,hh} -- Type 1 font reading and writing
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1unparser.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1unparser.cc
index 363b5c3a746..993253deec9 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1unparser.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/t1unparser.cc
@@ -2,7 +2,7 @@
 
 /* t1unparser.{cc,hh} -- debug printing of Type 1 fonts
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/ttfcs.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/ttfcs.cc
index 422b7eb3299..d427cf17bcc 100644
--- a/Build/source/texk/lcdf-typetools/libefont/ttfcs.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/ttfcs.cc
@@ -2,7 +2,7 @@
 
 /* ttfcs.{cc,hh} -- TrueType "charstring" emulation
  *
- * Copyright (c) 2006-2011 Eddie Kohler
+ * Copyright (c) 2006-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/ttfhead.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/ttfhead.cc
index 7aacb646778..5be8676c64c 100644
--- a/Build/source/texk/lcdf-typetools/libefont/ttfhead.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/ttfhead.cc
@@ -2,7 +2,7 @@
 
 /* ttfhead.{cc,hh} -- TrueType head table
  *
- * Copyright (c) 2007-2011 Eddie Kohler
+ * Copyright (c) 2007-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/libefont/ttfkern.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/ttfkern.cc
index c4adecb8065..824922457ac 100644
--- a/Build/source/texk/lcdf-typetools/libefont/ttfkern.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/libefont/ttfkern.cc
@@ -2,7 +2,7 @@
 
 /* ttfkern.{cc,hh} -- TrueType kern table
  *
- * Copyright (c) 2009-2011 Eddie Kohler
+ * Copyright (c) 2009-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/Makefile.am
index bc1048edb33..0cc406d4e70 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/Makefile.am
@@ -26,6 +26,6 @@ endif FIXLIBC
 liblcdf_a_LIBADD = @TEMPLATE_OBJS@
 CLEANFILES = @TEMPLATE_OBJS@
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 
 EXTRA_DIST = fixlibc.c
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/Makefile.in
index d4ee77ac1b3..2dfe208906f 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @FIXLIBC_TRUE@am__append_1 = fixlibc.c
-subdir = liblcdf
+subdir = lcdf-typetools-2.95/liblcdf
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -159,6 +159,7 @@ 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@
@@ -220,7 +221,9 @@ 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@
@@ -256,7 +259,7 @@ liblcdf_a_SOURCES = bezier.cc clp.c error.cc filename.cc globmatch.cc \
 	string.cc strtonum.c transform.cc vectorv.cc $(am__append_1)
 liblcdf_a_LIBADD = @TEMPLATE_OBJS@
 CLEANFILES = @TEMPLATE_OBJS@
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 EXTRA_DIST = fixlibc.c
 all: all-am
 
@@ -271,9 +274,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liblcdf/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.95/liblcdf/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign liblcdf/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/liblcdf/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/bezier.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/bezier.cc
index 1ee46b39fcb..95c8d8b9fb0 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/bezier.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/bezier.cc
@@ -2,7 +2,7 @@
 
 /* bezier.{cc,hh} -- cubic Bezier curves
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/clp.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/clp.c
index 13394529302..b8aaafd2096 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/clp.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/clp.c
@@ -2,7 +2,7 @@
 /* clp.c - Complete source code for CLP.
  * This file is part of CLP, the command line parser package.
  *
- * Copyright (c) 1997-2011 Eddie Kohler, ekohler@gmail.com
+ * Copyright (c) 1997-2012 Eddie Kohler, ekohler@gmail.com
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/error.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/error.cc
index 54339c8a4a6..0ca36c703d5 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/error.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/error.cc
@@ -4,7 +4,7 @@
  * Eddie Kohler
  *
  * Copyright (c) 1999-2000 Massachusetts Institute of Technology
- * Copyright (c) 2001-2011 Eddie Kohler
+ * Copyright (c) 2001-2012 Eddie Kohler
  * Copyright (c) 2008 Meraki, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/filename.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/filename.cc
index 8136c626666..396e81cd3c5 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/filename.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/filename.cc
@@ -2,7 +2,7 @@
 
 /* filename.{cc,hh} -- filenames
  *
- * Copyright (c) 1999-2011 Eddie Kohler
+ * Copyright (c) 1999-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/fixlibc.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/fixlibc.c
index d41238daf85..d41238daf85 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/fixlibc.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/fixlibc.c
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/globmatch.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/globmatch.cc
index 73861c0b672..dcd7afc135c 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/globmatch.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/globmatch.cc
@@ -2,7 +2,7 @@
 
 /* globmatch.{cc,hh} -- glob_match() function for shell globbing
  *
- * Copyright (c) 2000-2011 Eddie Kohler
+ * Copyright (c) 2000-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/landmark.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/landmark.cc
index b26714dda9f..68511055ddc 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/landmark.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/landmark.cc
@@ -2,7 +2,7 @@
 
 /* landmark.{cc,hh} -- FILE:LINE type landmarks
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/md5.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/md5.c
index 8a45ee8b87a..8a45ee8b87a 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/md5.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/md5.c
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/permstr.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/permstr.cc
index 556706d9c7d..c6aebab31e7 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/permstr.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/permstr.cc
@@ -2,7 +2,7 @@
 
 /* permstr.{cc,hh} -- permanent strings
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -110,8 +110,8 @@ static int scatter[] = {        /* map characters to random values */
 void
 PermString::initialize(const char* s, int length)
 {
-    register const unsigned char* m = (const unsigned char*) s;
-    register const unsigned char* mm;
+    const unsigned char* m = reinterpret_cast<const unsigned char*>(s);
+    const unsigned char* mm;
 
     if (length < 0)
 	length = (s ? strlen(s) : 0);
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/point.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/point.cc
index 9da16b89781..8b23fdcb571 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/point.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/point.cc
@@ -2,7 +2,7 @@
 
 /* point.{cc,hh} -- 2D points
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/slurper.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/slurper.cc
index 3afcb26d184..e089617705d 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/slurper.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/slurper.cc
@@ -2,7 +2,7 @@
 
 /* slurper.{cc,hh} -- reading from files a line at a time
  *
- * Copyright (c) 1998-2011 Eddie Kohler
+ * Copyright (c) 1998-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/straccum.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/straccum.cc
index 67db3aea37e..f31b9e216fc 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/straccum.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/straccum.cc
@@ -4,7 +4,7 @@
  * Eddie Kohler
  *
  * Copyright (c) 1999-2000 Massachusetts Institute of Technology
- * Copyright (c) 2001-2011 Eddie Kohler
+ * Copyright (c) 2001-2012 Eddie Kohler
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/string.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/string.cc
index cd0410de155..cd0410de155 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/string.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/string.cc
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/strtonum.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/strtonum.c
index 36898c5a7ad..36898c5a7ad 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/strtonum.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/strtonum.c
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/transform.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/transform.cc
index b65978122dc..5eb0ff58728 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/transform.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/transform.cc
@@ -2,7 +2,7 @@
 
 /* transform.{cc,hh} -- planar affine transformations
  *
- * Copyright (c) 2000-2011 Eddie Kohler
+ * Copyright (c) 2000-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/vectorv.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/liblcdf/vectorv.cc
index f5f12b52c90..f5f12b52c90 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/vectorv.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/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.95/m4/lcdf-typetools.m4
new file mode 100644
index 00000000000..7aaff4c33af
--- /dev/null
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/m4/lcdf-typetools.m4
@@ -0,0 +1,15 @@
+## Define configure options for lcdf-typetools.  Extracted from configure.ac
+## for ease of building TeX Live.
+m4_define_default([kpse_indent_26], [26])[]dnl
+m4_define([kpse_lcdf_typetools_progs], [cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42])[]dnl
+AC_FOREACH([Kpse_Prog], kpse_lcdf_typetools_progs,
+           [AC_ARG_ENABLE(Kpse_Prog,
+                          AS_HELP_STRING([--disable-]Kpse_Prog,
+                                         [do not build the ]Kpse_Prog[ program],
+                                         kpse_indent_26))])
+m4_define([kpse_otftotfm_auto_opts], [cfftot1 t1dotlessj ttftotype42 updmap])[]dnl
+AC_FOREACH([Kpse_Opt], kpse_otftotfm_auto_opts,
+           [AC_ARG_ENABLE(Kpse_Opt,
+                          AS_HELP_STRING([--disable-auto-]Kpse_Opt,
+                                         [disable running ]Kpse_Opt[ from otftotfm],
+                                         kpse_indent_26))])
diff --git a/Build/source/texk/lcdf-typetools/mmafm/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmafm/Makefile.am
index 4d535e5cfbd..6438927eb5f 100644
--- a/Build/source/texk/lcdf-typetools/mmafm/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmafm/Makefile.am
@@ -8,7 +8,7 @@ mmafm_SOURCES = main.cc
 
 mmafm_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 
 EXTRA_DIST = mmafm.1
diff --git a/Build/source/texk/lcdf-typetools/mmafm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmafm/Makefile.in
index 7863b57b2a9..677860aa8b6 100644
--- a/Build/source/texk/lcdf-typetools/mmafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmafm/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = mmafm$(EXEEXT)
-subdir = mmafm
+subdir = lcdf-typetools-2.95/mmafm
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -169,6 +169,7 @@ 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@
@@ -230,7 +231,9 @@ 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@
@@ -263,7 +266,7 @@ AUTOMAKE_OPTIONS = foreign
 man_MANS = mmafm.1
 mmafm_SOURCES = main.cc
 mmafm_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = mmafm.1
 all: all-am
@@ -279,9 +282,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign mmafm/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.95/mmafm/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign mmafm/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/mmafm/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/mmafm/main.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmafm/main.cc
index ba76226b208..99e320f94bd 100644
--- a/Build/source/texk/lcdf-typetools/mmafm/main.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmafm/main.cc
@@ -1,6 +1,6 @@
 /* main.cc -- driver for mmafm program
  *
- * Copyright (c) 1997-2011 Eddie Kohler
+ * Copyright (c) 1997-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -322,7 +322,7 @@ main(int argc, char *argv[])
 
      case VERSION_OPT:
       printf("mmafm (LCDF typetools) %s\n", VERSION);
-      printf("Copyright (C) 1997-2011 Eddie Kohler\n\
+      printf("Copyright (C) 1997-2012 Eddie Kohler\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty, not even for merchantability or fitness for a\n\
 particular purpose.\n");
diff --git a/Build/source/texk/lcdf-typetools/mmafm/mmafm.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmafm/mmafm.1
index 29d04ec1b4d..6eea36ad475 100644
--- a/Build/source/texk/lcdf-typetools/mmafm/mmafm.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmafm/mmafm.1
@@ -1,5 +1,5 @@
 .\" -*-nroff-*-
-.ds V 2.94
+.ds V 2.95
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/Makefile.am
index 5d579edca5c..527b7d14937 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/Makefile.am
@@ -11,7 +11,7 @@ mmpfb_SOURCES = myfont.cc myfont.hh \
 
 mmpfb_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 
 EXTRA_DIST = mmpfb.1
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/Makefile.in
index 21fdb23d44b..a0c4b71b643 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = mmpfb$(EXEEXT)
-subdir = mmpfb
+subdir = lcdf-typetools-2.95/mmpfb
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -179,6 +179,7 @@ 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@
@@ -240,7 +241,9 @@ 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@
@@ -277,7 +280,7 @@ mmpfb_SOURCES = myfont.cc myfont.hh \
 	t1rewrit.cc t1rewrit.hh
 
 mmpfb_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = mmpfb.1
 all: all-am
@@ -293,9 +296,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign mmpfb/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.95/mmpfb/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign mmpfb/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/mmpfb/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/main.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/main.cc
index 747e4757f56..1d685f18eff 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/main.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/main.cc
@@ -1,6 +1,6 @@
 /* main.cc -- driver for mmpfb program
  *
- * Copyright (c) 1997-2011 Eddie Kohler
+ * Copyright (c) 1997-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -355,7 +355,7 @@ main(int argc, char *argv[])
 
      case VERSION_OPT:
       printf("mmpfb (LCDF typetools) %s\n", VERSION);
-      printf("Copyright (C) 1997-2011 Eddie Kohler\n\
+      printf("Copyright (C) 1997-2012 Eddie Kohler\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty, not even for merchantability or fitness for a\n\
 particular purpose.\n");
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/mmpfb.1
index 663e37c27ee..c07ef72b151 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/mmpfb.1
@@ -1,5 +1,5 @@
 .\" -*-nroff-*-
-.ds V 2.94
+.ds V 2.95
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/myfont.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/myfont.cc
index 25976ba8a86..1325b44d3e6 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/myfont.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/myfont.cc
@@ -1,6 +1,6 @@
 /* myfont.cc -- general multiple- to single-master conversion
  *
- * Copyright (c) 1997-2011 Eddie Kohler
+ * Copyright (c) 1997-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/myfont.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/myfont.hh
index ffe35668f94..ffe35668f94 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/myfont.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/myfont.hh
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/t1minimize.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/t1minimize.cc
index 1b589c24f9c..2c4b1bcb015 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/t1minimize.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/t1minimize.cc
@@ -1,6 +1,6 @@
 /* t1minimize.cc -- make minimal copy of a Type 1 font
  *
- * Copyright (c) 2003-2011 Eddie Kohler
+ * Copyright (c) 2003-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/t1minimize.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/t1minimize.hh
index a5c3ea04906..a5c3ea04906 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/t1minimize.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/t1minimize.hh
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/t1rewrit.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/t1rewrit.cc
index 25e657be2b4..86382ca239b 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/t1rewrit.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/t1rewrit.cc
@@ -1,6 +1,6 @@
 /* t1rewrit.cc -- routines for multiple- to single-master charstring conversion
  *
- * Copyright (c) 1997-2011 Eddie Kohler
+ * Copyright (c) 1997-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/t1rewrit.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/t1rewrit.hh
index eac9d75beeb..eac9d75beeb 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/t1rewrit.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/mmpfb/t1rewrit.hh
diff --git a/Build/source/texk/lcdf-typetools/otfinfo/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otfinfo/Makefile.am
index c1541be0c33..837eb83ef0f 100644
--- a/Build/source/texk/lcdf-typetools/otfinfo/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otfinfo/Makefile.am
@@ -10,7 +10,7 @@ otfinfo_SOURCES = \
 otfinfo_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
 otfinfo_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 
 EXTRA_DIST = otfinfo.1
diff --git a/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otfinfo/Makefile.in
index 6f06b4e3830..37162eeb7e6 100644
--- a/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otfinfo/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = otfinfo$(EXEEXT)
-subdir = otfinfo
+subdir = lcdf-typetools-2.95/otfinfo
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -168,6 +168,7 @@ 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@
@@ -229,7 +230,9 @@ 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@
@@ -265,7 +268,7 @@ otfinfo_SOURCES = \
 
 otfinfo_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
 otfinfo_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = otfinfo.1
 all: all-am
@@ -281,9 +284,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign otfinfo/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.95/otfinfo/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign otfinfo/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/otfinfo/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otfinfo/otfinfo.1
index 756534be521..c8057737c90 100644
--- a/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otfinfo/otfinfo.1
@@ -1,5 +1,5 @@
 '\"t
-.ds V 2.94
+.ds V 2.95
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otfinfo/otfinfo.cc
index ae16d56db52..74d340c3d45 100644
--- a/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otfinfo/otfinfo.cc
@@ -1,6 +1,6 @@
 /* otfinfo.cc -- driver for reporting information about OpenType fonts
  *
- * Copyright (c) 2003-2011 Eddie Kohler
+ * Copyright (c) 2003-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -558,7 +558,7 @@ main(int argc, char *argv[])
 
 	  case VERSION_OPT:
 	    printf("otfinfo (LCDF typetools) %s\n", VERSION);
-	    printf("Copyright (C) 2003-2011 Eddie Kohler\n\
+	    printf("Copyright (C) 2003-2012 Eddie Kohler\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty, not even for merchantability or fitness for a\n\
 particular purpose.\n");
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/Makefile.am
index e8652fb2548..d75c552f12e 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/Makefile.am
@@ -18,7 +18,7 @@ EXTRA_otftotfm_SOURCES = kpseinterface.c kpseinterface.h
 otftotfm_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
 otftotfm_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 
 EXTRA_DIST = otftotfm.1
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/Makefile.in
index 63cb8a7b7ea..c1f2686b8be 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/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 = otftotfm
+subdir = lcdf-typetools-2.95/otftotfm
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -192,6 +192,7 @@ 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@
@@ -253,7 +254,9 @@ 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@
@@ -293,7 +296,7 @@ otftotfm_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a \
 	$(am__append_3)
 otftotfm_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a \
 	$(am__append_4)
-INCLUDES = -I$(top_srcdir)/include $(am__append_2)
+INCLUDES = -I$(srcdir)/../include $(am__append_2)
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = otftotfm.1
 all: all-am
@@ -309,9 +312,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign otftotfm/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.95/otftotfm/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign otftotfm/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/otftotfm/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/automatic.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/automatic.cc
index aa74f6006a3..df3268f0c1e 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/automatic.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/automatic.cc
@@ -1,6 +1,6 @@
 /* automatic.{cc,hh} -- code for automatic mode and interfacing with kpathsea
  *
- * Copyright (c) 2003-2011 Eddie Kohler
+ * Copyright (c) 2003-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -333,7 +333,7 @@ update_odir(int o, String file, ErrorHandler *errh)
 	// look for mktexupd script
 	if (!mktexupd_tried) {
 #ifdef WIN32
-	    mktexupd = strdup("mktexupd");
+	    mktexupd = "mktexupd";
 #else
 	    mktexupd = kpsei_string(kpsei_find_file("mktexupd", KPSEI_FMT_WEB2C));
 #endif
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/automatic.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/automatic.hh
index 4c973347715..4c973347715 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/automatic.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/automatic.hh
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/dvipsencoding.cc
index a3066c0c2c0..870c7d02885 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/dvipsencoding.cc
@@ -1,6 +1,6 @@
 /* dvipsencoding.{cc,hh} -- store a DVIPS encoding
  *
- * Copyright (c) 2003-2011 Eddie Kohler
+ * Copyright (c) 2003-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/dvipsencoding.hh
index a80631c3038..a80631c3038 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/dvipsencoding.hh
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/glyphfilter.cc
index d8e3214862d..a4120660bfc 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/glyphfilter.cc
@@ -1,6 +1,6 @@
 /* glyphfilter.{cc,hh} -- define subsets of characters
  *
- * Copyright (c) 2004-2011 Eddie Kohler
+ * Copyright (c) 2004-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/glyphfilter.hh
index 753e5714d5c..753e5714d5c 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/glyphfilter.hh
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/kpseinterface.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/kpseinterface.c
index d052df00ab6..e42b81fa24a 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/kpseinterface.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/kpseinterface.c
@@ -1,6 +1,6 @@
 /* kpseinterface.{c,h} -- interface with the kpathsea library
  *
- * Copyright (c) 2003-2011 Eddie Kohler
+ * Copyright (c) 2003-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -107,13 +107,13 @@ void
 kpsei_init(const char* argv0, const char* progname)
 {
 #ifdef W32TEX
-  PROC pkpse_set_program_name;
-  pkpse_set_program_name = GetProcAddress(Hinstance, "kpse_set_program_name");
-  if(!pkpse_set_program_name) {
-    fprintf(stderr, "Failed to find Kpathsea function.\n");
-    return;
-  }
-  (void)pkpse_set_program_name(argv0, progname);
+    PROC pkpse_set_program_name;
+    pkpse_set_program_name = GetProcAddress(Hinstance, "kpse_set_program_name");
+    if(!pkpse_set_program_name) {
+	fprintf(stderr, "Failed to find Kpathsea function.\n");
+	return;
+    }
+    (void)pkpse_set_program_name(argv0, progname);
 #else
     kpse_set_program_name(argv0, progname);
 #endif
@@ -132,13 +132,13 @@ char*
 kpsei_path_expand(const char* path)
 {
 #ifdef W32TEX
-  PROC pkpse_path_expand;
-  pkpse_path_expand = GetProcAddress(Hinstance, "kpse_path_expand");
-  if(!pkpse_path_expand) {
-    fprintf(stderr, "Failed to find Kpathsea function.\n");
-    return 0;
-  }
-  return (char *)pkpse_path_expand(path);
+    PROC pkpse_path_expand;
+    pkpse_path_expand = GetProcAddress(Hinstance, "kpse_path_expand");
+    if(!pkpse_path_expand) {
+	fprintf(stderr, "Failed to find Kpathsea function.\n");
+	return 0;
+    }
+    return (char *)pkpse_path_expand(path);
 #else
     return kpse_path_expand(path);
 #endif
@@ -151,19 +151,24 @@ kpsei_path_expand(const char* path)
 char*
 kpsei_find_file(const char* name, int format)
 {
+    char *result;
 #ifdef W32TEX
-  PROC pkpse_find_file;
-  pkpse_find_file = GetProcAddress(Hinstance, "kpse_find_file");
-  if(!pkpse_find_file) {
-    fprintf(stderr, "Failed to find Kpathsea function.\n");
-    return 0;
-  }
+    PROC pkpse_find_file;
+    pkpse_find_file = GetProcAddress(Hinstance, "kpse_find_file");
+    if(!pkpse_find_file) {
+	fprintf(stderr, "Failed to find Kpathsea function.\n");
+	return 0;
+    }
 #endif
     switch (format) {
       case KPSEI_FMT_WEB2C:
 	return kpse_find_file(name, kpse_web2c_format, true);
-      case KPSEI_FMT_ENCODING:
-	return kpse_find_file(name, kpse_enc_format, true);
+    case KPSEI_FMT_ENCODING:
+#if HAVE_DECL_KPSE_ENC_FORMAT
+	if ((result = kpse_find_file(name, kpse_enc_format, true)))
+	    return result;
+#endif
+	return kpse_find_file(name, kpse_tex_ps_header_format, true);
       case KPSEI_FMT_TYPE1:
 	return kpse_find_file(name, kpse_type1_format, false);
       case KPSEI_FMT_TYPE42:
@@ -187,13 +192,13 @@ void
 kpsei_set_debug_flags(unsigned flags)
 {
 #ifdef W32TEX
-  unsigned int *pkpathsea_debug;
-  pkpathsea_debug = (unsigned int *)GetProcAddress(Hinstance, "kpathsea_debug");
-  if(!pkpathsea_debug) {
-    fprintf(stderr, "Failed to find Kpathsea variable.\n");
-    return;
-  }
-  *pkpathsea_debug = flags;
+    unsigned int *pkpathsea_debug;
+    pkpathsea_debug = (unsigned int *)GetProcAddress(Hinstance, "kpathsea_debug");
+    if(!pkpathsea_debug) {
+	fprintf(stderr, "Failed to find Kpathsea variable.\n");
+	return;
+    }
+    *pkpathsea_debug = flags;
 #else
     kpathsea_debug = flags;
 #endif
@@ -203,24 +208,24 @@ kpsei_set_debug_flags(unsigned flags)
 int
 kpsei_getlongpath(char *buff, char *input, int len)
 {
-  PROC pkpse_getlongpath;
-  pkpse_getlongpath = GetProcAddress(Hinstance, "getlongpath");
-  if(!pkpse_getlongpath) {
-    fprintf(stderr, "Failed to find Kpathsea function.\n");
-    return 0;
-  }
-  return (int)pkpse_getlongpath(buff, input, len);
+    PROC pkpse_getlongpath;
+    pkpse_getlongpath = GetProcAddress(Hinstance, "getlongpath");
+    if(!pkpse_getlongpath) {
+	fprintf(stderr, "Failed to find Kpathsea function.\n");
+	return 0;
+    }
+    return (int)pkpse_getlongpath(buff, input, len);
 }
 
 char *
 kpsei_var_value(const char *var)
 {
-  PROC pkpse_var_value;
-  pkpse_var_value = GetProcAddress(Hinstance, "kpse_var_value");
-  if(!pkpse_var_value) {
-    fprintf(stderr, "Failed to find Kpathsea function.\n");
-    return NULL;
-  }
-  return (char *)pkpse_var_value(var);
+    PROC pkpse_var_value;
+    pkpse_var_value = GetProcAddress(Hinstance, "kpse_var_value");
+    if(!pkpse_var_value) {
+	fprintf(stderr, "Failed to find Kpathsea function.\n");
+	return NULL;
+    }
+    return (char *)pkpse_var_value(var);
 }
 #endif
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/kpseinterface.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/kpseinterface.h
index c822a24fa1e..c822a24fa1e 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/kpseinterface.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/kpseinterface.h
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/metrics.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/metrics.cc
index ecc6ee0f443..b4427f3f6fa 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/metrics.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/metrics.cc
@@ -1,6 +1,6 @@
 /* metrics.{cc,hh} -- an encoding during and after OpenType features
  *
- * Copyright (c) 2003-2011 Eddie Kohler
+ * Copyright (c) 2003-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/metrics.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/metrics.hh
index b032e6b348f..b032e6b348f 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/metrics.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/metrics.hh
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/otftotfm.1
index 13401ec6e09..97581d1a04e 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/otftotfm.1
@@ -1,5 +1,5 @@
 '\"t
-.ds V 2.94
+.ds V 2.95
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/otftotfm.cc
index f4fe4a512a7..1bd2b25b910 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/otftotfm.cc
@@ -1,6 +1,6 @@
 /* otftotfm.cc -- driver for translating OpenType fonts to TeX metrics
  *
- * Copyright (c) 2003-2011 Eddie Kohler
+ * Copyright (c) 2003-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -50,9 +50,9 @@
 #include <signal.h>
 #include <algorithm>
 #include <math.h>
-/* apparently M_PI isn't defined by <math.h> under VC++ */
+/* M_PI isn't defined in C99 */
 #ifndef M_PI
-#define M_PI 3.14159265358979323846
+# define M_PI 3.14159265358979323846264338327
 #endif
 #ifdef HAVE_CTIME
 # include <time.h>
@@ -2131,13 +2131,13 @@ main(int argc, char *argv[])
 
 	  case VERSION_OPT:
 	    printf("otftotfm (LCDF typetools) %s\n", VERSION);
-	    printf("Copyright (C) 2002-2011 Eddie Kohler\n\
+	    printf("Copyright (C) 2002-2012 Eddie Kohler\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty, not even for merchantability or fitness for a\n\
 particular purpose.\n");
 #ifdef W32TEX
-            if(Hinstance != NULL)
-              FreeLibrary(Hinstance);
+	    if(Hinstance != NULL)
+		FreeLibrary(Hinstance);
 #endif
 	    exit(0);
 	    break;
@@ -2145,8 +2145,8 @@ particular purpose.\n");
 	  case HELP_OPT:
 	    usage();
 #ifdef W32TEX
-            if(Hinstance != NULL)
-              FreeLibrary(Hinstance);
+	    if(Hinstance != NULL)
+		FreeLibrary(Hinstance);
 #endif
 	    exit(0);
 	    break;
@@ -2206,7 +2206,7 @@ particular purpose.\n");
 	if (errh->nerrors()) {
 #ifdef W32TEX
 	    if(Hinstance != NULL)
-	      FreeLibrary(Hinstance);
+		FreeLibrary(Hinstance);
 #endif
 	    exit(1);
 	}
@@ -2300,7 +2300,7 @@ particular purpose.\n");
     }
 #ifdef W32TEX
     if(Hinstance != NULL)
-      FreeLibrary(Hinstance);
+	FreeLibrary(Hinstance);
 #endif
 
     return (errh->nerrors() == 0 ? 0 : 1);
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/otftotfm.hh
index 67c0e0b32ab..67c0e0b32ab 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/otftotfm.hh
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/secondary.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/secondary.cc
index d7d33c351b7..a951bc7d304 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/secondary.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/secondary.cc
@@ -1,6 +1,6 @@
 /* secondary.{cc,hh} -- code for generating fake glyphs
  *
- * Copyright (c) 2003-2011 Eddie Kohler
+ * Copyright (c) 2003-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/secondary.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/secondary.hh
index c349a48dcf6..c349a48dcf6 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/secondary.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/secondary.hh
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/uniprop.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/uniprop.cc
index 8f522b9ed8f..228661394a9 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/uniprop.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/uniprop.cc
@@ -1,6 +1,6 @@
 /* uniprop.{cc,hh} -- code for Unicode character properties
  *
- * Copyright (c) 2004-2011 Eddie Kohler
+ * Copyright (c) 2004-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/uniprop.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/uniprop.hh
index 4dd6b135eb7..4dd6b135eb7 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/uniprop.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/uniprop.hh
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/util.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/util.cc
index 6ae7a2ffcbf..973f7ca87c9 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/util.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/util.cc
@@ -1,6 +1,6 @@
 /* util.{cc,hh} -- various bits
  *
- * Copyright (c) 2003-2011 Eddie Kohler
+ * Copyright (c) 2003-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -184,22 +184,18 @@ temporary_file(String &filename, ErrorHandler *errh)
 	errh->error("temporary file %<%s%>: %s", filename.c_str(), strerror(errno));
     return fd;
 #else  // !HAVE_MKSTEMP
-#ifdef WIN32
+# ifdef WIN32
     const char *tmp_dir = getenv("TEMP");
     if (!tmp_dir)
 	tmp_dir = ".";
-#endif
+    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");
-#ifdef WIN32
-	char *tmpp;
-	if ((tmpp = strrchr(filename.c_str(), '/')))
-	    filename = ++tmpp;
-	if ((tmpp = strrchr(filename.c_str(), '\\')))
-	    filename = ++tmpp;
-	filename = String(tmp_dir) + "\\" + filename;
-#endif
+# 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/otftotfm/util.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/util.hh
index a3e42b63d9f..a3e42b63d9f 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/util.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/util.hh
diff --git a/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1dotlessj/Makefile.am
index 802f841f664..9b9b16ca77b 100644
--- a/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1dotlessj/Makefile.am
@@ -8,7 +8,7 @@ t1dotlessj_SOURCES = t1dotlessj.cc
 
 t1dotlessj_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 
 EXTRA_DIST = t1dotlessj.1
diff --git a/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1dotlessj/Makefile.in
index 2f63eb94659..43bbd9b8770 100644
--- a/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1dotlessj/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1dotlessj$(EXEEXT)
-subdir = t1dotlessj
+subdir = lcdf-typetools-2.95/t1dotlessj
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -169,6 +169,7 @@ 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@
@@ -230,7 +231,9 @@ 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@
@@ -263,7 +266,7 @@ AUTOMAKE_OPTIONS = foreign
 man_MANS = t1dotlessj.1
 t1dotlessj_SOURCES = t1dotlessj.cc
 t1dotlessj_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = t1dotlessj.1
 all: all-am
@@ -279,9 +282,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign t1dotlessj/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.95/t1dotlessj/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign t1dotlessj/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/t1dotlessj/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1dotlessj/t1dotlessj.1
index 86696ead291..d594e47b057 100644
--- a/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1dotlessj/t1dotlessj.1
@@ -1,4 +1,4 @@
-.ds V 2.94
+.ds V 2.95
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1dotlessj/t1dotlessj.cc
index 71956c9200d..aa1bae00aee 100644
--- a/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1dotlessj/t1dotlessj.cc
@@ -1,6 +1,6 @@
 /* t1dotlessj.cc -- driver for creating dotlessj characters from Type 1 fonts
  *
- * Copyright (c) 2003-2011 Eddie Kohler
+ * Copyright (c) 2003-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -310,7 +310,7 @@ main(int argc, char *argv[])
 
 	  case VERSION_OPT:
 	    printf("t1dotlessj (LCDF typetools) %s\n", VERSION);
-	    printf("Copyright (C) 2003-2011 Eddie Kohler\n\
+	    printf("Copyright (C) 2003-2012 Eddie Kohler\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty, not even for merchantability or fitness for a\n\
 particular purpose.\n");
diff --git a/Build/source/texk/lcdf-typetools/t1lint/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/Makefile.am
index 641702c1ed2..42cd92087d4 100644
--- a/Build/source/texk/lcdf-typetools/t1lint/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/Makefile.am
@@ -9,7 +9,7 @@ t1lint_SOURCES = cscheck.hh cscheck.cc \
 
 t1lint_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 
 EXTRA_DIST = t1lint.1
diff --git a/Build/source/texk/lcdf-typetools/t1lint/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/Makefile.in
index b5ec56d7386..87f951189ec 100644
--- a/Build/source/texk/lcdf-typetools/t1lint/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1lint$(EXEEXT)
-subdir = t1lint
+subdir = lcdf-typetools-2.95/t1lint
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -178,6 +178,7 @@ 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@
@@ -239,7 +240,9 @@ 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@
@@ -274,7 +277,7 @@ t1lint_SOURCES = cscheck.hh cscheck.cc \
 	t1lint.cc
 
 t1lint_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = t1lint.1
 all: all-am
@@ -290,9 +293,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign t1lint/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.95/t1lint/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign t1lint/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/t1lint/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/t1lint/cscheck.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/cscheck.cc
index 486a5b3a399..f39a040a014 100644
--- a/Build/source/texk/lcdf-typetools/t1lint/cscheck.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/cscheck.cc
@@ -1,6 +1,6 @@
 /* cscheck.{cc,hh} -- checking Type 1 charstrings for validity
  *
- * Copyright (c) 1999-2011 Eddie Kohler
+ * Copyright (c) 1999-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/t1lint/cscheck.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/cscheck.hh
index 9ba167b1588..9ba167b1588 100644
--- a/Build/source/texk/lcdf-typetools/t1lint/cscheck.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/cscheck.hh
diff --git a/Build/source/texk/lcdf-typetools/t1lint/t1lint.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/t1lint.1
index 1a056aee1e2..99e54a412b8 100644
--- a/Build/source/texk/lcdf-typetools/t1lint/t1lint.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/t1lint.1
@@ -1,4 +1,4 @@
-.ds V 2.94
+.ds V 2.95
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/t1lint/t1lint.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/t1lint.cc
index 1c083c909d7..e2ac1012382 100644
--- a/Build/source/texk/lcdf-typetools/t1lint/t1lint.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1lint/t1lint.cc
@@ -1,6 +1,6 @@
 /* t1lint.cc -- driver for checking Type 1 fonts for validity
  *
- * Copyright (c) 1999-2011 Eddie Kohler
+ * Copyright (c) 1999-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -412,7 +412,7 @@ main(int argc, char *argv[])
 
      case VERSION_OPT:
       printf("t1lint (LCDF typetools) %s\n", VERSION);
-      printf("Copyright (C) 1999-2011 Eddie Kohler\n\
+      printf("Copyright (C) 1999-2012 Eddie Kohler\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty, not even for merchantability or fitness for a\n\
 particular purpose.\n");
diff --git a/Build/source/texk/lcdf-typetools/t1rawafm/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1rawafm/Makefile.am
index 0cd52d6e36a..815d0efad89 100644
--- a/Build/source/texk/lcdf-typetools/t1rawafm/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1rawafm/Makefile.am
@@ -8,7 +8,7 @@ t1rawafm_SOURCES = t1rawafm.cc
 
 t1rawafm_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 
 EXTRA_DIST = t1rawafm.1
diff --git a/Build/source/texk/lcdf-typetools/t1rawafm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1rawafm/Makefile.in
index d835dde5887..f8eeab169fb 100644
--- a/Build/source/texk/lcdf-typetools/t1rawafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1rawafm/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1rawafm$(EXEEXT)
-subdir = t1rawafm
+subdir = lcdf-typetools-2.95/t1rawafm
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -169,6 +169,7 @@ 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@
@@ -230,7 +231,9 @@ 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@
@@ -263,7 +266,7 @@ AUTOMAKE_OPTIONS = foreign
 man_MANS = t1rawafm.1
 t1rawafm_SOURCES = t1rawafm.cc
 t1rawafm_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = t1rawafm.1
 all: all-am
@@ -279,9 +282,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign t1rawafm/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.95/t1rawafm/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign t1rawafm/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/t1rawafm/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1rawafm/t1rawafm.1
index 8f084dba9d0..6de9e4c6573 100644
--- a/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1rawafm/t1rawafm.1
@@ -1,4 +1,4 @@
-.ds V 2.94
+.ds V 2.95
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
@@ -10,7 +10,7 @@
 .SH NAME
 t1rawafm \- produce raw AFM metrics from a PostScript Type 1 font
 .SH SYNOPSIS
-\fBt1rawafm\fR \%[OPTIONS...] \fIfont\fR
+\fBt1rawafm\fR \%[OPTIONS...] [\fIfont\fR [\fIoutputfile\fR]]
 .SH DESCRIPTION
 .BR T1rawafm
 generates an AFM file with the information available in a PostScript
diff --git a/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1rawafm/t1rawafm.cc
index d44ed7835f6..8ba7c7531fb 100644
--- a/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1rawafm/t1rawafm.cc
@@ -1,6 +1,6 @@
 /* t1rawafm.cc -- driver for generating a raw AFM file from a font
  *
- * Copyright (c) 2008-2011 Eddie Kohler
+ * Copyright (c) 2008-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -64,7 +64,7 @@ usage_error(ErrorHandler *errh, const char *error_message, ...)
     va_list val;
     va_start(val, error_message);
     if (!error_message)
-	errh->message("Usage: %s [OPTION]... FONT", program_name);
+	errh->message("Usage: %s [OPTION]... [FONT [OUTPUT]]", program_name);
     else
 	errh->vxmessage(ErrorHandler::e_error, error_message, val);
     errh->message("Type %s --help for more information.", program_name);
@@ -79,13 +79,13 @@ usage()
 %<T1rawafm%> generates a raw (kernless and ligatureless) AFM file corresponding\n\
 to the specified Type 1 font file and writes it to the standard output.\n\
 \n\
-Usage: %s [OPTION]... [FONT]\n\
+Usage: %s [OPTION]... [FONT [OUTPUT]]\n\
 \n\
 FONT is the name of a PFA or PFB font file. If omitted, t1rawafm will read a\n\
 font file from the standard input.\n\
 \n\
 Options:\n\
-  -o, --output=FILE            Write output to FILE instead of standard out.\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\
@@ -299,7 +299,8 @@ main(int argc, char *argv[])
 	int opt = Clp_Next(clp);
 	switch (opt) {
 
-	  case OUTPUT_OPT:
+	case OUTPUT_OPT:
+	output_file:
 	    if (output_file)
 		errh->fatal("output file already specified");
 	    output_file = clp->vstr;
@@ -307,7 +308,7 @@ main(int argc, char *argv[])
 
 	  case VERSION_OPT:
 	    printf("t1rawafm (LCDF typetools) %s\n", VERSION);
-	    printf("Copyright (C) 2008-2011 Eddie Kohler\n\
+	    printf("Copyright (C) 2008-2012 Eddie Kohler\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty, not even for merchantability or fitness for a\n\
 particular purpose.\n");
@@ -321,8 +322,9 @@ particular purpose.\n");
 
 	  case Clp_NotOption:
 	    if (font)
-		errh->fatal("font already specified");
-	    do_file(clp->vstr, psres, errh);
+		goto output_file;
+	    else
+		do_file(clp->vstr, psres, errh);
 	    break;
 
 	  case Clp_Done:
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/Makefile.am
index 8dcf9da887d..4b6421f8942 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/Makefile.am
@@ -10,7 +10,7 @@ t1reencode_SOURCES = md5.c md5.h \
 
 t1reencode_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 
 EXTRA_DIST = t1reencode.1
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/Makefile.in
index 5ce21fceb36..7d16d650429 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1reencode$(EXEEXT)
-subdir = t1reencode
+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
@@ -179,6 +179,7 @@ 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@
@@ -240,7 +241,9 @@ 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@
@@ -276,7 +279,7 @@ t1reencode_SOURCES = md5.c md5.h \
 	util.cc util.hh
 
 t1reencode_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = t1reencode.1
 all: all-am
@@ -292,9 +295,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign t1reencode/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.95/t1reencode/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign t1reencode/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/t1reencode/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/md5.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/md5.c
index 107de8061c2..107de8061c2 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/md5.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/md5.c
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/md5.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/md5.h
index 228c45f615c..228c45f615c 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/md5.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/md5.h
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/t1reencode.1
index 493eeafc468..42a063d0f53 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/t1reencode.1
@@ -1,4 +1,4 @@
-.ds V 2.94
+.ds V 2.95
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/t1reencode.cc
index acfecd7a22f..bebcb1dad3a 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/t1reencode.cc
@@ -1,6 +1,6 @@
 /* t1reencode.cc -- driver for reencoding Type 1 fonts
  *
- * Copyright (c) 2005-2011 Eddie Kohler
+ * Copyright (c) 2005-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -978,7 +978,7 @@ main(int argc, char *argv[])
 
 	  case VERSION_OPT:
 	    printf("t1reencode (LCDF typetools) %s\n", VERSION);
-	    printf("Copyright (C) 1999-2011 Eddie Kohler\n\
+	    printf("Copyright (C) 1999-2012 Eddie Kohler\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty, not even for merchantability or fitness for a\n\
 particular purpose.\n");
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/util.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/util.cc
index 89f43391152..89f43391152 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/util.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/util.cc
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/util.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/util.hh
index 34b9c9c5a22..34b9c9c5a22 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/util.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1reencode/util.hh
diff --git a/Build/source/texk/lcdf-typetools/t1testpage/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1testpage/Makefile.am
index 251c3ff697e..eac56ee9066 100644
--- a/Build/source/texk/lcdf-typetools/t1testpage/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1testpage/Makefile.am
@@ -8,7 +8,7 @@ t1testpage_SOURCES = t1testpage.cc
 
 t1testpage_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 
 EXTRA_DIST = t1testpage.1
diff --git a/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1testpage/Makefile.in
index db9c9dc4080..b93f71f9777 100644
--- a/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1testpage/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1testpage$(EXEEXT)
-subdir = t1testpage
+subdir = lcdf-typetools-2.95/t1testpage
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -169,6 +169,7 @@ 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@
@@ -230,7 +231,9 @@ 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@
@@ -263,7 +266,7 @@ AUTOMAKE_OPTIONS = foreign
 man_MANS = t1testpage.1
 t1testpage_SOURCES = t1testpage.cc
 t1testpage_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = t1testpage.1
 all: all-am
@@ -279,9 +282,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign t1testpage/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.95/t1testpage/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign t1testpage/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/t1testpage/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1testpage/t1testpage.1
index 15724f0cad9..a1d6d3507b5 100644
--- a/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1testpage/t1testpage.1
@@ -1,4 +1,4 @@
-.ds V 2.94
+.ds V 2.95
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1testpage/t1testpage.cc
index a7bea659d8e..ed3d7330a13 100644
--- a/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/t1testpage/t1testpage.cc
@@ -1,6 +1,6 @@
 /* t1testpage.cc -- driver for generating Type 1 fonts' test pages
  *
- * Copyright (c) 1999-2011 Eddie Kohler
+ * Copyright (c) 1999-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -624,7 +624,7 @@ main(int argc, char *argv[])
 
 	  case VERSION_OPT:
 	    printf("t1testpage (LCDF typetools) %s\n", VERSION);
-	    printf("Copyright (C) 1999-2011 Eddie Kohler\n\
+	    printf("Copyright (C) 1999-2012 Eddie Kohler\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty, not even for merchantability or fitness for a\n\
 particular purpose.\n");
diff --git a/Build/source/texk/lcdf-typetools/texglyphlist-g2u.txt b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/texglyphlist-g2u.txt
index 31d49b093f0..2340809a4de 100644
--- a/Build/source/texk/lcdf-typetools/texglyphlist-g2u.txt
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/texglyphlist-g2u.txt
@@ -1,4 +1,4 @@
-# lcdf-typetools texglyphlist-g2u.txt, Version 2.84
+# lcdf-typetools texglyphlist-g2u.txt, Version 2.95
 # Contents: Overrides to glyphlist.txt and texglyphlist.txt used to
 # generate glyphtounicode.tex, which maps glyphs to searchable Unicode
 # code points.
@@ -10,6 +10,8 @@ ffi;0066 0066 0069
 ffl;0066 0066 006C
 fi;0066 0069
 fl;0066 006C
+longst;017F 0074
+st;0073 0074
 # --
 # -- texglyphlist.txt overrides /heart, /diamond, /phi, and /phi1 to their
 # -- more typical meanings in encoding files meant for TeX: /heart and
diff --git a/Build/source/texk/lcdf-typetools/texglyphlist.txt b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/texglyphlist.txt
index 8d5ef05fad9..b9c5fa9af0f 100644
--- a/Build/source/texk/lcdf-typetools/texglyphlist.txt
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/texglyphlist.txt
@@ -1,4 +1,4 @@
-# lcdf-typetools texglyphlist.txt, Version 2.84
+# lcdf-typetools texglyphlist.txt, Version 2.95
 # Contents: Extensions to the Adobe Glyph List for TeX fonts and
 # encodings. We also extend the second field so that it can contain
 # multiple Unicode scalar values, separated by commas, analogous to
@@ -45,6 +45,7 @@ circledivide;2298
 circledot;2299
 circleminus;2296
 coproduct;2A3F
+ct;0063 0074
 # cwm: Unicode for ZWNJ, used for secondary replacement from EC.enc
 cwm;200C
 dblbracketleft;27E6
@@ -76,6 +77,11 @@ interrobangdown;2E18
 intersectionsq;2293
 latticetop;22A4
 lessmuch;226A
+longdbls;017F 017F
+longsh;017F 0068
+longsi;017F 0069
+longsl;017F 006C
+longst;FB05,017F 0074
 lscript;2113
 natural;266E
 negationslash;0338
@@ -98,6 +104,7 @@ sharp;266F
 similarequal;2243
 slurabove;2322
 slurbelow;2323
+st;FB06,0073 0074
 star;22C6
 subsetsqequal;2291
 supersetsqequal;2292
diff --git a/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ttftotype42/Makefile.am
index 24206d0d0a3..a55d65d82c4 100644
--- a/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ttftotype42/Makefile.am
@@ -8,7 +8,7 @@ ttftotype42_SOURCES = ttftotype42.cc
 
 ttftotype42_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 
 EXTRA_DIST = ttftotype42.1
diff --git a/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ttftotype42/Makefile.in
index c31b2616f27..6e8f246f3a9 100644
--- a/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ttftotype42/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = ttftotype42$(EXEEXT)
-subdir = ttftotype42
+subdir = lcdf-typetools-2.95/ttftotype42
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -169,6 +169,7 @@ 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@
@@ -230,7 +231,9 @@ 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@
@@ -263,7 +266,7 @@ AUTOMAKE_OPTIONS = foreign
 man_MANS = ttftotype42.1
 ttftotype42_SOURCES = ttftotype42.cc
 ttftotype42_LDADD = ../libefont/libefont.a ../liblcdf/liblcdf.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(srcdir)/../include
 CLEANFILES = @TEMPLATE_OBJS@
 EXTRA_DIST = ttftotype42.1
 all: all-am
@@ -279,9 +282,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ttftotype42/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.95/ttftotype42/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign ttftotype42/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-2.95/ttftotype42/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ttftotype42/ttftotype42.1
index d7a84f1c0de..6a80b880dd8 100644
--- a/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ttftotype42/ttftotype42.1
@@ -1,4 +1,4 @@
-.ds V 2.94
+.ds V 2.95
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ttftotype42/ttftotype42.cc
index babbff15573..e7984e5d444 100644
--- a/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/ttftotype42/ttftotype42.cc
@@ -1,6 +1,6 @@
 /* ttftotype42.cc -- driver for translating TrueType fonts to Type 42 fonts
  *
- * Copyright (c) 2006-2011 Eddie Kohler
+ * Copyright (c) 2006-2012 Eddie Kohler
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -344,7 +344,7 @@ main(int argc, char *argv[])
 
 	  case VERSION_OPT:
 	    printf("ttftotype42 (LCDF typetools) %s\n", VERSION);
-	    printf("Copyright (C) 2006-2011 Eddie Kohler\n\
+	    printf("Copyright (C) 2006-2012 Eddie Kohler\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty, not even for merchantability or fitness for a\n\
 particular purpose.\n");
diff --git a/Build/source/texk/lcdf-typetools/tests/t1.test b/Build/source/texk/lcdf-typetools/tests/t1.test
index 10c0ece007e..c39ae7ad24d 100755
--- a/Build/source/texk/lcdf-typetools/tests/t1.test
+++ b/Build/source/texk/lcdf-typetools/tests/t1.test
@@ -7,47 +7,47 @@ failed=
 
 rm -rf uhv*
 
-t1dotlessj/t1dotlessj -a $srcdir/tests/uhvrrc8a.pfb uhv_dl.pfa \
+$LCDF_TYPETOOLS_TREE/t1dotlessj/t1dotlessj -a $srcdir/tests/uhvrrc8a.pfb uhv_dl.pfa \
 	&& diff uhv_dl.pfa $srcdir/tests/uhv_dl.pfa \
 	&& echo "t1dotlessj/asc tests OK" \
 	|| failed="$failed t1dotlessj/asc"
 
-cat $srcdir/tests/uhvrrc8a.pfb | t1dotlessj/t1dotlessj -b >uhv_dl.pfb \
+cat $srcdir/tests/uhvrrc8a.pfb | $LCDF_TYPETOOLS_TREE/t1dotlessj/t1dotlessj -b >uhv_dl.pfb \
 	&& cmp -s uhv_dl.pfb $srcdir/tests/uhv_dl.pfb \
 	&& echo "t1dotlessj/bin tests OK" \
 	|| failed="$failed t1dotlessj/bin"
 
-t1lint/t1lint uhv_dl.pfa \
+$LCDF_TYPETOOLS_TREE/t1lint/t1lint uhv_dl.pfa \
 	&& echo "t1lint/asc tests OK" \
 	|| failed="$failed t1lint/asc"
 
-cat uhv_dl.pfb | t1lint/t1lint \
+cat uhv_dl.pfb | $LCDF_TYPETOOLS_TREE/t1lint/t1lint \
 	&& echo "t1lint/bin tests OK" \
 	|| failed="$failed t1lint/bin"
 
-t1testpage/t1testpage -o uhv_dl_a.ps uhv_dl.pfa \
+$LCDF_TYPETOOLS_TREE/t1testpage/t1testpage -o uhv_dl_a.ps uhv_dl.pfa \
 	&& diff uhv_dl_a.ps $srcdir/tests/uhv_dl.ps \
 	&& echo "t1testpage/asc tests OK" \
 	|| failed="$failed t1testpage/asc"
 
-cat uhv_dl.pfb | t1testpage/t1testpage >uhv_dl_b.ps \
+cat uhv_dl.pfb | $LCDF_TYPETOOLS_TREE/t1testpage/t1testpage >uhv_dl_b.ps \
 	&& diff uhv_dl_b.ps $srcdir/tests/uhv_dl.ps \
 	&& echo "t1testpage/bin tests OK" \
 	|| failed="$failed t1testpage/bin"
 
-t1reencode/t1reencode -e $srcdir/tests/t2c.enc -a $srcdir/tests/uhvrrc8a.pfb uhv_re.tmp \
+$LCDF_TYPETOOLS_TREE/t1reencode/t1reencode -e $srcdir/tests/t2c.enc -a $srcdir/tests/uhvrrc8a.pfb uhv_re.tmp \
 	&& grep -v 'Created by t1reencode' uhv_re.tmp >uhv_re.pfa \
 	&& diff uhv_re.pfa $srcdir/tests/uhv_re.pfa \
 	&& echo "t1reencode/asc tests OK" \
 	|| failed="$failed t1reencode/asc"
 
-t1rawafm/t1rawafm -o uhv_re_a.afm uhv_re.pfa \
+$LCDF_TYPETOOLS_TREE/t1rawafm/t1rawafm -o uhv_re_a.afm uhv_re.pfa \
 	&& diff uhv_re_a.afm $srcdir/tests/uhv_re.afm \
 	&& echo "t1rawafm/asc tests OK" \
 	|| failed="$failed t1rawafm/asc"
 
-cat $srcdir/tests/uhvrrc8a.pfb | t1reencode/t1reencode -e $srcdir/tests/t2c.enc -b \
-		| t1rawafm/t1rawafm >uhv_re_b.afm \
+cat $srcdir/tests/uhvrrc8a.pfb | $LCDF_TYPETOOLS_TREE/t1reencode/t1reencode -e $srcdir/tests/t2c.enc -b \
+		| $LCDF_TYPETOOLS_TREE/t1rawafm/t1rawafm >uhv_re_b.afm \
 	&& diff uhv_re_b.afm $srcdir/tests/uhv_re.afm \
 	&& echo "t1reencode+t1rawafm/bin tests OK" \
 	|| failed="$failed t1reencode+t1rawafm/bin"
diff --git a/Build/source/texk/lcdf-typetools/tests/tfm.test b/Build/source/texk/lcdf-typetools/tests/tfm.test
index 88f5279c6af..c7458bada16 100755
--- a/Build/source/texk/lcdf-typetools/tests/tfm.test
+++ b/Build/source/texk/lcdf-typetools/tests/tfm.test
@@ -9,7 +9,7 @@ export TEXMFCNF ENCFONTS
 
 rm -f Ant* a_enhg3c.enc
 
-otftotfm/otftotfm -e texnansx --glyphlist=$srcdir/glyphlist.txt \
+$LCDF_TYPETOOLS_TREE/otftotfm/otftotfm -e texnansx --glyphlist=$srcdir/$LCDF_TYPETOOLS_TREE/glyphlist.txt \
 	-p -fkern -fliga \
 	$srcdir/tests/antpolt-regular.otf Ant >Ant.map \
 	&& sed -e '1d' Ant.pl >Ant.plx \
diff --git a/Build/source/texk/lcdf-typetools/tests/ttf.test b/Build/source/texk/lcdf-typetools/tests/ttf.test
index 14ccd09507b..c527d4c683b 100755
--- a/Build/source/texk/lcdf-typetools/tests/ttf.test
+++ b/Build/source/texk/lcdf-typetools/tests/ttf.test
@@ -7,37 +7,37 @@ failed=
 
 rm -rf Fon* tmf.*
 
-cfftot1/cfftot1 -a $srcdir/tests/texmfhome.otf tmf.pfa \
+$LCDF_TYPETOOLS_TREE/cfftot1/cfftot1 -a $srcdir/tests/texmfhome.otf tmf.pfa \
 	&& diff tmf.pfa $srcdir/tests/tmf.pfa \
 	&& echo "cfftot1/asc tests OK" \
 	|| failed="$failed cfftot1/asc"
 
-cat $srcdir/tests/texmfhome.otf | cfftot1/cfftot1 -b >tmf.pfb \
+cat $srcdir/tests/texmfhome.otf | $LCDF_TYPETOOLS_TREE/cfftot1/cfftot1 -b >tmf.pfb \
 	&& cmp -s tmf.pfb $srcdir/tests/tmf.pfb \
 	&& echo "cfftot1/bin tests OK" \
 	|| failed="$failed cfftot1/bin"
 
-ttftotype42/ttftotype42 $srcdir/tests/FonetikaDaniaIwonaeBold.ttf Fon_f.t42 \
+$LCDF_TYPETOOLS_TREE/ttftotype42/ttftotype42 $srcdir/tests/FonetikaDaniaIwonaeBold.ttf Fon_f.t42 \
 	&& diff Fon_f.t42 $srcdir/tests/Fon.t42 \
 	&& echo "ttftotype42/file tests OK" \
 	|| failed="$failed ttftotype42/file"
 
-cat $srcdir/tests/FonetikaDaniaIwonaeBold.ttf | ttftotype42/ttftotype42 >Fon_t.t42 \
+cat $srcdir/tests/FonetikaDaniaIwonaeBold.ttf | $LCDF_TYPETOOLS_TREE/ttftotype42/ttftotype42 >Fon_t.t42 \
 	&& diff Fon_t.t42 $srcdir/tests/Fon.t42 \
 	&& echo "ttftotype42/term tests OK" \
 	|| failed="$failed ttftotype42/term"
 
-otfinfo/otfinfo -t $srcdir/tests/texmfhome.otf >tmf.tables \
+$LCDF_TYPETOOLS_TREE/otfinfo/otfinfo -t $srcdir/tests/texmfhome.otf >tmf.tables \
 	&& diff tmf.tables $srcdir/tests/tmf.tables \
 	&& echo "otfinfo/t tests OK" \
 	|| failed="$failed otfinfo/t"
 
-cat $srcdir/tests/texmfhome.otf | otfinfo/otfinfo -i >tmf.info \
+cat $srcdir/tests/texmfhome.otf | $LCDF_TYPETOOLS_TREE/otfinfo/otfinfo -i >tmf.info \
 	&& diff tmf.info $srcdir/tests/tmf.info \
 	&& echo "otfinfo/i tests OK" \
 	|| failed="$failed otfinfo/i"
 
-cat $srcdir/tests/texmfhome.otf | otfinfo/otfinfo -T post >Fon.post \
+cat $srcdir/tests/texmfhome.otf | $LCDF_TYPETOOLS_TREE/otfinfo/otfinfo -T post >Fon.post \
 	&& cmp -s Fon.post $srcdir/tests/Fon.post \
 	&& echo "otfinfo/T tests OK" \
 	|| failed="$failed otfinfo/T"
diff --git a/Build/source/texk/lcdf-typetools/version.ac b/Build/source/texk/lcdf-typetools/version.ac
index b8b6564e89c..6ce171b5367 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.94])
+m4_define([lcdf_typetools_version], [2.95])