202 files changed, 604 insertions, 546 deletions

diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index 3c89de52459..f6863fb5b13 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-27  Karl Berry  <karl@tug.org>
+
+	* Imported release 1.06.
+	* configure.ac: Adapted.
+	* dvisvgm-1.0.5-PATCHES: removed dir, all patches applies.
+
 2011-03-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Imported release 1.0.5.
diff --git a/Build/source/texk/dvisvgm/Makefile.am b/Build/source/texk/dvisvgm/Makefile.am
index 7e95f5d2d74..8334cad8d92 100644
--- a/Build/source/texk/dvisvgm/Makefile.am
+++ b/Build/source/texk/dvisvgm/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/dvisvgm/
 ##
-## Copyright (C) 2009 - 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 #************************************************************************
@@ -17,8 +17,8 @@ ACLOCAL_AMFLAGS = -I ../../m4
 EXTRA_DIST = $(DVISVGM_TREE)
 
 ## Patches applied to the original source tree
-##
-EXTRA_DIST += $(DVISVGM_TREE)-PATCHES
+## (as of 1.0.6, all have been applied.)
+#EXTRA_DIST += $(DVISVGM_TREE)-PATCHES
 
 # in case of an SVN repository
 dist-hook:
@@ -89,6 +89,7 @@ nodist_libdvisvgm_a_SOURCES = \
 	$(DVISVGM_TREE)/src/PageSize.cpp \
 	$(DVISVGM_TREE)/src/PSInterpreter.cpp \
 	$(DVISVGM_TREE)/src/PsSpecialHandler.cpp \
+	$(DVISVGM_TREE)/src/SignalHandler.cpp \
 	$(DVISVGM_TREE)/src/SpecialManager.cpp \
 	$(DVISVGM_TREE)/src/StreamReader.cpp \
 	$(DVISVGM_TREE)/src/StreamWriter.cpp \
diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in
index 61a82f65044..a6b8b8944af 100644
--- a/Build/source/texk/dvisvgm/Makefile.in
+++ b/Build/source/texk/dvisvgm/Makefile.in
@@ -97,11 +97,12 @@ nodist_libdvisvgm_a_OBJECTS = BgColorSpecialHandler.$(OBJEXT) \
 	Message.$(OBJEXT) MetafontWrapper.$(OBJEXT) \
 	PageRanges.$(OBJEXT) PageSize.$(OBJEXT) \
 	PSInterpreter.$(OBJEXT) PsSpecialHandler.$(OBJEXT) \
-	SpecialManager.$(OBJEXT) StreamReader.$(OBJEXT) \
-	StreamWriter.$(OBJEXT) SVGTree.$(OBJEXT) System.$(OBJEXT) \
-	Terminal.$(OBJEXT) TFM.$(OBJEXT) TpicSpecialHandler.$(OBJEXT) \
-	VFReader.$(OBJEXT) XMLDocument.$(OBJEXT) XMLNode.$(OBJEXT) \
-	XMLString.$(OBJEXT) $(am__objects_1)
+	SignalHandler.$(OBJEXT) SpecialManager.$(OBJEXT) \
+	StreamReader.$(OBJEXT) StreamWriter.$(OBJEXT) \
+	SVGTree.$(OBJEXT) System.$(OBJEXT) Terminal.$(OBJEXT) \
+	TFM.$(OBJEXT) TpicSpecialHandler.$(OBJEXT) VFReader.$(OBJEXT) \
+	XMLDocument.$(OBJEXT) XMLNode.$(OBJEXT) XMLString.$(OBJEXT) \
+	$(am__objects_1)
 libdvisvgm_a_OBJECTS = $(nodist_libdvisvgm_a_OBJECTS)
 libpotrace_a_AR = $(AR) $(ARFLAGS)
 libpotrace_a_LIBADD =
@@ -322,7 +323,7 @@ top_srcdir = @top_srcdir@
 #
 #************************************************************************
 ACLOCAL_AMFLAGS = -I ../../m4
