220 files changed, 442 insertions, 295 deletions

diff --git a/Build/source/texk/README b/Build/source/texk/README
index 3cef136d389..addb24891e9 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -59,8 +59,8 @@ dvipos - ?
 
 dvipsk - maintained here, by us
 
-dvisvgm - checked 11apr13
-  http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.2.1.tar.gz
+dvisvgm - checked 21may13
+  http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.2.2.tar.gz
 
 gsftopk - from Paul Vojta's xdvi?
 
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index 838ab920a57..310d9b0142c 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-21  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Imported release 1.2.2.
+	* Makefile.am, version.ac: Adapted.
+
 2013-04-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Imported release 1.2.1.
diff --git a/Build/source/texk/dvisvgm/Makefile.am b/Build/source/texk/dvisvgm/Makefile.am
index 65ff8c27d26..1100fd818ec 100644
--- a/Build/source/texk/dvisvgm/Makefile.am
+++ b/Build/source/texk/dvisvgm/Makefile.am
@@ -91,6 +91,7 @@ nodist_libdvisvgm_a_SOURCES = \
 	@DVISVGM_TREE@/src/Matrix.cpp \
 	@DVISVGM_TREE@/src/Message.cpp \
 	@DVISVGM_TREE@/src/MetafontWrapper.cpp \
+	@DVISVGM_TREE@/src/NoPsSpecialHandler.cpp \
 	@DVISVGM_TREE@/src/PSInterpreter.cpp \
 	@DVISVGM_TREE@/src/PSPattern.cpp \
 	@DVISVGM_TREE@/src/PdfSpecialHandler.cpp \
diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in
index 4e22cb4224e..522c80cb1d7 100644
--- a/Build/source/texk/dvisvgm/Makefile.in
+++ b/Build/source/texk/dvisvgm/Makefile.in
@@ -141,6 +141,7 @@ nodist_libdvisvgm_a_OBJECTS =  \
 	@DVISVGM_TREE@/src/Matrix.$(OBJEXT) \
 	@DVISVGM_TREE@/src/Message.$(OBJEXT) \
 	@DVISVGM_TREE@/src/MetafontWrapper.$(OBJEXT) \
+	@DVISVGM_TREE@/src/NoPsSpecialHandler.$(OBJEXT) \
 	@DVISVGM_TREE@/src/PSInterpreter.$(OBJEXT) \
 	@DVISVGM_TREE@/src/PSPattern.$(OBJEXT) \
 	@DVISVGM_TREE@/src/PdfSpecialHandler.$(OBJEXT) \
@@ -684,6 +685,7 @@ nodist_libdvisvgm_a_SOURCES =  \
 	@DVISVGM_TREE@/src/Length.cpp @DVISVGM_TREE@/src/MapLine.cpp \
 	@DVISVGM_TREE@/src/Matrix.cpp @DVISVGM_TREE@/src/Message.cpp \
 	@DVISVGM_TREE@/src/MetafontWrapper.cpp \
+	@DVISVGM_TREE@/src/NoPsSpecialHandler.cpp \
 	@DVISVGM_TREE@/src/PSInterpreter.cpp \
 	@DVISVGM_TREE@/src/PSPattern.cpp \
 	@DVISVGM_TREE@/src/PdfSpecialHandler.cpp \
@@ -886,6 +888,9 @@ clean-noinstLIBRARIES:
 @DVISVGM_TREE@/src/MetafontWrapper.$(OBJEXT):  \
 	@DVISVGM_TREE@/src/$(am__dirstamp) \
 	@DVISVGM_TREE@/src/$(DEPDIR)/$(am__dirstamp)
+@DVISVGM_TREE@/src/NoPsSpecialHandler.$(OBJEXT):  \
+	@DVISVGM_TREE@/src/$(am__dirstamp) \
+	@DVISVGM_TREE@/src/$(DEPDIR)/$(am__dirstamp)
 @DVISVGM_TREE@/src/PSInterpreter.$(OBJEXT):  \
 	@DVISVGM_TREE@/src/$(am__dirstamp) \
 	@DVISVGM_TREE@/src/$(DEPDIR)/$(am__dirstamp)
@@ -1090,6 +1095,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@@DVISVGM_TREE@/src/$(DEPDIR)/Matrix.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@DVISVGM_TREE@/src/$(DEPDIR)/Message.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@DVISVGM_TREE@/src/$(DEPDIR)/MetafontWrapper.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@DVISVGM_TREE@/src/$(DEPDIR)/NoPsSpecialHandler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@DVISVGM_TREE@/src/$(DEPDIR)/PSInterpreter.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@DVISVGM_TREE@/src/$(DEPDIR)/PSPattern.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@DVISVGM_TREE@/src/$(DEPDIR)/PageRanges.Po@am__quote@
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index a37e4e55700..75e135b7ac1 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.1.
+# Generated by GNU Autoconf 2.69 for dvisvgm 1.2.2.
 #
 # 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.1'
