dvipng: now without t1lib

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

13 files changed, 1051 insertions, 940 deletions

diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog
index 203f7c37d88..423687e527e 100644
--- a/Build/source/texk/dvipng/ChangeLog
+++ b/Build/source/texk/dvipng/ChangeLog
@@ -1,3 +1,13 @@
+2013-05-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* version.ac (new): Define dvipng version.
+	* configure.ac: Use version.ac.  Do not use AC_FUNC_MALLOC
+	because this might redefine malloc() as rpl_malloc().
+
+2013-05-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* ac/withenable.ac, Makefile.am, configure.ac: Drop t1lib.
+
 2013-01-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am, configure.ac: Allow subdir-objects.
diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am
index 33beaf436ed..5093a596ab3 100644
--- a/Build/source/texk/dvipng/Makefile.am
+++ b/Build/source/texk/dvipng/Makefile.am
@@ -29,7 +29,7 @@ dist-hook:
 
 AM_CPPFLAGS = -I$(top_srcdir)/$(DVIPNG_TREE)
 AM_CPPFLAGS += $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(GD_INCLUDES)
-AM_CPPFLAGS +=  $(T1LIB_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
+AM_CPPFLAGS += $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
 AM_CFLAGS = $(WARNING_CFLAGS)
 
 DVIPS = dvips -Ppdf
@@ -57,25 +57,16 @@ nodist_dvipng_SOURCES = \
 	@DVIPNG_TREE@/special.c \
 	@DVIPNG_TREE@/vf.c
 
-if have_t1
-nodist_dvipng_SOURCES += \
-	@DVIPNG_TREE@/t1.c
-endif have_t1
-
 if have_ft2
 nodist_dvipng_SOURCES += \
-	@DVIPNG_TREE@/ft.c \
-	@DVIPNG_TREE@/sfd.c
-endif have_ft2
-
-if have_ft2_or_t1
-nodist_dvipng_SOURCES += \
 	@DVIPNG_TREE@/enc.c \
 	@DVIPNG_TREE@/fontmap.c \
+	@DVIPNG_TREE@/ft.c \
+	@DVIPNG_TREE@/sfd.c \
 	@DVIPNG_TREE@/tfm.c
-endif have_ft2_or_t1
+endif have_ft2
 
-dvipng_dependencies = $(KPATHSEA_DEPEND) $(T1LIB_DEPEND) $(GD_DEPEND)
+dvipng_dependencies = $(KPATHSEA_DEPEND) $(GD_DEPEND)
 
 $(dvipng_OBJECTS): config.force
 
@@ -87,7 +78,7 @@ config.force: $(dvipng_dependencies)
 DISTCLEANFILES = config.force
 
 LDADD = $(KPATHSEA_LIBS) $(GD_LIBS) $(FREETYPE2_LIBS)
-LDADD += $(T1LIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS)
+LDADD += $(LIBPNG_LIBS) $(ZLIB_LIBS)
 
 dvigif_CPPFLAGS = -DEXEPROG=\"dvipng.exe\"
 nodist_dvigif_SOURCES = callexe.c
@@ -95,10 +86,8 @@ dvigif_LDADD =
 
 ## Rebuild libkpathsea
 @KPATHSEA_RULE@
-## Rebuild libgd
+## Rebuild gd
 @GD_RULE@
-## Rebuild libt1
-@T1LIB_RULE@
 
 include $(srcdir)/../am/bin_links.am
 
diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in
index 4dc947d510a..08fcb30640a 100644
--- a/Build/source/texk/dvipng/Makefile.in
+++ b/Build/source/texk/dvipng/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,17 +79,12 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = dvipng$(EXEEXT) $(am__EXEEXT_1)
-@have_t1_TRUE@am__append_1 = \
-@have_t1_TRUE@	@DVIPNG_TREE@/t1.c
-
-@have_ft2_TRUE@am__append_2 = \
+@have_ft2_TRUE@am__append_1 = \
+@have_ft2_TRUE@	@DVIPNG_TREE@/enc.c \
+@have_ft2_TRUE@	@DVIPNG_TREE@/fontmap.c \
 @have_ft2_TRUE@	@DVIPNG_TREE@/ft.c \
-@have_ft2_TRUE@	@DVIPNG_TREE@/sfd.c
-
-@have_ft2_or_t1_TRUE@am__append_3 = \
-@have_ft2_or_t1_TRUE@	@DVIPNG_TREE@/enc.c \
-@have_ft2_or_t1_TRUE@	@DVIPNG_TREE@/fontmap.c \
-@have_ft2_or_t1_TRUE@	@DVIPNG_TREE@/tfm.c
+@have_ft2_TRUE@	@DVIPNG_TREE@/sfd.c \
+@have_ft2_TRUE@	@DVIPNG_TREE@/tfm.c
 
 DIST_COMMON = $(srcdir)/../am/bin_links.am $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.am $(top_srcdir)/configure \
@@ -69,16 +92,18 @@ DIST_COMMON = $(srcdir)/../am/bin_links.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../texlive/w32_wrapper/callexe.c \
 	$(top_srcdir)/../../build-aux/depcomp \
 	$(top_srcdir)/../../build-aux/test-driver ChangeLog \
-	../../build-aux/config.guess ../../build-aux/config.sub \
-	../../build-aux/depcomp ../../build-aux/install-sh \
-	../../build-aux/missing ../../build-aux/texinfo.tex \
-	../../build-aux/ylwrap ../../build-aux/ltmain.sh \
+	../../build-aux/compile ../../build-aux/config.guess \
+	../../build-aux/config.sub ../../build-aux/depcomp \
+	../../build-aux/install-sh ../../build-aux/missing \
+	../../build-aux/texinfo.tex ../../build-aux/ylwrap \
+	../../build-aux/ltmain.sh \
+	$(top_srcdir)/../../build-aux/compile \
 	$(top_srcdir)/../../build-aux/config.guess \
 	$(top_srcdir)/../../build-aux/config.sub \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/ltmain.sh \
 	$(top_srcdir)/../../build-aux/missing
-@WIN32_TRUE@@have_gif_TRUE@am__append_4 = dvigif
+@WIN32_TRUE@@have_gif_TRUE@am__append_2 = dvigif
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \
@@ -88,7 +113,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \
 	$(top_srcdir)/../../m4/kpse-gd-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-t1lib-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
@@ -96,7 +120,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
 	$(top_srcdir)/../../m4/ltsugar.m4 \
 	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 \
+	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
 	$(top_srcdir)/ac/dvipng.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -117,26 +141,24 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 am__dirstamp = $(am__leading_dot)dirstamp
-@have_t1_TRUE@am__objects_1 = @DVIPNG_TREE@/t1.$(OBJEXT)
-@have_ft2_TRUE@am__objects_2 = @DVIPNG_TREE@/ft.$(OBJEXT) \
-@have_ft2_TRUE@	@DVIPNG_TREE@/sfd.$(OBJEXT)
-@have_ft2_or_t1_TRUE@am__objects_3 = @DVIPNG_TREE@/enc.$(OBJEXT) \
-@have_ft2_or_t1_TRUE@	@DVIPNG_TREE@/fontmap.$(OBJEXT) \
-@have_ft2_or_t1_TRUE@	@DVIPNG_TREE@/tfm.$(OBJEXT)
+@have_ft2_TRUE@am__objects_1 = @DVIPNG_TREE@/enc.$(OBJEXT) \
+@have_ft2_TRUE@	@DVIPNG_TREE@/fontmap.$(OBJEXT) \
+@have_ft2_TRUE@	@DVIPNG_TREE@/ft.$(OBJEXT) \
+@have_ft2_TRUE@	@DVIPNG_TREE@/sfd.$(OBJEXT) \
+@have_ft2_TRUE@	@DVIPNG_TREE@/tfm.$(OBJEXT)
 nodist_dvipng_OBJECTS = @DVIPNG_TREE@/color.$(OBJEXT) \
 	@DVIPNG_TREE@/draw.$(OBJEXT) @DVIPNG_TREE@/dvi.$(OBJEXT) \
 	@DVIPNG_TREE@/dvipng.$(OBJEXT) @DVIPNG_TREE@/font.$(OBJEXT) \
 	@DVIPNG_TREE@/misc.$(OBJEXT) @DVIPNG_TREE@/papersiz.$(OBJEXT) \
 	@DVIPNG_TREE@/pk.$(OBJEXT) @DVIPNG_TREE@/ppagelist.$(OBJEXT) \
 	@DVIPNG_TREE@/set.$(OBJEXT) @DVIPNG_TREE@/special.$(OBJEXT) \
-	@DVIPNG_TREE@/vf.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
-	$(am__objects_3)
+	@DVIPNG_TREE@/vf.$(OBJEXT) $(am__objects_1)
 dvipng_OBJECTS = $(nodist_dvipng_OBJECTS)
 dvipng_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
 dvipng_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -542,9 +564,6 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-T1LIB_DEPEND = @T1LIB_DEPEND@
-T1LIB_INCLUDES = @T1LIB_INCLUDES@
-T1LIB_LIBS = @T1LIB_LIBS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 ZLIB_DEPEND = @ZLIB_DEPEND@
@@ -613,8 +632,8 @@ ACLOCAL_AMFLAGS = -I ../../m4 -I m4
 EXTRA_DIST = $(DVIPNG_TREE) $(DVIPNG_TREE)-PATCHES dvipng.test \
 	dvipng-test.dvi
 AM_CPPFLAGS = -I$(top_srcdir)/$(DVIPNG_TREE) $(KPATHSEA_INCLUDES) \
-	$(FREETYPE2_INCLUDES) $(GD_INCLUDES) $(T1LIB_INCLUDES) \
-	$(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
+	$(FREETYPE2_INCLUDES) $(GD_INCLUDES) $(LIBPNG_INCLUDES) \
+	$(ZLIB_INCLUDES)
 AM_CFLAGS = $(WARNING_CFLAGS)
 DVIPS = dvips -Ppdf
 TEXI2HTML = texi2html
@@ -628,12 +647,11 @@ nodist_dvipng_SOURCES = @DVIPNG_TREE@/color.c @DVIPNG_TREE@/draw.c \
 	@DVIPNG_TREE@/font.c @DVIPNG_TREE@/misc.c \
 	@DVIPNG_TREE@/papersiz.c @DVIPNG_TREE@/pk.c \
 	@DVIPNG_TREE@/ppagelist.c @DVIPNG_TREE@/set.c \
-	@DVIPNG_TREE@/special.c @DVIPNG_TREE@/vf.c $(am__append_1) \
-	$(am__append_2) $(am__append_3)
-dvipng_dependencies = $(KPATHSEA_DEPEND) $(T1LIB_DEPEND) $(GD_DEPEND)
+	@DVIPNG_TREE@/special.c @DVIPNG_TREE@/vf.c $(am__append_1)
+dvipng_dependencies = $(KPATHSEA_DEPEND) $(GD_DEPEND)
 DISTCLEANFILES = config.force
-LDADD = $(KPATHSEA_LIBS) $(GD_LIBS) $(FREETYPE2_LIBS) $(T1LIB_LIBS) \
-	$(LIBPNG_LIBS) $(ZLIB_LIBS)
+LDADD = $(KPATHSEA_LIBS) $(GD_LIBS) $(FREETYPE2_LIBS) $(LIBPNG_LIBS) \
+	$(ZLIB_LIBS)
 dvigif_CPPFLAGS = -DEXEPROG=\"dvipng.exe\"
 nodist_dvigif_SOURCES = callexe.c
 dvigif_LDADD = 
@@ -682,8 +700,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -744,6 +762,7 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 dvigif$(EXEEXT): $(dvigif_OBJECTS) $(dvigif_DEPENDENCIES) $(EXTRA_dvigif_DEPENDENCIES) 
 	@rm -f dvigif$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(dvigif_OBJECTS) $(dvigif_LDADD) $(LIBS)
@@ -777,18 +796,17 @@ dvigif$(EXEEXT): $(dvigif_OBJECTS) $(dvigif_DEPENDENCIES) $(EXTRA_dvigif_DEPENDE
 	@DVIPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
 @DVIPNG_TREE@/vf.$(OBJEXT): @DVIPNG_TREE@/$(am__dirstamp) \
 	@DVIPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
-@DVIPNG_TREE@/t1.$(OBJEXT): @DVIPNG_TREE@/$(am__dirstamp) \
+@DVIPNG_TREE@/enc.$(OBJEXT): @DVIPNG_TREE@/$(am__dirstamp) \
+	@DVIPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
+@DVIPNG_TREE@/fontmap.$(OBJEXT): @DVIPNG_TREE@/$(am__dirstamp) \
 	@DVIPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
 @DVIPNG_TREE@/ft.$(OBJEXT): @DVIPNG_TREE@/$(am__dirstamp) \
 	@DVIPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
 @DVIPNG_TREE@/sfd.$(OBJEXT): @DVIPNG_TREE@/$(am__dirstamp) \
 	@DVIPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
-@DVIPNG_TREE@/enc.$(OBJEXT): @DVIPNG_TREE@/$(am__dirstamp) \
-	@DVIPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
-@DVIPNG_TREE@/fontmap.$(OBJEXT): @DVIPNG_TREE@/$(am__dirstamp) \
-	@DVIPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
 @DVIPNG_TREE@/tfm.$(OBJEXT): @DVIPNG_TREE@/$(am__dirstamp) \
 	@DVIPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
+
 dvipng$(EXEEXT): $(dvipng_OBJECTS) $(dvipng_DEPENDENCIES) $(EXTRA_dvipng_DEPENDENCIES) 
 	@rm -f dvipng$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(dvipng_OBJECTS) $(dvipng_LDADD) $(LIBS)
@@ -816,7 +834,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@@DVIPNG_TREE@/$(DEPDIR)/set.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@DVIPNG_TREE@/$(DEPDIR)/sfd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@DVIPNG_TREE@/$(DEPDIR)/special.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@DVIPNG_TREE@/$(DEPDIR)/t1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@DVIPNG_TREE@/$(DEPDIR)/tfm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@DVIPNG_TREE@/$(DEPDIR)/vf.Po@am__quote@
 
@@ -874,13 +891,12 @@ distclean-libtool:
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
@@ -983,7 +999,7 @@ distclean-tags:
 	$(MAKE) $(AM_MAKEFLAGS) $<
 
 # Leading 'am--fnord' is there to ensure the list of targets does not
-# exand to empty, as could happen e.g. with make check TESTS=''.
+# expand to empty, as could happen e.g. with make check TESTS=''.
 am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
 am--force-recheck:
 	@:
@@ -1214,10 +1230,16 @@ dist-xz: distdir
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
@@ -1475,7 +1497,6 @@ config.force: $(dvipng_dependencies)
 
 @KPATHSEA_RULE@
 @GD_RULE@
-@T1LIB_RULE@
 .PHONY: install-bin-links uninstall-bin-links
 
 install-bin-links:
diff --git a/Build/source/texk/dvipng/ac/withenable.ac b/Build/source/texk/dvipng/ac/withenable.ac
index 07865f537fb..c29e49af72f 100644
--- a/Build/source/texk/dvipng/ac/withenable.ac
+++ b/Build/source/texk/dvipng/ac/withenable.ac
@@ -1,8 +1,8 @@
 ## texk/dvipng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/
 dnl
-dnl Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 dnl You may freely use, modify and/or distribute this file.
 dnl
 ## configure options and TL libraries required for dvipng
-KPSE_ENABLE_PROG([dvipng], [kpathsea gd t1lib])
+KPSE_ENABLE_PROG([dvipng], [kpathsea gd])
 m4_include(kpse_TL[texk/dvipng/ac/dvipng.ac])
diff --git a/Build/source/texk/dvipng/aclocal.m4 b/Build/source/texk/dvipng/aclocal.m4
index a08e29c1036..121ddf8de2a 100644
--- a/Build/source/texk/dvipng/aclocal.m4
+++ b/Build/source/texk/dvipng/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.13.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.14 -*- Autoconf -*-
 
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.13'
+[am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.13.1], [],
+m4_if([$1], [1.14], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.13.1])dnl
+[AM_AUTOMAKE_VERSION([1.14])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -410,7 +410,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
@@ -455,6 +455,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -563,7 +569,48 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -571,7 +618,6 @@ dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -789,6 +835,70 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
@@ -998,76 +1108,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
 [# Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of '-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
@@ -1079,7 +1227,6 @@ m4_include([../../m4/kpse-freetype2-flags.m4])
 m4_include([../../m4/kpse-gd-flags.m4])
 m4_include([../../m4/kpse-kpathsea-flags.m4])
 m4_include([../../m4/kpse-libpng-flags.m4])
-m4_include([../../m4/kpse-t1lib-flags.m4])
 m4_include([../../m4/kpse-warnings.m4])
 m4_include([../../m4/kpse-win32.m4])
 m4_include([../../m4/kpse-zlib-flags.m4])
diff --git a/Build/source/texk/dvipng/config.h.in b/Build/source/texk/dvipng/config.h.in
index b6dfede02e4..9ad974db7e2 100644
--- a/Build/source/texk/dvipng/config.h.in
+++ b/Build/source/texk/dvipng/config.h.in
@@ -121,19 +121,12 @@
 /* Define to 1 if you have the `png' library (-lpng). */
 #undef HAVE_LIBPNG
 
-/* Define to 1 if you have the `t1' library (-lt1). */
-#undef HAVE_LIBT1
-
 /* Define to 1 if you have the `z' library (-lz). */
 #undef HAVE_LIBZ
 
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
-   to 0 otherwise. */
-#undef HAVE_MALLOC
-
 /* Define to 1 if you have the `memcmp' function. */
 #undef HAVE_MEMCMP
 
@@ -232,9 +225,6 @@
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #undef HAVE_SYS_WAIT_H
 
-/* Define to 1 if you have the <t1lib.h> header file. */
-#undef HAVE_T1LIB_H
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
@@ -333,9 +323,6 @@
    such a type exists and the standard includes do not define it. */
 #undef int64_t
 
-/* Define to rpl_malloc if the replacement function should be used. */
-#undef malloc
-
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 7c3beb143a5..2867c0d8620 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -643,12 +643,8 @@ WIN32_TRUE
 DVIPNG_TREE
 have_gif_FALSE
 have_gif_TRUE
-have_ft2_or_t1_FALSE
-have_ft2_or_t1_TRUE
 have_ft2_FALSE
 have_ft2_TRUE
-have_t1_FALSE
-have_t1_TRUE
 GD_RULE
 GD_DEPEND
 GD_LIBS
@@ -658,10 +654,6 @@ FREETYPE2_DEPEND
 FREETYPE2_LIBS
 FREETYPE2_INCLUDES
 FT2_CONFIG
-T1LIB_RULE
-T1LIB_DEPEND
-T1LIB_LIBS
-T1LIB_INCLUDES
 LIBPNG_RULE
 LIBPNG_DEPEND
 LIBPNG_LIBS
@@ -677,8 +669,8 @@ KPATHSEA_LIBS
 KPATHSEA_INCLUDES
 INSTALL_INFO
 AM_MAKEINFOFLAGS
-POW_LIB
 LIBOBJS
+POW_LIB
 ALLOCA
 GS
 cross_FALSE
@@ -825,9 +817,6 @@ with_system_zlib
 with_zlib_includes
 with_zlib_libdir
 with_system_libpng
-with_system_t1lib
-with_t1lib_includes
-with_t1lib_libdir
 with_system_freetype2
 with_system_gd
 with_gd_includes
@@ -1501,10 +1490,6 @@ Optional Packages:
   --with-zlib-libdir=DIR  zlib library installed in DIR
   --with-system-libpng    use installed libpng headers and library (requires
                           pkg-config)
-  --with-system-t1lib     use installed t1lib headers and library
-  --with-t1lib-includes=DIR
-                          t1lib headers installed in DIR
-  --with-t1lib-libdir=DIR t1lib library installed in DIR
   --with-system-freetype2 use installed freetype2 headers and library
                           (requires freetype-config)
   --with-system-gd        use installed gd headers and library
@@ -2582,7 +2567,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 # Common code for all programs using libkpathsea.
-am__api_version='1.13'
+am__api_version='1.14'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -3898,6 +3883,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -7672,6 +7716,10 @@ mkdir_p='$(MKDIR_P)'
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
 
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
@@ -7679,6 +7727,48 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
@@ -13963,73 +14053,6 @@ $as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
 
 fi
 
-for ac_header in stdlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STDLIB_H 1
-_ACEOF
-
-fi
-
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
-$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
-if ${ac_cv_func_malloc_0_nonnull+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_malloc_0_nonnull=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-char *malloc ();
-#endif
-
-int
-main ()
-{
-return ! malloc (0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_malloc_0_nonnull=yes
-else
-  ac_cv_func_malloc_0_nonnull=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
-$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
-if test $ac_cv_func_malloc_0_nonnull = yes; then :
-
-$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
-
-else
-  $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
-
-   case " $LIBOBJS " in
-  *" malloc.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
- ;;
-esac
-
-
-$as_echo "#define malloc rpl_malloc" >>confdefs.h
-
-fi
-
-
 
 
 
@@ -16112,41 +16135,6 @@ ${top_builddir}/../../libs/libpng/include/png.h:
 	cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
-## _KPSE_LIB_FLAGS: Setup t1lib (-lt1) flags
-
-# Check whether --with-system-t1lib was given.
-if test "${with_system_t1lib+set}" = set; then :
-  withval=$with_system_t1lib;
-fi
-
-# Check whether --with-t1lib-includes was given.
-if test "${with_t1lib_includes+set}" = set; then :
-  withval=$with_t1lib_includes;
-fi
-
-# Check whether --with-t1lib-libdir was given.
-if test "${with_t1lib_libdir+set}" = set; then :
-  withval=$with_t1lib_libdir;
-fi
-if test "x$with_system_t1lib" = xyes; then
-  if test "x$with_t1lib_includes" != x && test "x$with_t1lib_includes" != xyes; then
-  T1LIB_INCLUDES="-I$with_t1lib_includes"
-fi
-T1LIB_LIBS="-lt1"
-if test "x$with_t1lib_libdir" != x && test "x$with_t1lib_libdir" != xyes; then
-  T1LIB_LIBS="-L$with_t1lib_libdir $T1LIB_LIBS"
-fi
-else
-  T1LIB_INCLUDES="-I$kpse_BLD/libs/t1lib"
-  T1LIB_LIBS="$kpse_BLD/libs/t1lib/libt1.a"
-  T1LIB_DEPEND='${top_builddir}/../../libs/t1lib/libt1.a'
-  T1LIB_RULE='# Rebuild libt1
-$(T1LIB_DEPEND): ${top_builddir}/../../libs/t1lib/t1lib.h
-	cd ${top_builddir}/../../libs/t1lib && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/t1lib/t1lib.h:
-	cd ${top_builddir}/../../libs/t1lib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
 ## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
 
 # Check whether --with-system-freetype2 was given.
@@ -16262,6 +16250,52 @@ ${top_builddir}/../../libs/freetype2/ft2build.h:
 	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
+$as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
+if ${kpse_cv_have_win32+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef WIN32
+  choke me
+#endif
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __MINGW32__
+  choke me
+#endif
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  kpse_cv_have_win32=mingw32
+else
+  kpse_cv_have_win32=native
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  kpse_cv_have_win32=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5
+$as_echo "$kpse_cv_have_win32" >&6; }
+
 ## _KPSE_LIB_FLAGS: Setup gd (-lgd) flags
 
 # Check whether --with-system-gd was given.
@@ -16287,8 +16321,9 @@ if test "x$with_gd_libdir" != x && test "x$with_gd_libdir" != xyes; then
   GD_LIBS="-L$with_gd_libdir $GD_LIBS"
 fi
 else
-  GD_INCLUDES="-I$kpse_BLD/libs/gd/include -DNONDLL"
+  GD_INCLUDES="-I$kpse_BLD/libs/gd/include"
   GD_LIBS="$kpse_BLD/libs/gd/libgd.a"
+  test "x$kpse_cv_have_win32" = xno || GD_INCLUDES="$GD_INCLUDES -DBGDWIN32 -DNONDLL"
   GD_DEPEND='${top_builddir}/../../libs/gd/libgd.a'
   GD_RULE='# Rebuild libgd
 $(GD_DEPEND): ${top_builddir}/../../libs/gd/include/gd.h
@@ -16298,8 +16333,7 @@ ${top_builddir}/../../libs/gd/include/gd.h:
 fi
 
 
-# Assume we have t1lib and freetype2.
-have_t1=yes
+# Assume we have freetype2.
 have_ft2=yes
 
 if test "x$enable_build" != xno || test -f config.force; then
@@ -16329,19 +16363,6 @@ else
 fi
 
 
-eval CPPFLAGS=\"$T1LIB_INCLUDES \$CPPFLAGS\"
-eval LIBS=\"$T1LIB_LIBS \$LIBS\"
-
-ac_fn_c_check_func "$LINENO" "T1_InitLib" "ac_cv_func_T1_InitLib"
-if test "x$ac_cv_func_T1_InitLib" = xyes; then :
-
-$as_echo "#define HAVE_LIBT1 1" >>confdefs.h
-
-else
-  have_t1=no
-fi
-
-
 eval CPPFLAGS=\"$FREETYPE2_INCLUDES \$CPPFLAGS\"
 eval LIBS=\"$FREETYPE2_LIBS \$LIBS\"
 
@@ -16364,7 +16385,7 @@ if test "x$ac_cv_func_gdImageCreate" = xyes; then :
 $as_echo "#define HAVE_LIBGD 1" >>confdefs.h
 
 else
-  as_fn_error $? "cannot find/use libgd
+  as_fn_error $? "cannot find/use gd
 This drawing library can be downloaded at http://www.boutell.com/gd" "$LINENO" 5
 fi
 
@@ -16433,18 +16454,6 @@ fi
 
 done
 
-for ac_header in t1lib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "t1lib.h" "ac_cv_header_t1lib_h" "$ac_includes_default"
-if test "x$ac_cv_header_t1lib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_T1LIB_H 1
-_ACEOF
-
-fi
-
-done
-
 
 # Checks for more library functions.
 for ac_func in gdImageCreateTrueColor gdImageCreateFromJpeg gdImagePngEx gdImageCreateFromPngPtr gdImageGif FT_Library_Version
@@ -16468,14 +16477,6 @@ echo timestamp >config.force
 
 fi
 
- if test "x$have_t1" = xyes; then
-  have_t1_TRUE=
-  have_t1_FALSE='#'
-else
-  have_t1_TRUE='#'
-  have_t1_FALSE=
-fi
-
  if test "x$have_ft2" = xyes; then
   have_ft2_TRUE=
   have_ft2_FALSE='#'
@@ -16484,14 +16485,6 @@ else
   have_ft2_FALSE=
 fi
 
- if test "x$have_ft2:$have_t1" != xno:no; then
-  have_ft2_or_t1_TRUE=
-  have_ft2_or_t1_FALSE='#'
-else
-  have_ft2_or_t1_TRUE='#'
-  have_ft2_or_t1_FALSE=
-fi
-
  if test "x$ac_cv_func_gdImageGif" = xyes; then
   have_gif_TRUE=
   have_gif_FALSE='#'
@@ -16521,7 +16514,6 @@ fi
      (dvigif):                              $ac_cv_func_gdImageGif
    FreeType font rendering available:       $ac_cv_func_FT_Init_FreeType
    Support for subfonts (CJK-LaTeX):        $ac_cv_func_FT_Init_FreeType
-   T1lib font rendering available:          $ac_cv_func_T1_InitLib
 " >&5
 $as_echo "
 ** Configuration summary for $PACKAGE_STRING:
@@ -16543,7 +16535,6 @@ $as_echo "
      (dvigif):                              $ac_cv_func_gdImageGif
    FreeType font rendering available:       $ac_cv_func_FT_Init_FreeType
    Support for subfonts (CJK-LaTeX):        $ac_cv_func_FT_Init_FreeType
-   T1lib font rendering available:          $ac_cv_func_T1_InitLib
 " >&6; }
 
 ac_config_headers="$ac_config_headers config.h"
@@ -16552,52 +16543,6 @@ ac_config_headers="$ac_config_headers config.h"
 DVIPNG_TREE=dvipng-1.14
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
-$as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
-if ${kpse_cv_have_win32+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef WIN32
-  choke me
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __MINGW32__
-  choke me
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  kpse_cv_have_win32=mingw32
-else
-  kpse_cv_have_win32=native
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  kpse_cv_have_win32=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5
-$as_echo "$kpse_cv_have_win32" >&6; }
-
  if test "x$kpse_cv_have_win32" != xno; then
   WIN32_TRUE=
   WIN32_FALSE='#'
@@ -16765,18 +16710,10 @@ if test -z "${cross_TRUE}" && test -z "${cross_FALSE}"; then
   as_fn_error $? "conditional \"cross\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${have_t1_TRUE}" && test -z "${have_t1_FALSE}"; then
-  as_fn_error $? "conditional \"have_t1\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${have_ft2_TRUE}" && test -z "${have_ft2_FALSE}"; then
   as_fn_error $? "conditional \"have_ft2\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${have_ft2_or_t1_TRUE}" && test -z "${have_ft2_or_t1_FALSE}"; then
-  as_fn_error $? "conditional \"have_ft2_or_t1\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${have_gif_TRUE}" && test -z "${have_gif_FALSE}"; then
   as_fn_error $? "conditional \"have_gif\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -18351,7 +18288,7 @@ $as_echo X"$mf" |
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac
index 2c2850df3d0..a4d76c93208 100644
--- a/Build/source/texk/dvipng/configure.ac
+++ b/Build/source/texk/dvipng/configure.ac
@@ -13,7 +13,7 @@ dnl  Copyright (C) 2002-2008 Jan-Åke Larsson
 dnl
 dnl *********************************************************************
 dnl
-m4_define([dvipng_version], [1.14])[]dnl using unmodified dvipng source tree
+m4_include([version.ac])[] dnl define dvipng_version
 AC_INIT([dvipng], dvipng_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([dvipng-]dvipng_version[/dvipng.c])
@@ -69,7 +69,7 @@ AC_TYPE_PID_T
 # Checks for library functions.
 AC_FUNC_ALLOCA
 AC_FUNC_FORK
-AC_FUNC_MALLOC
+dnl AC_FUNC_MALLOC
 AC_FUNC_MMAP
 AC_FUNC_STRTOD
 AC_FUNC_VPRINTF
@@ -93,12 +93,10 @@ AC_PATH_PROG([INSTALL_INFO], [install-info], [:], [$PATH /usr/sbin /sbin])
 KPSE_KPATHSEA_FLAGS
 KPSE_ZLIB_FLAGS
 KPSE_LIBPNG_FLAGS
-KPSE_T1LIB_FLAGS
 KPSE_FREETYPE2_FLAGS
 KPSE_GD_FLAGS
 
-# Assume we have t1lib and freetype2.
-have_t1=yes
+# Assume we have freetype2.
 have_ft2=yes
 
 if test "x$enable_build" != xno || test -f config.force; then
@@ -115,12 +113,6 @@ AC_CHECK_FUNC([png_read_image],
                          [Define to 1 if you have the `png' library (-lpng).])],
               [AC_MSG_ERROR([cannot find/use libpng])])
 
-KPSE_ADD_FLAGS([t1lib])
-AC_CHECK_FUNC([T1_InitLib],
-              [AC_DEFINE([HAVE_LIBT1], 1,
-                         [Define to 1 if you have the `t1' library (-lt1).])],
-              [have_t1=no])
-
 KPSE_ADD_FLAGS([freetype2])
 AC_CHECK_FUNC([FT_Init_FreeType],
               [AC_DEFINE([HAVE_FT2], 1,
@@ -131,7 +123,7 @@ KPSE_ADD_FLAGS([gd])
 AC_CHECK_FUNC([gdImageCreate],
               [AC_DEFINE([HAVE_LIBGD], 1,
                          [Define to 1 if you have the `gd' library (-lgd).])],
-              [AC_MSG_ERROR([cannot find/use libgd
+              [AC_MSG_ERROR([cannot find/use gd
 This drawing library can be downloaded at http://www.boutell.com/gd])])
 
 KPSE_ADD_FLAGS([kpathsea])
@@ -149,7 +141,6 @@ KPSE_CHECK_KPSE_FORMAT([opentype],
 # Checks for more header files.
 AC_CHECK_HEADERS([gd.h png.h kpathsea/kpathsea.h], ,
                  [AC_MSG_ERROR([cannot find/use $ac_header])])
-AC_CHECK_HEADERS([t1lib.h])
 
 # Checks for more library functions.
 AC_CHECK_FUNCS([gdImageCreateTrueColor gdImageCreateFromJpeg gdImagePngEx gdImageCreateFromPngPtr gdImageGif FT_Library_Version])
@@ -160,9 +151,7 @@ echo timestamp >config.force
 
 fi
 
-AM_CONDITIONAL([have_t1], [test "x$have_t1" = xyes])
 AM_CONDITIONAL([have_ft2], [test "x$have_ft2" = xyes])
-AM_CONDITIONAL([have_ft2_or_t1], [test "x$have_ft2:$have_t1" != xno:no])
 AM_CONDITIONAL([have_gif], [test "x$ac_cv_func_gdImageGif" = xyes])
 
 AC_MSG_RESULT([
@@ -185,7 +174,6 @@ AC_MSG_RESULT([
      (dvigif):                              $ac_cv_func_gdImageGif
    FreeType font rendering available:       $ac_cv_func_FT_Init_FreeType
    Support for subfonts (CJK-LaTeX):        $ac_cv_func_FT_Init_FreeType
-   T1lib font rendering available:          $ac_cv_func_T1_InitLib
 ])
 
 AC_CONFIG_HEADERS([config.h])
diff --git a/Build/source/texk/dvipng/doc/Makefile.in b/Build/source/texk/dvipng/doc/Makefile.in
index 30ce49c1833..1a8f8194a1d 100644
--- a/Build/source/texk/dvipng/doc/Makefile.in
+++ b/Build/source/texk/dvipng/doc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -63,7 +91,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \
 	$(top_srcdir)/../../m4/kpse-gd-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-t1lib-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
@@ -71,7 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
 	$(top_srcdir)/../../m4/ltsugar.m4 \
 	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 \
+	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
 	$(top_srcdir)/ac/dvipng.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -256,9 +283,6 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-T1LIB_DEPEND = @T1LIB_DEPEND@
-T1LIB_INCLUDES = @T1LIB_INCLUDES@
-T1LIB_LIBS = @T1LIB_LIBS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 ZLIB_DEPEND = @ZLIB_DEPEND@
@@ -416,13 +440,9 @@ clean-libtool:
 	$(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
 	 -o $(@:.html=.htp) $<; \
 	then \
-	  rm -rf $@; \
-	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-	    mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
+	  rm -rf $@ && mv $(@:.html=.htp) $@; \
 	else \
-	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
-	  exit 1; \
+	  rm -rf $(@:.html=.htp); exit 1; \
 	fi
 $(srcdir)/dvipng.info: dvipng.texi $(dvipng_TEXINFOS)
 dvipng.dvi: dvipng.texi $(dvipng_TEXINFOS)
diff --git a/Build/source/texk/dvipng/doc/dvipng.help b/Build/source/texk/dvipng/doc/dvipng.help
index 5bf62a29297..da28fcd4ab2 100644
--- a/Build/source/texk/dvipng/doc/dvipng.help
+++ b/Build/source/texk/dvipng/doc/dvipng.help
@@ -33,7 +33,6 @@ These do not correspond to dvips options:
   --picky      When a warning occurs, don't output image
   --png        Output PNG images (dvipng default)
   --strict     When a warning occurs, exit
-  --t1lib*     T1lib font rendering (default on)
   --truecolor* Truecolor output
   -Q #         Quality (T1lib and PK subsampling)
   --width*     Output the image width on stdout
diff --git a/Build/source/texk/dvipng/doc/dvipng.info b/Build/source/texk/dvipng/doc/dvipng.info
index c0f565d72be..6c4e2d01d15 100644
--- a/Build/source/texk/dvipng/doc/dvipng.info
+++ b/Build/source/texk/dvipng/doc/dvipng.info
@@ -1,4 +1,4 @@
-This is dvipng.info, produced by makeinfo version 4.13 from dvipng.texi.
+This is dvipng.info, produced by makeinfo version 5.1 from dvipng.texi.
 
 INFO-DIR-SECTION TeX
 START-INFO-DIR-ENTRY
@@ -43,43 +43,43 @@ File: dvipng.info,  Node: Introduction,  Next: Installation,  Prev: Top,  Up: To
 This program makes PNG and/or GIF graphics from DVI files as obtained
 from TeX and its relatives.
 
-   If GIF support is enabled, GIF output is chosen by using the
-`dvigif' binary or with the `--gif' option.
+   If GIF support is enabled, GIF output is chosen by using the 'dvigif'
+binary or with the '--gif' option.
 
    It is intended to produce anti-aliased screen-resolution images as
-fast as is possible. The target audience is people who need to generate
-and regenerate many images again and again. The primary target is the
+fast as is possible.  The target audience is people who need to generate
+and regenerate many images again and again.  The primary target is the
 preview-latex (X)Emacs package, a package to preview formulas from
-within (X)Emacs. Yes, you get to see your formulas in the (X)Emacs
-buffer, see `http://www.gnu.org/software/auctex/preview-latex.html'.
+within (X)Emacs.  Yes, you get to see your formulas in the (X)Emacs
+buffer, see <http://www.gnu.org/software/auctex/preview-latex.html>.
 
    Another example is WeBWorK, an internet-based method for delivering
-homework problems to students over the internet, giving students
-instant feedback as to whether or not their answers are correct, see
-`http://webwork.math.rochester.edu'.
+homework problems to students over the internet, giving students instant
+feedback as to whether or not their answers are correct, see
+<http://webwork.math.rochester.edu>.
 
    A more recent addition to the dvipng-using applications out there is
-MediaWiki, the software behind Wikipedia and many other wikis out
-there. Dvipng is used to render mathematical formulae from version
-1.8.0 of MediaWiki, see `http://www.mediawiki.org'.
+MediaWiki, the software behind Wikipedia and many other wikis out there.
+Dvipng is used to render mathematical formulae from version 1.8.0 of
+MediaWiki, see <http://www.mediawiki.org>.
 
    Other applications may also benefit, like web applications as
 latex2html and WYSIWYG editors like LyX.
 
-   The benefits of `dvipng'/`dvigif' include
+   The benefits of 'dvipng'/'dvigif' include
 
-   * Speed. It is a very fast bitmap-rendering code for DVI files, which
-     makes it suitable for generating large amounts of images
+   * Speed.  It is a very fast bitmap-rendering code for DVI files,
+     which makes it suitable for generating large amounts of images
      on-the-fly, as needed in preview-latex, WeBWorK and others.
 
    * It does not read the postamble, so it can be started before TeX
-     finishes. There is a `--follow' switch that makes dvipng wait at
+     finishes.  There is a '--follow' switch that makes dvipng wait at
      end-of-file for further output, unless it finds the POST marker
      that indicates the end of the DVI.
 
-   * Interactive query of options. dvipng can read options interactively
-     through stdin, and all options are usable. It is even possible to
-     change the input file through this interface.
+   * Interactive query of options.  dvipng can read options
+     interactively through stdin, and all options are usable.  It is
+     even possible to change the input file through this interface.
 
    * Supports PK, VF, PostScript Type1, and TrueType fonts, subfonts
      (i.e., as used in CJK-LaTeX), color specials, and inclusion of
@@ -87,23 +87,22 @@ latex2html and WYSIWYG editors like LyX.
 
    * and more...
 
-
 
 File: dvipng.info,  Node: Installation,  Next: Basic usage,  Prev: Introduction,  Up: Top
 
 2 Installation
 **************
 
-Installing dvipng should be simple: merely `./configure', `make', and
-`make install'.
+Installing dvipng should be simple: merely './configure', 'make', and
+'make install'.
 
 * Menu:
 
-* Prerequisites::
-* Configure::
-* Build/install::
+* Prerequisites::               
+* Configure::                   
+* Build/install::               
 * Installation outside the texmf tree::
-* Advice for non-privileged users::
+* Advice for non-privileged users::  
 
 
 File: dvipng.info,  Node: Prerequisites,  Next: Configure,  Up: Installation
@@ -113,35 +112,35 @@ File: dvipng.info,  Node: Prerequisites,  Next: Configure,  Up: Installation
 
    * The GD Graphics Draw library, libgd
 
-     The drawing library `libgd' is necessary, and is downloadable at
-     `http://www.boutell.com/gd', and there are binary packages for
-     most operating systems from their respective distributors. In any
-     case, the latest version of the library installs using `autoconf'
-     so it should not be difficult for you to install it from source,
-     and then proceed with installing dvipng.
+     The drawing library 'libgd' is necessary, and is downloadable at
+     <http://www.boutell.com/gd>, and there are binary packages for most
+     operating systems from their respective distributors.  In any case,
+     the latest version of the library installs using 'autoconf' so it
+     should not be difficult for you to install it from source, and then
+     proceed with installing dvipng.
 
    * The path-searching library kpathsea
 
      Kpathsea is most likely included in your LaTeX installation, but it
-     may happen that ./configure does not find it; see below. If you do
-     not have it, download it from `http://www.ctan.org' and compile it.
+     may happen that ./configure does not find it; see below.  If you do
+     not have it, download it from <http://www.ctan.org> and compile it.
      I have no experience with this, so I cannot help much here.
 
    * The font-rendering library FreeType 2
 
      While not strictly necessary, a recent FreeType 2 is recommended
-     since dvipng currently will produce better-quality images when
-     this library is available. To take advantage of this, you should
-     have at least FreeType 2.1.9.
+     since dvipng currently will produce better-quality images when this
+     library is available.  To take advantage of this, you should have
+     at least FreeType 2.1.9.
 
      FreeType 2 will enable direct support for PostScript and TrueType
      fonts, so that dvipng will not need to generate bitmapped variants
      on disk of the TeX fonts since modern TeX distributions include
-     PostScript versions of them. Then, you can render images at
+     PostScript versions of them.  Then, you can render images at
      different (and unusual) resolutions without cluttering the disk
      with lots of bitmapped fonts.
 
-     Finally, it will enable subfont support in dvipng. That is, if you
+     Finally, it will enable subfont support in dvipng.  That is, if you
      want to render CJK-LaTeX characters, you must have FreeType 2
      installed.
 
@@ -151,17 +150,17 @@ File: dvipng.info,  Node: Prerequisites,  Next: Configure,  Up: Installation
      PostScript fonts in dvipng and will not include subfont support.
      Also here, you can render images at different (and unusual)
      resolutions without cluttering the disk with lots of bitmapped
-     fonts. If both FreeType 2 and T1lib are present, FreeType will be
+     fonts.  If both FreeType 2 and T1lib are present, FreeType will be
      internally preferred by dvipng but T1lib can be chosen at runtime.
 
    * libpng and libz
 
      To be able to compress and write PNG files to disk, dvipng (or
-     really libgd) uses libpng which in turn uses libz. These should be
+     really libgd) uses libpng which in turn uses libz.  These should be
      available on any modern system, if not, download them and install
      them.
 
-   * The `texinfo' package
+   * The 'texinfo' package
 
      This is needed for building the documentation.
 
@@ -171,32 +170,32 @@ File: dvipng.info,  Node: Configure,  Next: Build/install,  Prev: Prerequisites,
 2.2 Configure
 =============
 
-The first step is to configure the source code, telling it where
-various files will be.  To do so, run
+The first step is to configure the source code, telling it where various
+files will be.  To do so, run
 
      ./configure OPTIONS
 
    (Note: if you have fetched dvipng from CVS rather than a regular
-release, you will have to first generate `./configure' by running
-`autoconf' 2.53 or later.)
+release, you will have to first generate './configure' by running
+'autoconf' 2.53 or later.)
 
    On many machines, you will not need to specify any options, but if
-`configure' cannot determine something on its own, you'll need to help
-it out. For a list of the options type
+'configure' cannot determine something on its own, you'll need to help
+it out.  For a list of the options type
 
      ./configure --help
 
    On some machines, the libraries will be installed in directories that
-are not in the linker's search path. This will generate an error when
-running `./configure', indicating that it cannot find libgd or
-libkpathsea (most likely). You then need to specify the path to the
-respective library's object files. They are typically called e.g.,
-`libgd.a' or `libgd.so'. If they are located in e.g., `/sw/local/lib',
+are not in the linker's search path.  This will generate an error when
+running './configure', indicating that it cannot find libgd or
+libkpathsea (most likely).  You then need to specify the path to the
+respective library's object files.  They are typically called e.g.,
+'libgd.a' or 'libgd.so'.  If they are located in e.g., '/sw/local/lib',
 do
 
      ./configure LDFLAGS=-L/sw/local/lib
 
-   If the library is available as a shared object file (`.so'), the
+   If the library is available as a shared object file ('.so'), the
 runtime linker may also need to be told where to find the library, then
 use
 
@@ -204,11 +203,11 @@ use
 
    When either of these is necessary, it is likely that the C header
 files are also installed in directories that are not in the C
-preprocessor's search path. This will also generate an error when
-running `./configure', indicating that it cannot find e.g., `gd.h' or
-`kpathsea.h' (most likely). You then need to specify the path to the
-respective library's C header files. If they are located in e.g.,
-`/sw/local/include', do
+preprocessor's search path.  This will also generate an error when
+running './configure', indicating that it cannot find e.g., 'gd.h' or
+'kpathsea.h' (most likely).  You then need to specify the path to the
+respective library's C header files.  If they are located in e.g.,
+'/sw/local/include', do
 
      ./configure CPPFLAGS=-I/sw/local/include
 
@@ -225,7 +224,7 @@ File: dvipng.info,  Node: Build/install,  Next: Installation outside the texmf t
 2.3 Build/install
 =================
 
-Once `configure' has been run, simply enter
+Once 'configure' has been run, simply enter
 
      make
 
@@ -243,14 +242,13 @@ File: dvipng.info,  Node: Installation outside the texmf tree,  Next: Advice for
 2.4 Installation outside the texmf tree
 =======================================
 
-In some cases, a dvipng binary installed outside the texmf tree will
-not be able to find virtual fonts, or the PostScript font maps
-(normally used by dvips). This may be because _only_ $SELFAUTOLOC,
-$SELFAUTODIR, and $SELFAUTOPARENT are used in the texmf tree
-configuration file `texmf.cnf'. If so, give the switch
-`--enable-selfauto-set' to `./configure'. This will make dvipng adjust
-these three internally so that kpathsea thinks that dvipng _is_
-installed in the texmf tree.
+In some cases, a dvipng binary installed outside the texmf tree will not
+be able to find virtual fonts, or the PostScript font maps (normally
+used by dvips).  This may be because _only_ $SELFAUTOLOC, $SELFAUTODIR,
+and $SELFAUTOPARENT are used in the texmf tree configuration file
+'texmf.cnf'.  If so, give the switch '--enable-selfauto-set' to
+'./configure'.  This will make dvipng adjust these three internally so
+that kpathsea thinks that dvipng _is_ installed in the texmf tree.
 
 
 File: dvipng.info,  Node: Advice for non-privileged users,  Prev: Installation outside the texmf tree,  Up: Installation
@@ -259,18 +257,18 @@ File: dvipng.info,  Node: Advice for non-privileged users,  Prev: Installation o
 =========================================
 
 Often people without system administration privileges want to install
-software for their private use. In that case you need to specify more
-options to the `configure' script, usually this is done by using the
-`--prefix' option to the `configure' script, and let it point to the
-personal home directory. In that way, resulting binaries will be
-installed under the `bin' subdirectory of your home directory, manual
-pages under `man' and so on. That way, it is reasonably easy to
+software for their private use.  In that case you need to specify more
+options to the 'configure' script, usually this is done by using the
+'--prefix' option to the 'configure' script, and let it point to the
+personal home directory.  In that way, resulting binaries will be
+installed under the 'bin' subdirectory of your home directory, manual
+pages under 'man' and so on.  That way, it is reasonably easy to
 maintain a bunch of additional packages, since the prefix argument is
-supported by most `configure' scripts.
+supported by most 'configure' scripts.
 
-   You'll have to add something like `/home/myself/bin' to your `PATH'
+   You'll have to add something like '/home/myself/bin' to your 'PATH'
 shell variable, if it isn't there already, and similarly set the
-`INFOPATH' and `MANPATH' variables to be able to access the
+'INFOPATH' and 'MANPATH' variables to be able to access the
 documentation.
 
 
@@ -283,21 +281,20 @@ To use dvipng at its simplest, simply type
 
      dvipng foo
 
-where `foo.dvi' is the output of TeX that you want to convert to PNG
-format. If there are four pages in `foo.dvi', those pages will be
-output as `foo1.png', `foo2.png', `foo3.png', and `foo4.png',
+where 'foo.dvi' is the output of TeX that you want to convert to PNG
+format.  If there are four pages in 'foo.dvi', those pages will be
+output as 'foo1.png', 'foo2.png', 'foo3.png', and 'foo4.png',
 respectively.
 
    If you have enabled the PostScript font support (via FreeType or
-T1lib), fonts will be rendered as they are needed. Otherwise, dvipng
+T1lib), fonts will be rendered as they are needed.  Otherwise, dvipng
 will use bitmapped (PK) fonts, and if you use PK fonts that have not
 been used on your system before, they may be automatically generated;
 this process can take a few minutes, so progress reports appear by
-default. The next time the same font is used, it will have been saved
-on disk, so rendering will go much faster. (If dvipng tries to
+default.  The next time the same font is used, it will have been saved
+on disk, so rendering will go much faster.  (If dvipng tries to
 endlessly generate the same fonts over and over again, something is
-wrong. *Note Unable to generate fonts: (kpathsea)Unable to generate
-fonts.)
+wrong.  *Note (kpathsea)Unable to generate fonts::.)
 
    Many options are available (see the next section).  For a brief
 summary of available options, just type
@@ -315,7 +312,7 @@ section will give a good idea of the capabilities of the driver.
 
 * Menu:
 
-* Option summary::              Quick listing, from dvipng --help.
+* Option summary::              Quick listing, from dvipng -help.
 * Option details::              More information about each option.
 
 
@@ -325,7 +322,7 @@ File: dvipng.info,  Node: Option summary,  Next: Option details,  Up: Command-li
 ==================
 
 Here is a handy summary of the options; it is printed out when you run
-dvipng with no arguments or with the standard `--help' option.
+dvipng with no arguments or with the standard '--help' option.
 
      This is ./dvipng 1.14 Copyright 2002-2010 Jan-Ake Larsson
 
@@ -362,7 +359,6 @@ dvipng with no arguments or with the standard `--help' option.
        --picky      When a warning occurs, don't output image
        --png        Output PNG images (dvipng default)
        --strict     When a warning occurs, exit
-       --t1lib*     T1lib font rendering (default on)
        --truecolor* Truecolor output
        -Q #         Quality (T1lib and PK subsampling)
        --width*     Output the image width on stdout
@@ -378,325 +374,322 @@ File: dvipng.info,  Node: Option details,  Prev: Option summary,  Up: Command-li
 ==================
 
 Many of the parameterless options listed here can be turned off by
-suffixing the option with a zero (`0'); for instance, to turn off page
-reversal, use `-r0'.  Such options are marked with a trailing `*'.
+suffixing the option with a zero ('0'); for instance, to turn off page
+reversal, use '-r0'.  Such options are marked with a trailing '*'.
 
-`-'
+'-'
      Read additional options from standard input after processing the
      command line.
 
-`--help'
+'--help'
      Print a usage message and exit.
 
-`--version'
+'--version'
      Print the version number and exit.
 
-`-bd NUM'
-
-`-bd COLOR_SPEC'
-
-`-bd 'NUM COLOR_SPEC''
-     Set the pixel width of the transparent border (default 0). Using
+'-bd NUM'
+'-bd COLOR_SPEC'
+'-bd 'NUM COLOR_SPEC''
+     Set the pixel width of the transparent border (default 0).  Using
      this option will make the image edges transparent, but it only
-     affects pixels with the background color. Giving a COLOR_SPEC will
+     affects pixels with the background color.  Giving a COLOR_SPEC will
      set the fallback color, to be used in viewers that cannot handle
-     transparency (the default is the background color). The color spec
+     transparency (the default is the background color).  The color spec
      should be in TeX color \special syntax, e.g., 'rgb 1.0 0.0 0.0'.
      Setting the fallback color makes the default border width 1 px.
      *Note Color::.
 
-`--bdpi NUM'
-     This option only has an effect when using bitmapped (PK) fonts. The
-     option sets the base (Metafont) resolution, both horizontal and
-     vertical, to NUM dpi (dots per inch). This option is necessary
+'--bdpi NUM'
+     This option only has an effect when using bitmapped (PK) fonts.
+     The option sets the base (Metafont) resolution, both horizontal and
+     vertical, to NUM dpi (dots per inch).  This option is necessary
      when manually selecting Metafont mode with the -mode option (see
      below).
 
-`-bg COLOR_SPEC'
-     Choose background color for the images. This option will be
+'-bg COLOR_SPEC'
+     Choose background color for the images.  This option will be
      ignored if there is a background color \special in the DVI. The
      color spec should be in TeX color \special syntax, e.g., 'rgb 1.0
-     0.0 0.0'. You can also specify 'Transparent' or 'transparent'
+     0.0 0.0'.  You can also specify 'Transparent' or 'transparent'
      which will give you a transparent background with the normal
-     background as a fallback color. A capitalized 'Transparent' will
+     background as a fallback color.  A capitalized 'Transparent' will
      give a full-alpha transparency, while an all-lowercase
      'transparent' will give a simple fully transparent background with
-     non-transparent antialiased pixels. The latter would be suitable
+     non-transparent antialiased pixels.  The latter would be suitable
      for viewers who cannot cope with a true alpha channel.  GIF images
      do not support full alpha transparency, so in case of GIF output,
      both variants will use the latter behaviour.  *Note Color::.
 
-`-d NUM'
+'-d NUM'
      Set the debug flags, showing what dvipng (thinks it) is doing.
-     This will work unless dvipng has been compiled without the `DEBUG'
-     option (not recommended). Set the flags as you need them, use `-d
-     -1' as the first option for maximum output. *Note Debug options::.
+     This will work unless dvipng has been compiled without the 'DEBUG'
+     option (not recommended).  Set the flags as you need them, use '-d
+     -1' as the first option for maximum output.  *Note Debug options::.
 
-`-D NUM'
-     Set the output resolution, both horizontal and vertical, to NUM
-     dpi (dots per inch).
+'-D NUM'
+     Set the output resolution, both horizontal and vertical, to NUM dpi
+     (dots per inch).
 
      One may want to adjust this to fit a certain text font size (e.g.,
      on a web page), and for a text font height of FONT_PX pixels (in
      Mozilla) the correct formula is
           DPI = FONT_PX * 72.27 / 10 [px * TeXpt/in / TeXpt]
      The last division by ten is due to the standard font height 10pt in
-     your document, if you use 12pt, divide by 12. Unfortunately, some
+     your document, if you use 12pt, divide by 12.  Unfortunately, some
      proprietary browsers have font height in pt (points), not pixels.
      You have to rescale that to pixels, using the screen resolution
      (default is usually 96 dpi) which means the formula is
           FONT_PX = FONT_PT * 96 / 72 [pt * px/in / (pt/in)]
-     On some high-res screens, the value is instead 120 dpi. Good luck!
+     On some high-res screens, the value is instead 120 dpi.  Good luck!
 
-`--depth*'
-     Report the depth of the image. This only works reliably when the
-     LaTeX style `preview.sty' from preview-latex is used with the
-     `active' option. It reports the number of pixels from the bottom
-     of the image to the baseline of the image. This can be used for
+'--depth*'
+     Report the depth of the image.  This only works reliably when the
+     LaTeX style 'preview.sty' from preview-latex is used with the
+     'active' option.  It reports the number of pixels from the bottom
+     of the image to the baseline of the image.  This can be used for
      vertical positioning of the image in, e.g., web documents, where
      one would use (Cascading StyleSheets 1)
           <IMG SRC="FILENAME.PNG" STYLE="vertical-align: -DEPTHpx">
      The depth is a negative offset in this case, so the minus sign is
      necessary, and the unit is pixels (px).
 
-`--dvinum*'
+'--dvinum*'
      Set this option to make the output page number be the TeX page
-     numbers rather than the physical page number. See the `-o' switch.
+     numbers rather than the physical page number.  See the '-o' switch.
 
-`-fg COLOR_SPEC'
-     Choose foreground color for the images. This option will be
+'-fg COLOR_SPEC'
+     Choose foreground color for the images.  This option will be
      ignored if there is a foreground color \special in the DVI. The
      color spec should be in TeX color \special syntax, e.g., 'rgb 1.0
      0.0 0.0'.  *Note Color::.
 
-`--follow*'
-     Wait for data at end-of-file. One of the benefits of dvipng is
+'--follow*'
+     Wait for data at end-of-file.  One of the benefits of dvipng is
      that it does not read the postamble, so it can be started before
-     TeX finishes. This switch makes dvipng wait at end-of-file for
+     TeX finishes.  This switch makes dvipng wait at end-of-file for
      further output, unless it finds the POST marker that indicates the
-     end of the DVI. This is similar to `tail -f' but for DVI-to-PNG
+     end of the DVI. This is similar to 'tail -f' but for DVI-to-PNG
      conversion.
 
-`--freetype*'
-     Enable/disable FreeType font rendering (default on). This option is
-     available if the FreeType2 font library was present at compilation
-     time.  If this is the case, dvipng will have direct support for
-     PostScript Type1 and TrueType fonts internally, rather than using
-     `gsftopk' for rendering the fonts. If you have PostScript versions
-     of Computer Modern installed, there will be no need to generate
-     bitmapped (PK) variants on disk of these. Then, you can render
-     images at different (and unusual) resolutions without cluttering
-     the disk with lots of bitmapped fonts.  Note that if you have both
-     FreeType and T1lib on your system, FreeType will be preferred by
-     dvipng. If you for some reason would want to use T1lib rendering,
-     use this option.
-
-`--gamma NUM'
+'--freetype*'
+     Enable/disable FreeType font rendering (default on).  This option
+     is available if the FreeType2 font library was present at
+     compilation time.  If this is the case, dvipng will have direct
+     support for PostScript Type1 and TrueType fonts internally, rather
+     than using 'gsftopk' for rendering the fonts.  If you have
+     PostScript versions of Computer Modern installed, there will be no
+     need to generate bitmapped (PK) variants on disk of these.  Then,
+     you can render images at different (and unusual) resolutions
+     without cluttering the disk with lots of bitmapped fonts.  Note
+     that if you have both FreeType and T1lib on your system, FreeType
+     will be preferred by dvipng.  If you for some reason would want to
+     use T1lib rendering, use this option.
+
+'--gamma NUM'
      Control the interpolation of colors in the greyscale anti-aliasing
      color palette.  Default value is 1.0.  For 0 < NUM < 1, the fonts
      will be lighter (more like the background), and for NUM > 1, the
      fonts will be darker (more like the foreground).
 
-`--gif*'
+'--gif*'
      The images are output in the GIF format, if GIF support is enabled.
-     This is the default for the `dvigif' binary, which only will be
-     available when GIF support is enabled. GIF images are palette
-     images (see the `--palette' option) and does not support true alpha
-     channels (see the `--bg' option). See also the `--png' option.
-
-`--height*'
-     Report the height of the image. This only works reliably when the
-     LaTeX style `preview.sty' from preview-latex is used with the
-     `active' option. It reports the number of pixels from the top of
-     the image to the baseline of the image. The total height of the
-     image is obtained as the sum of the values reported from
-     `--height' and `--depth'.
-
-`-l [=]NUM'
-     The last page printed will be the first one numbered NUM. Default
+     This is the default for the 'dvigif' binary, which only will be
+     available when GIF support is enabled.  GIF images are palette
+     images (see the '--palette' option) and does not support true alpha
+     channels (see the '--bg' option).  See also the '--png' option.
+
+'--height*'
+     Report the height of the image.  This only works reliably when the
+     LaTeX style 'preview.sty' from preview-latex is used with the
+     'active' option.  It reports the number of pixels from the top of
+     the image to the baseline of the image.  The total height of the
+     image is obtained as the sum of the values reported from '--height'
+     and '--depth'.
+
+'-l [=]NUM'
+     The last page printed will be the first one numbered NUM.  Default
      is the last page in the document.  If NUM is prefixed by an equals
-     sign, then it (and the argument to the `-p' option, if specified)
+     sign, then it (and the argument to the '-p' option, if specified)
      is treated as a physical (absolute) page number, rather than a
-     value to compare with the TeX `\count0' values stored in the DVI
-     file.  Thus, using `-l =9' will end with the ninth page of the
+     value to compare with the TeX '\count0' values stored in the DVI
+     file.  Thus, using '-l =9' will end with the ninth page of the
      document, no matter what the pages are actually numbered.
 
-`--mode MODE'
-     This option only has an effect when using bitmapped (PK) fonts. Use
-     MODE as the Metafont device name for the PK fonts (both for path
-     searching and font generation). This needs to be augmented with
-     the base device resolution, given with the `--bdpi' option. See
-     the file `ftp://ftp.tug.org/tex/modes.mf' for a list of
-     resolutions and mode names for most devices. *Note Unable to
-     generate fonts: (kpathsea)Unable to generate fonts.
+'--mode MODE'
+     This option only has an effect when using bitmapped (PK) fonts.
+     Use MODE as the Metafont device name for the PK fonts (both for
+     path searching and font generation).  This needs to be augmented
+     with the base device resolution, given with the '--bdpi' option.
+     See the file <ftp://ftp.tug.org/tex/modes.mf> for a list of
+     resolutions and mode names for most devices.  *Note
+     (kpathsea)Unable to generate fonts::.
 
-`-M*'
-     This option only has an effect when using bitmapped (PK) fonts. It
-     turns off automatic PK font generation (`mktexpk').
+'-M*'
+     This option only has an effect when using bitmapped (PK) fonts.  It
+     turns off automatic PK font generation ('mktexpk').
 
-`--nogs*'
+'--nogs*'
      This switch prohibits the internal call to GhostScript for
-     displaying PostScript specials. `--nogs0' turns the call back on.
+     displaying PostScript specials.  '--nogs0' turns the call back on.
 
-`--nogssafer*'
+'--nogssafer*'
      Normally, if GhostScript is used to render PostScript specials, the
-     GhostScript interpreter is run with the option `-dSAFER'. The
-     `--nogssafer' option runs GhostScript without `-dSAFER'. The
-     `-dSAFER' option in Ghostscript disables PostScript operators such
+     GhostScript interpreter is run with the option '-dSAFER'.  The
+     '--nogssafer' option runs GhostScript without '-dSAFER'.  The
+     '-dSAFER' option in Ghostscript disables PostScript operators such
      as deletefile, to prevent possibly malicious PostScript programs
      from having any effect.
 
-`--norawps*'
+'--norawps*'
      Some packages generate raw PostScript specials, even non-rendering
      such specials.  This switch turns off the internal call to
      GhostScript intended to display these raw PostScript specials.
-     `--norawps0' turns the call back on.
+     '--norawps0' turns the call back on.
 
-`-o NAME'
-     Send output to the file NAME. A single occurrence of `%d' or
-     `%01d', ..., `%09d' will be exchanged for the physical page number
-     (this can be changed, see the `--dvinum' switch). The default
-     output filename is `FILE%d.png' where the input DVI file was
-     `FILE.dvi'.
+'-o NAME'
+     Send output to the file NAME.  A single occurrence of '%d' or
+     '%01d', ..., '%09d' will be exchanged for the physical page number
+     (this can be changed, see the '--dvinum' switch).  The default
+     output filename is 'FILE%d.png' where the input DVI file was
+     'FILE.dvi'.
 
-`-O X-OFFSET,Y-OFFSET'
+'-O X-OFFSET,Y-OFFSET'
      Move the origin by X-OFFSET,Y-OFFSET, a comma-separated pair of
-     dimensions such as `.1in,-.3cm'.  The origin of the page is
-     shifted from the default position (of one inch down, one inch to
-     the right from the upper left corner of the paper) by this amount.
-
-`-p [=]NUM'
-     The first page printed will be the first one numbered NUM. Default
-     is the first page in the document.  If NUM is prefixed by an
-     equals sign, then it (and the argument to the `-l' option, if
-     specified) is treated as a physical (absolute) page number, rather
-     than a value to compare with the TeX `\count0' values stored in the
-     DVI file.  Thus, using `-p =3' will start with the third page of
-     the document, no matter what the pages are actually numbered.
-
-`--palette*'
-     When an external image is included, `dvipng' will automatically
+     dimensions such as '.1in,-.3cm'.  The origin of the page is shifted
+     from the default position (of one inch down, one inch to the right
+     from the upper left corner of the paper) by this amount.
+
+'-p [=]NUM'
+     The first page printed will be the first one numbered NUM.  Default
+     is the first page in the document.  If NUM is prefixed by an equals
+     sign, then it (and the argument to the '-l' option, if specified)
+     is treated as a physical (absolute) page number, rather than a
+     value to compare with the TeX '\count0' values stored in the DVI
+     file.  Thus, using '-p =3' will start with the third page of the
+     document, no matter what the pages are actually numbered.
+
+'--palette*'
+     When an external image is included, 'dvipng' will automatically
      switch to truecolor mode, to avoid unnecessary delay and quality
      reduction, and enable the EPS translator to draw on a transparent
-     background and outside of the boundingbox. This switch will force
-     palette (256-color) output and make `dvipng' revert to opaque
-     clipped image inclusion. This will also override the `--truecolor'
+     background and outside of the boundingbox.  This switch will force
+     palette (256-color) output and make 'dvipng' revert to opaque
+     clipped image inclusion.  This will also override the '--truecolor'
      switch if present.
 
-`--picky*'
-     No images are output when a warning occurs. Normally, dvipng will
+'--picky*'
+     No images are output when a warning occurs.  Normally, dvipng will
      output an image in spite of a warning, but there may be something
-     missing in this image. One reason to use this option would be if
-     you have a more complete but slower fallback converter. Mainly,
+     missing in this image.  One reason to use this option would be if
+     you have a more complete but slower fallback converter.  Mainly,
      this is useful for failed figure inclusion and unknown \special
      occurrences, but warnings will also occur for missing or unknown
      color specs and missing PK fonts.
 
-`--png*'
-     The images are output in the PNG format. This is the default for
-     the `dvipng' binary. See also the `--gif' option.
+'--png*'
+     The images are output in the PNG format.  This is the default for
+     the 'dvipng' binary.  See also the '--gif' option.
 
-`-pp FIRSTPAGE-LASTPAGE'
-     Print pages FIRSTPAGE through LASTPAGE; but not quite equivalent
-     to `-p FIRSTPAGE -l LASTPAGE'. For example, when rendering a book,
+'-pp FIRSTPAGE-LASTPAGE'
+     Print pages FIRSTPAGE through LASTPAGE; but not quite equivalent to
+     '-p FIRSTPAGE -l LASTPAGE'.  For example, when rendering a book,
      there may be several instances of a page in the DVI file (one in
-     `\frontmatter', one in `\mainmatter', and one in `\backmatter').
-     In case of several pages matching, `-pp FIRSTPAGE-LASTPAGE' will
-     render _all_ pages that matches the specified range, while `-p
+     '\frontmatter', one in '\mainmatter', and one in '\backmatter').
+     In case of several pages matching, '-pp FIRSTPAGE-LASTPAGE' will
+     render _all_ pages that matches the specified range, while '-p
      FIRSTPAGE -l LASTPAGE' will render the pages from the _first_
      occurrence of FIRSTPAGE to the _first_ occurrence of LASTPAGE.
-     This is the (undocumented) behaviour of dvips. In dvipng you can
+     This is the (undocumented) behaviour of dvips.  In dvipng you can
      give both kinds of options, in which case you get all pages that
-     matches the range in `-pp' between the pages from `-p' to `-l'.
-     Also multiple `-pp' options accumulate, unlike `-p' and `-l'.  The
-     `-' separator can also be `:'. Note that `-pp -1' will be
+     matches the range in '-pp' between the pages from '-p' to '-l'.
+     Also multiple '-pp' options accumulate, unlike '-p' and '-l'.  The
+     '-' separator can also be ':'.  Note that '-pp -1' will be
      interpreted as "all pages up to and including 1", if you want a
-     page numbered -1 (only the table of contents, say) put `-pp -1--1',
-     or more readable, `-pp -1:-1'.
+     page numbered -1 (only the table of contents, say) put '-pp -1--1',
+     or more readable, '-pp -1:-1'.
 
-`-q*'
+'-q*'
      Run quietly.  Don't chatter about pages converted, etc. to standard
      output; report no warnings (only errors) to standard error.
 
-`-Q NUM'
-     Set the quality to NUM. That is, choose the number of antialiasing
+'-Q NUM'
+     Set the quality to NUM.  That is, choose the number of antialiasing
      levels for bitmapped fonts (PK) and fonts rendered using T1lib, to
-     be NUM*NUM+1. The default value is 4 which gives 17 levels of
-     antialiasing for antialiased fonts from these two. If FreeType is
+     be NUM*NUM+1.  The default value is 4 which gives 17 levels of
+     antialiasing for antialiased fonts from these two.  If FreeType is
      available, its rendering is unaffected by this option.
 
-`-r*'
-     Toggle output of pages in reverse/forward order. By default, the
+'-r*'
+     Toggle output of pages in reverse/forward order.  By default, the
      first page in the DVI is output first.
 
-`--strict*'
-     The program exits when a warning occurs. Normally, dvipng will
+'--strict*'
+     The program exits when a warning occurs.  Normally, dvipng will
      output an image in spite of a warning, but there may be something
-     missing in this image. One reason to use this option would be if
-     you have a more complete but slower fallback converter. See the
-     `--picky' option above for a list of when warnings occur.
-
-`-T IMAGE_SIZE'
-     Set the image size to IMAGE_SIZE which can be either of `bbox',
-     `tight', or a comma-separated pair of dimensions HSIZE,VSIZE such
-     as `.1in,.3cm'. The default is `bbox' which produces a PNG that
+     missing in this image.  One reason to use this option would be if
+     you have a more complete but slower fallback converter.  See the
+     '--picky' option above for a list of when warnings occur.
+
+'-T IMAGE_SIZE'
+     Set the image size to IMAGE_SIZE which can be either of 'bbox',
+     'tight', or a comma-separated pair of dimensions HSIZE,VSIZE such
+     as '.1in,.3cm'.  The default is 'bbox' which produces a PNG that
      includes all ink put on the page and in addition the DVI origin,
      located 1in from the top and 1in from the left edge of the paper.
-     This usually gives whitespace above and to the left in the
-     produced image. The value `tight' will make dvipng only include
-     all ink put on the page, producing neat images.
+     This usually gives whitespace above and to the left in the produced
+     image.  The value 'tight' will make dvipng only include all ink put
+     on the page, producing neat images.
 
-`--t1lib*'
-     Enable T1lib font rendering (default on). This option is available
-     if the T1lib font library was present at compilation time. If this
+'--t1lib*'
+     Enable T1lib font rendering (default on).  This option is available
+     if the T1lib font library was present at compilation time.  If this
      is the case, dvipng will have direct support for PostScript Type1
-     fonts internally, rather than using `gsftopk' for rendering the
-     fonts. If you have PostScript versions of Computer Modern
+     fonts internally, rather than using 'gsftopk' for rendering the
+     fonts.  If you have PostScript versions of Computer Modern
      installed, there will be no need to generate bitmapped variants on
      disk of these.  Then, you can render images at different (and
      unusual) resolutions without cluttering the disk with lots of
-     bitmapped fonts. Note that if you have both FreeType and T1lib on
+     bitmapped fonts.  Note that if you have both FreeType and T1lib on
      your system, FreeType will be preferred by dvipng, and if you for
-     some reason rather want to use T1lib, give the option
-     `--freetype0' (see above).
+     some reason rather want to use T1lib, give the option '--freetype0'
+     (see above).
 
-`--truecolor*'
-     This will make `dvipng' generate truecolor output. Note that
+'--truecolor*'
+     This will make 'dvipng' generate truecolor output.  Note that
      truecolor output is automatic if you include an external image in
-     your DVI, e.g., via a PostScript special (i.e., the `graphics' or
-     `graphicx' package). This switch is overridden by the `--palette'
+     your DVI, e.g., via a PostScript special (i.e., the 'graphics' or
+     'graphicx' package).  This switch is overridden by the '--palette'
      switch.
 
-`-v*'
-     Enable verbose operation. This will currently indicate what fonts
+'-v*'
+     Enable verbose operation.  This will currently indicate what fonts
      is used, in addition to the usual output.
 
-`--width*'
-     Report the width of the image. See also `--height' and `--depth'.
+'--width*'
+     Report the width of the image.  See also '--height' and '--depth'.
 
-`-x NUM'
-     This option is deprecated; it should not be used. It is much
-     better to select the output resolution directly with the `-D'
-     option. This option sets the magnification ratio to NUM/1000 and
+'-x NUM'
+     This option is deprecated; it should not be used.  It is much
+     better to select the output resolution directly with the '-D'
+     option.  This option sets the magnification ratio to NUM/1000 and
      overrides the magnification specified in the DVI file.  Must be
      between 10 and 100000.  It is recommended that you use standard
      magstep values (1095, 1200, 1440, 1728, 2074, 2488, 2986, and so
-     on) to help reduce the total number of PK files generated.  NUM
-     may be a real number, not an integer, for increased precision.
+     on) to help reduce the total number of PK files generated.  NUM may
+     be a real number, not an integer, for increased precision.
 
-`-z NUM'
-     Set the PNG compression level to NUM. This option is enabled if
-     your `libgd' is new enough. The default compression level is 1,
+'-z NUM'
+     Set the PNG compression level to NUM.  This option is enabled if
+     your 'libgd' is new enough.  The default compression level is 1,
      which selects maximum speed at the price of slightly larger PNGs.
-     For an older `libgd', the hard-soldered value 5 is used. The
-     include file `png.h' says
-
+     For an older 'libgd', the hard-soldered value 5 is used.  The
+     include file 'png.h' says
           Currently, valid values range from 0 - 9, corresponding
           directly to the zlib compression levels 0 - 9 (0 - no
-          compression, 9 - "maximal" compression). Note that tests have
-          shown that zlib compression levels 3-6 usually perform as
-          well as level 9 for PNG images, and do considerably fewer
-          calculations. In the future, these values may not correspond
+          compression, 9 - "maximal" compression).  Note that tests have
+          shown that zlib compression levels 3-6 usually perform as well
+          as level 9 for PNG images, and do considerably fewer
+          calculations.  In the future, these values may not correspond
           directly to the zlib compression levels.
 
 
@@ -705,12 +698,12 @@ File: dvipng.info,  Node: Graphics,  Next: Color,  Prev: Command-line options,
 5 Graphics
 **********
 
-`dvipng' attempts to handle graphics as included by the `graphicx' and
-`graphics' packages, without the need of specifying a driver to these
-packages. This means that it recognizes the encapsulated postscript
-inclusion meant for `dvips', but is also able (from version 1.8) to
-include bitmapped graphics. It also tries to handle some of the raw
-PostScript that is output from various packages. Some of the
+'dvipng' attempts to handle graphics as included by the 'graphicx' and
+'graphics' packages, without the need of specifying a driver to these
+packages.  This means that it recognizes the encapsulated postscript
+inclusion meant for 'dvips', but is also able (from version 1.8) to
+include bitmapped graphics.  It also tries to handle some of the raw
+PostScript that is output from various packages.  Some of the
 possibilities and problems are mentioned below.
 
 * Menu:
@@ -726,25 +719,25 @@ File: dvipng.info,  Node: Encapsulated PostScript,  Next: Bitmapped graphics,  U
 ===========================
 
 When an EPS file is included, a call to GhostScript is performed to
-produce a bitmapped image that can be included. The default is to
+produce a bitmapped image that can be included.  The default is to
 produce an image with transparent background, at the same size as the
 DVI page currently being converted to PNG, and include that as
-foreground on the PNG. Of course, if the image is to be cropped, that
-is done. The included image will be a truecolor image, so for maximum
+foreground on the PNG. Of course, if the image is to be cropped, that is
+done.  The included image will be a truecolor image, so for maximum
 performance the output PNG will be in truecolor mode as well.
 
-   This conversion needs the `pngalpha' output device to be present in
-your copy of GhostScript. If that device is not present, or you use the
-`--palette' switch or request GIF output, the fallback is to use the
-`png16m' device to produce a cropped opaque image for inclusion. Other
-relevant switches are `--noghostscript' and `--nogssafer'. *Note Option
+   This conversion needs the 'pngalpha' output device to be present in
+your copy of GhostScript.  If that device is not present, or you use the
+'--palette' switch or request GIF output, the fallback is to use the
+'png16m' device to produce a cropped opaque image for inclusion.  Other
+relevant switches are '--noghostscript' and '--nogssafer'.  *Note Option
 details::.
 
    The most common problem with including graphics is an incorrect
-bounding box. Complain to whoever wrote the software that generated the
-file if the bounding box is indeed incorrect. An adjusted boundingbox
-can be specified in the `\includegraphics' call, as in this example
-(using `graphicx'):
+bounding box.  Complain to whoever wrote the software that generated the
+file if the bounding box is indeed incorrect.  An adjusted boundingbox
+can be specified in the '\includegraphics' call, as in this example
+(using 'graphicx'):
 
      \includegraphics[bb=10 20 100 200]{imagename.eps}
 
@@ -754,11 +747,11 @@ File: dvipng.info,  Node: Bitmapped graphics,  Next: Raw PostScript,  Prev: Enca
 5.2 Bitmapped graphics
 ======================
 
-dvipng can include PNG, JPEG and GIF graphics. When including such
-images via `\includegraphics' you need to specify the bounding box
-since TeX itself cannot read them from the files in question.  The
-bounding box size should be given as `0 0 w h' in pixels, e.g., if the
-file `imagename.png' is 300x400 pixels, the inclusion would read
+dvipng can include PNG, JPEG and GIF graphics.  When including such
+images via '\includegraphics' you need to specify the bounding box since
+TeX itself cannot read them from the files in question.  The bounding
+box size should be given as '0 0 w h' in pixels, e.g., if the file
+'imagename.png' is 300x400 pixels, the inclusion would read
 
      \includegraphics[bb=0 0 300 400]{imagename.png}
 
@@ -768,10 +761,10 @@ That is, default resolution will be 72 dpi for included bitmaps, which
 is the default size in the few other bitmap-capable drivers that are
 known to me (dvipdfm and PDFLaTeX).
 
-   If you want 100 dpi you need to specify the width accordingly. You
+   If you want 100 dpi you need to specify the width accordingly.  You
 just divide your image width by 100: a 135 pixel wide image at 100 dpi
-will take up 1.35 inches. If you want 200 dpi you divide by 200, and so
-on. Simple, eh? The example above at 200 dpi would be 1.5 inches wide:
+will take up 1.35 inches.  If you want 200 dpi you divide by 200, and so
+on.  Simple, eh?  The example above at 200 dpi would be 1.5 inches wide:
 
      \includegraphics[bb=0 0 300 400,witdh=1.5in]{imagename.png}
 
@@ -781,40 +774,40 @@ File: dvipng.info,  Node: Raw PostScript,  Prev: Bitmapped graphics,  Up: Graphi
 5.3 Raw PostScript
 ==================
 
-dvipng attempts to handle raw PostScript. Rendering raw PostScript
+dvipng attempts to handle raw PostScript.  Rendering raw PostScript
 specials is done on top of the page by including a transparent image
-generated by the `pngalpha' device in GhostScript (automatically
-selecting `truecolor' mode in dvipng).
+generated by the 'pngalpha' device in GhostScript (automatically
+selecting 'truecolor' mode in dvipng).
 
    Included PostScript headers are respected, and if the header
-`tex.pro' is included, dvipng also throws in `color.pro' and
-`special.pro'. The package `xcolor' includes its own headers with color
+'tex.pro' is included, dvipng also throws in 'color.pro' and
+'special.pro'.  The package 'xcolor' includes its own headers with color
 names, and this is not only kept as a PostScript header, but is also
-read and interpreted by dvipng itself. An attempt is also made to
-respect the PGF header. The non-rendering specials from `hyperref' are
+read and interpreted by dvipng itself.  An attempt is also made to
+respect the PGF header.  The non-rendering specials from 'hyperref' are
 handled via some heuristics and do not give an error.
 
    Really rendering and moving things with raw PostScript specials is
-more troublesome. The \rotatebox macro serves as a good example. The
+more troublesome.  The \rotatebox macro serves as a good example.  The
 dvips driver of the graphicx package surrounds DVI glyphs with
 PostScript code so that after conversion by dvips, the glyphs (now
-themselves in PostScript) will be rotated in the desired way. dvipng
-does not handle this, at present. An attempt has been made to handle
-the rendering specials output by PGF (tikz), and also PSTricks. Some
+themselves in PostScript) will be rotated in the desired way.  dvipng
+does not handle this, at present.  An attempt has been made to handle
+the rendering specials output by PGF (tikz), and also PSTricks.  Some
 things work, but others do not.  This is especially clear when mixing
-PostScript and DVI rendering commands such as glyphs. dvipng cannot at
-present detect if PostScript code moves `currentpoint' or rotates the
-frame since GhostScript does not return such information. A
+PostScript and DVI rendering commands such as glyphs.  dvipng cannot at
+present detect if PostScript code moves 'currentpoint' or rotates the
+frame since GhostScript does not return such information.  A
 recommendation would be to produce images from these packages as EPS
 files and include them into your document in the standard manner.
 
    Another way to handle this would be to use a slower fallback (with
-dvips and gs, for example). If you want to disable raw PostScript
-handling in dvipng, use the switch `--norawps'.  This switch turns off
+dvips and gs, for example).  If you want to disable raw PostScript
+handling in dvipng, use the switch '--norawps'.  This switch turns off
 the internal call to GhostScript intended to display these raw
-PostScript specials. Further, when dvipng encounters raw PostScript and
-the gs call is turned off, it gives a warning. It is now possible to
-use the switch `--picky' to disable page rendering of pages with
+PostScript specials.  Further, when dvipng encounters raw PostScript and
+the gs call is turned off, it gives a warning.  It is now possible to
+use the switch '--picky' to disable page rendering of pages with
 warnings, and use the slower fallback for these pages.
 
 
@@ -824,14 +817,14 @@ File: dvipng.info,  Node: Color,  Next: Diagnosing problems,  Prev: Graphics,  U
 *******
 
 To support color, dvipng recognizes a certain set of specials as
-generated by the `color' and `xcolor' style files. These specials start
-with the keyword `color' or the keyword `background', followed by a
+generated by the 'color' and 'xcolor' style files.  These specials start
+with the keyword 'color' or the keyword 'background', followed by a
 color specification.
 
 * Menu:
 
-* Color specifications::
-* Color specials::
+* Color specifications::        
+* Color specials::              
 
 
 File: dvipng.info,  Node: Color specifications,  Next: Color specials,  Up: Color
@@ -839,23 +832,23 @@ File: dvipng.info,  Node: Color specifications,  Next: Color specials,  Up: Colo
 6.1 Color specifications
 ========================
 
-The color specification supported by dvipng is by-value or by-name. The
-by-value spec starts with the name of a color model (one of `rgb',
-`hsb', `cmy', `cmyk', or `gray') followed by the appropriate number of
-parameters. Thus, the color specification `rgb 0.3 0.4 0.5' would
-correspond to the color that is `0.3 0.4 0.5' in its red, blue and
-green values. The color model used internally in dvipng is `RGB'
-(discretized to 256 levels), for details on the formulas used in
-conversion, see the `xcolor' documentation.
+The color specification supported by dvipng is by-value or by-name.  The
+by-value spec starts with the name of a color model (one of 'rgb',
+'hsb', 'cmy', 'cmyk', or 'gray') followed by the appropriate number of
+parameters.  Thus, the color specification 'rgb 0.3 0.4 0.5' would
+correspond to the color that is '0.3 0.4 0.5' in its red, blue and green
+values.  The color model used internally in dvipng is 'RGB' (discretized
+to 256 levels), for details on the formulas used in conversion, see the
+'xcolor' documentation.
 
    By-name color specifications are single (case-dependent) words and
-are compared with color names defined in `dvipsnam.def' (from the
-`graphics' bundle), `svgnam.def' and `xcolor.sty' (from the `xcolor'
-bundle). See the `xcolor' documentation for a list of names and the
+are compared with color names defined in 'dvipsnam.def' (from the
+'graphics' bundle), 'svgnam.def' and 'xcolor.sty' (from the 'xcolor'
+bundle).  See the 'xcolor' documentation for a list of names and the
 corresponding colors.
 
-   On the command-line, the name `Transparent' can also be used as an
-argument to `--bg' to choose transparent background.  *Note Option
+   On the command-line, the name 'Transparent' can also be used as an
+argument to '--bg' to choose transparent background.  *Note Option
 details::.
 
 
@@ -864,28 +857,27 @@ File: dvipng.info,  Node: Color specials,  Prev: Color specifications,  Up: Colo
 6.2 Color specials
 ==================
 
-We will describe `background' first, since it is the simplest. The
-`background' keyword must be followed by a color specification.  That
-color specification is used as a fill color for the background. The
-last `background' special on a page is the one that gets used, and is
-used for the whole of the page image. (This is possible because the
+We will describe 'background' first, since it is the simplest.  The
+'background' keyword must be followed by a color specification.  That
+color specification is used as a fill color for the background.  The
+last 'background' special on a page is the one that gets used, and is
+used for the whole of the page image.  (This is possible because the
 prescan phase of dvipng notices all of the color specials so that the
 appropriate information can be written out during the second phase.)
 
-   The `color' special itself has three forms. The first is just
-`color' followed by a color specification. In this case, the current
+   The 'color' special itself has three forms.  The first is just
+'color' followed by a color specification.  In this case, the current
 global color is set to that color; the color stack must be empty when
 such a command is executed.
 
-   The second form is `color push' followed by a color specification.
+   The second form is 'color push' followed by a color specification.
 This saves the current color on the color stack and sets the color to be
 that given by the color specification.  This is the most common way to
 set a color.
 
-   The final form of the `color' special is just `color pop', with no
-color specification; this says to pop the color last pushed on the
-color stack from the color stack and set the current color to be that
-color.
+   The final form of the 'color' special is just 'color pop', with no
+color specification; this says to pop the color last pushed on the color
+stack from the color stack and set the current color to be that color.
 
    dvipng correctly handles these color specials across pages, even when
 the pages are rendered repeatedly or in reverse order.
@@ -898,7 +890,7 @@ File: dvipng.info,  Node: Diagnosing problems,  Next: Credits,  Prev: Color,  Up
 
 You've gone through all the trouble of installing dvipng, carefully read
 all the instructions in this manual, and still can't get something to
-work. The following sections provide some helpful hints if you find
+work.  The following sections provide some helpful hints if you find
 yourself in such a situation.
 
 * Menu:
@@ -915,16 +907,16 @@ File: dvipng.info,  Node: Contact information,  Next: Debug options,  Up: Diagno
 Bug reports should be sent to <dvipng@nongnu.org>.
 
    Questions, suggestions for new features, pleas for help, and/or
-praise should go to <dvipng@nongnu.org>. For more information on this
-mailing list, send a message with just the word `help' as subject or
+praise should go to <dvipng@nongnu.org>.  For more information on this
+mailing list, send a message with just the word 'help' as subject or
 body to <dvipng-request@nongnu.org> or look at
-`http://lists.nongnu.org/mailman/listinfo/dvipng'.
+<http://lists.nongnu.org/mailman/listinfo/dvipng>.
 
-   Offers to support further development will be appreciated. For
+   Offers to support further development will be appreciated.  For
 developer access, ask on <dvipng@nongnu.org>.
 
-   For details on the TeX path-searching library, and `mktexpk'
-problems, *note Common problems: (kpathsea)Common problems.
+   For details on the TeX path-searching library, and 'mktexpk'
+problems, *note (kpathsea)Common problems::.
 
 
 File: dvipng.info,  Node: Debug options,  Prev: Contact information,  Up: Diagnosing problems
@@ -932,60 +924,46 @@ File: dvipng.info,  Node: Debug options,  Prev: Contact information,  Up: Diagno
 7.2 Debug options
 =================
 
-The `-d' flag to dvipng helps in tracking down certain errors.  The
+The '-d' flag to dvipng helps in tracking down certain errors.  The
 parameter to this flag is an integer that tells what errors are
 currently being tracked.  To track a certain class of debug messages,
 simply provide the appropriate number given below; if you wish to track
 multiple classes, sum the numbers of the classes you wish to track.  To
-track all classes, you can use `-1'.
+track all classes, you can use '-1'.
 
    Some of these debugging options are actually provided by Kpathsea
-(*note Debugging: (kpathsea)Debugging.).
+(*note (kpathsea)Debugging::).
 
    The classes are:
 1
      Normal dvi op-codes
-
 2
      Virtual fonts
-
 4
      PK fonts
-
 8
      TFM files
-
 16
      Glyph rendering
-
 32
      FreeType calls
-
 64
      Encoding loads
-
 128
      Color specials
-
 256
      GhostScript specials
-
 512
      T1lib calls
-
 1024
-     Kpathsea `stat' calls
-
+     Kpathsea 'stat' calls
 2048
      Kpathsea hash table lookups
-
 4096
      Kpathsea path element expansion
-
 8192
      Kpathsea path searches
 
-
 
 File: dvipng.info,  Node: Credits,  Next: Copying,  Prev: Diagnosing problems,  Up: Top
 
@@ -993,10 +971,10 @@ File: dvipng.info,  Node: Credits,  Next: Copying,  Prev: Diagnosing problems,
 *********
 
 A number of persons have contributed, if I forget to mention someone, I
-apologize. First and foremost we have David Kastrup whose preview-latex
+apologize.  First and foremost we have David Kastrup whose preview-latex
 project provided the incentive to write this program.  There is also a
 number of people who have contributed by reporting bugs and suggesting
-improvements as the thing has evolved. These include but is perhaps not
+improvements as the thing has evolved.  These include but is perhaps not
 limited to (in semi-random order): Thomas Esser (teTeX), Christian
 Schenk (MIKTeX), Brian R Furry (debian package), Angus Leeming (LyX),
 Thomas Boutell (libgd), John Jones (first user report), Uwe Kern
@@ -1009,11 +987,11 @@ Ridderstro"m, Ezra Peisach, William H Wheeler, Thomas Klausner, Harald
 Koenig, Adrian Bunk, Kevin Smith, Jason Riedy, Wolfram Krause, Reinhard
 Kotucha, Takeshi Abe, and Waldeck Schutzer.
 
-   Use of the `gd' library requires inclusion of the following
-copyright notice, which applies to the `gd' library:
+   Use of the 'gd' library requires inclusion of the following copyright
+notice, which applies to the 'gd' library:
 
      Portions copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-     2002, 2003, 2004 by Cold Spring Harbor Laboratory. Funded under
+     2002, 2003, 2004 by Cold Spring Harbor Laboratory.  Funded under
      Grant P41-RR02188 by the National Institutes of Health.
 
      Portions copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
@@ -1031,16 +1009,16 @@ copyright notice, which applies to the `gd' library:
      Portions relating to gdft.c copyright 2001, 2002, 2003, 2004 John
      Ellson (ellson@graphviz.org).
 
-     Portions relating to JPEG and to color quantization copyright
-     2000, 2001, 2002, 2003, 2004, Doug Becker and copyright (C) 1994,
-     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Thomas
-     G. Lane. This software is based in part on the work of the
-     Independent JPEG Group. See the file README-JPEG.TXT for more
+     Portions relating to JPEG and to color quantization copyright 2000,
+     2001, 2002, 2003, 2004, Doug Becker and copyright (C) 1994, 1995,
+     1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Thomas G.
+     Lane.  This software is based in part on the work of the
+     Independent JPEG Group.  See the file README-JPEG.TXT for more
      information.
 
      Portions relating to GIF compression copyright 1989 by Jef
-     Poskanzer and David Rowley, with modifications for thread safety
-     by Thomas Boutell.
+     Poskanzer and David Rowley, with modifications for thread safety by
+     Thomas Boutell.
 
      Portions relating to GIF decompression copyright 1990, 1991, 1993
      by David Koblas, with modifications for thread safety by Thomas
@@ -1049,19 +1027,19 @@ copyright notice, which applies to the `gd' library:
      Portions relating to WBMP copyright 2000, 2001, 2002, 2003, 2004
      Maurice Szmurlo and Johan Van den Brande.
 
-     Portions relating to GIF animations copyright 2004 Jaakko
-     Hyva"dtti (jaakko.hyvatti@iki.fi)
+     Portions relating to GIF animations copyright 2004 Jaakko Hyva"dtti
+     (jaakko.hyvatti@iki.fi)
 
      Permission has been granted to copy, distribute and modify gd in
      any context without fee, including a commercial application,
      provided that this notice is present in user-accessible supporting
      documentation.
 
-     This does not affect your ownership of the derived work itself,
-     and the intent is to assure proper credit for the authors of gd,
-     not to interfere with your productive use of gd. If you have
-     questions, ask. "Derived works" includes all programs that utilize
-     the library. Credit must be given in user-accessible documentation.
+     This does not affect your ownership of the derived work itself, and
+     the intent is to assure proper credit for the authors of gd, not to
+     interfere with your productive use of gd.  If you have questions,
+     ask.  "Derived works" includes all programs that utilize the
+     library.  Credit must be given in user-accessible documentation.
 
      This software is provided "AS IS." The copyright holders disclaim
      all warranties, either express or implied, including but not
@@ -1080,9 +1058,9 @@ File: dvipng.info,  Node: Copying,  Next: Index,  Prev: Credits,  Up: Top
 *********
 
 This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published
-by the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
    This program is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -1090,7 +1068,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
 General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-License along with this program. If not, see
+License along with this program.  If not, see
 <http://www.gnu.org/licenses/>.
 
 
@@ -1106,107 +1084,107 @@ Index
 
 * Menu:
 
-* -dSAFER:                               Option details.      (line 168)
-* absolute page number, and -l:          Option details.      (line 142)
-* absolute page number, and -p:          Option details.      (line 195)
-* antialiasing levels, number of:        Option details.      (line 248)
-* background color (option):             Option details.      (line  42)
-* base resolution, setting:              Option details.      (line  35)
-* baseline reporting:                    Option details.      (line  78)
+* -dSAFER:                               Option details.      (line 166)
+* absolute page number, and '-l':        Option details.      (line 140)
+* absolute page number, and '-p':        Option details.      (line 193)
+* antialiasing levels, number of:        Option details.      (line 246)
+* background color (option):             Option details.      (line  40)
+* base resolution, setting:              Option details.      (line  33)
+* baseline reporting:                    Option details.      (line  76)
+* baseline reporting <1>:                Option details.      (line 132)
 * color specifications:                  Color specifications.
                                                               (line   6)
 * command-line options:                  Command-line options.
                                                               (line   6)
 * compilation:                           Installation.        (line   6)
-* compression:                           Option details.      (line 314)
+* compression:                           Option details.      (line 312)
 * configuration, of dvipng:              Installation.        (line   6)
-* dark fonts:                            Option details.      (line 121)
+* dark fonts:                            Option details.      (line 119)
+* debugging:                             Option details.      (line  54)
 * debugging <1>:                         Diagnosing problems. (line   6)
-* debugging:                             Option details.      (line  56)
-* depth reporting:                       Option details.      (line  78)
-* exit on erroneous images:              Option details.      (line 259)
-* first page printed:                    Option details.      (line 195)
-* follow mode:                           Option details.      (line  99)
-* font generation, avoiding:             Option details.      (line 160)
-* forcing palette output:                Option details.      (line 204)
-* foreground color (option):             Option details.      (line  93)
-* FreeType font rendering:               Option details.      (line 107)
-* fuzzy images:                          Option details.      (line 121)
-* gamma:                                 Option details.      (line 121)
-* GhostScript and -dSAFER:               Option details.      (line 168)
-* GhostScript, turning off:              Option details.      (line 164)
-* GIF image format:                      Option details.      (line 127)
-* height reporting:                      Option details.      (line 134)
+* depth reporting:                       Option details.      (line  76)
+* exit on erroneous images:              Option details.      (line 257)
+* first page printed:                    Option details.      (line 193)
+* follow mode:                           Option details.      (line  97)
+* font generation, avoiding:             Option details.      (line 158)
+* forcing palette output:                Option details.      (line 202)
+* foreground color (option):             Option details.      (line  91)
+* FreeType font rendering:               Option details.      (line 105)
+* fuzzy images:                          Option details.      (line 119)
+* gamma:                                 Option details.      (line 119)
+* GhostScript and -dSAFER:               Option details.      (line 166)
+* GhostScript, turning off:              Option details.      (line 162)
+* GIF image format:                      Option details.      (line 125)
+* height reporting:                      Option details.      (line 132)
 * installation, of dvipng:               Installation.        (line   6)
 * invoking dvipng:                       Basic usage.         (line   6)
-* last page printed:                     Option details.      (line 142)
-* light fonts:                           Option details.      (line 121)
-* magnification, overriding DVI:         Option details.      (line 304)
-* Metafont mode, specifying:             Option details.      (line 151)
-* mktexpk, avoiding:                     Option details.      (line 160)
-* mode name, specifying:                 Option details.      (line 151)
-* no erroneous images:                   Option details.      (line 213)
-* offset pages:                          Option details.      (line 189)
+* last page printed:                     Option details.      (line 140)
+* light fonts:                           Option details.      (line 119)
+* magnification, overriding DVI:         Option details.      (line 302)
+* Metafont mode, specifying:             Option details.      (line 149)
+* mktexpk, avoiding:                     Option details.      (line 158)
+* mode name, specifying:                 Option details.      (line 149)
+* no erroneous images:                   Option details.      (line 211)
+* offset pages:                          Option details.      (line 187)
 * option, details of:                    Option details.      (line   6)
 * options, dvipng:                       Command-line options.
                                                               (line   6)
 * options, reading from standard input:  Option details.      (line  11)
 * options, summary:                      Option summary.      (line   6)
-* output resolution, setting:            Option details.      (line  62)
-* output, redirecting:                   Option details.      (line 182)
-* page range:                            Option details.      (line 226)
-* page, first printed:                   Option details.      (line 195)
-* page, last printed:                    Option details.      (line 142)
-* physical page number, and -l:          Option details.      (line 142)
-* physical page number, and -p:          Option details.      (line 195)
-* PNG image format:                      Option details.      (line 222)
+* output resolution, setting:            Option details.      (line  60)
+* output, redirecting:                   Option details.      (line 180)
+* page range:                            Option details.      (line 224)
+* page, first printed:                   Option details.      (line 193)
+* page, last printed:                    Option details.      (line 140)
+* physical page number, and '-l':        Option details.      (line 140)
+* physical page number, and '-p':        Option details.      (line 193)
+* PNG image format:                      Option details.      (line 220)
 * PostScript inclusion problems:         Encapsulated PostScript.
                                                               (line  21)
 * PostScript, turning off raw PostScript specials: Option details.
-                                                              (line 176)
+                                                              (line 174)
 * problems:                              Diagnosing problems. (line   6)
-* quality:                               Option details.      (line 248)
-* quiet operation:                       Option details.      (line 244)
-* reverse pagination:                    Option details.      (line 255)
-* silent operation:                      Option details.      (line 244)
+* quality:                               Option details.      (line 246)
+* quiet operation:                       Option details.      (line 242)
+* reverse pagination:                    Option details.      (line 253)
+* silent operation:                      Option details.      (line 242)
 * standard input, reading options from:  Option details.      (line  11)
-* standard output, output to:            Option details.      (line 182)
-* T1lib font rendering:                  Option details.      (line 276)
-* transparent border fallback color:     Option details.      (line  25)
-* transparent border width:              Option details.      (line  25)
+* standard output, output to:            Option details.      (line 180)
+* T1lib font rendering:                  Option details.      (line 274)
+* transparent border fallback color:     Option details.      (line  23)
+* transparent border width:              Option details.      (line  23)
 * trouble:                               Diagnosing problems. (line   6)
-* truecolor output:                      Option details.      (line 290)
-* warnings, suppressing:                 Option details.      (line 244)
-* width reporting:                       Option details.      (line 301)
+* truecolor output:                      Option details.      (line 288)
+* warnings, suppressing:                 Option details.      (line 242)
+* width reporting:                       Option details.      (line 299)
 
 
 
 Tag Table:
-Node: Top297
-Node: Introduction1192
-Node: Installation3431
-Node: Prerequisites3778
-Node: Configure6268
-Node: Build/install8307
-Node: Installation outside the texmf tree8775
-Node: Advice for non-privileged users9482
-Node: Basic usage10490
-Node: Command-line options11662
-Node: Option summary12086
-Node: Option details14512
-Node: Graphics30430
-Node: Encapsulated PostScript31182
-Node: Bitmapped graphics32525
-Node: Raw PostScript33748
-Node: Color35987
-Node: Color specifications36375
-Node: Color specials37474
-Node: Diagnosing problems38886
-Node: Contact information39369
-Node: Debug options40110
-Node: Credits41145
-Node: Copying45146
-Node: Index45926
+Node: Top296
+Node: Introduction1191
+Node: Installation3436
+Node: Prerequisites3834
+Node: Configure6331
+Node: Build/install8378
+Node: Installation outside the texmf tree8846
+Node: Advice for non-privileged users9556
+Node: Basic usage10567
+Node: Command-line options11720
+Node: Option summary12143
+Node: Option details14515
+Node: Graphics30478
+Node: Encapsulated PostScript31233
+Node: Bitmapped graphics32583
+Node: Raw PostScript33811
+Node: Color36064
+Node: Color specifications36475
+Node: Color specials37578
+Node: Diagnosing problems38995
+Node: Contact information39479
+Node: Debug options40207
+Node: Credits41218
+Node: Copying45227
+Node: Index46008
 
 End Tag Table
-
diff --git a/Build/source/texk/dvipng/help/Makefile.in b/Build/source/texk/dvipng/help/Makefile.in
index 6a40757846e..c1db25194f4 100644
--- a/Build/source/texk/dvipng/help/Makefile.in
+++ b/Build/source/texk/dvipng/help/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -59,7 +87,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \
 	$(top_srcdir)/../../m4/kpse-gd-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-t1lib-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
@@ -67,7 +94,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
 	$(top_srcdir)/../../m4/ltsugar.m4 \
 	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 \
+	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
 	$(top_srcdir)/ac/dvipng.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -179,9 +206,6 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-T1LIB_DEPEND = @T1LIB_DEPEND@
-T1LIB_INCLUDES = @T1LIB_INCLUDES@
-T1LIB_LIBS = @T1LIB_LIBS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 ZLIB_DEPEND = @ZLIB_DEPEND@
diff --git a/Build/source/texk/dvipng/version.ac b/Build/source/texk/dvipng/version.ac
new file mode 100644
index 00000000000..0c066332108
--- /dev/null
+++ b/Build/source/texk/dvipng/version.ac
@@ -0,0 +1,11 @@
+dnl
+dnl   Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+dnl
+dnl   This file is free software; the copyright holder
+dnl   gives unlimited permission to copy and/or distribute it,
+dnl   with or without modifications, as long as this notice is preserved.
+dnl
+dnl --------------------------------------------------------
+dnl
+dnl  m4-include this file to define the current dvipng version
+m4_define([dvipng_version], [1.14])