206 files changed, 387 insertions, 237 deletions

diff --git a/Build/source/texk/README b/Build/source/texk/README
index 6068197de2c..ea7155c5fae 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -61,7 +61,7 @@ dvipos - ?
 
 dvipsk - maintained here, by us
 
-dvisvgm 1.8 - checked 31jul14
+dvisvgm 1.8.1 - checked 15sep14
   http://downloads.sourceforge.net/dvisvgm/
 
 gsftopk - from Paul Vojta's xdvi?
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index 7dccd7ae73e..2d1f90fbab7 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Imported release 1.8.1.
+	* version.ac: Adapted.
+	* Makefile.am: Adjusted.
+
 2014-07-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Imported release 1.8.
diff --git a/Build/source/texk/dvisvgm/Makefile.am b/Build/source/texk/dvisvgm/Makefile.am
index 45e3be31947..8d52a750574 100644
--- a/Build/source/texk/dvisvgm/Makefile.am
+++ b/Build/source/texk/dvisvgm/Makefile.am
@@ -68,6 +68,7 @@ nodist_libdvisvgm_a_SOURCES = \
 	@DVISVGM_TREE@/src/DVIReader.cpp \
 	@DVISVGM_TREE@/src/DVIToSVG.cpp \
 	@DVISVGM_TREE@/src/DVIToSVGActions.cpp \
+	@DVISVGM_TREE@/src/DependencyGraph.h \
 	@DVISVGM_TREE@/src/Directory.cpp \
 	@DVISVGM_TREE@/src/DvisvgmSpecialHandler.cpp \
 	@DVISVGM_TREE@/src/EPSFile.cpp \
diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in
index f0bbafd1e00..37299b2beaa 100644
--- a/Build/source/texk/dvisvgm/Makefile.in
+++ b/Build/source/texk/dvisvgm/Makefile.in
@@ -264,6 +264,24 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(nodist_libclipper_a_SOURCES) \
 	$(nodist_libdvisvgm_a_SOURCES) $(nodist_dvisvgm_SOURCES)
 DIST_SOURCES =
@@ -698,6 +716,7 @@ nodist_libdvisvgm_a_SOURCES = @DVISVGM_TREE@/src/BasicDVIReader.cpp \
 	@DVISVGM_TREE@/src/DVIReader.cpp \
 	@DVISVGM_TREE@/src/DVIToSVG.cpp \
 	@DVISVGM_TREE@/src/DVIToSVGActions.cpp \
+	@DVISVGM_TREE@/src/DependencyGraph.h \
 	@DVISVGM_TREE@/src/Directory.cpp \
 	@DVISVGM_TREE@/src/DvisvgmSpecialHandler.cpp \
 	@DVISVGM_TREE@/src/EPSFile.cpp @DVISVGM_TREE@/src/EPSToSVG.cpp \
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 737aaf13489..dec58afd655 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.69 for dvisvgm (TeX Live) 1.8.
+# Generated by GNU Autoconf 2.69 for dvisvgm (TeX Live) 1.8.1.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,12 +590,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvisvgm (TeX Live)'
 PACKAGE_TARNAME='dvisvgm--tex-live-'
