dvisvgm 1.6

git-svn-id: svn://tug.org/texlive/trunk@33742 c570f23f-e606-0410-a88d-b1316a301751
author: Peter Breitenlohner <peb@mppmu.mpg.de> 2014-04-29 06:58:25 +0000
committer: Peter Breitenlohner <peb@mppmu.mpg.de> 2014-04-29 06:58:25 +0000
commit: ade99b6e1e4e5cc22d6522782f387e678a3a7ff5 (patch)
tree: ff58b4a14c25651928933cf51a24683ff419b003 /Build
parent: 44c0325c41761729f2df6665f110dec0b942ab2a (diff)
185 files changed, 314 insertions, 145 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README
index 1d4ecb2c8b4..fe5cb67cbf5 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -61,7 +61,7 @@ dvipos - ?
 
 dvipsk - maintained here, by us
 
-dvisvgm 1.5.3 - checked 13apr14
+dvisvgm 1.6 - checked 29apr14
   http://downloads.sourceforge.net/dvisvgm/
 
 gsftopk - from Paul Vojta's xdvi?
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index 4e9ef8a58a7..ae88e8f1b5f 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Imported release 1.6.
+	* version.ac: Adapted.
+
 2014-04-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Imported release 1.5.3.
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 2a413e90ee1..b7fd09480cf 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.3.
+# Generated by GNU Autoconf 2.69 for dvisvgm (TeX Live) 1.6.
 #
 # 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.3'
