215 files changed, 191 insertions, 148 deletions

diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index b2f2e97e1c7..838ab920a57 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Imported release 1.2.1.
+	* version.ac: Adapted.
+
 2013-04-02  Karl Berry  <karl@tug.org>
 
 	* dvisvgm-1.2/src/FileFinder.cpp [__cplusplus]: force to be 1,
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 37d917c6773..a37e4e55700 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 1.2.
+# Generated by GNU Autoconf 2.69 for dvisvgm 1.2.1.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,12 +590,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvisvgm'
 PACKAGE_TARNAME='dvisvgm'
-PACKAGE_VERSION='1.2'
-PACKAGE_STRING='dvisvgm 1.2'
+PACKAGE_VERSION='1.2.1'
+PACKAGE_STRING='dvisvgm 1.2.1'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="dvisvgm-1.2/src/dvisvgm.cpp"
+ac_unique_file="dvisvgm-1.2.1/src/dvisvgm.cpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1362,7 +1362,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dvisvgm 1.2 to adapt to many kinds of systems.
+\`configure' configures dvisvgm 1.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1432,7 +1432,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvisvgm 1.2:";;
+     short | recursive ) echo "Configuration of dvisvgm 1.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1564,7 +1564,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvisvgm configure 1.2
+dvisvgm configure 1.2.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2386,7 +2386,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dvisvgm $as_me 1.2, which was
+It was created by dvisvgm $as_me 1.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7818,7 +7818,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvisvgm'
- VERSION='1.2'
+ VERSION='1.2.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17528,7 +17528,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dvisvgm config.lt 1.2
+dvisvgm config.lt 1.2.1
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -19207,7 +19207,7 @@ CPPFLAGS=$kpse_save_CPPFLAGS
 LIBS=$kpse_save_LIBS
 
 
-DVISVGM_TREE=dvisvgm-1.2
+DVISVGM_TREE=dvisvgm-1.2.1
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -19759,7 +19759,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dvisvgm $as_me 1.2, which was
+This file was extended by dvisvgm $as_me 1.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19825,7 +19825,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dvisvgm config.status 1.2
+dvisvgm config.status 1.2.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.2-PATCHES/TL-Changes
deleted file mode 100644
index 75c944005ad..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2-PATCHES/TL-Changes
+++ /dev/null
@@ -1,29 +0,0 @@
-Changes applied to the dvisvgm-1.2 tree as obtained from:
-	http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.2.tar.gz
-
-Removed:
-	Makefile.in
-	aclocal.m4
-	config.guess
-	config.sub
-	configure
-	depcomp
-	install-sh
-	missing
-	*/Makefile.in
-
-Converted Dos/Win line ends to native:
-	potracelib/auxiliary.h
-	potracelib/bitmap.h
-	potracelib/curve.c
-	potracelib/decompose.h
-	potracelib/lists.h
-	potracelib/progress.h
-	potracelib/trace.c
-	potracelib/trace.h
-	src/EPSToSVG.cpp
-	src/EPSToSVG.h
-	src/PSPattern.cpp
-	src/PSPattern.h
-	src/SVGOutputBase.h
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.2.1-PATCHES/ChangeLog
new file mode 100644
index 00000000000..be409a7aa10
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1-PATCHES/ChangeLog
@@ -0,0 +1,21 @@
+2013-04-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Import release 1.2.1.
+
+	* patch-1-cpp (removed): Renamed ...
+	* patch-01-cpp (new): ... and adapted.
+
+2013-04-02  Karl Berry  <karl@tug.org>
+
+	* patch-1-cpp (new): Force __cplusplus to be 1,
+	for sake of g++ 4.7.x and including c-memstr.h and Solaris.
+        Patch from Apostolos, tlbuild 1 Apr 2013 00:34:43.
+
+2013-03-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Import release 1.2.
+
+2013-01-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Import release 1.1.
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.2.1-PATCHES/TL-Changes
new file mode 100644
index 00000000000..7dce2ff5b1e
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1-PATCHES/TL-Changes
@@ -0,0 +1,14 @@
+Changes applied to the dvisvgm-1.2.1 tree as obtained from:
+	http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.2.1.tar.gz
+
+Removed:
+	Makefile.in
+	aclocal.m4
+	config.guess
+	config.sub
+	configure
+	depcomp
+	install-sh
+	missing
+	*/Makefile.in
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2-PATCHES/patch-1-cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1-PATCHES/patch-01-cpp
index dcc061a4912..37042f849f7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2-PATCHES/patch-1-cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1-PATCHES/patch-01-cpp
@@ -1,5 +1,6 @@
---- dvisvgm-1.2/src/FileFinder.cpp	(revision 29587)
-+++ dvisvgm-1.2/src/FileFinder.cpp	(working copy)
+diff -ur dvisvgm-1.2.1.orig/src/FileFinder.cpp dvisvgm-1.2.1/src/FileFinder.cpp
+--- dvisvgm-1.2.1.orig/src/FileFinder.cpp	2013-01-22 10:05:07.000000000 +0100
++++ dvisvgm-1.2.1/src/FileFinder.cpp	2013-04-11 10:31:23.000000000 +0200
 @@ -18,6 +18,9 @@
  ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
  *************************************************************************/
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/AUTHORS b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/AUTHORS
index 837e1e96bfb..837e1e96bfb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/AUTHORS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/AUTHORS
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/COPYING b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/COPYING
index 94a9ed024d3..94a9ed024d3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/COPYING
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/COPYING
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/INSTALL b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/INSTALL
index a4b34144dcf..a4b34144dcf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/INSTALL
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/INSTALL
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/LGPL-2.1.txt b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/LGPL-2.1.txt
index 602bfc94635..602bfc94635 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/LGPL-2.1.txt
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/LGPL-2.1.txt
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/Makefile.am
index 62cf7699878..21666db93cf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/Makefile.am
@@ -5,5 +5,11 @@
 
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = COPYING LGPL-2.1.txt
-SUBDIRS = potracelib src tests doc 
+if HAVE_LIBPOTRACE
+SUBDIRS =
+else
+SUBDIRS = potracelib
+endif
+
+SUBDIRS += src tests doc
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/NEWS b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/NEWS
index 91b8e6cb172..cff69bfa92d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/NEWS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/NEWS
@@ -1,3 +1,9 @@
+dvisvgm-1.2.1 (2013-04-09)
+- updated bundled potrace library to version 1.11
+- avoid building bundled potracelib if system library is present (patch by Alexis Ballier)
+- allow background color specials to create white background rectangles
+- code refactorings and cleanup
+
 dvisvgm-1.2 (2013-03-01)
 - PostScript handler: added support of tiling patterns
 - PostScript handler: added support for EPS files with binary headers/footers
@@ -51,7 +57,7 @@ dvisvgm-1.0.9 (2011-10-13)
 
 dvisvgm-1.0.8 (2011-05-31)
 - PS handler: added evaluation of PS operators save, restore, and grestoreall
-- PS handler: fixed potention segfault caused by invisible zero-length paths
+- PS handler: fixed potential segfault caused by invisible zero-length paths
 - fixed computation of current drawing position influenced by PS and DVI actions
 - don't stop Metafont conversions on errors any longer in order to convert
   buggy MF fonts properly
@@ -63,8 +69,8 @@ dvisvgm-1.0.7 (2011-05-06)
 - fixed semantics of TPIC special 'ip' (doesn't draw polygon outlines any longer)
 
 dvisvgm-1.0.6 (2011-04-21)
-- fixed segfault occured if a (malformed) DVI file calls set_char/put_char
-  whithout preceding font definition
+- fixed segfault occurred if a (malformed) DVI file calls set_char/put_char
+  without preceding font definition
 - added CTRL-C handler
 - MiKTeX support updated to version 2.9
 - some code refactorings
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/README b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/README
index 6356881cd9f..6356881cd9f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/README
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/README
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/config.h.in b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/config.h.in
index b027999e9b3..b027999e9b3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/config.h.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/config.h.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/config.rpath b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/config.rpath
index e69de29bb2d..e69de29bb2d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/config.rpath
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/config.rpath
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/configure.ac b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/configure.ac
index e3457789a69..a225367cd56 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/configure.ac
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.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.2],[martin.gieseking@uos.de])
-DATE="February 2013"
+AC_INIT([dvisvgm],[1.2.1],[martin.gieseking@uos.de])
+DATE="April 2013"
 AC_CONFIG_SRCDIR(src)
 AC_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST
@@ -61,6 +61,7 @@ if test "$HAVE_LIBPOTRACE" -eq 0; then
 	EXTRA_LIBS="$EXTRA_LIBS ../potracelib/libpotrace.a "
 	AC_MSG_NOTICE([Using bundled potrace library])
 fi
+AM_CONDITIONAL(HAVE_LIBPOTRACE, test "x$HAVE_LIBPOTRACE" = "x1")
 
 
 # Check how to link Ghostscript
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/doc/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/doc/Makefile.am
index fb5c56ffedf..fb5c56ffedf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/doc/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/doc/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/doc/dvisvgm.1 b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/doc/dvisvgm.1
index 54a376f687b..c9e08ed6fe0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/doc/dvisvgm.1
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/doc/dvisvgm.1
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: dvisvgm
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 03/01/2013
+.\"    Author: Martin Gieseking <martin.gieseking@uos.de>
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 04/09/2013
 .\"    Manual: dvisvgm Manual
-.\"    Source: dvisvgm 1.2
+.\"    Source: dvisvgm 1.2.1
 .\"  Language: English
 .\"
-.TH "DVISVGM" "1" "03/01/2013" "dvisvgm 1\&.2" "dvisvgm Manual"
+.TH "DVISVGM" "1" "04/09/2013" "dvisvgm 1\&.2\&.1" "dvisvgm Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -658,7 +658,7 @@ dvisvgm supports several sets of \fIspecial commands\fR that can be used to enri
 .PP
 \fBbgcolor\fR
 .RS 4
-Special statement for changing the background/page color\&. Since SVG 1\&.1 doesn\(cqt support background colors, dvisvgm inserts a rectangle of the chosen color\&. In the current version, this rectangle always gets the size of the minimal bounding box\&. This command is part of the color special set but is handled separately in order to let the user turn it off\&. For an overview of the command syntax, see the documentation of dvips, for instance\&.
+Special statement for changing the background/page color\&. Since SVG 1\&.1 doesn\(cqt support background colors, dvisvgm inserts a rectangle of the chosen color into the generated SVG document\&. This rectangle always gets the same size as the selected or computed bounding box\&. This background color command is part of the color special set but is handled separately in order to let the user turn it off\&. For an overview of the command syntax, see the documentation of dvips, for instance\&.
 .RE
 .PP
 \fBcolor\fR
@@ -1012,13 +1012,11 @@ T}
 .PP
 Project home page
 .RS 4
-
 http://dvisvgm\&.sourceforge\&.net
 .RE
 .PP
 SourceForge project site
 .RS 4
-
 http://sourceforge\&.net/projects/dvisvgm
 .RE
 .SH "BUGS"
@@ -1030,3 +1028,9 @@ Written by Martin Gieseking <martin\&.gieseking@uos\&.de>
 .SH "COPYING"
 .sp
 Copyright \(co 2005\-2013 Martin Gieseking\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 3 or, (at your option) any later version\&.
+.SH "AUTHOR"
+.PP
+\fBMartin Gieseking\fR <\&martin\&.gieseking@uos\&.de\&>
+.RS 4
+Author.
+.RE
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/doc/dvisvgm.txt.in b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/doc/dvisvgm.txt.in
index c4f0f8a7d79..3250457d9b7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/doc/dvisvgm.txt.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/doc/dvisvgm.txt.in
@@ -416,9 +416,10 @@ with the same prefix. To get a list of actually provided special handlers, use o
 
 *bgcolor*::
 Special statement for changing the background/page color. Since SVG 1.1 doesn't support background colors,
-dvisvgm inserts a rectangle of the chosen color. In the current version, this rectangle always gets the size
-of the minimal bounding box. This command is part of the color special set but is handled separately in order
-to let the user turn it off. For an overview of the command syntax, see the documentation of dvips, for instance.
+dvisvgm inserts a rectangle of the chosen color into the generated SVG document. This rectangle always gets
+the same size as the selected or computed bounding box. This background color command is part of the color
+special set but is handled separately in order to let the user turn it off. For an overview of the command
+syntax, see the documentation of dvips, for instance.
 
 *color*::
 Statements of this command set provide instructions to change the text/paint color. For an overview of the
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/Makefile.am
index 97bf78f50f4..97bf78f50f4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/auxiliary.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/auxiliary.h
index fbd1db4c166..c4c610cd4ef 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/auxiliary.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/auxiliary.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2011 Peter Selinger.
+/* Copyright (C) 2001-2013 Peter Selinger.
    This file is part of Potrace. It is free software and it is covered
    by the GNU General Public License. See the file COPYING for details. */
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/bitmap.h
index 2df04b46fbe..1ce13d61e2d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/bitmap.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2011 Peter Selinger.
+/* Copyright (C) 2001-2013 Peter Selinger.
    This file is part of Potrace. It is free software and it is covered
    by the GNU General Public License. See the file COPYING for details. */
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/curve.c b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/curve.c
index 414fb5de9ee..2bfc4ab3bf4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/curve.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/curve.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2011 Peter Selinger.
+/* Copyright (C) 2001-2013 Peter Selinger.
    This file is part of Potrace. It is free software and it is covered
    by the GNU General Public License. See the file COPYING for details. */
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/curve.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/curve.h
index e98efdf5cfd..7ba2a46439e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/curve.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/curve.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2011 Peter Selinger.
+/* Copyright (C) 2001-2013 Peter Selinger.
    This file is part of Potrace. It is free software and it is covered
    by the GNU General Public License. See the file COPYING for details. */
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/decompose.c b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/decompose.c
index 376af015df3..adcdc1c2cab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/decompose.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/decompose.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2011 Peter Selinger.
+/* Copyright (C) 2001-2013 Peter Selinger.
    This file is part of Potrace. It is free software and it is covered
    by the GNU General Public License. See the file COPYING for details. */
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/decompose.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/decompose.h
index 89b01e5045c..feec07a46b3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/decompose.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/decompose.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2011 Peter Selinger.
+/* Copyright (C) 2001-2013 Peter Selinger.
    This file is part of Potrace. It is free software and it is covered
    by the GNU General Public License. See the file COPYING for details. */
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/lists.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/lists.h
index 078129afce5..b67b9662356 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/lists.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/lists.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2011 Peter Selinger.
+/* Copyright (C) 2001-2013 Peter Selinger.
    This file is part of Potrace. It is free software and it is covered
    by the GNU General Public License. See the file COPYING for details. */
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/potracelib.c b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/potracelib.c
index c483ea335b9..95901bcb53f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/potracelib.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/potracelib.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2011 Peter Selinger.
+/* Copyright (C) 2001-2013 Peter Selinger.
    This file is part of Potrace. It is free software and it is covered
    by the GNU General Public License. See the file COPYING for details. */
 
@@ -55,7 +55,7 @@ potrace_state_t *potrace_trace(const potrace_param_t *param, const potrace_bitma
   potrace_state_t *st;
   progress_t prog;
   progress_t subprog;
-  
+
   /* prepare private progress bar state */
   prog.callback = param->progress.callback;
   prog.data = param->progress.data;
@@ -110,5 +110,5 @@ void potrace_param_free(potrace_param_t *p) {
 }
 
 const char *potrace_version(void) {
-  return "potracelib 1.10";
+  return "potracelib 1.11";
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/potracelib.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/potracelib.h
index 99e17e424ae..5c628a2bdbd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/potracelib.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/potracelib.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2011 Peter Selinger.
+/* Copyright (C) 2001-2013 Peter Selinger.
    This file is part of Potrace. It is free software and it is covered
    by the GNU General Public License. See the file COPYING for details. */
 
@@ -78,7 +78,7 @@ typedef struct potrace_dpoint_s potrace_dpoint_t;
 struct potrace_curve_s {
   int n;                    /* number of segments */
   int *tag;                 /* tag[n]: POTRACE_CURVETO or POTRACE_CORNER */
-  potrace_dpoint_t (*c)[3]; /* c[n][3]: control points. 
+  potrace_dpoint_t (*c)[3]; /* c[n][3]: control points.
 			       c[n][0] is unused for tag[n]=POTRACE_CORNER */
 };
 typedef struct potrace_curve_s potrace_curve_t;
@@ -96,7 +96,7 @@ struct potrace_path_s {
 
   struct potrace_privpath_s *priv;  /* private state */
 };
-typedef struct potrace_path_s potrace_path_t;  
+typedef struct potrace_path_s potrace_path_t;
 
 /* ---------------------------------------------------------------------- */
 /* Potrace state */
@@ -105,7 +105,7 @@ typedef struct potrace_path_s potrace_path_t;
 #define POTRACE_STATUS_INCOMPLETE 1
 
 struct potrace_state_s {
-  int status;                       
+  int status;
   potrace_path_t *plist;            /* vector data */
 
   struct potrace_privstate_s *priv; /* private state */
@@ -122,7 +122,7 @@ potrace_param_t *potrace_param_default(void);
 void potrace_param_free(potrace_param_t *p);
 
 /* trace a bitmap*/
-potrace_state_t *potrace_trace(const potrace_param_t *param, 
+potrace_state_t *potrace_trace(const potrace_param_t *param,
 			       const potrace_bitmap_t *bm);
 
 /* free a Potrace state */
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/progress.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/progress.h
index 93a1fa3f04c..166209a5226 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/progress.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/progress.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2011 Peter Selinger.
+/* Copyright (C) 2001-2013 Peter Selinger.
    This file is part of Potrace. It is free software and it is covered
    by the GNU General Public License. See the file COPYING for details. */
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/trace.c b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/trace.c
index f1e88a90862..1464bd32948 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/trace.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/trace.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2011 Peter Selinger.
+/* Copyright (C) 2001-2013 Peter Selinger.
    This file is part of Potrace. It is free software and it is covered
    by the GNU General Public License. See the file COPYING for details. */
 
@@ -875,7 +875,7 @@ static void smooth(privcurve_t *curve, double alphamax) {
     }
     curve->alpha0[j] = alpha;	 /* remember "original" value of alpha */
 
-    if (alpha > alphamax) {  /* pointed corner */
+    if (alpha >= alphamax) {  /* pointed corner */
       curve->tag[j] = POTRACE_CORNER;
       curve->c[j][1] = curve->vertex[j];
       curve->c[j][2] = p4;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/trace.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/trace.h
index dc2b9247adb..d24ffb354ec 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/potracelib/trace.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/trace.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2011 Peter Selinger.
+/* Copyright (C) 2001-2013 Peter Selinger.
    This file is part of Potrace. It is free software and it is covered
    by the GNU General Public License. See the file COPYING for details. */
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/BgColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/BgColorSpecialHandler.cpp
index a225d360910..a225d360910 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/BgColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/BgColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/BgColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/BgColorSpecialHandler.h
index 98dd814ba9e..98dd814ba9e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/BgColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/BgColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Bitmap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Bitmap.cpp
index e72d5ee34ac..e72d5ee34ac 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Bitmap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Bitmap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Bitmap.h
index 1a1f19caf15..1a1f19caf15 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/BoundingBox.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/BoundingBox.cpp
index d39ff708da9..d39ff708da9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/BoundingBox.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/BoundingBox.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/BoundingBox.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/BoundingBox.h
index 96655cd1d5d..96655cd1d5d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/BoundingBox.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/BoundingBox.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/CRC32.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CRC32.cpp
index 2295ab17bde..2295ab17bde 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/CRC32.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CRC32.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/CRC32.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CRC32.h
index ca8ec359d0f..ca8ec359d0f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/CRC32.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CRC32.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Calculator.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Calculator.cpp
index c26a40bc237..c26a40bc237 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Calculator.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Calculator.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Calculator.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Calculator.h
index b3faa325322..b3faa325322 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Calculator.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Calculator.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/CmdLineParserBase.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CmdLineParserBase.cpp
index 73439fc3f09..73439fc3f09 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/CmdLineParserBase.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CmdLineParserBase.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/CmdLineParserBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CmdLineParserBase.h
index 7de4f8133d8..389bb247bc6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/CmdLineParserBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CmdLineParserBase.h
@@ -24,7 +24,7 @@
 #include <string>
 #include <vector>
 
-struct InputReader;
+class InputReader;
 
 class CmdLineParserBase
 {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Color.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Color.cpp
index c9695a62b32..45d5ce453da 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Color.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Color.cpp
@@ -29,6 +29,7 @@ using namespace std;
 
 const Color Color::BLACK(0);
 const Color Color::WHITE(UInt8(255), UInt8(255), UInt8(255));
+const Color Color::TRANSPARENT(0xff000000);
 
 
 static inline UInt8 float_to_byte (float v) {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Color.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Color.h
index a6b6b40dcc9..24b33c7bb95 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Color.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Color.h
@@ -25,11 +25,16 @@
 #include <vector>
 #include "types.h"
 
+#ifdef TRANSPARENT
+#undef TRANSPARENT
+#endif
+
 class Color
 {
 	public:
 		static const Color BLACK;
 		static const Color WHITE;
+		static const Color TRANSPARENT;
 
 	public:
 		Color () : _rgb(0) {}
@@ -46,7 +51,7 @@ class Color
 		void setGray (float g)                {set(g,g,g);}
 		void setHSB (float h, float s, float b);
 		void setCMYK (float c, float m, float y, float k);
-		void getRGB (float &r, float &g, float &b) const; 
+		void getRGB (float &r, float &g, float &b) const;
 		void operator *= (double c);
 		std::string rgbString () const;
 		static void CMYK2RGB (const std::vector<float> &cmyk, std::vector<float> &rgb);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/ColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/ColorSpecialHandler.cpp
index d156a43770f..d156a43770f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/ColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/ColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/ColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/ColorSpecialHandler.h
index a9b73dc8b74..a9b73dc8b74 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/ColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/ColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/CommandLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CommandLine.cpp
index 4d240b769ac..4d240b769ac 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/CommandLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CommandLine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/CommandLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CommandLine.h
index 67d00d4e20d..67d00d4e20d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/CommandLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CommandLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DLLoader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DLLoader.cpp
index 30317455ba6..30317455ba6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DLLoader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DLLoader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DLLoader.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DLLoader.h
index 3052d13714e..3052d13714e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DLLoader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DLLoader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DVIActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIActions.cpp
index f9c95dc3754..f9c95dc3754 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DVIActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIActions.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DVIActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIActions.h
index a3fa86a801c..a3fa86a801c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DVIActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIReader.cpp
index acdb8cd7351..acdb8cd7351 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIReader.h
index 1a1163900d6..1a1163900d6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DVIToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIToSVG.cpp
index 5fe9bef8675..5fe9bef8675 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DVIToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIToSVG.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DVIToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIToSVG.h
index 0efc86a8a07..0efc86a8a07 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DVIToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DVIToSVGActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIToSVGActions.cpp
index adae27f105b..c9853b220e9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DVIToSVGActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIToSVGActions.cpp
@@ -39,7 +39,7 @@ bool DVIToSVGActions::EXACT_BBOX = false;
 
 
 DVIToSVGActions::DVIToSVGActions (DVIToSVG &dvisvg, SVGTree &svg)
-	: _svg(svg), _dvisvg(dvisvg), _pageMatrix(0), _bgcolor(Color::WHITE), _boxes(0)
+	: _svg(svg), _dvisvg(dvisvg), _pageMatrix(0), _bgcolor(Color::TRANSPARENT), _boxes(0)
 {
 	_currentFontNum = -1;
 	_pageCount = 0;
@@ -57,7 +57,7 @@ void DVIToSVGActions::reset() {
 	_usedFonts.clear();
 	_bbox = BoundingBox();
 	_currentFontNum = -1;
-	_bgcolor = Color::WHITE;
+	_bgcolor = Color::TRANSPARENT;
 }
 
 
@@ -219,7 +219,8 @@ void DVIToSVGActions::beginPage (unsigned n, Int32 *c) {
 /** This method is called when an "end of page (eop)" command was found in the DVI file. */
 void DVIToSVGActions::endPage () {
 	_svg.transformPage(_pageMatrix);
-	if (_bgcolor != Color::WHITE) {
+	if (_bgcolor != Color::TRANSPARENT) {
+		// create a rectangle filled with the background color
 		XMLElementNode *r = new XMLElementNode("rect");
 		r->addAttribute("x", _bbox.minX());
 		r->addAttribute("y", _bbox.minY());
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DVIToSVGActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIToSVGActions.h
index 2e68bb9cb31..2e68bb9cb31 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DVIToSVGActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIToSVGActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Directory.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Directory.cpp
index c13ebe35a38..c13ebe35a38 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Directory.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Directory.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Directory.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Directory.h
index 6420bec6d19..6420bec6d19 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Directory.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Directory.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DvisvgmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DvisvgmSpecialHandler.cpp
index 11e3c0fc42a..11e3c0fc42a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DvisvgmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DvisvgmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DvisvgmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DvisvgmSpecialHandler.h
index 93e726fe634..93e726fe634 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/DvisvgmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DvisvgmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/EPSFile.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EPSFile.cpp
index cbeb5600366..cbeb5600366 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/EPSFile.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EPSFile.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/EPSFile.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EPSFile.h
index 60a4c007d39..60a4c007d39 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/EPSFile.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EPSFile.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/EPSToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EPSToSVG.cpp
index 2c2a38e7a9b..2c2a38e7a9b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/EPSToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EPSToSVG.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/EPSToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EPSToSVG.h
index 92edb5884e0..92edb5884e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/EPSToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EPSToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/EmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EmSpecialHandler.cpp
index 3617e188a64..3617e188a64 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/EmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/EmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EmSpecialHandler.h
index 2a0700ebb9e..2a0700ebb9e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/EmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FileFinder.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FileFinder.cpp
index 8f167c19a50..bbd90df61c1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FileFinder.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FileFinder.cpp
@@ -253,4 +253,4 @@ const char* FileFinder::lookup (const std::string &fname, bool extended) {
 	if ((path = find_file(fname)) || (extended  && ((path = find_mapped_file(fname)) || (path = mktex(fname)))))
 		return path;
 	return 0;
-}
+}
\ No newline at end of file
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FileFinder.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FileFinder.h
index f0d8dbba001..f0d8dbba001 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FileFinder.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FileFinder.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FilePath.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FilePath.cpp
index 2d7e676772a..2d7e676772a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FilePath.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FilePath.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FilePath.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FilePath.h
index 5bd3fdf98e2..5bd3fdf98e2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FilePath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FilePath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FileSystem.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FileSystem.cpp
index 67e48595db9..67e48595db9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FileSystem.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FileSystem.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FileSystem.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FileSystem.h
index c920a5046e6..c920a5046e6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FileSystem.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FileSystem.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Font.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Font.cpp
index f9ec0737a2d..f9ec0737a2d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Font.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Font.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Font.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Font.h
index ed3c82f3634..ed3c82f3634 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Font.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Font.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontCache.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontCache.cpp
index a36df9afa82..a36df9afa82 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontCache.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontCache.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontCache.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontCache.h
index cf4cbef7ec2..cf4cbef7ec2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontCache.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontCache.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontEncoding.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontEncoding.cpp
index bf9efb8e3ee..bf9efb8e3ee 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontEncoding.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontEncoding.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontEncoding.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontEncoding.h
index 3170d850256..3170d850256 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontEncoding.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontEncoding.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontEngine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontEngine.cpp
index ab53b1bd644..ab53b1bd644 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontEngine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontEngine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontEngine.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontEngine.h
index 68652b66523..68652b66523 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontEngine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontEngine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontManager.cpp
index 0481b59a969..0481b59a969 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontManager.h
index 18966269158..18966269158 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontMap.cpp
index cd349080d14..cd349080d14 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontMap.h
index b3c1b85a304..b3c1b85a304 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FontMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/GFGlyphTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFGlyphTracer.cpp
index c40702e595f..c40702e595f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/GFGlyphTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFGlyphTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/GFGlyphTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFGlyphTracer.h
index 379ed1d98c8..379ed1d98c8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/GFGlyphTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFGlyphTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/GFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFReader.cpp
index 1bb6c426549..1bb6c426549 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/GFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/GFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFReader.h
index 0d9a7bb0e32..0d9a7bb0e32 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/GFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/GFTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFTracer.cpp
index 69a078456a0..69a078456a0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/GFTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/GFTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFTracer.h
index ba15961db65..ba15961db65 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/GFTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Ghostscript.cpp
index 7da863cbc82..7da863cbc82 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Ghostscript.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Ghostscript.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Ghostscript.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Ghostscript.h
index ccfd5b0b0f4..ccfd5b0b0f4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Ghostscript.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Ghostscript.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Glyph.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Glyph.h
index b598dc5002d..b598dc5002d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Glyph.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Glyph.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/GlyphTracerMessages.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GlyphTracerMessages.h
index 2b0cedcd8b6..2b0cedcd8b6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/GlyphTracerMessages.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GlyphTracerMessages.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/GraphicPath.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GraphicPath.h
index 46a3b0cc335..46a3b0cc335 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/GraphicPath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GraphicPath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/InputBuffer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/InputBuffer.cpp
index ad99305fa3c..ad99305fa3c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/InputBuffer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/InputBuffer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/InputBuffer.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/InputBuffer.h
index c25df9a1452..c25df9a1452 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/InputBuffer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/InputBuffer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/InputReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/InputReader.cpp
index 3899a2362b2..3899a2362b2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/InputReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/InputReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/InputReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/InputReader.h
index 5bc35d4f61b..23a16421567 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/InputReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/InputReader.h
@@ -27,33 +27,34 @@
 #include "InputBuffer.h"
 
 
-struct InputReader
+class InputReader
 {
-	virtual ~InputReader() {}
-	virtual int get () =0;
-	virtual int peek () const =0;
-	virtual int peek (size_t n) const =0;
-	virtual bool eof () const =0;
-	virtual bool check (char c) const {return peek() == c;}
-	virtual bool check (const char *s, bool consume=true);
-	virtual int compare (const char *s, bool consume=true);
-	virtual void skip (size_t n);
-	virtual bool skipUntil (const char *s, bool consume=true);
-	virtual int find (char c) const;
-	virtual void skipSpace ();
-	virtual int getInt ();
-	virtual bool parseInt (int &val, bool accept_sign=true);
-	virtual bool parseInt (int base, int &val);
-	virtual bool parseUInt (unsigned &val);
-	virtual char parseDouble (double &val);
-	virtual double getDouble ();
-	virtual std::string getWord ();
-	virtual char getPunct ();
-	virtual std::string getQuotedString (char quotechar);
-	virtual std::string getString ();
-	virtual std::string getString (size_t n);
-	virtual int parseAttributes (std::map<std::string,std::string> &attr);
-	virtual operator bool () const {return !eof();}
+	public:
+		virtual ~InputReader() {}
+		virtual int get () =0;
+		virtual int peek () const =0;
+		virtual int peek (size_t n) const =0;
+		virtual bool eof () const =0;
+		virtual bool check (char c) const {return peek() == c;}
+		virtual bool check (const char *s, bool consume=true);
+		virtual int compare (const char *s, bool consume=true);
+		virtual void skip (size_t n);
+		virtual bool skipUntil (const char *s, bool consume=true);
+		virtual int find (char c) const;
+		virtual void skipSpace ();
+		virtual int getInt ();
+		virtual bool parseInt (int &val, bool accept_sign=true);
+		virtual bool parseInt (int base, int &val);
+		virtual bool parseUInt (unsigned &val);
+		virtual char parseDouble (double &val);
+		virtual double getDouble ();
+		virtual std::string getWord ();
+		virtual char getPunct ();
+		virtual std::string getQuotedString (char quotechar);
+		virtual std::string getString ();
+		virtual std::string getString (size_t n);
+		virtual int parseAttributes (std::map<std::string,std::string> &attr);
+		virtual operator bool () const {return !eof();}
 };
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Length.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Length.cpp
index aae20b74e59..aae20b74e59 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Length.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Length.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Length.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Length.h
index 995ba068cee..995ba068cee 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Length.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Length.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Makefile.am
index 60fa35f5374..60fa35f5374 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/MapLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MapLine.cpp
index 99dce4f9547..99dce4f9547 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/MapLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MapLine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/MapLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MapLine.h
index 87451dc912d..87451dc912d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/MapLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MapLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Matrix.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Matrix.cpp
index f44e0661e80..f44e0661e80 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Matrix.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Matrix.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Matrix.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Matrix.h
index 30f1b39f31b..30f1b39f31b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Matrix.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Matrix.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Message.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Message.cpp
index 24c5ea7547f..24c5ea7547f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Message.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Message.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Message.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Message.h
index bc4a9ed016c..bc4a9ed016c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Message.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Message.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/MessageException.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MessageException.h
index 92b8978c3e1..92b8978c3e1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/MessageException.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MessageException.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/MetafontWrapper.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MetafontWrapper.cpp
index 37e3b68f92f..37e3b68f92f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/MetafontWrapper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MetafontWrapper.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/MetafontWrapper.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MetafontWrapper.h
index 2a69654ff95..2a69654ff95 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/MetafontWrapper.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MetafontWrapper.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/MiKTeXCom.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MiKTeXCom.cpp
index ddf5af52f80..ddf5af52f80 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/MiKTeXCom.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MiKTeXCom.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/MiKTeXCom.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MiKTeXCom.h
index 8649cc9f377..8649cc9f377 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/MiKTeXCom.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MiKTeXCom.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PSInterpreter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PSInterpreter.cpp
index f1fad9448d8..f1fad9448d8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PSInterpreter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PSInterpreter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PSInterpreter.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PSInterpreter.h
index 4e46732a420..4e46732a420 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PSInterpreter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PSInterpreter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PSPattern.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PSPattern.cpp
index 52fbf16c589..52fbf16c589 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PSPattern.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PSPattern.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PSPattern.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PSPattern.h
index 7e2848dea3b..7e2848dea3b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PSPattern.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PSPattern.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PageRanges.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PageRanges.cpp
index 8a20a35d52b..8a20a35d52b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PageRanges.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PageRanges.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PageRanges.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PageRanges.h
index b9f155cac47..0e5cd58e5ff 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PageRanges.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PageRanges.h
@@ -44,7 +44,6 @@ class PageRanges
 
    private:
 		Container _ranges;
-		int _max;
 };
 
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PageSize.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PageSize.cpp
index 85a6c062f85..85a6c062f85 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PageSize.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PageSize.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PageSize.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PageSize.h
index 058bc3d21ff..058bc3d21ff 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PageSize.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PageSize.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Pair.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Pair.h
index a3dc5a12af3..a3dc5a12af3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Pair.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Pair.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PdfSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PdfSpecialHandler.cpp
index f3d8464704c..f3d8464704c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PdfSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PdfSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PdfSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PdfSpecialHandler.h
index 43cdd1045de..43cdd1045de 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PdfSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PdfSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Process.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Process.cpp
index a76219e9846..a76219e9846 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Process.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Process.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Process.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Process.h
index 973fabf2baf..973fabf2baf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Process.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Process.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PsSpecialHandler.cpp
index 91020b9f28c..91020b9f28c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PsSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PsSpecialHandler.h
index afb9b3cfc36..afb9b3cfc36 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/PsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PsSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/SVGOutputBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SVGOutputBase.h
index f53815c0a28..f53815c0a28 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/SVGOutputBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SVGOutputBase.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/SVGTree.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SVGTree.cpp
index d37dba6dc7f..d37dba6dc7f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/SVGTree.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SVGTree.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/SVGTree.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SVGTree.h
index c81dbd6d62f..c81dbd6d62f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/SVGTree.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SVGTree.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/SignalHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SignalHandler.cpp
index ffcd66165e0..ffcd66165e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/SignalHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SignalHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/SignalHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SignalHandler.h
index e7473f567d8..e7473f567d8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/SignalHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SignalHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/SpecialActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SpecialActions.h
index 3d99d9b17c0..3d99d9b17c0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/SpecialActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SpecialActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/SpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SpecialHandler.h
index 7818dbfb108..7818dbfb108 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/SpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/SpecialManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SpecialManager.cpp
index 7ef7ea4a67a..7ef7ea4a67a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/SpecialManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SpecialManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/SpecialManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SpecialManager.h
index 51f9bb08d02..51f9bb08d02 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/SpecialManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SpecialManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/StreamReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/StreamReader.cpp
index bc6ac14eaef..bc6ac14eaef 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/StreamReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/StreamReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/StreamReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/StreamReader.h
index 4a9ce672d8e..4a9ce672d8e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/StreamReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/StreamReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/StreamWriter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/StreamWriter.cpp
index bdd378f9993..bdd378f9993 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/StreamWriter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/StreamWriter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/StreamWriter.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/StreamWriter.h
index 6217800dae6..6217800dae6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/StreamWriter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/StreamWriter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Subfont.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Subfont.cpp
index aa552d029f6..aa552d029f6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Subfont.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Subfont.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Subfont.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Subfont.h
index b099bc76897..b099bc76897 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Subfont.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Subfont.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/System.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/System.cpp
index 80c71ec7b4c..80c71ec7b4c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/System.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/System.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/System.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/System.h
index 775d6358dd7..775d6358dd7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/System.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/System.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/TFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/TFM.cpp
index 093af8cb5e3..093af8cb5e3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/TFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/TFM.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/TFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/TFM.h
index f2ce472ead4..f2ce472ead4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/TFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/TFM.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Terminal.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Terminal.cpp
index b40a68c73d9..b40a68c73d9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Terminal.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Terminal.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Terminal.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Terminal.h
index 835ae4571e6..835ae4571e6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/Terminal.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Terminal.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/TpicSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/TpicSpecialHandler.cpp
index f61338905e4..f61338905e4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/TpicSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/TpicSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/TpicSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/TpicSpecialHandler.h
index 257843d1115..257843d1115 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/TpicSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/TpicSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/VFActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/VFActions.h
index ba25639b337..ba25639b337 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/VFActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/VFActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/VFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/VFReader.cpp
index 39b081d8284..39b081d8284 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/VFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/VFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/VFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/VFReader.h
index 3abaa894cfa..3abaa894cfa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/VFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/VFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/VectorStream.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/VectorStream.h
index d767c071290..d767c071290 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/VectorStream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/VectorStream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/XMLDocTypeNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLDocTypeNode.h
index ad1cd0f3b38..ad1cd0f3b38 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/XMLDocTypeNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLDocTypeNode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/XMLDocument.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLDocument.cpp
index f9a65c90da8..f9a65c90da8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/XMLDocument.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLDocument.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/XMLDocument.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLDocument.h
index 3697c5702d6..3697c5702d6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/XMLDocument.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLDocument.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/XMLNode.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLNode.cpp
index 909ad0f62a2..d69b4a9b049 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/XMLNode.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLNode.cpp
@@ -278,11 +278,17 @@ XMLDeclarationNode::~XMLDeclarationNode () {
 		delete *i;
 }
 
-void XMLDeclarationNode::append (XMLDeclarationNode *child) {
-	if (child)
-		_children.push_back(child);
+
+/** Appends another declaration node to this one.
+ *  @param[in] child child to append, must be of type XMLDeclarationNode */
+void XMLDeclarationNode::append (XMLNode *child) {
+	if (XMLDeclarationNode *decl_node = dynamic_cast<XMLDeclarationNode*>(child))
+		_children.push_back(decl_node);
+	else
+		delete child;
 }
 
+
 ostream& XMLDeclarationNode::write (ostream &os) const {
 	os << "<!" << _name << ' ' << _params;
 	if (_children.empty())
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/XMLNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLNode.h
index c50a4ca45cf..324bea068aa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/XMLNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLNode.h
@@ -108,7 +108,7 @@ class XMLDeclarationNode : public XMLNode
 		XMLDeclarationNode (const XMLDeclarationNode &node);
 		~XMLDeclarationNode ();
 		XMLNode* clone () const {return new XMLDeclarationNode(*this);}
-		void append (XMLDeclarationNode *child);
+		void append (XMLNode *child);
 		std::ostream& write (std::ostream &os) const;
 		bool emit (std::ostream &os, XMLNode *stopElement);
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/XMLString.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLString.cpp
index 326eaf89bdf..326eaf89bdf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/XMLString.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLString.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/XMLString.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLString.h
index b1496b4a503..b1496b4a503 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/XMLString.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLString.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/dvisvgm.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/dvisvgm.cpp
index 7f6e5f5961b..7f6e5f5961b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/dvisvgm.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/dvisvgm.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/gzstream.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/gzstream.cpp
index 2893c299891..2893c299891 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/gzstream.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/gzstream.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/gzstream.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/gzstream.h
index 60f38c4fac7..60f38c4fac7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/gzstream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/gzstream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/iapi.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/iapi.h
index 8e29d938d03..8e29d938d03 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/iapi.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/iapi.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/ierrors.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/ierrors.h
index 3184341177e..3184341177e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/ierrors.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/ierrors.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/macros.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/macros.h
index 8935b9babe9..8935b9babe9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/macros.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/macros.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/options.xml b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/options.xml
index 2abf740d04b..2abf740d04b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/options.xml
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/options.xml
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/psdefs.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/psdefs.cpp
index 259105a3529..259105a3529 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/psdefs.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/psdefs.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/types.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/types.h
index c22d0e1bf47..c22d0e1bf47 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/types.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/types.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/BoundingBoxTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/BoundingBoxTest.cpp
index 53bf63c3bf4..53bf63c3bf4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/BoundingBoxTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/BoundingBoxTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/CRC32Test.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/CRC32Test.cpp
index 40bc3415363..40bc3415363 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/CRC32Test.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/CRC32Test.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/CalculatorTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/CalculatorTest.cpp
index a4bb24c6215..a4bb24c6215 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/CalculatorTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/CalculatorTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/ColorSpecialTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/ColorSpecialTest.cpp
index 48d4d57729b..48d4d57729b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/ColorSpecialTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/ColorSpecialTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/CommandLineTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/CommandLineTest.cpp
index 7d1e5874b33..7d1e5874b33 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/CommandLineTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/CommandLineTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/DirectoryTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/DirectoryTest.cpp
index 5a503b9bfd7..5a503b9bfd7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/DirectoryTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/DirectoryTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/FileFinderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FileFinderTest.cpp
index 9286237ad30..9286237ad30 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/FileFinderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FileFinderTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/FilePathTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FilePathTest.cpp
index 6f1ef7677ab..6f1ef7677ab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/FilePathTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FilePathTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/FileSystemTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FileSystemTest.cpp
index bd7adeef383..bd7adeef383 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/FileSystemTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FileSystemTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/FontManagerTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FontManagerTest.cpp
index d7d0fb30f57..d7d0fb30f57 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/FontManagerTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FontManagerTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/FontMapTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FontMapTest.cpp
index a853b829295..a853b829295 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/FontMapTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FontMapTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/GFReaderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/GFReaderTest.cpp
index 333eacfb7c4..333eacfb7c4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/GFReaderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/GFReaderTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/GraphicPathTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/GraphicPathTest.cpp
index 6df695604f2..6df695604f2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/GraphicPathTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/GraphicPathTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/LengthTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/LengthTest.cpp
index e6c7bbd5dac..e6c7bbd5dac 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/LengthTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/LengthTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/Makefile.am
index 8f528347c80..3cc15efde22 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/Makefile.am
@@ -11,145 +11,145 @@ check_PROGRAMS =
 TESTS += BoundingBoxTest
 check_PROGRAMS += BoundingBoxTest
 BoundingBoxTest_SOURCES = BoundingBoxTest.cpp
-BoundingBoxTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+BoundingBoxTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += CalculatorTest
 check_PROGRAMS += CalculatorTest
 CalculatorTest_SOURCES = CalculatorTest.cpp
-CalculatorTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+CalculatorTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += ColorSpecialTest
 check_PROGRAMS += ColorSpecialTest
 ColorSpecialTest_SOURCES = ColorSpecialTest.cpp
-ColorSpecialTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+ColorSpecialTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += CommandLineTest
 check_PROGRAMS += CommandLineTest
 CommandLineTest_SOURCES = CommandLineTest.cpp
-CommandLineTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+CommandLineTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += CRC32Test
 check_PROGRAMS += CRC32Test
 CRC32Test_SOURCES = CRC32Test.cpp
-CRC32Test_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+CRC32Test_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += DirectoryTest
 check_PROGRAMS += DirectoryTest
 DirectoryTest_SOURCES = DirectoryTest.cpp
-DirectoryTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+DirectoryTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += FileFinderTest
 check_PROGRAMS += FileFinderTest
 FileFinderTest_SOURCES = FileFinderTest.cpp
-FileFinderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+FileFinderTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += FilePathTest
 check_PROGRAMS += FilePathTest
 FilePathTest_SOURCES = FilePathTest.cpp
-FilePathTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+FilePathTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += FileSystemTest
 check_PROGRAMS += FileSystemTest
 FileSystemTest_SOURCES = FileSystemTest.cpp
-FileSystemTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+FileSystemTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += FontManagerTest
 check_PROGRAMS += FontManagerTest
 FontManagerTest_SOURCES = FontManagerTest.cpp
-FontManagerTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+FontManagerTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += FontMapTest
 check_PROGRAMS += FontMapTest
 FontMapTest_SOURCES = FontMapTest.cpp
-FontMapTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+FontMapTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += GFReaderTest
 check_PROGRAMS += GFReaderTest
 GFReaderTest_SOURCES = GFReaderTest.cpp
-GFReaderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+GFReaderTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += GraphicPathTest
 check_PROGRAMS += GraphicPathTest
 GraphicPathTest_SOURCES = GraphicPathTest.cpp
-GraphicPathTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+GraphicPathTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += LengthTest
 check_PROGRAMS += LengthTest
 LengthTest_SOURCES = LengthTest.cpp
-LengthTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+LengthTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += MapLineTest
 check_PROGRAMS += MapLineTest
 MapLineTest_SOURCES = MapLineTest.cpp
-MapLineTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+MapLineTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += MatrixTest
 check_PROGRAMS += MatrixTest
 MatrixTest_SOURCES = MatrixTest.cpp
-MatrixTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+MatrixTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += MessageExceptionTest
 check_PROGRAMS += MessageExceptionTest
 MessageExceptionTest_SOURCES = MessageExceptionTest.cpp
-MessageExceptionTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+MessageExceptionTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += PageRagesTest
 check_PROGRAMS += PageRagesTest
 PageRagesTest_SOURCES = PageRagesTest.cpp
-PageRagesTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+PageRagesTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += PageSizeTest
 check_PROGRAMS += PageSizeTest
 PageSizeTest_SOURCES = PageSizeTest.cpp
-PageSizeTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+PageSizeTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += PairTest
 check_PROGRAMS += PairTest
 PairTest_SOURCES = PairTest.cpp
-PairTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+PairTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += PSInterpreterTest
 check_PROGRAMS += PSInterpreterTest
 PSInterpreterTest_SOURCES = PSInterpreterTest.cpp
-PSInterpreterTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+PSInterpreterTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += SplittedCharInputBufferTest
 check_PROGRAMS += SplittedCharInputBufferTest
 SplittedCharInputBufferTest_SOURCES = SplittedCharInputBufferTest.cpp
-SplittedCharInputBufferTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+SplittedCharInputBufferTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += StreamInputBufferTest
 check_PROGRAMS += StreamInputBufferTest
 StreamInputBufferTest_SOURCES = StreamInputBufferTest.cpp
-StreamInputBufferTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+StreamInputBufferTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += StreamReaderTest
 check_PROGRAMS += StreamReaderTest
 StreamReaderTest_SOURCES = StreamReaderTest.cpp
-StreamReaderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+StreamReaderTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += StreamWriterTest
 check_PROGRAMS += StreamWriterTest
 StreamWriterTest_SOURCES = StreamWriterTest.cpp
-StreamWriterTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+StreamWriterTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += SubfontTest
 check_PROGRAMS += SubfontTest
 SubfontTest_SOURCES = SubfontTest.cpp
-SubfontTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+SubfontTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += TypesTest
 check_PROGRAMS += TypesTest
 TypesTest_SOURCES = TypesTest.cpp
-TypesTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+TypesTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTS += VectorStreamTest
 check_PROGRAMS += VectorStreamTest
 VectorStreamTest_SOURCES = VectorStreamTest.cpp
-VectorStreamTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+VectorStreamTest_LDADD = ../src/libdvisvgm.a -L../potracelib -lpotrace -lgtest -lgtest_main -lpthread
 
 TESTDATA =
 TESTDATA += frktest.dvi frktest-wf-cmp.svg frktest-nf-cmp.svg
-TESTDATA += sample.dvi sample-wf-cmp.svg sample-nf-cmp.svg sample.sfd
-EXTRA_DIST = check-conv normalize.xsl cmr10.600gf $(TESTDATA)
+TESTDATA += sample.dvi sample-wf-cmp.svg sample-nf-cmp.svg
+EXTRA_DIST = check-conv normalize.xsl cmr10.600gf sample.sfd $(TESTDATA)
 TESTS += check-conv
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/MapLineTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/MapLineTest.cpp
index e03f53c4b21..e03f53c4b21 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/MapLineTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/MapLineTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/MatrixTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/MatrixTest.cpp
index f01878900e1..f01878900e1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/MatrixTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/MatrixTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/MessageExceptionTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/MessageExceptionTest.cpp
index 14d6ed94978..14d6ed94978 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/MessageExceptionTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/MessageExceptionTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/PSInterpreterTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/PSInterpreterTest.cpp
index 06a9e7ce0dc..06a9e7ce0dc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/PSInterpreterTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/PSInterpreterTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/PageRagesTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/PageRagesTest.cpp
index ec0da0dfb28..ec0da0dfb28 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/PageRagesTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/PageRagesTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/PageSizeTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/PageSizeTest.cpp
index cb0bf778f9a..cb0bf778f9a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/PageSizeTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/PageSizeTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/PairTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/PairTest.cpp
index 68157243f43..68157243f43 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/PairTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/PairTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/SplittedCharInputBufferTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/SplittedCharInputBufferTest.cpp
index ff35f1c265c..ff35f1c265c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/SplittedCharInputBufferTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/SplittedCharInputBufferTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/StreamInputBufferTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/StreamInputBufferTest.cpp
index 8a1fbd103c2..8a1fbd103c2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/StreamInputBufferTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/StreamInputBufferTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/StreamReaderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/StreamReaderTest.cpp
index ba294a87201..ba294a87201 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/StreamReaderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/StreamReaderTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/StreamWriterTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/StreamWriterTest.cpp
index 0e142c205fa..0e142c205fa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/StreamWriterTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/StreamWriterTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/SubfontTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/SubfontTest.cpp
index de93aafcbaf..de93aafcbaf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/SubfontTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/SubfontTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/TypesTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/TypesTest.cpp
index 11cb44fc191..11cb44fc191 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/TypesTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/TypesTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/VectorStreamTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/VectorStreamTest.cpp
index 2d5d0b0bc3e..2d5d0b0bc3e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/VectorStreamTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/VectorStreamTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/check-conv b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/check-conv
index 9aeda3a2d74..9aeda3a2d74 100755
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/check-conv
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/check-conv
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/cmr10.600gf b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/cmr10.600gf
index 6dca421e21c..6dca421e21c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/cmr10.600gf
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/cmr10.600gf
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/frktest-nf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/frktest-nf-cmp.svg
index 372662c6b95..372662c6b95 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/frktest-nf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/frktest-nf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/frktest-wf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/frktest-wf-cmp.svg
index b8effca34a5..b8effca34a5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/frktest-wf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/frktest-wf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/frktest.dvi b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/frktest.dvi
index 723b08a2964..723b08a2964 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/frktest.dvi
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/frktest.dvi
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/normalize.xsl b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/normalize.xsl
index 5a6ba2f62d6..5a6ba2f62d6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/normalize.xsl
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/normalize.xsl
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/sample-nf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/sample-nf-cmp.svg
index b448e6caa8a..b448e6caa8a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/sample-nf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/sample-nf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/sample-wf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/sample-wf-cmp.svg
index d597c134c9a..d597c134c9a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/sample-wf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/sample-wf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/sample.dvi b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/sample.dvi
index 87e6236021d..87e6236021d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/sample.dvi
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/sample.dvi
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/sample.sfd b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/sample.sfd
index e7c84c7b5e1..e7c84c7b5e1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/tests/sample.sfd
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/sample.sfd
diff --git a/Build/source/texk/dvisvgm/version.ac b/Build/source/texk/dvisvgm/version.ac
index 1c972624ba2..04be9eeae75 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.2])
+m4_define([dvisvgm_version], [1.2.1])