185 files changed, 101 insertions, 66 deletions

diff --git a/Build/source/texk/README b/Build/source/texk/README
index a27f39c4672..4d24b1f4e09 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -59,8 +59,8 @@ dvipos - ?
 
 dvipsk - maintained here, by us
 
-dvisvgm - checked 10sep13
-  http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.5.tar.gz
+dvisvgm - checked 30oct13
+  http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.5.1.tar.gz
 
 gsftopk - from Paul Vojta's xdvi?
 
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index 0afee0491dd..42cab1f1520 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Imported release 1.5.1.
+	* version.ac: Adapted.
+
 2013-09-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Use KPSE_COND_WIN32.
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 38eb72daf15..c32b7f70b03 100755
--- a/Build/source/texk/dvisvgm/configure
+++ b/Build/source/texk/dvisvgm/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dvisvgm (TeX Live) 1.5.
+# Generated by GNU Autoconf 2.69 for dvisvgm (TeX Live) 1.5.1.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,12 +590,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvisvgm (TeX Live)'
 PACKAGE_TARNAME='dvisvgm--tex-live-'
-PACKAGE_VERSION='1.5'
-PACKAGE_STRING='dvisvgm (TeX Live) 1.5'
+PACKAGE_VERSION='1.5.1'
+PACKAGE_STRING='dvisvgm (TeX Live) 1.5.1'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="dvisvgm-1.5/src/dvisvgm.cpp"
+ac_unique_file="dvisvgm-1.5.1/src/dvisvgm.cpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1371,7 +1371,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dvisvgm (TeX Live) 1.5 to adapt to many kinds of systems.
+\`configure' configures dvisvgm (TeX Live) 1.5.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1442,7 +1442,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvisvgm (TeX Live) 1.5:";;
+     short | recursive ) echo "Configuration of dvisvgm (TeX Live) 1.5.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1579,7 +1579,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvisvgm (TeX Live) configure 1.5
+dvisvgm (TeX Live) configure 1.5.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2401,7 +2401,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dvisvgm (TeX Live) $as_me 1.5, which was
+It was created by dvisvgm (TeX Live) $as_me 1.5.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7892,7 +7892,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvisvgm--tex-live-'
- VERSION='1.5'
+ VERSION='1.5.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17746,7 +17746,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dvisvgm (TeX Live) config.lt 1.5
+dvisvgm (TeX Live) config.lt 1.5.1
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -19551,7 +19551,7 @@ $as_echo "#define KPSE_CXX_UNSAFE 1" >>confdefs.h
 
 fi
 
-DVISVGM_TREE=dvisvgm-1.5
+DVISVGM_TREE=dvisvgm-1.5.1
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -20103,7 +20103,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dvisvgm (TeX Live) $as_me 1.5, which was
+This file was extended by dvisvgm (TeX Live) $as_me 1.5.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20169,7 +20169,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dvisvgm (TeX Live) config.status 1.5
+dvisvgm (TeX Live) config.status 1.5.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.5.1-PATCHES/ChangeLog
index 1c991bdde84..8f3ecbeb79b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Import release 1.5.1.
+
 2013-09-17  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* patch-01-MSVC (removed): Instead compile with -DNOMINMAX.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.5.1-PATCHES/TL-Changes
index 14160857c5b..e995017f720 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/TL-Changes
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1-PATCHES/TL-Changes
@@ -1,5 +1,5 @@
-Changes applied to the dvisvgm-1.5 tree as obtained from:
-	http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.5.tar.gz
+Changes applied to the dvisvgm-1.5.1 tree as obtained from:
+	http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.5.1.tar.gz
 
 Removed:
 	ChangeLog
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/AUTHORS b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/AUTHORS
index d9b6468421e..d9b6468421e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/AUTHORS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/AUTHORS
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/COPYING b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/COPYING
index 94a9ed024d3..94a9ed024d3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/COPYING
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/COPYING
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/INSTALL b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/INSTALL
index a4b34144dcf..a4b34144dcf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/INSTALL
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/INSTALL
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/LGPL-2.1.txt b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/LGPL-2.1.txt
index 602bfc94635..602bfc94635 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/LGPL-2.1.txt
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/LGPL-2.1.txt
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/Makefile.am
index a3462b39cdb..a3462b39cdb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/NEWS b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/NEWS
index 8cf84bf01b6..95e2871e984 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/NEWS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/NEWS
@@ -1,3 +1,10 @@
+dvisvgm-1.5.1 (2013-10-29)
+- fixed processing of bounding box data created by the preview package
+- fixed processing of font definitions across DVI pages
+- fixed compilation issues occurred if processing of PS specials is disabled
+- don't print the logical page number if it's equal to the physical one
+- some minor code improvements
+
 dvisvgm-1.5 (2013-09-02)
 - added support for DVI format 3 as created by pTeX in vertical/tate mode
 - added support for DVI format 5 (XDV) as created by XeTeX
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/README b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/README
index d9728660268..d9728660268 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/README
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/README
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/config.h.in b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/config.h.in
index fcd8cf41872..fcd8cf41872 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/config.h.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/config.h.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/configure.ac b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/configure.ac
index fb36743efdc..e796a6f2c2d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/configure.ac
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/configure.ac
@@ -4,8 +4,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dvisvgm],[1.5],[martin.gieseking@uos.de])
-DATE="September 2013"
+AC_INIT([dvisvgm],[1.5.1],[martin.gieseking@uos.de])
+DATE="Oktober 2013"
 AC_CONFIG_SRCDIR(src)
 AC_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/doc/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/doc/Makefile.am
index fb5c56ffedf..fb5c56ffedf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/doc/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/doc/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/doc/dvisvgm.1 b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/doc/dvisvgm.1
index 4a4e3abebc7..2e1661d5b0a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/doc/dvisvgm.1
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/doc/dvisvgm.1
@@ -2,12 +2,12 @@
 .\"     Title: dvisvgm
 .\"    Author: Martin Gieseking <martin.gieseking@uos.de>
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 09/01/2013
+.\"      Date: 10/28/2013
 .\"    Manual: dvisvgm Manual
-.\"    Source: dvisvgm 1.5
+.\"    Source: dvisvgm 1.5.1
 .\"  Language: English
 .\"
-.TH "DVISVGM" "1" "09/01/2013" "dvisvgm 1\&.5" "dvisvgm Manual"
+.TH "DVISVGM" "1" "10/28/2013" "dvisvgm 1\&.5\&.1" "dvisvgm Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/doc/dvisvgm.txt.in b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/doc/dvisvgm.txt.in
index 9436b57faa7..9436b57faa7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/doc/dvisvgm.txt.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/doc/dvisvgm.txt.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/BgColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/BgColorSpecialHandler.cpp
index 883704febd9..883704febd9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/BgColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/BgColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/BgColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/BgColorSpecialHandler.h
index e8b9ec21eed..e8b9ec21eed 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/BgColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/BgColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Bitmap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Bitmap.cpp
index a7f2347988c..2f589d18638 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Bitmap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Bitmap.cpp
@@ -19,6 +19,7 @@
 *************************************************************************/
 
 #include <config.h>
+#include <algorithm>
 #include <cstdlib>
 #include <iostream>
 #include "Bitmap.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Bitmap.h
index 1a1f19caf15..1a1f19caf15 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/BoundingBox.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/BoundingBox.cpp
index 6f7e301b3b2..6f7e301b3b2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/BoundingBox.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/BoundingBox.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/BoundingBox.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/BoundingBox.h
index b3a4016f52a..b3a4016f52a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/BoundingBox.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/BoundingBox.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMap.cpp
index b873ce234ed..b873ce234ed 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMap.h
index 15ead6e9f5a..15ead6e9f5a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CMapManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMapManager.cpp
index 28a7b943c57..28a7b943c57 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CMapManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMapManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CMapManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMapManager.h
index 43b163bb9c7..43b163bb9c7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CMapManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMapManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CMapReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMapReader.cpp
index 75135340951..75135340951 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CMapReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMapReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CMapReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMapReader.h
index 4e0ae9ac266..4e0ae9ac266 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CMapReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMapReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CRC32.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CRC32.cpp
index b2401e92224..b2401e92224 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CRC32.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CRC32.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CRC32.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CRC32.h
index ca8ec359d0f..ca8ec359d0f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CRC32.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CRC32.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Calculator.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Calculator.cpp
index 717e78294a4..717e78294a4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Calculator.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Calculator.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Calculator.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Calculator.h
index 36bb39d679c..36bb39d679c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Calculator.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Calculator.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CharMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CharMap.cpp
index 0dd6b25fd2f..0dd6b25fd2f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CharMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CharMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CharMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CharMap.h
index 0b84d7570a7..0b84d7570a7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CharMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CharMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CharMapID.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CharMapID.cpp
index 596e669365f..596e669365f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CharMapID.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CharMapID.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CharMapID.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CharMapID.h
index 79d6e9bd538..79d6e9bd538 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CharMapID.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CharMapID.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Character.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Character.h
index 8d5a6965af7..8d5a6965af7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Character.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Character.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CmdLineParserBase.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CmdLineParserBase.cpp
index b019f0d8acb..b019f0d8acb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CmdLineParserBase.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CmdLineParserBase.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CmdLineParserBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CmdLineParserBase.h
index b37cbb0863c..b37cbb0863c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CmdLineParserBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CmdLineParserBase.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Color.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Color.cpp
index 65a98c57a4b..acb3d31c5c5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Color.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Color.cpp
@@ -19,6 +19,7 @@
 *************************************************************************/
 
 #include <config.h>
+#include <algorithm>
 #include <cctype>
 #include <cmath>
 #include <cstdlib>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Color.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Color.h
index 56a69dd2da8..c2df2737e08 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Color.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Color.h
@@ -38,20 +38,20 @@ class Color
 
 	public:
 		Color () : _rgb(0) {}
-		Color (UInt32 rgb) : _rgb(rgb)        {}
-		Color (UInt8 r, UInt8 g, UInt8 b)     {set(r,g,b);}
-		Color (float r, float g, float b)     {set(r,g,b);}
-		Color (const std::vector<float> &rgb) {set(rgb[0], rgb[1], rgb[2]);}
+		Color (UInt32 rgb) : _rgb(rgb)          {}
+		Color (UInt8 r, UInt8 g, UInt8 b)       {set(r,g,b);}
+		Color (float r, float g, float b)       {set(r,g,b);}
+		Color (const std::vector<float> &rgb)   {set(rgb[0], rgb[1], rgb[2]);}
 		Color (const char *name);
 		Color (const std::string &name);
-		operator UInt32 () const              {return _rgb;}
-		bool operator == (const Color &c)     {return _rgb == c._rgb;}
-		bool operator != (const Color &c)     {return _rgb != c._rgb;}
-		void set (UInt8 r, UInt8 g, UInt8 b)  {_rgb = (r << 16) | (g << 8) | b;}
+		operator UInt32 () const                {return _rgb;}
+		bool operator == (const Color &c) const {return _rgb == c._rgb;}
+		bool operator != (const Color &c) const {return _rgb != c._rgb;}
+		void set (UInt8 r, UInt8 g, UInt8 b)    {_rgb = (r << 16) | (g << 8) | b;}
 		void set (float r, float g, float b);
 		bool set (std::string name, bool case_sensitive=true);
-		void setGray (UInt8 g)                {set(g,g,g);}
-		void setGray (float g)                {set(g,g,g);}
+		void setGray (UInt8 g)                  {set(g,g,g);}
+		void setGray (float g)                  {set(g,g,g);}
 		void setHSB (float h, float s, float b);
 		void setCMYK (float c, float m, float y, float k);
 		void getRGB (float &r, float &g, float &b) const;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/ColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/ColorSpecialHandler.cpp
index 3e3bf6df3ad..3e3bf6df3ad 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/ColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/ColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/ColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/ColorSpecialHandler.h
index b5559481b00..b5559481b00 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/ColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/ColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CommandLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CommandLine.cpp
index 491e110eb59..491e110eb59 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CommandLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CommandLine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CommandLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CommandLine.h
index 5f81df278dc..5f81df278dc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/CommandLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CommandLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DLLoader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DLLoader.cpp
index e56c86aa96e..e56c86aa96e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DLLoader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DLLoader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DLLoader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DLLoader.h
index 0420c534869..0420c534869 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DLLoader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DLLoader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DVIActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIActions.cpp
index 2fc2adbf43c..2fc2adbf43c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DVIActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIActions.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DVIActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIActions.h
index 1a2fb3b9386..1a2fb3b9386 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DVIActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIReader.cpp
index 4e086129b86..17a9fbbd293 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIReader.cpp
@@ -720,9 +720,8 @@ void DVIReader::cmdFontDef (int len) {
 	string fontpath = readString(pathlen);
 	string fontname = readString(namelen);
 
-	// process font definitions between bop and eop only, skip those in the postamble
-	if (_inPage)
-		defineFont(fontnum, fontname, checksum, dsize*_scaleFactor, ssize*_scaleFactor);
+	// @@ TODO: avoid processing the font definitions in the postamble
+	defineFont(fontnum, fontname, checksum, dsize*_scaleFactor, ssize*_scaleFactor);
 }
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIReader.h
index cbf8703ced7..cbf8703ced7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DVIToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIToSVG.cpp
index fadf3d73b9b..eefe426647e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DVIToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIToSVG.cpp
@@ -141,6 +141,7 @@ void DVIToSVG::convert (unsigned first, unsigned last, pair<int,int> *pageinfo)
 	}
 	last = min(last, getTotalPages());
 
+#if defined(HAVE_LIBGS) || !defined(DISABLE_GS)
 	// ensure loading of PostScript prologues given at the beginning of the first page
 	// (prologue files are always referenced in first page)
 	PSHeaderActions headerActions(*this);
@@ -153,6 +154,7 @@ void DVIToSVG::convert (unsigned first, unsigned last, pair<int,int> *pageinfo)
 		replaceActions(save);
 		throw;
 	}
+#endif
 
 	for (unsigned i=first; i <= last; ++i) {
 		executePage(i);
@@ -192,11 +194,14 @@ void DVIToSVG::convert (const string &rangestr, pair<int,int> *pageinfo) {
 
 /** This template method is called by parent class DVIReader before
  *  executing the BOP actions.
+ *  @param[in] pageno physical page number (1 = first page)
  *  @param[in] c contains information about the page (page number etc.) */
 void DVIToSVG::beginPage (unsigned pageno, Int32 *c) {
 	if (dynamic_cast<DVIToSVGActions*>(getActions())) {
 		Message::mstream().indent(0);
-		Message::mstream(false, Message::MC_PAGE_NUMBER) << "processing page " << pageno << " [" << c[0] << ']';
+		Message::mstream(false, Message::MC_PAGE_NUMBER) << "processing page " << pageno;
+		if (pageno != (unsigned)c[0])  // Does page number shown on page differ from physical page number?
+			Message::mstream(false) << " [" << c[0] << ']';
 		Message::mstream().indent(1);
 		_svg.appendToDoc(new XMLCommentNode(" This file was generated by dvisvgm " VERSION_STR " "));
 		_svg.appendToDoc(new XMLCommentNode(" " + datetime() + " "));
@@ -366,7 +371,7 @@ const SpecialManager* DVIToSVG::setProcessSpecials (const char *ignorelist, bool
 #endif
 			if (pswarning) {
 #if defined(DISABLE_GS)
-				Message::wstream() << "this build of dvisvgm doesn't support the processing of PostScript specials\n";
+				Message::wstream() << "processing of PostScript specials has been disabled permanently\n";
 #else
 				Message::wstream() << "processing of PostScript specials is disabled (Ghostscript not found)\n";
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DVIToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIToSVG.h
index b69bfeca297..b69bfeca297 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DVIToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DVIToSVGActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIToSVGActions.cpp
index d5d8fb2e768..d5d8fb2e768 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DVIToSVGActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIToSVGActions.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DVIToSVGActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIToSVGActions.h
index 01fd54fbe1d..01fd54fbe1d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DVIToSVGActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIToSVGActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Directory.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Directory.cpp
index 0715ebd45ae..0715ebd45ae 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Directory.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Directory.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Directory.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Directory.h
index 2bed74d7038..2bed74d7038 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Directory.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Directory.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DvisvgmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DvisvgmSpecialHandler.cpp
index 9909b2e99fc..9909b2e99fc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DvisvgmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DvisvgmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DvisvgmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DvisvgmSpecialHandler.h
index 93e726fe634..93e726fe634 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/DvisvgmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DvisvgmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/EPSFile.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EPSFile.cpp
index adb05cc3093..adb05cc3093 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/EPSFile.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EPSFile.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/EPSFile.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EPSFile.h
index 60a4c007d39..60a4c007d39 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/EPSFile.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EPSFile.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/EPSToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EPSToSVG.cpp
index b29061654cd..b29061654cd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/EPSToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EPSToSVG.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/EPSToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EPSToSVG.h
index 46360e820a5..46360e820a5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/EPSToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EPSToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/EmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EmSpecialHandler.cpp
index 5004e500882..5004e500882 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/EmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/EmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EmSpecialHandler.h
index 56cb934b385..56cb934b385 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/EmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/EncFile.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EncFile.cpp
index a0380f2e4b2..a0380f2e4b2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/EncFile.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EncFile.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/EncFile.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EncFile.h
index 3dee313b1aa..3dee313b1aa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/EncFile.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EncFile.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FileFinder.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FileFinder.cpp
index ea0ad9e48a4..ea0ad9e48a4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FileFinder.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FileFinder.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FileFinder.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FileFinder.h
index b958303bd55..b958303bd55 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FileFinder.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FileFinder.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FilePath.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FilePath.cpp
index 5869d060c6c..5869d060c6c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FilePath.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FilePath.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FilePath.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FilePath.h
index 5bd3fdf98e2..5bd3fdf98e2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FilePath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FilePath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FileSystem.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FileSystem.cpp
index ef43b58377e..b567034f3df 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FileSystem.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FileSystem.cpp
@@ -287,7 +287,7 @@ bool FileSystem::isFile (const char *fname) {
 		return false;
 #ifdef __WIN32__
 	ifstream ifs(fname);
-	return ifs;
+	return (bool)ifs;
 #else
 	struct stat attr;
 	return stat(fname, &attr) == 0 && S_ISREG(attr.st_mode);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FileSystem.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FileSystem.h
index c920a5046e6..c920a5046e6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FileSystem.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FileSystem.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Font.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Font.cpp
index a0d1a779a7d..a0d1a779a7d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Font.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Font.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Font.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Font.h
index a9171f818ce..a9171f818ce 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Font.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Font.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontCache.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontCache.cpp
index 394a5506078..6056fb2bc54 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontCache.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontCache.cpp
@@ -36,7 +36,7 @@
 
 using namespace std;
 
-const UInt8 FontCache::VERSION = 5;
+const UInt8 FontCache::FORMAT_VERSION = 5;
 
 
 static Pair32 read_pair (int bytes, StreamReader &sr) {
@@ -162,7 +162,7 @@ bool FontCache::write (const char *fontname, ostream &os) const {
 		CRC32 &_crc32;
 	} actions(sw, crc32);
 
-	sw.writeUnsigned(VERSION, 1, crc32);
+	sw.writeUnsigned(FORMAT_VERSION, 1, crc32);
 	sw.writeUnsigned(0, 4);  // space for checksum
 	sw.writeString(fontname, crc32, true);
 	sw.writeUnsigned(_glyphs.size(), 4, crc32);
@@ -214,7 +214,7 @@ bool FontCache::read (const char *fontname, istream &is) {
 
 	StreamReader sr(is);
 	CRC32 crc32;
-	if (sr.readUnsigned(1, crc32) != VERSION)
+	if (sr.readUnsigned(1, crc32) != FORMAT_VERSION)
 		return false;
 
 	UInt32 crc32_cmp = sr.readUnsigned(4);
@@ -307,7 +307,7 @@ bool FontCache::fontinfo (std::istream &is, FontInfo &info) {
 		is.seekg(0);
 		StreamReader sr(is);
 		CRC32 crc32;
-		if ((info.version = sr.readUnsigned(1, crc32)) != VERSION)
+		if ((info.version = sr.readUnsigned(1, crc32)) != FORMAT_VERSION)
 			return false;
 
 		info.checksum = sr.readUnsigned(4);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontCache.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontCache.h
index cf4cbef7ec2..247906e9e76 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontCache.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontCache.h
@@ -27,10 +27,6 @@
 #include "types.h"
 #include "Glyph.h"
 
-#ifdef VERSION
-#undef VERSION
-#endif
-
 
 class FontCache
 {
@@ -65,7 +61,7 @@ class FontCache
 		static void fontinfo (const char *dirname, std::ostream &os, bool purge=false);
 
    private:
-		static const UInt8 VERSION;
+		static const UInt8 FORMAT_VERSION;
       std::string _fontname;
 		GlyphMap _glyphs;
 		bool _changed;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontEncoding.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontEncoding.cpp
index a5f75e3338b..a5f75e3338b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontEncoding.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontEncoding.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontEncoding.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontEncoding.h
index a8ea57c55e8..a8ea57c55e8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontEncoding.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontEncoding.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontEngine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontEngine.cpp
index 1b9d63e08c4..1b9d63e08c4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontEngine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontEngine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontEngine.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontEngine.h
index 75e36ec4aae..75e36ec4aae 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontEngine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontEngine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontManager.cpp
index b80211402c7..b80211402c7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontManager.h
index a765a868d96..a765a868d96 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontMap.cpp
index d7f32808e26..d7f32808e26 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontMap.h
index 6ff9c21ad58..6ff9c21ad58 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMetrics.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontMetrics.cpp
index 7dbe4e0ff24..7dbe4e0ff24 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMetrics.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontMetrics.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMetrics.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontMetrics.h
index 1ce1b15dc8f..1ce1b15dc8f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMetrics.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontMetrics.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontStyle.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontStyle.h
index 932c09291cc..932c09291cc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontStyle.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontStyle.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/GFGlyphTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFGlyphTracer.cpp
index 470b7a9b160..470b7a9b160 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/GFGlyphTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFGlyphTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/GFGlyphTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFGlyphTracer.h
index 379ed1d98c8..379ed1d98c8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/GFGlyphTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFGlyphTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/GFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFReader.cpp
index ed1b9381f56..ed1b9381f56 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/GFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/GFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFReader.h
index 0d9a7bb0e32..0d9a7bb0e32 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/GFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/GFTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFTracer.cpp
index c7fb3bca11c..c7fb3bca11c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/GFTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/GFTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFTracer.h
index ba15961db65..ba15961db65 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/GFTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Ghostscript.cpp
index 8d2538457c9..8d2538457c9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Ghostscript.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Ghostscript.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Ghostscript.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Ghostscript.h
index 6d4dea23f32..cff13b745a7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Ghostscript.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Ghostscript.h
@@ -46,6 +46,7 @@ struct Ghostscript
 
 	Ghostscript () {}
 	Ghostscript (int argc, const char **argv, void *caller=0) {}
+	bool init (int argc, const char **argv, void *caller=0) {return false;}
 	bool available () {return false;}
 	bool revision (gsapi_revision_t *r) {return false;}
 	std::string revision (bool revonly=false) {return "";}
@@ -54,6 +55,7 @@ struct Ghostscript
 	int run_string_continue (const char *str, unsigned int length, int user_errors, int *pexit_code) {return 0;}
 	int run_string_end (int user_errors, int *pexit_code) {return 0;}
 	int exit () {return 0;}
+	const char* error_name (int code) {return 0;}
 };
 
 #else
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Glyph.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Glyph.h
index b598dc5002d..b598dc5002d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Glyph.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Glyph.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/GlyphTracerMessages.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GlyphTracerMessages.h
index 2b0cedcd8b6..2b0cedcd8b6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/GlyphTracerMessages.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GlyphTracerMessages.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/GraphicPath.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GraphicPath.h
index 46a3b0cc335..46a3b0cc335 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/GraphicPath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GraphicPath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/HtmlSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/HtmlSpecialHandler.cpp
index 7422e9f778d..7422e9f778d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/HtmlSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/HtmlSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/HtmlSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/HtmlSpecialHandler.h
index 6e1e0e40c53..6e1e0e40c53 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/HtmlSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/HtmlSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/InputBuffer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/InputBuffer.cpp
index a01449bb3f3..a01449bb3f3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/InputBuffer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/InputBuffer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/InputBuffer.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/InputBuffer.h
index c25df9a1452..963d1ff7680 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/InputBuffer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/InputBuffer.h
@@ -87,7 +87,7 @@ class CharInputBuffer : public InputBuffer
 		CharInputBuffer (const char *buf, size_t size) : _pos(buf), _size(buf ? size : 0) {}
 
 		int get () {
-			if (_size <= 0)
+			if (_size == 0)
 				return -1;
 			else {
 				_size--;
@@ -103,8 +103,8 @@ class CharInputBuffer : public InputBuffer
 
 		void assign (const char *buf) {assign(buf, std::strlen(buf));}
 		int peek () const             {return _size > 0 ? *_pos : -1;}
-		int peek (size_t n) const   {return _size >= n ? _pos[n] : -1;}
-		bool eof () const             {return _size <= 0;}
+		int peek (size_t n) const     {return _size >= n ? _pos[n] : -1;}
+		bool eof () const             {return _size == 0;}
       void invalidate ()            {_size = 0;}
 
 	private:
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/InputReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/InputReader.cpp
index 10a4fca01c6..10a4fca01c6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/InputReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/InputReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/InputReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/InputReader.h
index 7d1ee838110..7d1ee838110 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/InputReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/InputReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/JFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/JFM.cpp
index cca5b9f0d18..19edb5218a5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/JFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/JFM.cpp
@@ -19,6 +19,7 @@
 *************************************************************************/
 
 #include <config.h>
+#include <algorithm>
 #include <cstring>
 #include <fstream>
 #include <sstream>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/JFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/JFM.h
index dd4ca212c49..dd4ca212c49 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/JFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/JFM.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Length.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Length.cpp
index fb9a1ae3158..fb9a1ae3158 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Length.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Length.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Length.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Length.h
index 995ba068cee..995ba068cee 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Length.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Length.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Makefile.am
index 53187f58f60..53187f58f60 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/MapLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MapLine.cpp
index 845fc20acc2..845fc20acc2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/MapLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MapLine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/MapLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MapLine.h
index 87451dc912d..87451dc912d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/MapLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MapLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Matrix.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Matrix.cpp
index 42008d7552d..524dcf435fb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Matrix.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Matrix.cpp
@@ -19,6 +19,7 @@
 *************************************************************************/
 
 #include <config.h>
+#include <algorithm>
 #include <cmath>
 #include <limits>
 #include <sstream>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Matrix.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Matrix.h
index fedeff90695..fedeff90695 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Matrix.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Matrix.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Message.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Message.cpp
index bf70b1eff04..bf70b1eff04 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Message.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Message.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Message.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Message.h
index bc4a9ed016c..bc4a9ed016c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Message.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Message.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/MessageException.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MessageException.h
index e6c4ace019f..e6c4ace019f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/MessageException.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MessageException.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/MetafontWrapper.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MetafontWrapper.cpp
index 6653bf8ee33..0144f1caa42 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/MetafontWrapper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MetafontWrapper.cpp
@@ -93,7 +93,7 @@ bool MetafontWrapper::call (const string &mode, double mag) {
 		}
 	}
 	ifstream gf((_fontname+".gf").c_str());
-	return gf;
+	return (bool)gf;
 }
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/MetafontWrapper.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MetafontWrapper.h
index 2a69654ff95..2a69654ff95 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/MetafontWrapper.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MetafontWrapper.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/MiKTeXCom.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MiKTeXCom.cpp
index 09fa598990c..09fa598990c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/MiKTeXCom.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MiKTeXCom.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/MiKTeXCom.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MiKTeXCom.h
index 3f387c8204b..3f387c8204b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/MiKTeXCom.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MiKTeXCom.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/NoPsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/NoPsSpecialHandler.cpp
index 89b16609331..89b16609331 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/NoPsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/NoPsSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/NoPsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/NoPsSpecialHandler.h
index e2f38302186..e2f38302186 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/NoPsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/NoPsSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PSFilter.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSFilter.h
index abb707b86e5..abb707b86e5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PSFilter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSFilter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PSInterpreter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSInterpreter.cpp
index 855e951036d..855e951036d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PSInterpreter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSInterpreter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PSInterpreter.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSInterpreter.h
index b6f28d0f9d9..b6f28d0f9d9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PSInterpreter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSInterpreter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PSPattern.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSPattern.cpp
index b031cb69975..b031cb69975 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PSPattern.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSPattern.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PSPattern.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSPattern.h
index 7e2848dea3b..7e2848dea3b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PSPattern.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSPattern.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PSPreviewFilter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSPreviewFilter.cpp
index fc1815a20d2..c6300eeb932 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PSPreviewFilter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSPreviewFilter.cpp
@@ -38,14 +38,18 @@ PSPreviewFilter::PSPreviewFilter (PSInterpreter &psi)
 /** Activates this filter so that the PS code will be redirected through it if
  *  it's hooked into the PSInterpreter. */
 void PSPreviewFilter::activate () {
-	_tightpage = _active = false;
-	// try to retrieve version string of preview package set in the PS header section
-	if (psInterpreter().executeRaw("SDict begin currentdict/preview@version known{preview@version}{0}ifelse end", 1))
-		_version = psInterpreter().rawData()[0];
-	// check if tightpage option was set
-	if (_version != "0" && psInterpreter().executeRaw("SDict begin preview@tightpage end", 1)) {
-		_tightpage = (psInterpreter().rawData()[0] == "true");
+	if (_tightpage)  // reactivate filter?
 		_active = true;
+	else {           // first activation?
+		_tightpage = _active = false;
+		// try to retrieve version string of preview package set in the PS header section
+		if (psInterpreter().executeRaw("SDict begin currentdict/preview@version known{preview@version}{0}ifelse end", 1))
+			_version = psInterpreter().rawData()[0];
+		// check if tightpage option was set
+		if (_version != "0" && psInterpreter().executeRaw("SDict begin preview@tightpage end", 1)) {
+			_tightpage = (psInterpreter().rawData()[0] == "true");
+			_active = true;
+		}
 	}
 	_boxExtents.clear();
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PSPreviewFilter.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSPreviewFilter.h
index 7662dfa74cc..7662dfa74cc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PSPreviewFilter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSPreviewFilter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PageRanges.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PageRanges.cpp
index 392be0acf33..392be0acf33 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PageRanges.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PageRanges.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PageRanges.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PageRanges.h
index 0e5cd58e5ff..0e5cd58e5ff 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PageRanges.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PageRanges.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PageSize.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PageSize.cpp
index 4625af066a8..4625af066a8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PageSize.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PageSize.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PageSize.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PageSize.h
index bb7a55c7cdc..bb7a55c7cdc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PageSize.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PageSize.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Pair.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Pair.h
index a3dc5a12af3..a3dc5a12af3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Pair.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Pair.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PdfSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PdfSpecialHandler.cpp
index 8dc7d7fd13d..8dc7d7fd13d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PdfSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PdfSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PdfSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PdfSpecialHandler.h
index 43cdd1045de..43cdd1045de 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PdfSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PdfSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Process.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Process.cpp
index 03e3261de6d..03e3261de6d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Process.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Process.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Process.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Process.h
index caf80de4c14..caf80de4c14 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Process.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Process.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PsSpecialHandler.cpp
index 9e1b64faef1..09d23aa03b8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PsSpecialHandler.cpp
@@ -376,8 +376,10 @@ void PsSpecialHandler::dviEndPage (unsigned) {
 			Message::mstream() << "can't determine height, width, and depth due to non-horizontal baseline\n";
 	}
 	// close dictionary TeXDict and execute end-hook if defined
-	if (_psSection == PS_BODY)
+	if (_psSection == PS_BODY) {
 		_psi.execute("\nend userdict/end-hook known{end-hook}if ");
+		_psSection = PS_HEADERS;
+	}
 }
 
 ///////////////////////////////////////////////////////
@@ -848,7 +850,7 @@ void PsSpecialHandler::ClippingStack::pop (int saveID, bool grestoreall) {
 
 
 /** Returns a pointer to the path on top of the stack, or 0 if the stack is empty. */
-PsSpecialHandler::Path* PsSpecialHandler::ClippingStack::top () {
+const PsSpecialHandler::Path* PsSpecialHandler::ClippingStack::top () const {
 	return (!_stack.empty() && _stack.top().pathID)
 		? &_paths[_stack.top().pathID-1]
 		: 0;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PsSpecialHandler.h
index fcdede1da7a..d1d61e92568 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/PsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PsSpecialHandler.h
@@ -48,9 +48,9 @@ class PsSpecialHandler : public SpecialHandler, public DVIEndPageListener, prote
 			void dup (int saveID=-1);
 			void pop (int saveID=-1, bool grestore=false);
 			void clear ();
-			bool empty () {return _stack.empty();}
-			Path* top ();
-			int topID ()  {return _stack.empty() ? 0 : _stack.top().pathID;}
+			bool empty () const {return _stack.empty();}
+			const Path* top () const;
+			int topID () const  {return _stack.empty() ? 0 : _stack.top().pathID;}
 
 		private:
 			struct Entry {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/SVGOutputBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SVGOutputBase.h
index f53815c0a28..f53815c0a28 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/SVGOutputBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SVGOutputBase.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/SVGTree.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SVGTree.cpp
index 626d81da133..626d81da133 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/SVGTree.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SVGTree.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/SVGTree.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SVGTree.h
index 041d97d21d8..041d97d21d8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/SVGTree.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SVGTree.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/SignalHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SignalHandler.cpp
index 494c87b8e90..494c87b8e90 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/SignalHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SignalHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/SignalHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SignalHandler.h
index e7473f567d8..e7473f567d8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/SignalHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SignalHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/SpecialActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SpecialActions.h
index a3cbafeefe3..a3cbafeefe3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/SpecialActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SpecialActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/SpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SpecialHandler.h
index 0883b4cf326..0883b4cf326 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/SpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/SpecialManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SpecialManager.cpp
index 2f1641393a0..2f1641393a0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/SpecialManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SpecialManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/SpecialManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SpecialManager.h
index fc609569ce7..fc609569ce7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/SpecialManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SpecialManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/StreamReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/StreamReader.cpp
index 7b56222e852..7b56222e852 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/StreamReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/StreamReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/StreamReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/StreamReader.h
index 3bb25dacca9..3bb25dacca9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/StreamReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/StreamReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/StreamWriter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/StreamWriter.cpp
index 72ffd5b5eac..72ffd5b5eac 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/StreamWriter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/StreamWriter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/StreamWriter.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/StreamWriter.h
index 6217800dae6..6217800dae6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/StreamWriter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/StreamWriter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Subfont.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Subfont.cpp
index 7b005d00aa9..7b005d00aa9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Subfont.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Subfont.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Subfont.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Subfont.h
index b099bc76897..b099bc76897 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Subfont.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Subfont.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/System.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/System.cpp
index 816f3dc02a1..816f3dc02a1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/System.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/System.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/System.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/System.h
index 775d6358dd7..775d6358dd7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/System.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/System.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/TFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/TFM.cpp
index 1d97600361d..1d97600361d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/TFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/TFM.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/TFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/TFM.h
index a46d2560c22..a46d2560c22 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/TFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/TFM.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Terminal.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Terminal.cpp
index 6d61bea78d4..6d61bea78d4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Terminal.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Terminal.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Terminal.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Terminal.h
index 0a876272c91..0a876272c91 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Terminal.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Terminal.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/TpicSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/TpicSpecialHandler.cpp
index 8d160e9d9a4..8d160e9d9a4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/TpicSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/TpicSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/TpicSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/TpicSpecialHandler.h
index e055e2e0a69..e055e2e0a69 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/TpicSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/TpicSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/VFActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/VFActions.h
index ba25639b337..ba25639b337 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/VFActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/VFActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/VFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/VFReader.cpp
index 20c7fef457c..20c7fef457c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/VFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/VFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/VFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/VFReader.h
index 25689dec2c8..25689dec2c8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/VFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/VFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/VectorStream.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/VectorStream.h
index e57dad43ad1..e57dad43ad1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/VectorStream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/VectorStream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/XMLDocument.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLDocument.cpp
index 00517b218ff..00517b218ff 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/XMLDocument.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLDocument.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/XMLDocument.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLDocument.h
index 31cf9dea303..31cf9dea303 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/XMLDocument.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLDocument.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/XMLNode.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLNode.cpp
index e7c9f295d89..e7c9f295d89 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/XMLNode.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLNode.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/XMLNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLNode.h
index 324bea068aa..324bea068aa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/XMLNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLNode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/XMLString.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLString.cpp
index 2b46d049db6..2b46d049db6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/XMLString.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLString.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/XMLString.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLString.h
index b1496b4a503..b1496b4a503 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/XMLString.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLString.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/dvisvgm.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/dvisvgm.cpp
index ef873835365..f45d44790ad 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/dvisvgm.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/dvisvgm.cpp
@@ -388,7 +388,11 @@ int main (int argc, char *argv[]) {
 	if (!HtmlSpecialHandler::setLinkMarker(args.linkmark_arg()))
 		Message::wstream(true) << "invalid argument '"+args.linkmark_arg()+"' supplied for option --linkmark\n";
 	double start_time = System::time();
-	string inputfile = ensure_suffix(args.file(0), args.eps_given());
+	bool eps_given=false;
+#if defined(HAVE_LIBGS) || !defined(DISABLE_GS)
+	eps_given = args.eps_given();
+#endif
+	string inputfile = ensure_suffix(args.file(0), eps_given);
 	ifstream ifs(inputfile.c_str(), ios_base::binary|ios_base::in);
 	if (!ifs) {
 		Message::estream(true) << "can't open file '" << inputfile << "' for reading\n";
@@ -397,6 +401,7 @@ int main (int argc, char *argv[]) {
 	try {
 		SVGOutput out(args.stdout_given() ? 0 : inputfile.c_str(), args.output_arg(), args.zip_given() ? args.zip_arg() : 0);
 		SignalHandler::instance().start();
+#if defined(HAVE_LIBGS) || !defined(DISABLE_GS)
 		if (args.eps_given()) {
 			EPSToSVG eps2svg(inputfile, out);
 			eps2svg.convert();
@@ -404,7 +409,9 @@ int main (int argc, char *argv[]) {
 			Message::mstream(false, Message::MC_PAGE_NUMBER)
 				<< "file converted in " << (System::time()-start_time) << " seconds\n";
 		}
-		else {
+		else
+#endif
+		{
 			DVIToSVG dvi2svg(ifs, out);
 			const char *ignore_specials = args.no_specials_given() ? (args.no_specials_arg().empty() ? "*" : args.no_specials_arg().c_str()) : 0;
 			dvi2svg.setProcessSpecials(ignore_specials, true);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/gzstream.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/gzstream.cpp
index 2893c299891..2893c299891 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/gzstream.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/gzstream.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/gzstream.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/gzstream.h
index 60f38c4fac7..60f38c4fac7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/gzstream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/gzstream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/iapi.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/iapi.h
index 8e29d938d03..8e29d938d03 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/iapi.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/iapi.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/ierrors.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/ierrors.h
index 3184341177e..3184341177e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/ierrors.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/ierrors.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/macros.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/macros.h
index 8935b9babe9..8935b9babe9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/macros.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/macros.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/options.xml b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/options.xml
index ea0a6f6db95..ea0a6f6db95 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/options.xml
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/options.xml
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/psdefs.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/psdefs.cpp
index 9742ca1cd7a..9742ca1cd7a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/psdefs.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/psdefs.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/types.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/types.h
index c22d0e1bf47..c22d0e1bf47 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/types.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/types.h
diff --git a/Build/source/texk/dvisvgm/version.ac b/Build/source/texk/dvisvgm/version.ac
index 526a275408a..a778c53becc 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.5])
+m4_define([dvisvgm_version], [1.5.1])