dvisvgm 1.0.7

git-svn-id: svn://tug.org/texlive/trunk@22532 c570f23f-e606-0410-a88d-b1316a301751

204 files changed, 484 insertions, 333 deletions

diff --git a/Build/source/texk/README b/Build/source/texk/README
index 3b0229aaae5..bef8ac3ec94 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -58,7 +58,7 @@ dvipos - ?
 
 dvipsk - maintained here by Tom Rokicki, Karl Berry, Akira Kakuto, ...
 
-dvisvgm 1.0.6 - checked 25apr11
+dvisvgm 1.0.7 - checked 19may11
   http://sourceforge.net/projects/dvisvgm/files/dvisvgm/
 
 gsftopk - from Paul Vojta's xdvi?
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index 0af74b21b3e..795046956c0 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac, version.ac (new): Imported release 1.0.7.
+
 2011-05-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* dvisvgm-1.0.6-PATCHES/TL-Changes: Recreated this, documenting
@@ -7,7 +11,7 @@
 
 	* Imported release 1.0.6.
 	* configure.ac: Adapted.
-	* dvisvgm-1.0.5-PATCHES: removed dir, all patches applies.
+	* dvisvgm-1.0.5-PATCHES: removed dir, all patches applied.
 
 2011-03-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in
index 3d40ae6643c..c6e982a8750 100644
--- a/Build/source/texk/dvisvgm/Makefile.in
+++ b/Build/source/texk/dvisvgm/Makefile.in
@@ -65,7 +65,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
 	$(top_srcdir)/../../m4/ltsugar.m4 \
 	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 \
+	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
 	$(top_srcdir)/ac/dvisvgm.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 58d8bc76d82..049137e0067 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.68 for dvisvgm 1.0.6.
+# Generated by GNU Autoconf 2.68 for dvisvgm 1.0.7.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -570,12 +570,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvisvgm'
 PACKAGE_TARNAME='dvisvgm'