-PACKAGE_VERSION='1.8'
-PACKAGE_STRING='dvisvgm (TeX Live) 1.8'
+PACKAGE_VERSION='1.8.1'
+PACKAGE_STRING='dvisvgm (TeX Live) 1.8.1'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="dvisvgm-1.8/src/dvisvgm.cpp"
+ac_unique_file="dvisvgm-1.8.1/src/dvisvgm.cpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1372,7 +1372,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 (TeX Live) 1.8 to adapt to many kinds of systems.
+\`configure' configures dvisvgm (TeX Live) 1.8.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1443,7 +1443,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvisvgm (TeX Live) 1.8:";;
+     short | recursive ) echo "Configuration of dvisvgm (TeX Live) 1.8.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1581,7 +1581,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvisvgm (TeX Live) configure 1.8
+dvisvgm (TeX Live) configure 1.8.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2403,7 +2403,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 (TeX Live) $as_me 1.8, which was
+It was created by dvisvgm (TeX Live) $as_me 1.8.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7894,7 +7894,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvisvgm--tex-live-'
- VERSION='1.8'
+ VERSION='1.8.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17755,7 +17755,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dvisvgm (TeX Live) config.lt 1.8
+dvisvgm (TeX Live) config.lt 1.8.1
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -19566,7 +19566,7 @@ $as_echo "#define KPSE_CXX_UNSAFE 1" >>confdefs.h
 
 fi
 
-DVISVGM_TREE=dvisvgm-1.8
+DVISVGM_TREE=dvisvgm-1.8.1
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -20118,7 +20118,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 (TeX Live) $as_me 1.8, which was
+This file was extended by dvisvgm (TeX Live) $as_me 1.8.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20184,7 +20184,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 (TeX Live) config.status 1.8
+dvisvgm (TeX Live) config.status 1.8.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.8.1-PATCHES/ChangeLog
index 9c1da1c7cb2..f6eccb4ec32 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8-PATCHES/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2014-09-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Import release 1.8.1.
+
 2014-07-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Import release 1.8.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.8.1-PATCHES/TL-Changes
index 6a1eaaa3405..99a521eacbc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8-PATCHES/TL-Changes
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the dvisvgm-1.8 tree as obtained from:
+Changes applied to the dvisvgm-1.8.1 tree as obtained from:
 	http://downloads.sourceforge.net/dvisvgm/
 
 Removed:
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/AUTHORS b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/AUTHORS
index d9b6468421e..d9b6468421e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/AUTHORS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/AUTHORS
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/COPYING b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/COPYING
index 94a9ed024d3..94a9ed024d3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/COPYING
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/COPYING
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/ChangeLog
index a0ffb165fab..3446d6448e4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/ChangeLog
@@ -1,3 +1,66 @@
+2014-08-29  Martin Gieseking  <martin.gieseking@uos.de>
+
+  * NEWS: 
+  updated NEWS 
+
+  * configure.ac, src/Doxyfile: 
+  set version to 1.8.1 
+
+  * src/FontEngine.cpp, tests/PageRagesTest.cpp: 
+  removed unused static functions 
+
+  * src/PsSpecialHandler.cpp: 
+  added missing whitespace boundaries in PS code 
+
+2014-08-18  Martin Gieseking  <martin.gieseking@uos.de>
+
+  * src/DVIToSVG.cpp, src/DependencyGraph.h, src/Makefile.am, 
+    src/SVGTree.cpp, src/SVGTree.h, src/XMLNode.cpp, src/XMLNode.h, 
+    tests/DependencyGraphTest.cpp, tests/Makefile.am: 
+  remove redundant clipPath elements from generated SVG files 
+
+2014-08-16  Martin Gieseking  <martin.gieseking@uos.de>
+
+  * src/PSPattern.cpp, src/XMLNode.cpp, src/XMLNode.h: 
+  renamed XMLElementNode::findDescendants() and made it constant 
+
+2014-08-11  Martin Gieseking  <martin.gieseking@uos.de>
+
+  * tests/Makefile.am, tests/create-makefile: 
+  link tests against FreeType library 
+
+2014-08-10  Khaled Hosny  <khaledhosny@eglug.org>
+
+  * configure.ac, src/Makefile.am: 
+  Don't override CPPFLAGS and LDFLAGS in configure
+
+For the same reasons 
+  as the previous commit 
+
+  * configure.ac, src/Makefile.am: 
+  Don't override CXXFLAGS in configure script
+
+Breaks standard things 
+  like:
+
+     make CXXFLAGS="-g -O0 -pg" 
+
+  * configure.ac, src/Makefile.am: 
+  EXTRA_LIBS is not used anymore 
+
+2014-08-07  Martin Gieseking  <martin.gieseking@uos.de>
+
+  * src/XMLDocument.cpp, src/XMLDocument.h, src/XMLNode.cpp, src/XMLNode.h: 
+  removed unused emit() methods from XML classes 
+
+  * src/dvisvgm.cpp: 
+  removed old code that moved cache files to new location 
+
+2014-07-31  Martin Gieseking  <martin.gieseking@uos.de>
+
+  * src/PsSpecialHandler.cpp, src/psdefs.cpp, src/psdefs.ps: 
+  prevent side-effects caused by bop/eop operators present in PS specials 
+
 2014-07-29  Martin Gieseking  <martin.gieseking@uos.de>
 
   * NEWS: 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/INSTALL b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/INSTALL
index a4b34144dcf..a4b34144dcf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/INSTALL
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/INSTALL
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/LGPL-2.1.txt b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/LGPL-2.1.txt
index 602bfc94635..602bfc94635 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/LGPL-2.1.txt
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/LGPL-2.1.txt
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/Makefile.am
index c4675c016e0..c4675c016e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/NEWS b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/NEWS
index 51245c1bf36..9f8cf6eb532 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/NEWS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/NEWS
@@ -1,3 +1,10 @@
+dvisvgm-1.8.1 (2014-08-29)
+- unreferenced clipPath elements are now removed from the SVG files
+- fixed side-effectes caused by unexpected bop/eop operators in
+  PS specials (LP bug #1350688)
+- few improvements to configure.ac (patches by Khaled Hosny)
+- removed redundant code
+
 dvisvgm-1.8 (2014-07-29)
 - added option --clipjoin which tells dvisvgm to compute intersections
   of clipping paths itself and not to delegate this task to the SVG renderer
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/README b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/README
index e0d3b3fd6c5..e0d3b3fd6c5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/README
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/README
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/clipper/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/clipper/Makefile.am
index a24a478e587..a24a478e587 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/clipper/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/clipper/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/clipper/clipper.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/clipper/clipper.cpp
index a6dbae285cf..a6dbae285cf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/clipper/clipper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/clipper/clipper.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/clipper/clipper.hpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/clipper/clipper.hpp
index 313484dbb23..313484dbb23 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/clipper/clipper.hpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/clipper/clipper.hpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/config.h.in b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/config.h.in
index fcd8cf41872..fcd8cf41872 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/config.h.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/config.h.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/configure.ac b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/configure.ac
index f867c8754be..5232cae7540 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/configure.ac
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/configure.ac
@@ -4,8 +4,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dvisvgm],[1.8],[martin.gieseking@uos.de])
-DATE="July 2014"
+AC_INIT([dvisvgm],[1.8.1],[martin.gieseking@uos.de])
+DATE="August 2014"
 AC_CONFIG_SRCDIR(src)
 AC_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST
@@ -103,8 +103,6 @@ PKG_PROG_PKG_CONFIG
 
 # Check for libraries.
 PKG_CHECK_MODULES([FREETYPE], [freetype2])
-CXXFLAGS="$CXXFLAGS ${FREETYPE_CFLAGS}"
-LIBS="$LIBS ${FREETYPE_LIBS}"
 
 AC_CHECK_LIB(z, gzopen)
 
@@ -141,11 +139,13 @@ AC_ARG_WITH(zlib,[  --with-zlib=DIR         location of the zlib library],
 
 if test "$withval" != no; then
 	if test -n "$ZLIB_DIR"; then
-		CPPFLAGS="$CPPFLAGS -I$ZLIB_DIR -I$ZLIB_DIR/include"
-		LDFLAGS="$LDFLAGS -L$ZLIB_DIR/lib"
+		ZLIB_CFLAGS="-I$ZLIB_DIR -I$ZLIB_DIR/include"
+		ZLIB_LIBS="-L$ZLIB_DIR/lib"
 	fi
 fi
 
+AC_SUBST([ZLIB_CFLAGS])
+AC_SUBST([ZLIB_LIBS])
 
 # Check if the kpathsea headers are C++ safe
 AC_MSG_CHECKING([if the kpathsea headers are C++ safe])
@@ -159,7 +159,6 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <kpathsea/kpathsea.h>]],
 AC_LANG_POP([C++])
 
 AC_SUBST(DATE)
-AC_SUBST(EXTRA_LIBS)
 AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(AM_LDFLAGS)
 AC_CONFIG_FILES([Makefile clipper/Makefile src/Makefile tests/Makefile doc/dvisvgm.txt doc/Makefile])
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/doc/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/doc/Makefile.am
index 13254cb773a..13254cb773a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/doc/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/doc/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/doc/README b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/doc/README
index 4ceb62ce402..4ceb62ce402 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/doc/README
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/doc/README
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/doc/dvisvgm.1 b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/doc/dvisvgm.1
index 0aa592262ae..046aa5eaf42 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/doc/dvisvgm.1
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/doc/dvisvgm.1
@@ -2,12 +2,12 @@
 .\"     Title: dvisvgm
 .\"    Author: Martin Gieseking <martin.gieseking@uos.de>
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 07/29/2014
+.\"      Date: 08/29/2014
 .\"    Manual: dvisvgm Manual
-.\"    Source: dvisvgm 1.8
+.\"    Source: dvisvgm 1.8.1
 .\"  Language: English
 .\"
-.TH "DVISVGM" "1" "07/29/2014" "dvisvgm 1\&.8" "dvisvgm Manual"
+.TH "DVISVGM" "1" "08/29/2014" "dvisvgm 1\&.8\&.1" "dvisvgm Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/doc/dvisvgm.txt.in b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/doc/dvisvgm.txt.in
index 173b0e5d39a..173b0e5d39a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/doc/dvisvgm.txt.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/doc/dvisvgm.txt.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/BasicDVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/BasicDVIReader.cpp
index 155e729c2e9..155e729c2e9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/BasicDVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/BasicDVIReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/BasicDVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/BasicDVIReader.h
index 0b810f6c1cd..0b810f6c1cd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/BasicDVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/BasicDVIReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Bezier.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Bezier.cpp
index 10201fa5062..10201fa5062 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Bezier.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Bezier.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Bezier.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Bezier.h
index ee763ede172..ee763ede172 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Bezier.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Bezier.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/BgColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/BgColorSpecialHandler.cpp
index dd19e4b5f53..dd19e4b5f53 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/BgColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/BgColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/BgColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/BgColorSpecialHandler.h
index edd764e86b2..edd764e86b2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/BgColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/BgColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Bitmap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Bitmap.cpp
index 265533b1ef5..265533b1ef5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Bitmap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Bitmap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Bitmap.h
index 0883688bd9a..0883688bd9a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/BoundingBox.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/BoundingBox.cpp
index f6c5d0b3b9b..f6c5d0b3b9b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/BoundingBox.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/BoundingBox.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/BoundingBox.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/BoundingBox.h
index 6d38edf6e3b..6d38edf6e3b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/BoundingBox.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/BoundingBox.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CMap.cpp
index 6b940300f8e..6b940300f8e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CMap.h
index 324c51800fa..324c51800fa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CMapManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CMapManager.cpp
index eb73d72f3c4..eb73d72f3c4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CMapManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CMapManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CMapManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CMapManager.h
index 6918ed93e98..6918ed93e98 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CMapManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CMapManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CMapReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CMapReader.cpp
index 502e42ef2e0..502e42ef2e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CMapReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CMapReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CMapReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CMapReader.h
index d9567e79433..d9567e79433 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CMapReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CMapReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CRC32.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CRC32.cpp
index 3f85710c6b7..3f85710c6b7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CRC32.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CRC32.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CRC32.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CRC32.h
index 35cd4d4399a..35cd4d4399a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CRC32.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CRC32.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Calculator.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Calculator.cpp
index 12a35a35edd..12a35a35edd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Calculator.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Calculator.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Calculator.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Calculator.h
index fdd4ed177d5..fdd4ed177d5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Calculator.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Calculator.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CharMapID.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CharMapID.cpp
index 4c15abde98f..4c15abde98f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CharMapID.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CharMapID.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CharMapID.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CharMapID.h
index acc1a8482de..acc1a8482de 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CharMapID.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CharMapID.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Character.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Character.h
index a9d0f6a2d6d..a9d0f6a2d6d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Character.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Character.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CmdLineParserBase.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CmdLineParserBase.cpp
index 2c8d133cc97..2c8d133cc97 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CmdLineParserBase.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CmdLineParserBase.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CmdLineParserBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CmdLineParserBase.h
index 855186f9d4b..855186f9d4b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CmdLineParserBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CmdLineParserBase.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Color.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Color.cpp
index 94514c292a7..94514c292a7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Color.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Color.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Color.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Color.h
index 99d847560e0..99d847560e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Color.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Color.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/ColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/ColorSpecialHandler.cpp
index 937c0f42877..937c0f42877 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/ColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/ColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/ColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/ColorSpecialHandler.h
index 6e7b0edf0f3..6e7b0edf0f3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/ColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/ColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CommandLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CommandLine.cpp
index 9395e9b770b..9395e9b770b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CommandLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CommandLine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CommandLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CommandLine.h
index 9c86e2feb9c..9c86e2feb9c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/CommandLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/CommandLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DLLoader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DLLoader.cpp
index 8f03d1a0b83..8f03d1a0b83 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DLLoader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DLLoader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DLLoader.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DLLoader.h
index de14be50495..de14be50495 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DLLoader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DLLoader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DVIActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DVIActions.h
index 7a82d4456f1..7a82d4456f1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DVIActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DVIActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DVIReader.cpp
index 925efe0407b..925efe0407b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DVIReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DVIReader.h
index 366a110f531..366a110f531 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DVIReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DVIToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DVIToSVG.cpp
index d4252961b11..539dabdad7f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DVIToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DVIToSVG.cpp
@@ -96,6 +96,7 @@ void DVIToSVG::convert (unsigned first, unsigned last, pair<int,int> *pageinfo)
 
 	for (unsigned i=first; i <= last; ++i) {
 		executePage(i);
+		_svg.removeRedundantElements();
 		embedFonts(_svg.rootNode());
 		_svg.write(_out.getPageStream(getCurrentPageNumber(), numberOfPages()));
 		string fname = _out.filename(i, numberOfPages());
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DVIToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DVIToSVG.h
index 39f335a2907..39f335a2907 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DVIToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DVIToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DVIToSVGActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DVIToSVGActions.cpp
index ca716bf88f5..ca716bf88f5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DVIToSVGActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DVIToSVGActions.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DVIToSVGActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DVIToSVGActions.h
index 2980fa2c657..2980fa2c657 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DVIToSVGActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DVIToSVGActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DependencyGraph.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DependencyGraph.h
new file mode 100644
index 00000000000..00c467bb0c2
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DependencyGraph.h
@@ -0,0 +1,122 @@
+/*************************************************************************
+** DependencyGraph.h                                                    **
+**                                                                      **
+** This file is part of dvisvgm -- the DVI to SVG converter             **
+** Copyright (C) 2005-2014 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 DEPENDENCYGRAPH_H
+#define DEPENDENCYGRAPH_H
+
+#include <map>
+#include <vector>
+
+template <typename T>
+class DependencyGraph
+{
+	struct GraphNode {
+		typedef typename std::vector<GraphNode*> Dependees;
+		typedef typename Dependees::iterator Iterator;
+
+		GraphNode (const T &k) : key(k), dependent(0) {}
+
+		void addDependee (GraphNode *node) {
+			if (node) {
+				node->dependent = this;
+				dependees.push_back(node);
+			}
+		}
+
+		void deleteDependentsAndSelf () {
+			if (dependent)
+				dependent->deleteDependentsAndSelf();
+			for (typename Dependees::iterator it = dependees.begin(); it != dependees.end(); ++it)
+				(*it)->dependent = 0;
+			delete this;
+		}
+
+		T key;
+		GraphNode *dependent;
+		Dependees dependees;
+	};
+
+	typedef std::map<T, GraphNode*> NodeMap;
+
+	public:
+		~DependencyGraph() {
+			for (typename NodeMap::iterator it=_nodeMap.begin(); it != _nodeMap.end(); ++it)
+				delete it->second;
+		}
+
+		void insert (const T &key) {
+			if (!contains(key))
+				_nodeMap[key] = new GraphNode(key);
+		}
+
+		void insert (const T &depKey, const T &key) {
+			if (contains(key))
+				return;
+			typename NodeMap::iterator it = _nodeMap.find(depKey);
+			if (it != _nodeMap.end()) {
+				GraphNode *node = new GraphNode(key);
+				it->second->addDependee(node);
+				_nodeMap[key] = node;
+			}
+		}
+
+		void removeDependencyPath (const T &key) {
+			typename NodeMap::iterator it = _nodeMap.find(key);
+			if (it != _nodeMap.end()) {
+				GraphNode *startNode = it->second;
+				for (GraphNode *node=startNode; node; node=node->dependent)
+					_nodeMap.erase(node->key);
+				startNode->deleteDependentsAndSelf();
+			}
+		}
+
+		void getKeys (std::vector<T> &keys) const {
+			for (typename NodeMap::const_iterator it=_nodeMap.begin(); it != _nodeMap.end(); ++it)
+				keys.push_back(it->first);
+		}
+
+		bool contains (const T &value) const {
+			return _nodeMap.find(value) != _nodeMap.end();
+		}
+
+		bool empty () const {
+			return _nodeMap.empty();
+		}
+
+#if 0
+		void writeDOT (std::ostream &os) const {
+			os << "digraph {\n";
+			for (typename NodeMap::const_iterator it=_nodeMap.begin(); it != _nodeMap.end(); ++it) {
+				GraphNode *node = it->second;
+				if (node->dependent)
+					os << (node->key) << " -> " << (node->dependent->key) << ";\n";
+				else if (node->dependees.empty())
+					os << (node->key) << ";\n";
+			}
+			os << "}\n";
+		}
+#endif
+
+	private:
+		NodeMap _nodeMap;
+};
+
+#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Directory.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Directory.cpp
index 925b3065c8d..925b3065c8d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Directory.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Directory.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Directory.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Directory.h
index a10a26bd39c..a10a26bd39c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Directory.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Directory.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DvisvgmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DvisvgmSpecialHandler.cpp
index a3b2233e5b2..a3b2233e5b2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DvisvgmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DvisvgmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DvisvgmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DvisvgmSpecialHandler.h
index 13c52718011..13c52718011 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/DvisvgmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/DvisvgmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/EPSFile.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/EPSFile.cpp
index aea2c9114c9..aea2c9114c9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/EPSFile.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/EPSFile.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/EPSFile.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/EPSFile.h
index 19b60a42797..19b60a42797 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/EPSFile.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/EPSFile.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/EPSToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/EPSToSVG.cpp
index 6e0188d1d6f..6e0188d1d6f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/EPSToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/EPSToSVG.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/EPSToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/EPSToSVG.h
index e6d654f595f..e6d654f595f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/EPSToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/EPSToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/EmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/EmSpecialHandler.cpp
index 2d944e9433d..2d944e9433d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/EmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/EmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/EmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/EmSpecialHandler.h
index 000277f6909..000277f6909 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/EmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/EmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/EncFile.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/EncFile.cpp
index 103090bc3e3..103090bc3e3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/EncFile.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/EncFile.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/EncFile.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/EncFile.h
index 5d15a48cfff..5d15a48cfff 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/EncFile.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/EncFile.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FileFinder.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FileFinder.cpp
index e8269991053..e8269991053 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FileFinder.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FileFinder.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FileFinder.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FileFinder.h
index e4a59c2346a..e4a59c2346a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FileFinder.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FileFinder.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FilePath.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FilePath.cpp
index 92922d99354..92922d99354 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FilePath.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FilePath.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FilePath.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FilePath.h
index c1c1bab7064..c1c1bab7064 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FilePath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FilePath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FileSystem.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FileSystem.cpp
index 398878853cd..398878853cd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FileSystem.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FileSystem.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FileSystem.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FileSystem.h
index f60fcd0ac86..f60fcd0ac86 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FileSystem.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FileSystem.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Font.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Font.cpp
index 1fc51600929..1fc51600929 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Font.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Font.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Font.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Font.h
index beba335793a..beba335793a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Font.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Font.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontCache.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontCache.cpp
index e617bc9fd34..e617bc9fd34 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontCache.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontCache.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontCache.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontCache.h
index 3afed5485a2..3afed5485a2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontCache.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontCache.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontEncoding.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontEncoding.cpp
index a0fca850a98..a0fca850a98 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontEncoding.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontEncoding.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontEncoding.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontEncoding.h
index 4c366182632..4c366182632 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontEncoding.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontEncoding.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontEngine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontEngine.cpp
index 621184ad943..0abe6a33c61 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontEngine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontEngine.cpp
@@ -40,28 +40,13 @@ static inline FT_Fixed to_16dot16 (double val) {
 	return static_cast<FT_Fixed>(val*65536.0 + 0.5);
 }
 
+
 /** Converts an integer to a 16.16 fixed point value. */
 static inline FT_Fixed to_16dot16 (int val) {
 	return static_cast<FT_Fixed>(val) << 16;
 }
 
 
-static inline double conv_16dot16_to_double (FT_Fixed fixed) {
-	return static_cast<double>(fixed)/(1 << 16);
-}
-
-
-/** Converts a floating point value to a 26.6 fixed point value. */
-static inline FT_F26Dot6 to_26dot6 (double val) {
-	return static_cast<FT_F26Dot6>(val*64.0 + 0.5);
-}
-
-/** Converts an integer to a 26.6 fixed point value. */
-static inline FT_F26Dot6 to_26dot6 (int val) {
-	return static_cast<FT_F26Dot6>(val) << 6;
-}
-
-
 ///////////////////////////////////////////////////////////////////////////
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontEngine.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontEngine.h
index 79a0916d04d..79a0916d04d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontEngine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontEngine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontManager.cpp
index bb4288c57a4..bb4288c57a4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontManager.h
index c5ed1a35a97..c5ed1a35a97 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontMap.cpp
index e885e0a38fa..e885e0a38fa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontMap.h
index bee44d8e6e7..bee44d8e6e7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontMetrics.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontMetrics.cpp
index 3920e4e6e76..3920e4e6e76 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontMetrics.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontMetrics.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontMetrics.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontMetrics.h
index 50207211d2c..50207211d2c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontMetrics.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontMetrics.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontStyle.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontStyle.h
index 932c09291cc..932c09291cc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/FontStyle.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/FontStyle.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/GFGlyphTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/GFGlyphTracer.cpp
index e1d3f916241..e1d3f916241 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/GFGlyphTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/GFGlyphTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/GFGlyphTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/GFGlyphTracer.h
index 57ed0362cc0..57ed0362cc0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/GFGlyphTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/GFGlyphTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/GFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/GFReader.cpp
index 9b0a319733b..9b0a319733b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/GFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/GFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/GFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/GFReader.h
index 1706acea126..1706acea126 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/GFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/GFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/GFTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/GFTracer.cpp
index 89ff4359fda..89ff4359fda 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/GFTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/GFTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/GFTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/GFTracer.h
index 617580636f0..617580636f0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/GFTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/GFTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Ghostscript.cpp
index e204842bab9..e204842bab9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Ghostscript.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Ghostscript.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Ghostscript.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Ghostscript.h
index 6200fa8d0a1..6200fa8d0a1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Ghostscript.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Ghostscript.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Glyph.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Glyph.h
index 5a003a2196b..5a003a2196b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Glyph.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Glyph.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/GlyphTracerMessages.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/GlyphTracerMessages.h
index 6256bb843a0..6256bb843a0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/GlyphTracerMessages.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/GlyphTracerMessages.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/GraphicPath.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/GraphicPath.h
index dc3cb46852d..dc3cb46852d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/GraphicPath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/GraphicPath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/HtmlSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/HtmlSpecialHandler.cpp
index dc419e8ebb8..dc419e8ebb8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/HtmlSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/HtmlSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/HtmlSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/HtmlSpecialHandler.h
index 221c325185f..221c325185f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/HtmlSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/HtmlSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/InputBuffer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/InputBuffer.cpp
index 154c60511bd..154c60511bd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/InputBuffer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/InputBuffer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/InputBuffer.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/InputBuffer.h
index efcbc36ed74..efcbc36ed74 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/InputBuffer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/InputBuffer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/InputReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/InputReader.cpp
index 8a8709fe0f7..8a8709fe0f7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/InputReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/InputReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/InputReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/InputReader.h
index d2eb5703211..d2eb5703211 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/InputReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/InputReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/JFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/JFM.cpp
index 89c4796616c..89c4796616c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/JFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/JFM.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/JFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/JFM.h
index 297ad6df710..297ad6df710 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/JFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/JFM.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Length.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Length.cpp
index 09951489ff6..09951489ff6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Length.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Length.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Length.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Length.h
index 109cc2d2898..109cc2d2898 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Length.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Length.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Makefile.am
index 331ed44696e..da6a7292453 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Makefile.am
@@ -9,8 +9,13 @@ noinst_LIBRARIES     = libdvisvgm.a
 dvisvgm_SOURCES      = gzstream.h \
 							  dvisvgm.cpp gzstream.cpp
 
-dvisvgm_LDADD        = $(noinst_LIBRARIES) @EXTRA_LIBS@ ../clipper/libclipper.a
-dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES) @EXTRA_LIBS@
+dvisvgm_LDADD = \
+	$(noinst_LIBRARIES) \
+	../clipper/libclipper.a \
+	$(FREETYPE_LIBS) \
+	$(ZLIB_LIBS)
+
+dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES)
 
 libdvisvgm_a_SOURCES = \
 	BasicDVIReader.cpp \
@@ -44,6 +49,7 @@ libdvisvgm_a_SOURCES = \
 	CommandLine.h \
 	CRC32.cpp \
 	CRC32.h \
+	DependencyGraph.h \
 	Directory.cpp \
 	Directory.h \
 	DLLoader.cpp \
@@ -186,7 +192,10 @@ libdvisvgm_a_SOURCES = \
 
 EXTRA_DIST = options.xml options.dtd iapi.h ierrors.h MiKTeXCom.h MiKTeXCom.cpp
 
-AM_CXXFLAGS = -Wall -Wnon-virtual-dtor -I$(top_srcdir)/clipper
+AM_CXXFLAGS = -Wall -Wnon-virtual-dtor \
+	-I$(top_srcdir)/clipper \
+	$(FREETYPE_CFLAGS) \
+	$(ZLIB_CFLAGS)
 
 # the command-line parser is generated from options.xml by opt2cpp
 CommandLine.cpp: options.xml
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/MapLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/MapLine.cpp
index d571d094890..d571d094890 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/MapLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/MapLine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/MapLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/MapLine.h
index 2c1a53518fa..2c1a53518fa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/MapLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/MapLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Matrix.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Matrix.cpp
index e0e301d281d..e0e301d281d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Matrix.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Matrix.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Matrix.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Matrix.h
index bcff8a57bad..bcff8a57bad 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Matrix.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Matrix.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Message.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Message.cpp
index c875109633f..c875109633f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Message.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Message.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Message.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Message.h
index 7c39127dbd4..7c39127dbd4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Message.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Message.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/MessageException.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/MessageException.h
index 446c2e1282f..446c2e1282f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/MessageException.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/MessageException.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/MetafontWrapper.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/MetafontWrapper.cpp
index 6e955faeec5..6e955faeec5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/MetafontWrapper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/MetafontWrapper.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/MetafontWrapper.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/MetafontWrapper.h
index 8a59dc9d5d7..8a59dc9d5d7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/MetafontWrapper.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/MetafontWrapper.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/MiKTeXCom.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/MiKTeXCom.cpp
index bb4353f8ee4..bb4353f8ee4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/MiKTeXCom.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/MiKTeXCom.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/MiKTeXCom.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/MiKTeXCom.h
index dcb6271a4bc..dcb6271a4bc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/MiKTeXCom.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/MiKTeXCom.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/NoPsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/NoPsSpecialHandler.cpp
index 0a5119f6938..0a5119f6938 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/NoPsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/NoPsSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/NoPsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/NoPsSpecialHandler.h
index 8af05f889a3..8af05f889a3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/NoPsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/NoPsSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/NumericRanges.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/NumericRanges.h
index 7d810fb2a5d..7d810fb2a5d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/NumericRanges.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/NumericRanges.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PSFilter.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PSFilter.h
index e2c5c092dd3..e2c5c092dd3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PSFilter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PSFilter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PSInterpreter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PSInterpreter.cpp
index b1fa641fe46..b1fa641fe46 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PSInterpreter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PSInterpreter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PSInterpreter.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PSInterpreter.h
index 6d1794e5065..6d1794e5065 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PSInterpreter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PSInterpreter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PSPattern.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PSPattern.cpp
index 107dac4f795..e566f1a34e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PSPattern.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PSPattern.cpp
@@ -154,7 +154,7 @@ void PSUncoloredTilingPattern::apply (SpecialActions* actions) {
 		vector<XMLElementNode*> colored_elems;
 		const char *attribs[] = {"fill", "stroke"};
 		for (int i=0; i < 2; i++) {
-			getGroupNode()->findDescendants(0, attribs[i], colored_elems);
+			getGroupNode()->getDescendants(0, attribs[i], colored_elems);
 			for (vector<XMLElementNode*>::iterator it=colored_elems.begin(); it != colored_elems.end(); ++it)
 				if (string((*it)->getAttributeValue(attribs[i])) != "none")
 					(*it)->addAttribute(attribs[i], _currentColor.rgbString());
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PSPattern.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PSPattern.h
index 96911b921da..96911b921da 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PSPattern.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PSPattern.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PSPreviewFilter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PSPreviewFilter.cpp
index c9b3b080118..c9b3b080118 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PSPreviewFilter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PSPreviewFilter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PSPreviewFilter.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PSPreviewFilter.h
index 3e65ac9ba4c..3e65ac9ba4c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PSPreviewFilter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PSPreviewFilter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PageRanges.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PageRanges.cpp
index e19e679c67e..e19e679c67e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PageRanges.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PageRanges.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PageRanges.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PageRanges.h
index 3292986226d..3292986226d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PageRanges.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PageRanges.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PageSize.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PageSize.cpp
index 2cc3f36512d..2cc3f36512d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PageSize.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PageSize.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PageSize.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PageSize.h
index d63079ae784..d63079ae784 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PageSize.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PageSize.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Pair.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Pair.h
index 6183b3b97e3..6183b3b97e3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Pair.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Pair.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PathClipper.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PathClipper.cpp
index fcc231fb5fe..fcc231fb5fe 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PathClipper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PathClipper.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PathClipper.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PathClipper.h
index c8aca25dbc1..c8aca25dbc1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PathClipper.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PathClipper.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PdfSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PdfSpecialHandler.cpp
index fb8e775759f..fb8e775759f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PdfSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PdfSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PdfSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PdfSpecialHandler.h
index 6865a21d9be..6865a21d9be 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PdfSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PdfSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PreScanDVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PreScanDVIReader.cpp
index f88010b89ed..f88010b89ed 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PreScanDVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PreScanDVIReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PreScanDVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PreScanDVIReader.h
index 1e033e73fa6..1e033e73fa6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PreScanDVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PreScanDVIReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Process.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Process.cpp
index 41c3bec0daa..41c3bec0daa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Process.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Process.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Process.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Process.h
index 54f4ec611c3..54f4ec611c3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Process.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Process.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PsSpecialHandler.cpp
index 13b770a1db8..a6cc0ca38da 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PsSpecialHandler.cpp
@@ -80,6 +80,9 @@ void PsSpecialHandler::initialize () {
 		const char *headers[] = {"tex.pro", "texps.pro", "special.pro", /*"color.pro",*/ 0};
 		for (const char **p=headers; *p; ++p)
 			processHeaderFile(*p);
+		// disable bop/eop operators to prevent side-effects by
+		// unexpected bobs/eops present in PS specials
+		_psi.execute("\nTeXDict begin /bop{pop pop}def /eop{}def end ");
 		_psSection = PS_HEADERS;  // allow to process header specials now
 	}
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PsSpecialHandler.h
index 10d091aa688..10d091aa688 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/PsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/PsSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/RangeMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/RangeMap.cpp
index e3bfea44eef..e3bfea44eef 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/RangeMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/RangeMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/RangeMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/RangeMap.h
index 60bf071aff0..60bf071aff0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/RangeMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/RangeMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/SVGOutputBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/SVGOutputBase.h
index cad892ea068..cad892ea068 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/SVGOutputBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/SVGOutputBase.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/SVGTree.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/SVGTree.cpp
index 084f9f921a9..b902cb1b423 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/SVGTree.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/SVGTree.cpp
@@ -23,6 +23,7 @@
 #include <sstream>
 #include <string>
 #include "BoundingBox.h"
+#include "DependencyGraph.h"
 #include "DVIToSVG.h"
 #include "Font.h"
 #include "FontManager.h"
@@ -427,3 +428,45 @@ void SVGTree::popContextElement () {
 		_text = _span = 0; // ensure the creation of a new text element for the following characters added
 	}
 }
+
+
+/** Extracts the ID from a local URL reference like url(#abcde) */
+inline string extract_id_from_url (const string &url) {
+	return url.substr(5, url.length()-6);
+}
+
+
+/** Removes elements present in the SVH tree that are not required.
+ *  For now, only clipPath elements are removed. */
+void SVGTree::removeRedundantElements () {
+	vector<XMLElementNode*> clipElements;
+	if (!_defs || !_defs->getDescendants("clipPath", 0, clipElements))
+		return;
+
+	// collect dependencies between clipPath elements in the defs section of the SVG tree
+	DependencyGraph<string> idTree;
+	for (vector<XMLElementNode*>::iterator it=clipElements.begin(); it != clipElements.end(); ++it) {
+		if (const char *id = (*it)->getAttributeValue("id")) {
+			if (const char *url = (*it)->getAttributeValue("clip-path"))
+				idTree.insert(extract_id_from_url(url), id);
+			else
+				idTree.insert(id);
+		}
+	}
+	// collect elements that reference a clipPath (have a clip-path attribute)
+	vector<XMLElementNode*> descendants;
+	_page->getDescendants(0, "clip-path", descendants);
+	// remove referenced IDs and their dependencies from the dependency graph
+	for (vector<XMLElementNode*>::iterator it=descendants.begin(); it != descendants.end(); ++it) {
+		string idref = extract_id_from_url((*it)->getAttributeValue("clip-path"));
+		idTree.removeDependencyPath(idref);
+	}
+	descendants.clear();
+	vector<string> ids;
+	idTree.getKeys(ids);
+	for (vector<string>::iterator it=ids.begin(); it != ids.end(); ++it) {
+		XMLElementNode *node = _defs->getFirstDescendant("clipPath", "id", it->c_str());
+		_defs->remove(node);
+	}
+}
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/SVGTree.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/SVGTree.h
index e8d848aa0ec..765d5340dcb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/SVGTree.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/SVGTree.h
@@ -75,6 +75,7 @@ class SVGTree
 		void append (const PhysicalFont &font, const std::set<int> &chars, GFGlyphTracer::Callback *cb=0);
 		void pushContextElement (XMLElementNode *node);
 		void popContextElement ();
+		void removeRedundantElements ();
 		void setBBox (const BoundingBox &bbox);
 		void setFont (int id, const Font *font);
 		void setX (double x)              {_xchanged = true;}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/SignalHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/SignalHandler.cpp
index 6e91a05442d..6e91a05442d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/SignalHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/SignalHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/SignalHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/SignalHandler.h
index fa69e4129ed..fa69e4129ed 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/SignalHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/SignalHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/SpecialActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/SpecialActions.h
index 0222a977955..0222a977955 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/SpecialActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/SpecialActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/SpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/SpecialHandler.h
index c9779836106..c9779836106 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/SpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/SpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/SpecialManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/SpecialManager.cpp
index f10946b1d1e..f10946b1d1e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/SpecialManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/SpecialManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/SpecialManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/SpecialManager.h
index 2ea14da992b..2ea14da992b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/SpecialManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/SpecialManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/StreamReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/StreamReader.cpp
index 35a1cb1a583..35a1cb1a583 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/StreamReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/StreamReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/StreamReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/StreamReader.h
index 82679254cdc..82679254cdc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/StreamReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/StreamReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/StreamWriter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/StreamWriter.cpp
index 203a1788f87..203a1788f87 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/StreamWriter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/StreamWriter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/StreamWriter.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/StreamWriter.h
index f3ba391b044..f3ba391b044 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/StreamWriter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/StreamWriter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Subfont.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Subfont.cpp
index c37cd7e7eb6..c37cd7e7eb6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Subfont.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Subfont.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Subfont.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Subfont.h
index eafa683e30b..eafa683e30b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Subfont.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Subfont.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/System.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/System.cpp
index 6769f843cae..6769f843cae 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/System.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/System.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/System.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/System.h
index 7200c93f291..7200c93f291 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/System.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/System.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/TFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/TFM.cpp
index db36b7f50b6..db36b7f50b6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/TFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/TFM.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/TFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/TFM.h
index a7941874b30..a7941874b30 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/TFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/TFM.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Terminal.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Terminal.cpp
index e95111d196b..e95111d196b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Terminal.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Terminal.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Terminal.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Terminal.h
index 08ac7e6300a..08ac7e6300a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Terminal.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Terminal.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/ToUnicodeMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/ToUnicodeMap.cpp
index 5d5f1b23b76..5d5f1b23b76 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/ToUnicodeMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/ToUnicodeMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/ToUnicodeMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/ToUnicodeMap.h
index 80ad10dc874..80ad10dc874 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/ToUnicodeMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/ToUnicodeMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/TpicSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/TpicSpecialHandler.cpp
index c460542ca8e..c460542ca8e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/TpicSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/TpicSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/TpicSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/TpicSpecialHandler.h
index 424721dbffc..424721dbffc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/TpicSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/TpicSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Unicode.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Unicode.cpp
index f0fdde17898..f0fdde17898 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Unicode.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Unicode.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Unicode.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Unicode.h
index 41be47749cd..41be47749cd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/Unicode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/Unicode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/VFActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/VFActions.h
index a8e86831fe9..a8e86831fe9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/VFActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/VFActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/VFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/VFReader.cpp
index 45d0ed7da27..45d0ed7da27 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/VFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/VFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/VFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/VFReader.h
index f6d9474ccbe..f6d9474ccbe 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/VFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/VFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/VectorStream.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/VectorStream.h
index 92ce8a68437..92ce8a68437 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/VectorStream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/VectorStream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/XMLDocument.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/XMLDocument.cpp
index caee2ec7439..b9cb243dbc9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/XMLDocument.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/XMLDocument.cpp
@@ -25,7 +25,7 @@
 using namespace std;
 
 XMLDocument::XMLDocument (XMLElementNode *root)
-	: _rootElement(root), _emitted(false)
+	: _rootElement(root)
 {
 }
 
@@ -72,30 +72,3 @@ ostream& XMLDocument::write (ostream &os) const {
 	}
 	return os;
 }
-
-/** Writes a part of the XML document to the given output stream and removes
- *  the completely written nodes. The output stops when a stop node is reached
- *  (this node won't be printed at all). If a node was only partly emitted, i.e.
- *  its child was the stop node, a further call of emit will continue the output.
- *  @param[in] os stream to which the output is written
- *  @param[in] stopNode node where emitting stops (if 0 the whole tree will be emitted)
- *  @return true if node was completely emitted */
-bool XMLDocument::emit (ostream& os, XMLNode *stopNode) {
-	if (_rootElement) {  // no root element => no output
-		if (!_emitted) {
-			os << "<?xml version='1.0' encoding='ISO-8859-1'?>\n";
-			_emitted = true;
-		}
-		FORALL(_nodes, list<XMLNode*>::iterator, i) {
-			if ((*i)->emit(os, stopNode)) {
-				list<XMLNode*>::iterator it = i++;  // prevent i from being invalidated...
-				_nodes.erase(it);              // ... by erase
-				--i;  // @@ what happens if i points to first child?
-			}
-			else
-				return false;
-		}
-		return _rootElement->emit(os, stopNode);
-	}
-	return true;
-}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/XMLDocument.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/XMLDocument.h
index 4a2dd3e5318..02800f6b3b6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/XMLDocument.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/XMLDocument.h
@@ -33,12 +33,10 @@ class XMLDocument
 		void setRootNode (XMLElementNode *root);
 		const XMLElementNode* getRootElement () const {return _rootElement;}
 		std::ostream& write (std::ostream &os) const;
-		bool emit (std::ostream& os, XMLNode *stopNode);
 
 	private:
 		std::list<XMLNode*> _nodes;
 		XMLElementNode *_rootElement;
-		bool _emitted;
 };
 
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/XMLNode.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/XMLNode.cpp
index 1fb40368f19..5b2252a28db 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/XMLNode.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/XMLNode.cpp
@@ -27,20 +27,13 @@
 
 using namespace std;
 
-bool XMLNode::emit (ostream &os, XMLNode *stopNode) {
-	if (this == stopNode)
-		return false;
-	write(os);
-	return true;
-}
-
 
-XMLElementNode::XMLElementNode (const string &n) : _name(n), _emitted(false) {
+XMLElementNode::XMLElementNode (const string &n) : _name(n) {
 }
 
 
 XMLElementNode::XMLElementNode (const XMLElementNode &node)
-	: _name(node._name), _attributes(node._attributes), _emitted(false)
+	: _name(node._name), _attributes(node._attributes)
 {
 	FORALL(node._children, ChildList::const_iterator, it)
 		_children.push_back((*it)->clone());
@@ -144,23 +137,39 @@ bool XMLElementNode::insertAfter (XMLNode *child, XMLNode *sibling) {
 }
 
 
-/** Finds all descendant elements of a given name and given attribute.
+/** Gets all descendant elements with a given name and given attribute.
  *  @param[in] name name of elements to find
- *  @param[in] attr_name name of attribute to find
+ *  @param[in] attrName name of attribute to find
  *  @param[out] descendants all elements found
  *  @return true if at least one element was found  */
-bool XMLElementNode::findDescendants (const char *name, const char *attr_name, vector<XMLElementNode*> &descendants) {
-	FORALL(_children, ChildList::iterator, it) {
+bool XMLElementNode::getDescendants (const char *name, const char *attrName, vector<XMLElementNode*> &descendants) const {
+	FORALL(_children, ChildList::const_iterator, it) {
 		if (XMLElementNode *elem = dynamic_cast<XMLElementNode*>(*it)) {
-			if ((!name || elem->getName() == name) && (!attr_name || elem->hasAttribute(attr_name)))
+			if ((!name || elem->getName() == name) && (!attrName || elem->hasAttribute(attrName)))
 				descendants.push_back(elem);
-			elem->findDescendants(name, attr_name, descendants);
+			elem->getDescendants(name, attrName, descendants);
 		}
 	}
 	return !descendants.empty();
 }
 
 
+XMLElementNode* XMLElementNode::getFirstDescendant (const char *name, const char *attrName, const char *attrValue) const {
+	FORALL(_children, ChildList::const_iterator, it) {
+		if (XMLElementNode *elem = dynamic_cast<XMLElementNode*>(*it)) {
+			if (!name || elem->getName() == name) {
+				const char *value;
+				if (!attrName || !attrValue || !(value = elem->getAttributeValue(attrName)) || string(value) == attrValue)
+					return elem;
+			}
+			if (XMLElementNode *descendant = elem->getFirstDescendant(name, attrName, attrValue))
+				return descendant;
+		}
+	}
+	return 0;
+}
+
+
 ostream& XMLElementNode::write (ostream &os) const {
 	os << '<' << _name;
 	FORALL(_attributes, AttribMap::const_iterator, i)
@@ -179,47 +188,6 @@ ostream& XMLElementNode::write (ostream &os) const {
 }
 
 
-/** Writes a part of the XML tree to the given output stream and removes
- *  the completely written nodes. The output stops when a stop node is reached
- *  (this node won't be printed at all). If a node was only partly emitted, i.e.
- *  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] stopNode node where emitting stops (if 0 the whole tree will be 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)
-			os << ' ' << i->first << "='" << i->second << '\'';
-		if (_children.empty())
-			os << "/>\n";
-		else {
-			os << '>';
-			if (dynamic_cast<XMLElementNode*>(_children.front()))
-				os << '\n';
-		}
-
-		_emitted = true;
-	}
-	if (!_children.empty()) {
-		FORALL(_children, ChildList::iterator, i) {
-			if ((*i)->emit(os, stopNode)) {
-				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";
-	}
-	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();
@@ -270,13 +238,13 @@ void XMLTextNode::prepend (XMLNode *node) {
 //////////////////////
 
 XMLDeclarationNode::XMLDeclarationNode (const string &n, const string &p)
-	: _name(n), _params(p), _emitted(false)
+	: _name(n), _params(p)
 {
 }
 
 
 XMLDeclarationNode::XMLDeclarationNode (const XMLDeclarationNode &node)
-	: _name(node._name), _params(node._params), _emitted(false)
+	: _name(node._name), _params(node._params)
 {
 	FORALL(node._children, list<XMLDeclarationNode*>::const_iterator, it)
 		_children.push_back(new XMLDeclarationNode(**it));
@@ -319,35 +287,6 @@ ostream& XMLDeclarationNode::write (ostream &os) const {
 	return os;
 }
 
-
-bool XMLDeclarationNode::emit (ostream &os, XMLNode *stopNode) {
-	if (this == stopNode)
-		return false;
-
-	if (!_emitted) {
-		os << "<!" << _name << ' ' << _params;
-		if (_children.empty())
-			os << ">\n";
-		else
-			os << "[\n";
-		_emitted = true;
-	}
-	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
-				--i;  // @@ what happens if i points to first child?
-			}
-			else
-				return false;
-		}
-		os << "]>\n";
-	}
-	return true;
-
-}
-
 //////////////////////
 
 ostream& XMLCDataNode::write (ostream &os) const {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/XMLNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/XMLNode.h
index 2924e038adb..a90a5a6a391 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/XMLNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/XMLNode.h
@@ -35,7 +35,6 @@ struct XMLNode
 	virtual XMLNode* clone () const =0;
 	virtual void clear () =0;
 	virtual std::ostream& write (std::ostream &os) const =0;
-	virtual bool emit (std::ostream &os, XMLNode *stopElement);
 	virtual void append (XMLNode *child) {}
 	virtual void prepend (XMLNode *child) {}
 };
@@ -56,13 +55,14 @@ class XMLElementNode : public XMLNode
 		void append (XMLNode *child);
 		void append (const std::string &str);
 		void prepend (XMLNode *child);
+		void remove (XMLNode *child)                 {_children.remove(child);}
 		bool insertAfter (XMLNode *child, XMLNode *sibling);
 		bool insertBefore (XMLNode *child, XMLNode *sibling);
 		bool hasAttribute (const std::string &name) const;
 		const char* getAttributeValue (const std::string &name) const;
-		bool findDescendants (const char *name, const char *attr_name, std::vector<XMLElementNode*> &descendants);
+		bool getDescendants (const char *name, const char *attr_name, std::vector<XMLElementNode*> &descendants) const;
+		XMLElementNode* getFirstDescendant (const char *name, const char *attrName, const char *attrValue) const;
 		std::ostream& write (std::ostream &os) const;
-		bool emit (std::ostream &os, XMLNode *stopElement);
 		bool empty () const                          {return _children.empty();}
 		const std::list<XMLNode*>& children () const {return _children;}
 		const std::string& getName () const          {return _name;}
@@ -71,7 +71,6 @@ class XMLElementNode : public XMLNode
 		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
 };
 
 
@@ -116,13 +115,11 @@ class XMLDeclarationNode : public XMLNode
 		void clear ();
 		void append (XMLNode *child);
 		std::ostream& write (std::ostream &os) const;
-		bool emit (std::ostream &os, XMLNode *stopElement);
 
 	private:
 		std::string _name;
 		std::string _params;
 		std::list<XMLDeclarationNode*> _children;
-		bool _emitted;
 };
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/XMLString.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/XMLString.cpp
index 4911b6c6a19..4911b6c6a19 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/XMLString.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/XMLString.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/XMLString.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/XMLString.h
index 311d7e535b9..311d7e535b9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/XMLString.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/XMLString.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/dvisvgm.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/dvisvgm.cpp
index 5af35683355..ca4bffd92f9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/dvisvgm.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/dvisvgm.cpp
@@ -208,36 +208,16 @@ static bool set_cache_dir (const CommandLine &args) {
 		else
 			Message::wstream(true) << "cache directory '" << args.cache_arg() << "' does not exist (caching disabled)\n";
 	}
-	else {
-		if (const char *userdir = FileSystem::userdir()) {
-			static string path = userdir;
-			path += "/.dvisvgm";
-			path = FileSystem::adaptPathSeperators(path);
-			const string cachepath = path+"/cache";
-			if (!FileSystem::exists(cachepath.c_str())) {
-				if (!FileSystem::exists(path.c_str()))
-					FileSystem::mkdir(cachepath.c_str());
-				else {
-					FileSystem::mkdir(cachepath.c_str());
-					// move existing cache files from former location to new one
-					vector<string> files;
-					FileSystem::collect(path.c_str(), files);
-					FORALL(files, vector<string>::iterator, it) {
-						if (it->at(0) == 'f' && it->length() > 4 && it->substr(it->length()-4, 4) == ".fgd") {
-							const char *fname = it->c_str()+1;
-							FileSystem::copy(path+"/"+fname, cachepath+"/"+fname, true);
-						}
-					}
-				}
-			}
-			path = cachepath;
-			PhysicalFont::CACHE_PATH = path.c_str();
-		}
-		if (args.cache_given() && args.cache_arg().empty()) {
-			cout << "cache directory: " << (PhysicalFont::CACHE_PATH ? PhysicalFont::CACHE_PATH : "(none)") << '\n';
-			FontCache::fontinfo(PhysicalFont::CACHE_PATH, cout, true);
-			return false;
-		}
+	else if (const char *userdir = FileSystem::userdir()) {
+		static string cachepath = userdir + string("/.dvisvgm/cache");
+		if (!FileSystem::exists(cachepath.c_str()))
+			FileSystem::mkdir(cachepath.c_str());
+		PhysicalFont::CACHE_PATH = cachepath.c_str();
+	}
+	if (args.cache_given() && args.cache_arg().empty()) {
+		cout << "cache directory: " << (PhysicalFont::CACHE_PATH ? PhysicalFont::CACHE_PATH : "(none)") << '\n';
+		FontCache::fontinfo(PhysicalFont::CACHE_PATH, cout, true);
+		return false;
 	}
 	return true;
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/gzstream.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/gzstream.cpp
index 2893c299891..2893c299891 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/gzstream.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/gzstream.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/gzstream.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/gzstream.h
index 60f38c4fac7..60f38c4fac7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/gzstream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/gzstream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/iapi.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/iapi.h
index 8e29d938d03..8e29d938d03 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/iapi.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/iapi.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/ierrors.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/ierrors.h
index 3184341177e..3184341177e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/ierrors.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/ierrors.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/macros.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/macros.h
index 73217c763e0..73217c763e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/macros.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/macros.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/options.dtd b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/options.dtd
index d8444c94c9f..d8444c94c9f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/options.dtd
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/options.dtd
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/options.xml b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/options.xml
index 35b8618ff54..35b8618ff54 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/options.xml
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/options.xml
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/psdefs.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/psdefs.cpp
index a9fd027fc97..7cdeb50cea8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/psdefs.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/psdefs.cpp
@@ -47,41 +47,41 @@ const char *PSInterpreter::PSDEFS =
 "h 0(fill)prcmd :newpath}{:fill}ifelse}put @SD/eofill{@dodraw{1 1(newpath)prcmd"
 " prpath 0(eofill)prcmd :newpath}{:eofill}ifelse}put @SD/clip{:clip 0 1(newpath"
 ")prcmd prpath 0(clip)prcmd}put @SD/eoclip{:eoclip 1 1(newpath)prcmd prpath 0(e"
-"oclip)prcmd}put @SD/bop{pop pop}put/@rect{4 -2 roll moveto exch dup 0 rlineto "
-"exch 0 exch rlineto neg 0 rlineto closepath}bind def/@rectcc{4 -2 roll moveto "
-"2 copy 0 lt exch 0 lt xor{dup 0 exch rlineto exch 0 rlineto neg 0 exch rlineto"
-"}{exch dup 0 rlineto exch 0 exch rlineto neg 0 rlineto}ifelse closepath}bind d"
-"ef @SD/rectclip{:newpath dup type/arraytype eq{aload length 4 idiv{@rectcc}rep"
-"eat}{@rectcc}ifelse clip :newpath}put @SD/rectfill{gsave :newpath dup type/arr"
-"aytype eq{aload length 4 idiv{@rectcc}repeat}{@rectcc}ifelse fill grestore}put"
-" @SD/rectstroke{gsave :newpath dup type/arraytype eq{aload length 4 idiv{@rect"
-"}repeat}{@rect}ifelse stroke grestore}put false setglobal @SD readonly pop/ini"
-"tclip 0 defpr/clippath 0 defpr/sysexec{@SD exch get exec}def/adddot{dup length"
-" 1 add string dup 0 46 put dup 3 -1 roll 1 exch putinterval}def/setlinewidth{d"
-"up/setlinewidth sysexec applyscalevals 1(setlinewidth)prcmd}def/setlinecap 1 d"
-"efpr/setlinejoin 1 defpr/setmiterlimit 1 defpr/setdash{mark 3 1 roll 2 copy/se"
-"tdash sysexec applyscalevals exch aload length 1 add -1 roll counttomark(setda"
-"sh)prcmd pop}def/setgstate{currentlinewidth 1(setlinewidth)prcmd currentlineca"
-"p 1(setlinecap)prcmd currentlinejoin 1(setlinejoin)prcmd currentmiterlimit 1(s"
-"etmiterlimit)prcmd currentrgbcolor 3(setrgbcolor)prcmd 6 array currentmatrix a"
-"load pop 6(setmatrix)prcmd currentdash mark 3 1 roll exch aload length 1 add -"
-"1 roll counttomark(setdash)prcmd pop}def/save{@UD begin/@saveID vmstatus pop p"
-"op def end :save @saveID 1(save)prcmd}def/restore{:restore setgstate @UD/@save"
-"ID known{@UD begin @saveID end}{0}ifelse 1(restore)prcmd}def/gsave 0 defpr/gre"
-"store{:grestore setgstate 0(grestore)prcmd}def/grestoreall{:grestoreall setsta"
-"te 0(grestoreall)prcmd}def/rotate{dup type/arraytype ne{dup 1(rotate)prcmd}if/"
-"rotate sysexec}def/scale{dup type/arraytype ne{2 copy 2(scale)prcmd}if/scale s"
-"ysexec}def/translate{dup type/arraytype ne{2 copy 2(translate)prcmd}if/transla"
-"te sysexec}def/setmatrix{dup/setmatrix sysexec aload pop 6(setmatrix)prcmd}def"
-"/initmatrix{matrix setmatrix}def/concat{matrix currentmatrix matrix concatmatr"
-"ix setmatrix}def/makepattern{gsave <</mx 3 -1 roll >> begin dup/XUID[1000000 @"
-"patcnt]put mx/makepattern sysexec dup dup begin PatternType @patcnt BBox aload"
-" pop XStep YStep PaintType mx aload pop 15(makepattern)prcmd :newpath matrix s"
-"etmatrix PaintProc 0 1(makepattern)prcmd end/@patcnt @patcnt 1 add store end g"
-"restore}def/setpattern{begin PatternType 1 eq{PaintType 1 eq{XUID aload pop ex"
-"ch pop 1}{:gsave[currentcolorspace aload length -1 roll pop]setcolorspace/setc"
-"olor sysexec XUID aload pop exch pop currentrgbcolor :grestore 4}ifelse(setpat"
-"tern)prcmd}{/setpattern sysexec}ifelse end}def/setcolor{dup type/dicttype eq{s"
-"etpattern}{/setcolor sysexec}ifelse}def/setgray 1 defpr/setcmykcolor 4 defpr/s"
-"ethsbcolor 3 defpr/setrgbcolor 3 defpr/.setopacityalpha{dup/.setopacityalpha s"
-"ysexec 1(setopacityalpha)prcmd}def ";
+"oclip)prcmd}put/@rect{4 -2 roll moveto exch dup 0 rlineto exch 0 exch rlineto "
+"neg 0 rlineto closepath}bind def/@rectcc{4 -2 roll moveto 2 copy 0 lt exch 0 l"
+"t xor{dup 0 exch rlineto exch 0 rlineto neg 0 exch rlineto}{exch dup 0 rlineto"
+" exch 0 exch rlineto neg 0 rlineto}ifelse closepath}bind def @SD/rectclip{:new"
+"path dup type/arraytype eq{aload length 4 idiv{@rectcc}repeat}{@rectcc}ifelse "
+"clip :newpath}put @SD/rectfill{gsave :newpath dup type/arraytype eq{aload leng"
+"th 4 idiv{@rectcc}repeat}{@rectcc}ifelse fill grestore}put @SD/rectstroke{gsav"
+"e :newpath dup type/arraytype eq{aload length 4 idiv{@rect}repeat}{@rect}ifels"
+"e stroke grestore}put false setglobal @SD readonly pop/initclip 0 defpr/clippa"
+"th 0 defpr/sysexec{@SD exch get exec}def/adddot{dup length 1 add string dup 0 "
+"46 put dup 3 -1 roll 1 exch putinterval}def/setlinewidth{dup/setlinewidth syse"
+"xec applyscalevals 1(setlinewidth)prcmd}def/setlinecap 1 defpr/setlinejoin 1 d"
+"efpr/setmiterlimit 1 defpr/setdash{mark 3 1 roll 2 copy/setdash sysexec applys"
+"calevals exch aload length 1 add -1 roll counttomark(setdash)prcmd pop}def/set"
+"gstate{currentlinewidth 1(setlinewidth)prcmd currentlinecap 1(setlinecap)prcmd"
+" currentlinejoin 1(setlinejoin)prcmd currentmiterlimit 1(setmiterlimit)prcmd c"
+"urrentrgbcolor 3(setrgbcolor)prcmd 6 array currentmatrix aload pop 6(setmatrix"
+")prcmd currentdash mark 3 1 roll exch aload length 1 add -1 roll counttomark(s"
+"etdash)prcmd pop}def/save{@UD begin/@saveID vmstatus pop pop def end :save @sa"
+"veID 1(save)prcmd}def/restore{:restore setgstate @UD/@saveID known{@UD begin @"
+"saveID end}{0}ifelse 1(restore)prcmd}def/gsave 0 defpr/grestore{:grestore setg"
+"state 0(grestore)prcmd}def/grestoreall{:grestoreall setstate 0(grestoreall)prc"
+"md}def/rotate{dup type/arraytype ne{dup 1(rotate)prcmd}if/rotate sysexec}def/s"
+"cale{dup type/arraytype ne{2 copy 2(scale)prcmd}if/scale sysexec}def/translate"
+"{dup type/arraytype ne{2 copy 2(translate)prcmd}if/translate sysexec}def/setma"
+"trix{dup/setmatrix sysexec aload pop 6(setmatrix)prcmd}def/initmatrix{matrix s"
+"etmatrix}def/concat{matrix currentmatrix matrix concatmatrix setmatrix}def/mak"
+"epattern{gsave <</mx 3 -1 roll >> begin dup/XUID[1000000 @patcnt]put mx/makepa"
+"ttern sysexec dup dup begin PatternType @patcnt BBox aload pop XStep YStep Pai"
+"ntType mx aload pop 15(makepattern)prcmd :newpath matrix setmatrix PaintProc 0"
+" 1(makepattern)prcmd end/@patcnt @patcnt 1 add store end grestore}def/setpatte"
+"rn{begin PatternType 1 eq{PaintType 1 eq{XUID aload pop exch pop 1}{:gsave[cur"
+"rentcolorspace aload length -1 roll pop]setcolorspace/setcolor sysexec XUID al"
+"oad pop exch pop currentrgbcolor :grestore 4}ifelse(setpattern)prcmd}{/setpatt"
+"ern sysexec}ifelse end}def/setcolor{dup type/dicttype eq{setpattern}{/setcolor"
+" sysexec}ifelse}def/setgray 1 defpr/setcmykcolor 4 defpr/sethsbcolor 3 defpr/s"
+"etrgbcolor 3 defpr/.setopacityalpha{dup/.setopacityalpha sysexec 1(setopacitya"
+"lpha)prcmd}def ";
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/types.h b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/types.h
index 1e1daef928c..1e1daef928c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.8/src/types.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.8.1/src/types.h
diff --git a/Build/source/texk/dvisvgm/version.ac b/Build/source/texk/dvisvgm/version.ac
index 83c5f06fa1d..ff43db7888a 100644
--- a/Build/source/texk/dvisvgm/version.ac
+++ b/Build/source/texk/dvisvgm/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current dvisvgm version
-m4_define([dvisvgm_version], [1.8])
+m4_define([dvisvgm_version], [1.8.1])