-PACKAGE_STRING='dvisvgm (TeX Live) 1.5.3'
+PACKAGE_VERSION='1.6'
+PACKAGE_STRING='dvisvgm (TeX Live) 1.6'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="dvisvgm-1.5.3/src/dvisvgm.cpp"
+ac_unique_file="dvisvgm-1.6/src/dvisvgm.cpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1372,7 +1372,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dvisvgm (TeX Live) 1.5.3 to adapt to many kinds of systems.
+\`configure' configures dvisvgm (TeX Live) 1.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1443,7 +1443,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvisvgm (TeX Live) 1.5.3:";;
+     short | recursive ) echo "Configuration of dvisvgm (TeX Live) 1.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1581,7 +1581,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvisvgm (TeX Live) configure 1.5.3
+dvisvgm (TeX Live) configure 1.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2403,7 +2403,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dvisvgm (TeX Live) $as_me 1.5.3, which was
+It was created by dvisvgm (TeX Live) $as_me 1.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7894,7 +7894,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvisvgm--tex-live-'
- VERSION='1.5.3'
+ VERSION='1.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17755,7 +17755,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dvisvgm (TeX Live) config.lt 1.5.3
+dvisvgm (TeX Live) config.lt 1.6
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -19566,7 +19566,7 @@ $as_echo "#define KPSE_CXX_UNSAFE 1" >>confdefs.h
 
 fi
 
-DVISVGM_TREE=dvisvgm-1.5.3
+DVISVGM_TREE=dvisvgm-1.6
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -20118,7 +20118,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dvisvgm (TeX Live) $as_me 1.5.3, which was
+This file was extended by dvisvgm (TeX Live) $as_me 1.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20184,7 +20184,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dvisvgm (TeX Live) config.status 1.5.3
+dvisvgm (TeX Live) config.status 1.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.6-PATCHES/ChangeLog
index fed2bc44065..8e6ce1832cf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3-PATCHES/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Import release 1.6.
+
 2014-04-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Import release 1.5.3.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.6-PATCHES/TL-Changes
index 0b154b3f170..f102fe4d733 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3-PATCHES/TL-Changes
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6-PATCHES/TL-Changes
@@ -1,11 +1,10 @@
-Changes applied to the dvisvgm-1.5.3 tree as obtained from:
+Changes applied to the dvisvgm-1.6 tree as obtained from:
 	http://downloads.sourceforge.net/dvisvgm/
 
 Removed:
 	Makefile.in
 	aclocal.m4
 	config.guess
-	config.rpath
 	config.sub
 	configure
 	depcomp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/AUTHORS b/Build/source/texk/dvisvgm/dvisvgm-1.6/AUTHORS
index d9b6468421e..d9b6468421e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/AUTHORS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/AUTHORS
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/COPYING b/Build/source/texk/dvisvgm/dvisvgm-1.6/COPYING
index 94a9ed024d3..94a9ed024d3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/COPYING
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/COPYING
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.6/ChangeLog
index aa07685bdc0..67663e1a0d7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/ChangeLog
@@ -1,5 +1,55 @@
+2014-04-22  Martin Gieseking  <martin.gieseking@uos.de>
+
+  * configure.ac, src/Doxyfile: 
+  set version to 1.6 
+
+2014-04-21  Martin Gieseking  <martin.gieseking@uos.de>
+
+  * doc/dvisvgm.txt.in, src/DVIToSVG.cpp, src/EPSToSVG.cpp: 
+  removed date and machine triplet from generated SVG files 
+
+2014-04-18  Martin Gieseking  <martin.gieseking@uos.de>
+
+  * doc/dvisvgm.txt.in, src/HtmlSpecialHandler.cpp, 
+    src/HtmlSpecialHandler.h: 
+  added optional selection of line/box colors to option --linkmark 
+
+2014-04-17  Martin Gieseking  <martin.gieseking@uos.de>
+
+  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/options.xml: 
+  changed default argument of option --linkmark to 'box' 
+
+  * src/DVIReader.h, src/DVIToSVGActions.h, src/HtmlSpecialHandler.cpp, 
+    src/HtmlSpecialHandler.h, src/SpecialActions.h: 
+  only split hyperlink boxes on line breaks 
+
+  * src/CommandLine.h, src/DVIToSVG.cpp, src/EPSToSVG.cpp: 
+  don't link GS messages unnecessarily if HAVE_LIBGS is defined 
+
+2014-04-16  Martin Gieseking  <martin.gieseking@uos.de>
+
+  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/CommandLine.h, 
+    src/SVGTree.cpp, src/SVGTree.h, src/dvisvgm.cpp, src/options.xml: 
+  added command-line option --zoom 
+
+  * src/Ghostscript.cpp, src/dvisvgm.cpp: 
+  moved lookup of MiKTeX's GS DLL to get_libgs() 
+
+  * doc/dvisvgm.txt.in, src/Ghostscript.cpp: 
+  if libgs is loaded during runtime, look for libgs.so.X instead of 
+  libgs.so 
+
+  * src/DLLoader.cpp: 
+  prevent calling dlopen() if the length of the string argument is 0 
+
 2014-04-11  Martin Gieseking  <martin.gieseking@uos.de>
 
+  * NEWS: 
+  updated NEWS 
+
+  * configure.ac, src/Doxyfile: 
+  set version to 1.5.3 
+
   * src/CMap.cpp, src/CmdLineParserBase.cpp, src/ColorSpecialHandler.cpp, 
     src/DVIReader.cpp, src/DVIToSVGActions.cpp, src/Doxyfile, 
     src/DvisvgmSpecialHandler.cpp, src/DvisvgmSpecialHandler.h, 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/INSTALL b/Build/source/texk/dvisvgm/dvisvgm-1.6/INSTALL
index a4b34144dcf..a4b34144dcf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/INSTALL
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/INSTALL
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/LGPL-2.1.txt b/Build/source/texk/dvisvgm/dvisvgm-1.6/LGPL-2.1.txt
index 602bfc94635..602bfc94635 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/LGPL-2.1.txt
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/LGPL-2.1.txt
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.6/Makefile.am
index b73dbf588f8..b73dbf588f8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/NEWS b/Build/source/texk/dvisvgm/dvisvgm-1.6/NEWS
index bc9e7e02d03..45104994435 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/NEWS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/NEWS
@@ -1,3 +1,16 @@
+dvisvgm-1.6 (2014-04-22)
+- added option --zoom to "visually" scale the generated SVG graphics while
+  preserving the original size and position values of the graphic objects
+- extended argument syntax of option --linkmark to allow to select the
+  box/line color
+- changed default link marker from 'line' to 'box'
+- changed link markers to be only split on line breaks while extended in all
+  other cases
+- if libgs is not directly linked to the binary, dvisvgm now looks for
+  libgs.so.X instead of libgs.so (supported GS ABIs: X = 7, 8, 9)
+- removed time stamp and machine triplet from generated SVG files
+- some code improvements and refactorings
+
 dvisvgm-1.5.3 (2014-04-11)
 - improved positioning of PostScript graphics
 - fixed positioning of DVI rules/rectangles
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/README b/Build/source/texk/dvisvgm/dvisvgm-1.6/README
index 2454a2a23f4..2454a2a23f4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/README
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/README
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/config.h.in b/Build/source/texk/dvisvgm/dvisvgm-1.6/config.h.in
index fcd8cf41872..fcd8cf41872 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/config.h.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/config.h.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/configure.ac b/Build/source/texk/dvisvgm/dvisvgm-1.6/configure.ac
index f52b8295a0f..934dffccbb0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/configure.ac
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/configure.ac
@@ -4,7 +4,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dvisvgm],[1.5.3],[martin.gieseking@uos.de])
+AC_INIT([dvisvgm],[1.6],[martin.gieseking@uos.de])
 DATE="April 2014"
 AC_CONFIG_SRCDIR(src)
 AC_CONFIG_HEADER(config.h)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/doc/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.6/doc/Makefile.am
index 13254cb773a..13254cb773a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/doc/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/doc/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/doc/dvisvgm.1 b/Build/source/texk/dvisvgm/dvisvgm-1.6/doc/dvisvgm.1
index c0814786d09..0c65adf919a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/doc/dvisvgm.1
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/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/11/2014
+.\"      Date: 04/23/2014
 .\"    Manual: dvisvgm Manual
-.\"    Source: dvisvgm 1.5.3
+.\"    Source: dvisvgm 1.6
 .\"  Language: English
 .\"
-.TH "DVISVGM" "1" "04/11/2014" "dvisvgm 1\&.5\&.3" "dvisvgm Manual"
+.TH "DVISVGM" "1" "04/23/2014" "dvisvgm 1\&.6" "dvisvgm Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -273,7 +273,7 @@ Disables the removal of temporary files as created by Metafont (usually \&.gf, \
 .PP
 \fB\-\-libgs\fR=\fIfilename\fR
 .RS 4
-This option is only available if the Ghostscript library is not directly linked to dvisvgm and if PostScript support was not completely disabled during compilation\&. In this case, dvisvgm tries to load the shared GS library dynamically during runtime\&. By default, it expects the library\(cqs name to be libgs\&.so (on Unix\-like systems) or gsdll32\&.dll/gsdll64\&.dll (Windows)\&. Option
+This option is only available if the Ghostscript library is not directly linked to dvisvgm and if PostScript support was not completely disabled during compilation\&. In this case, dvisvgm tries to load the shared GS library dynamically during runtime\&. By default, it expects the library\(cqs name to be libgs\&.so\&.X (on Unix\-like systems, where X is the ABI version of the library) or gsdll32\&.dll/gsdll64\&.dll (Windows)\&. Option
 \fB\-\-libgs\fR
 can be used to give a different name\&. Alternatively, it\(cqs also possible to set the GS library name by the environment variable
 LIBGS\&. The latter has less precedence than the command\-line option\&.
@@ -286,21 +286,31 @@ Selects the method how to mark hyperlinked areas\&. The
 argument can take one of the values
 \fInone\fR,
 \fIbox\fR, and
-\fIline\fR, where the latter is the default, i\&.e\&. all links are underlined when dvisvgm is called without option
-\fB\-\-linkmark\fR\&. Type
+\fIline\fR, where
 \fIbox\fR
-draws a rectangle around the linked area, and
+is the default, i\&.e\&. a rectangle is drawn around the linked region if option
+\fB\-\-linkmark\fR
+is omitted\&. Type
+\fIline\fR
+just draws the lower edge of the bounding rectangle, and
 \fInone\fR
-tells dvisvgm not to add any visible objects to hyperlinks\&. Additionally, the argument
-\fItype\fR
-can take a dvips color name as listed here:
+tells dvisvgm not to add any visible objects to hyperlinks\&. The lines and boxes get the current text color selected\&. In order to apply a different, constant color, a colon followed by a color specifier can be appended to the type string\&. A
+\fIcolor specifier\fR
+is either a hexadecimal RGB value of the form
+\fI#RRGGBB\fR, or a dvips color name as listed here:
 http://en\&.wikibooks\&.org/wiki/LaTeX/Colors#The_68_standard_colors_known_to_dvips
-It\(cqs also possible to give an explicit hexadecimal RGB value of the form
-\fI#RRGGBB\fR, e\&.g\&.
-\fI#0000ff\fR
-or simply
-\fI#ff\fR
-for blue\&. The color is used to highlight the linked area\&.
+.sp
+Moreover, argument
+\fItype\fR
+can take a single color specifier to highlight the linked region by a frameless box filled with that color\&. An optional second color specifier separated by colon selects the frame color\&.
+.sp
+Examples:
+\fBbox:red\fR
+or
+\fBbox:#ff0000\fR
+draws red boxes around the linked areas\&.
+\fByellow:blue\fR
+creates yellow filled rectangles with blue frames\&.
 .RE
 .PP
 \fB\-l, \-\-list\-specials\fR
@@ -681,6 +691,21 @@ This option cannot be combined with
 .sp .5v
 .RE
 .RE
+.PP
+\fB\-Z, \-\-zoom\fR[=\fIfactor\fR]
+.RS 4
+Multiplies the
+\fIwidth\fR
+and
+\fIheight\fR
+attributes of the SVG root element by argument
+\fIfactor\fR
+while the coordinate system of the graphic is retained\&. As a result, most SVG viewers zoom the graphics accordingly\&. If a negative zoom factor is given, the
+\fIwidth\fR
+and
+\fIheight\fR
+attributes are omitted\&.
+.RE
 .SH "SUPPORT OF SPECIALS"
 .sp
 dvisvgm supports several sets of \fIspecial commands\fR that can be used to enrich DVI files with additional features, like color, graphics, and hyperlinks\&. The evaluation of special commands is delegated to various handlers\&. Each handler is responsible for all special statements of the same command set, i\&.e\&. commands beginning with the same prefix\&. To get a list of actually provided special handlers, use option \fB\-\-list\-specials\fR (see above)\&. This section gives an overview of the special commands currently supported\&.
@@ -795,7 +820,7 @@ These specials were introduced with the emTeX distribution by Eberhard Mattes\&.
 \fBhtml\fR
 .RS 4
 The hyperref specials allow the definition of hyperlinks inside DVI files in various flavors\&. dvisvgm supports the plain HyperTeX special constructs as created with hyperref package option
-\fIhypertex\fR\&. Internal links, i\&.e\&. references to other parts of the same document, are only converted if the link and the corresponding link target are located on the same page\&. Links between different pages are not supported yet\&. By default, all linked areas of the document are underlined\&. Option
+\fIhypertex\fR\&. Internal links, i\&.e\&. references to other parts of the same document, are only converted if the link and the corresponding link target are located on the same page\&. Links between different pages are not supported yet\&. By default, all linked areas of the document are marked by a rectangle\&. Option
 \fB\-\-linkmark\fR
 allows to change this behavior\&. See above for further details\&. Information on syntax and semantics of the HyperTeX specials can be found in the hyperref manual\&.
 .RE
@@ -813,18 +838,18 @@ are supported by dvisvgm\&. These specials allow modifying the font map tree dur
 .RS 4
 The famous DVI driver dvips introduced its own set of specials in order to embed PostScript code into DVI files, which greatly improves the capabilities of DVI documents\&. One aim of dvisvgm is to completely evaluate all PostScript snippets and to convert a large amount of it to SVG\&. However, in contrast to dvips, dvisvgm uses floating point arithmetics to compute the precise position of each graphic element, i\&.e\&. it doesn\(cqt round the coordinates\&. Therefore, the relative locations of the graphic elements may slightly differ from those computed by dvips\&.
 .sp
-Since PostScript is a rather complex language, dvisvgm does not try to implement its own PostScript interpreter but relies on Ghostscript instead\&. If the Ghostscript library was not linked while building dvisvgm, it is looked up and loaded dynamically during runtime\&. In this case, dvisvgm looks for
-\fIlibgs\&.so\fR
-on Unix\-like systems, and for
+Since PostScript is a rather complex language, dvisvgm does not try to implement its own PostScript interpreter but relies on Ghostscript instead\&. If the Ghostscript library was not linked to the dvisvgm binary, it is looked up and loaded dynamically during runtime\&. In this case, dvisvgm looks for
+\fIlibgs\&.so\&.X\fR
+on Unix\-like systems (supported ABI versions: 7,8,9), and for
 \fIgsdll32\&.dll\fR
 or
 \fIgsdll64\&.dll\fR
-on Windows\&. You can override these default file names with environment variable
+on Windows\&. You can override the default file names with environment variable
 LIBGS
 or the command\-line option
-\fB\-\-libgs\fR\&. The library must be installed and reachable through the ld search path (*nix) or the PATH environment variable (Windows)\&. If it cannot be found, the processing of PostScript specials is disabled\&. Use option
+\fB\-\-libgs\fR\&. The library must be reachable through the ld search path (*nix) or the PATH environment variable (Windows)\&. Alternatively, the absolute file path can be specified\&. If the library cannot be found, dvisvgm disables the processing of PostScript specials\&. Use option
 \fB\-\-list\-specials\fR
-to check whether PS support is available, i\&.e\&. the entry
+to check whether PS support is available, i\&.e\&. entry
 \fIps\fR
 is present\&.
 .sp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/doc/dvisvgm.txt.in b/Build/source/texk/dvisvgm/dvisvgm-1.6/doc/dvisvgm.txt.in
index 06cf27d35a6..7d942066d3b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/doc/dvisvgm.txt.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/doc/dvisvgm.txt.in
@@ -172,7 +172,7 @@ However, each filename can be preceded by an optional mode specifier (*+*, *-*,
  
   +mapfile;;
     Only those entries in the given map file that don't redefine a font mapping are applied.
-	 That's also the default mode if no mode specifier is given.
+    That's also the default mode if no mode specifier is given.
   
   -mapfile;;
     Ensures that none of the font mappings defined in the given map file are used, i.e. previously 
@@ -211,20 +211,28 @@ Disables the removal of temporary files as created by Metafont (usually .gf, .tf
 This option is only available if the Ghostscript library is not directly linked to dvisvgm and if
 PostScript support was not completely disabled during compilation. In this case, dvisvgm tries
 to load the shared GS library dynamically during runtime. By default, it expects the library's name
-to be libgs.so (on Unix-like systems) or gsdll32.dll/gsdll64.dll (Windows). Option *--libgs* can be
-used to give a different name. Alternatively, it's also possible to set the GS library name by the
-environment variable +LIBGS+. The latter has less precedence than the command-line option.
+to be libgs.so.X (on Unix-like systems, where X is the ABI version of the library) or
+gsdll32.dll/gsdll64.dll (Windows). Option *--libgs* can be used to give a different name.
+Alternatively, it's also possible to set the GS library name by the environment variable +LIBGS+.
+The latter has less precedence than the command-line option.
 
 
 *-L, --linkmark*='type'::
 Selects the method how to mark hyperlinked areas. The 'type' argument can take one of the values
-'none', 'box', and 'line', where the latter is the default, i.e. all links are underlined when
-dvisvgm is called without option *--linkmark*. Type 'box' draws a rectangle around the linked
-area, and 'none' tells dvisvgm not to add any visible objects to hyperlinks.
-Additionally, the argument 'type' can take a dvips color name as listed here:
+'none', 'box', and 'line', where 'box' is the default, i.e. a rectangle is drawn around
+the linked region if option *--linkmark* is omitted. Type 'line' just draws the lower edge of
+the bounding rectangle, and 'none' tells dvisvgm not to add any visible objects to hyperlinks.
+The lines and boxes get the current text color selected. In order to apply a different, constant color,
+a colon followed by a color specifier can be appended to the type string. A 'color specifier' is either
+a hexadecimal RGB value of the form '#RRGGBB', or a dvips color name as listed here:
 http://en.wikibooks.org/wiki/LaTeX/Colors#The_68_standard_colors_known_to_dvips
-It's also possible to give an explicit hexadecimal RGB value of the form '#RRGGBB', e.g. '#0000ff'
-or simply '#ff' for blue. The color is used to highlight the linked area.
++
+Moreover, argument 'type' can take a single color specifier to highlight the linked region by
+a frameless box filled with that color. An optional second color specifier separated by colon
+selects the frame color.
++
+Examples: *box:red* or *box:#ff0000* draws red boxes around the linked areas. *yellow:blue* creates
+yellow filled rectangles with blue frames.
 
 
 *-l, --list-specials*::
@@ -429,6 +437,12 @@ compression results but take more computation time.
 CAUTION: This option cannot be combined with *-s, --stdout*.
 
 
+*-Z, --zoom*[='factor']::
+Multiplies the 'width' and 'height' attributes of the SVG root element by argument 'factor' while
+the coordinate system of the graphic is retained. As a result, most SVG viewers zoom the graphics
+accordingly. If a negative zoom factor is given, the 'width' and 'height' attributes are omitted.
+
+
 SUPPORT OF SPECIALS
 -------------------
 dvisvgm supports several sets of 'special commands' that can be used to enrich DVI files with additional
@@ -513,9 +527,9 @@ The hyperref specials allow the definition of hyperlinks inside DVI files in var
 the plain HyperTeX special constructs as created with hyperref package option 'hypertex'. Internal links, i.e.
 references to other parts of the same document, are only converted if the link and the corresponding link target
 are located on the same page. Links between different pages are not supported yet.
-By default, all linked areas of the document are underlined. Option *--linkmark* allows to change this behavior.
-See above for further details. Information on syntax and semantics of the HyperTeX specials can be found in the
-hyperref manual.
+By default, all linked areas of the document are marked by a rectangle. Option *--linkmark* allows to change
+this behavior. See above for further details. Information on syntax and semantics of the HyperTeX specials can be
+found in the hyperref manual.
 
 *pdf*::
 pdfTeX and dvipdfmx introduced several special commands related to the generation of PDF files. Currently, only
@@ -532,12 +546,13 @@ arithmetics to compute the precise position of each graphic element, i.e. it doe
 the relative locations of the graphic elements may slightly differ from those computed by dvips.
 +
 Since PostScript is a rather complex language, dvisvgm does not try to implement its own PostScript interpreter but relies on
-Ghostscript instead. If the Ghostscript library was not linked while building dvisvgm, it is looked up and loaded dynamically
-during runtime. In this case, dvisvgm looks for 'libgs.so' on Unix-like systems, and for 'gsdll32.dll' or 'gsdll64.dll' on Windows.
-You can override these default file names with environment variable +LIBGS+ or the command-line option *--libgs*.
-The library must be installed and reachable through the ld search path (\*nix) or the PATH environment
-variable (Windows). If it cannot be found, the processing of PostScript specials is disabled.
-Use option *--list-specials* to check whether PS support is available, i.e. the entry 'ps' is present.
+Ghostscript instead. If the Ghostscript library was not linked to the dvisvgm binary, it is looked up and loaded dynamically
+during runtime. In this case, dvisvgm looks for 'libgs.so.X' on Unix-like systems (supported ABI versions: 7,8,9),
+and for 'gsdll32.dll' or 'gsdll64.dll' on Windows.
+You can override the default file names with environment variable +LIBGS+ or the command-line option *--libgs*.
+The library must be reachable through the ld search path (\*nix) or the PATH environment variable (Windows). Alternatively,
+the absolute file path can be specified. If the library cannot be found, dvisvgm disables the processing of PostScript specials.
+Use option *--list-specials* to check whether PS support is available, i.e. entry 'ps' is present.
 +
 The PostScript handler also recognizes and evaluates bounding box data generated by the 'preview' package with
 option 'tightpage'. If the data is present in a DVI file, dvisvgm adapts the bounding box of the generated SVG file
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BgColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/BgColorSpecialHandler.cpp
index dd19e4b5f53..dd19e4b5f53 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BgColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/BgColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BgColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/BgColorSpecialHandler.h
index edd764e86b2..edd764e86b2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BgColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/BgColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Bitmap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Bitmap.cpp
index 265533b1ef5..265533b1ef5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Bitmap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Bitmap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Bitmap.h
index af03597be33..af03597be33 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BoundingBox.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/BoundingBox.cpp
index f6c5d0b3b9b..f6c5d0b3b9b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BoundingBox.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/BoundingBox.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BoundingBox.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/BoundingBox.h
index 1996973d42d..1996973d42d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BoundingBox.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/BoundingBox.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CMap.cpp
index f6a46a31a86..f6a46a31a86 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CMap.h
index 2a3e9c7dbbb..2a3e9c7dbbb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CMapManager.cpp
index cbad12746c9..cbad12746c9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CMapManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CMapManager.h
index fb71886753c..fb71886753c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CMapManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CMapReader.cpp
index 502e42ef2e0..502e42ef2e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CMapReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CMapReader.h
index 5986e92b13d..5986e92b13d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CMapReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CRC32.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CRC32.cpp
index 3f85710c6b7..3f85710c6b7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CRC32.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CRC32.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CRC32.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CRC32.h
index 4376b192077..4376b192077 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CRC32.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CRC32.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Calculator.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Calculator.cpp
index 2e0bb06a361..2e0bb06a361 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Calculator.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Calculator.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Calculator.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Calculator.h
index 89d2c08560d..89d2c08560d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Calculator.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Calculator.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CharMap.cpp
index 3e749add96b..3e749add96b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CharMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CharMap.h
index 8faeffa21c1..8faeffa21c1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CharMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMapID.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CharMapID.cpp
index 2c6e1cd8a59..2c6e1cd8a59 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMapID.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CharMapID.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMapID.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CharMapID.h
index ea30d50d266..ea30d50d266 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMapID.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CharMapID.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Character.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Character.h
index a9d0f6a2d6d..a9d0f6a2d6d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Character.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Character.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CmdLineParserBase.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CmdLineParserBase.cpp
index 2c8d133cc97..2c8d133cc97 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CmdLineParserBase.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CmdLineParserBase.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CmdLineParserBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CmdLineParserBase.h
index 87e740feaf3..87e740feaf3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CmdLineParserBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CmdLineParserBase.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Color.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Color.cpp
index 7e8d9d56069..7e8d9d56069 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Color.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Color.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Color.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Color.h
index 99d847560e0..99d847560e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Color.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Color.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/ColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/ColorSpecialHandler.cpp
index 31b9de68c01..31b9de68c01 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/ColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/ColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/ColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/ColorSpecialHandler.h
index 27dfe984a00..27dfe984a00 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/ColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/ColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CommandLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CommandLine.cpp
index b13fc520cec..7a50191229f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CommandLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CommandLine.cpp
@@ -47,6 +47,7 @@ const CmdLineParserBase::Option CommandLine::_options[] = {
    {'v', "verbosity", ARG_REQUIRED, new OptionHandlerImpl<CommandLine>(&CommandLine::handle_verbosity)},
    {'V', "version", ARG_OPTIONAL, new OptionHandlerImpl<CommandLine>(&CommandLine::handle_version)},
    {'z', "zip", ARG_OPTIONAL, new OptionHandlerImpl<CommandLine>(&CommandLine::handle_zip)},
+   {'Z', "zoom", ARG_REQUIRED, new OptionHandlerImpl<CommandLine>(&CommandLine::handle_zoom)},
 };
 
 const CmdLineParserBase::Option* CommandLine::options (size_t *numopts) const {
@@ -91,6 +92,7 @@ void CommandLine::init () {
    _verbosity_given = false;
    _version_given = false;
    _zip_given = false;
+   _zoom_given = false;
 
    // set default option values
    _bbox_arg = "min";
@@ -100,7 +102,7 @@ void CommandLine::init () {
 #if !defined(HAVE_LIBGS) && !defined(DISABLE_GS)
    _libgs_arg.clear();
 #endif
-   _linkmark_arg = "line";
+   _linkmark_arg = "box";
    _mag_arg = 4;
    _no_fonts_arg = 0;
    _no_specials_arg.clear();
@@ -116,6 +118,7 @@ void CommandLine::init () {
    _verbosity_arg = 7;
    _version_arg = false;
    _zip_arg = 9;
+   _zoom_arg = 1.0;
 }
 
 const char** CommandLine::helplines (size_t *numlines) const {
@@ -129,7 +132,7 @@ const char** CommandLine::helplines (size_t *numlines) const {
 #endif
       "sSVG output options:",
       "o-b, --bbox=size               set size of bounding box [min]",
-      "o-L, --linkmark=type           select how to mark hyperlinked areas [line]",
+      "o-L, --linkmark=type           select how to mark hyperlinked areas [box]",
       "o-o, --output=pattern          set name pattern of output files",
       "o-d, --precision=number        set number of decimal points (0-6) [0]",
       "o-s, --stdout                  write SVG output to stdout",
@@ -141,6 +144,7 @@ const char** CommandLine::helplines (size_t *numlines) const {
       "o-c, --scale=sx[,sy]           scale page content",
       "o-t, --translate=tx[,ty]       shift page content",
       "o-T, --transform=commands      transform page content",
+      "o-Z, --zoom=factor             zoom page content [1.0]",
       "sProcessing options:",
       "o-C, --cache[=dir]             set/print path of cache directory",
       "o-e, --exact                   compute exact glyph boxes",
@@ -305,3 +309,8 @@ void CommandLine::handle_zip (InputReader &ir, const Option &opt, bool longopt)
       _zip_given = true;
 }
 
+void CommandLine::handle_zoom (InputReader &ir, const Option &opt, bool longopt) {
+   if (getDoubleArg(ir, opt, longopt, _zoom_arg))
+      _zoom_given = true;
+}
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CommandLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CommandLine.h
index dedf935a112..20a991b0e1e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CommandLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/CommandLine.h
@@ -4,8 +4,8 @@
 // See file COPYING for further details.
 // (C) 2009-2014 Martin Gieseking <martin.gieseking@uos.de>
 
-#ifndef DVISVGM_COMMANDLINE_H
-#define DVISVGM_COMMANDLINE_H
+#ifndef COMMANDLINE_H
+#define COMMANDLINE_H
 
 #include <config.h>
 #include "CmdLineParserBase.h"
@@ -69,6 +69,8 @@ class CommandLine : public CmdLineParserBase
       bool version_arg () const {return _version_arg;}
       bool zip_given () const {return _zip_given;}
       int zip_arg () const {return _zip_arg;}
+      bool zoom_given () const {return _zoom_given;}
+      double zoom_arg () const {return _zoom_arg;}
 
    protected:
       void init ();
@@ -107,6 +109,7 @@ class CommandLine : public CmdLineParserBase
       void handle_verbosity (InputReader &ir, const Option &opt, bool longopt);
       void handle_version (InputReader &ir, const Option &opt, bool longopt);
       void handle_zip (InputReader &ir, const Option &opt, bool longopt);
+      void handle_zoom (InputReader &ir, const Option &opt, bool longopt);
 
    private:
       static const CmdLineParserBase::Option _options[];
@@ -164,6 +167,8 @@ class CommandLine : public CmdLineParserBase
       bool _version_arg;
       bool _zip_given;
       int _zip_arg;
+      bool _zoom_given;
+      double _zoom_arg;
 };
 
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DLLoader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DLLoader.cpp
index 2386da70fed..8f03d1a0b83 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DLLoader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DLLoader.cpp
@@ -22,12 +22,15 @@
 #include "DLLoader.h"
 
 
-DLLoader::DLLoader (const char *dlname) {
+DLLoader::DLLoader (const char *dlname) : _handle(0)
+{
+	if (dlname && *dlname) {
 #ifdef __WIN32__
-	_handle = LoadLibrary(dlname);
+		_handle = LoadLibrary(dlname);
 #else
-	_handle = dlopen(dlname, RTLD_LAZY);
+		_handle = dlopen(dlname, RTLD_LAZY);
 #endif
+	}
 }
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DLLoader.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DLLoader.h
index e699fa219db..e699fa219db 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DLLoader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DLLoader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DVIActions.h
index 613be5365d6..613be5365d6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DVIActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DVIReader.cpp
index f9edfd0536d..f9edfd0536d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DVIReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DVIReader.h
index f55a611625b..d57250295b8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DVIReader.h
@@ -77,6 +77,7 @@ class DVIReader : public StreamReader, protected VFActions
 		void translateToY (double y)           {_ty=y-_dviState.v-_ty;}
 		double getPageWidth () const;
 		double getPageHeight () const;
+		int getStackDepth () const             {return _stateStack.size();}
 		int getCurrentFontNumber () const      {return _currFontNum;}
 		unsigned getCurrentPageNumber () const {return _currPageNum;}
 		unsigned getTotalPages () const        {return _totalPages;}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DVIToSVG.cpp
index b474443fd68..8f9bb1f63a3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DVIToSVG.cpp
@@ -57,26 +57,10 @@
 
 ///////////////////////////////////
 
-#ifdef TARGET_SYSTEM
-	#define VERSION_STR VERSION " (" TARGET_SYSTEM ")"
-#else
-	#define VERSION_STR VERSION
-#endif
-
 
 using namespace std;
 
 
-/** Returns time stamp of current date/time. */
-static string datetime () {
-	time_t t;
-	time(&t);
-	struct tm *tm = localtime(&t);
-	char *timestr = asctime(tm);
-	timestr[24] = 0;  // remove newline
-	return timestr;
-}
-
 class PSHeaderActions : public DVIActions
 {
 	public :
@@ -141,7 +125,7 @@ void DVIToSVG::convert (unsigned first, unsigned last, pair<int,int> *pageinfo)
 	}
 	last = min(last, getTotalPages());
 
-#if defined(HAVE_LIBGS) || !defined(DISABLE_GS)
+#ifndef 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);
@@ -203,8 +187,7 @@ void DVIToSVG::beginPage (unsigned pageno, Int32 *c) {
 		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() + " "));
+		_svg.appendToDoc(new XMLCommentNode(" This file was generated by dvisvgm " VERSION " "));
 	}
 }
 
@@ -363,22 +346,22 @@ const SpecialManager* DVIToSVG::setProcessSpecials (const char *ignorelist, bool
 			0
 		};
 		SpecialHandler **p = handlers;
-#if !defined(DISABLE_GS)
+#ifndef DISABLE_GS
 		if (Ghostscript().available())
 			*p = new PsSpecialHandler;
 		else
 #endif
 		{
-#if defined(DISABLE_GS) || !defined(HAVE_LIBGS)
+#ifndef HAVE_LIBGS
 			*p = new NoPsSpecialHandler; // dummy PS special handler that only prints warning messages
-#endif
 			if (pswarning) {
-#if defined(DISABLE_GS)
+#ifdef DISABLE_GS
 				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
 			}
+#endif
 		}
 		_specialManager.unregisterHandlers();
 		_specialManager.registerHandlers(p, ignorelist);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DVIToSVG.h
index 626e27c568a..626e27c568a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DVIToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVGActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DVIToSVGActions.cpp
index 7d25678d227..7d25678d227 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVGActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DVIToSVGActions.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVGActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DVIToSVGActions.h
index 6891a0d48a2..9b18209904b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVGActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DVIToSVGActions.h
@@ -55,6 +55,7 @@ class DVIToSVGActions : public DVIActions, public SpecialActions, public Special
 		const Matrix& getMatrix () const               {return _svg.getMatrix();}
 		void getPageTransform (Matrix &matrix) const   {_dvisvg.getPageTransformation(matrix);}
 		Color getColor () const                        {return _svg.getColor();}
+		int getDVIStackDepth() const                   {return _dvisvg.getStackDepth();}
 		void appendToPage (XMLNode *node)              {_svg.appendToPage(node);}
 		void appendToDefs (XMLNode *node)              {_svg.appendToDefs(node);}
 		void prependToPage (XMLNode *node)             {_svg.prependToPage(node);}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Directory.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Directory.cpp
index 925b3065c8d..925b3065c8d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Directory.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Directory.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Directory.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Directory.h
index 0d1e9406b4e..0d1e9406b4e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Directory.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Directory.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DvisvgmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DvisvgmSpecialHandler.cpp
index 58f6a6e7ca1..58f6a6e7ca1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DvisvgmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DvisvgmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DvisvgmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DvisvgmSpecialHandler.h
index 1c6424c6fb8..1c6424c6fb8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DvisvgmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/DvisvgmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSFile.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/EPSFile.cpp
index d3def37dc68..d3def37dc68 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSFile.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/EPSFile.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSFile.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/EPSFile.h
index 19b60a42797..19b60a42797 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSFile.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/EPSFile.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/EPSToSVG.cpp
index c92dbb9c10d..417dde90f48 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/EPSToSVG.cpp
@@ -29,19 +29,15 @@
 #include "PsSpecialHandler.h"
 #include "SVGOutputBase.h"
 
-#ifdef TARGET_SYSTEM
-	#define VERSION_STR VERSION " (" TARGET_SYSTEM ")"
-#else
-	#define VERSION_STR VERSION
-#endif
-
 
 using namespace std;
 
 
 void EPSToSVG::convert () {
+#ifndef HAVE_LIBGS
 	if (!Ghostscript().available())
 		throw MessageException("Ghostscript is required to process the EPS file");
+#endif
 	EPSFile epsfile(_fname);
 	if (!epsfile.hasValidHeader())
 		throw PSException("invalid EPS file");
@@ -55,7 +51,7 @@ void EPSToSVG::convert () {
 	_svg.newPage(1);
 	// create a psfile special and forward it to the PsSpecialHandler
 	stringstream ss;
-	ss << "\"" << _fname  << "\" "
+	ss << "\"" << _fname << "\" "
 			"llx=" << bbox.minX() << " "
 			"lly=" << bbox.minY() << " "
 			"urx=" << bbox.maxX() << " "
@@ -64,7 +60,7 @@ void EPSToSVG::convert () {
 	pshandler.process("psfile=", ss, this);
 	// output SVG file
 	_svg.setBBox(_bbox);
-	_svg.appendToDoc(new XMLCommentNode(" This file was generated by dvisvgm " VERSION_STR " "));
+	_svg.appendToDoc(new XMLCommentNode(" This file was generated by dvisvgm " VERSION " "));
 	_svg.write(_out.getPageStream(1, 1));
 	string svgfname = _out.filename(1, 1);
 	const double bp2pt = 72.27/72;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/EPSToSVG.h
index e3ea67ca87d..e3ea67ca87d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/EPSToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/EmSpecialHandler.cpp
index cc06289464c..cc06289464c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/EmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/EmSpecialHandler.h
index 17e84a3e6e2..17e84a3e6e2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/EmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EncFile.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/EncFile.cpp
index 103090bc3e3..103090bc3e3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EncFile.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/EncFile.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EncFile.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/EncFile.h
index 10b21c15547..10b21c15547 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EncFile.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/EncFile.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileFinder.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FileFinder.cpp
index e8269991053..e8269991053 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileFinder.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FileFinder.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileFinder.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FileFinder.h
index 5057e9b2593..5057e9b2593 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileFinder.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FileFinder.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FilePath.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FilePath.cpp
index 92922d99354..92922d99354 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FilePath.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FilePath.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FilePath.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FilePath.h
index c1c1bab7064..c1c1bab7064 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FilePath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FilePath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileSystem.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FileSystem.cpp
index e938e65a207..e938e65a207 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileSystem.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FileSystem.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileSystem.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FileSystem.h
index f60fcd0ac86..f60fcd0ac86 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileSystem.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FileSystem.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Font.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Font.cpp
index a7f78e80427..a7f78e80427 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Font.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Font.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Font.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Font.h
index bc33f630004..bc33f630004 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Font.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Font.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontCache.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontCache.cpp
index e617bc9fd34..e617bc9fd34 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontCache.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontCache.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontCache.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontCache.h
index c6c868edf49..c6c868edf49 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontCache.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontCache.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEncoding.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontEncoding.cpp
index dfa5b6c750e..dfa5b6c750e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEncoding.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontEncoding.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEncoding.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontEncoding.h
index 4c366182632..4c366182632 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEncoding.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontEncoding.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEngine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontEngine.cpp
index 5bfeba236d2..5bfeba236d2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEngine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontEngine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEngine.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontEngine.h
index 353613a40ef..353613a40ef 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEngine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontEngine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontManager.cpp
index 7db9bad13bb..7db9bad13bb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontManager.h
index 24402f5ae5e..24402f5ae5e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontMap.cpp
index a094093b2f1..a094093b2f1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontMap.h
index 8bd2f712340..8bd2f712340 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMetrics.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontMetrics.cpp
index 3920e4e6e76..3920e4e6e76 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMetrics.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontMetrics.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMetrics.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontMetrics.h
index 50207211d2c..50207211d2c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMetrics.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontMetrics.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontStyle.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontStyle.h
index 932c09291cc..932c09291cc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontStyle.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/FontStyle.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFGlyphTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/GFGlyphTracer.cpp
index 4eff0912d42..4eff0912d42 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFGlyphTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/GFGlyphTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFGlyphTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/GFGlyphTracer.h
index 84063a994b5..84063a994b5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFGlyphTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/GFGlyphTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/GFReader.cpp
index 0c0238b5766..0c0238b5766 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/GFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/GFReader.h
index 62c36a0498b..62c36a0498b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/GFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/GFTracer.cpp
index 89ff4359fda..89ff4359fda 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/GFTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/GFTracer.h
index 7171ac1e3aa..7171ac1e3aa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/GFTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Ghostscript.cpp
index cc94a331d28..5a872960774 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Ghostscript.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Ghostscript.cpp
@@ -28,28 +28,58 @@
    #include <ghostscript/ierrors.h>
 #else
    #include "ierrors.h"
+	#include "FileFinder.h"
 #endif
 
 using namespace std;
 
-// default name of dynamic/shared Ghostscript library
+// name of Ghostscript shared library set by the user
+string Ghostscript::LIBGS_NAME;
+
+
+#ifndef HAVE_LIBGS
+/** Try to detect name of the Ghostscript shared library depending on the user settings.
+ *  @param[in] fname path/filename given by the user
+ *  @return name of Ghostscript shared library */
+static string get_libgs (const string &fname) {
+	if (!fname.empty())
+		return fname;
+#ifdef MIKTEX
 #if defined(__WIN64__)
-	#define GS_DL_NAME "gsdll64.dll"
+	const char *gsdll = "mgsdll64.dll";
 #elif defined(__WIN32__)
-	#define GS_DL_NAME "gsdll32.dll"
+	const char *gsdll = "mgsdll32.dll";
+#endif
+	// try to look up the Ghostscript DLL coming with MiKTeX
+	if (const char *gsdll_path = FileFinder::lookup(gsdll))
+		return gsdll_path;
+#endif // MIKTEX
+#if defined(__WIN64__)
+	return "gsdll64.dll";
+#elif defined(__WIN32__)
+	return "gsdll32.dll";
 #else
-	#define GS_DL_NAME "libgs.so"
+	// try to find libgs.so.X on the user's system
+	const int abi_min=7, abi_max=9; // supported libgs ABI versions
+	for (int i=abi_max; i >= abi_min; i--) {
+		ostringstream oss;
+		oss << "libgs.so." << i;
+		DLLoader loader(oss.str().c_str());
+		if (loader.loaded())
+			return oss.str();
+	}
 #endif
-
-
-string Ghostscript::LIBGS_NAME;
+	// no appropriate library found
+	return "";
+}
+#endif // HAVE_LIBGS
 
 
 /** Loads the Ghostscript library but does not create an instance. This
  *  constructor should only be used to call available() and revision(). */
 Ghostscript::Ghostscript ()
 #if !defined(HAVE_LIBGS)
-	: DLLoader(LIBGS_NAME.empty() ? GS_DL_NAME : LIBGS_NAME.c_str())
+	: DLLoader(get_libgs(LIBGS_NAME).c_str())
 #endif
 {
 	_inst = 0;
@@ -62,7 +92,7 @@ Ghostscript::Ghostscript ()
  * @param[in] caller this parameter is passed to all callback functions */
 Ghostscript::Ghostscript (int argc, const char **argv, void *caller)
 #if !defined(HAVE_LIBGS)
-	: DLLoader(LIBGS_NAME.empty() ? GS_DL_NAME : LIBGS_NAME.c_str())
+	: DLLoader(get_libgs(LIBGS_NAME).c_str())
 #endif
 {
 	_inst = 0;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Ghostscript.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Ghostscript.h
index d223ad04edf..d223ad04edf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Ghostscript.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Ghostscript.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Glyph.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Glyph.h
index 5a003a2196b..5a003a2196b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Glyph.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Glyph.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GlyphTracerMessages.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/GlyphTracerMessages.h
index 6256bb843a0..6256bb843a0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GlyphTracerMessages.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/GlyphTracerMessages.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GraphicPath.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/GraphicPath.h
index e1bd457d554..e1bd457d554 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GraphicPath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/GraphicPath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/HtmlSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/HtmlSpecialHandler.cpp
index f8681aceb8f..29ae75b5821 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/HtmlSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/HtmlSpecialHandler.cpp
@@ -29,8 +29,10 @@
 using namespace std;
 
 // variable to select the link marker variant (none, underlined, boxed, or colored background)
-HtmlSpecialHandler::LinkMarker HtmlSpecialHandler::LINK_MARKER = HtmlSpecialHandler::LM_LINE;
+HtmlSpecialHandler::MarkerType HtmlSpecialHandler::MARKER_TYPE = HtmlSpecialHandler::MT_LINE;
 Color HtmlSpecialHandler::LINK_BGCOLOR;
+Color HtmlSpecialHandler::LINK_LINECOLOR;
+bool HtmlSpecialHandler::USE_LINECOLOR = false;
 
 
 bool HtmlSpecialHandler::process (const char *prefix, istream &is, SpecialActions *actions) {
@@ -82,7 +84,7 @@ void HtmlSpecialHandler::hrefAnchor (string uri) {
 	anchor->addAttribute("xlink:title", uri);
 	_actions->pushContextElement(anchor);
 	_actions->bbox("{anchor}", true);  // start computing the bounding box of the linked area
-	_anchorYPos = _actions->getY();
+	_depthThreshold = _actions->getDVIStackDepth();
 	_anchorType = AT_HREF;
 }
 
@@ -112,6 +114,7 @@ void HtmlSpecialHandler::closeAnchor () {
 	if (_anchorType == AT_HREF) {
 		markLinkedBox();
 		_actions->popContextElement();
+		_depthThreshold = 0;
 	}
 	else if (_anchorType == AT_NAME)
 		_anchorName.clear();
@@ -126,25 +129,31 @@ void HtmlSpecialHandler::closeAnchor () {
 void HtmlSpecialHandler::markLinkedBox () {
 	const BoundingBox &bbox = _actions->bbox("{anchor}");
 	if (bbox.width() > 0 && bbox.height() > 0) {  // does the bounding box extend in both dimensions?
-		if (LINK_MARKER != LM_NONE) {
+		if (MARKER_TYPE != MT_NONE) {
 			const double linewidth = min(0.5, bbox.height()/15);
 			XMLElementNode *rect = new XMLElementNode("rect");
 			double x = bbox.minX();
 			double y = bbox.maxY()+linewidth;
 			double w = bbox.width();
 			double h = linewidth;
-			if (LINK_MARKER == LM_LINE)
-				rect->addAttribute("fill", _actions->getColor().rgbString());
+			const Color &linecolor = USE_LINECOLOR ? LINK_LINECOLOR : _actions->getColor();
+			if (MARKER_TYPE == MT_LINE)
+				rect->addAttribute("fill", linecolor.rgbString());
 			else {
 				x -= linewidth;
 				y = bbox.minY()-linewidth;
 				w += 2*linewidth;
 				h += bbox.height()+linewidth;
-				if (LINK_MARKER == LM_BGCOLOR)
+				if (MARKER_TYPE == MT_BGCOLOR) {
 					rect->addAttribute("fill", LINK_BGCOLOR.rgbString());
+					if (USE_LINECOLOR) {
+						rect->addAttribute("stroke", linecolor.rgbString());
+						rect->addAttribute("stroke-width", linewidth);
+					}
+				}
 				else {  // LM_BOX
 					rect->addAttribute("fill", "none");
-					rect->addAttribute("stroke", _actions->getColor().rgbString());
+					rect->addAttribute("stroke", linecolor.rgbString());
 					rect->addAttribute("stroke-width", linewidth);
 				}
 			}
@@ -153,7 +162,8 @@ void HtmlSpecialHandler::markLinkedBox () {
 			rect->addAttribute("width", w);
 			rect->addAttribute("height", h);
 			_actions->prependToPage(rect);
-			if (LINK_MARKER == LM_BOX) {
+			if (MARKER_TYPE == MT_BOX || MARKER_TYPE == MT_BGCOLOR) {
+				// slightly enlarge the boxed area
 				x -= linewidth;
 				y -= linewidth;
 				w += 2*linewidth;
@@ -180,9 +190,11 @@ void HtmlSpecialHandler::markLinkedBox () {
 /** This method is called every time the DVI position changes. */
 void HtmlSpecialHandler::dviMovedTo (double x, double y) {
 	if (_actions && _anchorType != AT_NONE) {
-		if (y != _anchorYPos) {  // does vertical position changed inside a linked area?
+		// Start a new box if the current depth of the DVI stack underruns
+		// the initial threshold which indicates a line break.
+		if (_actions->getDVIStackDepth() < _depthThreshold) {
 			markLinkedBox();
-			_anchorYPos = y;
+			_depthThreshold = _actions->getDVIStackDepth();
 			_actions->bbox("{anchor}", true);  // start a new box on the new line
 		}
 	}
@@ -211,17 +223,35 @@ void HtmlSpecialHandler::dviEndPage (unsigned pageno) {
 }
 
 
-bool HtmlSpecialHandler::setLinkMarker (const string &type) {
+/** Sets the appearance of the link markers.
+ *  @param[in] marker string specifying the marker (format: type[:linecolor])
+ *  @return true on success */
+bool HtmlSpecialHandler::setLinkMarker (const string &marker) {
+	string type;  // "none", "box", "line", or a background color specifier
+	string color; // optional line color specifier
+	size_t seppos = marker.find(":");
+	if (seppos == string::npos)
+		type = marker;
+	else {
+		type = marker.substr(0, seppos);
+		color = marker.substr(seppos+1);
+	}
 	if (type.empty() || type == "none")
-		LINK_MARKER = LM_NONE;
+		MARKER_TYPE = MT_NONE;
 	else if (type == "line")
-		LINK_MARKER = LM_LINE;
+		MARKER_TYPE = MT_LINE;
 	else if (type == "box")
-		LINK_MARKER = LM_BOX;
+		MARKER_TYPE = MT_BOX;
 	else {
 		if (!LINK_BGCOLOR.set(type, false))
 			return false;
-		LINK_MARKER = LM_BGCOLOR;
+		MARKER_TYPE = MT_BGCOLOR;
+	}
+	USE_LINECOLOR = false;
+	if (MARKER_TYPE != MT_NONE && !color.empty()) {
+		if (!LINK_LINECOLOR.set(color, false))
+			return false;
+		USE_LINECOLOR = true;
 	}
 	return true;
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/HtmlSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/HtmlSpecialHandler.h
index df420145d37..e94b3800e1d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/HtmlSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/HtmlSpecialHandler.h
@@ -41,7 +41,7 @@ class HtmlSpecialHandler : public SpecialHandler, public DVIEndPageListener, pub
 	typedef std::map<std::string, NamedAnchor> NamedAnchors;
 
    public:
-		HtmlSpecialHandler () : _actions(0), _anchorType(AT_NONE), _anchorYPos(0) {}
+		HtmlSpecialHandler () : _actions(0), _anchorType(AT_NONE), _depthThreshold(0) {}
 		bool process (const char *prefix, std::istream &in, SpecialActions *actions);
 		const char* name () const  {return "html";}
 		const char* info () const  {return "hyperref specials";}
@@ -49,10 +49,6 @@ class HtmlSpecialHandler : public SpecialHandler, public DVIEndPageListener, pub
 
 		static bool setLinkMarker (const std::string &type);
 
-		enum LinkMarker {LM_NONE, LM_LINE, LM_BOX, LM_BGCOLOR};
-		static LinkMarker LINK_MARKER;  ///< selects how linked areas are marked
-		static Color LINK_BGCOLOR;      ///< background color if anchor linkmark type == LT_BGCOLOR
-
 	protected:
 		void hrefAnchor (std::string uri);
 		void nameAnchor (const std::string &name);
@@ -61,10 +57,16 @@ class HtmlSpecialHandler : public SpecialHandler, public DVIEndPageListener, pub
 		void closeAnchor ();
 		void markLinkedBox ();
 
+		enum MarkerType {MT_NONE, MT_LINE, MT_BOX, MT_BGCOLOR};
+		static MarkerType MARKER_TYPE;  ///< selects how linked areas are marked
+		static Color LINK_BGCOLOR;      ///< background color if linkmark type == LT_BGCOLOR
+		static Color LINK_LINECOLOR;    ///< line color if linkmark type is LM_LINE or LM_BOX
+		static bool USE_LINECOLOR;      ///< if true, LINK_LINECOLOR is applied
+
 	private:
 		SpecialActions *_actions;
 		AnchorType _anchorType;     ///< type of active anchor
-		double _anchorYPos;         ///< current vertical position inside linked area
+		int _depthThreshold;        ///< break anchor box if the DVI stack depth underruns this threshold
 		std::string _anchorName;    ///< name of currently active named anchor
 		std::string _base;          ///< base URL that is prepended to all relative targets
 		NamedAnchors _namedAnchors; ///< information about all named anchors processed
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputBuffer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/InputBuffer.cpp
index 79e0dcf39c7..79e0dcf39c7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputBuffer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/InputBuffer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputBuffer.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/InputBuffer.h
index c29a943a7e7..c29a943a7e7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputBuffer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/InputBuffer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/InputReader.cpp
index b2f01f5ea1e..b2f01f5ea1e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/InputReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/InputReader.h
index c0d726424f6..c0d726424f6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/InputReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/JFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/JFM.cpp
index 89c4796616c..89c4796616c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/JFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/JFM.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/JFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/JFM.h
index 86585477f74..86585477f74 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/JFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/JFM.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Length.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Length.cpp
index 63d1509d3fd..63d1509d3fd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Length.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Length.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Length.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Length.h
index f2e4f5d4114..f2e4f5d4114 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Length.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Length.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Makefile.am
index b504093a3bf..b504093a3bf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MapLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/MapLine.cpp
index b225b0ba4fd..b225b0ba4fd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MapLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/MapLine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MapLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/MapLine.h
index 16ee9687ae3..16ee9687ae3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MapLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/MapLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Matrix.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Matrix.cpp
index 9eb956f0529..9eb956f0529 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Matrix.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Matrix.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Matrix.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Matrix.h
index 1da461d99a0..1da461d99a0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Matrix.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Matrix.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Message.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Message.cpp
index c875109633f..c875109633f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Message.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Message.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Message.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Message.h
index 7c39127dbd4..7c39127dbd4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Message.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Message.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MessageException.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/MessageException.h
index 48ae4b5bb4c..48ae4b5bb4c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MessageException.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/MessageException.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MetafontWrapper.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/MetafontWrapper.cpp
index d7922b1825b..d7922b1825b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MetafontWrapper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/MetafontWrapper.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MetafontWrapper.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/MetafontWrapper.h
index 3b2485122d0..3b2485122d0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MetafontWrapper.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/MetafontWrapper.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MiKTeXCom.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/MiKTeXCom.cpp
index bb4353f8ee4..bb4353f8ee4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MiKTeXCom.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/MiKTeXCom.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MiKTeXCom.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/MiKTeXCom.h
index dcb6271a4bc..dcb6271a4bc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MiKTeXCom.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/MiKTeXCom.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/NoPsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/NoPsSpecialHandler.cpp
index 0a5119f6938..0a5119f6938 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/NoPsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/NoPsSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/NoPsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/NoPsSpecialHandler.h
index 7a017fecb06..7a017fecb06 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/NoPsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/NoPsSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSFilter.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PSFilter.h
index e2c5c092dd3..e2c5c092dd3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSFilter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PSFilter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSInterpreter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PSInterpreter.cpp
index 9ca5ed39c27..9ca5ed39c27 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSInterpreter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PSInterpreter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSInterpreter.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PSInterpreter.h
index c1f30598e16..c1f30598e16 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSInterpreter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PSInterpreter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPattern.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PSPattern.cpp
index 107dac4f795..107dac4f795 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPattern.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PSPattern.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPattern.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PSPattern.h
index db11b59f0e0..db11b59f0e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPattern.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PSPattern.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPreviewFilter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PSPreviewFilter.cpp
index c9b3b080118..c9b3b080118 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPreviewFilter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PSPreviewFilter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPreviewFilter.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PSPreviewFilter.h
index bbed9640aab..bbed9640aab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPreviewFilter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PSPreviewFilter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageRanges.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PageRanges.cpp
index 71650753d67..71650753d67 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageRanges.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PageRanges.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageRanges.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PageRanges.h
index 57b47b91e44..57b47b91e44 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageRanges.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PageRanges.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageSize.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PageSize.cpp
index 2cc3f36512d..2cc3f36512d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageSize.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PageSize.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageSize.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PageSize.h
index 77cbdbcc44d..77cbdbcc44d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageSize.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PageSize.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Pair.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Pair.h
index 4c2d465e7c0..4c2d465e7c0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Pair.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Pair.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PdfSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PdfSpecialHandler.cpp
index 998b8016eae..998b8016eae 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PdfSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PdfSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PdfSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PdfSpecialHandler.h
index a5391fbf141..a5391fbf141 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PdfSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PdfSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Process.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Process.cpp
index 41c3bec0daa..41c3bec0daa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Process.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Process.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Process.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Process.h
index df2e0545049..df2e0545049 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Process.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Process.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PsSpecialHandler.cpp
index f0742a36194..f0742a36194 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PsSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PsSpecialHandler.h
index 8fc3d6b5ae3..8fc3d6b5ae3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/PsSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SVGOutputBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/SVGOutputBase.h
index cad892ea068..cad892ea068 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SVGOutputBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/SVGOutputBase.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SVGTree.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/SVGTree.cpp
index b68e5f8c2cc..a1f375a5f9a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SVGTree.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/SVGTree.cpp
@@ -38,6 +38,7 @@ using namespace std;
 bool SVGTree::CREATE_STYLE=true;
 bool SVGTree::USE_FONTS=true;
 bool SVGTree::CREATE_USE_ELEMENTS=false;
+double SVGTree::ZOOM_FACTOR=1.0;
 
 
 SVGTree::SVGTree () : _vertical(false), _font(0), _color(Color::BLACK), _matrix(1) {
@@ -62,8 +63,10 @@ void SVGTree::reset () {
 /** Sets the bounding box of the document.
  *  @param[in] bbox bounding box in PS point units */
 void SVGTree::setBBox (const BoundingBox &bbox) {
-	_root->addAttribute("width", XMLString(bbox.width())+"pt");
-	_root->addAttribute("height", XMLString(bbox.height())+"pt");
+	if (ZOOM_FACTOR >= 0) {
+		_root->addAttribute("width", XMLString(bbox.width()*ZOOM_FACTOR)+"pt");
+		_root->addAttribute("height", XMLString(bbox.height()*ZOOM_FACTOR)+"pt");
+	}
 	_root->addAttribute("viewBox", bbox.toSVGViewBox());
 }
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SVGTree.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/SVGTree.h
index 1ac375d7fbb..541d299971c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SVGTree.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/SVGTree.h
@@ -91,6 +91,7 @@ class SVGTree
       static bool USE_FONTS;    ///< if true, create font references and don't draw paths directly
       static bool CREATE_STYLE; ///< should style elements and class attributes be used to reference fonts?
       static bool CREATE_USE_ELEMENTS; ///< allow generation of <use/> elements?
+		static double ZOOM_FACTOR; ///< factor applied to width/height attribute
 
 	protected:
 		void newTextNode (double x, double y);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SignalHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/SignalHandler.cpp
index 6e91a05442d..6e91a05442d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SignalHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/SignalHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SignalHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/SignalHandler.h
index dfece9963e4..dfece9963e4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SignalHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/SignalHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/SpecialActions.h
index d28a24a766e..e7b4503d148 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/SpecialActions.h
@@ -54,6 +54,7 @@ struct SpecialActions
 	virtual void embed (const BoundingBox &bbox) =0;
 	virtual void embed (const DPair &p, double r=0) =0;
 	virtual void progress (const char *id) {}
+	virtual int getDVIStackDepth () const {return 0;}
 };
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/SpecialHandler.h
index b11bab4782c..b11bab4782c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/SpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/SpecialManager.cpp
index 86aca42cd02..86aca42cd02 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/SpecialManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/SpecialManager.h
index a0cdd26ac91..a0cdd26ac91 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/SpecialManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/StreamReader.cpp
index 1464b9fdcf6..1464b9fdcf6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/StreamReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/StreamReader.h
index a35bae2d91f..a35bae2d91f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/StreamReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamWriter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/StreamWriter.cpp
index 203a1788f87..203a1788f87 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamWriter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/StreamWriter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamWriter.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/StreamWriter.h
index 05999c48fb5..05999c48fb5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamWriter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/StreamWriter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Subfont.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Subfont.cpp
index 1ac23a66139..1ac23a66139 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Subfont.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Subfont.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Subfont.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Subfont.h
index 03ce75c3e99..03ce75c3e99 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Subfont.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Subfont.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/System.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/System.cpp
index 6769f843cae..6769f843cae 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/System.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/System.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/System.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/System.h
index 9485f029d96..7200c93f291 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/System.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/System.h
@@ -24,6 +24,6 @@
 namespace System
 {
 	double time ();
-};
+}
 
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/TFM.cpp
index db36b7f50b6..db36b7f50b6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/TFM.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/TFM.h
index 1f75d76cb50..1f75d76cb50 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/TFM.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Terminal.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Terminal.cpp
index e95111d196b..e95111d196b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Terminal.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Terminal.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Terminal.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Terminal.h
index 08ac7e6300a..08ac7e6300a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Terminal.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/Terminal.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TpicSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/TpicSpecialHandler.cpp
index b9412f3a74d..b9412f3a74d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TpicSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/TpicSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TpicSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/TpicSpecialHandler.h
index 9afdf9a31fc..9afdf9a31fc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TpicSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/TpicSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VFActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/VFActions.h
index a8e86831fe9..a8e86831fe9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VFActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/VFActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/VFReader.cpp
index eb9ed4d22ee..eb9ed4d22ee 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/VFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/VFReader.h
index f6d9474ccbe..f6d9474ccbe 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/VFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VectorStream.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/VectorStream.h
index 345b319c7b3..345b319c7b3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VectorStream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/VectorStream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLDocument.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/XMLDocument.cpp
index caee2ec7439..caee2ec7439 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLDocument.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/XMLDocument.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLDocument.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/XMLDocument.h
index c3d6b928ee7..c3d6b928ee7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLDocument.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/XMLDocument.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLNode.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/XMLNode.cpp
index 82b85b52ffd..82b85b52ffd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLNode.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/XMLNode.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/XMLNode.h
index cd878701db9..cd878701db9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/XMLNode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLString.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/XMLString.cpp
index ea4487f45bc..ea4487f45bc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLString.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/XMLString.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLString.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/XMLString.h
index ae27053a856..ae27053a856 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLString.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/XMLString.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/dvisvgm.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/dvisvgm.cpp
index c3e4cccbae6..aafd843ecd1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/dvisvgm.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/dvisvgm.cpp
@@ -106,7 +106,7 @@ class SVGOutput : public SVGOutputBase
 
 
 		/** Returns the name of the SVG file containing the given page.
-		 *  @param[in] page number of current page 
+		 *  @param[in] page number of current page
 		 *  @param[in] numPages total number of pages */
 		string filename (int page, int numPages) const {
 			if (_stdout)
@@ -193,18 +193,6 @@ static void set_libgs (CommandLine &args) {
 		Ghostscript::LIBGS_NAME = args.libgs_arg();
 	else if (getenv("LIBGS"))
 		Ghostscript::LIBGS_NAME = getenv("LIBGS");
-#ifdef MIKTEX
-	else {
-#ifdef __WIN64__
-		const char *gsdll = "mgsdll64.dll";
-#else
-		const char *gsdll = "mgsdll32.dll";
-#endif
-		// try to lookup the Ghostscript DLL coming with MiKTeX
-		if (const char *gsdll_path = FileFinder::lookup(gsdll))
-			Ghostscript::LIBGS_NAME = gsdll_path;
-	}
-#endif
 #endif
 }
 
@@ -380,6 +368,7 @@ int main (int argc, char *argv[]) {
 	SVGTree::CREATE_STYLE = !args.no_styles_given();
 	SVGTree::USE_FONTS = !args.no_fonts_given();
 	SVGTree::CREATE_USE_ELEMENTS = args.no_fonts_arg() < 1;
+	SVGTree::ZOOM_FACTOR = args.zoom_arg();
 	DVIToSVG::TRACE_MODE = args.trace_all_given() ? (args.trace_all_arg() ? 'a' : 'm') : 0;
 	Message::LEVEL = args.verbosity_arg();
 	PhysicalFont::EXACT_BBOX = args.exact_given();
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/gzstream.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/gzstream.cpp
index 2893c299891..2893c299891 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/gzstream.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/gzstream.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/gzstream.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/gzstream.h
index 60f38c4fac7..60f38c4fac7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/gzstream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/gzstream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/iapi.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/iapi.h
index 8e29d938d03..8e29d938d03 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/iapi.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/iapi.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/ierrors.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/ierrors.h
index 3184341177e..3184341177e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/ierrors.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/ierrors.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/macros.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/macros.h
index 73217c763e0..73217c763e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/macros.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/macros.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/options.xml b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/options.xml
index bf1e0106999..33ce8bd44f9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/options.xml
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/options.xml
@@ -47,7 +47,7 @@
 				<description>set size of bounding box</description>
 			</option>
 			<option long="linkmark" short="L">
-				<arg type="string" name="type" default="line"/>
+				<arg type="string" name="type" default="box"/>
 				<description>select how to mark hyperlinked areas</description>
 			</option>
 			<option long="output" short="o">
@@ -90,6 +90,10 @@
 				<arg type="string" name="commands"/>
 				<description>transform page content</description>
 			</option>
+			<option long="zoom" short="Z">
+				<arg type="double" name="factor" default="1.0"/>
+				<description>zoom page content</description>
+			</option>
 		</section>
 		<section title="Processing options">
 			<option long="cache" short="C">
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/psdefs.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/psdefs.cpp
index 4edce3af1d8..4edce3af1d8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/psdefs.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/psdefs.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/types.h b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/types.h
index 306a0ab4e26..306a0ab4e26 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/types.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.6/src/types.h
diff --git a/Build/source/texk/dvisvgm/version.ac b/Build/source/texk/dvisvgm/version.ac
index 8a89039b26a..b5d62c1a71b 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.3])
+m4_define([dvisvgm_version], [1.6])
author	Peter Breitenlohner <peb@mppmu.mpg.de>	2014-04-29 06:58:25 +0000
committer	Peter Breitenlohner <peb@mppmu.mpg.de>	2014-04-29 06:58:25 +0000
commit	ade99b6e1e4e5cc22d6522782f387e678a3a7ff5 (patch)
tree	ff58b4a14c25651928933cf51a24683ff419b003 /Build
parent	44c0325c41761729f2df6665f110dec0b942ab2a (diff)