-PACKAGE_VERSION='1.0.6'
-PACKAGE_STRING='dvisvgm 1.0.6'
+PACKAGE_VERSION='1.0.7'
+PACKAGE_STRING='dvisvgm 1.0.7'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="dvisvgm-1.0.6/src/dvisvgm.cpp"
+ac_unique_file="dvisvgm-1.0.7/src/dvisvgm.cpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1336,7 +1336,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dvisvgm 1.0.6 to adapt to many kinds of systems.
+\`configure' configures dvisvgm 1.0.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1406,7 +1406,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvisvgm 1.0.6:";;
+     short | recursive ) echo "Configuration of dvisvgm 1.0.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1533,7 +1533,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvisvgm configure 1.0.6
+dvisvgm configure 1.0.7
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2225,7 +2225,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dvisvgm $as_me 1.0.6, which was
+It was created by dvisvgm $as_me 1.0.7, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -7579,7 +7579,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvisvgm'
- VERSION='1.0.6'
+ VERSION='1.0.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17213,7 +17213,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dvisvgm config.lt 1.0.6
+dvisvgm config.lt 1.0.7
 configured by $0, generated by GNU Autoconf 2.68.
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -18916,7 +18916,7 @@ CPPFLAGS=$kpse_save_CPPFLAGS
 LIBS=$kpse_save_LIBS
 
 
-DVISVGM_TREE=dvisvgm-1.0.6
+DVISVGM_TREE=dvisvgm-1.0.7
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -19468,7 +19468,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dvisvgm $as_me 1.0.6, which was
+This file was extended by dvisvgm $as_me 1.0.7, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19534,7 +19534,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dvisvgm config.status 1.0.6
+dvisvgm config.status 1.0.7
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvisvgm/configure.ac b/Build/source/texk/dvisvgm/configure.ac
index de8465321eb..41059376021 100644
--- a/Build/source/texk/dvisvgm/configure.ac
+++ b/Build/source/texk/dvisvgm/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -13,7 +13,7 @@ dnl  Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de>
 dnl
 dnl *********************************************************************
 dnl
-m4_define([dvisvgm_version], [1.0.6])[]dnl using unmodified dvisvgm source tree
+m4_include([version.ac])[] dnl define dvisvgm_version
 AC_INIT([dvisvgm], dvisvgm_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([dvisvgm-]dvisvgm_version[/src/dvisvgm.cpp])
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.0.6-PATCHES/TL-Changes
deleted file mode 100644
index a81eedb0a7e..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6-PATCHES/TL-Changes
+++ /dev/null
@@ -1,11 +0,0 @@
-Changes applied to the dvisvgm-1.0.6 tree as obtained from:
-	http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.0.6.tar.gz
-
-Removed:
-	config.guess
-	config.rpath
-	config.sub
-	depcomp
-	install-sh
-	missing
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/psdefs.psc b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/psdefs.psc
deleted file mode 100644
index 3a5c9a1f65c..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/psdefs.psc
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************************************
-** psdefs.psc                                                           **
-**                                                                      **
-** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2011 Martin Gieseking <martin.gieseking@uos.de>   **
-**                                                                      **
-** This program is free software; you can redistribute it and/or        ** 
-** modify it under the terms of the GNU General Public License as       **
-** published by the Free Software Foundation; either version 3 of       **
-** the License, or (at your option) any later version.                  **
-**                                                                      **
-** This program is distributed in the hope that it will be useful, but  **
-** WITHOUT ANY WARRANTY; without even the implied warranty of           **
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the         **
-** GNU General Public License for more details.                         **
-**                                                                      **
-** You should have received a copy of the GNU General Public License    **
-** along with this program; if not, see <http://www.gnu.org/licenses/>. ** 
-*************************************************************************/
-
-const char *PSInterpreter::PSDEFS =
-"3 dict dup begin/Install{matrix setmatrix}def/HWResolution[72.27 72.27]def/PageS"
-"ize[10000 10000]def end setpagedevice/@dodraw true store/@SD systemdict def true"
-" setglobal @SD/:gsave @SD/gsave get put @SD/:grestore @SD/grestore get put @SD/:"
-"stroke @SD/stroke get put @SD/:fill @SD/fill get put @SD/:eofill @SD/eofill get "
-"put @SD/:clip @SD/clip get put @SD/:eoclip @SD/eoclip get put @SD/:charpath @SD/"
-"charpath get put @SD/.setopacityalpha known not{@SD/.setopacityalpha{pop}put}if "
-"@SD/prval{dup type/stringtype eq{print}{30 string cvs print}ifelse}put @SD/prseq"
-"{-1 1{-1 roll prval( )print}for(\\n)print}put @SD/prcmd{( )exch(\\ndvi.)3{print}"
-"repeat prseq}put @SD/cvxall{{cvx}forall}put @SD/defpr{[exch[/copy @SD]cvxall 5 -"
-"1 roll dup 6 1 roll[/get/exec]cvxall 6 -1 roll dup 7 1 roll 4 -1 roll dup 5 1 ro"
-"ll dup length string cvs/prcmd cvx]cvx def}put @SD/setpos{currentpoint dup type "
-"cvlit/booleantype eq{pop}{2(setpos)prcmd}ifelse}put @SD/applyscalevals{1 0 trans"
-"form 0 0 transform 3 -1 roll sub dup mul 3 1 roll sub dup mul add sqrt 0 1 trans"
-"form 0 0 transform 3 -1 roll sub dup mul 3 1 roll sub dup mul add sqrt 1 0 trans"
-"form dup mul exch dup dup mul 3 -1 roll add sqrt div 3(applyscalevals)prcmd}def "
-"@SD/prpath{{2(moveto)prcmd}{2(lineto)prcmd}{6(curveto)prcmd}{0(closepath)prcmd}p"
-"athforall}put @SD/charpath{/@dodraw false store :charpath/@dodraw true store}put"
-" @SD/show{@dodraw{true charpath eofill}if}put @SD/stroke{@dodraw{0(newpath)prcmd"
-" prpath 0(stroke)prcmd newpath}{:stroke}ifelse}put @SD/fill{@dodraw{0(newpath)pr"
-"cmd prpath 0(fill)prcmd newpath}{:fill}ifelse}put @SD/eofill{@dodraw{0(newpath)p"
-"rcmd prpath 0(eofill)prcmd newpath}{:eofill}ifelse}put @SD/clip{:clip 0(newpath)"
-"prcmd prpath 0(clip)prcmd}put @SD/eoclip{:eoclip 0(newpath)prcmd prpath 0(eoclip"
-")prcmd}put false setglobal @SD readonly pop/initclip 0 defpr/sysexec{@SD exch ge"
-"t exec}def/adddot{dup length 1 add string dup 0 46 put dup 3 -1 roll 1 exch puti"
-"nterval}def/setlinewidth{dup/setlinewidth sysexec applyscalevals 1(setlinewidth)"
-"prcmd}def/setlinecap 1 defpr/setlinejoin 1 defpr/setmiterlimit 1 defpr/setdash{m"
-"ark 3 1 roll 2 copy/setdash sysexec applyscalevals exch aload length 1 add -1 ro"
-"ll counttomark(setdash)prcmd pop}def/gsave 0 defpr/grestore{:grestore currentlin"
-"ewidth 1(setlinewidth)prcmd currentlinecap 1(setlinecap)prcmd currentlinejoin 1("
-"setlinejoin)prcmd currentmiterlimit 1(setmiterlimit)prcmd currentrgbcolor 3(setr"
-"gbcolor)prcmd 6 array currentmatrix aload pop 6(setmatrix)prcmd currentdash mark"
-" 3 1 roll exch aload length 1 add -1 roll counttomark(setdash)prcmd pop 0(gresto"
-"re)prcmd}def/rotate{dup type/arraytype ne{dup 1(rotate)prcmd}if/rotate sysexec}d"
-"ef/scale{dup type/arraytype ne{2 copy 2(scale)prcmd}if/scale sysexec}def/transla"
-"te{dup type/arraytype ne{2 copy 2(translate)prcmd}if/translate sysexec}def/setma"
-"trix{dup/setmatrix sysexec aload pop 6(setmatrix)prcmd}def/initmatrix{matrix set"
-"matrix}def/concat{matrix currentmatrix matrix concatmatrix setmatrix}def/setgray"
-" 1 defpr/setcmykcolor 4 defpr/sethsbcolor 3 defpr/setrgbcolor 3 defpr/.setopacit"
-"yalpha{dup/.setopacityalpha sysexec 1(setopacityalpha)prcmd}def/.handleerror err"
-"ordict/handleerror get def errordict begin/handleerror{0(beginerror)prcmd .handl"
-"eerror 0(enderror)prcmd}.bind def end ";
-
-// vim: set syntax=cpp:
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.7-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.0.7-PATCHES/TL-Changes
new file mode 100644
index 00000000000..ec46a7e05d6
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7-PATCHES/TL-Changes
@@ -0,0 +1,11 @@
+Changes applied to the dvisvgm-1.0.7 tree as obtained from:
+	http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.0.7.tar.gz
+
+Removed:
+	config.guess
+	config.rpath
+	config.sub
+	depcomp
+	install-sh
+	missing
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.7-PATCHES/patch-01-NOMINMAX b/Build/source/texk/dvisvgm/dvisvgm-1.0.7-PATCHES/patch-01-NOMINMAX
new file mode 100644
index 00000000000..5a85cc8c46c
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7-PATCHES/patch-01-NOMINMAX
@@ -0,0 +1,11 @@
+diff -ur dvisvgm-1.0.7.orig/src/DLLoader.h dvisvgm-1.0.7/src/DLLoader.h
+--- dvisvgm-1.0.7.orig/src/DLLoader.h	2011-05-04 13:21:42.000000000 +0200
++++ dvisvgm-1.0.7/src/DLLoader.h	2011-05-18 21:00:14.000000000 +0200
+@@ -22,6 +22,7 @@
+ #define DLLOADER_H
+ 
+ #ifdef __WIN32__
++	#undef NOMINMAX
+ 	#define NOMINMAX
+ 	#include <windows.h>
+ #else
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/AUTHORS b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/AUTHORS
index 837e1e96bfb..837e1e96bfb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/AUTHORS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/AUTHORS
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/COPYING b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/COPYING
index 94a9ed024d3..94a9ed024d3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/COPYING
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/COPYING
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/INSTALL b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/INSTALL
index a4b34144dcf..a4b34144dcf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/INSTALL
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/INSTALL
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/LGPL-2.1.txt b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/LGPL-2.1.txt
index 602bfc94635..602bfc94635 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/LGPL-2.1.txt
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/LGPL-2.1.txt
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/Makefile.am
index d0557a0e78c..d0557a0e78c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/Makefile.in
index 80592ceaa38..80592ceaa38 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/NEWS b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/NEWS
index 66a11bbd6f4..fd581275da0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/NEWS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/NEWS
@@ -1,39 +1,46 @@
-dvisvgm-1.0.6
-- fixed segfault occured if a (malformed) DVI file calls set_char/put_char whithout preceding font definition
+dvisvgm-1.0.7 (2011-05-06)
+- improved overall handling of PS specials
+- fixed broken PS special subset 'ps::'
+- fixed scaling of PS line properties (width, dash distance, etc.)
+- fixed semantics of TPIC special 'ip' (doesn't draw polygon outlines any longer)
+
+dvisvgm-1.0.6 (2011-04-21)
+- fixed segfault occured if a (malformed) DVI file calls set_char/put_char 
+  whithout preceding font definition
 - added CTRL-C handler
 - MiKTeX support updated to version 2.9
 - some code refactorings
 
-dvisvgm-1.0.5
+dvisvgm-1.0.5 (2011-03-01)
 - added optional integer argument to option -n to disable generation of <use> elements
 - added missing unit to width/height attributes of svg root element (SF bug #3185773)
 - added integrity check to font cache files
 - updated bundled potrace library to version 1.9
 - fixed a couple of minor issues
 
-dvisvgm-1.0.4
+dvisvgm-1.0.4 (2010-12-18)
 - added missing line width/dash pattern scaling to PS handler
 - fixed scaling issue in PS positioning
 - fixed compilation issue related to FreeType 2.4.0
 
-dvisvgm-1.0.3
+dvisvgm-1.0.3 (2010-08-06)
 - applied some more portability patches for TeX Live
 - fixed a potential memory issue
 - fixed a transformation issue regarding special 'psfile' (SF bug #3037372)
 
-dvisvgm-1.0.2
+dvisvgm-1.0.2 (2010-06-22)
 - applied latest TeX Live portability patches sent by Peter Breitenlohner and Karl Berry
 - fixed a potrace name clash occurred on Mac OS X Tiger
 - fixed putchar() name clash occurred on Solaris
 - fixed a couple of conversion warnings
 - updated the test suite
 
-dvisvgm-1.0.1
+dvisvgm-1.0.1 (2010-06-11)
 - fixed a memory issue in the PS handler that could lead to a segfault (SF bug #3013392)
 - fixed a recursion issue in the PS handler
 - suppress ANSI color code when terminating
 
-dvisvgm-1.0
+dvisvgm-1.0 (2010-06-08)
 - conversion of multiple pages (must be enabled explicitly, see option --pages)
 - added transparency support to the PS handler
 - improved conversion results of the PS handler
@@ -42,12 +49,12 @@ dvisvgm-1.0
 - improved progress indicator (option --progress)
 - a couple of improvements of the build system
 
-dvisvgm-0.9.1
+dvisvgm-0.9.1 (2010-04-23)
 - CSS style definitions omit unnecessary fonts now
 - SVG validity was broken when using font elements
 - fixed two memory issues that could lead to segfaults
 
-dvisvgm-0.9
+dvisvgm-0.9 (2010-03-25)
 - added option --exact and corresponding algorithms to compute the exact 
   bounding boxes of characters
 - added option --keep that prevents deleting temporary font files
@@ -56,7 +63,7 @@ dvisvgm-0.9
 - fixed bug in evaluation of embedded PS headers
 - several code refactorings
 
-dvisvgm-0.8.8
+dvisvgm-0.8.8 (2010-02-02)
 - added option --libgs and evaluation of environment variable LIBGS
   to overwrite the expected file name of the GS shared library
   (only available if dvisvgm isn't linked against libgs and GS support
@@ -68,14 +75,14 @@ dvisvgm-0.8.8
   dvisvgm into TeX Live
 - some code refactorings
 
-dvisvgm-0.8.7
+dvisvgm-0.8.7 (2009-11-09)
 - fixed a bounding box issue concerning italic corrections
 - PS handler: zero-length paths are now drawn as dots
 - PS handler: fixed a path positioning issue
 - PS handler: colors set by color specials are now considered properly
 - added macro {?nl} to be used with special dvisvgm:raw
 
-dvisvgm-0.8.6
+dvisvgm-0.8.6 (2009-10-13)
 - renamed command-line option --bbox-format to --bbox
 - option --bbox can now be used to set an arbitrary bounding box
 - added the two special variants "dvisvgm:bbox abs" and "dvisvgm:bbox fix"
@@ -84,12 +91,12 @@ dvisvgm-0.8.6
 - fixed a couple of PS positioning issues reported by John Bowman
 - fixed a bit shift overflow in the font tracer occurred on 64-bit systems
 
-dvisvgm-0.8.5
+dvisvgm-0.8.5 (2009-10-01)
 - added an optional depth parameter to special dvisvgm:raw
 - updated the man page
 - added LGPL license text needed for the gzstream wrapper classes
 
-dvisvgm-0.8.4
+dvisvgm-0.8.4 (2009-09-17)
 - improved the command-line parser to be more POSIX-compliant
 - added a simple progress indicator for time-consuming special operations
 - option --cache prints more information about the cached fonts
@@ -98,7 +105,7 @@ dvisvgm-0.8.4
 - fixed a bug in computation of the PS bounding box
 - fixed a memory bug in the GF tracer module
 
-dvisvgm-0.8.3
+dvisvgm-0.8.3 (2009-08-28)
 - added basic evaluation of the PostScript "show" operator
   (handles PSTricks Type 3 fonts properly now)
 - improved checks for Ghostscript and potrace library in configure script
@@ -106,29 +113,29 @@ dvisvgm-0.8.3
 - PostScript header/prologue files are now loaded regardless of converted page
 - replaced command-line option variant --cache=? by --cache
 
-dvisvgm-0.8.2
+dvisvgm-0.8.2 (2009-08-24)
 - changed license of dvisvgm to GPL version 3 or later
 - replaced getopt-based command-line parser by own implementation
   in order to simplify future internationalizations
 - fixed memory bug in fontmap reader
 
-dvisvgm-0.8.1
+dvisvgm-0.8.1 (2009-08-02)
 - added evaluation of more psfile parameters
 - fixed computation of bounding box in psfile special
 - fixed compilation errors and a conversion bug occurred on x64 systems
 
-dvisvgm-0.8
+dvisvgm-0.8 (2009-07-27)
 - experimental evaluation of PostScript specials has been added (requires 
   a recent version of the Ghostscript shared library libgs.so or gsdll32.dll)
 - several code improvements and refactorings
 - fixed compilation bug occurred when using GCC 4.4.x
 
-dvisvgm-0.7.3
+dvisvgm-0.7.3 (2009-04-24)
 - fixed bug in font map reader that could cause a segmentation fault
 - fixed bug in creation of shorthand path drawing commands
 - fixed bug in TPIC special handler
 
-dvisvgm-0.7.2
+dvisvgm-0.7.2 (2009-04-02)
 - font caching has been added (speeds up embedding of bitmap fonts)
 - added option --trace-all that enables tracing of all glyphs of all
   bitmap fonts used in the current DVI file. Even glyphs that are currently
@@ -138,7 +145,7 @@ dvisvgm-0.7.2
 - if option --no-fonts is used, all glyph sizes are now computed correctly
 - use shorthand path commands in SVG fonts if possible
 
-dvisvgm-0.7.1
+dvisvgm-0.7.1 (2009-03-09)
 - evaluation of a subset of emTeX specials has been added
 - specials for embedding of raw SVG snippets have been added
 - evaluation of TPIC specials has been added
@@ -148,7 +155,7 @@ dvisvgm-0.7.1
 - moved defs to top of SVG file to make Firefox's SVG renderer happy
 - fixed bug in color handler
 
-dvisvgm-0.7
+dvisvgm-0.7 (2009-02-16)
 - basic support for evaluation of specials has been added
 - evaluation of color specials has been added
 - renamed command-line option -S to --no-specials and inverted previous behavior
@@ -161,13 +168,13 @@ dvisvgm-0.7
 - fixed buggy evaluation of command-line argument -m/--map-file
 - several internal code improvements
 
-dvisvgm-0.6.1
+dvisvgm-0.6.1 (2009-01-29)
 - added support for dvips map files
 - removed dependency on dvipdfm's map file (now ps2pk.map, psfonts.map or dvipdfm.map is used by default)
 - fixed compilation bug #2535497
 - some internal refactorings
 
-dvisvgm-0.6
+dvisvgm-0.6 (2009-01-23)
 - added support for varying font encodings
 - updated MiKTeX support using its COM interface
 - fixed incomplete handling of nested virtual fonts
@@ -175,7 +182,7 @@ dvisvgm-0.6
 - fixed bug in matrix transformation code
 - updated bundled potrace library to version 1.8
 
-dvisvgm-0.5
+dvisvgm-0.5 (2007-03-26)
 - redesigned and improved font handling
 - added support for virtual fonts
 - evaluation of dvipdfm's map file to find font files with differing 
@@ -187,24 +194,24 @@ dvisvgm-0.5
 - added sources of Peter Selinger's potrace library (part of potrace, http://potrace.sourceforge.net) 
   to simplify the build process
 
-dvisvgm-0.4.3
+dvisvgm-0.4.3 (2007-01-03)
 - problem with changed freetype API (freetype version >= 2.2.1) has been fixed
 - updated MiKTeX support to version 2.5 
 - minor code improvements
 - some unit tests based on CxxTest (http://cxxtest.sourceforge.net) have been added
 
-dvisvgm-0.4.2
+dvisvgm-0.4.2 (2005-09-22)
 - added SVG transformation options
 - some bugfixes in command line frontend and TFM handling
 - code refactorings to improve modularity and extensibility
 
-dvisvgm-0.4.1:
+dvisvgm-0.4.1 (2005-09-02)
 - added option -b to specify the bounding box
 - added a manual page 
 
-dvisvgm-0.4:
-Added a glyph tracing module that vectorizes Metafont's bitmap output
-if no corresponding Type 1 font file is available.
+dvisvgm-0.4 (2005-08-24)
+- Added a glyph tracing module that vectorizes Metafont's bitmap output
+  if no corresponding Type 1 font file is available.
 
-dvisvgm-0.3:
-Initial public release with basic conversion functionality.
+dvisvgm-0.3 (2005-08-10)
+- Initial public release with basic conversion functionality.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/README b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/README
index 4f2ef39b684..2157b7d6078 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/README
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/README
@@ -33,8 +33,8 @@ DEPENDENCIES
    * potracelib (http://potrace.sourceforge.net)
      Peter Selinger's bitmap tracing library is utilized to
      vectorize Metafont's bitmap output.
-     potracelib is now part of the dvisvgm source tarball, so
-     you don't need to create the library seperately any longer.
+     The latest version of the library is bundled with the
+     source tarball.
 
    * zlib (http://www.zlib.org)
      Compressed SVG files are produced by using functions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/aclocal.m4 b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/aclocal.m4
index 546de700179..546de700179 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/aclocal.m4
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/aclocal.m4
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/config.h.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/config.h.in
index b027999e9b3..b027999e9b3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/config.h.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/config.h.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/configure b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/configure
index d7863a24162..d9fcee822fa 100755
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/configure
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.66 for dvisvgm 1.0.6.
+# Generated by GNU Autoconf 2.66 for dvisvgm 1.0.7.
 #
 # Report bugs to <martin.gieseking@uos.de>.
 #
@@ -552,8 +552,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvisvgm'
 PACKAGE_TARNAME='dvisvgm'
-PACKAGE_VERSION='1.0.6'
-PACKAGE_STRING='dvisvgm 1.0.6'
+PACKAGE_VERSION='1.0.7'
+PACKAGE_STRING='dvisvgm 1.0.7'
 PACKAGE_BUGREPORT='martin.gieseking@uos.de'
 PACKAGE_URL=''
 
@@ -1270,7 +1270,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dvisvgm 1.0.6 to adapt to many kinds of systems.
+\`configure' configures dvisvgm 1.0.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1341,7 +1341,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvisvgm 1.0.6:";;
+     short | recursive ) echo "Configuration of dvisvgm 1.0.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1444,7 +1444,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvisvgm configure 1.0.6
+dvisvgm configure 1.0.7
 generated by GNU Autoconf 2.66
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1905,7 +1905,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dvisvgm $as_me 1.0.6, which was
+It was created by dvisvgm $as_me 1.0.7, which was
 generated by GNU Autoconf 2.66.  Invocation command line was
 
   $ $0 $@
@@ -2834,7 +2834,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvisvgm'
- VERSION='1.0.6'
+ VERSION='1.0.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6852,7 +6852,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dvisvgm $as_me 1.0.6, which was
+This file was extended by dvisvgm $as_me 1.0.7, which was
 generated by GNU Autoconf 2.66.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6918,7 +6918,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dvisvgm config.status 1.0.6
+dvisvgm config.status 1.0.7
 configured by $0, generated by GNU Autoconf 2.66,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/configure.ac b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/configure.ac
index 9f85c6c4f71..b445675f896 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/configure.ac
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/configure.ac
@@ -4,7 +4,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dvisvgm],[1.0.6],[martin.gieseking@uos.de])
+AC_INIT([dvisvgm],[1.0.7],[martin.gieseking@uos.de])
 DATE="December 2010"
 AC_CONFIG_SRCDIR(src)
 AC_CONFIG_HEADER(config.h)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/doc/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/doc/Makefile.am
index 65756c12742..65756c12742 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/doc/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/doc/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/doc/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/doc/Makefile.in
index 83d557df09f..83d557df09f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/doc/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/doc/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/doc/dvisvgm.1 b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/doc/dvisvgm.1
index e002fb5cf44..7d03a7f2b9f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/doc/dvisvgm.1
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/doc/dvisvgm.1
@@ -2,12 +2,12 @@
 .\"     Title: dvisvgm
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 04/16/2011
+.\"      Date: 05/06/2011
 .\"    Manual: dvisvgm Manual
-.\"    Source: dvisvgm 1.0.6
+.\"    Source: dvisvgm 1.0.7
 .\"  Language: English
 .\"
-.TH "DVISVGM" "1" "04/16/2011" "dvisvgm 1\&.0\&.6" "dvisvgm Manual"
+.TH "DVISVGM" "1" "05/06/2011" "dvisvgm 1\&.0\&.7" "dvisvgm Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -660,7 +660,7 @@ The following TeX snippet adds two raw SVG elements to the output and updates th
 .RS 4
 These specials were introduced with the emTeX distribution by Eberhard Mattes\&. They provide line drawing statements, instructions for embedding MSP, PCX, and BMP image files, as well as two PCL commands\&.
 \fBdvisvgm\fR
-supports only the line drawing statements, all other em specials are silently ignored\&. A description of the command syntax can be found in the DVI driver documentation coming with emTeX (see CTAN)\&.
+supports only the line drawing statements and ignores all other em specials silently\&. A description of the command syntax can be found in the DVI driver documentation coming with emTeX (see CTAN)\&.
 .RE
 .PP
 \fBps\fR
@@ -669,9 +669,19 @@ The famous DVI driver
 \fBdvips\fR
 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
 \fBdvisvgm\fR
-is to completely evaluate the PostScript code and to convert a large amount of it to SVG\&. Since PostScript is a rather complex language,
+is to completely evaluate all PostScript snippets and to convert a large amount of it to SVG\&. However, in contrast to
+\fBdvips\fR,
 \fBdvisvgm\fR
-does not try to implement its own PostScript interpreter but uses Ghostscript instead\&. If the Ghostscript library was not linked while building dvisvgm, it is looked up and dynamically loaded during runtime\&. In this case, dvisvgm looks for libgs\&.so on Unix\-like systems, and gsdll32\&.dll on Windows\&. You can override these default file names with the environment variable 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 evaluation of PostScript specials is disabled\&. Use option
+uses floating point arithmetics to compute the precise position of each graphic element, i\&.e\&. it doesn\(cqt round the corrdinates\&. Therefore, the relative locations of the graphic elements may slightly differ from those computed by
+\fBdvips\fR\&.
+.sp
+Since PostScript is a rather complex language,
+\fBdvisvgm\fR
+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 dynamically loaded during runtime\&. In this case, dvisvgm looks for
+\fIlibgs\&.so\fR
+on Unix\-like systems, and for
+\fIgsdll32\&.dll\fR
+on Windows\&. You can override these default file names with the environment variable LIBGS\&. The library must be installed and must be reachable through the ld search path (*nix) or the PATH environment variable (Windows)\&. If it cannot be found, the evaluation of PostScript specials is disabled\&. Use option
 \fB\-\-list\-specials\fR
 to check whether PS support is available, i\&.e\&. the entry
 \fIps\fR
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/doc/dvisvgm.txt.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/doc/dvisvgm.txt.in
index c3f12c34de7..2c804069190 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/doc/dvisvgm.txt.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/doc/dvisvgm.txt.in
@@ -37,39 +37,39 @@ DESCRIPTION
 -----------
 The command-line utility *dvisvgm* converts DVI files, as generated by TeX/LaTeX, to the
 XML-based scalable vector graphics format SVG. Since the current SVG standard 1.1 doesn't
-specify multi-page graphics, *dvisvgm* creates separate SVG files for each DVI page. 
-Because of compatibility reasons, only the first page is converted by default. In order 
-to select a different page or arbitrary page sequences, use option *-p* which is described below. 
+specify multi-page graphics, *dvisvgm* creates separate SVG files for each DVI page.
+Because of compatibility reasons, only the first page is converted by default. In order
+to select a different page or arbitrary page sequences, use option *-p* which is described below.
 
-*dvisvgm* should properly convert all pages that are made up of fonts and rules only. 
+*dvisvgm* should properly convert all pages that are made up of fonts and rules only.
 However, the utility also supports a couple of DVI extensions defined in terms of 'DVI specials'.
 For a more detailed overview, see section *support of specials* below.
 
-As SVG is a vector based graphics format, *dvisvgm* tries to convert the glyph 
-outlines of all used fonts into scalable path descriptions. The fastest way to do that 
-is to extract the path information from PFB (PostScript Type 1) files. So, if *dvisvgm* is able 
+As SVG is a vector based graphics format, *dvisvgm* tries to convert the glyph
+outlines of all used fonts into scalable path descriptions. The fastest way to do that
+is to extract the path information from PFB (PostScript Type 1) files. So, if *dvisvgm* is able
 to find a PFB file for a required font, it will read the necessary information from this file.
 
-TeX's main source for font descriptions is Metafont though, which produces bitmap output. That's why 
-not all obtainable TeX fonts are available in PFB format. In these cases *dvisvgm* tries 
-to vectorize Metafont's output (GF fonts) by tracing the glyph bitmaps. The results are not 
+TeX's main source for font descriptions is Metafont though, which produces bitmap output. That's why
+not all obtainable TeX fonts are available in PFB format. In these cases *dvisvgm* tries
+to vectorize Metafont's output (GF fonts) by tracing the glyph bitmaps. The results are not
 as perfect as most (manually optimized) PFB outlines but are nonetheless really nice in most cases.
 
 
 OPTIONS
 -------
 *-a, --trace-all*=['retrace']::
-This option forces dvisvgm to trace not only the actually needed glyphs but all 
-glyphs of all bitmap fonts used in the DVI file. Since the tracing results are stored in 
-the font cache, all following DVI conversions (without option *--trace-all*) where these 
-fonts are involved, will be much faster. By default, dvisvgm traces only the actually 
-needed glyphs and adds them to the cache. 
+This option forces dvisvgm to trace not only the actually needed glyphs but all
+glyphs of all bitmap fonts used in the DVI file. Since the tracing results are stored in
+the font cache, all following DVI conversions (without option *--trace-all*) where these
+fonts are involved, will be much faster. By default, dvisvgm traces only the actually
+needed glyphs and adds them to the cache.
 The boolean option 'retrace' determines how to handle glyphs already stored in the cache.
 By default, these glyphs are skipped. Setting argument 'retrace' to 'yes' or
 'true' forces dvisvgm to trace the corresponding bitmaps again.
 +
 [NOTE]
-This option only takes affect if font caching is active. Thus, *--trace-all* cannot be 
+This option only takes affect if font caching is active. Thus, *--trace-all* cannot be
 combined with option *--cache=none*.
 +
 
@@ -88,7 +88,7 @@ right corner.
 Alternatively, the following format specifiers are supported:
  
  *International DIN/ISO paper sizes*;;
- A__n__, B__n__, C__n__, D__n__, where 'n' is a non-negative integer, e.g. A4 or a4 for DIN/ISO A4 
+ A__n__, B__n__, C__n__, D__n__, where 'n' is a non-negative integer, e.g. A4 or a4 for DIN/ISO A4
  format (210mm &#215; 297mm).
  
  *North American paper sizes*;;
@@ -111,14 +111,14 @@ Alternatively, the following format specifiers are supported:
    Furthermore, the orientation suffixes can't be used with *dvi*, *min*, and *none*.
 +
 [NOTE]
-Option *-b, --bbox* only affects the bounding box and does not transform the page content. 
+Option *-b, --bbox* only affects the bounding box and does not transform the page content.
 Hence, if you choose a landscape format, the page won't be rotated.
 +
 //
 
 //
 *-c, --scale*='sx'[,'sy']::
-Scales the page content horizontally by 'sx' and vertically by 'sy'. This option is equivalent 
+Scales the page content horizontally by 'sx' and vertically by 'sy'. This option is equivalent
 to *-TS*'sx','sy'.
 
 
@@ -161,7 +161,7 @@ The latter has less precedence than the command-line option.
 *-l, --list-specials*::
 Prints a list of registered special handlers and exits. Each handler processes a set of special
 statements belonging to the same category. The categories are usually identified by the
-prefix of the special statements. It's usually a leading word separated from the rest of the 
+prefix of the special statements. It's usually a leading word separated from the rest of the
 statement by a colon or a blank, e.g. 'color' or 'ps'.
 
 
@@ -173,10 +173,10 @@ Disables the removal of temporary files as created by Metafont (usually .gf, .tf
 Sets the map file used to look up font names and encodings. *dvisvgm* does not provide
 its own map file but tries to use available ones coming with *dvips* or *dvipdfm*. If
 option *-m* is not given, *dvisvgm* looks for +ps2pk.map+, +dvipdfm.map+, and +psfonts.map+ (in this order).
-Without further options, the file specified by option *-m* will be used instead of the 
+Without further options, the file specified by option *-m* will be used instead of the
 default maps. If you want *dvisgvm* to load the given file additionally to the default maps, add a
 leading '+' to the file/path, e.g. `--map-file=+myfonts.map`.
-For further information about the file format, see the manuals of *dvips* and *dvipdfm*. 
+For further information about the file format, see the manuals of *dvips* and *dvipdfm*.
 
 
 *-M, --mag*='factor'::
@@ -223,7 +223,7 @@ the DVI filename without suffix, and *%p* is the current page number.
 By default, the pattern is *%f-%p.svg* if the DVI file consists of more than one page, and
 *%f.svg* otherwise. That means, a DVI file 'foo.dvi' is converted to 'foo.svg' if 'foo.dvi'
 is a single-page document. Otherwise, multiple SVG files 'foo-01.svg', 'foo-02.svg', etc. are
-produced. In Windows environments, the percent sign indicates dereferenced environment 
+produced. In Windows environments, the percent sign indicates dereferenced environment
 variables, and must therefore be protected by a second percent sign, e.g. *--output=%%f-%%p*.
 
 
@@ -436,24 +436,27 @@ The following TeX snippet adds two raw SVG elements to the output and updates th
 *em*::
 These specials were introduced with the emTeX distribution by Eberhard Mattes. They provide line drawing
 statements, instructions for embedding MSP, PCX, and BMP image files, as well as two PCL commands.
-*dvisvgm* supports only the line drawing statements, all other em specials are silently ignored.
+*dvisvgm* supports only the line drawing statements and ignores all other em specials silently.
 A description of the command syntax can be found in the DVI driver documentation coming with emTeX (see CTAN).
 
 // *html*::
-// The hyperref package uses a set of HTML anchor tags to indicate hyperlinks in DVI files. 
+// The hyperref package uses a set of HTML anchor tags to indicate hyperlinks in DVI files.
 // *dvisvgm* converts them to corresponding SVG elements.
 
 *ps*::
 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 the
-PostScript code and to convert a large amount of it to SVG.
-Since PostScript is a rather complex language, *dvisvgm* does not try to implement its own PostScript interpreter but uses
+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't round the corrdinates. Therefore,
+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 dynamically loaded
-during runtime. In this case, dvisvgm looks for libgs.so on Unix-like systems, and gsdll32.dll on Windows. You can override these
-default file names with the environment variable 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 evaluation of PostScript specials is disabled. Use option *--list-specials* to check whether
-PS support is available, i.e. the entry 'ps' is present.
+during runtime. In this case, dvisvgm looks for 'libgs.so' on Unix-like systems, and for 'gsdll32.dll' on Windows.
+You can override these default file names with the environment variable LIBGS.
+The library must be installed and must be reachable through the ld search path (\*nix) or the PATH environment
+variable (Windows). If it cannot be found, the evaluation of PostScript specials is disabled.
+Use option *--list-specials* to check whether PS support is available, i.e. the entry 'ps' is present.
 
 *tpic*::
 The TPIC special set defines instructions for drawing simple geometric objects. Some LaTeX packages, like
@@ -532,7 +535,7 @@ Written by {author} <{email}>
 COPYING
 -------
 Copyright (C) 2005-2011 by Martin Gieseking. Free use of this software is
-granted under the terms of the GNU General Public License (GPL) version 3 
+granted under the terms of the GNU General Public License (GPL) version 3
 or, (at your option) any later version.
 
-// vim: set syntax=asciidoc: 
+// vim: set syntax=asciidoc:
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/Makefile.am
index 97bf78f50f4..97bf78f50f4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/Makefile.in
index e7ca5bae59e..e7ca5bae59e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/auxiliary.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/auxiliary.h
index 1c2765816b8..1c2765816b8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/auxiliary.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/auxiliary.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/bitmap.h
index 671382dc27d..671382dc27d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/curve.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/curve.c
index 0ab0c6d7a2a..0ab0c6d7a2a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/curve.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/curve.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/curve.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/curve.h
index 0f2d9fa876a..0f2d9fa876a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/curve.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/curve.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/decompose.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/decompose.c
index 1b3f35c22d8..1b3f35c22d8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/decompose.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/decompose.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/decompose.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/decompose.h
index 409439c62fd..409439c62fd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/decompose.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/decompose.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/lists.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/lists.h
index 4f78bf20fde..4f78bf20fde 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/lists.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/lists.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/potracelib.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/potracelib.c
index e8480b216c9..e8480b216c9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/potracelib.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/potracelib.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/potracelib.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/potracelib.h
index 6bc8682c074..6bc8682c074 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/potracelib.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/potracelib.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/progress.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/progress.h
index 220639c6e5c..220639c6e5c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/progress.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/progress.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/trace.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/trace.c
index 8fe1a1bc4ab..8fe1a1bc4ab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/trace.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/trace.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/trace.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/trace.h
index 72d1a36965b..72d1a36965b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/potracelib/trace.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/potracelib/trace.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/BgColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/BgColorSpecialHandler.cpp
index 979d76bdd0f..979d76bdd0f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/BgColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/BgColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/BgColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/BgColorSpecialHandler.h
index d3b0a75ccca..d3b0a75ccca 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/BgColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/BgColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Bitmap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Bitmap.cpp
index 4c2a0510bc8..4c2a0510bc8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Bitmap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Bitmap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Bitmap.h
index a9a6be61b2a..a9a6be61b2a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/BoundingBox.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/BoundingBox.cpp
index c5ab55e27a9..c5ab55e27a9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/BoundingBox.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/BoundingBox.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/BoundingBox.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/BoundingBox.h
index 952fbdfd3af..952fbdfd3af 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/BoundingBox.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/BoundingBox.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CRC32.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/CRC32.cpp
index 339375a6b06..339375a6b06 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CRC32.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/CRC32.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CRC32.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/CRC32.h
index 4dd323ad3df..4dd323ad3df 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CRC32.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/CRC32.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Calculator.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Calculator.cpp
index 33502d6cec2..33502d6cec2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Calculator.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Calculator.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Calculator.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Calculator.h
index ce4f6698b20..ce4f6698b20 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Calculator.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Calculator.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CmdLineParserBase.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/CmdLineParserBase.cpp
index 6c18f221ad3..6c18f221ad3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CmdLineParserBase.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/CmdLineParserBase.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CmdLineParserBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/CmdLineParserBase.h
index 1be54e022a5..1be54e022a5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CmdLineParserBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/CmdLineParserBase.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Color.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Color.cpp
index 630c3798cda..630c3798cda 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Color.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Color.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Color.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Color.h
index d1d8ce3f6cc..d1d8ce3f6cc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Color.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Color.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/ColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/ColorSpecialHandler.cpp
index 2dfbb5fc606..2dfbb5fc606 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/ColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/ColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/ColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/ColorSpecialHandler.h
index 0e098631354..0e098631354 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/ColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/ColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CommandLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/CommandLine.cpp
index ccba1e74f08..ccba1e74f08 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CommandLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/CommandLine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CommandLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/CommandLine.h
index 5d1eb7bd078..5d1eb7bd078 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/CommandLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/CommandLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DLLoader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DLLoader.cpp
index 22edb3dfa93..8d6c48c4c85 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DLLoader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DLLoader.cpp
@@ -51,4 +51,3 @@ void* DLLoader::loadFunction (const char *name) {
 	}
 	return 0;
 }
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DLLoader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DLLoader.h
index d7fa5155fee..138556aac0e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DLLoader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DLLoader.h
@@ -22,21 +22,23 @@
 #define DLLOADER_H
 
 #ifdef __WIN32__
+	#undef NOMINMAX
+	#define NOMINMAX
 	#include <windows.h>
 #else
 	#include <dlfcn.h>
 #endif
 
+
 class DLLoader
 {
    public:
-      DLLoader (const char *dllname);
+      DLLoader (const char *dlname);
       virtual ~DLLoader ();
 		bool loaded () const {return _handle != 0;}
 
 	protected:
 		DLLoader () : _handle(0) {}
-		DLLoader (const DLLoader &l) {}
 		void* loadFunction (const char *name);
 
    private:
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DVIActions.cpp
index 355a59efaba..355a59efaba 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DVIActions.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DVIActions.h
index 42ae3330b07..42ae3330b07 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DVIActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DVIReader.cpp
index f2d8e14ae2b..539179f6e76 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DVIReader.cpp
@@ -42,6 +42,7 @@ DVIReader::DVIReader (istream &is, DVIActions *a) : StreamReader(is), _actions(a
 	_inPage = false;
 	_pageHeight = _pageWidth = 0;
 	_scaleFactor = 0.0;
+	_tx = _ty = 0;    // no cursor translation
 	_inPostamble = false;
 	_totalPages = 0;  // we don't know the correct value yet
 	_currFontNum = 0;
@@ -305,26 +306,14 @@ void DVIReader::executePostamble () {
 /** Returns the current x coordinate in TeX point units.
  *  This is the horizontal position where the next output would be placed. */
 double DVIReader::getXPos () const {
-	return _currPos.h;
+	return _currPos.h+_tx;
 }
 
 
 /** Returns the current y coordinate in TeX point units.
  *  This is the vertical position where the next output would be placed. */
 double DVIReader::getYPos () const {
-	return _currPos.v;
-}
-
-
-/** Sets the horizontal position in TeX point units. */
-void DVIReader::setXPos (double x) {
-	_currPos.h = x;
-}
-
-
-/** Sets the vertical position in TeX point units. */
-void DVIReader::setYPos (double y) {
-	_currPos.v = y;
+	return _currPos.v+_ty;
 }
 
 
@@ -452,9 +441,9 @@ void DVIReader::cmdPop (int) {
 		_posStack.pop();
 		if (_actions) {
 			if (prevPos.h != _currPos.h)
-				_actions->moveToX(_currPos.h);
+				_actions->moveToX(_currPos.h + _tx);
 			if (prevPos.v != _currPos.v)
-				_actions->moveToY(_currPos.v);
+				_actions->moveToY(_currPos.v + _ty);
 		}
 	}
 }
@@ -501,7 +490,7 @@ void DVIReader::putChar (UInt32 c, bool moveCursor) {
 		}
 	}
 	else if (_actions) {
-		_actions->setChar(_currPos.h, _currPos.v, c, font);
+		_actions->setChar(_currPos.h+_tx, _currPos.v+_ty, c, font);
 	}
 	if (moveCursor)
 		_currPos.h += font->charWidth(c) * font->scaleFactor() * _mag/1000.0;
@@ -549,10 +538,10 @@ void DVIReader::cmdSetRule (int) {
 		double height = _scaleFactor*readSigned(4);
 		double width  = _scaleFactor*readSigned(4);
 		if (_actions && height > 0 && width > 0)
-			_actions->setRule(_currPos.h, _currPos.v, height, width);
+			_actions->setRule(_currPos.h+_tx, _currPos.v+_ty, height, width);
 		_currPos.h += width;
 		if (_actions && (height <= 0 || width <= 0))
-			_actions->moveToX(_currPos.h);
+			_actions->moveToX(_currPos.h+_tx);
 	}
 	else
 		throw DVIException("set_rule outside of page");
@@ -567,7 +556,7 @@ void DVIReader::cmdPutRule (int) {
 		double height = _scaleFactor*readSigned(4);
 		double width  = _scaleFactor*readSigned(4);
 		if (_actions && height > 0 && width > 0)
-			_actions->setRule(_currPos.h, _currPos.v, height, width);
+			_actions->setRule(_currPos.h+_tx, _currPos.v+_ty, height, width);
 	}
 	else
 		throw DVIException("put_rule outside of page");
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DVIReader.h
index 6805e398ae2..0c187ec0927 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DVIReader.h
@@ -68,8 +68,9 @@ class DVIReader : public StreamReader, protected VFActions
 		bool inPostamble () const              {return _inPostamble;}
 		double getXPos () const;
 		double getYPos () const;
-		void setXPos (double x);
-		void setYPos (double y);
+		void translate (double tx, double ty)  {_tx=tx; _ty=ty;}
+		void translateToX (double x)           {_tx=x-_currPos.h-_tx;}
+		void translateToY (double y)           {_ty=y-_currPos.v-_ty;}
 		double getPageWidth () const;
 		double getPageHeight () const;
 		int getCurrentFontNumber () const      {return _currFontNum;}
@@ -121,18 +122,19 @@ class DVIReader : public StreamReader, protected VFActions
 		void cmdPostPost (int len);
 
 	private:
-		DVIActions *_actions;   ///< actions to be performed on various DVI events
-		bool _inPage;           ///< true if between bop and eop
-		unsigned _totalPages;   ///< total number of pages in dvi file
-		unsigned _currPageNum;  ///< current page number
-		int _currFontNum;       ///< current font number
-		double _scaleFactor;    ///< 1 dvi unit = scaleFactor * TeX points
-		UInt32 _mag;            ///< magnification factor * 1000
-		bool _inPostamble;      ///< true if stream pointer is inside the postamble
-		Int32 _prevBop;         ///< pointer to previous bop
+		DVIActions *_actions;    ///< actions to be performed on various DVI events
+		bool _inPage;            ///< true if between bop and eop
+		unsigned _totalPages;    ///< total number of pages in dvi file
+		unsigned _currPageNum;   ///< current page number
+		int _currFontNum;        ///< current font number
+		double _scaleFactor;     ///< 1 dvi unit = scaleFactor * TeX points
+		UInt32 _mag;             ///< magnification factor * 1000
+		bool _inPostamble;       ///< true if stream pointer is inside the postamble
+		Int32 _prevBop;          ///< pointer to previous bop
 		double _pageHeight, _pageWidth;  ///< page height and width in TeX points
-		DVIPosition _currPos;
+		DVIPosition _currPos;    ///< current cursor position
 		std::stack<DVIPosition> _posStack;
+		double _tx, _ty;         ///< tranlation of cursor position
 		size_t _pageLength;      ///< number of bytes between current bop end eop
 		std::streampos _pagePos; ///< distance of current DVI command from bop (in bytes)
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DVIToSVG.cpp
index 89ce9eb60e0..89ce9eb60e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DVIToSVG.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DVIToSVG.h
index 0e5fa7da7d8..0e5fa7da7d8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DVIToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIToSVGActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DVIToSVGActions.cpp
index 878063c18ed..18ccdc23a44 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIToSVGActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DVIToSVGActions.cpp
@@ -25,7 +25,6 @@
 #include "DVIToSVGActions.h"
 #include "Font.h"
 #include "FontManager.h"
-#include "Ghostscript.h"
 #include "GlyphTracerMessages.h"
 #include "SpecialManager.h"
 #include "System.h"
@@ -68,6 +67,18 @@ void DVIToSVGActions::setPageMatrix (const Matrix &matrix) {
 }
 
 
+void DVIToSVGActions::moveToX (double x) {
+	_dvisvg.specialManager().notifyPositionChange(getX(), getY());
+	_svg.setX(getX());        // get current horizontal DVI position
+}
+
+
+void DVIToSVGActions::moveToY (double y) {
+	_dvisvg.specialManager().notifyPositionChange(getX(), getY());
+	_svg.setY(y);
+}
+
+
 /** This method is called when a "set char" command was found in the DVI file.
  *  It draws a character of the current font.
  *  @param[in] x horizontal position of left bounding box edge
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIToSVGActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DVIToSVGActions.h
index 400a5d19156..a60c87910ef 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DVIToSVGActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DVIToSVGActions.h
@@ -29,6 +29,7 @@
 #include "SpecialActions.h"
 #include "SpecialManager.h"
 #include "SVGTree.h"
+#include "DVIReader.h"
 
 
 class DVIToSVG;
@@ -55,8 +56,8 @@ class DVIToSVGActions : public DVIActions, public SpecialActions, public Special
 		Color getColor () const                         {return _svg.getColor();}
 		void appendToPage (XMLNode *node)               {_svg.appendToPage(node);}
 		void appendToDefs (XMLNode *node)               {_svg.appendToDefs(node);}
-		void moveToX (double x)                         {_svg.setX(x);}
-		void moveToY (double y)                         {_svg.setY(y);}
+		void moveToX (double x);
+		void moveToY (double y);
 		void setFont (int num, const Font *font);
 		void special (const std::string &s);
 		void preamble (const std::string &cmt);
@@ -70,11 +71,12 @@ class DVIToSVGActions : public DVIActions, public SpecialActions, public Special
 		CharMap& getUsedChars () const        {return _usedChars;}
 		const FontSet& getUsedFonts () const  {return _usedFonts;}
 		void setPageMatrix (const Matrix &tm);
-		double getX() const  {return _dvisvg.getXPos();}
-		double getY() const  {return _dvisvg.getYPos();}
-		void setX (double x) {_dvisvg.setXPos(x);}
-		void setY (double y) {_dvisvg.setYPos(y);}
-		BoundingBox& bbox () {return _bbox;}
+		double getX() const   {return _dvisvg.getXPos();}
+		double getY() const   {return _dvisvg.getYPos();}
+		void setX (double x)  {_dvisvg.translateToX(x); _svg.setX(x);}
+		void setY (double y)  {_dvisvg.translateToY(y); _svg.setY(y);}
+      void resetPosition () {_dvisvg.translate(0, 0);}
+		BoundingBox& bbox ()  {return _bbox;}
       BoundingBox& bbox (const std::string &name, bool reset=false);
       void embed (const BoundingBox &bbox);
       void embed (const DPair &p, double r=0);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Directory.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Directory.cpp
index 86a8b446ceb..86a8b446ceb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Directory.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Directory.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Directory.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Directory.h
index 373f2f57dff..373f2f57dff 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Directory.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Directory.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DvisvgmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DvisvgmSpecialHandler.cpp
index 2e44169362a..2e44169362a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DvisvgmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DvisvgmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DvisvgmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DvisvgmSpecialHandler.h
index 1d15f864cf4..1d15f864cf4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/DvisvgmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/DvisvgmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/EmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/EmSpecialHandler.cpp
index 786ff5c3623..5fa5346b4ca 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/EmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/EmSpecialHandler.cpp
@@ -208,7 +208,7 @@ bool EmSpecialHandler::process (const char *prefix, istream &is, SpecialActions
 
 /** This method is called at the end of a DVI page. Here we have to draw all pending
  *   lines that are still in the line list. All line endpoints must be defined until here. */
-void EmSpecialHandler::endPage () {
+void EmSpecialHandler::dviEndPage () {
 	if (_actions) {
 		FORALL(_lines, list<Line>::iterator, it) {
 			map<int,DPair>::iterator pit1=_points.find(it->p1);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/EmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/EmSpecialHandler.h
index 548e5fbc757..090d775b71d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/EmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/EmSpecialHandler.h
@@ -42,7 +42,10 @@ class EmSpecialHandler : public SpecialHandler
 		const char* info () const   {return "line drawing statements of the emTeX special set";}
 		const char** prefixes () const;
 		bool process (const char *prefix, std::istream &in, SpecialActions *actions);
-		void endPage ();
+		void dviEndPage ();
+
+	protected:
+		bool isEndPageListener () const {return true;}
 
    private:
 		std::map<int, DPair> _points; ///< points defined by special em:point
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FileFinder.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FileFinder.cpp
index 91f63b8d7f5..91f63b8d7f5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FileFinder.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FileFinder.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FileFinder.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FileFinder.h
index 6dcdf335e1c..6dcdf335e1c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FileFinder.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FileFinder.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FilePath.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FilePath.cpp
index 7f5db32120c..7f5db32120c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FilePath.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FilePath.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FilePath.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FilePath.h
index 4702cb8d969..4702cb8d969 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FilePath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FilePath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FileSystem.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FileSystem.cpp
index f53b84b42b4..f53b84b42b4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FileSystem.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FileSystem.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FileSystem.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FileSystem.h
index b53b42b09a8..b53b42b09a8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FileSystem.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FileSystem.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Font.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Font.cpp
index 9ebd0515ffe..9ebd0515ffe 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Font.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Font.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Font.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Font.h
index adddcb98458..adddcb98458 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Font.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Font.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontCache.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontCache.cpp
index c4ca8ad1fbf..c4ca8ad1fbf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontCache.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontCache.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontCache.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontCache.h
index 5ab7b885210..5ab7b885210 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontCache.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontCache.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontEncoding.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontEncoding.cpp
index e02e859933d..e02e859933d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontEncoding.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontEncoding.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontEncoding.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontEncoding.h
index 6766611f64f..6766611f64f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontEncoding.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontEncoding.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontEngine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontEngine.cpp
index 991813fc1a5..991813fc1a5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontEngine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontEngine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontEngine.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontEngine.h
index 678bc43c180..678bc43c180 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontEngine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontEngine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontManager.cpp
index 8f6958cdb42..8f6958cdb42 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontManager.h
index 14f6d2aae71..14f6d2aae71 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontMap.cpp
index 01075d91309..01075d91309 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontMap.h
index ec2c69af0f6..ec2c69af0f6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/FontMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/FontMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFGlyphTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/GFGlyphTracer.cpp
index 9dbb4b5fa71..9dbb4b5fa71 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFGlyphTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/GFGlyphTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFGlyphTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/GFGlyphTracer.h
index 14a927fcef9..14a927fcef9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFGlyphTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/GFGlyphTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/GFReader.cpp
index b47c175f048..b47c175f048 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/GFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/GFReader.h
index cbc9fec3e77..cbc9fec3e77 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/GFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/GFTracer.cpp
index 981d45dda10..981d45dda10 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/GFTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/GFTracer.h
index 6d6a4351a05..6d6a4351a05 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GFTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/GFTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Ghostscript.cpp
index 0f8a0785b65..d7534b045ce 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Ghostscript.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Ghostscript.cpp
@@ -57,12 +57,8 @@ Ghostscript::Ghostscript (int argc, const char **argv, void *caller)
 	: DLLoader(LIBGS_NAME.empty() ? GS_DL_NAME : LIBGS_NAME.c_str())
 #endif
 {
-	int status = new_instance(&_inst, caller);
-	if (status < 0)
-		_inst = 0;
-	else {
-		init_with_args(argc, (char**)argv);
-	}
+	_inst = 0;
+	init(argc, argv, caller);
 }
 
 
@@ -75,6 +71,19 @@ Ghostscript::~Ghostscript () {
 }
 
 
+bool Ghostscript::init (int argc, const char **argv, void *caller) {
+	if (!_inst) {
+		int status = new_instance(&_inst, caller);
+		if (status < 0)
+			_inst = 0;
+		else {
+			init_with_args(argc, (char**)argv);
+		}
+	}
+	return _inst != 0;
+}
+
+
 /** Returns true if Ghostscript library was found and can be loaded. */
 bool Ghostscript::available () {
 #if defined(HAVE_LIBGS)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Ghostscript.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Ghostscript.h
index 69077afc027..ab9bb000841 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Ghostscript.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Ghostscript.h
@@ -76,6 +76,7 @@ class Ghostscript
 		Ghostscript ();
 		Ghostscript (int argc, const char **argv, void *caller=0);
 		~Ghostscript ();
+		bool init (int argc, const char **argv, void *caller=0);
 		bool available ();
 		bool revision (gsapi_revision_t *r);
 		std::string revision ();
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Glyph.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Glyph.h
index 5866f23737b..5866f23737b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Glyph.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Glyph.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GlyphTracerMessages.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/GlyphTracerMessages.h
index 4f99a2db2a9..4f99a2db2a9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GlyphTracerMessages.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/GlyphTracerMessages.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GraphicPath.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/GraphicPath.h
index bcebc040f38..bcebc040f38 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/GraphicPath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/GraphicPath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/InputBuffer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/InputBuffer.cpp
index f5e7125f80b..f5e7125f80b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/InputBuffer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/InputBuffer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/InputBuffer.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/InputBuffer.h
index 910f66429e9..910f66429e9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/InputBuffer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/InputBuffer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/InputReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/InputReader.cpp
index 76652da26a8..76652da26a8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/InputReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/InputReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/InputReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/InputReader.h
index 0e3d23f5eb0..0e3d23f5eb0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/InputReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/InputReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Length.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Length.cpp
index 7ae102df7c5..7ae102df7c5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Length.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Length.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Length.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Length.h
index efd353695a7..c062af5b256 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Length.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Length.h
@@ -24,6 +24,10 @@
 #include <string>
 #include "MessageException.h"
 
+#ifdef IN
+#undef IN
+#endif
+
 struct UnitException : MessageException
 {
 	UnitException (const std::string &msg) : MessageException(msg) {}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Makefile.am
index 70718e5a1df..70718e5a1df 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Makefile.in
index b68074c0373..b68074c0373 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Matrix.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Matrix.cpp
index 0e3dbc93024..0e3dbc93024 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Matrix.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Matrix.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Matrix.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Matrix.h
index 5c3b7442081..5c3b7442081 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Matrix.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Matrix.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Message.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Message.cpp
index 52cb6da56d0..52cb6da56d0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Message.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Message.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Message.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Message.h
index a69b414c727..a69b414c727 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Message.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Message.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/MessageException.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/MessageException.h
index 338c9daac9f..338c9daac9f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/MessageException.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/MessageException.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/MetafontWrapper.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/MetafontWrapper.cpp
index e04187491f6..e04187491f6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/MetafontWrapper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/MetafontWrapper.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/MetafontWrapper.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/MetafontWrapper.h
index ce4ccbb5e5e..ce4ccbb5e5e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/MetafontWrapper.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/MetafontWrapper.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PSInterpreter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/PSInterpreter.cpp
index e149aeb5128..1cc0b455f12 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PSInterpreter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/PSInterpreter.cpp
@@ -47,10 +47,21 @@ const char *PSInterpreter::GSARGS[] = {
 /** Constructs a new PSInterpreter object.
  *  @param[in] actions template methods to be executed after recognizing the corresponding PS operator. */
 PSInterpreter::PSInterpreter (PSActions *actions)
-	: _gs(sizeof(GSARGS)/sizeof(char*), GSARGS, this), _mode(PS_NONE), _actions(actions), _inError(false)
+	: _mode(PS_NONE), _actions(actions), _inError(false), _initialized(false)
 {
-	_gs.set_stdio(input, output, error);
-	_initialized = false;
+}
+
+
+void PSInterpreter::init () {
+	if (!_initialized) {
+		_gs.init(sizeof(GSARGS)/sizeof(char*), GSARGS, this);
+		_gs.set_stdio(input, output, error);
+		_initialized = true;
+		// Before executing any random PS code redefine some operators and run
+		// initializing PS code. This cannot be done in the constructor because we
+		// need the completely initialized PSInterpreter object here.
+		execute(PSDEFS);
+	}
 }
 
 
@@ -67,13 +78,7 @@ PSActions* PSInterpreter::setActions (PSActions *actions) {
  *  @param[in] flush If true, a final 'flush' is sent which forces the
  *  	output buffer to be written immediately.*/
 void PSInterpreter::execute (const char *str, size_t len, bool flush) {
-	if (!_initialized) {
-		// Before executing any random PS code redefine some operators and run
-		// initializing PS code. This cannot be done in the constructor because we
-		// need the completely initialized PSInterpreter object here.
-		_initialized = true;
-		execute(PSDEFS);
-	}
+	init();
 	if (_mode != PS_QUIT) {
 		int status;
 		if (_mode == PS_NONE) {
@@ -101,7 +106,7 @@ void PSInterpreter::execute (const char *str, size_t len, bool flush) {
 		}
 		if (flush) {
 			// force writing contents of output buffer
-			_gs.run_string_continue(" flush ", 7, 0, &status);
+			_gs.run_string_continue("\nflush ", 7, 0, &status);
 		}
 	}
 }
@@ -115,7 +120,7 @@ void PSInterpreter::execute (istream &is) {
 		is.read(buf, 4096);
 		execute(buf, is.gcount(), false);
 	}
-	execute(" ", 1);
+	execute("\n", 1);
 }
 
 
@@ -228,6 +233,7 @@ void PSInterpreter::callActions (InputReader &in) {
 		{"lineto",          2, &PSActions::lineto},
 		{"moveto",          2, &PSActions::moveto},
 		{"newpath",         0, &PSActions::newpath},
+		{"querypos",        2, &PSActions::querypos},
 		{"rotate",          1, &PSActions::rotate},
 		{"scale",           2, &PSActions::scale},
 		{"setcmykcolor",    4, &PSActions::setcmykcolor},
@@ -240,7 +246,6 @@ void PSInterpreter::callActions (InputReader &in) {
 		{"setmatrix",       6, &PSActions::setmatrix},
 		{"setmiterlimit",   1, &PSActions::setmiterlimit},
 		{"setopacityalpha", 1, &PSActions::setopacityalpha},
-		{"setpos",          2, &PSActions::setpos},
 		{"setrgbcolor",     3, &PSActions::setrgbcolor},
 		{"stroke",          0, &PSActions::stroke},
 		{"translate",       2, &PSActions::translate},
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PSInterpreter.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/PSInterpreter.h
index 9f9d562ec9f..ee62f766ff1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PSInterpreter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/PSInterpreter.h
@@ -43,7 +43,7 @@ struct PSActions
 	virtual ~PSActions () {}
    virtual void applyscalevals (std::vector<double> &p) =0;
 	virtual void clip (std::vector<double> &p) =0;
-	virtual void closepath (std::vector<double> &p) =0;   
+	virtual void closepath (std::vector<double> &p) =0;
 	virtual void curveto (std::vector<double> &p) =0;
 	virtual void eoclip (std::vector<double> &p) =0;
 	virtual void eofill (std::vector<double> &p) =0;
@@ -54,6 +54,7 @@ struct PSActions
 	virtual void lineto (std::vector<double> &p) =0;
 	virtual void moveto (std::vector<double> &p) =0;
 	virtual void newpath (std::vector<double> &p) =0;
+	virtual void querypos (std::vector<double> &p) =0;
 	virtual void rotate (std::vector<double> &p) =0;
 	virtual void scale (std::vector<double> &p) =0;
 	virtual void setcmykcolor (std::vector<double> &cmyk) =0;
@@ -66,10 +67,9 @@ struct PSActions
 	virtual void setmatrix (std::vector<double> &p) =0;
 	virtual void setmiterlimit (std::vector<double> &p) =0;
 	virtual void setopacityalpha (std::vector<double> &p) =0;
-	virtual void setpos (std::vector<double> &p) =0;
 	virtual void setrgbcolor (std::vector<double> &rgb) =0;
 	virtual void stroke (std::vector<double> &p) =0;
-	virtual void translate (std::vector<double> &p) =0;   
+	virtual void translate (std::vector<double> &p) =0;
 	virtual void executed () {}  // triggered if one of the above PS operators has been executed
 };
 
@@ -90,6 +90,7 @@ class PSInterpreter
 		PSActions* setActions (PSActions *actions);
 
 	protected:
+		void init ();
 		// callback functions
 		static int GSDLLCALL input (void *inst, char *buf, int len);
 		static int GSDLLCALL output (void *inst, const char *buf, int len);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PageRanges.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/PageRanges.cpp
index 9c985972b72..9c985972b72 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PageRanges.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/PageRanges.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PageRanges.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/PageRanges.h
index f15641b9f70..f15641b9f70 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PageRanges.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/PageRanges.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PageSize.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/PageSize.cpp
index 88990136285..88990136285 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PageSize.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/PageSize.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PageSize.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/PageSize.h
index c2ca163e051..c2ca163e051 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PageSize.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/PageSize.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Pair.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Pair.h
index 9e6d1f0d0d1..9e6d1f0d0d1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Pair.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Pair.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/PsSpecialHandler.cpp
index 79c49abad86..c1d80146be2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/PsSpecialHandler.cpp
@@ -21,8 +21,10 @@
 #include <cmath>
 #include <fstream>
 #include <iostream>
+#include <limits>
 #include <sstream>
 #include "FileFinder.h"
+#include "Ghostscript.h"
 #include "Message.h"
 #include "PsSpecialHandler.h"
 #include "SpecialActions.h"
@@ -63,6 +65,7 @@ void PsSpecialHandler::initialize (SpecialActions *actions) {
 		_xmlnode = 0;
 		_opacityalpha = 1;  // fully opaque
 		_sx = _sy = _cos = 1.0;
+		_prevDviY = numeric_limits<double>::min();
 
 		// execute dvips prologue/header files
 		const char *headers[] = {"tex.pro", "texps.pro", "special.pro", /*"color.pro",*/ 0};
@@ -91,19 +94,52 @@ void PsSpecialHandler::initialize (SpecialActions *actions) {
 
 
 const char* PsSpecialHandler::info () const {
-	static string str = "dvips PostScript specials (using " + Ghostscript().revision() + ")";
+	static string str;
+	str = "dvips PostScript specials (using " + Ghostscript().revision() + ")";
 	return str.c_str();
 }
 
 
-void PsSpecialHandler::updatePos () {
+/** The DVI action handler calls this method whenever the DVI position changes.
+ *  @param[in] x new horizontal position (in TeX pt units)
+ *  @param[in] y new vertical position (in TeX pt units) */
+void PsSpecialHandler::dviMovedTo (double x, double y) {
+	// In order to imitate the positioning of dvips in conjunction with
+	// plain PS specials, alterations of the DVI position stay active as
+	// long as we are in horizointal mode.
+	if (y != _prevDviY && _actions) {
+		_actions->resetPosition();
+		_prevDviY = y;
+	}
+}
+
+
+/** Move PS graphic position to current DVI location. */
+void PsSpecialHandler::moveToDVIPos () {
 	if (_actions) {
+		const double bp=72.0/72.27; // pt -> bp
+		const double x = _actions->getX()*bp;
+		const double y = _actions->getY()*bp;
 		ostringstream oss;
-		const double x = _actions->getX(), y = _actions->getY();
-		oss << ' ' << x << ' ' << y << " moveto ";
-		_psi.execute(oss.str());
-		_currentpoint = DPair(x, y);
-	}
+      oss << '\n' << x << ' ' << y << " moveto ";
+      _psi.execute(oss.str());
+      _currentpoint = DPair(x, y);
+   }
+}
+
+
+/** Executes a PS snippet and moves the DVI cursor to the current DVI position afterwards.
+ *  It's just a shorthand function as this action sequence is required several times.
+ *  @param[in] psi PS interpreter instance
+ *  @param[in] is  stream to read the PS code from
+ *  @param[in] pos current PS graphic position
+ *  @param[in] actions special actions */
+static void exec_and_syncpos (PSInterpreter &psi, istream &is, const DPair &pos, SpecialActions *actions) {
+	psi.execute(is);
+	psi.execute("\nquerypos ");   // retrieve current PS position (stored in 'pos')
+	const double pt = 72.27/72.0; // bp -> pt
+	actions->setX(pos.x()*pt);
+	actions->setY(pos.y()*pt);
 }
 
 
@@ -114,16 +150,16 @@ bool PsSpecialHandler::process (const char *prefix, istream &is, SpecialActions
 
 	if (*prefix == '"') {
 		// read and execute literal PostScript code (isolated by a wrapping save/restore pair)
-		updatePos();
-		_psi.execute(" @beginspecial @setspecial ");
+		moveToDVIPos();
+		_psi.execute("\n@beginspecial @setspecial ");
 		_psi.execute(is);
-		_psi.execute(" @endspecial ");
+		_psi.execute("\n@endspecial ");
 	}
 	else if (*prefix == '!') {
 		// execute literal PostScript header
-		_psi.execute(" @defspecial ");
+		_psi.execute("\n@defspecial ");
 		_psi.execute(is);
-		_psi.execute(" @fedspecial ");
+		_psi.execute("\n@fedspecial ");
 	}
 	else if (strcmp(prefix, "header=") == 0) {
 		// read and execute PS header files
@@ -146,28 +182,34 @@ bool PsSpecialHandler::process (const char *prefix, istream &is, SpecialActions
 		}
 	}
 	else if (strcmp(prefix, "ps::") == 0) {
-		if (is.peek() != '[') {
-			// execute literal PostScript without initial positioning and without any wrapping code
-			_psi.execute(is);
-			_psi.execute(" setpos ");  // forces a call of PSActions::setpos to get the current PS position
-			_actions->setX(_currentpoint.x());
-			_actions->setY(_currentpoint.y());
-		}
-		else {
-			is.get();
-			string label;
-			int c;
-			while (!is.eof() && (c = is.get()) != ']')
-				label += c;
-			if (label != "begin" && label != "end") {
-				Message::wstream(true) << "invalid PostScript special ps::[" << label << "]\n";
-				return false;
+		_prevDviY = numeric_limits<double>::min();  // forget previous vertical DVI position
+		if (is.peek() == '[') {
+			// collect characters inside the brackets
+			string code;
+			for (int i=0; i < 9 && is.peek() != ']' && !is.eof(); ++i)
+				code += is.get();
+			if (is.peek() == ']')
+				code += is.get();
+
+			if (code == "[begin]" || code == "[nobreak]") {
+				moveToDVIPos();
+				exec_and_syncpos(_psi, is, _currentpoint, _actions);
+			}
+			else {
+				// no move to DVI position here
+				if (code != "[end]") // PS array?
+					_psi.execute(code);
+				exec_and_syncpos(_psi, is, _currentpoint, _actions);
 			}
-			_psi.execute(is);
+		}
+		else { // ps::<code> behaves like ps::[end]<code>
+			// no move to DVI position here
+			exec_and_syncpos(_psi, is, _currentpoint, _actions);
 		}
 	}
 	else { // ps: ...
-		updatePos();
+		_prevDviY = numeric_limits<double>::min();  // forget previous vertical DVI position
+		moveToDVIPos();
 		StreamInputReader in(is);
 		if (in.check(" plotfile ")) { // ps: plotfile fname
 			string fname = in.getString();
@@ -178,11 +220,11 @@ bool PsSpecialHandler::process (const char *prefix, istream &is, SpecialActions
 				Message::wstream(true) << "file '" << fname << "' not found in ps: plotfile\n";
 		}
 		else {
-			// execute literal PostScript (without any wrapping code)
-			_psi.execute(is);
-			_psi.execute(" setpos ");  // forces a call of PSActions::setpos to get the current PS position
-			_actions->setX(_currentpoint.x());
-			_actions->setY(_currentpoint.y());
+			// ps:<code> is almost identical to ps::[begin]<code> but does
+			// a final repositioning to the current DVI location
+			exec_and_syncpos(_psi, is, _currentpoint, _actions);
+			_prevDviY = numeric_limits<double>::min();  // forget previous vertical DVI position
+			moveToDVIPos();
 		}
 	}
 	return true;
@@ -198,23 +240,23 @@ void PsSpecialHandler::psfile (const string &fname, const map<string,string> &at
 		Message::wstream(true) << "file '" << fname << "' not found in special 'psfile'\n";
 	else {
 		map<string,string>::const_iterator it;
-		const double PT = 72.27/72.0;  // bp -> pt
+		const double pt = 72.27/72.0;  // bp -> pt
 
 		// bounding box of EPS figure
-		double llx = (it = attr.find("llx")) != attr.end() ? str2double(it->second)*PT : 0;
-		double lly = (it = attr.find("lly")) != attr.end() ? str2double(it->second)*PT : 0;
-		double urx = (it = attr.find("urx")) != attr.end() ? str2double(it->second)*PT : 0;
-		double ury = (it = attr.find("ury")) != attr.end() ? str2double(it->second)*PT : 0;
+		double llx = (it = attr.find("llx")) != attr.end() ? str2double(it->second)*pt : 0;
+		double lly = (it = attr.find("lly")) != attr.end() ? str2double(it->second)*pt : 0;
+		double urx = (it = attr.find("urx")) != attr.end() ? str2double(it->second)*pt : 0;
+		double ury = (it = attr.find("ury")) != attr.end() ? str2double(it->second)*pt : 0;
 
 		// desired width/height of resulting figure
-		double rwi = (it = attr.find("rwi")) != attr.end() ? str2double(it->second)/10.0*PT : -1;
-		double rhi = (it = attr.find("rhi")) != attr.end() ? str2double(it->second)/10.0*PT : -1;
+		double rwi = (it = attr.find("rwi")) != attr.end() ? str2double(it->second)/10.0*pt : -1;
+		double rhi = (it = attr.find("rhi")) != attr.end() ? str2double(it->second)/10.0*pt : -1;
 		if (rwi == 0 || rhi == 0 || urx-llx == 0 || ury-lly == 0)
 			return;
 
 		// user transformations (default values chosen according to dvips manual)
-		double hoffset = (it = attr.find("hoffset")) != attr.end() ? str2double(it->second)*PT : 0;
-		double voffset = (it = attr.find("voffset")) != attr.end() ? str2double(it->second)*PT : 0;
+		double hoffset = (it = attr.find("hoffset")) != attr.end() ? str2double(it->second)*pt : 0;
+		double voffset = (it = attr.find("voffset")) != attr.end() ? str2double(it->second)*pt : 0;
 //		double hsize   = (it = attr.find("hsize")) != attr.end() ? str2double(it->second) : 612;
 //		double vsize   = (it = attr.find("vsize")) != attr.end() ? str2double(it->second) : 792;
 		double hscale  = (it = attr.find("hscale")) != attr.end() ? str2double(it->second) : 100;
@@ -239,12 +281,12 @@ void PsSpecialHandler::psfile (const string &fname, const map<string,string> &at
 		// all following drawings are relative to (0,0)
 		_actions->setX(0);
 		_actions->setY(0);
-		updatePos();
+		moveToDVIPos();
 
 		_xmlnode = new XMLElementNode("g");
-		_psi.execute(" @beginspecial @setspecial "); // enter \special environment
+		_psi.execute("\n@beginspecial @setspecial "); // enter \special environment
 		_psi.execute(ifs);             // process EPS file
-		_psi.execute(" @endspecial "); // leave special environment
+		_psi.execute("\n@endspecial "); // leave special environment
 		if (!_xmlnode->empty()) {      // has anything been drawn?
 			Matrix m(1);
 			m.rotate(angle).scale(hscale/100, vscale/100).translate(hoffset, voffset);
@@ -261,7 +303,7 @@ void PsSpecialHandler::psfile (const string &fname, const map<string,string> &at
 		// restore DVI position
 		_actions->setX(x);
 		_actions->setY(y);
-		updatePos();
+		moveToDVIPos();
 
 		// update bounding box
 		m.scale(sx, -sy);
@@ -324,7 +366,7 @@ void PsSpecialHandler::stroke (vector<double> &p) {
 		XMLElementNode *path=0;
 		Pair<double> point;
 		if (_path.isDot(point)) {  // zero-length path?
-			if (_linecap == 1) {     // round line ends?  => draw dot
+			if (_linecap == 1) {    // round line ends?  => draw dot
 				double x = point.x();
 				double y = point.y();
 				double r = _linewidth/2.0;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/PsSpecialHandler.h
index 9c1e082e5dd..a99d994524e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/PsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/PsSpecialHandler.h
@@ -58,19 +58,21 @@ class PsSpecialHandler : public SpecialHandler, protected PSActions
 		const char* info () const;
 		const char** prefixes () const;
 		bool process (const char *prefix, std::istream &is, SpecialActions *actions);
+		void dviMovedTo (double x, double y);
 
 	protected:
 		void initialize (SpecialActions *actions);
-		void updatePos ();
+		void moveToDVIPos ();
 		void psfile (const std::string &fname, const std::map<std::string,std::string> &attr);
+		bool isPositionListener () const {return true;}
 
       /// scale given value by current PS scale factors
-      double scale (double v) const {return v*(_sx*_cos*_cos + _sy*(1-_cos)*(1-_cos));}
+      double scale (double v) const {return v*(_sx*_cos*_cos + _sy*(1-_cos*_cos));}
 
       void applyscalevals (std::vector<double> &p) {_sx = p[0]; _sy = p[1]; _cos = p[2];}
 		void clip (std::vector<double> &p)           {clip(p, false);}
 		void clip (std::vector<double> &p, bool evenodd);
-		void closepath (std::vector<double> &p);      
+		void closepath (std::vector<double> &p);
 		void curveto (std::vector<double> &p);
 		void eoclip (std::vector<double> &p)         {clip(p, true);}
 		void eofill (std::vector<double> &p)         {fill(p, true);}
@@ -82,6 +84,7 @@ class PsSpecialHandler : public SpecialHandler, protected PSActions
 		void lineto (std::vector<double> &p);
 		void moveto (std::vector<double> &p);
 		void newpath (std::vector<double> &p);
+		void querypos (std::vector<double> &p)       {_currentpoint = DPair(p[0], p[1]);}
 		void rotate (std::vector<double> &p);
 		void scale (std::vector<double> &p);
 		void setcmykcolor (std::vector<double> &cmyk);
@@ -94,10 +97,9 @@ class PsSpecialHandler : public SpecialHandler, protected PSActions
 		void setmatrix (std::vector<double> &p);
 		void setmiterlimit (std::vector<double> &p)  {_miterlimit = p[0]*1.00375;}
 		void setopacityalpha (std::vector<double> &p){_opacityalpha = p[0];}
-		void setpos (std::vector<double> &p)         {_currentpoint = DPair(p[0], p[1]);}
 		void setrgbcolor (std::vector<double> &rgb);
 		void stroke (std::vector<double> &p);
-		void translate (std::vector<double> &p);      
+		void translate (std::vector<double> &p);
 		void executed ();
 
    private:
@@ -106,7 +108,8 @@ class PsSpecialHandler : public SpecialHandler, protected PSActions
 		bool _initialized;
 		XMLElementNode *_xmlnode;   ///< if != 0, created SVG elements are appended to this node
 		Path _path;
-		DPair _currentpoint;        ///< current PS position
+		DPair _currentpoint;        ///< current PS position in bp units
+		double _prevDviY;           ///< previous vertical DVI position
       double _sx, _sy;            ///< horizontal and vertical scale factors retrieved by operator "applyscalevals"
       double _cos;                ///< cosine of angle between (1,0) and transform(1,0)
 		double _linewidth;          ///< current linewidth
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SVGTree.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/SVGTree.cpp
index 07cdca2a4b9..07cdca2a4b9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SVGTree.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/SVGTree.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SVGTree.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/SVGTree.h
index a9659f72b37..a9659f72b37 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SVGTree.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/SVGTree.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SignalHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/SignalHandler.cpp
index 00851d8502f..00851d8502f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SignalHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/SignalHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SignalHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/SignalHandler.h
index 70d2abd8ee8..70d2abd8ee8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SignalHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/SignalHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SpecialActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/SpecialActions.h
index b891bbadfba..74c8ce7c21b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SpecialActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/SpecialActions.h
@@ -35,6 +35,7 @@ struct SpecialActions
 	virtual double getY() const =0;
 	virtual void setX(double x) =0;
 	virtual void setY(double y) =0;
+   virtual void resetPosition () =0;
 	virtual void setColor (const Color &color) =0;
 	virtual Color getColor () const =0;
 	virtual void setMatrix (const Matrix &m) =0;
@@ -57,6 +58,7 @@ class SpecialEmptyActions : public SpecialActions
 		double getY() const {return 0;}
 		void setX(double x) {}
 		void setY(double y) {}
+   	void resetPosition () {}
 		void setColor (const Color &color) {}
 		void setBgColor (const Color &color) {}
 		Color getColor () const {return 0;}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/SpecialHandler.h
index 465d59aed25..45c4905ddb5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/SpecialHandler.h
@@ -27,6 +27,7 @@
 
 
 class SpecialActions;
+class SpecialManager;
 
 
 struct SpecialException : public MessageException
@@ -35,14 +36,22 @@ struct SpecialException : public MessageException
 };
 
 
-struct SpecialHandler
+class SpecialHandler
 {
-	virtual ~SpecialHandler () {}
-	virtual const char** prefixes () const=0;
-	virtual const char* info () const=0;
-	virtual const char* name () const=0;
-	virtual bool process (const char *prefix, std::istream &is, SpecialActions *actions)=0;
-	virtual void endPage () {}
+	friend class SpecialManager;
+
+	public:
+		virtual ~SpecialHandler () {}
+		virtual const char** prefixes () const=0;
+		virtual const char* info () const=0;
+		virtual const char* name () const=0;
+		virtual bool process (const char *prefix, std::istream &is, SpecialActions *actions)=0;
+		virtual void dviMovedTo (double x, double y) {}
+		virtual void dviEndPage () {}
+
+	protected:
+		virtual bool isEndPageListener () const  {return false;}
+		virtual bool isPositionListener () const {return false;}
 };
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SpecialManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/SpecialManager.cpp
index 1ac871aa131..7698726de7c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SpecialManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/SpecialManager.cpp
@@ -47,6 +47,10 @@ void SpecialManager::registerHandler (SpecialHandler *handler) {
 		_pool.push_back(handler);
 		for (const char **p=handler->prefixes(); *p; ++p)
 			_handlers[*p] = handler;
+		if (handler->isEndPageListener())
+			_endPageListeners.push_back(handler);
+		if (handler->isPositionListener())
+			_positionListeners.push_back(handler);
 	}
 }
 
@@ -100,6 +104,8 @@ bool SpecialManager::process (const string &special, SpecialActions *actions, Li
 		prefix += c;
 	if (ispunct(c)) // also add seperation character to identifying prefix
 		prefix += c;
+	if (prefix == "ps:" && iss.peek() == ':')
+		prefix += iss.get();
 	if (SpecialHandler *handler = findHandler(prefix)) {
 		if (listener)
 			listener->beginSpecial(prefix.c_str());
@@ -112,9 +118,15 @@ bool SpecialManager::process (const string &special, SpecialActions *actions, Li
 }
 
 
-void SpecialManager::notifyEndPage () {
-	FORALL(_handlers, Iterator, it)
-		it->second->endPage();
+void SpecialManager::notifyEndPage () const {
+	FORALL(_endPageListeners, HandlerPool::const_iterator, it)
+		(*it)->dviEndPage();
+}
+
+
+void SpecialManager::notifyPositionChange (double x, double y) const {
+	FORALL(_positionListeners, HandlerPool::const_iterator, it)
+		(*it)->dviMovedTo(x, y);
 }
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SpecialManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/SpecialManager.h
index 90033098687..555af4380ec 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/SpecialManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/SpecialManager.h
@@ -52,7 +52,8 @@ class SpecialManager
 		void registerHandlers (SpecialHandler **handlers, const char *ignorelist);
 		void unregisterHandlers ();
 		bool process (const std::string &special, SpecialActions *actions, Listener *listener=0) const;
-		void notifyEndPage ();
+		void notifyEndPage () const;
+		void notifyPositionChange (double x, double y) const;
 		void writeHandlerInfo (std::ostream &os) const;
 
 	protected:
@@ -63,6 +64,8 @@ class SpecialManager
    private:
 		HandlerPool _pool;     ///< stores pointers to all handlers
 		HandlerMap _handlers;  ///< pointers to handlers for corresponding prefixes
+		HandlerPool _endPageListeners;
+		HandlerPool _positionListeners;
 };
 
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/StreamReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/StreamReader.cpp
index 65c7149f780..65c7149f780 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/StreamReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/StreamReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/StreamReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/StreamReader.h
index 6fbd94e00de..6fbd94e00de 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/StreamReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/StreamReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/StreamWriter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/StreamWriter.cpp
index 2a1e7b4a34f..2a1e7b4a34f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/StreamWriter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/StreamWriter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/StreamWriter.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/StreamWriter.h
index 440bd94a2a9..440bd94a2a9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/StreamWriter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/StreamWriter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/System.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/System.cpp
index b57c0662462..b57c0662462 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/System.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/System.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/System.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/System.h
index 3485c27e6b5..3485c27e6b5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/System.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/System.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/TFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/TFM.cpp
index d56185d0086..d56185d0086 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/TFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/TFM.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/TFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/TFM.h
index 09accaea2c6..09accaea2c6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/TFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/TFM.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Terminal.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Terminal.cpp
index 0cbb4116796..0cbb4116796 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Terminal.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Terminal.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Terminal.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Terminal.h
index 33f71312ffe..33f71312ffe 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/Terminal.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/Terminal.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/TpicSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/TpicSpecialHandler.cpp
index 4b4f2054d40..fcd33a5bcf5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/TpicSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/TpicSpecialHandler.cpp
@@ -38,7 +38,7 @@ TpicSpecialHandler::TpicSpecialHandler () {
 }
 
 
-void TpicSpecialHandler::endPage () {
+void TpicSpecialHandler::dviEndPage () {
 	reset();
 }
 
@@ -51,10 +51,11 @@ void TpicSpecialHandler::reset () {
 
 
 /** Creates SVG elements that draw lines through the recorded points.
- *  @param[in] fill true if enclosed area should be filled
+ *  @param[in] stroke if true, the (out)line is drawn (in black)
+ *  @param[in] fill if true, enclosed area is filled with current color
  *  @param[in] ddist dash/dot distance of line in TeX point units
  *                   (0:solid line, >0:dashed line, <0:dotted line) */
-void TpicSpecialHandler::drawLines (bool fill, double ddist, SpecialActions *actions) {
+void TpicSpecialHandler::drawLines (bool stroke, bool fill, double ddist, SpecialActions *actions) {
 	if (actions && _points.size() > 0) {
 		XMLElementNode *elem=0;
 		if (_points.size() == 1) {
@@ -91,8 +92,10 @@ void TpicSpecialHandler::drawLines (bool fill, double ddist, SpecialActions *act
 				actions->embed(DPair(x, y));
 			}
 			elem->addAttribute("points", oss.str());
-			elem->addAttribute("stroke", "black");
-			elem->addAttribute("stroke-width", XMLString(_penwidth));
+			if (stroke) {   // draw outline?
+				elem->addAttribute("stroke", "black");
+				elem->addAttribute("stroke-width", XMLString(_penwidth));
+			}
 		}
 		if (ddist > 0)
 			elem->addAttribute("stroke-dasharray", XMLString(ddist));
@@ -111,7 +114,7 @@ void TpicSpecialHandler::drawSplines (double ddist, SpecialActions *actions) {
 	if (actions && _points.size() > 0) {
 		const size_t size = _points.size();
 		if (size < 3)
-			drawLines(false, ddist, actions);
+			drawLines(true, false, ddist, actions);
 		else {
 			double x = actions->getX();
 			double y = actions->getY();
@@ -259,16 +262,16 @@ bool TpicSpecialHandler::process (const char *prefix, istream &is, SpecialAction
 			break;
 		}
 		case cmd_id('f','p'): // draw solid lines through recorded points; close and fill path if fill color was defined
-			drawLines(_fill >= 0, 0, actions);
+			drawLines(true, _fill >= 0, 0, actions);
 			break;
-		case cmd_id('i','p'): // as above but always fill polygon
-			drawLines(true, 0, actions);
+		case cmd_id('i','p'): // don't draw outlines but close the recorded path and fill the resulting polygon
+			drawLines(false, true, 0, actions);
 			break;
 		case cmd_id('d','a'): // as fp but draw dashed lines
-			drawLines(_fill >= 0, in.getDouble()*72.27, actions);
+			drawLines(true, _fill >= 0, in.getDouble()*72.27, actions);
 			break;
 		case cmd_id('d','t'): // as fp but draw dotted lines
-			drawLines(_fill >= 0, -in.getDouble()*72.27, actions);
+			drawLines(true, _fill >= 0, -in.getDouble()*72.27, actions);
 			break;
 		case cmd_id('s','p'): { // draw quadratic splines through recorded points
 			double ddist = in.getDouble();
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/TpicSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/TpicSpecialHandler.h
index f14b58de670..30bae57358a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/TpicSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/TpicSpecialHandler.h
@@ -33,11 +33,12 @@ class TpicSpecialHandler : public SpecialHandler
 		const char* name () const   {return "tpic";}
 		const char** prefixes () const;
 		bool process (const char *prefix, std::istream &is, SpecialActions *actions);
-		void endPage ();
+		void dviEndPage ();
 
 	protected:
+		bool isEndPageListener () const {return true;}
 		void reset ();
-		void drawLines (bool fill, double ddist, SpecialActions *actions);
+		void drawLines (bool stroke, bool fill, double ddist, SpecialActions *actions);
 		void drawSplines (double ddist, SpecialActions *actions);
 		void drawArc (double cx, double cy, double rx, double ry, double angle1, double angle2, SpecialActions *actions);
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/VFActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/VFActions.h
index 898fd8850c1..898fd8850c1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/VFActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/VFActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/VFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/VFReader.cpp
index 57660c99825..57660c99825 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/VFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/VFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/VFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/VFReader.h
index 22e51f30a0e..22e51f30a0e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/VFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/VFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/VectorStream.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/VectorStream.h
index 228089db9b2..228089db9b2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/VectorStream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/VectorStream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLDocTypeNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/XMLDocTypeNode.h
index 490d398b6b7..490d398b6b7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLDocTypeNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/XMLDocTypeNode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLDocument.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/XMLDocument.cpp
index 39973266a7c..39973266a7c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLDocument.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/XMLDocument.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLDocument.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/XMLDocument.h
index 8adab2fb0dd..8adab2fb0dd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLDocument.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/XMLDocument.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLNode.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/XMLNode.cpp
index 3e5aa93ca62..3e5aa93ca62 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLNode.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/XMLNode.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/XMLNode.h
index e4576e9d830..e4576e9d830 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/XMLNode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLString.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/XMLString.cpp
index 630736b29f0..630736b29f0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLString.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/XMLString.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLString.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/XMLString.h
index 2f669e21fb7..2f669e21fb7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/XMLString.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/XMLString.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/dvisvgm.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/dvisvgm.cpp
index 90015fccbc7..90015fccbc7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/dvisvgm.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/dvisvgm.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/gzstream.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/gzstream.cpp
index 2893c299891..2893c299891 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/gzstream.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/gzstream.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/gzstream.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/gzstream.h
index 60f38c4fac7..60f38c4fac7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/gzstream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/gzstream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/iapi.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/iapi.h
index 8e29d938d03..8e29d938d03 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/iapi.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/iapi.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/ierrors.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/ierrors.h
index 3184341177e..3184341177e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/ierrors.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/ierrors.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/macros.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/macros.h
index d23cb825814..12be07323c7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/macros.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/macros.h
@@ -40,6 +40,6 @@
 	}
 
 #include <iostream>
-#define SHOW(x) std::cerr << __FILE__ ", " << __LINE__ << ": " << #x << "=" << (x) << std::endl
+#define SHOW(x) std::cerr << ">>> " << __FILE__ ", " << __LINE__ << ": " << #x << "=" << (x) << std::endl
 
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/options.xml b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/options.xml
index 10846285b3d..10846285b3d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/options.xml
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/options.xml
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/psdefs.psc b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/psdefs.psc
new file mode 100644
index 00000000000..312084393d1
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/psdefs.psc
@@ -0,0 +1,66 @@
+/*************************************************************************
+** psdefs.psc                                                           **
+**                                                                      **
+** This file is part of dvisvgm -- the DVI to SVG converter             **
+** Copyright (C) 2005-2011 Martin Gieseking <martin.gieseking@uos.de>   **
+**                                                                      **
+** This program is free software; you can redistribute it and/or        ** 
+** modify it under the terms of the GNU General Public License as       **
+** published by the Free Software Foundation; either version 3 of       **
+** the License, or (at your option) any later version.                  **
+**                                                                      **
+** This program is distributed in the hope that it will be useful, but  **
+** WITHOUT ANY WARRANTY; without even the implied warranty of           **
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the         **
+** GNU General Public License for more details.                         **
+**                                                                      **
+** You should have received a copy of the GNU General Public License    **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. ** 
+*************************************************************************/
+
+const char *PSInterpreter::PSDEFS =
+"3 dict dup begin/Install{matrix setmatrix}def/HWResolution[72 72]def/PageSize[10"
+"000 10000]def end setpagedevice/@dodraw true store/@SD systemdict def true setgl"
+"obal @SD/:save @SD/save get put @SD/:restore @SD/restore get put @SD/:gsave @SD/"
+"gsave get put @SD/:grestore @SD/grestore get put @SD/:stroke @SD/stroke get put "
+"@SD/:fill @SD/fill get put @SD/:eofill @SD/eofill get put @SD/:clip @SD/clip get"
+" put @SD/:eoclip @SD/eoclip get put @SD/:charpath @SD/charpath get put @SD/.seto"
+"pacityalpha known not{@SD/.setopacityalpha{pop}put}if @SD/prval{dup type/stringt"
+"ype eq{print}{30 string cvs print}ifelse}put @SD/prseq{-1 1{-1 roll prval( )prin"
+"t}for(\\n)print}put @SD/prcmd{( )exch(\\ndvi.)3{print}repeat prseq}put @SD/cvxal"
+"l{{cvx}forall}put @SD/defpr{[exch[/copy @SD]cvxall 5 -1 roll dup 6 1 roll[/get/e"
+"xec]cvxall 6 -1 roll dup 7 1 roll 4 -1 roll dup 5 1 roll dup length string cvs/p"
+"rcmd cvx]cvx def}put @SD/querypos{{currentpoint}stopped{$error/newerror false pu"
+"t}{2(querypos)prcmd}ifelse}put @SD/applyscalevals{1 0 transform 0 0 transform 3 "
+"-1 roll sub dup mul 3 1 roll sub dup mul add sqrt 0 1 transform 0 0 transform 3 "
+"-1 roll sub dup mul 3 1 roll sub dup mul add sqrt 1 0 transform dup mul exch dup"
+" dup mul 3 -1 roll add sqrt div 3(applyscalevals)prcmd}def @SD/prpath{{2(moveto)"
+"prcmd}{2(lineto)prcmd}{6(curveto)prcmd}{0(closepath)prcmd}pathforall}put @SD/cha"
+"rpath{/@dodraw false store :charpath/@dodraw true store}put @SD/show{@dodraw{tru"
+"e charpath eofill}if}put @SD/stroke{@dodraw{0(newpath)prcmd prpath 0(stroke)prcm"
+"d newpath}{:stroke}ifelse}put @SD/fill{@dodraw{0(newpath)prcmd prpath 0(fill)prc"
+"md newpath}{:fill}ifelse}put @SD/eofill{@dodraw{0(newpath)prcmd prpath 0(eofill)"
+"prcmd newpath}{:eofill}ifelse}put @SD/clip{:clip 0(newpath)prcmd prpath 0(clip)p"
+"rcmd}put @SD/eoclip{:eoclip 0(newpath)prcmd prpath 0(eoclip)prcmd}put false setg"
+"lobal @SD readonly pop/initclip 0 defpr/sysexec{@SD exch get exec}def/adddot{dup"
+" length 1 add string dup 0 46 put dup 3 -1 roll 1 exch putinterval}def/setlinewi"
+"dth{dup/setlinewidth sysexec applyscalevals 1(setlinewidth)prcmd}def/setlinecap "
+"1 defpr/setlinejoin 1 defpr/setmiterlimit 1 defpr/setdash{mark 3 1 roll 2 copy/s"
+"etdash sysexec applyscalevals exch aload length 1 add -1 roll counttomark(setdas"
+"h)prcmd pop}def/setgstate{currentlinewidth 1(setlinewidth)prcmd currentlinecap 1"
+"(setlinecap)prcmd currentlinejoin 1(setlinejoin)prcmd currentmiterlimit 1(setmit"
+"erlimit)prcmd currentrgbcolor 3(setrgbcolor)prcmd 6 array currentmatrix aload po"
+"p 6(setmatrix)prcmd currentdash mark 3 1 roll exch aload length 1 add -1 roll co"
+"unttomark(setdash)prcmd pop 0(grestore)prcmd}def/save{:save 0(gsave)prcmd}def/re"
+"store{:restore setgstate}def/gsave 0 defpr/grestore{:grestore setgstate}def/rota"
+"te{dup type/arraytype ne{dup 1(rotate)prcmd}if/rotate sysexec}def/scale{dup type"
+"/arraytype ne{2 copy 2(scale)prcmd}if/scale sysexec}def/translate{dup type/array"
+"type ne{2 copy 2(translate)prcmd}if/translate sysexec}def/setmatrix{dup/setmatri"
+"x sysexec aload pop 6(setmatrix)prcmd}def/initmatrix{matrix setmatrix}def/concat"
+"{matrix currentmatrix matrix concatmatrix setmatrix}def/setgray 1 defpr/setcmykc"
+"olor 4 defpr/sethsbcolor 3 defpr/setrgbcolor 3 defpr/.setopacityalpha{dup/.setop"
+"acityalpha sysexec 1(setopacityalpha)prcmd}def/.handleerror errordict/handleerro"
+"r get def errordict begin/handleerror{0(beginerror)prcmd .handleerror 0(enderror"
+")prcmd}.bind def end ";
+
+// vim: set syntax=cpp:
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/types.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/types.h
index f404565df96..f404565df96 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/src/types.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/src/types.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/BoundingBoxTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/BoundingBoxTest.cpp
index 3e092af7f13..3e092af7f13 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/BoundingBoxTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/BoundingBoxTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/CRC32Test.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/CRC32Test.cpp
index bd5015df06f..bd5015df06f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/CRC32Test.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/CRC32Test.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/CalculatorTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/CalculatorTest.cpp
index 6d9a095370c..6d9a095370c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/CalculatorTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/CalculatorTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/ColorSpecialTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/ColorSpecialTest.cpp
index 1fd0cbf6930..1fd0cbf6930 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/ColorSpecialTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/ColorSpecialTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/CommandLineTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/CommandLineTest.cpp
index 3de612db08e..3de612db08e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/CommandLineTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/CommandLineTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/DirectoryTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/DirectoryTest.cpp
index 37b46b7c080..37b46b7c080 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/DirectoryTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/DirectoryTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FileFinderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/FileFinderTest.cpp
index 64772a1f8d2..64772a1f8d2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FileFinderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/FileFinderTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FilePathTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/FilePathTest.cpp
index 04449fcf919..04449fcf919 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FilePathTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/FilePathTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FileSystemTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/FileSystemTest.cpp
index 5b8c6912d31..5b8c6912d31 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FileSystemTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/FileSystemTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FontManagerTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/FontManagerTest.cpp
index e7259b80f7c..e7259b80f7c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FontManagerTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/FontManagerTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FontMapTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/FontMapTest.cpp
index 92bd6420724..92bd6420724 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/FontMapTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/FontMapTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/GFReaderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/GFReaderTest.cpp
index ae527feddbf..ae527feddbf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/GFReaderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/GFReaderTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/GraphicPathTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/GraphicPathTest.cpp
index 6263dc90178..6263dc90178 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/GraphicPathTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/GraphicPathTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/LengthTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/LengthTest.cpp
index c7c38f755c4..c7c38f755c4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/LengthTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/LengthTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/Makefile.am
index 44ec80dd990..44ec80dd990 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/Makefile.in
index 8919d065389..8919d065389 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/MatrixTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/MatrixTest.cpp
index 9567d52c6ea..9567d52c6ea 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/MatrixTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/MatrixTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/MessageExceptionTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/MessageExceptionTest.cpp
index 11eb87c29eb..11eb87c29eb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/MessageExceptionTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/MessageExceptionTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/PSInterpreterTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/PSInterpreterTest.cpp
index 10b87904068..23a072cb172 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/PSInterpreterTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/PSInterpreterTest.cpp
@@ -42,6 +42,7 @@ class PSTestActions : public PSActions
 		void lineto (vector<double> &p)          {print("lineto", p);}
 		void moveto (vector<double> &p)          {print("moveto", p);}
 		void newpath (vector<double> &p)         {print("newpath", p);}
+		void querypos (vector<double> &p)        {print("querypos", p);}
 		void rotate (vector<double> &p)          {print("rotate", p);}
 		void scale (vector<double> &p)           {print("scale", p);}
 		void setcmykcolor (vector<double> &p)    {print("setcmykcolor", p);}
@@ -54,7 +55,6 @@ class PSTestActions : public PSActions
 		void setmatrix (vector<double> &p)       {print("setmatrix", p);}
 		void setmiterlimit (vector<double> &p)   {print("setmiterlimit", p);}
 		void setopacityalpha (vector<double> &p) {print("setopacityalpha", p);}
-		void setpos (vector<double> &p)          {print("setpos", p);}
 		void setrgbcolor (vector<double> &p)     {print("setrgbcolor", p);}
 		void stroke (vector<double> &p)          {print("stroke", p);}
 		void translate (vector<double> &p)       {print("translate", p);}
@@ -93,7 +93,7 @@ TEST(PSInterpreterTest, gsave_grestore) {
 	psi.execute("grestore ");
 	ASSERT_EQ(actions.result(), "setlinewidth 1;setlinecap 0;setlinejoin 0;setmiterlimit 10;setrgbcolor 0 0 0;setmatrix 1 0 0 1 0 0;setdash 0;grestore;");
 	actions.clear();
-	
+
 	psi.execute("1 setlinecap 5 setmiterlimit 0 1 0 setrgbcolor gsave 0 setlinecap 10 setmiterlimit ");
 	ASSERT_EQ(actions.result(), "setlinecap 1;setmiterlimit 5;setrgbcolor 0 1 0;gsave;setlinecap 0;setmiterlimit 10;");
 	actions.clear();
@@ -149,15 +149,15 @@ TEST(PSInterpreterTest, setlinewidth) {
 	psi.execute("10 setlinewidth ");
 	ASSERT_EQ(actions.result(), "applyscalevals 1 1 1;setlinewidth 10;");
 	actions.clear();
-	
+
 	psi.execute("5 5 scale 10 setlinewidth ");
 	ASSERT_EQ(actions.result(), "scale 5 5;applyscalevals 5 5 1;setlinewidth 10;");
 	actions.clear();
-	
+
 	psi.execute("90 rotate 10 setlinewidth ");
 	ASSERT_EQ(actions.result(), "rotate 90;applyscalevals 5 5 0;setlinewidth 10;");
 	actions.clear();
-	
+
 	psi.execute("-30 rotate 10 setlinewidth ");
 	ASSERT_EQ(actions.result(), "rotate -30;applyscalevals 5 5 0.5;setlinewidth 10;");
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/PageRagesTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/PageRagesTest.cpp
index 353ea15b7d1..353ea15b7d1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/PageRagesTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/PageRagesTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/PageSizeTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/PageSizeTest.cpp
index 785fde6d162..785fde6d162 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/PageSizeTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/PageSizeTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/PairTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/PairTest.cpp
index 9807cc7a353..9807cc7a353 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/PairTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/PairTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/SplittedCharInputBufferTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/SplittedCharInputBufferTest.cpp
index ff8970da2c7..ff8970da2c7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/SplittedCharInputBufferTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/SplittedCharInputBufferTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/StreamInputBufferTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/StreamInputBufferTest.cpp
index 56769671708..56769671708 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/StreamInputBufferTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/StreamInputBufferTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/StreamReaderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/StreamReaderTest.cpp
index 1b7fd35ad90..1b7fd35ad90 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/StreamReaderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/StreamReaderTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/StreamWriterTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/StreamWriterTest.cpp
index 4256ce84448..4256ce84448 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/StreamWriterTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/StreamWriterTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/TypesTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/TypesTest.cpp
index 5d30cef2369..5d30cef2369 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/TypesTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/TypesTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/VectorStreamTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/VectorStreamTest.cpp
index 14b03ac763b..14b03ac763b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/VectorStreamTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/VectorStreamTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/check-conv b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/check-conv
index 7b0270231b1..7b0270231b1 100755
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/check-conv
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/check-conv
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/cmr10.600gf b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/cmr10.600gf
index 6dca421e21c..6dca421e21c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/cmr10.600gf
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/cmr10.600gf
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/frktest-nf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/frktest-nf-cmp.svg
index 7c40a685071..7c40a685071 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/frktest-nf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/frktest-nf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/frktest-wf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/frktest-wf-cmp.svg
index 93212ad4abc..93212ad4abc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/frktest-wf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/frktest-wf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/frktest.dvi b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/frktest.dvi
index 723b08a2964..723b08a2964 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/frktest.dvi
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/frktest.dvi
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/normalize.xsl b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/normalize.xsl
index 5a6ba2f62d6..5a6ba2f62d6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/normalize.xsl
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/normalize.xsl
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/sample-nf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/sample-nf-cmp.svg
index e51d037f0ab..e51d037f0ab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/sample-nf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/sample-nf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/sample-wf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/sample-wf-cmp.svg
index 49d3cd37551..49d3cd37551 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/sample-wf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/sample-wf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/sample.dvi b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/sample.dvi
index 87e6236021d..87e6236021d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/sample.dvi
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.7/tests/sample.dvi
diff --git a/Build/source/texk/dvisvgm/version.ac b/Build/source/texk/dvisvgm/version.ac
new file mode 100644
index 00000000000..69926f9db00
--- /dev/null
+++ b/Build/source/texk/dvisvgm/version.ac
@@ -0,0 +1,11 @@
+dnl
+dnl   Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl
+dnl   This file is free software; the copyright holder
+dnl   gives unlimited permission to copy and/or distribute it,
+dnl   with or without modifications, as long as this notice is preserved.
+dnl
+dnl --------------------------------------------------------
+dnl
+dnl  m4-include this file to define the current dvisvgm version
+m4_define([dvisvgm_version], [1.0.7])