-PACKAGE_STRING='dvisvgm 1.2.1'
+PACKAGE_VERSION='1.2.2'
+PACKAGE_STRING='dvisvgm 1.2.2'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="dvisvgm-1.2.1/src/dvisvgm.cpp"
+ac_unique_file="dvisvgm-1.2.2/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.1 to adapt to many kinds of systems.
+\`configure' configures dvisvgm 1.2.2 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.1:";;
+     short | recursive ) echo "Configuration of dvisvgm 1.2.2:";;
    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.1
+dvisvgm configure 1.2.2
 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.1, which was
+It was created by dvisvgm $as_me 1.2.2, 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.1'
+ VERSION='1.2.2'
 
 
 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.1
+dvisvgm config.lt 1.2.2
 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.1
+DVISVGM_TREE=dvisvgm-1.2.2
 
 
 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.1, which was
+This file was extended by dvisvgm $as_me 1.2.2, 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.1
+dvisvgm config.status 1.2.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
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
deleted file mode 100644
index 7dce2ff5b1e..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1-PATCHES/TL-Changes
+++ /dev/null
@@ -1,14 +0,0 @@
-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.1-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.2.2-PATCHES/ChangeLog
index be409a7aa10..55aad9a460b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1-PATCHES/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2-PATCHES/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-21  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Import release 1.2.2.
+
+	* patch-01-cpp (new): Adapted.
+
 2013-04-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Import release 1.2.1.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.2-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.2.2-PATCHES/TL-Changes
new file mode 100644
index 00000000000..374cc38fe43
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2-PATCHES/TL-Changes
@@ -0,0 +1,14 @@
+Changes applied to the dvisvgm-1.2.2 tree as obtained from:
+	http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.2.2.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.1-PATCHES/patch-01-cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2-PATCHES/patch-01-cpp
index 37042f849f7..5c33270f2a4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1-PATCHES/patch-01-cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2-PATCHES/patch-01-cpp
@@ -1,6 +1,6 @@
-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
+diff -ur dvisvgm-1.2.2.orig/src/FileFinder.cpp dvisvgm-1.2.2/src/FileFinder.cpp
+--- dvisvgm-1.2.2.orig/src/FileFinder.cpp	2013-04-19 15:05:25.000000000 +0200
++++ dvisvgm-1.2.2/src/FileFinder.cpp	2013-05-21 15:05:40.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.1/AUTHORS b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/AUTHORS
index 837e1e96bfb..837e1e96bfb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/AUTHORS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/AUTHORS
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/COPYING b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/COPYING
index 94a9ed024d3..94a9ed024d3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/COPYING
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/COPYING
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/INSTALL b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/INSTALL
index a4b34144dcf..a4b34144dcf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/INSTALL
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/INSTALL
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/LGPL-2.1.txt b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/LGPL-2.1.txt
index 602bfc94635..602bfc94635 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/LGPL-2.1.txt
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/LGPL-2.1.txt
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/Makefile.am
index 21666db93cf..21666db93cf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/NEWS b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/NEWS
index cff69bfa92d..aa2ae98c22c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/NEWS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/NEWS
@@ -1,3 +1,10 @@
+dvisvgm-1.2.2 (2013-04-26)
+- fixed a bug that prevented the lookup of fontmap files
+- avoid throwing an exception but print a warning message if MiKTeX is not available
+- print a warning message if PostScript specials are found but ignored
+- added information about "dvisvgm -E" to the --help text and to the manpage
+- various code refactorings and cleanups
+
 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)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/README b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/README
index 6356881cd9f..6356881cd9f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/README
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/README
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/config.h.in b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/config.h.in
index b027999e9b3..b027999e9b3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/config.h.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/config.h.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/config.rpath b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/config.rpath
index e69de29bb2d..e69de29bb2d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/config.rpath
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/config.rpath
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/configure.ac b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/configure.ac
index a225367cd56..3d077b1941e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/configure.ac
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/configure.ac
@@ -4,7 +4,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dvisvgm],[1.2.1],[martin.gieseking@uos.de])
+AC_INIT([dvisvgm],[1.2.2],[martin.gieseking@uos.de])
 DATE="April 2013"
 AC_CONFIG_SRCDIR(src)
 AC_CONFIG_HEADER(config.h)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/doc/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/doc/Makefile.am
index fb5c56ffedf..fb5c56ffedf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/doc/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/doc/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/doc/dvisvgm.1 b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/doc/dvisvgm.1
index c9e08ed6fe0..f71ef16e44f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/doc/dvisvgm.1
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/doc/dvisvgm.1
@@ -2,12 +2,12 @@
 .\"     Title: dvisvgm
 .\"    Author: Martin Gieseking <martin.gieseking@uos.de>
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/09/2013
+.\"      Date: 04/25/2013
 .\"    Manual: dvisvgm Manual
-.\"    Source: dvisvgm 1.2.1
+.\"    Source: dvisvgm 1.2.2
 .\"  Language: English
 .\"
-.TH "DVISVGM" "1" "04/09/2013" "dvisvgm 1\&.2\&.1" "dvisvgm Manual"
+.TH "DVISVGM" "1" "04/25/2013" "dvisvgm 1\&.2\&.2" "dvisvgm Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -32,6 +32,8 @@ dvisvgm \- converts DVI files to the XML\-based SVG format
 .SH "SYNOPSIS"
 .sp
 \fBdvisvgm\fR [ \fIoptions\fR ] \fIfile\fR [\&.dvi]
+.sp
+\fBdvisvgm\fR \-E [ \fIoptions\fR ] \fIfile\fR [\&.eps]
 .SH "DESCRIPTION"
 .sp
 The command\-line utility \fBdvisvgm\fR converts DVI files, as generated by TeX/LaTeX, to the XML\-based scalable vector graphics format SVG\&. Since the current SVG standard 1\&.1 doesn\(cqt specify multi\-page graphics, dvisvgm creates separate SVG files for each DVI page\&. Because of compatibility reasons, only the first page is converted by default\&. In order to select a different page or arbitrary page sequences, use option \fB\-p\fR which is described below\&.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/doc/dvisvgm.txt.in b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/doc/dvisvgm.txt.in
index 3250457d9b7..a09f37152e8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/doc/dvisvgm.txt.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/doc/dvisvgm.txt.in
@@ -32,6 +32,8 @@ SYNOPSIS
 --------
 *dvisvgm* [ 'options' ] 'file' [.dvi]
 
+*dvisvgm* -E [ 'options' ] 'file' [.eps]
+
 
 DESCRIPTION
 -----------
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/Makefile.am
index 97bf78f50f4..97bf78f50f4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/auxiliary.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/auxiliary.h
index c4c610cd4ef..c4c610cd4ef 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/auxiliary.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/auxiliary.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/bitmap.h
index 1ce13d61e2d..1ce13d61e2d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/curve.c b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/curve.c
index 2bfc4ab3bf4..2bfc4ab3bf4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/curve.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/curve.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/curve.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/curve.h
index 7ba2a46439e..7ba2a46439e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/curve.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/curve.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/decompose.c b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/decompose.c
index adcdc1c2cab..adcdc1c2cab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/decompose.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/decompose.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/decompose.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/decompose.h
index feec07a46b3..feec07a46b3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/decompose.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/decompose.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/lists.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/lists.h
index b67b9662356..b67b9662356 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/lists.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/lists.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/potracelib.c b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/potracelib.c
index 95901bcb53f..95901bcb53f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/potracelib.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/potracelib.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/potracelib.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/potracelib.h
index 5c628a2bdbd..5c628a2bdbd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/potracelib.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/potracelib.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/progress.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/progress.h
index 166209a5226..166209a5226 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/progress.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/progress.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/trace.c b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/trace.c
index 1464bd32948..1464bd32948 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/trace.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/trace.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/trace.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/trace.h
index d24ffb354ec..d24ffb354ec 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/potracelib/trace.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/potracelib/trace.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/BgColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/BgColorSpecialHandler.cpp
index a225d360910..a225d360910 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/BgColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/BgColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/BgColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/BgColorSpecialHandler.h
index 98dd814ba9e..98dd814ba9e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/BgColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/BgColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Bitmap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Bitmap.cpp
index e72d5ee34ac..e72d5ee34ac 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Bitmap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Bitmap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Bitmap.h
index 1a1f19caf15..1a1f19caf15 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/BoundingBox.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/BoundingBox.cpp
index d39ff708da9..85ec9c4c452 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/BoundingBox.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/BoundingBox.cpp
@@ -30,35 +30,42 @@ using namespace std;
 
 
 BoundingBox::BoundingBox ()
-	: ulx(0), uly(0), lrx(0), lry(0), _valid(false), _locked(false)
+	: _ulx(0), _uly(0), _lrx(0), _lry(0), _valid(false), _locked(false)
 {
 }
 
 
 BoundingBox::BoundingBox (double ulxx, double ulyy, double lrxx, double lryy)
-	: ulx(min(ulxx,lrxx)), uly(min(ulyy,lryy)),
-	  lrx(max(ulxx,lrxx)), lry(max(ulyy,lryy)),
+	: _ulx(min(ulxx,lrxx)), _uly(min(ulyy,lryy)),
+	  _lrx(max(ulxx,lrxx)), _lry(max(ulyy,lryy)),
 	  _valid(true), _locked(false)
 {
 }
 
 
 BoundingBox::BoundingBox (const DPair &p1, const DPair &p2)
-	: ulx(min(p1.x(), p2.x())), uly(min(p1.y(), p2.y())),
-	  lrx(max(p1.x(), p2.x())), lry(max(p1.y(), p2.y())),
+	: _ulx(min(p1.x(), p2.x())), _uly(min(p1.y(), p2.y())),
+	  _lrx(max(p1.x(), p2.x())), _lry(max(p1.y(), p2.y())),
 	  _valid(true), _locked(false)
 {
 }
 
 
 BoundingBox::BoundingBox (const Length &ulxx, const Length &ulyy, const Length &lrxx, const Length &lryy)
-	: ulx(min(ulxx.pt(),lrxx.pt())), uly(min(ulyy.pt(),lryy.pt())),
-	  lrx(max(ulxx.pt(),lrxx.pt())), lry(max(ulyy.pt(),lryy.pt())),
+	: _ulx(min(ulxx.pt(),lrxx.pt())), _uly(min(ulyy.pt(),lryy.pt())),
+	  _lrx(max(ulxx.pt(),lrxx.pt())), _lry(max(ulyy.pt(),lryy.pt())),
 	  _valid(true), _locked(false)
 {
 }
 
 
+BoundingBox::BoundingBox (const string &boxstr)
+	: _valid(false), _locked(false)
+{
+	set(boxstr);
+}
+
+
 /** Removes leading and trailing whitespace from the given string. */
 static string& strip (string &str) {
 	size_t n=0;
@@ -101,26 +108,27 @@ void BoundingBox::set (string boxstr) {
 
 	switch (coord.size()) {
 		case 1:
-			ulx -= coord[0].pt();
-			uly -= coord[0].pt();
-			lrx += coord[0].pt();
-			lry += coord[0].pt();
+			_ulx -= coord[0].pt();
+			_uly -= coord[0].pt();
+			_lrx += coord[0].pt();
+			_lry += coord[0].pt();
 			break;
 		case 2:
-			ulx -= coord[0].pt();
-			uly -= coord[1].pt();
-			lrx += coord[0].pt();
-			lry += coord[1].pt();
+			_ulx -= coord[0].pt();
+			_uly -= coord[1].pt();
+			_lrx += coord[0].pt();
+			_lry += coord[1].pt();
 			break;
 		case 4:
-			ulx = min(coord[0].pt(), coord[2].pt());
-			uly = min(coord[1].pt(), coord[3].pt());
-			lrx = max(coord[0].pt(), coord[2].pt());
-			lry = max(coord[1].pt(), coord[3].pt());
+			_ulx = min(coord[0].pt(), coord[2].pt());
+			_uly = min(coord[1].pt(), coord[3].pt());
+			_lrx = max(coord[0].pt(), coord[2].pt());
+			_lry = max(coord[1].pt(), coord[3].pt());
 			break;
 		default:
 			throw BoundingBoxException("1, 2 or 4 length parameters expected");
 	}
+	_valid = true;
 }
 
 
@@ -128,18 +136,18 @@ void BoundingBox::set (string boxstr) {
 void BoundingBox::embed (double x, double y) {
 	if (!_locked) {
 		if (_valid) {
-			if (x < ulx)
-				ulx = x;
-			else if (x > lrx)
-				lrx = x;
-			if (y < uly)
-				uly = y;
-			else if (y > lry)
-				lry = y;
+			if (x < _ulx)
+				_ulx = x;
+			else if (x > _lrx)
+				_lrx = x;
+			if (y < _uly)
+				_uly = y;
+			else if (y > _lry)
+				_lry = y;
 		}
 		else {
-			ulx = lrx = x;
-			uly = lry = y;
+			_ulx = _lrx = x;
+			_uly = _lry = y;
 			_valid = true;
 		}
 	}
@@ -150,14 +158,14 @@ void BoundingBox::embed (double x, double y) {
 void BoundingBox::embed (const BoundingBox &bb) {
 	if (!_locked && bb._valid) {
 		if (_valid) {
-			embed(bb.ulx, bb.uly);
-			embed(bb.lrx, bb.lry);
+			embed(bb._ulx, bb._uly);
+			embed(bb._lrx, bb._lry);
 		}
 		else {
-			ulx = bb.ulx;
-			uly = bb.uly;
-			lrx = bb.lrx;
-			lry = bb.lry;
+			_ulx = bb._ulx;
+			_uly = bb._uly;
+			_lrx = bb._lrx;
+			_lry = bb._lry;
 			_valid = true;
 		}
 	}
@@ -171,10 +179,10 @@ void BoundingBox::embed (const DPair &c, double r) {
 
 void BoundingBox::expand (double m) {
 	if (!_locked) {
-		ulx -= m;
-		uly -= m;
-		lrx += m;
-		lry += m;
+		_ulx -= m;
+		_uly -= m;
+		_lrx += m;
+		_lry += m;
 	}
 }
 
@@ -184,62 +192,62 @@ void BoundingBox::expand (double m) {
  *  @param[in] bbox box to intersect with
  *  @return false if *this is locked or both boxes are disjoint */
 bool BoundingBox::intersect (const BoundingBox &bbox) {
-	if (_locked || lrx < bbox.ulx || lry < bbox.uly || ulx > bbox.lrx || uly > bbox.lry)
+	if (_locked || _lrx < bbox._ulx || _lry < bbox._uly || _ulx > bbox._lrx || _uly > bbox._lry)
 		return false;
-	ulx = max(ulx, bbox.ulx);
-	uly = max(uly, bbox.uly);
-	lrx = min(lrx, bbox.lrx);
-	lry = min(lry, bbox.lry);
+	_ulx = max(_ulx, bbox._ulx);
+	_uly = max(_uly, bbox._uly);
+	_lrx = min(_lrx, bbox._lrx);
+	_lry = min(_lry, bbox._lry);
 	return true;
 }
 
 
 void BoundingBox::operator += (const BoundingBox &bb) {
 	if (!_locked) {
-		ulx += bb.ulx;
-		uly += bb.uly;
-		lrx += bb.lrx;
-		lry += bb.lry;
+		_ulx += bb._ulx;
+		_uly += bb._uly;
+		_lrx += bb._lrx;
+		_lry += bb._lry;
 	}
 }
 
 
 void BoundingBox::scale (double sx, double sy) {
 	if (!_locked) {
-		ulx *= sx;
-		lrx *= sx;
-		if (sx < 0)	swap(ulx, lrx);
-		uly *= sy;
-		lry *= sy;
-		if (sy < 0)	swap(uly, lry);
+		_ulx *= sx;
+		_lrx *= sx;
+		if (sx < 0)	swap(_ulx, _lrx);
+		_uly *= sy;
+		_lry *= sy;
+		if (sy < 0)	swap(_uly, _lry);
 	}
 }
 
 
 void BoundingBox::transform (const Matrix &tm) {
 	if (!_locked) {
-		DPair ul = tm * DPair(lrx, lry);
-		DPair lr = tm * DPair(ulx, uly);
-		DPair ll = tm * DPair(ulx, lry);
-		DPair ur = tm * DPair(lrx, uly);
-		ulx = min(min(ul.x(), lr.x()), min(ur.x(), ll.x()));
-		uly = min(min(ul.y(), lr.y()), min(ur.y(), ll.y()));
-		lrx = max(max(ul.x(), lr.x()), max(ur.x(), ll.x()));
-		lry = max(max(ul.y(), lr.y()), max(ur.y(), ll.y()));
+		DPair ul = tm * DPair(_lrx, _lry);
+		DPair lr = tm * DPair(_ulx, _uly);
+		DPair ll = tm * DPair(_ulx, _lry);
+		DPair ur = tm * DPair(_lrx, _uly);
+		_ulx = min(min(ul.x(), lr.x()), min(ur.x(), ll.x()));
+		_uly = min(min(ul.y(), lr.y()), min(ur.y(), ll.y()));
+		_lrx = max(max(ul.x(), lr.x()), max(ur.x(), ll.x()));
+		_lry = max(max(ul.y(), lr.y()), max(ur.y(), ll.y()));
 	}
 }
 
 
 string BoundingBox::toSVGViewBox () const {
 	ostringstream oss;
-	oss << XMLString(ulx) << ' ' << XMLString(uly) << ' ' << XMLString(width()) << ' ' << XMLString(height());
+	oss << XMLString(_ulx) << ' ' << XMLString(_uly) << ' ' << XMLString(width()) << ' ' << XMLString(height());
 	return oss.str();
 }
 
 
 ostream& BoundingBox::write (ostream &os) const {
-	return os << '('  << ulx << ", " << uly
-				 << ", " << lrx << ", " << lry << ')';
+	return os << '('  << _ulx << ", " << _uly
+				 << ", " << _lrx << ", " << _lry << ')';
 }
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/BoundingBox.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/BoundingBox.h
index 96655cd1d5d..b3a4016f52a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/BoundingBox.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/BoundingBox.h
@@ -47,7 +47,7 @@ class BoundingBox
 		BoundingBox (double ulxx, double ulyy, double lrxx, double lryy);
 		BoundingBox (const DPair &p1, const DPair &p2);
 		BoundingBox (const Length &ulxx, const Length &ulyy, const Length &lrxx, const Length &lryy);
-		BoundingBox (const std::string &boxstr) {set(boxstr);}
+		BoundingBox (const std::string &boxstr);
 		void set (std::string boxstr);
 		void embed (double x, double y);
 		void embed (const BoundingBox &bb);
@@ -59,12 +59,12 @@ class BoundingBox
 
 		void expand (double m);
 		bool  intersect (const BoundingBox &bbox);
-		double minX () const        {return ulx;}
-		double minY () const        {return uly;}
-		double maxX () const        {return lrx;}
-		double maxY () const        {return lry;}
-		double width () const       {return lrx-ulx;}
-		double height () const      {return lry-uly;}
+		double minX () const        {return _ulx;}
+		double minY () const        {return _uly;}
+		double maxX () const        {return _lrx;}
+		double maxY () const        {return _lry;}
+		double width () const       {return _lrx-_ulx;}
+		double height () const      {return _lry-_uly;}
 		void lock ()                {_locked = true;}
 		void unlock ()              {_locked = false;}
 		void operator += (const BoundingBox &bb);
@@ -75,10 +75,10 @@ class BoundingBox
 		XMLElementNode* toSVGRect () const;
 
    private:
-		double ulx, uly; ///< coordinates of upper left vertex (in TeX point units)
-	   double lrx, lry; ///< coordinates of lower right vertex (in TeX point unitx)
-		bool _valid : 1;  ///< true if the box coordinates are properly set
-		bool _locked : 1; ///< if true, the box data is read-only
+		double _ulx, _uly; ///< coordinates of upper left vertex (in TeX point units)
+		double _lrx, _lry; ///< coordinates of lower right vertex (in TeX point unitx)
+		bool _valid : 1;   ///< true if the box coordinates are properly set
+		bool _locked : 1;  ///< if true, the box data is read-only
 };
 
 IMPLEMENT_OUTPUT_OPERATOR(BoundingBox)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CRC32.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/CRC32.cpp
index 2295ab17bde..2295ab17bde 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CRC32.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/CRC32.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CRC32.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/CRC32.h
index ca8ec359d0f..ca8ec359d0f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CRC32.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/CRC32.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Calculator.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Calculator.cpp
index c26a40bc237..2814cc286e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Calculator.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Calculator.cpp
@@ -96,20 +96,20 @@ double Calculator::prim (istream &is, bool skip) { // prim:
    if (skip)
       lex(is);
    switch (lookAhead(is)) {
-      case NUMBER: {                               // NUMBER => $1
+		case NUMBER: {                               // NUMBER => $1
 			lex(is);
-			double ret = numValue;
+			double ret = _numValue;
 			if (lookAhead(is) == NAME) {              // NUMBER NAME => $1 * $2
 				lex(is);
-				ret *= getVariable(strValue);
+				ret *= getVariable(_strValue);
 			}
 			return ret;
 		}
 		case NAME: {                                 // NAME => getVariable($1)
 			lex(is);
-			return getVariable(strValue);
+			return getVariable(_strValue);
 		}
-      case '-':                                    // '-' prim => -$2
+		case '-':                                    // '-' prim => -$2
 			return -prim(is, true);
       case '(': {                                  // '(' expr ')' => $2
          double e = expr(is, true);
@@ -118,7 +118,7 @@ double Calculator::prim (istream &is, bool skip) { // prim:
          lex(is);
          return e;
       }
-      default:
+		default:
 			throw CalculatorException("primary expression expected");
    }
 }
@@ -148,20 +148,20 @@ char Calculator::lookAhead (istream &is) {
  *  @return token type */
 char Calculator::lex (istream &is) {
 	int tokenType = lookAhead(is);
-   switch (tokenType) {
-      case NUMBER:
-         is >> numValue;
-         break;
-      case NAME: {
-         strValue.clear();
-         while (isalpha(is.peek()))
-            strValue += char(is.get());
-         break;
+	switch (tokenType) {
+		case NUMBER:
+			is >> _numValue;
+			break;
+		case NAME: {
+			_strValue.clear();
+			while (isalpha(is.peek()))
+				_strValue += char(is.get());
+			break;
 		}
 		default:
 			tokenType = is.get();
-   }
-   return char(tokenType);
+	}
+	return char(tokenType);
 }
 
 
@@ -170,8 +170,8 @@ char Calculator::lex (istream &is) {
  *  @param[in] name name of variable
  *  @return assigned value */
 double Calculator::getVariable (const string &name) const {
-	map<string,double>::const_iterator it = variables.find(name);
-	if (it == variables.end())
+	map<string,double>::const_iterator it = _variables.find(name);
+	if (it == _variables.end())
 		throw CalculatorException("undefined variable '" + name + "'");
 	return it->second;
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Calculator.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Calculator.h
index b3faa325322..36bb39d679c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Calculator.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Calculator.h
@@ -35,9 +35,10 @@ struct CalculatorException : public MessageException
 class Calculator
 {
    public:
-      double eval (std::istream &is);
+		Calculator () : _numValue(0) {}
+		double eval (std::istream &is);
 		double eval (const std::string &expr);
-		void setVariable (const std::string &name, double value) {variables[name] = value;}
+		void setVariable (const std::string &name, double value) {_variables[name] = value;}
 		double getVariable (const std::string &name) const;
 
    protected:
@@ -48,9 +49,9 @@ class Calculator
       char lookAhead (std::istream &is);
 
    private:
-		std::map<std::string,double> variables;
-		double numValue;
-		std::string strValue;
+		std::map<std::string,double> _variables;
+		double _numValue;
+		std::string _strValue;
 };
 
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CmdLineParserBase.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/CmdLineParserBase.cpp
index 73439fc3f09..27b607555b9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CmdLineParserBase.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/CmdLineParserBase.cpp
@@ -359,8 +359,11 @@ void CmdLineParserBase::help (int mode) const {
 		vector<const char*> linevec(lines, lines+numlines);
 		sort(linevec.begin(), linevec.end(), mode == 1 ? cmp_short : cmp_long);
 		for (vector<const char*>::iterator it=linevec.begin(); it != linevec.end(); ++it) {
-			if (**it != 's')  // skip section headers
+			if (**it != 's') { // skip section headers
 				puts(*it+1);
+				if (**it == 'd')
+					puts("\nOptions:");
+			}
 		}
 	}
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CmdLineParserBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/CmdLineParserBase.h
index 389bb247bc6..35e20e3735c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CmdLineParserBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/CmdLineParserBase.h
@@ -71,7 +71,7 @@ class CmdLineParserBase
 
 	protected:
 		CmdLineParserBase () : _printErrors(true), _error(false) {}
-		CmdLineParserBase (const CmdLineParserBase &cmd) {}
+		CmdLineParserBase (const CmdLineParserBase &cmd) : _printErrors(true), _error(false) {}
 		virtual ~CmdLineParserBase () {}
 		virtual void init ();
 		virtual void error (const Option &opt, bool longopt, const char *msg) const;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Color.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Color.cpp
index 45d5ce453da..45d5ce453da 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Color.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Color.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Color.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Color.h
index 24b33c7bb95..24b33c7bb95 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Color.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Color.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/ColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/ColorSpecialHandler.cpp
index d156a43770f..d156a43770f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/ColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/ColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/ColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/ColorSpecialHandler.h
index a9b73dc8b74..a9b73dc8b74 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/ColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/ColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CommandLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/CommandLine.cpp
index 4d240b769ac..c62cfe1e6bb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CommandLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/CommandLine.cpp
@@ -116,7 +116,7 @@ void CommandLine::init () {
 
 const char** CommandLine::helplines (size_t *numlines) const {
    static const char *lines[] = {
-      "dThis program converts DVI files, as created by TeX/LaTeX, to\nthe XML-based scalable vector graphics format SVG.\n\nUsage: dvisvgm [options] dvifile",
+      "dThis program converts DVI files, as created by TeX/LaTeX, to\nthe XML-based scalable vector graphics format SVG.\n\nUsage: dvisvgm [options] dvifile\n       dvisvgm -E [options] epsfile",
       "sInput options:",
       "o-p, --page=ranges             choose pages to convert [1]",
       "o-m, --fontmap=filenames       evaluate (additional) font map files",
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CommandLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/CommandLine.h
index 67d00d4e20d..67d00d4e20d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/CommandLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/CommandLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DLLoader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DLLoader.cpp
index 30317455ba6..30317455ba6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DLLoader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DLLoader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DLLoader.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DLLoader.h
index 3052d13714e..3052d13714e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DLLoader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DLLoader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DVIActions.cpp
index f9c95dc3754..f9c95dc3754 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DVIActions.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DVIActions.h
index a3fa86a801c..a3fa86a801c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DVIActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DVIReader.cpp
index acdb8cd7351..acdb8cd7351 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DVIReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DVIReader.h
index 1a1163900d6..1a1163900d6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DVIReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DVIToSVG.cpp
index 5fe9bef8675..24481b670c7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DVIToSVG.cpp
@@ -19,10 +19,14 @@
 *************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
-#define VERSION_STR VERSION " (" TARGET_SYSTEM ")"
+	#include "config.h"
+	#ifdef TARGET_SYSTEM
+		#define VERSION_STR VERSION " (" TARGET_SYSTEM ")"
+	#else
+		#define VERSION_STR VERSION
+	#endif
 #else
-#define VERSION_STR ""
+	#define VERSION_STR ""
 #endif
 
 #include <cstdlib>
@@ -57,6 +61,7 @@
 #include "ColorSpecialHandler.h"
 #include "DvisvgmSpecialHandler.h"
 #include "EmSpecialHandler.h"
+#include "NoPsSpecialHandler.h"
 #include "PdfSpecialHandler.h"
 //#include "HtmlSpecialHandler.h"
 #if !defined(DISABLE_GS)
@@ -337,12 +342,18 @@ const SpecialManager* DVIToSVG::setProcessSpecials (const char *ignorelist, bool
 			*p = new PsSpecialHandler;
 		else
 #endif
-			p++;
+		{
+			*p = new NoPsSpecialHandler; // dummy PS special handler that only prints warning messages
+			if (pswarning) {
+#if defined(DISABLE_GS)
+				Message::wstream() << "this build of dvisvgm doesn't support the processing of PostScript specials\n";
+#else
+				Message::wstream() << "processing of PostScript specials is disabled (Ghostscript not found)\n";
+#endif
+			}
+		}
 		_specialManager.unregisterHandlers();
 		_specialManager.registerHandlers(p, ignorelist);
-		if (*handlers == 0 && pswarning)
-			Message::wstream() << "processing of PostScript specials is disabled\n";
 	}
 	return &_specialManager;
 }
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DVIToSVG.h
index 0efc86a8a07..0efc86a8a07 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DVIToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIToSVGActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DVIToSVGActions.cpp
index c9853b220e9..26637ac07b6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIToSVGActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DVIToSVGActions.cpp
@@ -300,10 +300,7 @@ static int digits (int n) {
 void DVIToSVGActions::progress (size_t current, size_t total, const char *id) {
 	static double time=0;
 	static bool draw=false; // show progress indicator?
-	static int step = -1;   // >=0: rotating dash
-	static size_t prev_current=0, prev_total=1;
 	static const char *prev_id=0;
-	const char *tips = "-\\|/";
 	if (current == 0 && total > 0) {
 		time = System::time();
 		draw = false;
@@ -313,6 +310,9 @@ void DVIToSVGActions::progress (size_t current, size_t total, const char *id) {
 	if (!draw && System::time()-time > PROGRESSBAR_DELAY)
 		draw = true;
 	if (draw && (System::time() - time > 0.1 || (total > 0 && current == total) || prev_id != id)) {
+		static int step = -1;   // >=0: rotating dash
+		static size_t prev_current=0, prev_total=1;
+		const char *tips = "-\\|/";
 		if (total == 0) {
 			current = prev_current;
 			total = prev_total;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIToSVGActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DVIToSVGActions.h
index 2e68bb9cb31..2e68bb9cb31 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DVIToSVGActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DVIToSVGActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Directory.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Directory.cpp
index c13ebe35a38..c13ebe35a38 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Directory.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Directory.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Directory.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Directory.h
index 6420bec6d19..6420bec6d19 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Directory.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Directory.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DvisvgmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DvisvgmSpecialHandler.cpp
index 11e3c0fc42a..11e3c0fc42a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DvisvgmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DvisvgmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DvisvgmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DvisvgmSpecialHandler.h
index 93e726fe634..93e726fe634 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/DvisvgmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/DvisvgmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EPSFile.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/EPSFile.cpp
index cbeb5600366..cbeb5600366 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EPSFile.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/EPSFile.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EPSFile.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/EPSFile.h
index 60a4c007d39..60a4c007d39 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EPSFile.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/EPSFile.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EPSToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/EPSToSVG.cpp
index 2c2a38e7a9b..1bf0c81e9b2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EPSToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/EPSToSVG.cpp
@@ -29,10 +29,14 @@
 #include "SVGOutputBase.h"
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
-#define VERSION_STR VERSION " (" TARGET_SYSTEM ")"
+	#include "config.h"
+	#ifdef TARGET_SYSTEM
+		#define VERSION_STR VERSION " (" TARGET_SYSTEM ")"
+	#else
+		#define VERSION_STR VERSION
+	#endif
 #else
-#define VERSION_STR ""
+	#define VERSION_STR ""
 #endif
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EPSToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/EPSToSVG.h
index 92edb5884e0..92edb5884e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EPSToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/EPSToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/EmSpecialHandler.cpp
index 3617e188a64..3617e188a64 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/EmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/EmSpecialHandler.h
index 2a0700ebb9e..2a0700ebb9e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/EmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/EmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FileFinder.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FileFinder.cpp
index bbd90df61c1..328b6ea15dd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FileFinder.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FileFinder.cpp
@@ -102,11 +102,11 @@ void FileFinder::finish () {
 std::string FileFinder::version () {
 #ifdef MIKTEX
 	bool autoinit=false;
-	if (!_initialized) {
-		init("", "", false);
-		autoinit = true;
-	}
 	try {
+		if (!_initialized) {
+			init("", "", false);
+			autoinit = true;
+		}
 		string ret = miktex->getVersion();
 		if (autoinit)
 			finish();
@@ -115,7 +115,7 @@ std::string FileFinder::version () {
 	catch (MessageException &e) {
 		if (autoinit)
 			finish();
-		throw;
+		return "not available";
 	}
 #else
 	if (const char *v = strrchr(KPSEVERSION, ' '))
@@ -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.1/src/FileFinder.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FileFinder.h
index f0d8dbba001..f0d8dbba001 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FileFinder.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FileFinder.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FilePath.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FilePath.cpp
index 2d7e676772a..2d7e676772a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FilePath.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FilePath.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FilePath.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FilePath.h
index 5bd3fdf98e2..5bd3fdf98e2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FilePath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FilePath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FileSystem.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FileSystem.cpp
index 67e48595db9..67e48595db9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FileSystem.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FileSystem.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FileSystem.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FileSystem.h
index c920a5046e6..c920a5046e6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FileSystem.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FileSystem.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Font.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Font.cpp
index f9ec0737a2d..f9ec0737a2d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Font.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Font.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Font.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Font.h
index ed3c82f3634..ed3c82f3634 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Font.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Font.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontCache.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontCache.cpp
index a36df9afa82..a36df9afa82 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontCache.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontCache.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontCache.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontCache.h
index cf4cbef7ec2..cf4cbef7ec2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontCache.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontCache.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontEncoding.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontEncoding.cpp
index bf9efb8e3ee..c506292362c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontEncoding.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontEncoding.cpp
@@ -154,7 +154,7 @@ FontEncoding* FontEncoding::encoding (string fontname) {
 		EncodingMap::const_iterator it = encmap.find(entry->encname);
 		if (it != encmap.end())
 			return it->second;
-		if (FileFinder::lookup(entry->encname + ".enc"), false) {
+		if (FileFinder::lookup(entry->encname + ".enc", false)) {
 			FontEncoding *enc = new FontEncoding(entry->encname);
 			encmap[entry->encname] = enc;
 			return enc;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontEncoding.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontEncoding.h
index 3170d850256..3170d850256 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontEncoding.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontEncoding.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontEngine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontEngine.cpp
index ab53b1bd644..ab53b1bd644 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontEngine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontEngine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontEngine.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontEngine.h
index 68652b66523..68652b66523 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontEngine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontEngine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontManager.cpp
index 0481b59a969..0481b59a969 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontManager.h
index 18966269158..18966269158 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontMap.cpp
index cd349080d14..cd349080d14 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontMap.h
index b3c1b85a304..b3c1b85a304 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/FontMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/FontMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFGlyphTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/GFGlyphTracer.cpp
index c40702e595f..c40702e595f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFGlyphTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/GFGlyphTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFGlyphTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/GFGlyphTracer.h
index 379ed1d98c8..379ed1d98c8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFGlyphTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/GFGlyphTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/GFReader.cpp
index 1bb6c426549..1bb6c426549 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/GFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/GFReader.h
index 0d9a7bb0e32..0d9a7bb0e32 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/GFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/GFTracer.cpp
index 69a078456a0..69a078456a0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/GFTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/GFTracer.h
index ba15961db65..ba15961db65 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GFTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/GFTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Ghostscript.cpp
index 7da863cbc82..7da863cbc82 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Ghostscript.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Ghostscript.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Ghostscript.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Ghostscript.h
index ccfd5b0b0f4..ccfd5b0b0f4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Ghostscript.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Ghostscript.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Glyph.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Glyph.h
index b598dc5002d..b598dc5002d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Glyph.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Glyph.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GlyphTracerMessages.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/GlyphTracerMessages.h
index 2b0cedcd8b6..2b0cedcd8b6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GlyphTracerMessages.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/GlyphTracerMessages.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GraphicPath.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/GraphicPath.h
index 46a3b0cc335..46a3b0cc335 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/GraphicPath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/GraphicPath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/InputBuffer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/InputBuffer.cpp
index ad99305fa3c..ad99305fa3c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/InputBuffer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/InputBuffer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/InputBuffer.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/InputBuffer.h
index c25df9a1452..c25df9a1452 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/InputBuffer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/InputBuffer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/InputReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/InputReader.cpp
index 3899a2362b2..3899a2362b2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/InputReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/InputReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/InputReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/InputReader.h
index 23a16421567..23a16421567 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/InputReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/InputReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Length.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Length.cpp
index aae20b74e59..aae20b74e59 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Length.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Length.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Length.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Length.h
index 995ba068cee..995ba068cee 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Length.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Length.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Makefile.am
index 60fa35f5374..dd5fb8c11c3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Makefile.am
@@ -17,19 +17,19 @@ libdvisvgm_a_SOURCES = Bitmap.h BoundingBox.h BgColorSpecialHandler.h Calculator
 	DVIToSVGActions.h EmSpecialHandler.h EPSFile.h EPSToSVG.h FileFinder.h FilePath.h FileSystem.h Font.h FontCache.h \
 	FontEncoding.h FontEngine.h FontManager.h FontMap.h GFReader.h GFTracer.h GFGlyphTracer.h Ghostscript.h Glyph.h \
 	GlyphTracerMessages.h GraphicPath.h InputBuffer.h InputReader.h Length.h macros.h MapLine.h Matrix.h Message.h \
-	MessageException.h MetafontWrapper.h PageRanges.h PageSize.h Pair.h PdfSpecialHandler.h Process.h PSInterpreter.h \
-	PSPattern.h PsSpecialHandler.h SignalHandler.h SpecialActions.h SpecialHandler.h SpecialManager.h StreamReader.h \
-	StreamWriter.h Subfont.h SVGOutputBase.h SVGTree.h System.h Terminal.h TpicSpecialHandler.h TFM.h types.h \
+	MessageException.h MetafontWrapper.h NoPsSpecialHandler.h PageRanges.h PageSize.h Pair.h PdfSpecialHandler.h Process.h \
+	PSInterpreter.h PSPattern.h PsSpecialHandler.h SignalHandler.h SpecialActions.h SpecialHandler.h SpecialManager.h \
+	StreamReader.h StreamWriter.h Subfont.h SVGOutputBase.h SVGTree.h System.h Terminal.h TpicSpecialHandler.h TFM.h types.h \
 	VectorStream.h VFActions.h VFReader.h XMLDocTypeNode.h XMLDocument.h XMLNode.h XMLString.h \
 	BgColorSpecialHandler.cpp Bitmap.cpp BoundingBox.cpp Calculator.cpp CmdLineParserBase.cpp Color.cpp \
 	ColorSpecialHandler.cpp CommandLine.cpp CRC32.cpp Directory.cpp DLLoader.cpp DVIActions.cpp DVIReader.cpp \
 	DvisvgmSpecialHandler.cpp DVIToSVG.cpp DVIToSVGActions.cpp EmSpecialHandler.cpp EPSFile.cpp EPSToSVG.cpp FileFinder.cpp \
 	FilePath.cpp FileSystem.cpp Font.cpp FontCache.cpp FontEncoding.cpp FontEngine.cpp FontManager.cpp FontMap.cpp \
 	GFReader.cpp GFGlyphTracer.cpp GFTracer.cpp Ghostscript.cpp InputBuffer.cpp InputReader.cpp Length.cpp MapLine.cpp \
-	Matrix.cpp Message.cpp MetafontWrapper.cpp PageRanges.cpp PageSize.cpp PdfSpecialHandler.cpp Process.cpp psdefs.cpp \
-	PSInterpreter.cpp PSPattern.cpp PsSpecialHandler.cpp SignalHandler.cpp SpecialManager.cpp StreamReader.cpp \
-	StreamWriter.cpp Subfont.cpp SVGTree.cpp System.cpp Terminal.cpp TFM.cpp TpicSpecialHandler.cpp VFReader.cpp \
-	XMLDocument.cpp XMLNode.cpp XMLString.cpp
+	Matrix.cpp Message.cpp MetafontWrapper.cpp NoPsSpecialHandler.cpp PageRanges.cpp PageSize.cpp PdfSpecialHandler.cpp \
+	Process.cpp psdefs.cpp PSInterpreter.cpp PSPattern.cpp PsSpecialHandler.cpp SignalHandler.cpp SpecialManager.cpp \
+	StreamReader.cpp StreamWriter.cpp Subfont.cpp SVGTree.cpp System.cpp Terminal.cpp TFM.cpp TpicSpecialHandler.cpp \
+	VFReader.cpp XMLDocument.cpp XMLNode.cpp XMLString.cpp
 
 EXTRA_DIST = options.xml iapi.h ierrors.h MiKTeXCom.h MiKTeXCom.cpp
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MapLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/MapLine.cpp
index 99dce4f9547..99dce4f9547 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MapLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/MapLine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MapLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/MapLine.h
index 87451dc912d..87451dc912d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MapLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/MapLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Matrix.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Matrix.cpp
index f44e0661e80..6aba0d04bdd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Matrix.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Matrix.cpp
@@ -33,8 +33,8 @@ using namespace std;
 double det (const Matrix &m) {
 	double sum=0;
 	for (int i=0; i < 3; ++i) {
-		sum += m.values[0][i] * m.values[1][(i+1)%3] * m.values[2][(i+2)%3]
-		     - m.values[0][2-i] * m.values[1][(4-i)%3] * m.values[2][(3-i)%3];
+		sum += m._values[0][i] * m._values[1][(i+1)%3] * m._values[2][(i+2)%3]
+		     - m._values[0][2-i] * m._values[1][(4-i)%3] * m._values[2][(3-i)%3];
 	}
 	return sum;
 }
@@ -52,8 +52,8 @@ double det (const Matrix &m, int row, int col) {
 		swap(c1, c2);
 	if (r1 > r2)
 		swap(r1, r2);
-	return m.values[r1][c1] * m.values[r2][c2]
-	     - m.values[r1][c2] * m.values[r2][c1];
+	return m._values[r1][c1] * m._values[r2][c2]
+	     - m._values[r1][c2] * m._values[r2][c1];
 }
 
 
@@ -68,7 +68,7 @@ static inline double deg2rad (double deg) {
 Matrix::Matrix (double d) {
 	for (int i=0; i < 3; i++)
 		for (int j=0; j < 3; j++)
-			values[i][j] = (i==j ? d : 0);
+			_values[i][j] = (i==j ? d : 0);
 }
 
 
@@ -100,9 +100,9 @@ Matrix::Matrix (const string &cmds, Calculator &calc) {
 Matrix& Matrix::set (double v[], unsigned size) {
 	size = min(size, 9u);
 	for (unsigned i=0; i < size; i++)
-		values[i/3][i%3] = v[i];
+		_values[i/3][i%3] = v[i];
 	for (unsigned i=size; i < 9; i++)
-		values[i/3][i%3] = (i%4 ? 0 : 1);
+		_values[i/3][i%3] = (i%4 ? 0 : 1);
 	return *this;
 }
 
@@ -115,9 +115,9 @@ Matrix& Matrix::set (double v[], unsigned size) {
 Matrix& Matrix::set (const vector<double> &v, int start) {
 	unsigned size = min((unsigned)v.size()-start, 9u);
 	for (unsigned i=0; i < size; i++)
-		values[i/3][i%3] = v[i+start];
+		_values[i/3][i%3] = v[i+start];
 	for (unsigned i=size; i < 9; i++)
-		values[i/3][i%3] = (i%4 ? 0 : 1);
+		_values[i/3][i%3] = (i%4 ? 0 : 1);
 	return *this;
 }
 
@@ -187,7 +187,7 @@ Matrix& Matrix::flip (bool haxis, double a) {
 Matrix& Matrix::transpose () {
 	for (int i=0; i < 3; i++)
 		for (int j=i+1; j < 3; j++)
-			swap(values[i][j], values[j][i]);
+			swap(_values[i][j], _values[j][i]);
 	return *this;
 }
 
@@ -198,7 +198,7 @@ Matrix& Matrix::lmultiply (const Matrix &tm) {
 	for (int i=0; i < 3; i++)
 		for (int j=0; j < 3; j++)
 			for (int k=0; k < 3; k++)
-				ret.values[i][j] += values[i][k] * tm.values[k][j];
+				ret._values[i][j] += _values[i][k] * tm._values[k][j];
 	return *this = ret;
 }
 
@@ -209,7 +209,7 @@ Matrix& Matrix::rmultiply (const Matrix &tm) {
 	for (int i=0; i < 3; i++)
 		for (int j=0; j < 3; j++)
 			for (int k=0; k < 3; k++)
-				ret.values[i][j] += tm.values[i][k] * values[k][j];
+				ret._values[i][j] += tm._values[i][k] * _values[k][j];
 	return *this = ret;
 }
 
@@ -219,9 +219,9 @@ Matrix& Matrix::invert () {
 	if (double denom = det(*this)) {
 		for (int i=0; i < 3; ++i) {
 			for (int j=0; j < 3; ++j) {
-				ret.values[i][j] = det(*this, i, j)/denom;
+				ret._values[i][j] = det(*this, i, j)/denom;
 				if ((i+j)%2 != 0)
-					ret.values[i][j] *= -1;
+					ret._values[i][j] *= -1;
 			}
 		}
 		return *this = ret;
@@ -233,7 +233,7 @@ Matrix& Matrix::invert () {
 Matrix& Matrix::operator *= (double c) {
    for (int i=0; i < 3; i++)
       for (int j=0; j < 3; j++)
-			values[i][j] *= c;
+			_values[i][j] *= c;
 	return *this;
 }
 
@@ -243,7 +243,7 @@ DPair Matrix::operator * (const DPair &p) const {
    double ret[]= {0, 0};
    for (int i=0; i < 2; i++)
       for (int j=0; j < 3; j++)
-         ret[i] += values[i][j] * pp[j];
+         ret[i] += _values[i][j] * pp[j];
 	return DPair(ret[0], ret[1]);
 }
 
@@ -252,7 +252,7 @@ DPair Matrix::operator * (const DPair &p) const {
 bool Matrix::operator == (const Matrix &m) const {
    for (int i=0; i < 2; i++)
       for (int j=0; j < 3; j++)
-			if (values[i][j] != m.values[i][j])
+			if (_values[i][j] != m._values[i][j])
 				return false;
 	return true;
 }
@@ -262,7 +262,7 @@ bool Matrix::operator == (const Matrix &m) const {
 bool Matrix::operator != (const Matrix &m) const {
    for (int i=0; i < 2; i++)
       for (int j=0; j < 3; j++)
-			if (values[i][j] != m.values[i][j])
+			if (_values[i][j] != m._values[i][j])
 				return true;
 	return false;
 }
@@ -272,7 +272,7 @@ bool Matrix::operator != (const Matrix &m) const {
 bool Matrix::isIdentity() const {
    for (int i=0; i < 2; i++)
       for (int j=0; j < 3; j++) {
-			const double &v = values[i][j];
+			const double &v = _values[i][j];
 			if ((i == j && v != 1) || (i != j && v != 0))
 				return false;
 		}
@@ -286,15 +286,15 @@ bool Matrix::isIdentity() const {
  *  @param[out] ty vertical translation
  *  @return true if matrix describes a pure translation */
 bool Matrix::isTranslation (double &tx, double &ty) const {
-	tx = values[0][2];
-	ty = values[1][2];
+	tx = _values[0][2];
+	ty = _values[1][2];
    for (int i=0; i < 3; i++)
       for (int j=0; j < 2; j++) {
-			const double &v = values[i][j];
+			const double &v = _values[i][j];
 			if ((i == j && v != 1) || (i != j && v != 0))
 				return false;
 		}
-	return values[2][2] == 1;
+	return _values[2][2] == 1;
 }
 
 
@@ -416,7 +416,7 @@ string Matrix::getSVG () const {
 		for (int j=0; j < 2; j++) {
 			if (i > 0 || j > 0)
 				oss << ' ';
-			oss << XMLString(values[j][i]);
+			oss << XMLString(_values[j][i]);
 		}
 	}
 	oss << ')';
@@ -427,9 +427,9 @@ string Matrix::getSVG () const {
 ostream& Matrix::write (ostream &os) const {
 	os << '(';
 	for (int i=0; i < 3; i++) {
-		os << '(' << values[i][0];
+		os << '(' << _values[i][0];
 		for (int j=1; j < 3; j++)
-			os << ',' << values[i][j];
+			os << ',' << _values[i][j];
 		os << ')';
 		if (i < 2)
 			os << ',';
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Matrix.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Matrix.h
index 30f1b39f31b..d3a52439021 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Matrix.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Matrix.h
@@ -47,7 +47,7 @@ class Matrix
       Matrix (const std::vector<double> &v, int start=0);
 		Matrix& set (double v[], unsigned size);
       Matrix& set (const std::vector<double> &v, int start=0);
-		double get (int row, int col) const {return values[row][col];}
+		double get (int row, int col) const {return _values[row][col];}
 		Matrix& transpose ();
 		Matrix& invert ();
 		Matrix& parse (std::istream &is, Calculator &c);
@@ -70,7 +70,7 @@ class Matrix
 		std::ostream& write (std::ostream &os) const;
 
    private:
-		double values[3][3];  // row x col
+		double _values[3][3];  // row x col
 };
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Message.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Message.cpp
index 24c5ea7547f..38407ad5f6d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Message.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Message.cpp
@@ -28,7 +28,7 @@
 
 using namespace std;
 
-MessageStream::MessageStream () : _os(0), _nl(false) {
+MessageStream::MessageStream () : _os(0), _nl(false), _col(1), _indent(0) {
 }
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Message.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Message.h
index bc4a9ed016c..bc4a9ed016c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Message.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Message.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MessageException.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/MessageException.h
index 92b8978c3e1..e6c4ace019f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MessageException.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/MessageException.h
@@ -28,12 +28,12 @@
 class MessageException : public std::exception
 {
    public:
-      MessageException (const std::string &msg) : message(msg) {}
+      MessageException (const std::string &msg) : _message(msg) {}
       virtual ~MessageException () throw() {}
-      const char* what () const throw() {return message.c_str();}
+      const char* what () const throw() {return _message.c_str();}
 
    private:
-		std::string message;
+		std::string _message;
 };
 
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MetafontWrapper.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/MetafontWrapper.cpp
index 37e3b68f92f..37e3b68f92f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MetafontWrapper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/MetafontWrapper.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MetafontWrapper.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/MetafontWrapper.h
index 2a69654ff95..2a69654ff95 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MetafontWrapper.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/MetafontWrapper.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MiKTeXCom.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/MiKTeXCom.cpp
index ddf5af52f80..ddf5af52f80 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MiKTeXCom.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/MiKTeXCom.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MiKTeXCom.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/MiKTeXCom.h
index 8649cc9f377..8649cc9f377 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/MiKTeXCom.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/MiKTeXCom.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/NoPsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/NoPsSpecialHandler.cpp
new file mode 100644
index 00000000000..31fb41da3c2
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/NoPsSpecialHandler.cpp
@@ -0,0 +1,45 @@
+/*************************************************************************
+** NoPsSpecialHandler.cpp                                               **
+**                                                                      **
+** This file is part of dvisvgm -- the DVI to SVG converter             **
+** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+**                                                                      **
+** This program is free software; you can redistribute it and/or        **
+** modify it under the terms of the GNU General Public License as       **
+** published by the Free Software Foundation; either version 3 of       **
+** the License, or (at your option) any later version.                  **
+**                                                                      **
+** This program is distributed in the hope that it will be useful, but  **
+** WITHOUT ANY WARRANTY; without even the implied warranty of           **
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the         **
+** GNU General Public License for more details.                         **
+**                                                                      **
+** You should have received a copy of the GNU General Public License    **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
+*************************************************************************/
+
+#include "Message.h"
+#include "NoPsSpecialHandler.h"
+
+using namespace std;
+
+
+bool NoPsSpecialHandler::process (const char *prefix, istream &is, SpecialActions *actions) {
+	_count++;
+	return true;
+}
+
+
+void NoPsSpecialHandler::dviEndPage () {
+	if (_count > 0) {
+		string suffix = (_count > 1 ? "s" : "");
+		Message::wstream(true) << _count << " PostScript special" << suffix << " ignored. The resulting SVG might look wrong.\n";
+		_count = 0;
+	}
+}
+
+
+const char** NoPsSpecialHandler::prefixes () const {
+	static const char *pfx[] = {"header=", "psfile=", "PSfile=", "ps:", "ps::", "!", "\"", 0};
+	return pfx;
+}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/NoPsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/NoPsSpecialHandler.h
new file mode 100644
index 00000000000..a73768ca808
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/NoPsSpecialHandler.h
@@ -0,0 +1,43 @@
+/*************************************************************************
+** NoPsSpecialHandler.h                                                 **
+**                                                                      **
+** This file is part of dvisvgm -- the DVI to SVG converter             **
+** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+**                                                                      **
+** This program is free software; you can redistribute it and/or        **
+** modify it under the terms of the GNU General Public License as       **
+** published by the Free Software Foundation; either version 3 of       **
+** the License, or (at your option) any later version.                  **
+**                                                                      **
+** This program is distributed in the hope that it will be useful, but  **
+** WITHOUT ANY WARRANTY; without even the implied warranty of           **
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the         **
+** GNU General Public License for more details.                         **
+**                                                                      **
+** You should have received a copy of the GNU General Public License    **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
+*************************************************************************/
+
+#ifndef NOPSSPECIALHANDLER_H
+#define NOPSSPECIALHANDLER_H
+
+#include "SpecialHandler.h"
+
+class NoPsSpecialHandler : public SpecialHandler
+{
+   public:
+      NoPsSpecialHandler () : _count(0) {}
+		bool process (const char *prefix, std::istream &is, SpecialActions *actions);
+		void dviEndPage ();
+		const char* name () const   {return 0;}
+		const char* info () const   {return 0;}
+		const char** prefixes () const;
+
+	protected:
+		bool isEndPageListener () const  {return true;}
+
+   private:
+		unsigned _count;  // number of PS specials skipped
+};
+
+#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PSInterpreter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PSInterpreter.cpp
index f1fad9448d8..f1fad9448d8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PSInterpreter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PSInterpreter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PSInterpreter.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PSInterpreter.h
index 4e46732a420..4e46732a420 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PSInterpreter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PSInterpreter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PSPattern.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PSPattern.cpp
index 52fbf16c589..52fbf16c589 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PSPattern.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PSPattern.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PSPattern.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PSPattern.h
index 7e2848dea3b..7e2848dea3b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PSPattern.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PSPattern.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PageRanges.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PageRanges.cpp
index 8a20a35d52b..8a20a35d52b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PageRanges.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PageRanges.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PageRanges.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PageRanges.h
index 0e5cd58e5ff..0e5cd58e5ff 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PageRanges.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PageRanges.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PageSize.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PageSize.cpp
index 85a6c062f85..7ff9eb42c0f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PageSize.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PageSize.cpp
@@ -85,14 +85,14 @@ static void computeDSize (int n, double &width, double &height) {
 
 /** Constructs a PageSize object of given size.
  *  @param[in] name specifies the page size, e.g. "A4" or "letter" */
-PageSize::PageSize (string name) : width(0), height(0) {
+PageSize::PageSize (string name) : _width(0), _height(0) {
 	resize(name);
 }
 
 
 void PageSize::resize (double w, double h) {
-	width = w;
-	height = h;
+	_width = w;
+	_height = h;
 }
 
 void PageSize::resize (string name) {
@@ -113,44 +113,44 @@ void PageSize::resize (string name) {
 	}
 
 	if (name == "invoice") {
-		width = 140;
-		height = 216;
+		_width = 140;
+		_height = 216;
 	}
 	else if (name == "executive") {
-		width = 184;
-		height = 267;
+		_width = 184;
+		_height = 267;
 	}
 	else if (name == "legal") {
-		width = 216;
-		height = 356;
+		_width = 216;
+		_height = 356;
 	}
 	else if (name == "letter") {
-		width = 216;
-		height = 279;
+		_width = 216;
+		_height = 279;
 	}
 	else if (name == "ledger") {
-		width = 279;
-		height = 432;
+		_width = 279;
+		_height = 432;
 	}
 	else if (isdigit(name[1]) && name.length() < 5) {  // limit length of number to prevent arithmetic errors
 		istringstream iss(name.substr(1));
 		int n;
 		iss >> n;
 		switch (name[0]) {
-			case 'a' : computeASize(n, width, height); break;
-			case 'b' : computeBSize(n, width, height); break;
-			case 'c' : computeCSize(n, width, height); break;
-			case 'd' : computeDSize(n, width, height); break;
+			case 'a' : computeASize(n, _width, _height); break;
+			case 'b' : computeBSize(n, _width, _height); break;
+			case 'c' : computeCSize(n, _width, _height); break;
+			case 'd' : computeDSize(n, _width, _height); break;
 			default  : throw PageSizeException("invalid page format: "+name);
 		}
 	}
-	if (width == 0 || height == 0)
+	if (_width == 0 || _height == 0)
 		throw PageSizeException("unknown page format: "+name);
 	if (landscape)
-		swap(width, height);
+		swap(_width, _height);
 
 	const double ptpmm = 72.27/25.4; // TeX points per millimeter (72.27pt = 1in = 25.4mm)
-	width *= ptpmm;
-	height *= ptpmm;
+	_width *= ptpmm;
+	_height *= ptpmm;
 }
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PageSize.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PageSize.h
index 058bc3d21ff..bb7a55c7cdc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PageSize.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PageSize.h
@@ -31,18 +31,18 @@ struct PageSizeException : public MessageException
 class PageSize
 {
    public:
- 		PageSize (double w=0, double h=0) : width(w), height(h) {}
+ 		PageSize (double w=0, double h=0) : _width(w), _height(h) {}
 		PageSize (std::string name);
 		void resize (std:: string name);
 		void resize (double w, double h);
-		double widthInPT () const  {return width;}
-		double heightInPT () const {return height;}
-		double widthInMM () const  {return width*25.4/72.27;}
-		double heightInMM () const {return height*25.4/72.27;}
-		bool valid () const        {return width > 0 && height > 0;}
+		double widthInPT () const  {return _width;}
+		double heightInPT () const {return _height;}
+		double widthInMM () const  {return _width*25.4/72.27;}
+		double heightInMM () const {return _height*25.4/72.27;}
+		bool valid () const        {return _width > 0 && _height > 0;}
 
    private:
-		double width, height; // in pt
+		double _width, _height; // in pt
 };
 
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Pair.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Pair.h
index a3dc5a12af3..a3dc5a12af3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Pair.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Pair.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PdfSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PdfSpecialHandler.cpp
index f3d8464704c..f3d8464704c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PdfSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PdfSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PdfSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PdfSpecialHandler.h
index 43cdd1045de..43cdd1045de 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PdfSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PdfSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Process.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Process.cpp
index a76219e9846..a76219e9846 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Process.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Process.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Process.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Process.h
index 973fabf2baf..973fabf2baf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Process.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Process.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PsSpecialHandler.cpp
index 91020b9f28c..91020b9f28c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PsSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PsSpecialHandler.h
index afb9b3cfc36..afb9b3cfc36 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/PsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/PsSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SVGOutputBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/SVGOutputBase.h
index f53815c0a28..f53815c0a28 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SVGOutputBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/SVGOutputBase.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SVGTree.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/SVGTree.cpp
index d37dba6dc7f..d37dba6dc7f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SVGTree.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/SVGTree.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SVGTree.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/SVGTree.h
index c81dbd6d62f..c81dbd6d62f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SVGTree.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/SVGTree.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SignalHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/SignalHandler.cpp
index ffcd66165e0..ffcd66165e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SignalHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/SignalHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SignalHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/SignalHandler.h
index e7473f567d8..e7473f567d8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SignalHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/SignalHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SpecialActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/SpecialActions.h
index 3d99d9b17c0..3d99d9b17c0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SpecialActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/SpecialActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/SpecialHandler.h
index 7818dbfb108..7818dbfb108 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/SpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SpecialManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/SpecialManager.cpp
index 7ef7ea4a67a..11c697be46d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SpecialManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/SpecialManager.cpp
@@ -75,7 +75,7 @@ void SpecialManager::registerHandlers (SpecialHandler **handlers, const char *ig
 		ign = "%"+ign+"%";
 
 		for (; *handlers; handlers++) {
-			if (ign.find("%"+string((*handlers)->name())+"%") == string::npos)
+			if (!(*handlers)->name() || ign.find("%"+string((*handlers)->name())+"%") == string::npos)
 				registerHandler(*handlers);
 			else
 				delete *handlers;
@@ -139,8 +139,8 @@ void SpecialManager::writeHandlerInfo (ostream &os) const {
 	typedef map<string, SpecialHandler*> SortMap;
 	SortMap m;
 	FORALL(_handlers, ConstIterator, it)
-		m[it->second->name()] = it->second;
-
+		if (it->second->name())
+			m[it->second->name()] = it->second;
 	FORALL(m, SortMap::iterator, it) {
 		os << setw(10) << left << it->second->name() << ' ';
 		if (it->second->info())
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SpecialManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/SpecialManager.h
index 51f9bb08d02..51f9bb08d02 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/SpecialManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/SpecialManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/StreamReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/StreamReader.cpp
index bc6ac14eaef..6e726e4016e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/StreamReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/StreamReader.cpp
@@ -25,14 +25,14 @@
 using namespace std;
 
 StreamReader::StreamReader (istream &s)
-	: is(&s)
+	: _is(&s)
 {
 }
 
 
 istream& StreamReader::replaceStream (istream &in) {
-	istream &ret = *is;
-	is = &in;
+	istream &ret = *_is;
+	_is = &in;
 	return ret;
 }
 
@@ -42,8 +42,8 @@ istream& StreamReader::replaceStream (istream &in) {
  *  @return read integer */
 UInt32 StreamReader::readUnsigned (int bytes) {
 	UInt32 ret = 0;
-	for (bytes--; bytes >= 0 && !is->eof(); bytes--) {
-		UInt32 b = is->get();
+	for (bytes--; bytes >= 0 && !_is->eof(); bytes--) {
+		UInt32 b = _is->get();
 		ret |= b << (8*bytes);
 	}
 	return ret;
@@ -65,11 +65,11 @@ UInt32 StreamReader::readUnsigned (int bytes, CRC32 &crc32) {
  *  @param[in] bytes number of bytes to read (max. 4)
  *  @return read integer */
 Int32 StreamReader::readSigned (int bytes) {
-	Int32 ret = is->get();
+	Int32 ret = _is->get();
 	if (ret & 128)        // negative value?
 		ret |= 0xffffff00;
-	for (bytes-=2; bytes >= 0 && !is->eof(); bytes--)
-		ret = (ret << 8) | is->get();
+	for (bytes-=2; bytes >= 0 && !_is->eof(); bytes--)
+		ret = (ret << 8) | _is->get();
 	return ret;
 }
 
@@ -87,12 +87,12 @@ Int32 StreamReader::readSigned (int bytes, CRC32 &crc32) {
 
 /** Reads a string terminated by a 0-byte. */
 string StreamReader::readString () {
-	if (!is)
+	if (!_is)
 		throw StreamReaderException("no stream assigned");
 	string ret;
-	while (!is->eof() && is->peek() > 0)
-		ret += is->get();
-	is->get();  // skip 0-byte
+	while (!_is->eof() && _is->peek() > 0)
+		ret += _is->get();
+	_is->get();  // skip 0-byte
 	return ret;
 }
 
@@ -114,13 +114,13 @@ string StreamReader::readString (CRC32 &crc32, bool finalZero) {
  *  @param[in] length number of characters to read
  *  @return the string read */
 string StreamReader::readString (int length) {
-	if (!is)
+	if (!_is)
 		throw StreamReaderException("no stream assigned");
 	char *buf = new char[length+1];
 	if (length <= 0)
 		*buf = 0;
 	else {
-		is->read(buf, length);  // reads 'length' bytes
+		_is->read(buf, length);  // reads 'length' bytes
 		buf[length] = 0;
 	}
 	string ret = buf;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/StreamReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/StreamReader.h
index 4a9ce672d8e..341899dd1ec 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/StreamReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/StreamReader.h
@@ -45,14 +45,14 @@ class StreamReader
 		std::string readString (int length, CRC32 &crc32);
 		std::vector<UInt8>& readBytes (int n, std::vector<UInt8> &bytes);
 		std::vector<UInt8>& readBytes (int n, std::vector<UInt8> &bytes, CRC32 &crc32);
-		int readByte ()              {return is->get();}
+		int readByte () {return _is->get();}
 		int readByte (CRC32 &crc32);
 
 	protected:
-		std::istream& in () {return *is;}
+		std::istream& in () {return *_is;}
 
    private:
-		std::istream *is;
+		std::istream *_is;
 };
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/StreamWriter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/StreamWriter.cpp
index bdd378f9993..bdd378f9993 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/StreamWriter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/StreamWriter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/StreamWriter.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/StreamWriter.h
index 6217800dae6..6217800dae6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/StreamWriter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/StreamWriter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Subfont.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Subfont.cpp
index aa552d029f6..aa552d029f6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Subfont.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Subfont.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Subfont.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Subfont.h
index b099bc76897..b099bc76897 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Subfont.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Subfont.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/System.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/System.cpp
index 80c71ec7b4c..80c71ec7b4c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/System.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/System.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/System.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/System.h
index 775d6358dd7..775d6358dd7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/System.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/System.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/TFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/TFM.cpp
index 093af8cb5e3..093af8cb5e3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/TFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/TFM.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/TFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/TFM.h
index f2ce472ead4..f2ce472ead4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/TFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/TFM.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Terminal.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Terminal.cpp
index b40a68c73d9..b40a68c73d9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Terminal.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Terminal.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Terminal.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Terminal.h
index 835ae4571e6..835ae4571e6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/Terminal.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/Terminal.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/TpicSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/TpicSpecialHandler.cpp
index f61338905e4..f61338905e4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/TpicSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/TpicSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/TpicSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/TpicSpecialHandler.h
index 257843d1115..257843d1115 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/TpicSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/TpicSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/VFActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/VFActions.h
index ba25639b337..ba25639b337 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/VFActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/VFActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/VFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/VFReader.cpp
index 39b081d8284..5980a63054a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/VFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/VFReader.cpp
@@ -34,7 +34,7 @@ inline static double fix2double (FixWord fix) {
 
 
 VFReader::VFReader (istream &is)
-	: StreamReader(is), actions(0) {
+	: StreamReader(is), _actions(0), _designSize(0) {
 }
 
 
@@ -43,8 +43,8 @@ VFReader::~VFReader () {
 
 
 VFActions* VFReader::replaceActions (VFActions *a) {
-	VFActions *ret = actions;
-	actions = a;
+	VFActions *ret = _actions;
+	_actions = a;
 	return ret;
 }
 
@@ -60,7 +60,7 @@ int VFReader::executeCommand (ApproveAction approve) {
 		throw VFException("invalid file");
 
 	bool approved = !approve || approve(opcode);
-	VFActions *act = actions;
+	VFActions *actions = _actions;
 	if (!approved)
 		replaceActions(0);   // disable actions
 
@@ -74,14 +74,14 @@ int VFReader::executeCommand (ApproveAction approve) {
 			case 247: cmdPre();      break;      // preamble
 			case 248: cmdPost();     break;      // postamble
 			default : {                          // invalid opcode
-				replaceActions(act);              // reenable actions
+				replaceActions(actions);              // reenable actions
 				ostringstream oss;
 				oss << "undefined VF command (opcode " << opcode << ')';
 				throw VFException(oss.str());
 			}
 		}
 	}
-	replaceActions(act); // reenable actions
+	replaceActions(actions); // reenable actions
 	return opcode;
 }
 
@@ -129,29 +129,29 @@ void VFReader::cmdPre () {
 	string cmt = readString(k);    // comment
 	UInt32 cs  = readUnsigned(4);  // check sum to be compared with TFM cecksum
 	UInt32 ds  = readUnsigned(4);  // design size (same as TFM design size) (fix_word)
-	designSize = fix2double(ds);
+	_designSize = fix2double(ds);
 	if (i != 202)
 		throw VFException("invalid identification value in preamble");
-   if (actions)
-      actions->preamble(cmt, cs, ds);
+   if (_actions)
+      _actions->preamble(cmt, cs, ds);
 }
 
 
 void VFReader::cmdPost () {
 	while ((readUnsigned(1)) == 248); // skip fill bytes
-	if (actions)
-		actions->postamble();
+	if (_actions)
+		_actions->postamble();
 }
 
 
 void VFReader::cmdLongChar () {
 	UInt32 pl  = readUnsigned(4);      // packet length (length of DVI subroutine)
-	if (actions) {
+	if (_actions) {
 		UInt32 cc  = readUnsigned(4);   // character code
 		readUnsigned(4);                // character width from corresponding TFM file
 		vector<UInt8> *dvi = new vector<UInt8>(pl); // DVI subroutine
 		readBytes(pl, *dvi);
-		actions->defineVFChar(cc, dvi); // call template method for user actions
+		_actions->defineVFChar(cc, dvi); // call template method for user actions
 	}
 	else
 		in().seekg(8+pl, ios::cur);     // skip remaining char definition bytes
@@ -161,12 +161,12 @@ void VFReader::cmdLongChar () {
 /** Reads and executes short_char_x command.
  *  @param[in] pl packet length (length of DVI subroutine) */
 void VFReader::cmdShortChar (int pl) {
-	if (actions) {
+	if (_actions) {
 		UInt32 cc  = readUnsigned(1);   // character code
 		readUnsigned(3);                // character width from corresponding TFM file
 		vector<UInt8> *dvi = new vector<UInt8>(pl); // DVI subroutine
 		readBytes(pl, *dvi);
-		actions->defineVFChar(cc, dvi); // call template method for user actions
+		_actions->defineVFChar(cc, dvi); // call template method for user actions
 	}
 	else
 		in().seekg(4+pl, ios::cur);     // skip char definition bytes
@@ -182,9 +182,9 @@ void VFReader::cmdFontDef (int len) {
 	UInt32 namelen  = readUnsigned(1);     // length of font name
 	string fontpath = readString(pathlen);
 	string fontname = readString(namelen);
-	if (actions) {
+	if (_actions) {
 		double ss = fix2double(ssize);
 		double ds = fix2double(dsize);
-		actions->defineVFFont(fontnum, fontpath, fontname, checksum, ds, ss*designSize);
+		_actions->defineVFFont(fontnum, fontpath, fontname, checksum, ds, ss*_designSize);
 	}
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/VFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/VFReader.h
index 3abaa894cfa..25689dec2c8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/VFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/VFReader.h
@@ -58,8 +58,8 @@ class VFReader : public StreamReader
 		void cmdFontDef (int len);
 
 	private:
-		VFActions *actions; ///< actions to execute when reading a VF command
-		double    designSize; ///< design size of currently read VF
+		VFActions *_actions; ///< actions to execute when reading a VF command
+		double _designSize; ///< design size of currently read VF
 };
 
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/VectorStream.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/VectorStream.h
index d767c071290..e57dad43ad1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/VectorStream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/VectorStream.h
@@ -38,9 +38,9 @@ template <typename T>
 class VectorInputStream : public std::istream
 {
 	public:
-		VectorInputStream (std::vector<T> &source) : std::istream(&buf), buf(source) {}
+		VectorInputStream (std::vector<T> &source) : std::istream(&_buf), _buf(source) {}
 	private:
-		VectorStreamBuffer<T> buf;
+		VectorStreamBuffer<T> _buf;
 };
 
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLDocTypeNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/XMLDocTypeNode.h
index ad1cd0f3b38..ad1cd0f3b38 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLDocTypeNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/XMLDocTypeNode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLDocument.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/XMLDocument.cpp
index f9a65c90da8..5b6e3b1354f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLDocument.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/XMLDocument.cpp
@@ -24,7 +24,7 @@
 using namespace std;
 
 XMLDocument::XMLDocument (XMLElementNode *root)
-	: rootElement(root), emitted(false)
+	: _rootElement(root), _emitted(false)
 {
 }
 
@@ -35,11 +35,11 @@ XMLDocument::~XMLDocument () {
 
 
 void XMLDocument::clear () {
-	delete rootElement;
-	rootElement = 0;
-	FORALL(nodes, list<XMLNode*>::iterator, i)
+	delete _rootElement;
+	_rootElement = 0;
+	FORALL(_nodes, list<XMLNode*>::iterator, i)
 		delete *i;
-	nodes.clear();
+	_nodes.clear();
 }
 
 
@@ -48,26 +48,26 @@ void XMLDocument::append (XMLNode *node) {
 		return;
 	XMLElementNode *newRoot = dynamic_cast<XMLElementNode*>(node);
 	if (newRoot) {             // there can only be one root element node in the document
-		delete rootElement;     // so if there is already one...
-		rootElement = newRoot;  // ...we replace it
+		delete _rootElement;     // so if there is already one...
+		_rootElement = newRoot;  // ...we replace it
 	}
 	else
-		nodes.push_back(node);
+		_nodes.push_back(node);
 }
 
 
 void XMLDocument::setRootNode (XMLElementNode *root) {
-	delete rootElement;
-	rootElement = root;
+	delete _rootElement;
+	_rootElement = root;
 }
 
 
 ostream& XMLDocument::write (ostream &os) const {
-	if (rootElement) { // no root element => no output
+	if (_rootElement) { // no root element => no output
 		os << "<?xml version='1.0' encoding='ISO-8859-1'?>\n";
-		FORALL(nodes, list<XMLNode*>::const_iterator, i)
+		FORALL(_nodes, list<XMLNode*>::const_iterator, i)
 			(*i)->write(os);
-		rootElement->write(os);
+		_rootElement->write(os);
 	}
 	return os;
 }
@@ -80,21 +80,21 @@ ostream& XMLDocument::write (ostream &os) const {
  *  @param[in] stopElement node where emitting stops (if 0 the whole tree will be emitted)
  *  @return true if node was completely emitted */
 bool XMLDocument::emit (ostream& os, XMLNode *stopNode) {
-	if (rootElement) {  // no root element => no output
-		if (!emitted) {
+	if (_rootElement) {  // no root element => no output
+		if (!_emitted) {
 			os << "<?xml version='1.0' encoding='ISO-8859-1'?>\n";
-			emitted = true;
+			_emitted = true;
 		}
-		FORALL(nodes, list<XMLNode*>::iterator, i) {
+		FORALL(_nodes, list<XMLNode*>::iterator, i) {
 			if ((*i)->emit(os, stopNode)) {
 				list<XMLNode*>::iterator it = i++;  // prevent i from being invalidated...
-				nodes.erase(it);              // ... by erase
+				_nodes.erase(it);              // ... by erase
 				--i;  // @@ what happens if i points to first child?
 			}
 			else
 				return false;
 		}
-		return rootElement->emit(os, stopNode);
+		return _rootElement->emit(os, stopNode);
 	}
 	return true;
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLDocument.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/XMLDocument.h
index 3697c5702d6..31cf9dea303 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLDocument.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/XMLDocument.h
@@ -31,14 +31,14 @@ class XMLDocument
 		void clear ();
 		void append (XMLNode *node);
 		void setRootNode (XMLElementNode *root);
-		const XMLElementNode* getRootElement () const {return rootElement;}
+		const XMLElementNode* getRootElement () const {return _rootElement;}
 		std::ostream& write (std::ostream &os) const;
 		bool emit (std::ostream& os, XMLNode *stopNode);
 
    private:
-		std::list<XMLNode*> nodes;
-		XMLElementNode *rootElement;
-		bool emitted;
+		std::list<XMLNode*> _nodes;
+		XMLElementNode *_rootElement;
+		bool _emitted;
 };
 
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLNode.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/XMLNode.cpp
index d69b4a9b049..d69b4a9b049 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLNode.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/XMLNode.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/XMLNode.h
index 324bea068aa..324bea068aa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/XMLNode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLString.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/XMLString.cpp
index 326eaf89bdf..326eaf89bdf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLString.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/XMLString.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLString.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/XMLString.h
index b1496b4a503..b1496b4a503 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/XMLString.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/XMLString.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/dvisvgm.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/dvisvgm.cpp
index 7f6e5f5961b..f275ee65e52 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/dvisvgm.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/dvisvgm.cpp
@@ -48,7 +48,8 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #include "PSInterpreter.h"
-#else
+#endif
+#ifndef TARGET_SYSTEM
 #define TARGET_SYSTEM ""
 #endif
 
@@ -275,8 +276,9 @@ static void print_version (bool extended) {
 	ostringstream oss;
 	oss << PACKAGE_STRING;
 	if (extended) {
-		oss << " (" TARGET_SYSTEM ")\n";
-		oss << string(oss.str().length()-1, '-') << "\n"
+		if (strlen(TARGET_SYSTEM) > 0)
+			oss << " (" TARGET_SYSTEM ")";
+		oss << "\n" << string(oss.str().length()-1, '-') << "\n"
 			"freetype:    " << FontEngine::version() << "\n";
 
 		string gsver;
@@ -376,8 +378,8 @@ int main (int argc, char *argv[]) {
 		Message::estream(true) << "can't open file '" << inputfile << "' for reading\n";
 		return 0;
 	}
-	FileFinder::init(argv[0], "dvisvgm", !args.no_mktexmf_given());
 	try {
+		FileFinder::init(argv[0], "dvisvgm", !args.no_mktexmf_given());
 		SVGOutput out(args.stdout_given() ? 0 : inputfile.c_str(), args.output_arg(), args.zip_given() ? args.zip_arg() : 0);
 		SignalHandler::instance().start();
 		if (args.eps_given()) {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/gzstream.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/gzstream.cpp
index 2893c299891..2893c299891 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/gzstream.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/gzstream.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/gzstream.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/gzstream.h
index 60f38c4fac7..60f38c4fac7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/gzstream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/gzstream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/iapi.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/iapi.h
index 8e29d938d03..8e29d938d03 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/iapi.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/iapi.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/ierrors.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/ierrors.h
index 3184341177e..3184341177e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/ierrors.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/ierrors.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/macros.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/macros.h
index 8935b9babe9..8935b9babe9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/macros.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/macros.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/options.xml b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/options.xml
index 2abf740d04b..6f4e2875cd2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/options.xml
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/options.xml
@@ -24,6 +24,7 @@
 	<program>
 		<name>dvisvgm</name>
 		<usage>[options] dvifile</usage>
+		<usage>-E [options] epsfile</usage>
       <description>This program converts DVI files, as created by TeX/LaTeX, to\nthe XML-based scalable vector graphics format SVG.</description>
 	</program>
 	<options>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/psdefs.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/psdefs.cpp
index 259105a3529..259105a3529 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/psdefs.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/psdefs.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/types.h b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/types.h
index c22d0e1bf47..c22d0e1bf47 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/src/types.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/src/types.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/BoundingBoxTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/BoundingBoxTest.cpp
index 53bf63c3bf4..53bf63c3bf4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/BoundingBoxTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/BoundingBoxTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/CRC32Test.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/CRC32Test.cpp
index 40bc3415363..40bc3415363 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/CRC32Test.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/CRC32Test.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/CalculatorTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/CalculatorTest.cpp
index a4bb24c6215..a4bb24c6215 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/CalculatorTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/CalculatorTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/ColorSpecialTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/ColorSpecialTest.cpp
index 48d4d57729b..48d4d57729b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/ColorSpecialTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/ColorSpecialTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/CommandLineTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/CommandLineTest.cpp
index 7d1e5874b33..7d1e5874b33 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/CommandLineTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/CommandLineTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/DirectoryTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/DirectoryTest.cpp
index 5a503b9bfd7..5a503b9bfd7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/DirectoryTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/DirectoryTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FileFinderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/FileFinderTest.cpp
index 9286237ad30..9286237ad30 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FileFinderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/FileFinderTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FilePathTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/FilePathTest.cpp
index 6f1ef7677ab..6f1ef7677ab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FilePathTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/FilePathTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FileSystemTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/FileSystemTest.cpp
index bd7adeef383..bd7adeef383 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FileSystemTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/FileSystemTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FontManagerTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/FontManagerTest.cpp
index d7d0fb30f57..d7d0fb30f57 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FontManagerTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/FontManagerTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FontMapTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/FontMapTest.cpp
index a853b829295..a853b829295 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/FontMapTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/FontMapTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/GFReaderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/GFReaderTest.cpp
index 333eacfb7c4..333eacfb7c4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/GFReaderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/GFReaderTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/GraphicPathTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/GraphicPathTest.cpp
index 6df695604f2..6df695604f2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/GraphicPathTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/GraphicPathTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/LengthTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/LengthTest.cpp
index e6c7bbd5dac..e6c7bbd5dac 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/LengthTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/LengthTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/Makefile.am
index 3cc15efde22..3cc15efde22 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/MapLineTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/MapLineTest.cpp
index e03f53c4b21..e03f53c4b21 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/MapLineTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/MapLineTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/MatrixTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/MatrixTest.cpp
index f01878900e1..f01878900e1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/MatrixTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/MatrixTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/MessageExceptionTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/MessageExceptionTest.cpp
index 14d6ed94978..14d6ed94978 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/MessageExceptionTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/MessageExceptionTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/PSInterpreterTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/PSInterpreterTest.cpp
index 06a9e7ce0dc..06a9e7ce0dc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/PSInterpreterTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/PSInterpreterTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/PageRagesTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/PageRagesTest.cpp
index ec0da0dfb28..ec0da0dfb28 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/PageRagesTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/PageRagesTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/PageSizeTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/PageSizeTest.cpp
index cb0bf778f9a..cb0bf778f9a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/PageSizeTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/PageSizeTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/PairTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/PairTest.cpp
index 68157243f43..68157243f43 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/PairTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/PairTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/SplittedCharInputBufferTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/SplittedCharInputBufferTest.cpp
index ff35f1c265c..ff35f1c265c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/SplittedCharInputBufferTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/SplittedCharInputBufferTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/StreamInputBufferTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/StreamInputBufferTest.cpp
index 8a1fbd103c2..8a1fbd103c2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/StreamInputBufferTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/StreamInputBufferTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/StreamReaderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/StreamReaderTest.cpp
index ba294a87201..ba294a87201 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/StreamReaderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/StreamReaderTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/StreamWriterTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/StreamWriterTest.cpp
index 0e142c205fa..0e142c205fa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/StreamWriterTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/StreamWriterTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/SubfontTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/SubfontTest.cpp
index de93aafcbaf..de93aafcbaf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/SubfontTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/SubfontTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/TypesTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/TypesTest.cpp
index 11cb44fc191..11cb44fc191 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/TypesTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/TypesTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/VectorStreamTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/VectorStreamTest.cpp
index 2d5d0b0bc3e..2d5d0b0bc3e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/VectorStreamTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/VectorStreamTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/check-conv b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/check-conv
index 9aeda3a2d74..9aeda3a2d74 100755
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/check-conv
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/check-conv
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/cmr10.600gf b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/cmr10.600gf
index 6dca421e21c..6dca421e21c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/cmr10.600gf
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/cmr10.600gf
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/frktest-nf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/frktest-nf-cmp.svg
index 372662c6b95..372662c6b95 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/frktest-nf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/frktest-nf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/frktest-wf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/frktest-wf-cmp.svg
index b8effca34a5..b8effca34a5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/frktest-wf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/frktest-wf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/frktest.dvi b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/frktest.dvi
index 723b08a2964..723b08a2964 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/frktest.dvi
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/frktest.dvi
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/normalize.xsl b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/normalize.xsl
index 5a6ba2f62d6..5a6ba2f62d6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/normalize.xsl
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/normalize.xsl
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/sample-nf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/sample-nf-cmp.svg
index b448e6caa8a..b448e6caa8a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/sample-nf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/sample-nf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/sample-wf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/sample-wf-cmp.svg
index d597c134c9a..d597c134c9a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/sample-wf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/sample-wf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/sample.dvi b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/sample.dvi
index 87e6236021d..87e6236021d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/sample.dvi
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/sample.dvi
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/sample.sfd b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/sample.sfd
index e7c84c7b5e1..e7c84c7b5e1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2.1/tests/sample.sfd
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2.2/tests/sample.sfd
diff --git a/Build/source/texk/dvisvgm/version.ac b/Build/source/texk/dvisvgm/version.ac
index 04be9eeae75..cb3a960a68a 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.1])
+m4_define([dvisvgm_version], [1.2.2])