dvisvgm 1.0.3 (6 aug 10)

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

192 files changed, 278 insertions, 319 deletions

diff --git a/Build/source/texk/README b/Build/source/texk/README
index dd97f90326f..a1735ed8bb5 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -60,8 +60,8 @@ dvipos - ?
 
 dvipsk - maintained here by Tom Rokicki, Karl Berry, Akira Kakuto, ...
 
-dvisvgm - checked 11jun10
-  http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.0.1.tar.gz
+dvisvgm - checked 1oct10
+  http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.0.3.tar.gz
 
 gsftopk - from Paul Vojta's xdvi?
 
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index 994b9d15d91..acd815dad0c 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Imported release 1.0.3.
+	* configure.ac: Adapted.
+
 2010-06-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Imported release 1.0.2.
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index cccdf852dfe..3aae74e5c88 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.2.
+# Generated by GNU Autoconf 2.68 for dvisvgm 1.0.3.
 #
 # 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.2'
-PACKAGE_STRING='dvisvgm 1.0.2'
+PACKAGE_VERSION='1.0.3'
+PACKAGE_STRING='dvisvgm 1.0.3'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="dvisvgm-1.0.2/src/dvisvgm.cpp"
+ac_unique_file="dvisvgm-1.0.3/src/dvisvgm.cpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1341,7 +1341,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.2 to adapt to many kinds of systems.
+\`configure' configures dvisvgm 1.0.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1411,7 +1411,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvisvgm 1.0.2:";;
+     short | recursive ) echo "Configuration of dvisvgm 1.0.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1538,7 +1538,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvisvgm configure 1.0.2
+dvisvgm configure 1.0.3
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2230,7 +2230,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.2, which was
+It was created by dvisvgm $as_me 1.0.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -7584,7 +7584,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvisvgm'
- VERSION='1.0.2'
+ VERSION='1.0.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17250,7 +17250,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dvisvgm config.lt 1.0.2
+dvisvgm config.lt 1.0.3
 configured by $0, generated by GNU Autoconf 2.68.
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -18953,7 +18953,7 @@ CPPFLAGS=$kpse_save_CPPFLAGS
 LIBS=$kpse_save_LIBS
 
 
-DVISVGM_TREE=dvisvgm-1.0.2
+DVISVGM_TREE=dvisvgm-1.0.3
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -19505,7 +19505,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.2, which was
+This file was extended by dvisvgm $as_me 1.0.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19571,7 +19571,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.2
+dvisvgm config.status 1.0.3
 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 5fccab6cc28..cb043ba57b7 100644
--- a/Build/source/texk/dvisvgm/configure.ac
+++ b/Build/source/texk/dvisvgm/configure.ac
@@ -13,7 +13,7 @@ dnl  Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de>
 dnl
 dnl *********************************************************************
 dnl
-m4_define([dvisvgm_version], [1.0.2])[]dnl using unmodified dvisvgm source tree
+m4_define([dvisvgm_version], [1.0.3])[]dnl using unmodified dvisvgm source tree
 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.2-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/TL-Changes
deleted file mode 100644
index 06f9b20b7a2..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/TL-Changes
+++ /dev/null
@@ -1,10 +0,0 @@
-Changes applied to the dvisvgm-1.0.2 tree as obtained from:
-	http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.0.2.tar.gz
-
-Removed:
-	config.guess
-	config.sub
-	depcomp
-	install-sh
-	missing
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/patch-01-path b/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/patch-01-path
deleted file mode 100644
index de62a54225f..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/patch-01-path
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ur dvisvgm-1.0.2.orig/src/GraphicPath.h dvisvgm-1.0.2/src/GraphicPath.h
---- dvisvgm-1.0.2.orig/src/GraphicPath.h	2010-06-16 19:09:47.000000000 +0200
-+++ dvisvgm-1.0.2/src/GraphicPath.h	2010-07-05 10:38:09.963061244 +0200
-@@ -247,7 +247,7 @@
-  *  @param[in] optimize if true, shorthand drawing commands (sconicto, scubicto,...) are considered */
- template <typename T>
- void GraphicPath<T>::iterate (Actions &actions, bool optimize) const {
--	ConstIterator prev;  // pointer to preceding command
-+	ConstIterator prev = _commands.end();  // pointer to preceding command
- 	Point fp; // first point of current path
- 	Point cp; // current point
- 	Point pstore[2];
-@@ -280,7 +280,7 @@
- 				}
- 				break;
- 			case Command::CONICTO:
--				if (optimize && prev->type == Command::CONICTO && params[0] == pstore[1]*T(2)-pstore[0]) {
-+				if (optimize && prev != _commands.end() && prev->type == Command::CONICTO && params[0] == pstore[1]*T(2)-pstore[0]) {
- 					actions.sconicto(params[1]);
- 					actions.draw('T', params+1, 1);
- 				}
-@@ -293,7 +293,7 @@
- 				break;
- 			case Command::CUBICTO:
- 				// is first control point reflection of preceding second control point?
--				if (optimize && prev->type == Command::CUBICTO && params[0] == pstore[1]*T(2)-pstore[0]) {
-+				if (optimize && prev != _commands.end() && prev->type == Command::CUBICTO && params[0] == pstore[1]*T(2)-pstore[0]) {
- 					actions.scubicto(params[1], params[2]);
- 					actions.draw('S', params+1, 2);
- 				}
-diff -ur dvisvgm-1.0.2.orig/src/PsSpecialHandler.h dvisvgm-1.0.2/src/PsSpecialHandler.h
---- dvisvgm-1.0.2.orig/src/PsSpecialHandler.h	2010-06-17 19:07:35.000000000 +0200
-+++ dvisvgm-1.0.2/src/PsSpecialHandler.h	2010-07-05 10:38:09.963061244 +0200
-@@ -31,9 +31,10 @@
- 
- class PsSpecialHandler : public SpecialHandler, protected PSActions
- {
-+	typedef GraphicPath<double> Path;
-+	
- 	class ClippingStack
- 	{
--		typedef GraphicPath<double> Path;
- 		public:
- 			void push ();
- 			void push (const Path &path);
-@@ -100,7 +101,7 @@
- 		SpecialActions *_actions;
- 		bool _initialized;
- 		XMLElementNode *_xmlnode;   ///< if != 0, created SVG elements are appended to this node
--		GraphicPath<double> _path;
-+		Path _path;
- 		DPair _currentpoint;        ///< current PS position
- 		double _linewidth;          ///< current linewidth
- 		double _miterlimit;         ///< current miter limit
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/patch-02-namespace b/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/patch-02-namespace
deleted file mode 100644
index ed4a24d2bb7..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/patch-02-namespace
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur dvisvgm-1.0.2.orig/src/InputBuffer.h dvisvgm-1.0.2/src/InputBuffer.h
---- dvisvgm-1.0.2.orig/src/InputBuffer.h	2010-06-16 19:08:12.000000000 +0200
-+++ dvisvgm-1.0.2/src/InputBuffer.h	2010-07-05 10:39:29.396407278 +0200
-@@ -4,7 +4,7 @@
- ** This file is part of dvisvgm -- the DVI to SVG converter             **
- ** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>   **
- **                                                                      **
--** This program is free software; you can redistribute it and/or        ** 
-+** 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.                  **
-@@ -15,7 +15,7 @@
- ** 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/>. ** 
-+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
- *************************************************************************/
- 
- #ifndef INPUTBUFFER_H
-@@ -101,7 +101,7 @@
- 			_size = size;
- 		}
- 
--		void assign (const char *buf) {assign(buf, strlen(buf));}
-+		void assign (const char *buf) {assign(buf, std::strlen(buf));}
- 		int peek () const             {return _size > 0 ? *_pos : -1;}
- 		int peek (unsigned n) const   {return _size >= n ? _pos[n] : -1;}
- 		bool eof () const             {return _size <= 0;}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/patch-03-esc b/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/patch-03-esc
deleted file mode 100644
index 68969261935..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/patch-03-esc
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur dvisvgm-1.0.2.orig/src/Terminal.cpp dvisvgm-1.0.2/src/Terminal.cpp
---- dvisvgm-1.0.2.orig/src/Terminal.cpp	2010-06-08 10:40:37.000000000 +0200
-+++ dvisvgm-1.0.2/src/Terminal.cpp	2010-07-05 10:40:35.135954475 +0200
-@@ -134,9 +134,9 @@
- 	}
- #else
- 	if (color == DEFAULT)
--		os << "\e[0m";
-+		os << "\x1B[0m";
- 	else
--		os << "\e[" << (light ? '1': '0') << ';' << (30+(color & 0x07)) << 'm';
-+		os << "\x1B[" << (light ? '1': '0') << ';' << (30+(color & 0x07)) << 'm';
- #endif
- }
- 
-@@ -158,8 +158,8 @@
- 	}
- #else
- 	if (color == DEFAULT)
--		os << "\e[0m";
-+		os << "\x1B[0m";
- 	else
--		os << "\e[" << (40+(color & 0x07)) << 'm';
-+		os << "\x1B[" << (40+(color & 0x07)) << 'm';
- #endif
- }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.0.3-PATCHES/ChangeLog
index ceca1f0d96e..c6e2c5e108f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported release 1.0.3.
+
+	Removed patch-01-path, patch-02-namespace, and patch-03-esc,
+	now all included in the original source tree.
+
 2010-09-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Added patch-04-freetype to allow to build with freetype-2.4.0
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.3-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.0.3-PATCHES/TL-Changes
new file mode 100644
index 00000000000..a979ee038bb
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3-PATCHES/TL-Changes
@@ -0,0 +1,11 @@
+Changes applied to the dvisvgm-1.0.3 tree as obtained from:
+	http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.0.3.tar.gz
+
+Removed:
+	config.guess
+	config.rpath
+	config.sub
+	depcomp
+	install-sh
+	missing
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/patch-04-freetype b/Build/source/texk/dvisvgm/dvisvgm-1.0.3-PATCHES/patch-04-freetype
index 364711a9bfd..714ec171644 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/patch-04-freetype
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3-PATCHES/patch-04-freetype
@@ -1,6 +1,8 @@
-diff -ur dvisvgm-1.0.2.orig/src/FontEngine.cpp dvisvgm-1.0.2/src/FontEngine.cpp
---- dvisvgm-1.0.2.orig/src/FontEngine.cpp	2010-06-16 19:08:12.000000000 +0200
-+++ dvisvgm-1.0.2/src/FontEngine.cpp	2010-09-23 17:52:38.000000000 +0200
+	Allow to build with, e.g., freetype-2.4.0.
+
+diff -ur dvisvgm-1.0.3.orig/src/FontEngine.cpp dvisvgm-1.0.3/src/FontEngine.cpp
+--- dvisvgm-1.0.3.orig/src/FontEngine.cpp	2010-08-04 10:33:35.000000000 +0200
++++ dvisvgm-1.0.3/src/FontEngine.cpp	2010-10-01 15:57:26.367478311 +0200
 @@ -262,7 +262,7 @@
  
  
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/AUTHORS b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/AUTHORS
index 837e1e96bfb..837e1e96bfb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/AUTHORS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/AUTHORS
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/COPYING b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/COPYING
index 94a9ed024d3..94a9ed024d3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/COPYING
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/COPYING
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/INSTALL b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/INSTALL
index a4b34144dcf..a4b34144dcf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/INSTALL
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/INSTALL
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/LGPL-2.1.txt b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/LGPL-2.1.txt
index 602bfc94635..602bfc94635 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/LGPL-2.1.txt
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/LGPL-2.1.txt
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/Makefile.am
index 8b330e8e7c0..8b330e8e7c0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/Makefile.in
index aaf403c1fe2..626e7905948 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/Makefile.in
@@ -38,7 +38,8 @@ subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING INSTALL NEWS \
-	config.guess config.sub depcomp install-sh missing
+	config.guess config.rpath config.sub depcomp install-sh \
+	missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/NEWS b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/NEWS
index becfa1bef1d..c0ea0e8754d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/NEWS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/NEWS
@@ -1,3 +1,8 @@
+dvisvgm-1.0.3
+- 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
 - applied latest TeX Live portability patches sent by Peter Breitenlohner and Karl Berry
 - fixed a potrace name clash occurred on Mac OS X Tiger
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/README b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/README
index e83d7f09ff6..e83d7f09ff6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/README
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/README
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/aclocal.m4 b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/aclocal.m4
index 721df62391d..721df62391d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/aclocal.m4
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/aclocal.m4
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/config.h.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/config.h.in
index b027999e9b3..b027999e9b3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/config.h.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/config.h.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/configure b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/configure
index 3791732c742..1dec27697c1 100755
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/configure
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for dvisvgm 1.0.2.
+# Generated by GNU Autoconf 2.65 for dvisvgm 1.0.3.
 #
 # 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.2'
-PACKAGE_STRING='dvisvgm 1.0.2'
+PACKAGE_VERSION='1.0.3'
+PACKAGE_STRING='dvisvgm 1.0.3'
 PACKAGE_BUGREPORT='martin.gieseking@uos.de'
 PACKAGE_URL=''
 
@@ -1266,7 +1266,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.2 to adapt to many kinds of systems.
+\`configure' configures dvisvgm 1.0.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1337,7 +1337,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvisvgm 1.0.2:";;
+     short | recursive ) echo "Configuration of dvisvgm 1.0.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1436,7 +1436,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvisvgm configure 1.0.2
+dvisvgm configure 1.0.3
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1899,7 +1899,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.2, which was
+It was created by dvisvgm $as_me 1.0.3, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2821,7 +2821,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvisvgm'
- VERSION='1.0.2'
+ VERSION='1.0.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6837,7 +6837,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.2, which was
+This file was extended by dvisvgm $as_me 1.0.3, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6903,7 +6903,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.2
+dvisvgm config.status 1.0.3
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/configure.ac b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/configure.ac
index 35768f3450f..383c6041de4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/configure.ac
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/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.2],[martin.gieseking@uos.de])
+AC_INIT([dvisvgm],[1.0.3],[martin.gieseking@uos.de])
 DATE="May 2010"
 AC_CONFIG_SRCDIR(src)
 AC_CONFIG_HEADER(config.h)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/doc/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/doc/Makefile.am
index e9c79906fde..e9c79906fde 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/doc/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/doc/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/doc/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/doc/Makefile.in
index d08fc354c5d..d08fc354c5d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/doc/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/doc/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/doc/dvisvgm.1 b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/doc/dvisvgm.1
index 74d82bce23a..13970ac2de4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/doc/dvisvgm.1
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/doc/dvisvgm.1
@@ -2,12 +2,12 @@
 .\"     Title: dvisvgm
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/22/2010
+.\"      Date: 08/06/2010
 .\"    Manual: dvisvgm Manual
-.\"    Source: dvisvgm 1.0.2
+.\"    Source: dvisvgm 1.0.3
 .\"  Language: English
 .\"
-.TH "DVISVGM" "1" "06/22/2010" "dvisvgm 1\&.0\&.2" "dvisvgm Manual"
+.TH "DVISVGM" "1" "08/06/2010" "dvisvgm 1\&.0\&.3" "dvisvgm Manual"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -168,7 +168,8 @@ only affects the bounding box and does not transform the page content\&. Hence i
 Scales page content horizontally by
 \fIsx\fR
 and vertically by
-\fIsy\fR\&. This option is equivalent to *\-TS*\fIsx\fR,\fIsy\fR\&.
+\fIsy\fR\&. This option is equivalent to
+\fB\-TS\fR\fIsx\fR,\fIsy\fR\&.
 .RE
 .PP
 \fB\-C, \-\-cache\fR[=\fIdir\fR]
@@ -201,7 +202,7 @@ Prints a short summary of all available command\-line options\&.
 .PP
 \fB\-\-libgs=filename\fR
 .RS 4
-This option is only available if the Ghostscript library is not directly linked to dvisvgm and PostScript support was not completely disabled\&. In this case, dvisvgm tries to load the shared GS library dynamically during runtime\&. By default, it expects the library\(cqs name to be libgs\&.so (Linux) or gsdll32\&.dll (Windows)\&. Option
+This option is only available if the Ghostscript library is not directly linked to dvisvgm and PostScript support was not completely disabled\&. In this case, dvisvgm tries to load the shared GS library dynamically during runtime\&. By default, it expects the library\(cqs name to be libgs\&.so (on Unix\-like systems) or gsdll32\&.dll (Windows)\&. Option
 \fB\-\-libgs\fR
 can be used to give a different name\&. Alternatively, the GS library name can also be set by the environment variable
 \fBLIBGS\fR\&. The latter has a less precedence than the command\-line option\&.
@@ -652,7 +653,7 @@ introduced its own set of specials in order to embed PostScript code into DVI fi
 \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,
 \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 Linux 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 PATH environment variable\&. If it cannot be found, the evaluation of PostScript specials is disabled\&. Use option
+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
 \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.2/doc/dvisvgm.txt.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/doc/dvisvgm.txt.in
index 3003fb44e16..1c4cba19500 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/doc/dvisvgm.txt.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/doc/dvisvgm.txt.in
@@ -119,7 +119,7 @@ you choose a landscape format the page won't be rotated.
 //
 *-c, --scale*='sx'[,'sy']::
 Scales page content horizontally by 'sx' and vertically by 'sy'. This option is equivalent 
-to *-TS*__sx__,__sy__.
+to *-TS*'sx','sy'.
 
 
 *-C, --cache*[='dir']::
@@ -151,10 +151,10 @@ Prints a short summary of all available command-line options.
 *--libgs=filename*::
 This option is only available if the Ghostscript library is not directly linked to dvisvgm and
 PostScript support was not completely disabled. In this case, dvisvgm tries to load the shared 
-GS library dynamically during runtime. By default, it expects the library's name to be libgs.so (Linux) 
-or gsdll32.dll (Windows). Option *--libgs* can be used to give a different name. Alternatively, 
-the GS library name can also be set by the environment variable *LIBGS*. The latter has a less 
-precedence than the command-line option.
+GS library dynamically during runtime. By default, it expects the library's name to be libgs.so 
+(on Unix-like systems) or gsdll32.dll (Windows). Option *--libgs* can be used to give a different 
+name. Alternatively, the GS library name can also be set by the environment variable *LIBGS*. 
+The latter has a less precedence than the command-line option.
 
 
 *-l, --list-specials*::
@@ -445,10 +445,10 @@ which greatly improves the capabilities of DVI documents. One aim of *dvisvgm* i
 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
 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 Linux systems, and gsdll32.dll on Windows. You can override these
+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 PATH environment variable. If it cannot
-be found, the evaluation of PostScript specials is disabled. Use option *--list-specials* to check whether 
+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.
 
 *tpic*::
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/Makefile.am
index 97bf78f50f4..97bf78f50f4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/Makefile.in
index 01af70e8ac1..01af70e8ac1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/auxiliary.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/auxiliary.h
index 7baab851cff..7baab851cff 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/auxiliary.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/auxiliary.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/bitmap.h
index 2a172b1ad6a..2a172b1ad6a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/curve.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/curve.c
index 6a4ac6df4b5..6a4ac6df4b5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/curve.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/curve.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/curve.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/curve.h
index 60b22d6f492..60b22d6f492 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/curve.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/curve.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/decompose.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/decompose.c
index f5057d65419..f5057d65419 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/decompose.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/decompose.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/decompose.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/decompose.h
index 512baf14d21..512baf14d21 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/decompose.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/decompose.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/lists.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/lists.h
index 931cbb04a73..931cbb04a73 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/lists.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/lists.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/potracelib.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/potracelib.c
index 2b247b6a125..2b247b6a125 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/potracelib.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/potracelib.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/potracelib.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/potracelib.h
index 5791d1d73d6..5791d1d73d6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/potracelib.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/potracelib.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/progress.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/progress.h
index 0e077430d7f..0e077430d7f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/progress.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/progress.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/trace.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/trace.c
index bd193f57218..bd193f57218 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/trace.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/trace.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/trace.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/trace.h
index b1e05a649f5..b1e05a649f5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/trace.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/potracelib/trace.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/BgColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/BgColorSpecialHandler.cpp
index 26806694edf..26806694edf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/BgColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/BgColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/BgColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/BgColorSpecialHandler.h
index cecfb39339c..cecfb39339c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/BgColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/BgColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Bitmap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Bitmap.cpp
index 65e8ab76449..65e8ab76449 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Bitmap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Bitmap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Bitmap.h
index 9e108b236cf..9e108b236cf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/BoundingBox.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/BoundingBox.cpp
index 83a84892f6d..a6639611333 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/BoundingBox.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/BoundingBox.cpp
@@ -23,6 +23,7 @@
 #include <string>
 #include "BoundingBox.h"
 #include "Matrix.h"
+#include "XMLNode.h"
 
 using namespace std;
 
@@ -239,3 +240,14 @@ ostream& BoundingBox::write (ostream &os) const {
 	return os << '('  << ulx << ", " << uly
 				 << ", " << lrx << ", " << lry << ')';
 }
+
+
+XMLElementNode* BoundingBox::toSVGRect () const {
+	XMLElementNode *rect = new XMLElementNode("rect");
+	rect->addAttribute("x", minX());
+	rect->addAttribute("y", minY());
+	rect->addAttribute("width", width());
+	rect->addAttribute("height", height());
+	rect->addAttribute("fill", "none");
+	return rect;
+}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/BoundingBox.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/BoundingBox.h
index b0e811b33a9..43a47914040 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/BoundingBox.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/BoundingBox.h
@@ -31,6 +31,7 @@
 
 
 class Matrix;
+class XMLElementNode;
 
 
 struct BoundingBoxException : MessageException
@@ -71,6 +72,7 @@ class BoundingBox
 		void transform (const Matrix &tm);
 		std::string toSVGViewBox () const;
 		std::ostream& write (std::ostream &os) const;
+		XMLElementNode* toSVGRect () const;
 
    private:
 		double ulx, uly; ///< coordinates of upper left vertex (in TeX point units)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Calculator.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Calculator.cpp
index 7ec135f6c02..7ec135f6c02 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Calculator.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Calculator.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Calculator.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Calculator.h
index 5ae0ab6e9fb..5ae0ab6e9fb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Calculator.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Calculator.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/CmdLineParserBase.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/CmdLineParserBase.cpp
index 21d38574bb9..21d38574bb9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/CmdLineParserBase.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/CmdLineParserBase.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/CmdLineParserBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/CmdLineParserBase.h
index da9d91dca13..da9d91dca13 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/CmdLineParserBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/CmdLineParserBase.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Color.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Color.cpp
index 4f96c803172..4f96c803172 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Color.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Color.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Color.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Color.h
index 64aa0f105bb..64aa0f105bb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Color.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Color.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/ColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/ColorSpecialHandler.cpp
index 1870597f3fc..1870597f3fc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/ColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/ColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/ColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/ColorSpecialHandler.h
index 339271be38e..339271be38e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/ColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/ColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/CommandLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/CommandLine.cpp
index 35e51b1cf4b..35e51b1cf4b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/CommandLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/CommandLine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/CommandLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/CommandLine.h
index 1454c40687b..1454c40687b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/CommandLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/CommandLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DLLoader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DLLoader.cpp
index 9e4325d5774..9e4325d5774 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DLLoader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DLLoader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DLLoader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DLLoader.h
index 1810be99770..1810be99770 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DLLoader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DLLoader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DVIActions.cpp
index bec202a126a..bec202a126a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DVIActions.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DVIActions.h
index edc83dd89b4..edc83dd89b4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DVIActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DVIReader.cpp
index 13b21657e08..fcdb0842679 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DVIReader.cpp
@@ -273,6 +273,17 @@ bool DVIReader::executePages (unsigned first, unsigned last) {
 }
 
 
+void DVIReader::executePreamble () {
+	in().clear();
+	if (!in())
+		throw DVIException("invalid DVI file");
+	in().seekg(0, ios_base::beg);
+	if (in().get() != 247)
+		throw DVIException("invalid DVI file");
+	cmdPre(0);
+}
+
+
 /** Reads and executes the commands of the postamble. */
 void DVIReader::executePostamble () {
 	in().clear();  // reset all status bits
@@ -334,8 +345,11 @@ void DVIReader::cmdPre (int) {
 	_mag = readUnsigned(4);        // magnification
 	UInt32 k   = readUnsigned(1);  // length of following comment
 	string cmt = readString(k);    // comment
-	if (i != 2)
-		throw DVIException("invalid identification value in DVI preamble");
+	if (i != 2) {
+		ostringstream oss;
+		oss << "DVI format version " << i << " not supported";
+		throw DVIException(oss.str());
+	}
 	// 1 dviunit * num/den == multiples of 0.0000001m
 	// 1 dviunit * _scaleFactor: length of 1 dviunit in TeX points * _mag/1000
 	_scaleFactor = num/25400000.0*7227.0/den*_mag/1000.0;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DVIReader.h
index 0a404e207c1..50b6cce7f1a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DVIReader.h
@@ -61,6 +61,7 @@ class DVIReader : public StreamReader, protected VFActions
 		bool executeDocument ();
 		void executeAll ();
 		bool executeAllPages ();
+		void executePreamble ();
 		void executePostamble ();
 		bool executePage (unsigned n);
 		bool executePages (unsigned first, unsigned last);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DVIToSVG.cpp
index ec35140fdc8..bb05391e4a7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DVIToSVG.cpp
@@ -118,8 +118,10 @@ DVIToSVG::~DVIToSVG () {
  *  @param[in] last number of last page to convert
  *  @param[out] pageinfo (number of converted pages, number of total pages) */
 void DVIToSVG::convert (unsigned first, unsigned last, pair<int,int> *pageinfo) {
-	if (getTotalPages() == 0)
+	if (getTotalPages() == 0) {
+		executePreamble();
 		executePostamble();    // collect scaling and font information
+	}
 	if (first > last)
 		swap(first, last);
 	if (first > getTotalPages()) {
@@ -159,8 +161,10 @@ void DVIToSVG::convert (unsigned first, unsigned last, pair<int,int> *pageinfo)
  *  @param[in] rangestr string describing the pages to convert
  *  @param[out] pageinfo (number of converted pages, number of total pages) */
 void DVIToSVG::convert (const string &rangestr, pair<int,int> *pageinfo) {
-	if (getTotalPages() == 0)
+	if (getTotalPages() == 0) {
+		executePreamble();
 		executePostamble();    // collect scaling and font information
+	}
 	PageRanges ranges;
 	if (!ranges.parse(rangestr, getTotalPages()))
 		throw MessageException("invalid page range format");
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DVIToSVG.h
index 6008faccb66..6008faccb66 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DVIToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIToSVGActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DVIToSVGActions.cpp
index d3043bffd5b..d3043bffd5b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIToSVGActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DVIToSVGActions.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIToSVGActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DVIToSVGActions.h
index 1589fdaa0d9..1589fdaa0d9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIToSVGActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DVIToSVGActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Directory.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Directory.cpp
index e811f471f38..cc0a0eaf233 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Directory.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Directory.cpp
@@ -4,7 +4,7 @@
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
 ** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
-** This program is free software; you can redistribute it and/or        ** 
+** 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.                  **
@@ -15,7 +15,7 @@
 ** 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/>. ** 
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
 #include "Directory.h"
@@ -49,7 +49,7 @@ Directory::~Directory () {
 
 
 bool Directory::open (string dname) {
-	dirname = dname;
+	_dirname = dname;
 #ifdef __WIN32__
 	firstread = true;
 	if (dname[dname.length()-1] == '/' || dname[dname.length()-1] == '\\')
@@ -58,7 +58,7 @@ bool Directory::open (string dname) {
 	handle = FindFirstFile(dname.c_str(), &fileData);
 	return handle != INVALID_HANDLE_VALUE;
 #else
-	dir = opendir(dirname.c_str());
+	dir = opendir(_dirname.c_str());
 	return dir;
 #endif
 }
@@ -96,7 +96,7 @@ const char* Directory::read (char type) {
 	if (!dir)
 		return 0;
 	while ((dirent = readdir(dir))) {
-		string path = string(dirname) + "/" + dirent->d_name;
+		string path = string(_dirname) + "/" + dirent->d_name;
 		struct stat stats;
 		stat(path.c_str(), &stats);
 		if (S_ISDIR(stats.st_mode)) {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Directory.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Directory.h
index 5932bba25f2..34a7211b284 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Directory.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Directory.h
@@ -4,7 +4,7 @@
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
 ** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
-** This program is free software; you can redistribute it and/or        ** 
+** 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.                  **
@@ -15,7 +15,7 @@
 ** 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/>. ** 
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
 #ifndef DIRECTORY_H
@@ -40,7 +40,7 @@ class Directory
 		std::string getEntry () const;
 
    private:
-		std::string dirname;
+		std::string _dirname;
 #ifdef __WIN32__
 		bool firstread;
 		HANDLE handle;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DvisvgmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DvisvgmSpecialHandler.cpp
index 5d8e9be52f7..5d8e9be52f7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DvisvgmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DvisvgmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DvisvgmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DvisvgmSpecialHandler.h
index 7eccf473ce1..7eccf473ce1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DvisvgmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/DvisvgmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/EmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/EmSpecialHandler.cpp
index 28576bdfa5d..28576bdfa5d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/EmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/EmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/EmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/EmSpecialHandler.h
index 84e619abf79..84e619abf79 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/EmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/EmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FileFinder.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FileFinder.cpp
index 77706bbbeef..77706bbbeef 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FileFinder.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FileFinder.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FileFinder.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FileFinder.h
index 9b04e5d76b9..9b04e5d76b9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FileFinder.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FileFinder.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FilePath.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FilePath.cpp
index d1dc1c216e6..d1dc1c216e6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FilePath.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FilePath.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FilePath.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FilePath.h
index c80a1925db7..c80a1925db7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FilePath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FilePath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FileSystem.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FileSystem.cpp
index 892b5ba47d2..892b5ba47d2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FileSystem.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FileSystem.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FileSystem.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FileSystem.h
index 086f0f6e500..086f0f6e500 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FileSystem.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FileSystem.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Font.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Font.cpp
index 415e0051dc1..415e0051dc1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Font.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Font.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Font.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Font.h
index 854430334d3..854430334d3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Font.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Font.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontCache.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontCache.cpp
index 97bc129ba6a..97bc129ba6a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontCache.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontCache.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontCache.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontCache.h
index 0aa93ca2203..0aa93ca2203 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontCache.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontCache.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEncoding.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontEncoding.cpp
index 62487408ca8..62487408ca8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEncoding.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontEncoding.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEncoding.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontEncoding.h
index dfcd6822153..dfcd6822153 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEncoding.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontEncoding.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEngine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontEngine.cpp
index d3913bd7cc4..d3913bd7cc4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEngine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontEngine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEngine.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontEngine.h
index a92e970d6db..a92e970d6db 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEngine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontEngine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontManager.cpp
index c32d43c0bc3..c32d43c0bc3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontManager.h
index d3d18156a91..d3d18156a91 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontMap.cpp
index 1a67917f687..1a67917f687 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontMap.h
index d57153c9d4b..d57153c9d4b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/FontMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFGlyphTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/GFGlyphTracer.cpp
index d94ecda14a8..d94ecda14a8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFGlyphTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/GFGlyphTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFGlyphTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/GFGlyphTracer.h
index 9a51703a003..9a51703a003 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFGlyphTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/GFGlyphTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/GFReader.cpp
index a146c14bf50..93cd9dab2e6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/GFReader.cpp
@@ -42,16 +42,16 @@ static inline double scaled2double (Int32 scaled) {
 }
 
 
-GFReader::GFReader (istream &is) : in(is)
+GFReader::GFReader (istream &is) : _in(is)
 {
-	minX = maxX = minY = maxY = x = y = 0;
+	_minX = _maxX = _minY = _maxY = _x = _y = 0;
 }
 
 
 UInt32 GFReader::readUnsigned (int bytes) {
 	UInt32 ret = 0;
-	for (int i=bytes-1; i >= 0 && !in.eof(); i--) {
-		UInt32 b = in.get();
+	for (int i=bytes-1; i >= 0 && !_in.eof(); i--) {
+		UInt32 b = _in.get();
 		ret |= b << (8*i);
 	}
 	return ret;
@@ -59,11 +59,11 @@ UInt32 GFReader::readUnsigned (int bytes) {
 
 
 Int32 GFReader::readSigned (int bytes) {
-	Int32 ret = in.get();
+	Int32 ret = _in.get();
 	if (ret & 128)        // negative value?
 		ret |= 0xffffff00;
-	for (int i=bytes-2; i >= 0 && !in.eof(); i--)
-		ret = (ret << 8) | in.get();
+	for (int i=bytes-2; i >= 0 && !_in.eof(); i--)
+		ret = (ret << 8) | _in.get();
 	return ret;
 }
 
@@ -71,7 +71,7 @@ Int32 GFReader::readSigned (int bytes) {
 string GFReader::readString (int bytes) {
 	vector<char> buf(bytes+1);
 	if (bytes > 0)
-		in.get(&buf[0], bytes+1);  // reads 'bytes' bytes (pos. bytes+1 is set to 0)
+		_in.get(&buf[0], bytes+1);  // reads 'bytes' bytes (pos. bytes+1 is set to 0)
 	else
 		buf[0] = 0;
 	return &buf[0];
@@ -97,7 +97,7 @@ int GFReader::executeCommand () {
 		{&GFReader::cmdPre, 0},     {&GFReader::cmdPost, 0}, {&GFReader::cmdPostPost, 0}                     // 247-249
 	};
 
-	int opcode = in.get();
+	int opcode = _in.get();
 	if (opcode < 0)  // at end of file?
 		throw GFException("unexpected end of file");
 
@@ -121,13 +121,13 @@ int GFReader::executeCommand () {
 
 
 bool GFReader::executeChar (UInt8 c) {
-	in.clear();
-	if (charInfoMap.empty())
+	_in.clear();
+	if (_charInfoMap.empty())
 		executePostamble();          // read character info
-	in.clear();
-	Iterator it = charInfoMap.find(c);
-	if (in && it != charInfoMap.end()) {
-		in.seekg(it->second.location, ios_base::beg);
+	_in.clear();
+	Iterator it = _charInfoMap.find(c);
+	if (_in && it != _charInfoMap.end()) {
+		_in.seekg(it->second.location, ios_base::beg);
 		while (executeCommand() != 69);  // execute all commands until eoc is reached
 		return true;
 	}
@@ -136,12 +136,12 @@ bool GFReader::executeChar (UInt8 c) {
 
 
 bool GFReader::executeAllChars () {
-	in.clear();
-	if (charInfoMap.empty())
+	_in.clear();
+	if (_charInfoMap.empty())
 		executePostamble();   // read character info
-	in.clear();
-	if (in) {
-		in.seekg(0);
+	_in.clear();
+	if (_in) {
+		_in.seekg(0);
 		while (executeCommand() != 248); // execute all commands until postamble is reached
 		return true;
 	}
@@ -150,15 +150,15 @@ bool GFReader::executeAllChars () {
 
 
 bool GFReader::executePostamble () {
-	in.clear();
-	if (!in)
+	_in.clear();
+	if (!_in)
 		return false;
-	in.seekg(-1, ios_base::end);
-	while (in.peek() == 223)         // skip fill bytes
-		in.seekg(-1, ios_base::cur);
-	in.seekg(-4, ios_base::cur);
+	_in.seekg(-1, ios_base::end);
+	while (_in.peek() == 223)         // skip fill bytes
+		_in.seekg(-1, ios_base::cur);
+	_in.seekg(-4, ios_base::cur);
 	UInt32 q = readUnsigned(4);      // pointer to begin of postamble
-	in.seekg(q, ios_base::beg);      // now on begin of postamble
+	_in.seekg(q, ios_base::beg);      // now on begin of postamble
 	while (executeCommand() != 249); // execute all commands until postpost is reached
 	return true;
 }
@@ -166,23 +166,23 @@ bool GFReader::executePostamble () {
 
 /** Returns the design size of this font int TeX point units. */
 double GFReader::getDesignSize () const {
-	return fix2double(designSize);
+	return fix2double(_designSize);
 }
 
 /** Returns the number of horizontal pixels per point. */
 double GFReader::getHPixelsPerPoint () const {
-	return scaled2double(hppp);
+	return scaled2double(_hppp);
 }
 
 /** Returns the number of vertical pixels per point. */
 double GFReader::getVPixelsPerPoint () const {
-	return scaled2double(vppp);
+	return scaled2double(_vppp);
 }
 
 /** Returns the width of character c in TeX point units */
 double GFReader::getCharWidth (UInt32 c) const {
-	ConstIterator it = charInfoMap.find(c%256);
-	return it == charInfoMap.end() ? 0 : it->second.width*getDesignSize()/(1<<24);
+	ConstIterator it = _charInfoMap.find(c%256);
+	return it == _charInfoMap.end() ? 0 : it->second.width*getDesignSize()/(1<<24);
 }
 
 ///////////////////////
@@ -204,11 +204,11 @@ void GFReader::cmdPre (int) {
 /** Reads the postamble. */
 void GFReader::cmdPost (int) {
 	readUnsigned(4);               // pointer to byte after final eoc
-	designSize = readUnsigned(4);  // design size of font in points
-	checksum   = readUnsigned(4);  // checksum
-	hppp       = readUnsigned(4);  // horizontal pixels per point (scaled int)
-	vppp       = readUnsigned(4);  // vertical pixels per point (scaled int)
-	in.seekg(16, ios_base::cur);   // skip x and y bounds
+	_designSize = readUnsigned(4);  // design size of font in points
+	_checksum   = readUnsigned(4);  // checksum
+	_hppp       = readUnsigned(4);  // horizontal pixels per point (scaled int)
+	_vppp       = readUnsigned(4);  // vertical pixels per point (scaled int)
+	_in.seekg(16, ios_base::cur);   // skip x and y bounds
 	postamble();
 }
 
@@ -228,10 +228,10 @@ void GFReader::cmdPostPost (int) {
  *  and advances the cursor by n.
  *  @param[in] n number of pixels to be inverted */
 void GFReader::cmdPaint0 (int n) {
-	if (penDown)                    // set pixels?
-		bitmap.setBits(y, x, n);
-	x += n;
-	penDown = !penDown;             // inverse pen state
+	if (_penDown)                    // set pixels?
+		_bitmap.setBits(_y, _x, n);
+	_x += n;
+	_penDown = !_penDown;             // inverse pen state
 }
 
 
@@ -247,40 +247,40 @@ void GFReader::cmdPaint (int len) {
 
 /** Beginning of character (generic format). */
 void GFReader::cmdBoc (int) {
-	currentChar = readSigned(4);
+	_currentChar = readSigned(4);
 	readSigned(4);  // pointer to previous boc with same c mod 256
-	minX = readSigned(4);
-	maxX = readSigned(4);
-	minY = readSigned(4);
-	maxY = readSigned(4);
-	x = minX;
-	y = maxY;
-	penDown = false;
-	bitmap.resize(minX, maxX, minY, maxY);
-	beginChar(currentChar);
+	_minX = readSigned(4);
+	_maxX = readSigned(4);
+	_minY = readSigned(4);
+	_maxY = readSigned(4);
+	_x = _minX;
+	_y = _maxY;
+	_penDown = false;
+	_bitmap.resize(_minX, _maxX, _minY, _maxY);
+	beginChar(_currentChar);
 }
 
 
 /** Beginning of character (compact format). */
 void GFReader::cmdBoc1 (int) {
-	currentChar = readUnsigned(1);
+	_currentChar = readUnsigned(1);
 	UInt32 dx = readUnsigned(1);
-	maxX = readUnsigned(1);
-	minX = maxX - dx;
+	_maxX = readUnsigned(1);
+	_minX = _maxX - dx;
 	UInt32 dy = readUnsigned(1);
-	maxY = readUnsigned(1);
-	minY = maxY - dy;
-	x = minX;
-	y = maxY;
-	penDown = false;
-	bitmap.resize(minX, maxX, minY, maxY);
-	beginChar(currentChar);
+	_maxY = readUnsigned(1);
+	_minY = _maxY - dy;
+	_x = _minX;
+	_y = _maxY;
+	_penDown = false;
+	_bitmap.resize(_minX, _maxX, _minY, _maxY);
+	beginChar(_currentChar);
 }
 
 
 /** End of character. */
 void GFReader::cmdEoc (int) {
-	endChar(currentChar);
+	endChar(_currentChar);
 }
 
 
@@ -290,11 +290,11 @@ void GFReader::cmdEoc (int) {
  *                 The read value denotes the number of rows to be skipped.  */
 void GFReader::cmdSkip (int len) {
 	if (len == 0)
-		y--;
+		_y--;
 	else
-		y -= readUnsigned(len)+1;
-	x = minX;
-	penDown = false;
+		_y -= readUnsigned(len)+1;
+	_x = _minX;
+	_penDown = false;
 }
 
 
@@ -302,9 +302,9 @@ void GFReader::cmdSkip (int len) {
  *  the paint color to black.
  *  @param[in] col pixel/column number */
 void GFReader::cmdNewRow (int col) {
-	x = minX + col ;
-	y--;
-	penDown = true;
+	_x = _minX + col ;
+	_y--;
+	_penDown = true;
 }
 
 
@@ -334,7 +334,7 @@ void GFReader::cmdCharLoc0 (int) {
 	Int32 p   = readSigned(4);  // pointer to begin of (last) character data
 	Int32 dx  = 65536*dm;
 	Int32 dy  = 0;
-	charInfoMap[c] = CharInfo(dx, dy, w, p);
+	_charInfoMap[c] = CharInfo(dx, dy, w, p);
 }
 
 
@@ -345,6 +345,6 @@ void GFReader::cmdCharLoc (int) {
 	Int32 dy = readSigned(4);   // vertical escapement (scaled pixel units)
 	Int32 w  = readSigned(4);   // (1<<24)*characterWidth/designSize
 	Int32 p  = readSigned(4);   // pointer to begin of (last) character data
-	charInfoMap[c] = CharInfo(dx, dy, w, p);
+	_charInfoMap[c] = CharInfo(dx, dy, w, p);
 }
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/GFReader.h
index 17b96a1503f..fa8e8b9d2c5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/GFReader.h
@@ -4,7 +4,7 @@
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
 ** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
-** This program is free software; you can redistribute it and/or        ** 
+** 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.                  **
@@ -15,7 +15,7 @@
 ** 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/>. ** 
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
 #ifndef GFREADER_H
@@ -64,19 +64,19 @@ class GFReader
 		virtual void endChar (UInt32 c) {}
 		virtual void special (std::string str) {}
 		virtual void numspecial (Int32 y) {}
-		const Bitmap& getBitmap () const {return bitmap;}
+		const Bitmap& getBitmap () const {return _bitmap;}
 		double getDesignSize () const;
 		double getHPixelsPerPoint () const;
 		double getVPixelsPerPoint () const;
 		double getCharWidth (UInt32 c) const;
-		UInt32 getChecksum () const  {return checksum;}
+		UInt32 getChecksum () const  {return _checksum;}
 
 	protected:
 		Int32 readSigned (int bytes);
 		UInt32 readUnsigned (int bytes);
 		std::string readString (int len);
 		int executeCommand ();
-		std::istream& getInputStream () const {return in;}
+		std::istream& getInputStream () const {return _in;}
 
 		void cmdPre (int);
 		void cmdPost (int);
@@ -95,16 +95,16 @@ class GFReader
 		void cmdCharLoc (int);
 
    private:
-		std::istream &in;
-		Int32 minX, maxX, minY, maxY;
-		Int32 x, y;            // current pen location (pixel units)
-		Int32 currentChar;
-		Bitmap bitmap;         // bitmap of current char
-		FixWord designSize;    // designSize
-		ScaledInt hppp, vppp;  // horizontal and vertical pixel per point
-		UInt32 checksum;
-		std::map<UInt8,CharInfo> charInfoMap;
-		bool penDown;
+		std::istream &_in;
+		Int32 _minX, _maxX, _minY, _maxY;
+		Int32 _x, _y;            // current pen location (pixel units)
+		Int32 _currentChar;
+		Bitmap _bitmap;         // bitmap of current char
+		FixWord _designSize;    // designSize
+		ScaledInt _hppp, _vppp;  // horizontal and vertical pixel per point
+		UInt32 _checksum;
+		std::map<UInt8,CharInfo> _charInfoMap;
+		bool _penDown;
 };
 
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/GFTracer.cpp
index 8a3dd245a86..8a3dd245a86 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/GFTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/GFTracer.h
index 3a60e03c8ab..3a60e03c8ab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/GFTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Ghostscript.cpp
index 4b2550253ef..4b2550253ef 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Ghostscript.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Ghostscript.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Ghostscript.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Ghostscript.h
index 80f55d086e9..80f55d086e9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Ghostscript.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Ghostscript.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Glyph.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Glyph.h
index 6edcfa1e6cc..6edcfa1e6cc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Glyph.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Glyph.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GlyphTracerMessages.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/GlyphTracerMessages.h
index ab8b71e4365..ab8b71e4365 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GlyphTracerMessages.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/GlyphTracerMessages.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GraphicPath.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/GraphicPath.h
index 132c4d357b6..132c4d357b6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GraphicPath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/GraphicPath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/InputBuffer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/InputBuffer.cpp
index cb1a393fb6f..cb1a393fb6f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/InputBuffer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/InputBuffer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/InputBuffer.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/InputBuffer.h
index 21cb79d0a49..21cb79d0a49 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/InputBuffer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/InputBuffer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/InputReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/InputReader.cpp
index 7465c4f6f8f..7465c4f6f8f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/InputReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/InputReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/InputReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/InputReader.h
index ae7b4e9e594..ae7b4e9e594 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/InputReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/InputReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Length.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Length.cpp
index 7edeb5c5f37..7edeb5c5f37 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Length.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Length.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Length.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Length.h
index ba79dfa66f8..ba79dfa66f8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Length.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Length.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Makefile.am
index 22a20250844..22a20250844 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Makefile.in
index d394eba494e..d394eba494e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Matrix.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Matrix.cpp
index 08c4f1489c0..d5f2c647c31 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Matrix.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Matrix.cpp
@@ -4,7 +4,7 @@
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
 ** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
-** This program is free software; you can redistribute it and/or        ** 
+** 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.                  **
@@ -15,7 +15,7 @@
 ** 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/>. ** 
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
 #include <cmath>
@@ -50,7 +50,7 @@ Matrix::Matrix (double d) {
 /** Creates the matrix ((v0,v1,v2),(v3,v4,v5),(v6,v7,v8)).
  *  Expects that array v consists of 'size' elements. If size is less than 9, the
  *  remaining matrix components will be set to those of the identity matrix.
- *  @param[in] v array containing the matrix components 
+ *  @param[in] v array containing the matrix components
  *  @param[in] size size of array v */
 Matrix::Matrix (double v[], unsigned size) {
 	set(v, size);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Matrix.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Matrix.h
index c6c8c854c0b..d8c0cce32c8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Matrix.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Matrix.h
@@ -4,7 +4,7 @@
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
 ** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
-** This program is free software; you can redistribute it and/or        ** 
+** 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.                  **
@@ -15,7 +15,7 @@
 ** 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/>. ** 
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
 #ifndef MATRIX_H
@@ -85,4 +85,9 @@ struct RotationMatrix : public Matrix
 	RotationMatrix (double deg);
 };
 
+
+inline std::ostream& operator << (std::ostream &os, const Matrix &m) {
+	return m.write(os);
+}
+
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Message.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Message.cpp
index f43a231957c..f43a231957c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Message.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Message.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Message.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Message.h
index 6a21112ae5d..6a21112ae5d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Message.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Message.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/MessageException.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/MessageException.h
index cf5d0d311b5..cf5d0d311b5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/MessageException.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/MessageException.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/MetafontWrapper.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/MetafontWrapper.cpp
index 3113366aa17..3113366aa17 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/MetafontWrapper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/MetafontWrapper.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/MetafontWrapper.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/MetafontWrapper.h
index 9d0ea7b0d50..9d0ea7b0d50 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/MetafontWrapper.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/MetafontWrapper.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PSInterpreter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/PSInterpreter.cpp
index d511d52548e..d511d52548e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PSInterpreter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/PSInterpreter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PSInterpreter.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/PSInterpreter.h
index b24ee2fa637..b24ee2fa637 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PSInterpreter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/PSInterpreter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PageRanges.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/PageRanges.cpp
index 85a124683c7..85a124683c7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PageRanges.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/PageRanges.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PageRanges.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/PageRanges.h
index a2a6fc28589..a2a6fc28589 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PageRanges.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/PageRanges.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PageSize.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/PageSize.cpp
index 9b5e6b29b40..9b5e6b29b40 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PageSize.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/PageSize.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PageSize.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/PageSize.h
index 38cfd22e922..38cfd22e922 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PageSize.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/PageSize.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Pair.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Pair.h
index 778b68d3a2d..778b68d3a2d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Pair.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Pair.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/PsSpecialHandler.cpp
index aea16b36724..9b7371b6500 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/PsSpecialHandler.cpp
@@ -76,7 +76,7 @@ void PsSpecialHandler::initialize (SpecialActions *actions) {
 		// push dictionary "TeXDict" with dvips definitions on dictionary stack
 		// and initialize basic dvips PostScript variables
 		ostringstream oss;
-		oss << " TeXDict begin 0 0 1000 72.27 72.27 () @start "
+		oss << " TeXDict begin 0 0 1000 72 72 () @start "
 		       " 0 0 moveto ";
   		if (actions) {
 			float r, g, b;
@@ -97,8 +97,9 @@ const char* PsSpecialHandler::info () const {
 
 void PsSpecialHandler::updatePos () {
 	if (_actions) {
+		const double bp = 72.0/72.27;
 		ostringstream oss;
-		const double x = _actions->getX(), y = _actions->getY();
+		const double x = _actions->getX()*bp, y = _actions->getY()*bp;
 		oss << ' ' << x << ' ' << y << " moveto ";
 		_psi.execute(oss.str());
 		_currentpoint = DPair(x, y);
@@ -188,77 +189,85 @@ bool PsSpecialHandler::process (const char *prefix, istream &is, SpecialActions
 }
 
 
+/** Handles psfile special.
+ *  @param[in] fname EPS file to be included
+ *  @param[in] attr attributes given with \special psfile */
 void PsSpecialHandler::psfile (const string &fname, const map<string,string> &attr) {
 	ifstream ifs(fname.c_str());
 	if (!ifs)
 		Message::wstream(true) << "file '" << fname << "' not found in special 'psfile'\n";
 	else {
-		const double BP = 72.27/72.0;   // factor to convert bp -> pt
 		map<string,string>::const_iterator it;
-		// coordinates of lower left and upper right vertex (result in TeX points)
-		double llx = (it = attr.find("llx")) != attr.end() ? str2double(it->second)*BP : 0;
-		double lly = (it = attr.find("lly")) != attr.end() ? str2double(it->second)*BP : 0;
-		double urx = (it = attr.find("urx")) != attr.end() ? str2double(it->second)*BP : 0;
-		double ury = (it = attr.find("ury")) != attr.end() ? str2double(it->second)*BP : 0;
+		const double PT = 72.27/72.0;  // bp -> pt
 
-		// actual width and height (result in 10th of TeX points)
-		double rwi = (it = attr.find("rwi")) != attr.end() ? str2double(it->second)*BP : 0;
-		double rhi = (it = attr.find("rhi")) != attr.end() ? str2double(it->second)*BP : 0;
+		// 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;
+
+		// 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;
+		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)*BP : 0;
-		double voffset = (it = attr.find("voffset")) != attr.end() ? str2double(it->second)*BP : 0;
-		double hsize   = (it = attr.find("hsize")) != attr.end() ? str2double(it->second)*BP : 612*BP;
-		double vsize   = (it = attr.find("vsize")) != attr.end() ? str2double(it->second)*BP : 792*BP;
+		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;
 		double vscale  = (it = attr.find("vscale")) != attr.end() ? str2double(it->second) : 100;
 		double angle   = (it = attr.find("angle")) != attr.end() ? str2double(it->second) : 0;
 
-		double x=_actions->getX(), y=_actions->getY();
-		double w=(urx-llx), h=(ury-lly);  // width and height of (E)PS image in TeX points
-		if (w <= 0)
-			w = hsize;
-		if (h <= 0)
-			h = vsize;
-		h *= -1;  	// must be negative to get the bounding box right
-
-		double sx=1, sy=1;
-		if (rwi != 0 || rhi != 0) {
-			sx = rwi/10/w;
-			sy = rhi/10/fabs(h);
-			if (sx == 0)
-				sx = sy;
-			else if (sy == 0)
-				sy = sx;
-		}
-		w *= sx;
-		h *= sy;
+		Matrix m(1);
+		m.rotate(angle).scale(hscale/100, vscale/100).translate(hoffset, voffset);
+		BoundingBox bbox(llx, lly, urx, ury);
+		bbox.transform(m);
 
-		Matrix usertrans(1);  // transformations given by the user
-		if (hscale != 100 || vscale != 100)
-			usertrans.scale(hscale/100, vscale/100);
-		if (angle != 0)
-			usertrans.rotate(angle);
-		if (hoffset != 0 || voffset != 0)
-			usertrans.translate(hoffset, voffset);
+		double sx = rwi/bbox.width();
+		double sy = rhi/bbox.height();
+		if (sx < 0)	sx = sy;
+		if (sy < 0)	sy = sx;
+		if (sx < 0) sx = sy = 1.0;
 
-		Matrix trans(1);  // final transformation to position the graphic correctly
-		trans.translate(-llx, -lly).rmultiply(usertrans).scale(sx, -sy).translate(x, y);
+		// save current DVI position (in pt units)
+		const double x = _actions->getX();
+		const double y = _actions->getY();
 
-		_xmlnode = new XMLElementNode("g");
+		// all following drawings are relative to (0,0)
+		_actions->setX(0);
+		_actions->setY(0);
 		updatePos();
-		_psi.execute(ifs);
-		if (!_xmlnode->empty()) {
-			_xmlnode->addAttribute("transform", trans.getSVG());
+
+		_xmlnode = new XMLElementNode("g");
+		_psi.execute(" @beginspecial @setspecial "); // enter \special environment
+		_psi.execute(ifs);             // process EPS file
+		_psi.execute(" @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);
+			m.translate(-llx, lly);
+			m.scale(sx, sy);      // resize image to width "rwi" and height "rhi"
+			m.translate(x, y); // move image to current DVI position
+			_xmlnode->addAttribute("transform", m.getSVG());
 			_actions->appendToPage(_xmlnode);
 		}
 		else
 			delete _xmlnode;
 		_xmlnode = 0;
 
-		// adapt bounding box
-		BoundingBox bbox(x, y, x+w, y+h);
-		bbox.transform(usertrans);
+		// restore DVI position
+		_actions->setX(x);
+		_actions->setY(y);
+		updatePos();
+
+		// update bounding box
+		m.scale(sx, -sy);
+		m.translate(x, y);
+		bbox = BoundingBox(0, 0, fabs(urx-llx), fabs(ury-lly));
+		bbox.transform(m);
 		_actions->embed(bbox);
 	}
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/PsSpecialHandler.h
index 51b24816095..b56514242fe 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/PsSpecialHandler.h
@@ -32,7 +32,7 @@ class XMLElementNode;
 class PsSpecialHandler : public SpecialHandler, protected PSActions
 {
 	typedef GraphicPath<double> Path;
-	
+
 	class ClippingStack
 	{
 		public:
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SVGTree.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/SVGTree.cpp
index c1af13f4f3a..c1af13f4f3a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SVGTree.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/SVGTree.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SVGTree.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/SVGTree.h
index de432609e8b..de432609e8b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SVGTree.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/SVGTree.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SpecialActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/SpecialActions.h
index 8132ac3c510..8132ac3c510 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SpecialActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/SpecialActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/SpecialHandler.h
index cf52c070d4d..cf52c070d4d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/SpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SpecialManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/SpecialManager.cpp
index b115d49be2c..b115d49be2c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SpecialManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/SpecialManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SpecialManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/SpecialManager.h
index 07d1f01e454..07d1f01e454 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SpecialManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/SpecialManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/StreamReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/StreamReader.cpp
index 519fb726be7..519fb726be7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/StreamReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/StreamReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/StreamReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/StreamReader.h
index 8f7986f2fe5..8f7986f2fe5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/StreamReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/StreamReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/StreamWriter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/StreamWriter.cpp
index 7512f89e3fa..7512f89e3fa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/StreamWriter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/StreamWriter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/StreamWriter.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/StreamWriter.h
index 1fd01aae62a..1fd01aae62a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/StreamWriter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/StreamWriter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/System.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/System.cpp
index 4651b44fccc..4651b44fccc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/System.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/System.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/System.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/System.h
index 11c7f44078d..11c7f44078d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/System.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/System.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/TFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/TFM.cpp
index 235548bbbe6..235548bbbe6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/TFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/TFM.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/TFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/TFM.h
index c375efed407..c375efed407 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/TFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/TFM.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Terminal.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Terminal.cpp
index fbab8fd3761..fbab8fd3761 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Terminal.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Terminal.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Terminal.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Terminal.h
index a1a1c7e578d..a1a1c7e578d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Terminal.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/Terminal.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/TpicSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/TpicSpecialHandler.cpp
index a2dc4627f46..a2dc4627f46 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/TpicSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/TpicSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/TpicSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/TpicSpecialHandler.h
index 93f4c123c23..93f4c123c23 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/TpicSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/TpicSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/VFActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/VFActions.h
index 34be50e5b70..34be50e5b70 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/VFActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/VFActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/VFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/VFReader.cpp
index 21b468c247a..21b468c247a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/VFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/VFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/VFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/VFReader.h
index b60acccb32b..b60acccb32b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/VFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/VFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/VectorStream.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/VectorStream.h
index e2221b3df7a..e2221b3df7a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/VectorStream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/VectorStream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLDocTypeNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/XMLDocTypeNode.h
index a45e10cfaba..a45e10cfaba 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLDocTypeNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/XMLDocTypeNode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLDocument.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/XMLDocument.cpp
index 11f0ded7337..11f0ded7337 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLDocument.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/XMLDocument.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLDocument.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/XMLDocument.h
index 8e2b4f75a9c..8e2b4f75a9c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLDocument.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/XMLDocument.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLNode.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/XMLNode.cpp
index 6b7d2747221..6b7d2747221 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLNode.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/XMLNode.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/XMLNode.h
index d46619b038a..d46619b038a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/XMLNode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLString.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/XMLString.cpp
index c7cd33f7b1d..c7cd33f7b1d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLString.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/XMLString.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLString.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/XMLString.h
index acce6f966ad..acce6f966ad 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLString.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/XMLString.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/dvisvgm.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/dvisvgm.cpp
index 55548803064..55548803064 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/dvisvgm.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/dvisvgm.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/gzstream.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/gzstream.cpp
index 2893c299891..2893c299891 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/gzstream.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/gzstream.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/gzstream.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/gzstream.h
index 60f38c4fac7..60f38c4fac7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/gzstream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/gzstream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/iapi.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/iapi.h
index 8e29d938d03..8e29d938d03 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/iapi.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/iapi.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/ierrors.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/ierrors.h
index 3184341177e..3184341177e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/ierrors.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/ierrors.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/macros.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/macros.h
index 24d97419af2..24d97419af2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/macros.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/macros.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/options.xml b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/options.xml
index 1866977995b..1866977995b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/options.xml
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/options.xml
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/psdefs.psc b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/psdefs.psc
index 445d7973233..445d7973233 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/psdefs.psc
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/psdefs.psc
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/types.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/types.h
index 6ffdb42a149..6ffdb42a149 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/types.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/src/types.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/BoundingBoxTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/BoundingBoxTest.cpp
index 59b9ddbc7a5..59b9ddbc7a5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/BoundingBoxTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/BoundingBoxTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/CalculatorTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/CalculatorTest.cpp
index 14dc34d9e89..14dc34d9e89 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/CalculatorTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/CalculatorTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/ColorSpecialTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/ColorSpecialTest.cpp
index b3a9d52d699..b3a9d52d699 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/ColorSpecialTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/ColorSpecialTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/CommandLineTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/CommandLineTest.cpp
index 1fe5be9a47f..1fe5be9a47f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/CommandLineTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/CommandLineTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/DirectoryTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/DirectoryTest.cpp
index 59cba3e6027..59cba3e6027 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/DirectoryTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/DirectoryTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/FileFinderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/FileFinderTest.cpp
index caf7781a8d9..caf7781a8d9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/FileFinderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/FileFinderTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/FilePathTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/FilePathTest.cpp
index fc7ffe2eda7..fc7ffe2eda7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/FilePathTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/FilePathTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/FontManagerTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/FontManagerTest.cpp
index e0774119d00..e0774119d00 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/FontManagerTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/FontManagerTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/FontMapTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/FontMapTest.cpp
index af6b7dadd1d..af6b7dadd1d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/FontMapTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/FontMapTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/GFReaderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/GFReaderTest.cpp
index 0e78790e2ff..0e78790e2ff 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/GFReaderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/GFReaderTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/GraphicPathTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/GraphicPathTest.cpp
index 1cf92d53156..1cf92d53156 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/GraphicPathTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/GraphicPathTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/LengthTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/LengthTest.cpp
index 7add99c2d55..7add99c2d55 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/LengthTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/LengthTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/Makefile.am
index d5065ce529c..d5065ce529c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/Makefile.in
index 05fc561efb2..05fc561efb2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/MatrixTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/MatrixTest.cpp
index d5cfa92cb40..d5cfa92cb40 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/MatrixTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/MatrixTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/PageRagesTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/PageRagesTest.cpp
index a5f28ba807b..a5f28ba807b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/PageRagesTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/PageRagesTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/PageSizeTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/PageSizeTest.cpp
index 65a990db73d..65a990db73d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/PageSizeTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/PageSizeTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/SplittedCharInputBufferTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/SplittedCharInputBufferTest.cpp
index dcb91728210..dcb91728210 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/SplittedCharInputBufferTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/SplittedCharInputBufferTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/StreamInputBufferTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/StreamInputBufferTest.cpp
index 08084563fce..08084563fce 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/StreamInputBufferTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/StreamInputBufferTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/TypesTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/TypesTest.cpp
index 86021d5c7e2..86021d5c7e2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/TypesTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/TypesTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/VectorStreamTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/VectorStreamTest.cpp
index e47e2046de3..e47e2046de3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/VectorStreamTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/VectorStreamTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/check-conv b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/check-conv
index e1e6315d776..e1e6315d776 100755
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/check-conv
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/check-conv
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/cmr10.600gf b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/cmr10.600gf
index 6dca421e21c..6dca421e21c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/cmr10.600gf
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/cmr10.600gf
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/frktest-nf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/frktest-nf-cmp.svg
index 4efb2993236..4efb2993236 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/frktest-nf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/frktest-nf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/frktest-wf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/frktest-wf-cmp.svg
index 78e67a13116..78e67a13116 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/frktest-wf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/frktest-wf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/normalize.xsl b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/normalize.xsl
index 5a6ba2f62d6..5a6ba2f62d6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/normalize.xsl
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/normalize.xsl
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/sample-nf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/sample-nf-cmp.svg
index c115ae96c29..c115ae96c29 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/sample-nf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/sample-nf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/sample-wf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/sample-wf-cmp.svg
index 84c3de4ba3c..84c3de4ba3c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/sample-wf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.3/tests/sample-wf-cmp.svg