-EXTRA_DIST = $(DVISVGM_TREE) $(DVISVGM_TREE)-PATCHES
+EXTRA_DIST = $(DVISVGM_TREE)
 INCLUDES = -I$(top_srcdir)/$(DVISVGM_TREE)/src \
 	-I$(top_srcdir)/$(DVISVGM_TREE)/potracelib \
 	$(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(ZLIB_INCLUDES) \
@@ -378,6 +379,7 @@ nodist_libdvisvgm_a_SOURCES =  \
 	$(DVISVGM_TREE)/src/PageSize.cpp \
 	$(DVISVGM_TREE)/src/PSInterpreter.cpp \
 	$(DVISVGM_TREE)/src/PsSpecialHandler.cpp \
+	$(DVISVGM_TREE)/src/SignalHandler.cpp \
 	$(DVISVGM_TREE)/src/SpecialManager.cpp \
 	$(DVISVGM_TREE)/src/StreamReader.cpp \
 	$(DVISVGM_TREE)/src/StreamWriter.cpp \
@@ -556,6 +558,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PageSize.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PsSpecialHandler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGTree.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SignalHandler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SpecialManager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StreamReader.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StreamWriter.Po@am__quote@
@@ -1218,6 +1221,20 @@ PsSpecialHandler.obj: $(DVISVGM_TREE)/src/PsSpecialHandler.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PsSpecialHandler.obj `if test -f '$(DVISVGM_TREE)/src/PsSpecialHandler.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/PsSpecialHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/PsSpecialHandler.cpp'; fi`
 
+SignalHandler.o: $(DVISVGM_TREE)/src/SignalHandler.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SignalHandler.o -MD -MP -MF $(DEPDIR)/SignalHandler.Tpo -c -o SignalHandler.o `test -f '$(DVISVGM_TREE)/src/SignalHandler.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/SignalHandler.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/SignalHandler.Tpo $(DEPDIR)/SignalHandler.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(DVISVGM_TREE)/src/SignalHandler.cpp' object='SignalHandler.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SignalHandler.o `test -f '$(DVISVGM_TREE)/src/SignalHandler.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/SignalHandler.cpp
+
+SignalHandler.obj: $(DVISVGM_TREE)/src/SignalHandler.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SignalHandler.obj -MD -MP -MF $(DEPDIR)/SignalHandler.Tpo -c -o SignalHandler.obj `if test -f '$(DVISVGM_TREE)/src/SignalHandler.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/SignalHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/SignalHandler.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/SignalHandler.Tpo $(DEPDIR)/SignalHandler.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(DVISVGM_TREE)/src/SignalHandler.cpp' object='SignalHandler.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SignalHandler.obj `if test -f '$(DVISVGM_TREE)/src/SignalHandler.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/SignalHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/SignalHandler.cpp'; fi`
+
 SpecialManager.o: $(DVISVGM_TREE)/src/SpecialManager.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SpecialManager.o -MD -MP -MF $(DEPDIR)/SpecialManager.Tpo -c -o SpecialManager.o `test -f '$(DVISVGM_TREE)/src/SpecialManager.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/SpecialManager.cpp
 @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/SpecialManager.Tpo $(DEPDIR)/SpecialManager.Po
@@ -1820,6 +1837,8 @@ uninstall-man: uninstall-man1
 	uninstall-man uninstall-man1
 
 
+#EXTRA_DIST += $(DVISVGM_TREE)-PATCHES
+
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 47ef57a594c..58d8bc76d82 100755
--- a/Build/source/texk/dvisvgm/configure
+++ b/Build/source/texk/dvisvgm/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for dvisvgm 1.0.5.
+# Generated by GNU Autoconf 2.68 for dvisvgm 1.0.6.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -570,12 +570,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvisvgm'
 PACKAGE_TARNAME='dvisvgm'
-PACKAGE_VERSION='1.0.5'
-PACKAGE_STRING='dvisvgm 1.0.5'
+PACKAGE_VERSION='1.0.6'
+PACKAGE_STRING='dvisvgm 1.0.6'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="dvisvgm-1.0.5/src/dvisvgm.cpp"
+ac_unique_file="dvisvgm-1.0.6/src/dvisvgm.cpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -772,7 +772,6 @@ enable_compiler_warnings
 with_system_libgs
 with_libgs_includes
 with_libgs_libdir
-with_gnu_ld
 enable_cxx_runtime_hack
 with_system_kpathsea
 with_kpathsea_includes
@@ -791,12 +790,8 @@ LDFLAGS
 LIBS
 CPPFLAGS
 CPP
-CPPFLAGS
 CXX
 CXXFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
 CCC
 CXXCPP'
 
@@ -1341,7 +1336,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dvisvgm 1.0.5 to adapt to many kinds of systems.
+\`configure' configures dvisvgm 1.0.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1411,7 +1406,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvisvgm 1.0.5:";;
+     short | recursive ) echo "Configuration of dvisvgm 1.0.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1538,7 +1533,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvisvgm configure 1.0.5
+dvisvgm configure 1.0.6
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2230,7 +2225,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dvisvgm $as_me 1.0.5, which was
+It was created by dvisvgm $as_me 1.0.6, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -7584,7 +7579,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvisvgm'
- VERSION='1.0.5'
+ VERSION='1.0.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17218,7 +17213,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dvisvgm config.lt 1.0.5
+dvisvgm config.lt 1.0.6
 configured by $0, generated by GNU Autoconf 2.68.
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -18921,7 +18916,7 @@ CPPFLAGS=$kpse_save_CPPFLAGS
 LIBS=$kpse_save_LIBS
 
 
-DVISVGM_TREE=dvisvgm-1.0.5
+DVISVGM_TREE=dvisvgm-1.0.6
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -19473,7 +19468,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dvisvgm $as_me 1.0.5, which was
+This file was extended by dvisvgm $as_me 1.0.6, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19539,7 +19534,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dvisvgm config.status 1.0.5
+dvisvgm config.status 1.0.6
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvisvgm/configure.ac b/Build/source/texk/dvisvgm/configure.ac
index 284b66e37df..de8465321eb 100644
--- a/Build/source/texk/dvisvgm/configure.ac
+++ b/Build/source/texk/dvisvgm/configure.ac
@@ -13,7 +13,7 @@ dnl  Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de>
 dnl
 dnl *********************************************************************
 dnl
-m4_define([dvisvgm_version], [1.0.5])[]dnl using unmodified dvisvgm source tree
+m4_define([dvisvgm_version], [1.0.6])[]dnl using unmodified dvisvgm source tree
 AC_INIT([dvisvgm], dvisvgm_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([dvisvgm-]dvisvgm_version[/src/dvisvgm.cpp])
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.0.5-PATCHES/ChangeLog
deleted file mode 100644
index 90836ff7342..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5-PATCHES/ChangeLog
+++ /dev/null
@@ -1,132 +0,0 @@
-2011-03-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Imported release 1.0.5.
-
-	Removed patch-04-freetype, now included in the release.
-
-	Added patch-05-potrace_version and patch-06-const to avoid
-	compiler warning (with 'g++ -Wall -Wwrite-strings').
-
-2010-10-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Imported release 1.0.3.
-
-	Removed patch-01-path, patch-02-namespace, and patch-03-esc,
-	now all included in the original source tree.
-
-2010-09-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Added patch-04-freetype to allow to build with freetype-2.4.0
-
-	Problem detected and solution inspired by Paul Vojta
-	<vojta@math.berkeley.edu>, mail from Tue, 17 Aug 2010 12:30:13.
-
-2010-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Portability patches from Martin Gieseking.
-
-	Added patch-01-path, mail from Thu, 24 Jun 2010 09:16:04.
-	Added patch-02-namespace, mail from Thu, 24 Jun 2010 15:49:05.
-	Added patch-03-esc, mail from Thu, 24 Jun 2010 22:41:57.
-
-2010-06-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Imported release 1.0.2.
-
-	Removed patch-01-isopen, patch-02-newline-at-end-of-file,
-	patch-07-libdvisvgm-uint32, patch-08-static-const-members,
-	patch-30-WIN32-warning,
-	now all included in the original source tree.
-
-2010-06-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Imported release 1.0.1.
-
-	Removed patch-01-potracelib-warning, patch-02-libdvisvgm-warnings,
-	patch-03-libdvisvgm-uninitialized, patch-04-libdvisvgm-virtual,
-	patch-05-libdvisvgm-dlfcn, patch-06-libdvisvgm-HAVE_LIBGS,
-	patch-09-unistd, patch-10-TL-help, patch-20-gettimeofday-or-ftime,
-	now all included in the original source tree.
-
-	Added patch-01-isopen.
-	* src/GFGlyphTracer.h: Avoid recent C++ STL extensions.
-	From Martin Gieseking <martin.gieseking@uos.de>.
-
-	Added patch-02-newline-at-end-of-file.
-	* src/FontEncoding.cpp: Add newline at end of file.
-
-2010-06-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Added patch-08-static-const-members, from vvv.
-	* src/FontCache.cpp (FontCache::VERSION),
-	src/gzstream.cpp (gzstreambuf::bufferSize): Initialized static
-	const class members need also to be declared (at least for AIX)
-
-2010-06-05  Karl Berry  <karl@tug.org>
-
-	* patch-07-libdvisvgm-uint32: declare glyphIndex as FT_UInt in the
-	first place, instead of casting.  From vvv, confirmed for his AIX.
-
-2010-05-31  Karl Berry  <karl@tug.org>
-
-	Added patch-07-libdvisvgm-uint32.
-	* src/FontEngine.cpp: must cast &glyphindex to (FT_Uint *)
-	for AIX compiler (tlbuild 28 May 2010 15:23:25).
-
-	Added patch-09-unistd.
-	* src/FileSystem.cpp: unconditionally include <unistd.h>.
-	(Needed on AIX, tlbuild 28 May 2010 15:08:06.)
-
-2010-02-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Added patch-30-WIN32-warning.
-	* src/MetafontWrapper.cpp (execute) [WIN32]: Initialize the
-	DWORD exitcode with (DWORD)-1 to avoid warning.
-
-2009-12-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Added patch-20-gettimeofday-or-ftime.
-	* configure.ac, src/dvisvgm.cpp: Check for gettimeofday()
-	and <sys/time.h> or ftime() and <sys/timeb.h>.
-
-2009-11-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Added patch-05-libdvisvgm-dlfcn.
-	* src/Ghostscript.h: #include <dlfcn.h> only when used.
-	* src/DVIToSVG.cpp, src/Ghostscript.{cpp,h}:
-	Use defined(DISABLE_GS) instead of DISABLE_GS.
-
-	Added patch-06-libdvisvgm-HAVE_LIBGS.
-	* src/Ghostscript.{cpp,h}: Use defined(HAVE_LIBGS).
-
-2009-11-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Added patch-03-libdvisvgm-uninitialized.
-	* src/InputReader.cpp (skipUntil): Avoid uninitialized variable.
-
-	Added patch-04-libdvisvgm-virtual.
-	* src/CmdLineParserBase.h, src/CommandLine.h: Added virtual
-	destructors because there are virtual functions.
-
-	Added patch-10-TL-help.
-	* src/dvisvgm.cpp (show_help): With our proxy configure.ac
-	PACKAGE_BUGREPORT is "tex-k@tug.org" and can't be used as email
-	for the copyright.
-
-2009-11-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Added patch-01-potracelib-warning.
-	* potracelib/potracelib.[ch]: Change return type of
-	potrace_version() from 'char *' to 'const char *'.
-
-	Added patch-02-libdvisvgm-warnings.
-	* src/Color.cpp (float_to_byte): Cast from double to UInt8.
-	* src/Color.cpp (HSB2RGB),
-	src/ColorSpecialHandler.cpp (hsb_to_rgb),
-	src/PsSpecialHandler.cpp (setdash),
-	src/TpicSpecialHandler.cpp (drawArc): Casts from double to int.
-	* src/PsSpecialHandler.h (setlinecap, setlinejoin): Casts from
-	double to unsigned int.
-	* src/FontManager.cpp (vfFirstFontNum): Cast from unsigned int
-	to int.
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.0.5-PATCHES/TL-Changes
deleted file mode 100644
index 88f951f0c41..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5-PATCHES/TL-Changes
+++ /dev/null
@@ -1,10 +0,0 @@
-Changes applied to the dvisvgm-1.0.5 tree as obtained from:
-	http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.0.5.tar.gz
-
-Removed:
-	config.guess
-	config.sub
-	depcomp
-	install-sh
-	missing
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5-PATCHES/patch-05-potrace_version b/Build/source/texk/dvisvgm/dvisvgm-1.0.5-PATCHES/patch-05-potrace_version
deleted file mode 100644
index c43c235b513..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5-PATCHES/patch-05-potrace_version
+++ /dev/null
@@ -1,26 +0,0 @@
-	Change return type of potrace_version() from 'char *' to
-	'const char *' in order to avoid compiler warning.
-
-diff -ur dvisvgm-1.0.5.orig/potracelib/potracelib.c dvisvgm-1.0.5/potracelib/potracelib.c
---- dvisvgm-1.0.5.orig/potracelib/potracelib.c	2011-02-21 19:47:53.000000000 +0100
-+++ dvisvgm-1.0.5/potracelib/potracelib.c	2011-03-04 09:47:22.000000000 +0100
-@@ -109,6 +109,6 @@
-   free(p);
- }
- 
--char *potrace_version(void) {
-+const char *potrace_version(void) {
-   return "potracelib 1.9";
- }
-diff -ur dvisvgm-1.0.5.orig/potracelib/potracelib.h dvisvgm-1.0.5/potracelib/potracelib.h
---- dvisvgm-1.0.5.orig/potracelib/potracelib.h	2011-02-21 19:47:53.000000000 +0100
-+++ dvisvgm-1.0.5/potracelib/potracelib.h	2011-03-04 09:47:20.000000000 +0100
-@@ -130,7 +130,7 @@
- 
- /* return a static plain text version string identifying this version
-    of potracelib */
--char *potrace_version(void);
-+const char *potrace_version(void);
- 
- #ifdef  __cplusplus
- } /* end of extern "C" */
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5-PATCHES/patch-06-const b/Build/source/texk/dvisvgm/dvisvgm-1.0.5-PATCHES/patch-06-const
deleted file mode 100644
index 3ab06ee8d0f..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5-PATCHES/patch-06-const
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur dvisvgm-1.0.5.orig/src/CRC32.cpp dvisvgm-1.0.5/src/CRC32.cpp
---- dvisvgm-1.0.5.orig/src/CRC32.cpp	2011-02-21 19:47:53.000000000 +0100
-+++ dvisvgm-1.0.5/src/CRC32.cpp	2011-03-04 10:01:05.000000000 +0100
-@@ -49,7 +49,7 @@
- /** Appends string bytes to the previous data and computes the resulting checksum.
-  *  @param[in] data string to update the checksum with */
- void CRC32::update (const char *data) {
--	update((UInt8*)data, strlen(data));
-+	update((const UInt8*)data, strlen(data));
- }
- 
- 
-@@ -101,7 +101,7 @@
- 
- /** Computes the CRC32 checksum of a string. */
- UInt32 CRC32::compute (const char *str) {
--	return compute((UInt8*)str, strlen(str));
-+	return compute((const UInt8*)str, strlen(str));
- }
- 
- 
-diff -ur dvisvgm-1.0.5.orig/src/StreamWriter.cpp dvisvgm-1.0.5/src/StreamWriter.cpp
---- dvisvgm-1.0.5.orig/src/StreamWriter.cpp	2011-02-21 19:47:53.000000000 +0100
-+++ dvisvgm-1.0.5/src/StreamWriter.cpp	2011-03-04 10:02:00.000000000 +0100
-@@ -71,11 +71,11 @@
- }
- 
- 
--/** Writes a signed integer to the output stream and updates the CRC32 checksum.
-- *  @param[in] val the value to write
-+/** Writes a string to the output stream and updates the CRC32 checksum.
-+ *  @param[in] str the string to write
-  *  @param[in,out] crc32 checksum to be updated
-  *  @param[in] finalZero if true, a final 0-byte is appended */
- void StreamWriter::writeString (const std::string &str, CRC32 &crc32, bool finalZero) {
- 	writeString(str, finalZero);
--	crc32.update((UInt8*)str.c_str(), str.length() + (finalZero ? 1 : 0));
-+	crc32.update((const UInt8*)str.c_str(), str.length() + (finalZero ? 1 : 0));
- }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FileFinder.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FileFinder.h
deleted file mode 100644
index d42e0a64001..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FileFinder.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*************************************************************************
-** FileFinder.h                                                         **
-**                                                                      **
-** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2011 Martin Gieseking <martin.gieseking@uos.de>   **
-**                                                                      **
-** This program is free software; you can redistribute it and/or        **
-** modify it under the terms of the GNU General Public License as       **
-** published by the Free Software Foundation; either version 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           **
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the         **
-** GNU General Public License for more details.                         **
-**                                                                      **
-** You should have received a copy of the GNU General Public License    **
-** along with this program; if not, see <http://www.gnu.org/licenses/>. **
-*************************************************************************/
-
-#ifndef KPSFILEFINDER_H
-#define KPSFILEFINDER_H
-
-#include <string>
-#include "FontMap.h"
-
-class FileFinder
-{
-	class Impl
-	{
-		public:
-			const char* lookup (const std::string &fname, bool extended);
-			const char* lookupEncFile (std::string fontname);
-			const char* lookupEncName (std::string fname);
-			static Impl& instance ();
-			static void setProgname (const char *progname) {_progname = progname;}
-			static void enableMktex (bool enable)          {_mktex_enabled = enable;}
-			static void setUserFontMap (const char *fname) {_usermapname = fname;}
-			static std::string version ();
-
-		protected:
-			Impl ();
-			~Impl ();
-			const char* findFile (const std::string &fname);
-			const char* findMappedFile (std::string fname);
-			const char* mktex (const std::string &fname);
-			void initFontMap ();
-
-		private:
-			static Impl *_instance;
-			static const char *_progname;
-			static bool _mktex_enabled;
-		   static FontMap _fontmap;
-			static const char *_usermapname;
-	};
-
-   public:
-		static std::string version () {
-			return Impl::version();
-		}
-
-		static const char* lookup (const std::string &fname, bool extended=true) {
-			return Impl::instance().lookup(fname, extended);
-		}
-
-		static const char* lookupEncFile (std::string fontname) {
-			return Impl::instance().lookupEncFile(fontname);
-		}
-
-		static const char* lookupEncName (std::string fname) {
-			return Impl::instance().lookupEncName(fname);
-		}
-
-		static void init (const char *progname, bool enable_mktexmf) {
-			Impl::setProgname(progname);
-			Impl::enableMktex(enable_mktexmf);
-		}
-
-		static void setUserFontMap (const char *fname) {
-			Impl::setUserFontMap(fname);
-		}
-};
-
-#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/AUTHORS b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/AUTHORS
index 837e1e96bfb..837e1e96bfb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/AUTHORS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/AUTHORS
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/COPYING b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/COPYING
index 94a9ed024d3..94a9ed024d3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/COPYING
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/COPYING
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/INSTALL b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/INSTALL
index a4b34144dcf..a4b34144dcf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/INSTALL
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/INSTALL
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/LGPL-2.1.txt b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/LGPL-2.1.txt
index 602bfc94635..602bfc94635 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/LGPL-2.1.txt
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/LGPL-2.1.txt
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/Makefile.am
index d0557a0e78c..d0557a0e78c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/Makefile.in
index fb7ee798f04..80592ceaa38 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/Makefile.in
@@ -38,7 +38,8 @@ subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING INSTALL NEWS \
-	config.guess config.sub depcomp install-sh missing
+	config.guess config.rpath config.sub depcomp install-sh \
+	missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/NEWS b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/NEWS
index dfb2c3de951..66a11bbd6f4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/NEWS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/NEWS
@@ -1,3 +1,9 @@
+dvisvgm-1.0.6
+- fixed segfault occured if a (malformed) DVI file calls set_char/put_char whithout preceding font definition
+- added CTRL-C handler
+- MiKTeX support updated to version 2.9
+- some code refactorings
+
 dvisvgm-1.0.5
 - added optional integer argument to option -n to disable generation of <use> elements
 - added missing unit to width/height attributes of svg root element (SF bug #3185773)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/README b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/README
index f4f546c5a54..4f2ef39b684 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/README
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/README
@@ -67,16 +67,8 @@ COMPILATION
  via a system call. Please ensure that Metafont is installed and
  reachable through the search path.
  
- To build Windows binaries I recommend MinGW in conjunction
- with MSYS (http://www.mingw.org). If executed within MSYS
- the configure script assumes that you want to build dvisvgm
- for MiKTeX. In this case the necessary import libraries for
- the MiKTeX DLLs will be created and linked. If not already done,
- add the MiKTeX bin directory to your search path, otherwise the
- required DLLs won't be found while running dvisvgm.
-
  If you don't like compiling the sources yourself, you can
- download precompiled executables for Windows and MiKTeX
+ download pre-compiled executables for Windows and MiKTeX
  from sourceforge.net instead (see below).
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/aclocal.m4 b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/aclocal.m4
index 546de700179..546de700179 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/aclocal.m4
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/aclocal.m4
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/config.h.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/config.h.in
index b027999e9b3..b027999e9b3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/config.h.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/config.h.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/configure b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/configure
index c2d94c34f64..d7863a24162 100755
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/configure
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.66 for dvisvgm 1.0.5.
+# Generated by GNU Autoconf 2.66 for dvisvgm 1.0.6.
 #
 # Report bugs to <martin.gieseking@uos.de>.
 #
@@ -552,8 +552,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvisvgm'
 PACKAGE_TARNAME='dvisvgm'
-PACKAGE_VERSION='1.0.5'
-PACKAGE_STRING='dvisvgm 1.0.5'
+PACKAGE_VERSION='1.0.6'
+PACKAGE_STRING='dvisvgm 1.0.6'
 PACKAGE_BUGREPORT='martin.gieseking@uos.de'
 PACKAGE_URL=''
 
@@ -1270,7 +1270,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dvisvgm 1.0.5 to adapt to many kinds of systems.
+\`configure' configures dvisvgm 1.0.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1341,7 +1341,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvisvgm 1.0.5:";;
+     short | recursive ) echo "Configuration of dvisvgm 1.0.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1444,7 +1444,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvisvgm configure 1.0.5
+dvisvgm configure 1.0.6
 generated by GNU Autoconf 2.66
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1905,7 +1905,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dvisvgm $as_me 1.0.5, which was
+It was created by dvisvgm $as_me 1.0.6, which was
 generated by GNU Autoconf 2.66.  Invocation command line was
 
   $ $0 $@
@@ -2834,7 +2834,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvisvgm'
- VERSION='1.0.5'
+ VERSION='1.0.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6852,7 +6852,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dvisvgm $as_me 1.0.5, which was
+This file was extended by dvisvgm $as_me 1.0.6, which was
 generated by GNU Autoconf 2.66.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6918,7 +6918,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dvisvgm config.status 1.0.5
+dvisvgm config.status 1.0.6
 configured by $0, generated by GNU Autoconf 2.66,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/configure.ac b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/configure.ac
index 375d4fd2023..9f85c6c4f71 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/configure.ac
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/configure.ac
@@ -4,7 +4,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dvisvgm],[1.0.5],[martin.gieseking@uos.de])
+AC_INIT([dvisvgm],[1.0.6],[martin.gieseking@uos.de])
 DATE="December 2010"
 AC_CONFIG_SRCDIR(src)
 AC_CONFIG_HEADER(config.h)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/doc/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/doc/Makefile.am
index 65756c12742..65756c12742 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/doc/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/doc/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/doc/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/doc/Makefile.in
index 83d557df09f..83d557df09f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/doc/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/doc/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/doc/dvisvgm.1 b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/doc/dvisvgm.1
index b09d169f23e..e002fb5cf44 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/doc/dvisvgm.1
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/doc/dvisvgm.1
@@ -1,13 +1,22 @@
 '\" t
 .\"     Title: dvisvgm
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/01/2011
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 04/16/2011
 .\"    Manual: dvisvgm Manual
-.\"    Source: dvisvgm 1.0.5
+.\"    Source: dvisvgm 1.0.6
 .\"  Language: English
 .\"
-.TH "DVISVGM" "1" "03/01/2011" "dvisvgm 1\&.0\&.5" "dvisvgm Manual"
+.TH "DVISVGM" "1" "04/16/2011" "dvisvgm 1\&.0\&.6" "dvisvgm Manual"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -635,10 +644,10 @@ The following TeX snippet adds two raw SVG elements to the output and updates th
 .RS 4
 .\}
 .nf
-\especial{dvisvgm:raw <circle cx=\'{?x}\' cy=\'{?y}\' r=\'10\' stroke=\'black\' fill=\'red\'/>}
+\especial{dvisvgm:raw <circle cx=\*(Aq{?x}\*(Aq cy=\*(Aq{?y}\*(Aq r=\*(Aq10\*(Aq stroke=\*(Aqblack\*(Aq fill=\*(Aqred\*(Aq/>}
 \especial{dvisvgm:bbox 20 10 10}
 
-\especial{dvisvgm:raw <path d=\'M50 200 L10 250 H100 Z\' stroke=\'black\' fill=\'blue\'/>}
+\especial{dvisvgm:raw <path d=\*(AqM50 200 L10 250 H100 Z\*(Aq stroke=\*(Aqblack\*(Aq fill=\*(Aqblue\*(Aq/>}
 \especial{dvisvgm:bbox abs 10 200 100 250}
 .fi
 .if n \{\
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/doc/dvisvgm.txt.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/doc/dvisvgm.txt.in
index c3f12c34de7..c3f12c34de7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/doc/dvisvgm.txt.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/doc/dvisvgm.txt.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/Makefile.am
index 97bf78f50f4..97bf78f50f4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/Makefile.in
index e7ca5bae59e..e7ca5bae59e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/auxiliary.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/auxiliary.h
index 1c2765816b8..1c2765816b8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/auxiliary.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/auxiliary.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/bitmap.h
index 671382dc27d..671382dc27d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/curve.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/curve.c
index 0ab0c6d7a2a..0ab0c6d7a2a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/curve.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/curve.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/curve.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/curve.h
index 0f2d9fa876a..0f2d9fa876a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/curve.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/curve.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/decompose.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/decompose.c
index 1b3f35c22d8..1b3f35c22d8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/decompose.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/decompose.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/decompose.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/decompose.h
index 409439c62fd..409439c62fd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/decompose.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/decompose.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/lists.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/lists.h
index 4f78bf20fde..4f78bf20fde 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/lists.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/lists.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/potracelib.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/potracelib.c
index e8480b216c9..e8480b216c9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/potracelib.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/potracelib.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/potracelib.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/potracelib.h
index 6bc8682c074..6bc8682c074 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/potracelib.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/potracelib.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/progress.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/progress.h
index 220639c6e5c..220639c6e5c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/progress.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/progress.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/trace.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/trace.c
index 8fe1a1bc4ab..8fe1a1bc4ab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/trace.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/trace.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/trace.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/trace.h
index 72d1a36965b..72d1a36965b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/potracelib/trace.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/trace.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/BgColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/BgColorSpecialHandler.cpp
index 979d76bdd0f..979d76bdd0f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/BgColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/BgColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/BgColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/BgColorSpecialHandler.h
index d3b0a75ccca..d3b0a75ccca 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/BgColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/BgColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Bitmap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Bitmap.cpp
index 4c2a0510bc8..4c2a0510bc8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Bitmap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Bitmap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Bitmap.h
index a9a6be61b2a..a9a6be61b2a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/BoundingBox.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/BoundingBox.cpp
index c5ab55e27a9..c5ab55e27a9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/BoundingBox.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/BoundingBox.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/BoundingBox.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/BoundingBox.h
index 952fbdfd3af..952fbdfd3af 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/BoundingBox.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/BoundingBox.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/CRC32.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CRC32.cpp
index 339375a6b06..339375a6b06 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/CRC32.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CRC32.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/CRC32.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CRC32.h
index 4dd323ad3df..4dd323ad3df 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/CRC32.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CRC32.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Calculator.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Calculator.cpp
index 33502d6cec2..33502d6cec2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Calculator.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Calculator.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Calculator.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Calculator.h
index ce4f6698b20..ce4f6698b20 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Calculator.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Calculator.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/CmdLineParserBase.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CmdLineParserBase.cpp
index 6c18f221ad3..6c18f221ad3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/CmdLineParserBase.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CmdLineParserBase.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/CmdLineParserBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CmdLineParserBase.h
index 1be54e022a5..1be54e022a5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/CmdLineParserBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CmdLineParserBase.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Color.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Color.cpp
index 630c3798cda..630c3798cda 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Color.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Color.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Color.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Color.h
index d1d8ce3f6cc..d1d8ce3f6cc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Color.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Color.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/ColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/ColorSpecialHandler.cpp
index 2dfbb5fc606..2dfbb5fc606 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/ColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/ColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/ColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/ColorSpecialHandler.h
index 0e098631354..0e098631354 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/ColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/ColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/CommandLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CommandLine.cpp
index ccba1e74f08..ccba1e74f08 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/CommandLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CommandLine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/CommandLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CommandLine.h
index 5d1eb7bd078..5d1eb7bd078 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/CommandLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CommandLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DLLoader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DLLoader.cpp
index 22edb3dfa93..22edb3dfa93 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DLLoader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DLLoader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DLLoader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DLLoader.h
index d7fa5155fee..d7fa5155fee 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DLLoader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DLLoader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DVIActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIActions.cpp
index 355a59efaba..355a59efaba 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DVIActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIActions.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DVIActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIActions.h
index 42ae3330b07..42ae3330b07 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DVIActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIReader.cpp
index 45449e2ea95..f2d8e14ae2b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIReader.cpp
@@ -28,6 +28,7 @@
 #include "Font.h"
 #include "FontManager.h"
 #include "Message.h"
+#include "SignalHandler.h"
 #include "VectorStream.h"
 #include "macros.h"
 
@@ -151,6 +152,7 @@ int DVIReader::evalCommand (bool compute_size, CommandHandler &handler, int &len
  *  corresponding cmdFOO method.
  *  @return opcode of the executed command */
 int DVIReader::executeCommand () {
+	SignalHandler::instance().check();
 	CommandHandler handler;
 	int len;   // number of parameter bytes
 	int param; // parameter of handler
@@ -464,43 +466,45 @@ void DVIReader::cmdPop (int) {
  * @param[in] moveCursor if true, register h is increased by the character width
  * @throw DVIException if method is called ouside a bop/eop pair */
 void DVIReader::putChar (UInt32 c, bool moveCursor) {
-	if (_inPage) {
-      FontManager &fm = FontManager::instance();
-		Font *font = fm.getFont(_currFontNum);
-		if (VirtualFont *vf = dynamic_cast<VirtualFont*>(font)) {    // is current font a virtual font?
-			vector<UInt8> *dvi = const_cast<vector<UInt8>*>(vf->getDVI(c)); // get DVI snippet that describes character c
-			if (dvi) {
-				DVIPosition pos = _currPos;       // save current cursor position
-				_currPos.x = _currPos.y = _currPos.w = _currPos.z = 0;
-				int save_fontnum = _currFontNum; // save current font number
-				fm.enterVF(vf);        // new font number context
-				cmdFontNum0(fm.vfFirstFontNum(vf));
-				double save_scale = _scaleFactor;
-				_scaleFactor = vf->scaledSize()/(1 << 20);
-
-				VectorInputStream<UInt8> vis(*dvi);
-				istream &is = replaceStream(vis);
-				try {
-					executeAll();            // execute DVI fragment
-				}
-				catch (const DVIException &e) {
-//					Message::estream(true) << "invalid dvi in vf: " << e.getMessage() << endl; // @@
-				}
-				replaceStream(is);          // restore previous input stream
-				_scaleFactor = save_scale;  // restore previous scale factor
-				fm.leaveVF();    // restore previous font number context
-				cmdFontNum0(save_fontnum);  // restore previous font number
-				_currPos = pos;             // restore previous cursor position
+	if (!_inPage)
+		throw DVIException("set_char or put_char outside of page");
+
+	FontManager &fm = FontManager::instance();
+	Font *font = fm.getFont(_currFontNum);
+	if (!font)
+		throw DVIException("no font selected");
+
+	if (VirtualFont *vf = dynamic_cast<VirtualFont*>(font)) {    // is current font a virtual font?
+		vector<UInt8> *dvi = const_cast<vector<UInt8>*>(vf->getDVI(c)); // get DVI snippet that describes character c
+		if (dvi) {
+			DVIPosition pos = _currPos;       // save current cursor position
+			_currPos.x = _currPos.y = _currPos.w = _currPos.z = 0;
+			int save_fontnum = _currFontNum; // save current font number
+			fm.enterVF(vf);        // new font number context
+			cmdFontNum0(fm.vfFirstFontNum(vf));
+			double save_scale = _scaleFactor;
+			_scaleFactor = vf->scaledSize()/(1 << 20);
+
+			VectorInputStream<UInt8> vis(*dvi);
+			istream &is = replaceStream(vis);
+			try {
+				executeAll();            // execute DVI fragment
 			}
+			catch (const DVIException &e) {
+				//					Message::estream(true) << "invalid dvi in vf: " << e.getMessage() << endl; // @@
+			}
+			replaceStream(is);          // restore previous input stream
+			_scaleFactor = save_scale;  // restore previous scale factor
+			fm.leaveVF();               // restore previous font number context
+			cmdFontNum0(save_fontnum);  // restore previous font number
+			_currPos = pos;             // restore previous cursor position
 		}
-		else if (_actions) {
-			_actions->setChar(_currPos.h, _currPos.v, c, font);
-		}
-		if (moveCursor)
-			_currPos.h += font->charWidth(c) * font->scaleFactor() * _mag/1000.0;
 	}
-	else
-		throw DVIException("set_char or put_char outside page");
+	else if (_actions) {
+		_actions->setChar(_currPos.h, _currPos.v, c, font);
+	}
+	if (moveCursor)
+		_currPos.h += font->charWidth(c) * font->scaleFactor() * _mag/1000.0;
 }
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIReader.h
index 6805e398ae2..6805e398ae2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DVIToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIToSVG.cpp
index 89ce9eb60e0..89ce9eb60e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DVIToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIToSVG.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DVIToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIToSVG.h
index 0e5fa7da7d8..0e5fa7da7d8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DVIToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DVIToSVGActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIToSVGActions.cpp
index e2475c07d59..878063c18ed 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DVIToSVGActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIToSVGActions.cpp
@@ -171,7 +171,7 @@ void DVIToSVGActions::special (const string &s) {
 		// @@ output message in case of unsupported specials?
 	}
 	catch (const SpecialException &e) {
-		Message::estream(true) << "error in special '" << s << "': " << e.getMessage() << '\n';
+		Message::estream(true) << "error in special '" << s << "': " << e.what() << '\n';
 	}
 }
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DVIToSVGActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIToSVGActions.h
index 400a5d19156..400a5d19156 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DVIToSVGActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIToSVGActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Directory.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Directory.cpp
index 86a8b446ceb..86a8b446ceb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Directory.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Directory.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Directory.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Directory.h
index 373f2f57dff..373f2f57dff 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Directory.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Directory.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DvisvgmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DvisvgmSpecialHandler.cpp
index 2e44169362a..2e44169362a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DvisvgmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DvisvgmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DvisvgmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DvisvgmSpecialHandler.h
index 1d15f864cf4..1d15f864cf4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/DvisvgmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DvisvgmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/EmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/EmSpecialHandler.cpp
index 786ff5c3623..786ff5c3623 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/EmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/EmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/EmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/EmSpecialHandler.h
index 548e5fbc757..548e5fbc757 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/EmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/EmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FileFinder.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FileFinder.cpp
index 61c91058ec3..91f63b8d7f5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FileFinder.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FileFinder.cpp
@@ -30,8 +30,8 @@ using namespace std;
 
 #ifdef MIKTEX
 	#include "MessageException.h"
-	#import <MiKTeX208-session.tlb>
-	using namespace MiKTeXSession2_8;
+	#import <MiKTeX209-session.tlb>
+	using namespace MiKTeXSession2_9;
 
 	static ISession2Ptr miktex_session;
 #else
@@ -48,17 +48,28 @@ using namespace std;
 // ---------------------------------------------------
 // static member variables of FileFinder::Impl
 
-FileFinder::Impl* FileFinder::Impl::_instance = 0;
-const char *FileFinder::Impl::_progname = 0;
-bool FileFinder::Impl::_mktex_enabled = false;
-FontMap FileFinder::Impl::_fontmap;
-const char *FileFinder::Impl::_usermapname = 0;
+static bool _initialized = false;
+static bool _mktex_enabled = false;
+static FontMap _fontmap;
 
 // ---------------------------------------------------
 
+static const char* find_file (const std::string &fname);
+static const char* find_mapped_file (std::string fname);
+static const char* mktex (const std::string &fname);
+static void init_font_map (const char *usermapname);
 
-FileFinder::Impl::Impl ()
-{
+
+/** Initializes the file finder. This function must be called before any other
+ *  FileFinder function.
+ *  @param[in] progname name of appllication using the FileFinder
+ *  @param[in] enable_mktexmf if true, tfm and mf file generation is activated
+ *  @param[in] usermapname optional path to mapfile; if 0, the default files are used */
+void FileFinder::init (const char *progname, bool enable_mktexmf, const char *usermapname) {
+	if (_initialized)
+		return;
+
+	_mktex_enabled = enable_mktexmf;
 #ifdef MIKTEX
 	if (FAILED(CoInitialize(0)))
 		throw MessageException("COM library could not be initialized\n");
@@ -67,42 +78,48 @@ FileFinder::Impl::Impl ()
 	if (FAILED(hres))
 		throw MessageException("MiKTeX.Session could not be initialized");
 #else
-	kpse_set_program_name(_progname, NULL);
+	kpse_set_program_name(progname, NULL);
 	// enable tfm and mf generation (actually invoked by calls of kpse_make_tex)
 	kpse_set_program_enabled(kpse_tfm_format, 1, kpse_src_env);
 	kpse_set_program_enabled(kpse_mf_format, 1, kpse_src_env);
 	kpse_make_tex_discard_errors = false; // don't suppress messages of mktexFOO tools
 #endif
+	_initialized = true;
+	init_font_map(usermapname);
 }
 
 
-FileFinder::Impl::~Impl () {
-	delete _instance;
+/** Cleans up the FileFinder. This function must be called before leaving the
+ *  applications main() function. */
+void FileFinder::finish () {
 #ifdef MIKTEX
-	miktex_session = 0;  // avoid automatic calling of Release() after CoUninitialize()
-	CoUninitialize();
+	if (_initialized) {
+		miktex_session = 0;  // avoid automatic calling of Release() after CoUninitialize()
+		CoUninitialize();
+	}
 #endif
+	_initialized = false;
 }
 
 
-FileFinder::Impl& FileFinder::Impl::instance () {
-	if (!_instance) {
-		_instance = new FileFinder::Impl;
-		_instance->initFontMap();
+std::string FileFinder::version () {
+#ifdef MIKTEX
+	bool autoinit=false;
+	if (!_initialized) {
+		init("", false);
+		autoinit = true;
 	}
-	return *_instance;
-}
-
 
-std::string FileFinder::Impl::version () {
-#ifdef MIKTEX
-	instance();
 	try {
 		MiKTeXSetupInfo info = miktex_session->GetMiKTeXSetupInfo();
 		_bstr_t version = info.version;
+		if (autoinit)
+			FileFinder::finish();
 		return string(version);
 	}
 	catch (_com_error e) {
+		if (autoinit)
+			FileFinder::finish();
 		throw MessageException((const char*)e.Description());
 	}
 #else
@@ -117,7 +134,10 @@ std::string FileFinder::Impl::version () {
  *  to actually look up the file.
  *  @param[in] fname name of file to look up
  *  @return file path on success, 0 otherwise */
-const char* FileFinder::Impl::findFile (const std::string &fname) {
+static const char* find_file (const std::string &fname) {
+	if (!_initialized)
+		return 0;
+
 	size_t pos = fname.rfind('.');
 	if (pos == std::string::npos)
 		return 0;  // no extension => no search
@@ -172,7 +192,7 @@ const char* FileFinder::Impl::findFile (const std::string &fname) {
  *  @param[in] fname name of file to look up
  *  @param[in] fontmap font mappings
  *  @return file path on success, 0 otherwise */
-const char* FileFinder::Impl::findMappedFile (std::string fname) {
+static const char* find_mapped_file (std::string fname) {
 	size_t pos = fname.rfind('.');
 	if (pos == std::string::npos)
 		return 0;
@@ -182,7 +202,7 @@ const char* FileFinder::Impl::findMappedFile (std::string fname) {
 	if (mapped_name) {
 		fname = std::string(mapped_name) + "." + ext;
 		const char *path;
-		if ((path = findFile(fname)) || (path = mktex(fname)))
+		if ((path = find_file(fname)) || (path = mktex(fname)))
 			return path;
 	}
 	return 0;
@@ -192,7 +212,10 @@ const char* FileFinder::Impl::findMappedFile (std::string fname) {
 /** Runs external mktexFOO tool to create missing tfm or mf file.
  *  @param[in] fname name of file to build
  *  @return file path on success, 0 otherwise */
-const char* FileFinder::Impl::mktex (const std::string &fname) {
+static const char* mktex (const std::string &fname) {
+	if (!_initialized)
+		return 0;
+
 	size_t pos = fname.rfind('.');
 	if (!_mktex_enabled || pos == std::string::npos)
 		return 0;
@@ -207,7 +230,7 @@ const char* FileFinder::Impl::mktex (const std::string &fname) {
 	// maketfm and makemf are located in miktex/bin which is in the search PATH
 	string toolname = (ext == "tfm" ? "maketfm" : "makemf");
 	system((toolname+".exe "+fname).c_str());
-	path = findFile(fname);
+	path = find_file(fname);
 #else
 	kpse_file_format_type type = (ext == "tfm" ? kpse_tfm_format : kpse_mf_format);
 	path = kpse_make_tex(type, fname.c_str());
@@ -218,25 +241,25 @@ const char* FileFinder::Impl::mktex (const std::string &fname) {
 
 /** Initializes a font map by reading the map file(s).
  *  @param[in,out] fontmap font map to be initialized */
-void FileFinder::Impl::initFontMap () {
-	const char *usermapname = _usermapname;
-	if (usermapname && *usermapname == '+') // read additional map entries?
+static void init_font_map (const char *usermapname) {
+	bool additional = (usermapname && *usermapname == '+'); // read additional map entries?
+	if (additional)
 		usermapname++;
 	if (usermapname) {
 		// try to read user font map file
 		const char *mappath = 0;
 		if (!_fontmap.read(usermapname)) {
-			if ((mappath = findFile(usermapname)))
+			if ((mappath = find_file(usermapname)))
 				_fontmap.read(mappath);
 			else
 				Message::wstream(true) << "map file '" << usermapname << "' not found\n";
 		}
 	}
-	if (!usermapname || *_usermapname == '+') {
+	if (!usermapname || additional) {
 		const char *mapfiles[] = {"ps2pk.map", "dvipdfm.map", "psfonts.map", 0};
 		const char *mf=0;
 		for (const char **p=mapfiles; *p && !mf; p++)
-			if ((mf = findFile(*p))!=0)
+			if ((mf = find_file(*p))!=0)
 				_fontmap.read(mf);
 		if (!mf)
 			Message::wstream(true) << "none of the default map files could be found";
@@ -254,9 +277,9 @@ void FileFinder::Impl::initFontMap () {
  *  @param[in] fname name of file to look up
  *  @param[in] extended if true, use fontmap lookup and mktexFOO calls
  *  @return path to file on success, 0 otherwise */
-const char* FileFinder::Impl::lookup (const std::string &fname, bool extended) {
+const char* FileFinder::lookup (const std::string &fname, bool extended) {
 	const char *path;
-	if ((path = findFile(fname)) || (extended  && ((path = findMappedFile(fname)) || (path = mktex(fname)))))
+	if ((path = find_file(fname)) || (extended  && ((path = find_mapped_file(fname)) || (path = mktex(fname)))))
 		return path;
 	return 0;
 }
@@ -265,10 +288,10 @@ const char* FileFinder::Impl::lookup (const std::string &fname, bool extended) {
 /** Returns the path to the corresponding encoding file for a given font file.
  *  @param[in] fname name of the font file
  *  @return path to encoding file on success, 0 otherwise */
-const char* FileFinder::Impl::lookupEncFile (std::string fname) {
+const char* FileFinder::lookupEncFile (std::string fname) {
 	if (const char *encname = lookupEncName(fname)) {
 		fname = std::string(encname) + ".enc";
-		const char *path = findFile(fname);
+		const char *path = find_file(fname);
 		if (path)
 			return path;
 	}
@@ -276,7 +299,7 @@ const char* FileFinder::Impl::lookupEncFile (std::string fname) {
 }
 
 
-const char* FileFinder::Impl::lookupEncName (std::string fname) {
+const char* FileFinder::lookupEncName (std::string fname) {
 	size_t pos = fname.rfind('.');
 	if (pos != std::string::npos)
 		fname = fname.substr(0, pos); // strip extension
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FileFinder.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FileFinder.h
new file mode 100644
index 00000000000..6dcdf335e1c
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FileFinder.h
@@ -0,0 +1,37 @@
+/*************************************************************************
+** FileFinder.h                                                         **
+**                                                                      **
+** This file is part of dvisvgm -- the DVI to SVG converter             **
+** Copyright (C) 2005-2011 Martin Gieseking <martin.gieseking@uos.de>   **
+**                                                                      **
+** This program is free software; you can redistribute it and/or        **
+** modify it under the terms of the GNU General Public License as       **
+** published by the Free Software Foundation; either version 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           **
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the         **
+** GNU General Public License for more details.                         **
+**                                                                      **
+** You should have received a copy of the GNU General Public License    **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
+*************************************************************************/
+
+#ifndef KPSFILEFINDER_H
+#define KPSFILEFINDER_H
+
+#include <string>
+#include "FontMap.h"
+
+struct FileFinder
+{
+  	static void init (const char *progname, bool enable_mktexmf, const char *usermapname=0);
+	static void finish ();
+	static std::string version ();
+	static const char* lookup (const std::string &fname, bool extended=true);
+	static const char* lookupEncFile (std::string fontname);
+	static const char* lookupEncName (std::string fname);
+};
+
+#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FilePath.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FilePath.cpp
index 7f5db32120c..7f5db32120c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FilePath.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FilePath.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FilePath.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FilePath.h
index 4702cb8d969..4702cb8d969 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FilePath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FilePath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FileSystem.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FileSystem.cpp
index f53b84b42b4..f53b84b42b4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FileSystem.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FileSystem.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FileSystem.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FileSystem.h
index b53b42b09a8..b53b42b09a8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FileSystem.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FileSystem.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Font.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Font.cpp
index e2b2eb1911b..9ebd0515ffe 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Font.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Font.cpp
@@ -34,6 +34,7 @@
 #include "VFReader.h"
 #include "macros.h"
 #include "FileSystem.h"
+#include "SignalHandler.h"
 #include "SVGTree.h"
 
 using namespace std;
@@ -233,10 +234,11 @@ bool PhysicalFont::getGlyph (int c, GraphicPath<Int32> &glyph, GFGlyphTracer::Ca
  *  @param[out] gfname name of GF font file
  *  @return true on success */
 bool PhysicalFont::createGF (string &gfname) const {
+	SignalHandler::instance().check();
 	gfname = name()+".gf";
 	MetafontWrapper mf(name());
-	mf.make("ljfour", METAFONT_MAG); // call Metafont if necessary
-	return mf.success() && getTFM();
+	int ret = mf.make("ljfour", METAFONT_MAG); // call Metafont if necessary
+	return (ret == 0) && mf.success() && getTFM();
 }
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Font.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Font.h
index adddcb98458..adddcb98458 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Font.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Font.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontCache.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontCache.cpp
index c4ca8ad1fbf..c4ca8ad1fbf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontCache.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontCache.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontCache.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontCache.h
index 5ab7b885210..5ab7b885210 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontCache.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontCache.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontEncoding.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontEncoding.cpp
index e02e859933d..e02e859933d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontEncoding.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontEncoding.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontEncoding.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontEncoding.h
index 6766611f64f..6766611f64f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontEncoding.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontEncoding.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontEngine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontEngine.cpp
index 991813fc1a5..991813fc1a5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontEngine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontEngine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontEngine.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontEngine.h
index 678bc43c180..678bc43c180 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontEngine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontEngine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontManager.cpp
index 8f6958cdb42..8f6958cdb42 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontManager.h
index 14f6d2aae71..14f6d2aae71 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontMap.cpp
index 01075d91309..01075d91309 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontMap.h
index ec2c69af0f6..ec2c69af0f6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/FontMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/GFGlyphTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFGlyphTracer.cpp
index 9dbb4b5fa71..9dbb4b5fa71 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/GFGlyphTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFGlyphTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/GFGlyphTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFGlyphTracer.h
index 14a927fcef9..14a927fcef9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/GFGlyphTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFGlyphTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/GFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFReader.cpp
index 88cbbbc56ba..b47c175f048 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/GFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFReader.cpp
@@ -22,6 +22,7 @@
 #include <sstream>
 #include "GFReader.h"
 #include "macros.h"
+#include "SignalHandler.h"
 
 using namespace std;
 
@@ -82,6 +83,7 @@ string GFReader::readString (int bytes) {
  *  corresponding cmdFOO method.
  *  @return opcode of the executed command */
 int GFReader::executeCommand () {
+	SignalHandler::instance().check();
    /* Each cmdFOO command reads the necessary number of bytes from the stream so executeCommand
    doesn't need to know the exact GF command format. Some cmdFOO methods are used for multiple
 	GF commands because they only differ in the size of their parameters. */
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/GFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFReader.h
index cbc9fec3e77..cbc9fec3e77 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/GFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/GFTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFTracer.cpp
index 981d45dda10..981d45dda10 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/GFTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/GFTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFTracer.h
index 6d6a4351a05..6d6a4351a05 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/GFTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Ghostscript.cpp
index 0f8a0785b65..0f8a0785b65 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Ghostscript.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Ghostscript.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Ghostscript.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Ghostscript.h
index 69077afc027..69077afc027 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Ghostscript.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Ghostscript.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Glyph.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Glyph.h
index 5866f23737b..5866f23737b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Glyph.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Glyph.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/GlyphTracerMessages.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GlyphTracerMessages.h
index 4f99a2db2a9..4f99a2db2a9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/GlyphTracerMessages.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GlyphTracerMessages.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/GraphicPath.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GraphicPath.h
index bcebc040f38..bcebc040f38 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/GraphicPath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GraphicPath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/InputBuffer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/InputBuffer.cpp
index f5e7125f80b..f5e7125f80b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/InputBuffer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/InputBuffer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/InputBuffer.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/InputBuffer.h
index 910f66429e9..910f66429e9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/InputBuffer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/InputBuffer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/InputReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/InputReader.cpp
index 76652da26a8..76652da26a8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/InputReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/InputReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/InputReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/InputReader.h
index 0e3d23f5eb0..0e3d23f5eb0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/InputReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/InputReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Length.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Length.cpp
index 7ae102df7c5..7ae102df7c5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Length.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Length.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Length.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Length.h
index efd353695a7..efd353695a7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Length.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Length.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Makefile.am
index 664821a42e6..70718e5a1df 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Makefile.am
@@ -8,7 +8,7 @@ noinst_LIBRARIES     = libdvisvgm.a
 
 dvisvgm_SOURCES      = gzstream.h \
 							  dvisvgm.cpp gzstream.cpp
-							  
+
 dvisvgm_LDADD        = $(noinst_LIBRARIES) @EXTRA_LIBS@
 dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES) @EXTRA_LIBS@
 
@@ -16,17 +16,18 @@ libdvisvgm_a_SOURCES = Bitmap.h BoundingBox.h BgColorSpecialHandler.h Calculator
 	ColorSpecialHandler.h CommandLine.h Directory.h DLLoader.h DVIActions.h DVIReader.h DvisvgmSpecialHandler.h DVIToSVG.h \
 	DVIToSVGActions.h EmSpecialHandler.h FileFinder.h FilePath.h FileSystem.h Font.h FontCache.h FontEncoding.h FontEngine.h \
 	FontManager.h FontMap.h GFReader.h GFTracer.h GFGlyphTracer.h Ghostscript.h Glyph.h GlyphTracerMessages.h \
-	GraphicPath.h InputBuffer.h InputReader.h Length.h macros.h Matrix.h Message.h MessageException.h MetafontWrapper.h PageRanges.h \
-	PageSize.h Pair.h PSInterpreter.h PsSpecialHandler.h SpecialActions.h SpecialHandler.h SpecialManager.h StreamReader.h \
-	StreamWriter.h SVGTree.h System.h Terminal.h TpicSpecialHandler.h TFM.h types.h VectorStream.h VFActions.h VFReader.h XMLDocTypeNode.h \
-	XMLDocument.h XMLNode.h XMLString.h \
+	GraphicPath.h InputBuffer.h InputReader.h Length.h macros.h Matrix.h Message.h MessageException.h MetafontWrapper.h \
+	PageRanges.h PageSize.h Pair.h PSInterpreter.h PsSpecialHandler.h SignalHandler.h SpecialActions.h SpecialHandler.h \
+	SpecialManager.h StreamReader.h StreamWriter.h SVGTree.h System.h Terminal.h TpicSpecialHandler.h TFM.h types.h \
+	VectorStream.h VFActions.h VFReader.h XMLDocTypeNode.h XMLDocument.h XMLNode.h XMLString.h \
 	BgColorSpecialHandler.cpp Bitmap.cpp BoundingBox.cpp Calculator.cpp CmdLineParserBase.cpp Color.cpp \
-  	ColorSpecialHandler.cpp CommandLine.cpp CRC32.cpp Directory.cpp DLLoader.cpp DVIActions.cpp DVIReader.cpp DvisvgmSpecialHandler.cpp \
-	DVIToSVG.cpp DVIToSVGActions.cpp EmSpecialHandler.cpp FileFinder.cpp FilePath.cpp FileSystem.cpp Font.cpp FontCache.cpp \
-   FontEncoding.cpp FontEngine.cpp FontManager.cpp FontMap.cpp GFReader.cpp GFGlyphTracer.cpp GFTracer.cpp Ghostscript.cpp \
-	InputBuffer.cpp InputReader.cpp Length.cpp Matrix.cpp Message.cpp MetafontWrapper.cpp PageRanges.cpp PageSize.cpp PSInterpreter.cpp \
-	PsSpecialHandler.cpp SpecialManager.cpp StreamReader.cpp StreamWriter.cpp SVGTree.cpp System.cpp Terminal.cpp TFM.cpp \
-	TpicSpecialHandler.cpp VFReader.cpp XMLDocument.cpp XMLNode.cpp XMLString.cpp
+	ColorSpecialHandler.cpp CommandLine.cpp CRC32.cpp Directory.cpp DLLoader.cpp DVIActions.cpp DVIReader.cpp \
+	DvisvgmSpecialHandler.cpp DVIToSVG.cpp DVIToSVGActions.cpp EmSpecialHandler.cpp FileFinder.cpp FilePath.cpp \
+	FileSystem.cpp Font.cpp FontCache.cpp FontEncoding.cpp FontEngine.cpp FontManager.cpp FontMap.cpp GFReader.cpp \
+	GFGlyphTracer.cpp GFTracer.cpp Ghostscript.cpp InputBuffer.cpp InputReader.cpp Length.cpp Matrix.cpp Message.cpp \
+	MetafontWrapper.cpp PageRanges.cpp PageSize.cpp PSInterpreter.cpp PsSpecialHandler.cpp SignalHandler.cpp \
+	SpecialManager.cpp StreamReader.cpp StreamWriter.cpp SVGTree.cpp System.cpp Terminal.cpp TFM.cpp TpicSpecialHandler.cpp \
+	VFReader.cpp XMLDocument.cpp XMLNode.cpp XMLString.cpp
 
 EXTRA_DIST = options.xml psdefs.psc iapi.h ierrors.h
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Makefile.in
index 54f658f2083..b68074c0373 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Makefile.in
@@ -69,11 +69,11 @@ am_libdvisvgm_a_OBJECTS = BgColorSpecialHandler.$(OBJEXT) \
 	Message.$(OBJEXT) MetafontWrapper.$(OBJEXT) \
 	PageRanges.$(OBJEXT) PageSize.$(OBJEXT) \
 	PSInterpreter.$(OBJEXT) PsSpecialHandler.$(OBJEXT) \
-	SpecialManager.$(OBJEXT) StreamReader.$(OBJEXT) \
-	StreamWriter.$(OBJEXT) SVGTree.$(OBJEXT) System.$(OBJEXT) \
-	Terminal.$(OBJEXT) TFM.$(OBJEXT) TpicSpecialHandler.$(OBJEXT) \
-	VFReader.$(OBJEXT) XMLDocument.$(OBJEXT) XMLNode.$(OBJEXT) \
-	XMLString.$(OBJEXT)
+	SignalHandler.$(OBJEXT) SpecialManager.$(OBJEXT) \
+	StreamReader.$(OBJEXT) StreamWriter.$(OBJEXT) \
+	SVGTree.$(OBJEXT) System.$(OBJEXT) Terminal.$(OBJEXT) \
+	TFM.$(OBJEXT) TpicSpecialHandler.$(OBJEXT) VFReader.$(OBJEXT) \
+	XMLDocument.$(OBJEXT) XMLNode.$(OBJEXT) XMLString.$(OBJEXT)
 libdvisvgm_a_OBJECTS = $(am_libdvisvgm_a_OBJECTS)
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
@@ -219,17 +219,18 @@ libdvisvgm_a_SOURCES = Bitmap.h BoundingBox.h BgColorSpecialHandler.h Calculator
 	ColorSpecialHandler.h CommandLine.h Directory.h DLLoader.h DVIActions.h DVIReader.h DvisvgmSpecialHandler.h DVIToSVG.h \
 	DVIToSVGActions.h EmSpecialHandler.h FileFinder.h FilePath.h FileSystem.h Font.h FontCache.h FontEncoding.h FontEngine.h \
 	FontManager.h FontMap.h GFReader.h GFTracer.h GFGlyphTracer.h Ghostscript.h Glyph.h GlyphTracerMessages.h \
-	GraphicPath.h InputBuffer.h InputReader.h Length.h macros.h Matrix.h Message.h MessageException.h MetafontWrapper.h PageRanges.h \
-	PageSize.h Pair.h PSInterpreter.h PsSpecialHandler.h SpecialActions.h SpecialHandler.h SpecialManager.h StreamReader.h \
-	StreamWriter.h SVGTree.h System.h Terminal.h TpicSpecialHandler.h TFM.h types.h VectorStream.h VFActions.h VFReader.h XMLDocTypeNode.h \
-	XMLDocument.h XMLNode.h XMLString.h \
+	GraphicPath.h InputBuffer.h InputReader.h Length.h macros.h Matrix.h Message.h MessageException.h MetafontWrapper.h \
+	PageRanges.h PageSize.h Pair.h PSInterpreter.h PsSpecialHandler.h SignalHandler.h SpecialActions.h SpecialHandler.h \
+	SpecialManager.h StreamReader.h StreamWriter.h SVGTree.h System.h Terminal.h TpicSpecialHandler.h TFM.h types.h \
+	VectorStream.h VFActions.h VFReader.h XMLDocTypeNode.h XMLDocument.h XMLNode.h XMLString.h \
 	BgColorSpecialHandler.cpp Bitmap.cpp BoundingBox.cpp Calculator.cpp CmdLineParserBase.cpp Color.cpp \
-  	ColorSpecialHandler.cpp CommandLine.cpp CRC32.cpp Directory.cpp DLLoader.cpp DVIActions.cpp DVIReader.cpp DvisvgmSpecialHandler.cpp \
-	DVIToSVG.cpp DVIToSVGActions.cpp EmSpecialHandler.cpp FileFinder.cpp FilePath.cpp FileSystem.cpp Font.cpp FontCache.cpp \
-   FontEncoding.cpp FontEngine.cpp FontManager.cpp FontMap.cpp GFReader.cpp GFGlyphTracer.cpp GFTracer.cpp Ghostscript.cpp \
-	InputBuffer.cpp InputReader.cpp Length.cpp Matrix.cpp Message.cpp MetafontWrapper.cpp PageRanges.cpp PageSize.cpp PSInterpreter.cpp \
-	PsSpecialHandler.cpp SpecialManager.cpp StreamReader.cpp StreamWriter.cpp SVGTree.cpp System.cpp Terminal.cpp TFM.cpp \
-	TpicSpecialHandler.cpp VFReader.cpp XMLDocument.cpp XMLNode.cpp XMLString.cpp
+	ColorSpecialHandler.cpp CommandLine.cpp CRC32.cpp Directory.cpp DLLoader.cpp DVIActions.cpp DVIReader.cpp \
+	DvisvgmSpecialHandler.cpp DVIToSVG.cpp DVIToSVGActions.cpp EmSpecialHandler.cpp FileFinder.cpp FilePath.cpp \
+	FileSystem.cpp Font.cpp FontCache.cpp FontEncoding.cpp FontEngine.cpp FontManager.cpp FontMap.cpp GFReader.cpp \
+	GFGlyphTracer.cpp GFTracer.cpp Ghostscript.cpp InputBuffer.cpp InputReader.cpp Length.cpp Matrix.cpp Message.cpp \
+	MetafontWrapper.cpp PageRanges.cpp PageSize.cpp PSInterpreter.cpp PsSpecialHandler.cpp SignalHandler.cpp \
+	SpecialManager.cpp StreamReader.cpp StreamWriter.cpp SVGTree.cpp System.cpp Terminal.cpp TFM.cpp TpicSpecialHandler.cpp \
+	VFReader.cpp XMLDocument.cpp XMLNode.cpp XMLString.cpp
 
 EXTRA_DIST = options.xml psdefs.psc iapi.h ierrors.h
 AM_CXXFLAGS = -Wall -Wnon-virtual-dtor
@@ -362,6 +363,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PageSize.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PsSpecialHandler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGTree.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SignalHandler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SpecialManager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StreamReader.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StreamWriter.Po@am__quote@
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Matrix.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Matrix.cpp
index 0e3dbc93024..0e3dbc93024 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Matrix.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Matrix.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Matrix.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Matrix.h
index 5c3b7442081..5c3b7442081 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Matrix.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Matrix.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Message.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Message.cpp
index 52cb6da56d0..52cb6da56d0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Message.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Message.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Message.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Message.h
index a69b414c727..a69b414c727 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Message.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Message.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/MessageException.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/MessageException.h
index 75f403a9f60..338c9daac9f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/MessageException.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/MessageException.h
@@ -21,14 +21,16 @@
 #ifndef MESSAGEEXCEPTION_H
 #define MESSAGEEXCEPTION_H
 
+#include <exception>
 #include <string>
 
 
-class MessageException
+class MessageException : public std::exception
 {
    public:
       MessageException (const std::string &msg) : message(msg) {}
-      const std::string& getMessage () const {return message;}
+      virtual ~MessageException () throw() {}
+      const char* what () const throw() {return message.c_str();}
 
    private:
 		std::string message;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/MetafontWrapper.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/MetafontWrapper.cpp
index db516006304..e04187491f6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/MetafontWrapper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/MetafontWrapper.cpp
@@ -26,6 +26,7 @@
 #include "FileFinder.h"
 #include "Message.h"
 #include "MetafontWrapper.h"
+#include "SignalHandler.h"
 
 #ifdef __WIN32__
 #include <windows.h>
@@ -90,7 +91,7 @@ int MetafontWrapper::call (const string &mode, double mag) {
 	const char *cmd = "mf";
 #endif
 	ostringstream oss;
-	oss << "\"\\mode=" << mode  << ";"
+	oss << "--halt-on-error \"\\mode=" << mode  << ";"
 		   "mag:=" << mag << ";"
 		   "batchmode;"
 		   "input " << _fontname << "\"";
@@ -104,6 +105,8 @@ int MetafontWrapper::call (const string &mode, double mag) {
 		while (ifs) {
 			ifs.getline(buf, 128);
 			string line = buf;
+			if (line.substr(0, 15) == "! Interruption.")
+				SignalHandler::instance().trigger(true);
 			if (line.substr(0, 17) == "Output written on") {
 				size_t pos = line.find("gf ", 18+_fontname.length());
 				if (pos != string::npos) {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/MetafontWrapper.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/MetafontWrapper.h
index ce4ccbb5e5e..ce4ccbb5e5e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/MetafontWrapper.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/MetafontWrapper.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/PSInterpreter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PSInterpreter.cpp
index ee587885f53..e149aeb5128 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/PSInterpreter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PSInterpreter.cpp
@@ -27,6 +27,7 @@
 #include "Message.h"
 #include "PSInterpreter.h"
 #include "psdefs.psc"
+#include "SignalHandler.h"
 
 using namespace std;
 
@@ -83,6 +84,7 @@ void PSInterpreter::execute (const char *str, size_t len, bool flush) {
 		// feed Ghostscript with code chunks that are not larger than 64KB
 		// => see documentation of gsapi_run_string_foo()
 		while (PS_RUNNING && len > 0) {
+			SignalHandler::instance().check();
 			size_t chunksize = min(len, (size_t)0xffff);
 			_gs.run_string_continue(p, chunksize, 0, &status);
 			p += chunksize;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/PSInterpreter.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PSInterpreter.h
index 9f9d562ec9f..9f9d562ec9f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/PSInterpreter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PSInterpreter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/PageRanges.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PageRanges.cpp
index 9c985972b72..9c985972b72 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/PageRanges.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PageRanges.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/PageRanges.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PageRanges.h
index f15641b9f70..f15641b9f70 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/PageRanges.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PageRanges.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/PageSize.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PageSize.cpp
index 88990136285..88990136285 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/PageSize.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PageSize.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/PageSize.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PageSize.h
index c2ca163e051..c2ca163e051 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/PageSize.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PageSize.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Pair.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Pair.h
index 9e6d1f0d0d1..9e6d1f0d0d1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Pair.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Pair.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/PsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PsSpecialHandler.cpp
index 79c49abad86..79c49abad86 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/PsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PsSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/PsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PsSpecialHandler.h
index 9c1e082e5dd..9c1e082e5dd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/PsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PsSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/SVGTree.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SVGTree.cpp
index 07cdca2a4b9..07cdca2a4b9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/SVGTree.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SVGTree.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/SVGTree.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SVGTree.h
index a9659f72b37..a9659f72b37 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/SVGTree.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SVGTree.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SignalHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SignalHandler.cpp
new file mode 100644
index 00000000000..00851d8502f
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SignalHandler.cpp
@@ -0,0 +1,85 @@
+/*************************************************************************
+** SignalHandler.cpp                                                    **
+**                                                                      **
+** This file is part of dvisvgm -- the DVI to SVG converter             **
+** Copyright (C) 2005-2011 Martin Gieseking <martin.gieseking@uos.de>   **
+**                                                                      **
+** This program is free software; you can redistribute it and/or        **
+** modify it under the terms of the GNU General Public License as       **
+** published by the Free Software Foundation; either version 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           **
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the         **
+** GNU General Public License for more details.                         **
+**                                                                      **
+** You should have received a copy of the GNU General Public License    **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
+*************************************************************************/
+
+#include <cerrno>
+#include <csignal>
+#include <cstdlib>
+#include "SignalHandler.h"
+
+using namespace std;
+
+bool SignalHandler::_break = false;
+
+
+SignalHandler::~SignalHandler() {
+	stop();
+}
+
+
+/** Returns the singleton handler object. */
+SignalHandler& SignalHandler::instance() {
+	static SignalHandler handler;
+	return handler;
+}
+
+
+/** Starts listening to CTRL-C signals.
+ *  @return true if handler was activated. */
+bool SignalHandler::start () {
+	if (!_active) {
+		_break = false;		
+		if (signal(SIGINT, SignalHandler::callback) != SIG_ERR) {
+			_active = true;
+			return true;
+		}
+	}
+	return false;
+}
+
+
+/** Stops listening for CTRL-C signals. */
+void SignalHandler::stop () {
+	if (_active) {
+		signal(SIGINT, SIG_DFL);
+		_active = false;
+	}
+}
+
+
+/** Checks for incoming signals and throws an exception if CTRL-C was caught.
+ *  @throw SignalException */
+void SignalHandler::check() {
+	if (_break)
+		throw SignalException();
+}
+
+
+void SignalHandler::trigger (bool notify) {
+  _break = true;
+  if (notify)
+     check();
+}
+
+
+/** This function is called on CTRL-C signals. */
+void SignalHandler::callback (int) {
+	_break = true;
+}
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SignalHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SignalHandler.h
new file mode 100644
index 00000000000..70d2abd8ee8
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SignalHandler.h
@@ -0,0 +1,50 @@
+/*************************************************************************
+** SignalHandler.h                                                      **
+**                                                                      **
+** This file is part of dvisvgm -- the DVI to SVG converter             **
+** Copyright (C) 2005-2011 Martin Gieseking <martin.gieseking@uos.de>   **
+**                                                                      **
+** This program is free software; you can redistribute it and/or        **
+** modify it under the terms of the GNU General Public License as       **
+** published by the Free Software Foundation; either version 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           **
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the         **
+** GNU General Public License for more details.                         **
+**                                                                      **
+** You should have received a copy of the GNU General Public License    **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
+*************************************************************************/
+
+#ifndef SIGNALHANDLER_H
+#define SIGNALHANDLER_H
+
+#include <exception>
+
+struct SignalException : public std::exception {
+};
+
+
+class SignalHandler
+{
+   public:
+      ~SignalHandler ();
+      static SignalHandler& instance ();
+      bool start ();
+      void stop ();
+      void check ();
+		void trigger (bool notify);
+      bool active () const {return _active;}
+
+   protected:
+      SignalHandler () : _active(false) {}
+      static void callback (int signal);
+
+   private:
+      bool _active;       ///< true if listening for signals
+      static bool _break; ///< true if signal has been caught
+};
+
+#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/SpecialActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SpecialActions.h
index b891bbadfba..b891bbadfba 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/SpecialActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SpecialActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/SpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SpecialHandler.h
index 465d59aed25..465d59aed25 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/SpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/SpecialManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SpecialManager.cpp
index 1ac871aa131..1ac871aa131 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/SpecialManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SpecialManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/SpecialManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SpecialManager.h
index 90033098687..90033098687 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/SpecialManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SpecialManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/StreamReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/StreamReader.cpp
index 65c7149f780..65c7149f780 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/StreamReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/StreamReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/StreamReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/StreamReader.h
index 6fbd94e00de..6fbd94e00de 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/StreamReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/StreamReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/StreamWriter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/StreamWriter.cpp
index 2a1e7b4a34f..2a1e7b4a34f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/StreamWriter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/StreamWriter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/StreamWriter.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/StreamWriter.h
index 440bd94a2a9..440bd94a2a9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/StreamWriter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/StreamWriter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/System.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/System.cpp
index b57c0662462..b57c0662462 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/System.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/System.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/System.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/System.h
index 3485c27e6b5..3485c27e6b5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/System.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/System.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/TFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/TFM.cpp
index 89b62bb088c..d56185d0086 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/TFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/TFM.cpp
@@ -23,7 +23,6 @@
 #include <vector>
 #include "FileFinder.h"
 #include "Message.h"
-#include "MetafontWrapper.h"
 #include "StreamReader.h"
 #include "TFM.h"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/TFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/TFM.h
index 09accaea2c6..09accaea2c6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/TFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/TFM.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Terminal.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Terminal.cpp
index 0cbb4116796..0cbb4116796 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Terminal.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Terminal.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Terminal.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Terminal.h
index 33f71312ffe..33f71312ffe 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/Terminal.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Terminal.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/TpicSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/TpicSpecialHandler.cpp
index 4b4f2054d40..4b4f2054d40 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/TpicSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/TpicSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/TpicSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/TpicSpecialHandler.h
index f14b58de670..f14b58de670 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/TpicSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/TpicSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/VFActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/VFActions.h
index 898fd8850c1..898fd8850c1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/VFActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/VFActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/VFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/VFReader.cpp
index 57660c99825..57660c99825 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/VFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/VFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/VFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/VFReader.h
index 22e51f30a0e..22e51f30a0e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/VFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/VFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/VectorStream.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/VectorStream.h
index 228089db9b2..228089db9b2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/VectorStream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/VectorStream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/XMLDocTypeNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLDocTypeNode.h
index 490d398b6b7..490d398b6b7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/XMLDocTypeNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLDocTypeNode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/XMLDocument.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLDocument.cpp
index 39973266a7c..39973266a7c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/XMLDocument.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLDocument.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/XMLDocument.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLDocument.h
index 8adab2fb0dd..8adab2fb0dd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/XMLDocument.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLDocument.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/XMLNode.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLNode.cpp
index 67d179e69cc..3e5aa93ca62 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/XMLNode.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLNode.cpp
@@ -32,23 +32,23 @@ bool XMLNode::emit (ostream &os, XMLNode *stopNode) {
 }
 
 
-XMLElementNode::XMLElementNode (const string &n) : name(n), emitted(false) {
+XMLElementNode::XMLElementNode (const string &n) : _name(n), _emitted(false) {
 }
 
 
 XMLElementNode::~XMLElementNode () {
-	FORALL(children, ElementList::iterator, i)
+	FORALL(_children, ChildList::iterator, i)
 		delete *i;
 }
 
 
 void XMLElementNode::addAttribute (const string &name, const string &value) {
-	attributes[name] = value;
+	_attributes[name] = value;
 }
 
 
 void XMLElementNode::addAttribute (const string &name, double value) {
-	attributes[name] = XMLString(value);
+	_attributes[name] = XMLString(value);
 }
 
 
@@ -56,22 +56,22 @@ void XMLElementNode::append (XMLNode *child) {
 	if (!child)
 		return;
 	XMLTextNode *textNode1 = dynamic_cast<XMLTextNode*>(child);
-	if (!textNode1 || children.empty())
-		children.push_back(child);
+	if (!textNode1 || _children.empty())
+		_children.push_back(child);
 	else {
-		if (XMLTextNode *textNode2 = dynamic_cast<XMLTextNode*>(children.back()))
+		if (XMLTextNode *textNode2 = dynamic_cast<XMLTextNode*>(_children.back()))
 			textNode2->append(textNode1);  // merge two consecutive text nodes
 		else
-			children.push_back(child);
+			_children.push_back(child);
 	}
 }
 
 
 void XMLElementNode::append (const string &str) {
-	if (children.empty() || !dynamic_cast<XMLTextNode*>(children.back()))
-		children.push_back(new XMLTextNode(str));
+	if (_children.empty() || !dynamic_cast<XMLTextNode*>(_children.back()))
+		_children.push_back(new XMLTextNode(str));
 	else
-		static_cast<XMLTextNode*>(children.back())->append(str);
+		static_cast<XMLTextNode*>(_children.back())->append(str);
 }
 
 
@@ -79,13 +79,13 @@ void XMLElementNode::prepend (XMLNode *child) {
 	if (!child)
 		return;
 	XMLTextNode *textNode1 = dynamic_cast<XMLTextNode*>(child);
-	if (!textNode1 || children.empty())
-		children.push_front(child);
+	if (!textNode1 || _children.empty())
+		_children.push_front(child);
 	else {
-		if (XMLTextNode *textNode2 = dynamic_cast<XMLTextNode*>(children.back()))
+		if (XMLTextNode *textNode2 = dynamic_cast<XMLTextNode*>(_children.back()))
 			textNode2->prepend(textNode1);  // merge two consecutive text nodes
 		else
-			children.push_front(child);
+			_children.push_front(child);
 	}
 }
 
@@ -97,11 +97,11 @@ void XMLElementNode::prepend (XMLNode *child) {
  *  @param[in] sibling following sibling of 'child'
  *  @return true on success */
 bool XMLElementNode::insertBefore (XMLNode *child, XMLNode *sibling) {
-	ElementList::iterator it = children.begin();
-	while (it != children.end() && *it != sibling)
+	ChildList::iterator it = _children.begin();
+	while (it != _children.end() && *it != sibling)
 		++it;
-	if (it != children.end()) {
-		children.insert(it, child);
+	if (it != _children.end()) {
+		_children.insert(it, child);
 		return true;
 	}
 	return false;
@@ -115,11 +115,11 @@ bool XMLElementNode::insertBefore (XMLNode *child, XMLNode *sibling) {
  *  @param[in] sibling preceding sibling of 'child'
  *  @return true on success */
 bool XMLElementNode::insertAfter (XMLNode *child, XMLNode *sibling) {
-	ElementList::iterator it = children.begin();
-	while (it != children.end() && *it != sibling)
+	ChildList::iterator it = _children.begin();
+	while (it != _children.end() && *it != sibling)
 		++it;
-	if (it != children.end()) {
-		children.insert(++it, child);
+	if (it != _children.end()) {
+		_children.insert(++it, child);
 		return true;
 	}
 	return false;
@@ -127,18 +127,18 @@ bool XMLElementNode::insertAfter (XMLNode *child, XMLNode *sibling) {
 
 
 ostream& XMLElementNode::write (ostream &os) const {
-	os << '<' << name;
-	FORALL(attributes, AttribMap::const_iterator, i)
+	os << '<' << _name;
+	FORALL(_attributes, AttribMap::const_iterator, i)
 		os << ' ' << i->first << "='" << i->second << '\'';
-	if (children.empty())
+	if (_children.empty())
 		os << "/>\n";
 	else {
 		os << '>';
-		if (dynamic_cast<XMLElementNode*>(children.front()))
+		if (dynamic_cast<XMLElementNode*>(_children.front()))
 			os << '\n';
-		FORALL(children, ElementList::const_iterator, i)
+		FORALL(_children, ChildList::const_iterator, i)
 			(*i)->write(os);
-		os << "</" << name << ">\n";
+		os << "</" << _name << ">\n";
 	}
 	return os;
 }
@@ -150,44 +150,44 @@ ostream& XMLElementNode::write (ostream &os) const {
  *  its child was the stop node, a further call of emit will continue the output.
  *  @param[in] os stream to which the output is sent to
  *  @param[in] stopElement node where emitting stops (if 0 the whole tree will be emitted)
- *  @return true if node was completely emitted
- * */
+ *  @return true if node was emitted completely */
 bool XMLElementNode::emit (ostream &os, XMLNode *stopNode) {
 	if (this == stopNode)
 		return false;
 
-	if (!emitted) {
-		os << '<' << name;
-		FORALL(attributes, AttribMap::iterator, i)
+	if (!_emitted) {
+		os << '<' << _name;
+		FORALL(_attributes, AttribMap::iterator, i)
 			os << ' ' << i->first << "='" << i->second << '\'';
-		if (children.empty())
+		if (_children.empty())
 			os << "/>\n";
 		else {
 			os << '>';
-			if (dynamic_cast<XMLElementNode*>(children.front()))
+			if (dynamic_cast<XMLElementNode*>(_children.front()))
 				os << '\n';
 		}
 
-		emitted = true;
+		_emitted = true;
 	}
-	if (!children.empty()) {
-		FORALL(children, ElementList::iterator, i) {
+	if (!_children.empty()) {
+		FORALL(_children, ChildList::iterator, i) {
 			if ((*i)->emit(os, stopNode)) {
-				ElementList::iterator it = i++;  // prevent i from being invalidated...
-				children.erase(it);              // ... by erase
+				ChildList::iterator it = i++;  // prevent i from being invalidated...
+				_children.erase(it);              // ... by erase
 				--i;  // @@ what happens if i points to first child?
 			}
 			else
 				return false;
 		}
-		os << "</" << name << ">\n";
+		os << "</" << _name << ">\n";
 	}
 	return true;
 }
 
 
+/** Returns true if this element has an attribute of given name. */
 bool XMLElementNode::hasAttribute (const string &name) const {
-	return attributes.find(name) != attributes.end();
+	return _attributes.find(name) != _attributes.end();
 }
 
 
@@ -203,13 +203,13 @@ void XMLTextNode::append (XMLNode *node) {
 
 void XMLTextNode::append (XMLTextNode *node) {
 	if (node)
-		text += node->text;
+		_text += node->_text;
 	delete node;
 }
 
 
 void XMLTextNode::append (const string &str) {
-	text += str;
+	_text += str;
 }
 
 
@@ -224,28 +224,28 @@ void XMLTextNode::prepend (XMLNode *node) {
 //////////////////////
 
 XMLDeclarationNode::XMLDeclarationNode (const string &n, const string &p)
-	: name(n), params(p), emitted(false)
+	: _name(n), _params(p), _emitted(false)
 {
 }
 
 
 XMLDeclarationNode::~XMLDeclarationNode () {
-	FORALL(children, list<XMLDeclarationNode*>::iterator, i)
+	FORALL(_children, list<XMLDeclarationNode*>::iterator, i)
 		delete *i;
 }
 
 void XMLDeclarationNode::append (XMLDeclarationNode *child) {
 	if (child)
-		children.push_back(child);
+		_children.push_back(child);
 }
 
 ostream& XMLDeclarationNode::write (ostream &os) const {
-	os << "<!" << name << ' ' << params;
-	if (children.empty())
+	os << "<!" << _name << ' ' << _params;
+	if (_children.empty())
 		os << ">\n";
 	else {
 		os << "[\n";
-		FORALL(children, list<XMLDeclarationNode*>::const_iterator, i)
+		FORALL(_children, list<XMLDeclarationNode*>::const_iterator, i)
 			(*i)->write(os);
 		os << "]>\n";
 	}
@@ -257,19 +257,19 @@ bool XMLDeclarationNode::emit (ostream &os, XMLNode *stopNode) {
 	if (this == stopNode)
 		return false;
 
-	if (!emitted) {
-		os << "<!" << name << ' ' << params;
-		if (children.empty())
+	if (!_emitted) {
+		os << "<!" << _name << ' ' << _params;
+		if (_children.empty())
 			os << ">\n";
 		else
 			os << "[\n";
-		emitted = true;
+		_emitted = true;
 	}
-	if (!children.empty()) {
-		FORALL(children, list<XMLDeclarationNode*>::iterator, i) {
+	if (!_children.empty()) {
+		FORALL(_children, list<XMLDeclarationNode*>::iterator, i) {
 			if ((*i)->emit(os, stopNode)) {
 				list<XMLDeclarationNode*>::iterator it = i++;  // prevent i from being invalidated...
-				children.erase(it);              // ... by erase
+				_children.erase(it);              // ... by erase
 				--i;  // @@ what happens if i points to first child?
 			}
 			else
@@ -285,7 +285,7 @@ bool XMLDeclarationNode::emit (ostream &os, XMLNode *stopNode) {
 
 ostream& XMLCDataNode::write (ostream &os) const {
 	os << "<![CDATA[\n"
-		<< data
+		<< _data
 		<< "]]>\n";
 	return os;
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/XMLNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLNode.h
index a2f602e62ca..e4576e9d830 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/XMLNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLNode.h
@@ -26,6 +26,8 @@
 #include <ostream>
 #include <string>
 
+#include "SpecialActions.h"
+
 
 struct XMLNode
 {
@@ -40,7 +42,7 @@ struct XMLNode
 class XMLElementNode : public XMLNode
 {
 	typedef std::map<std::string,std::string> AttribMap;
-	typedef std::list<XMLNode*> ElementList;
+	typedef std::list<XMLNode*> ChildList;
 	public:
       XMLElementNode (const std::string &name);
 		~XMLElementNode ();
@@ -54,39 +56,41 @@ class XMLElementNode : public XMLNode
 		bool hasAttribute (const std::string &name) const;
 		std::ostream& write (std::ostream &os) const;
 		bool emit (std::ostream &os, XMLNode *stopElement);
-		bool empty () const  {return children.empty();}
+		bool empty () const                          {return _children.empty();}
+      const std::list<XMLNode*>& children () const {return _children;}
+      const std::string& getName () const          {return _name;}
 
 	private:
-		std::string name;          // element name (<name a1="v1" .. an="vn">...</name>)
-		AttribMap attributes;
-		ElementList children; // child nodes
-		bool emitted;         // true if node has been (partly) emitted
+		std::string _name;     // element name (<name a1="v1" .. an="vn">...</name>)
+		AttribMap _attributes;
+		ChildList _children;   // child nodes
+		bool _emitted;         // true if node has been (partly) emitted
 };
 
 
 class XMLTextNode : public XMLNode
 {
 	public:
-		XMLTextNode (const std::string &str) : text(str) {}
+		XMLTextNode (const std::string &str) : _text(str) {}
 		void append (XMLNode *node);
 		void append (XMLTextNode *node);
 		void append (const std::string &str);
 		void prepend (XMLNode *child);
-		std::ostream& write (std::ostream &os) const {return os << text;}
+		std::ostream& write (std::ostream &os) const {return os << _text;}
 
 	private:
-		std::string text;
+		std::string _text;
 };
 
 
 class XMLCommentNode : public XMLNode
 {
 	public:
-		XMLCommentNode (const std::string &str) : text(str) {}
-		std::ostream& write (std::ostream &os) const {return os << "<!--" << text << "-->\n";}
+		XMLCommentNode (const std::string &str) : _text(str) {}
+		std::ostream& write (std::ostream &os) const {return os << "<!--" << _text << "-->\n";}
 
 	private:
-		std::string text;
+		std::string _text;
 };
 
 
@@ -100,21 +104,21 @@ class XMLDeclarationNode : public XMLNode
 		bool emit (std::ostream &os, XMLNode *stopElement);
 
 	private:
-		std::string name;
-		std::string params;
-		std::list<XMLDeclarationNode*> children;
-		bool emitted;
+		std::string _name;
+		std::string _params;
+		std::list<XMLDeclarationNode*> _children;
+		bool _emitted;
 };
 
 
 class XMLCDataNode : public XMLNode
 {
 	public:
-		XMLCDataNode (const std::string &d) : data(d) {}
+		XMLCDataNode (const std::string &d) : _data(d) {}
 		std::ostream& write (std::ostream &os) const;
 
 	private:
-		std::string data;
+		std::string _data;
 };
 
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/XMLString.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLString.cpp
index 630736b29f0..630736b29f0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/XMLString.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLString.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/XMLString.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLString.h
index 2f669e21fb7..2f669e21fb7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/XMLString.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLString.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/dvisvgm.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/dvisvgm.cpp
index 02e1095ef13..90015fccbc7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/dvisvgm.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/dvisvgm.cpp
@@ -38,6 +38,7 @@
 #include "Message.h"
 #include "FileFinder.h"
 #include "PageSize.h"
+#include "SignalHandler.h"
 #include "SpecialManager.h"
 #include "System.h"
 
@@ -261,7 +262,7 @@ static bool check_bbox (const string &bboxstr) {
 		return true;
 	}
 	catch (const MessageException &e) {
-		Message::estream(true) << e.getMessage() << '\n';
+		Message::estream(true) << e.what() << '\n';
 		return false;
 	}
 }
@@ -324,8 +325,6 @@ int main (int argc, char *argv[]) {
 		Message::estream(true) << "writing SVGZ files to stdout is not supported\n";
 		return 1;
 	}
-	if (args.map_file_given())
-		FileFinder::setUserFontMap(args.map_file_arg().c_str());
 
 	if (!check_bbox(args.bbox_arg()))
 		return 1;
@@ -357,8 +356,10 @@ int main (int argc, char *argv[]) {
 		dvisvg.setPageSize(args.bbox_arg());
 
 		try {
-			FileFinder::init(argv[0], !args.no_mktexmf_given());
+			const char *usermap = args.map_file_given() ? args.map_file_arg().c_str() : 0;
+			FileFinder::init(argv[0], !args.no_mktexmf_given(), usermap);
 			pair<int,int> pageinfo;
+			SignalHandler::instance().start();
 			dvisvg.convert(args.page_arg(), &pageinfo);
 			Message::mstream().indent(0);
 			Message::mstream(false, Terminal::BLUE, true) << "\n" << pageinfo.first << " of " << pageinfo.second << " page";
@@ -367,12 +368,16 @@ int main (int argc, char *argv[]) {
 			Message::mstream(false, Terminal::BLUE, true) << " converted in " << (System::time()-start_time) << " seconds\n";
 		}
 		catch (DVIException &e) {
-			Message::estream() << "\nDVI error: " << e.getMessage() << '\n';
+			Message::estream() << "\nDVI error: " << e.what() << '\n';
+		}
+		catch (SignalException &e) {
+			Message::wstream(true) << "execution interrupted by user\n";
 		}
 		catch (MessageException &e) {
-			Message::estream(true) << e.getMessage() << '\n';
+			Message::estream(true) << e.what() << '\n';
 		}
 	}
+	FileFinder::finish();
 	return 0;
 }
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/gzstream.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/gzstream.cpp
index 2893c299891..2893c299891 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/gzstream.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/gzstream.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/gzstream.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/gzstream.h
index 60f38c4fac7..60f38c4fac7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/gzstream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/gzstream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/iapi.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/iapi.h
index 8e29d938d03..8e29d938d03 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/iapi.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/iapi.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/ierrors.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/ierrors.h
index 3184341177e..3184341177e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/ierrors.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/ierrors.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/macros.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/macros.h
index d23cb825814..d23cb825814 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/macros.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/macros.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/options.xml b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/options.xml
index 10846285b3d..10846285b3d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/options.xml
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/options.xml
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/psdefs.psc b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/psdefs.psc
index 3a5c9a1f65c..3a5c9a1f65c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/psdefs.psc
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/psdefs.psc
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/types.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/types.h
index f404565df96..f404565df96 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/src/types.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/types.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/BoundingBoxTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/BoundingBoxTest.cpp
index 3e092af7f13..3e092af7f13 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/BoundingBoxTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/BoundingBoxTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/CRC32Test.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/CRC32Test.cpp
index bd5015df06f..bd5015df06f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/CRC32Test.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/CRC32Test.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/CalculatorTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/CalculatorTest.cpp
index 6d9a095370c..6d9a095370c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/CalculatorTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/CalculatorTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/ColorSpecialTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/ColorSpecialTest.cpp
index 1fd0cbf6930..1fd0cbf6930 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/ColorSpecialTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/ColorSpecialTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/CommandLineTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/CommandLineTest.cpp
index 3de612db08e..3de612db08e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/CommandLineTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/CommandLineTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/DirectoryTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/DirectoryTest.cpp
index 37b46b7c080..37b46b7c080 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/DirectoryTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/DirectoryTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/FileFinderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FileFinderTest.cpp
index e4d57b2801a..64772a1f8d2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/FileFinderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FileFinderTest.cpp
@@ -31,6 +31,10 @@ class FileFinderTest : public ::testing::Test
 		void SetUp () {
 			FileFinder::init("FileFinderTest", false);
 		}
+
+		void TearDown () {
+			FileFinder::finish();
+		}
 };
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/FilePathTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FilePathTest.cpp
index 04449fcf919..04449fcf919 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/FilePathTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FilePathTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/FileSystemTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FileSystemTest.cpp
index 5b8c6912d31..5b8c6912d31 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/FileSystemTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FileSystemTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/FontManagerTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FontManagerTest.cpp
index e7259b80f7c..e7259b80f7c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/FontManagerTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FontManagerTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/FontMapTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FontMapTest.cpp
index 92bd6420724..92bd6420724 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/FontMapTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FontMapTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/GFReaderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/GFReaderTest.cpp
index ae527feddbf..ae527feddbf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/GFReaderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/GFReaderTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/GraphicPathTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/GraphicPathTest.cpp
index 6263dc90178..6263dc90178 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/GraphicPathTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/GraphicPathTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/LengthTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/LengthTest.cpp
index c7c38f755c4..c7c38f755c4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/LengthTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/LengthTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/Makefile.am
index c48a3a7fe03..44ec80dd990 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/Makefile.am
@@ -83,6 +83,11 @@ check_PROGRAMS += MatrixTest
 MatrixTest_SOURCES = MatrixTest.cpp
 MatrixTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
 
+TESTS += MessageExceptionTest
+check_PROGRAMS += MessageExceptionTest
+MessageExceptionTest_SOURCES = MessageExceptionTest.cpp
+MessageExceptionTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
 TESTS += PageRagesTest
 check_PROGRAMS += PageRagesTest
 PageRagesTest_SOURCES = PageRagesTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/Makefile.in
index 9cdfa58bfa0..8919d065389 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/Makefile.in
@@ -41,8 +41,8 @@ TESTS = BoundingBoxTest$(EXEEXT) CalculatorTest$(EXEEXT) \
 	FileSystemTest$(EXEEXT) FontManagerTest$(EXEEXT) \
 	FontMapTest$(EXEEXT) GFReaderTest$(EXEEXT) \
 	GraphicPathTest$(EXEEXT) LengthTest$(EXEEXT) \
-	MatrixTest$(EXEEXT) PageRagesTest$(EXEEXT) \
-	PageSizeTest$(EXEEXT) PairTest$(EXEEXT) \
+	MatrixTest$(EXEEXT) MessageExceptionTest$(EXEEXT) \
+	PageRagesTest$(EXEEXT) PageSizeTest$(EXEEXT) PairTest$(EXEEXT) \
 	PSInterpreterTest$(EXEEXT) \
 	SplittedCharInputBufferTest$(EXEEXT) \
 	StreamInputBufferTest$(EXEEXT) StreamReaderTest$(EXEEXT) \
@@ -55,8 +55,8 @@ check_PROGRAMS = BoundingBoxTest$(EXEEXT) CalculatorTest$(EXEEXT) \
 	FileSystemTest$(EXEEXT) FontManagerTest$(EXEEXT) \
 	FontMapTest$(EXEEXT) GFReaderTest$(EXEEXT) \
 	GraphicPathTest$(EXEEXT) LengthTest$(EXEEXT) \
-	MatrixTest$(EXEEXT) PageRagesTest$(EXEEXT) \
-	PageSizeTest$(EXEEXT) PairTest$(EXEEXT) \
+	MatrixTest$(EXEEXT) MessageExceptionTest$(EXEEXT) \
+	PageRagesTest$(EXEEXT) PageSizeTest$(EXEEXT) PairTest$(EXEEXT) \
 	PSInterpreterTest$(EXEEXT) \
 	SplittedCharInputBufferTest$(EXEEXT) \
 	StreamInputBufferTest$(EXEEXT) StreamReaderTest$(EXEEXT) \
@@ -132,6 +132,10 @@ am_MatrixTest_OBJECTS = MatrixTest.$(OBJEXT)
 MatrixTest_OBJECTS = $(am_MatrixTest_OBJECTS)
 MatrixTest_DEPENDENCIES = ../src/libdvisvgm.a \
 	../potracelib/libpotrace.a
+am_MessageExceptionTest_OBJECTS = MessageExceptionTest.$(OBJEXT)
+MessageExceptionTest_OBJECTS = $(am_MessageExceptionTest_OBJECTS)
+MessageExceptionTest_DEPENDENCIES = ../src/libdvisvgm.a \
+	../potracelib/libpotrace.a
 am_PSInterpreterTest_OBJECTS = PSInterpreterTest.$(OBJEXT)
 PSInterpreterTest_OBJECTS = $(am_PSInterpreterTest_OBJECTS)
 PSInterpreterTest_DEPENDENCIES = ../src/libdvisvgm.a \
@@ -189,9 +193,10 @@ SOURCES = $(BoundingBoxTest_SOURCES) $(CRC32Test_SOURCES) \
 	$(FileSystemTest_SOURCES) $(FontManagerTest_SOURCES) \
 	$(FontMapTest_SOURCES) $(GFReaderTest_SOURCES) \
 	$(GraphicPathTest_SOURCES) $(LengthTest_SOURCES) \
-	$(MatrixTest_SOURCES) $(PSInterpreterTest_SOURCES) \
-	$(PageRagesTest_SOURCES) $(PageSizeTest_SOURCES) \
-	$(PairTest_SOURCES) $(SplittedCharInputBufferTest_SOURCES) \
+	$(MatrixTest_SOURCES) $(MessageExceptionTest_SOURCES) \
+	$(PSInterpreterTest_SOURCES) $(PageRagesTest_SOURCES) \
+	$(PageSizeTest_SOURCES) $(PairTest_SOURCES) \
+	$(SplittedCharInputBufferTest_SOURCES) \
 	$(StreamInputBufferTest_SOURCES) $(StreamReaderTest_SOURCES) \
 	$(StreamWriterTest_SOURCES) $(TypesTest_SOURCES) \
 	$(VectorStreamTest_SOURCES)
@@ -202,9 +207,10 @@ DIST_SOURCES = $(BoundingBoxTest_SOURCES) $(CRC32Test_SOURCES) \
 	$(FileSystemTest_SOURCES) $(FontManagerTest_SOURCES) \
 	$(FontMapTest_SOURCES) $(GFReaderTest_SOURCES) \
 	$(GraphicPathTest_SOURCES) $(LengthTest_SOURCES) \
-	$(MatrixTest_SOURCES) $(PSInterpreterTest_SOURCES) \
-	$(PageRagesTest_SOURCES) $(PageSizeTest_SOURCES) \
-	$(PairTest_SOURCES) $(SplittedCharInputBufferTest_SOURCES) \
+	$(MatrixTest_SOURCES) $(MessageExceptionTest_SOURCES) \
+	$(PSInterpreterTest_SOURCES) $(PageRagesTest_SOURCES) \
+	$(PageSizeTest_SOURCES) $(PairTest_SOURCES) \
+	$(SplittedCharInputBufferTest_SOURCES) \
 	$(StreamInputBufferTest_SOURCES) $(StreamReaderTest_SOURCES) \
 	$(StreamWriterTest_SOURCES) $(TypesTest_SOURCES) \
 	$(VectorStreamTest_SOURCES)
@@ -356,6 +362,8 @@ LengthTest_SOURCES = LengthTest.cpp
 LengthTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
 MatrixTest_SOURCES = MatrixTest.cpp
 MatrixTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+MessageExceptionTest_SOURCES = MessageExceptionTest.cpp
+MessageExceptionTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
 PageRagesTest_SOURCES = PageRagesTest.cpp
 PageRagesTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
 PageSizeTest_SOURCES = PageSizeTest.cpp
@@ -461,6 +469,9 @@ LengthTest$(EXEEXT): $(LengthTest_OBJECTS) $(LengthTest_DEPENDENCIES)
 MatrixTest$(EXEEXT): $(MatrixTest_OBJECTS) $(MatrixTest_DEPENDENCIES) 
 	@rm -f MatrixTest$(EXEEXT)
 	$(CXXLINK) $(MatrixTest_OBJECTS) $(MatrixTest_LDADD) $(LIBS)
+MessageExceptionTest$(EXEEXT): $(MessageExceptionTest_OBJECTS) $(MessageExceptionTest_DEPENDENCIES) 
+	@rm -f MessageExceptionTest$(EXEEXT)
+	$(CXXLINK) $(MessageExceptionTest_OBJECTS) $(MessageExceptionTest_LDADD) $(LIBS)
 PSInterpreterTest$(EXEEXT): $(PSInterpreterTest_OBJECTS) $(PSInterpreterTest_DEPENDENCIES) 
 	@rm -f PSInterpreterTest$(EXEEXT)
 	$(CXXLINK) $(PSInterpreterTest_OBJECTS) $(PSInterpreterTest_LDADD) $(LIBS)
@@ -513,6 +524,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GraphicPathTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LengthTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MatrixTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MessageExceptionTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PSInterpreterTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PageRagesTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PageSizeTest.Po@am__quote@
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/MatrixTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/MatrixTest.cpp
index 9567d52c6ea..9567d52c6ea 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/MatrixTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/MatrixTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/MessageExceptionTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/MessageExceptionTest.cpp
new file mode 100644
index 00000000000..11eb87c29eb
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/MessageExceptionTest.cpp
@@ -0,0 +1,78 @@
+/*************************************************************************
+** BoundingBoxTest.cpp                                                  **
+**                                                                      **
+** This file is part of dvisvgm -- the DVI to SVG converter             **
+** Copyright (C) 2005-2011 Martin Gieseking <martin.gieseking@uos.de>   **
+**                                                                      **
+** This program is free software; you can redistribute it and/or        **
+** modify it under the terms of the GNU General Public License as       **
+** published by the Free Software Foundation; either version 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           **
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the         **
+** GNU General Public License for more details.                         **
+**                                                                      **
+** You should have received a copy of the GNU General Public License    **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
+*************************************************************************/
+
+#include <gtest/gtest.h>
+#include <string>
+#include <cstring>
+#include "MessageException.h"
+
+using namespace std;
+
+static void throw_exception (const string &msg) {
+	throw MessageException(msg);
+}
+
+
+TEST(MessageExceptionTest, catch_direct) {
+	bool caught=false;
+	try {
+		throw_exception("test message");
+		FAIL();
+	}
+	catch (MessageException &e) {
+		ASSERT_TRUE(strcmp(e.what(), "test message") == 0);
+		caught = true;
+	}
+	catch (...) {
+		FAIL();
+	}
+	ASSERT_TRUE(caught);
+}
+
+
+TEST(MessageExceptionTest, catch_indirect1) {
+	bool caught=false;
+	try {
+		throw_exception("test message");
+		FAIL();
+	}
+	catch (exception &e) {
+		ASSERT_TRUE(strcmp(e.what(), "test message") == 0);
+		caught = true;
+	}
+	catch (...) {
+		FAIL();
+	}
+	ASSERT_TRUE(caught);
+}
+
+
+TEST(MessageExceptionTest, catch_indirect2) {
+	bool caught=false;
+	try {
+		throw_exception("test message");
+		FAIL();
+	}
+	catch (...) {
+		caught = true;
+	}
+	ASSERT_TRUE(caught);
+}
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/PSInterpreterTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/PSInterpreterTest.cpp
index 10b87904068..10b87904068 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/PSInterpreterTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/PSInterpreterTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/PageRagesTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/PageRagesTest.cpp
index 353ea15b7d1..353ea15b7d1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/PageRagesTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/PageRagesTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/PageSizeTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/PageSizeTest.cpp
index 785fde6d162..785fde6d162 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/PageSizeTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/PageSizeTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/PairTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/PairTest.cpp
index 9807cc7a353..9807cc7a353 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/PairTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/PairTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/SplittedCharInputBufferTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/SplittedCharInputBufferTest.cpp
index ff8970da2c7..ff8970da2c7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/SplittedCharInputBufferTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/SplittedCharInputBufferTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/StreamInputBufferTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/StreamInputBufferTest.cpp
index 56769671708..56769671708 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/StreamInputBufferTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/StreamInputBufferTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/StreamReaderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/StreamReaderTest.cpp
index 1b7fd35ad90..1b7fd35ad90 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/StreamReaderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/StreamReaderTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/StreamWriterTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/StreamWriterTest.cpp
index 4256ce84448..4256ce84448 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/StreamWriterTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/StreamWriterTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/TypesTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/TypesTest.cpp
index 5d30cef2369..5d30cef2369 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/TypesTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/TypesTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/VectorStreamTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/VectorStreamTest.cpp
index 14b03ac763b..14b03ac763b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/VectorStreamTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/VectorStreamTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/check-conv b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/check-conv
index 7b0270231b1..7b0270231b1 100755
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/check-conv
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/check-conv
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/cmr10.600gf b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/cmr10.600gf
index 6dca421e21c..6dca421e21c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/cmr10.600gf
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/cmr10.600gf
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/frktest-nf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/frktest-nf-cmp.svg
index 7c40a685071..7c40a685071 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/frktest-nf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/frktest-nf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/frktest-wf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/frktest-wf-cmp.svg
index 93212ad4abc..93212ad4abc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/frktest-wf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/frktest-wf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/normalize.xsl b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/normalize.xsl
index 5a6ba2f62d6..5a6ba2f62d6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/normalize.xsl
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/normalize.xsl
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/sample-nf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/sample-nf-cmp.svg
index e51d037f0ab..e51d037f0ab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/sample-nf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/sample-nf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/sample-wf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/sample-wf-cmp.svg
index 49d3cd37551..49d3cd37551 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.5/tests/sample-wf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/sample-wf-cmp.svg