185 files changed, 531 insertions, 471 deletions

diff --git a/Build/source/texk/README b/Build/source/texk/README
index 5e0538962bf..6d7874a19e3 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -59,8 +59,8 @@ dvipos - ?
 
 dvipsk - maintained here, by us
 
-dvisvgm - checked 30oct13
-  http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.5.1.tar.gz
+dvisvgm 1.5.2 - checked 13jan14
+  http://downloads.sourceforge.net/dvisvgm/
 
 gsftopk - from Paul Vojta's xdvi?
 
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index 9bad0a8dd68..4d5bf1c3d0f 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Imported release 1.5.2.
+	* version.ac: Adapted.
+
 2013-12-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Fix a stupid typo..
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 2522eb205f7..9d82664b716 100755
--- a/Build/source/texk/dvisvgm/configure
+++ b/Build/source/texk/dvisvgm/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dvisvgm (TeX Live) 1.5.1.
+# Generated by GNU Autoconf 2.69 for dvisvgm (TeX Live) 1.5.2.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,12 +590,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvisvgm (TeX Live)'
 PACKAGE_TARNAME='dvisvgm--tex-live-'
-PACKAGE_VERSION='1.5.1'
-PACKAGE_STRING='dvisvgm (TeX Live) 1.5.1'
+PACKAGE_VERSION='1.5.2'
+PACKAGE_STRING='dvisvgm (TeX Live) 1.5.2'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="dvisvgm-1.5.1/src/dvisvgm.cpp"
+ac_unique_file="dvisvgm-1.5.2/src/dvisvgm.cpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1372,7 +1372,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dvisvgm (TeX Live) 1.5.1 to adapt to many kinds of systems.
+\`configure' configures dvisvgm (TeX Live) 1.5.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1443,7 +1443,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvisvgm (TeX Live) 1.5.1:";;
+     short | recursive ) echo "Configuration of dvisvgm (TeX Live) 1.5.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1581,7 +1581,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvisvgm (TeX Live) configure 1.5.1
+dvisvgm (TeX Live) configure 1.5.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2403,7 +2403,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dvisvgm (TeX Live) $as_me 1.5.1, which was
+It was created by dvisvgm (TeX Live) $as_me 1.5.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7894,7 +7894,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvisvgm--tex-live-'
- VERSION='1.5.1'
+ VERSION='1.5.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17754,7 +17754,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dvisvgm (TeX Live) config.lt 1.5.1
+dvisvgm (TeX Live) config.lt 1.5.2
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -19565,7 +19565,7 @@ $as_echo "#define KPSE_CXX_UNSAFE 1" >>confdefs.h
 
 fi
 
-DVISVGM_TREE=dvisvgm-1.5.1
+DVISVGM_TREE=dvisvgm-1.5.2
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -20117,7 +20117,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dvisvgm (TeX Live) $as_me 1.5.1, which was
+This file was extended by dvisvgm (TeX Live) $as_me 1.5.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20183,7 +20183,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dvisvgm (TeX Live) config.status 1.5.1
+dvisvgm (TeX Live) config.status 1.5.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.5.2-PATCHES/ChangeLog
index 8f3ecbeb79b..002ebf7dbff 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1-PATCHES/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Import release 1.5.2.
+
 2013-10-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Import release 1.5.1.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.5.2-PATCHES/TL-Changes
index e995017f720..f9bad58fcb1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1-PATCHES/TL-Changes
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2-PATCHES/TL-Changes
@@ -1,11 +1,11 @@
-Changes applied to the dvisvgm-1.5.1 tree as obtained from:
-	http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.5.1.tar.gz
+Changes applied to the dvisvgm-1.5.2 tree as obtained from:
+	http://downloads.sourceforge.net/dvisvgm/
 
 Removed:
-	ChangeLog
 	Makefile.in
 	aclocal.m4
 	config.guess
+	config.rpath
 	config.sub
 	configure
 	depcomp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/AUTHORS b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/AUTHORS
index d9b6468421e..d9b6468421e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/AUTHORS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/AUTHORS
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/COPYING b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/COPYING
index 94a9ed024d3..94a9ed024d3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/COPYING
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/COPYING
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/INSTALL b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/INSTALL
index a4b34144dcf..a4b34144dcf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/INSTALL
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/INSTALL
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/LGPL-2.1.txt b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/LGPL-2.1.txt
index 602bfc94635..602bfc94635 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/LGPL-2.1.txt
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/LGPL-2.1.txt
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/Makefile.am
index a3462b39cdb..b73dbf588f8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/Makefile.am
@@ -1,5 +1,5 @@
 ## This file is part of dvisvgm
-## Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>
+## Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>
 ##
 ## Process this file with automake.
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/NEWS b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/NEWS
index 95e2871e984..1cdaa6b62c2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/NEWS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/NEWS
@@ -1,3 +1,7 @@
+dvisvgm-1.5.2 (2014-01-10)
+- fixed handling of global font colors and color specials
+- several code improvements
+
 dvisvgm-1.5.1 (2013-10-29)
 - fixed processing of bounding box data created by the preview package
 - fixed processing of font definitions across DVI pages
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/README b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/README
index d9728660268..2454a2a23f4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/README
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/README
@@ -91,7 +91,7 @@ ADDITIONAL INFORMATION
 
 COPYRIGHT
 
- Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>
+ Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>
 
  This program is free software; you can redistribute it and/or modify it
  under the terms of the GNU General Public License as published by the
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/config.h.in b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/config.h.in
index fcd8cf41872..fcd8cf41872 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/config.h.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/config.h.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/configure.ac b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/configure.ac
index e796a6f2c2d..2fcd9fc499d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/configure.ac
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/configure.ac
@@ -1,11 +1,11 @@
 # This file is part of dvisvgm
-# Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>
+# Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>
 #
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dvisvgm],[1.5.1],[martin.gieseking@uos.de])
-DATE="Oktober 2013"
+AC_INIT([dvisvgm],[1.5.2],[martin.gieseking@uos.de])
+DATE="January 2014"
 AC_CONFIG_SRCDIR(src)
 AC_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/doc/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/Makefile.am
index fb5c56ffedf..13254cb773a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/doc/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/Makefile.am
@@ -1,5 +1,5 @@
 ## This file is part of dvisvgm
-## Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>
+## Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>
 ##
 ## Process this file with automake.
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/doc/dvisvgm.1 b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/dvisvgm.1
index 2e1661d5b0a..4f64318e71b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/doc/dvisvgm.1
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/dvisvgm.1
@@ -2,12 +2,12 @@
 .\"     Title: dvisvgm
 .\"    Author: Martin Gieseking <martin.gieseking@uos.de>
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 10/28/2013
+.\"      Date: 01/03/2014
 .\"    Manual: dvisvgm Manual
-.\"    Source: dvisvgm 1.5.1
+.\"    Source: dvisvgm 1.5.2
 .\"  Language: English
 .\"
-.TH "DVISVGM" "1" "10/28/2013" "dvisvgm 1\&.5\&.1" "dvisvgm Manual"
+.TH "DVISVGM" "1" "01/03/2014" "dvisvgm 1\&.5\&.2" "dvisvgm Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1069,7 +1069,7 @@ Please report bugs using the bug tracker at Launchpad (see https://launchpad\&.n
 Written by Martin Gieseking <martin\&.gieseking@uos\&.de>
 .SH "COPYING"
 .sp
-Copyright \(co 2005\-2013 Martin Gieseking\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 3 or, (at your option) any later version\&.
+Copyright \(co 2005\-2014 Martin Gieseking\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 3 or, (at your option) any later version\&.
 .SH "AUTHOR"
 .PP
 \fBMartin Gieseking\fR <\&martin\&.gieseking@uos\&.de\&>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/doc/dvisvgm.txt.in b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/dvisvgm.txt.in
index 9436b57faa7..06cf27d35a6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/doc/dvisvgm.txt.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/dvisvgm.txt.in
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////
 // This file is part of dvisvgm -- the DVI to SVG converter             //
-// Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   //
+// Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   //
 //                                                                      //
 // This program is free software; you can redistribute it and/or        //
 // modify it under the terms of the GNU General Public License as       //
@@ -654,7 +654,7 @@ Written by {author} <{email}>
 
 COPYING
 -------
-Copyright (C) 2005-2013 Martin Gieseking. Free use of this software is
+Copyright (C) 2005-2014 Martin Gieseking. Free use of this software is
 granted under the terms of the GNU General Public License (GPL) version 3
 or, (at your option) any later version.
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/BgColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BgColorSpecialHandler.cpp
index 883704febd9..dd19e4b5f53 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/BgColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BgColorSpecialHandler.cpp
@@ -2,7 +2,7 @@
 ** BgColorSpecialHandler.cpp                                            **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/BgColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BgColorSpecialHandler.h
index e8b9ec21eed..edd764e86b2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/BgColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BgColorSpecialHandler.h
@@ -2,7 +2,7 @@
 ** BgColorSpecialHandler.h                                              **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef BGCOLORSPECIALHANDLER_H
-#define BGCOLORSPECIALHANDLER_H
+#ifndef DVISVGM_BGCOLORSPECIALHANDLER_H
+#define DVISVGM_BGCOLORSPECIALHANDLER_H
 
 #include "SpecialHandler.h"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Bitmap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Bitmap.cpp
index 2f589d18638..265533b1ef5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Bitmap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Bitmap.cpp
@@ -2,7 +2,7 @@
 ** Bitmap.cpp                                                           **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Bitmap.h
index 1a1f19caf15..af03597be33 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Bitmap.h
@@ -2,7 +2,7 @@
 ** Bitmap.h                                                             **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef BITMAP_H
-#define BITMAP_H
+#ifndef DVISVGM_BITMAP_H
+#define DVISVGM_BITMAP_H
 
 #include <ostream>
 #include <vector>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/BoundingBox.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BoundingBox.cpp
index 6f7e301b3b2..f6c5d0b3b9b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/BoundingBox.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BoundingBox.cpp
@@ -2,7 +2,7 @@
 ** BoundingBox.cpp                                                      **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -61,7 +61,7 @@ BoundingBox::BoundingBox (const Length &ulxx, const Length &ulyy, const Length &
 
 
 BoundingBox::BoundingBox (const string &boxstr)
-	: _valid(false), _locked(false)
+	: _ulx(0), _uly(0), _lrx(0), _lry(0), _valid(false), _locked(false)
 {
 	set(boxstr);
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/BoundingBox.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BoundingBox.h
index b3a4016f52a..bfc3eec56fb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/BoundingBox.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BoundingBox.h
@@ -2,7 +2,7 @@
 ** BoundingBox.h                                                        **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef BOUNDINGBOX_H
-#define BOUNDINGBOX_H
+#ifndef DVISVGM_BOUNDINGBOX_H
+#define DVISVGM_BOUNDINGBOX_H
 
 #include <ostream>
 #include <string>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMap.cpp
index b873ce234ed..285a553ec69 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMap.cpp
@@ -2,7 +2,7 @@
 ** CMap.cpp                                                             **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMap.h
index 15ead6e9f5a..2a3e9c7dbbb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMap.h
@@ -2,7 +2,7 @@
 ** CMap.h                                                               **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef CMAP_H
-#define CMAP_H
+#ifndef DVISVGM_CMAP_H
+#define DVISVGM_CMAP_H
 
 #include <algorithm>
 #include <ostream>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMapManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapManager.cpp
index 28a7b943c57..cbad12746c9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMapManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapManager.cpp
@@ -2,7 +2,7 @@
 ** CMapManager.cpp                                                      **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMapManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapManager.h
index 43b163bb9c7..fb71886753c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMapManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapManager.h
@@ -2,7 +2,7 @@
 ** CMapManager.h                                                        **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef CMAPMANAGER_H
-#define CMAPMANAGER_H
+#ifndef DVISVGM_CMAPMANAGER_H
+#define DVISVGM_CMAPMANAGER_H
 
 #include <map>
 #include <set>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMapReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapReader.cpp
index 75135340951..502e42ef2e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMapReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapReader.cpp
@@ -2,7 +2,7 @@
 ** CMapReader.cpp                                                       **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMapReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapReader.h
index 4e0ae9ac266..5986e92b13d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CMapReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapReader.h
@@ -2,7 +2,7 @@
 ** CMapReader.h                                                         **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef CMAPREADER_H
-#define CMAPREADER_H
+#ifndef DVISVGM_CMAPREADER_H
+#define DVISVGM_CMAPREADER_H
 
 #include <cstdlib>
 #include <istream>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CRC32.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CRC32.cpp
index b2401e92224..3f85710c6b7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CRC32.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CRC32.cpp
@@ -2,7 +2,7 @@
 ** CRC32.cpp                                                            **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CRC32.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CRC32.h
index ca8ec359d0f..4376b192077 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CRC32.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CRC32.h
@@ -2,7 +2,7 @@
 ** CRC32.h                                                              **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Calculator.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Calculator.cpp
index 717e78294a4..2e0bb06a361 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Calculator.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Calculator.cpp
@@ -2,7 +2,7 @@
 ** Calculator.cpp                                                       **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Calculator.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Calculator.h
index 36bb39d679c..89d2c08560d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Calculator.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Calculator.h
@@ -2,7 +2,7 @@
 ** Calculator.h                                                         **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef CALCULATOR_H
-#define CALCULATOR_H
+#ifndef DVISVGM_CALCULATOR_H
+#define DVISVGM_CALCULATOR_H
 
 #include <istream>
 #include <map>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CharMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMap.cpp
index 0dd6b25fd2f..3e749add96b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CharMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMap.cpp
@@ -2,7 +2,7 @@
 ** CharMap.cpp                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CharMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMap.h
index 0b84d7570a7..8faeffa21c1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CharMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMap.h
@@ -2,7 +2,7 @@
 ** CharMap.h                                                            **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef CHARMAP_H
-#define CHARMAP_H
+#ifndef DVISVGM_CHARMAP_H
+#define DVISVGM_CHARMAP_H
 
 #include <utility>
 #include <vector>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CharMapID.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMapID.cpp
index 596e669365f..2c6e1cd8a59 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CharMapID.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMapID.cpp
@@ -2,7 +2,7 @@
 ** CharMapID.cpp                                                        **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CharMapID.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMapID.h
index 79d6e9bd538..ea30d50d266 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CharMapID.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMapID.h
@@ -2,7 +2,7 @@
 ** CharMapID.h                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef CHARMAPID_H
-#define CHARMAPID_H
+#ifndef DVISVGM_CHARMAPID_H
+#define DVISVGM_CHARMAPID_H
 
 #include "types.h"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Character.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Character.h
index 8d5a6965af7..a9d0f6a2d6d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Character.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Character.h
@@ -2,7 +2,7 @@
 ** Character.h                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef CHARACTER_H
-#define CHARACTER_H
+#ifndef DVISVGM_CHARACTER_H
+#define DVISVGM_CHARACTER_H
 
 #include "types.h"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CmdLineParserBase.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CmdLineParserBase.cpp
index b019f0d8acb..002a0a9cc5e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CmdLineParserBase.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CmdLineParserBase.cpp
@@ -2,7 +2,7 @@
 ** CmdLineParserBase.cpp                                                **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CmdLineParserBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CmdLineParserBase.h
index b37cbb0863c..87e740feaf3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CmdLineParserBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CmdLineParserBase.h
@@ -2,7 +2,7 @@
 ** CmdLineParserBase.h                                                  **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef CMDLINEPARSERBASE_H
-#define CMDLINEPARSERBASE_H
+#ifndef DVISVGM_CMDLINEPARSERBASE_H
+#define DVISVGM_CMDLINEPARSERBASE_H
 
 #include <string>
 #include <vector>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Color.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Color.cpp
index acb3d31c5c5..7e8d9d56069 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Color.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Color.cpp
@@ -2,7 +2,7 @@
 ** Color.cpp                                                            **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Color.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Color.h
index c2df2737e08..99d847560e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Color.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Color.h
@@ -2,7 +2,7 @@
 ** Color.h                                                              **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef COLOR_H
-#define COLOR_H
+#ifndef DVISVGM_COLOR_H
+#define DVISVGM_COLOR_H
 
 #include <string>
 #include <vector>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/ColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/ColorSpecialHandler.cpp
index 3e3bf6df3ad..42ec2639a8c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/ColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/ColorSpecialHandler.cpp
@@ -2,7 +2,7 @@
 ** ColorSpecialHandler.cpp                                              **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/ColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/ColorSpecialHandler.h
index b5559481b00..27dfe984a00 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/ColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/ColorSpecialHandler.h
@@ -2,7 +2,7 @@
 ** ColorSpecialHandler.h                                                **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef COLORSPECIALHANDLER_H
-#define COLORSPECIALHANDLER_H
+#ifndef DVISVGM_COLORSPECIALHANDLER_H
+#define DVISVGM_COLORSPECIALHANDLER_H
 
 #include <stack>
 #include <vector>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CommandLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CommandLine.cpp
index 491e110eb59..b13fc520cec 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CommandLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CommandLine.cpp
@@ -2,7 +2,7 @@
 // It is part of the dvisvgm package and published under the terms
 // of the GNU General Public License version 3, or (at your option) any later version.
 // See file COPYING for further details.
-// (C) 2009-2013 Martin Gieseking <martin.gieseking@uos.de>
+// (C) 2009-2014 Martin Gieseking <martin.gieseking@uos.de>
 
 #include <config.h>
 #include <cstdio>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CommandLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CommandLine.h
index 5f81df278dc..dedf935a112 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/CommandLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CommandLine.h
@@ -2,10 +2,10 @@
 // It is part of the dvisvgm package and published under the terms
 // of the GNU General Public License version 3, or (at your option) any later version.
 // See file COPYING for further details.
-// (C) 2009-2013 Martin Gieseking <martin.gieseking@uos.de>
+// (C) 2009-2014 Martin Gieseking <martin.gieseking@uos.de>
 
-#ifndef COMMANDLINE_H
-#define COMMANDLINE_H
+#ifndef DVISVGM_COMMANDLINE_H
+#define DVISVGM_COMMANDLINE_H
 
 #include <config.h>
 #include "CmdLineParserBase.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DLLoader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DLLoader.cpp
index e56c86aa96e..2386da70fed 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DLLoader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DLLoader.cpp
@@ -2,7 +2,7 @@
 ** DLLoader.cpp                                                         **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DLLoader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DLLoader.h
index 0420c534869..e699fa219db 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DLLoader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DLLoader.h
@@ -2,7 +2,7 @@
 ** DLLoader.h                                                           **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef DLLOADER_H
-#define DLLOADER_H
+#ifndef DVISVGM_DLLOADER_H
+#define DVISVGM_DLLOADER_H
 
 #ifdef __WIN32__
 	#include <windows.h>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIActions.cpp
index 2fc2adbf43c..157847cd2f1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIActions.cpp
@@ -2,7 +2,7 @@
 ** DVIActions.cpp                                                       **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIActions.h
index 1a2fb3b9386..79bae4e6143 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIActions.h
@@ -2,7 +2,7 @@
 ** DVIActions.h                                                         **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef DVIACTIONS_H
-#define DVIACTIONS_H
+#ifndef DVISVGM_DVIACTIONS_H
+#define DVISVGM_DVIACTIONS_H
 
 #include <string>
 #include "Message.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIReader.cpp
index 17a9fbbd293..d256502520d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIReader.cpp
@@ -2,7 +2,7 @@
 ** DVIReader.cpp                                                        **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -53,6 +53,8 @@ DVIReader::DVIReader (istream &is, DVIActions *a) : StreamReader(is), _dviFormat
 	_currPageNum = 0;
 	_pageLength = 0;
 	_pagePos = 0;
+	_prevBop = 0;
+	_mag = 1;
 }
 
 
@@ -349,6 +351,8 @@ void DVIReader::cmdPre (int) {
 	verifyDVIFormat(_dviFormat);
 	UInt32 num = readUnsigned(4);  // numerator units of measurement
 	UInt32 den = readUnsigned(4);  // denominator units of measurement
+	if (den == 0)
+		throw DVIException("denominator of measurement unit is zero");
 	_mag = readUnsigned(4);        // magnification
 	UInt32 k   = readUnsigned(1);  // length of following comment
 	string cmt = readString(k);    // comment
@@ -365,6 +369,8 @@ void DVIReader::cmdPost (int) {
 	_prevBop   = readUnsigned(4);  // pointer to previous bop
 	UInt32 num = readUnsigned(4);
 	UInt32 den = readUnsigned(4);
+	if (den == 0)
+		throw DVIException("denominator of measurement unit is zero");
 	_mag = readUnsigned(4);
 	_pageHeight = readUnsigned(4); // height of tallest page in dvi units
 	_pageWidth  = readUnsigned(4); // width of widest page in dvi units
@@ -773,6 +779,9 @@ void DVIReader::cmdXFontDef (int) {
 	if (flags & 0x0100) { // vertical?
 	}
 	if (flags & 0x0200) { // colored?
+		// The font color must not interfere with color specials. If the font color is not black,
+		// all color specials should be ignored, i.e. glyphs of a non-black font have a fixed color
+		// that can't be changed by colors specials.
 		UInt32 rgba = readUnsigned(4);
 		color.set(UInt8(rgba >> 24), UInt8((rgba >> 16) & 0xff), UInt8((rgba >> 8) & 0xff));
 	}
@@ -787,12 +796,8 @@ void DVIReader::cmdXFontDef (int) {
 		for (int i=0; i < num_variations; i++)
 			readUnsigned(4);
 	}
-	if (_inPage && _actions && _actions->fontProcessingEnabled()) {
+	if (_inPage && _actions && _actions->fontProcessingEnabled())
 		FontManager::instance().registerFont(fontnum, fontname, ptsize, style, color);
-//		if (NativeFont *font = dynamic_cast<NativeFont*>(FontManager::instance().getFontById(id))) {
-//			font->setStyle(style);
-//		}
-	}
 }
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIReader.h
index cbf8703ced7..c8f50972bf3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIReader.h
@@ -2,7 +2,7 @@
 ** DVIReader.h                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef DVIREADER_H
-#define DVIREADER_H
+#ifndef DVISVGM_DVIREADER_H
+#define DVISVGM_DVIREADER_H
 
 #include <limits>
 #include <map>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVG.cpp
index eefe426647e..17dbc6d1c63 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVG.cpp
@@ -2,7 +2,7 @@
 ** DVIToSVG.cpp                                                         **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVG.h
index b69bfeca297..626e27c568a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVG.h
@@ -2,7 +2,7 @@
 ** DVIToSVG.h                                                           **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef DVITOSVG_H
-#define DVITOSVG_H
+#ifndef DVISVGM_DVITOSVG_H
+#define DVISVGM_DVITOSVG_H
 
 #include <iostream>
 #include <string>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIToSVGActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVGActions.cpp
index d5d8fb2e768..d8514175740 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIToSVGActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVGActions.cpp
@@ -2,7 +2,7 @@
 ** DVIToSVGActions.cpp                                                  **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIToSVGActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVGActions.h
index 01fd54fbe1d..89e1fc57246 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DVIToSVGActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVGActions.h
@@ -2,7 +2,7 @@
 ** DVIToSVGActions.h                                                    **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef DVITOSVGACTIONS_H
-#define DVITOSVGACTIONS_H
+#ifndef DVISVGM_DVITOSVGACTIONS_H
+#define DVISVGM_DVITOSVGACTIONS_H
 
 #include <map>
 #include <set>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Directory.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Directory.cpp
index 0715ebd45ae..925b3065c8d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Directory.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Directory.cpp
@@ -2,7 +2,7 @@
 ** Directory.cpp                                                        **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -34,6 +34,8 @@ using namespace std;
 Directory::Directory () {
 #if __WIN32__
 	handle = INVALID_HANDLE_VALUE;
+	firstread = true;
+	memset(&fileData, 0, sizeof(WIN32_FIND_DATA));
 #else
 	dir = 0;
 	dirent = 0;
@@ -42,9 +44,18 @@ Directory::Directory () {
 
 
 Directory::Directory (string dirname) {
+#if __WIN32__
+	handle = INVALID_HANDLE_VALUE;
+	firstread = true;
+	memset(&fileData, 0, sizeof(WIN32_FIND_DATA));
+#else
+	dir = 0;
+	dirent = 0;
+#endif
 	open(dirname);
 }
 
+
 Directory::~Directory () {
 	close();
 }
@@ -78,17 +89,17 @@ void Directory::close () {
 /** Reads first/next directory entry.
  *  @param[in] type type of entry to return (a: file or dir, f: file, d: dir)
  *  @return name of entry */
-const char* Directory::read (char type) {
+const char* Directory::read (EntryType type) {
 #ifdef __WIN32__
 	if (handle == INVALID_HANDLE_VALUE)
 		return 0;
 	while (firstread || FindNextFile(handle, &fileData)) {
 		firstread = false;
 		if (fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-			if (type == 'a' || type == 'd')
+			if (type == ET_FILE_OR_DIR || type == ET_DIR)
 				return fileData.cFileName;
 		}
-		else if (type == 'a' || type == 'f')
+		else if (type == ET_FILE_OR_DIR || type == ET_FILE)
 			return fileData.cFileName;
 	}
 	FindClose(handle);
@@ -100,13 +111,14 @@ const char* Directory::read (char type) {
 	while ((dirent = readdir(dir))) {
 		string path = string(_dirname) + "/" + dirent->d_name;
 		struct stat stats;
-		stat(path.c_str(), &stats);
-		if (S_ISDIR(stats.st_mode)) {
-			if (type == 'a' || type == 'd')
+		if (stat(path.c_str(), &stats) == 0) {
+			if (S_ISDIR(stats.st_mode)) {
+				if (type == ET_FILE_OR_DIR || type == ET_DIR)
+					return dirent->d_name;
+			}
+			else if (type == ET_FILE_OR_DIR || type == ET_FILE)
 				return dirent->d_name;
 		}
-		else if (type == 'a' || type == 'f')
-			return dirent->d_name;
 	}
 	closedir(dir);
 	dir = 0;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Directory.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Directory.h
index 2bed74d7038..0d1e9406b4e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Directory.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Directory.h
@@ -2,7 +2,7 @@
 ** Directory.h                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef DIRECTORY_H
-#define DIRECTORY_H
+#ifndef DVISVGM_DIRECTORY_H
+#define DVISVGM_DIRECTORY_H
 
 #include <string>
 #ifdef __WIN32__
@@ -30,13 +30,16 @@
 
 class Directory
 {
+	public:
+		enum EntryType {ET_FILE, ET_DIR, ET_FILE_OR_DIR};
+
    public:
 		Directory ();
       Directory (std::string path);
 		~Directory ();
 		bool open (std::string path);
 		void close ();
-		const char* read (char type='a');
+		const char* read (EntryType type=ET_FILE_OR_DIR);
 
    private:
 		std::string _dirname;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DvisvgmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DvisvgmSpecialHandler.cpp
index 9909b2e99fc..3aa915bbd12 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DvisvgmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DvisvgmSpecialHandler.cpp
@@ -2,7 +2,7 @@
 ** DvisvgmSpecialHandler.cpp                                            **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -160,19 +160,21 @@ static void bbox (InputReader &in, SpecialActions *actions) {
 
 
 static void img (InputReader &in, SpecialActions *actions) {
-	double w = in.getDouble();
-	double h = in.getDouble();
-	string f = in.getString();
-	update_bbox(w, h, 0, actions);
-	XMLElementNode *img = new XMLElementNode("image");
-	img->addAttribute("x", actions->getX());
-	img->addAttribute("y", actions->getY());
-	img->addAttribute("width", w);
-	img->addAttribute("height", h);
-	img->addAttribute("xlink:href", f);
-	if (actions && !actions->getMatrix().isIdentity())
-		img->addAttribute("transform", actions->getMatrix().getSVG());
-	actions->appendToPage(img);
+	if (actions) {
+		double w = in.getDouble();
+		double h = in.getDouble();
+		string f = in.getString();
+		update_bbox(w, h, 0, actions);
+		XMLElementNode *img = new XMLElementNode("image");
+		img->addAttribute("x", actions->getX());
+		img->addAttribute("y", actions->getY());
+		img->addAttribute("width", w);
+		img->addAttribute("height", h);
+		img->addAttribute("xlink:href", f);
+		if (!actions->getMatrix().isIdentity())
+			img->addAttribute("transform", actions->getMatrix().getSVG());
+		actions->appendToPage(img);
+	}
 }
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DvisvgmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DvisvgmSpecialHandler.h
index 93e726fe634..0e5c3009977 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/DvisvgmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DvisvgmSpecialHandler.h
@@ -2,7 +2,7 @@
 ** DvisvgmSpecialHandler.h                                              **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef DVISVGMSPECIALHANDLER_H
-#define DVISVGMSPECIALHANDLER_H
+#ifndef DVISVGM_DVISVGMSPECIALHANDLER_H
+#define DVISVGM_DVISVGMSPECIALHANDLER_H
 
 #include "SpecialHandler.h"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EPSFile.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSFile.cpp
index adb05cc3093..b1512f4a96e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EPSFile.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSFile.cpp
@@ -2,7 +2,7 @@
 ** EPSFile.cpp                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EPSFile.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSFile.h
index 60a4c007d39..19b60a42797 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EPSFile.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSFile.h
@@ -2,7 +2,7 @@
 ** EPSFile.h                                                            **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef EPSFILE_H
-#define EPSFILE_H
+#ifndef DVISVGM_EPSFILE_H
+#define DVISVGM_EPSFILE_H
 
 #include <fstream>
 #include <string>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EPSToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSToSVG.cpp
index b29061654cd..cfe02f78deb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EPSToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSToSVG.cpp
@@ -2,7 +2,7 @@
 ** EPSToSVG.cpp                                                         **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EPSToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSToSVG.h
index 46360e820a5..e3ea67ca87d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EPSToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSToSVG.h
@@ -2,7 +2,7 @@
 ** EPSToSVG.h                                                           **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef EPSTOSVG_H
-#define EPSTOSVG_H
+#ifndef DVISVGM_EPSTOSVG_H
+#define DVISVGM_EPSTOSVG_H
 
 #include <string>
 #include "SpecialActions.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EmSpecialHandler.cpp
index 5004e500882..4e18fd647a7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EmSpecialHandler.cpp
@@ -2,7 +2,7 @@
 ** EmSpecialHandler.cpp                                                 **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EmSpecialHandler.h
index 56cb934b385..17e84a3e6e2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EmSpecialHandler.h
@@ -2,7 +2,7 @@
 ** EmSpecialHandler.h                                                   **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef EMSPECIALHANDLER_H
-#define EMSPECIALHANDLER_H
+#ifndef DVISVGM_EMSPECIALHANDLER_H
+#define DVISVGM_EMSPECIALHANDLER_H
 
 #include <list>
 #include <map>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EncFile.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EncFile.cpp
index a0380f2e4b2..103090bc3e3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EncFile.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EncFile.cpp
@@ -2,7 +2,7 @@
 ** EncFile.cpp                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EncFile.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EncFile.h
index 3dee313b1aa..10b21c15547 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/EncFile.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EncFile.h
@@ -2,7 +2,7 @@
 ** EncFile.h                                                            **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef ENCFILE_H
-#define ENCFILE_H
+#ifndef DVISVGM_ENCFILE_H
+#define DVISVGM_ENCFILE_H
 
 #include <istream>
 #include <map>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FileFinder.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileFinder.cpp
index ea0ad9e48a4..3055013d969 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FileFinder.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileFinder.cpp
@@ -2,7 +2,7 @@
 ** FileFinder.cpp                                                       **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -112,7 +112,6 @@ std::string FileFinder::version () {
 	catch (MessageException &e) {
 		if (autoinit)
 			finish();
-		return "not available";
 	}
 #else
 	if (const char *v = strrchr(KPSEVERSION, ' '))
@@ -157,7 +156,12 @@ static const char* find_file (const std::string &fname, const char *ftype) {
 		process.run(&buf);
 		return buf.empty() ? 0 : buf.c_str();
 	}
-	return miktex->findFile(fname.c_str());
+	try {
+		return miktex->findFile(fname.c_str());
+	}
+	catch (const MessageException &e) {
+		return 0;
+	}
 #else
 #ifdef TEXLIVEWIN32
 	if (ext == "exe") {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FileFinder.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileFinder.h
index b958303bd55..5057e9b2593 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FileFinder.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileFinder.h
@@ -2,7 +2,7 @@
 ** FileFinder.h                                                         **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef KPSFILEFINDER_H
-#define KPSFILEFINDER_H
+#ifndef DVISVGM_KPSFILEFINDER_H
+#define DVISVGM_KPSFILEFINDER_H
 
 #include <string>
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FilePath.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FilePath.cpp
index 5869d060c6c..92922d99354 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FilePath.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FilePath.cpp
@@ -2,7 +2,7 @@
 ** FilePath.cpp                                                         **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FilePath.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FilePath.h
index 5bd3fdf98e2..c1c1bab7064 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FilePath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FilePath.h
@@ -2,7 +2,7 @@
 ** FilePath.h                                                           **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef FILEPATH_H
-#define FILEPATH_H
+#ifndef DVISVGM_FILEPATH_H
+#define DVISVGM_FILEPATH_H
 
 #include <string>
 #include <vector>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FileSystem.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileSystem.cpp
index b567034f3df..d3d514a8068 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FileSystem.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileSystem.cpp
@@ -2,7 +2,7 @@
 ** FileSystem.cpp                                                       **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FileSystem.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileSystem.h
index c920a5046e6..f60fcd0ac86 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FileSystem.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileSystem.h
@@ -2,7 +2,7 @@
 ** FileSystem.h                                                         **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef FILESYSTEM_H
-#define FILESYSTEM_H
+#ifndef DVISVGM_FILESYSTEM_H
+#define DVISVGM_FILESYSTEM_H
 
 #include <string>
 #include <vector>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Font.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Font.cpp
index a0d1a779a7d..15d609a5182 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Font.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Font.cpp
@@ -2,7 +2,7 @@
 ** Font.cpp                                                             **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -591,7 +591,8 @@ PhysicalFont::Type NativeFont::type () const {
 
 double NativeFont::charWidth (int c) const {
 	FontEngine::instance().setFont(*this);
-	double w = scaledSize()*FontEngine::instance().getAdvance(c)/FontEngine::instance().getUnitsPerEM()*_style.extend;
+	int upem = FontEngine::instance().getUnitsPerEM();
+	double w = upem ? (scaledSize()*FontEngine::instance().getAdvance(c)/upem*_style.extend) : 0;
 	w += fabs(_style.slant*charHeight(c));
 	return w;
 }
@@ -599,13 +600,15 @@ double NativeFont::charWidth (int c) const {
 
 double NativeFont::charHeight (int c) const {
 	FontEngine::instance().setFont(*this);
-	return scaledSize()*FontEngine::instance().getAscender()/FontEngine::instance().getUnitsPerEM();
+	int upem = FontEngine::instance().getUnitsPerEM();
+	return upem ? (scaledSize()*FontEngine::instance().getAscender()/upem) : 0;
 }
 
 
 double NativeFont::charDepth (int c) const {
 	FontEngine::instance().setFont(*this);
-	return -scaledSize()*FontEngine::instance().getDescender()/FontEngine::instance().getUnitsPerEM();
+	int upem = FontEngine::instance().getUnitsPerEM();
+	return upem ? (-scaledSize()*FontEngine::instance().getDescender()/upem) : 0;
 }
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Font.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Font.h
index a9171f818ce..277a97f8248 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Font.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Font.h
@@ -2,7 +2,7 @@
 ** Font.h                                                               **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef FONT_H
-#define FONT_H
+#ifndef DVISVGM_FONT_H
+#define DVISVGM_FONT_H
 
 #include <map>
 #include <string>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontCache.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontCache.cpp
index 6056fb2bc54..7e5ace9aad0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontCache.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontCache.cpp
@@ -2,7 +2,7 @@
 ** FontCache.cpp                                                        **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -91,11 +91,9 @@ bool FontCache::write (const char *fontname, const char *dir) const {
 		return true;
 
 	if (fontname && strlen(fontname) > 0) {
-		if (dir == 0 || strlen(dir) == 0)
-			dir = FileSystem::getcwd().c_str();
+		string dirstr = (dir == 0 || strlen(dir) == 0) ? FileSystem::getcwd() : dir;
 		ostringstream oss;
-		oss << dir << '/' << fontname << ".fgd";
-//		ogzstream ofs(oss.str().c_str(), 9, ios::binary|ios::out);
+		oss << dirstr << '/' << fontname << ".fgd";
 		ofstream ofs(oss.str().c_str(), ios::binary);
 		return write(fontname, ofs);
 	}
@@ -184,19 +182,16 @@ bool FontCache::write (const char *fontname, ostream &os) const {
  *  @param[in] dir directory where the cache files are located
  *  @return true if reading was successful */
 bool FontCache::read (const char *fontname, const char *dir) {
+	if (!fontname || strlen(fontname) == 0)
+		return false;
 	if (_fontname == fontname)
 		return true;
 	clear();
-	if (fontname && strlen(fontname) > 0) {
-		if (dir == 0 || strlen(dir) == 0)
-			dir = FileSystem::getcwd().c_str();
-		ostringstream oss;
-		oss << dir << '/' << fontname << ".fgd";
-		ifstream ifs(oss.str().c_str(), ios::binary);
-//		igzstream ifs(oss.str().c_str(), 9, ios::binary|ios::in);
-		return read(fontname, ifs);
-	}
-	return false;
+	string dirstr = (dir == 0 || strlen(dir) == 0) ? FileSystem::getcwd() : dir;
+	ostringstream oss;
+	oss << dirstr << '/' << fontname << ".fgd";
+	ifstream ifs(oss.str().c_str(), ios::binary);
+	return read(fontname, ifs);
 }
 
 
@@ -305,48 +300,53 @@ bool FontCache::fontinfo (std::istream &is, FontInfo &info) {
 	if (is) {
 		is.clear();
 		is.seekg(0);
-		StreamReader sr(is);
-		CRC32 crc32;
-		if ((info.version = sr.readUnsigned(1, crc32)) != FORMAT_VERSION)
-			return false;
-
-		info.checksum = sr.readUnsigned(4);
-		crc32.update(is);
-		if (crc32.get() != info.checksum)
-			return false;
-
-		is.clear();
-		is.seekg(5);  // continue reading after checksum
-
-		info.name = sr.readString();
-		info.numchars = sr.readUnsigned(4);
-		for (UInt32 i=0; i < info.numchars; i++) {
-			sr.readUnsigned(4);  // character code
-			UInt16 s = sr.readUnsigned(2);  // number of path commands
-			while (s-- > 0) {
-				UInt8 cmdval = sr.readUnsigned(1);
-				UInt8 cmdchar = (cmdval & 0x1f) + 'A';
-				int bytes = cmdval >> 5;
-				int bc = 0;
-				switch (cmdchar) {
-					case 'C': bc = 6*bytes; break;
-					case 'H':
-					case 'L':
-					case 'M':
-					case 'T':
-					case 'V': bc = 2*bytes; break;
-					case 'Q':
-					case 'S': bc = 4*bytes; break;
-					case 'Z': break;
-					default : return false;
+		try {
+			StreamReader sr(is);
+			CRC32 crc32;
+			if ((info.version = sr.readUnsigned(1, crc32)) != FORMAT_VERSION)
+				return false;
+
+			info.checksum = sr.readUnsigned(4);
+			crc32.update(is);
+			if (crc32.get() != info.checksum)
+				return false;
+
+			is.clear();
+			is.seekg(5);  // continue reading after checksum
+
+			info.name = sr.readString();
+			info.numchars = sr.readUnsigned(4);
+			for (UInt32 i=0; i < info.numchars; i++) {
+				sr.readUnsigned(4);  // character code
+				UInt16 s = sr.readUnsigned(2);  // number of path commands
+				while (s-- > 0) {
+					UInt8 cmdval = sr.readUnsigned(1);
+					UInt8 cmdchar = (cmdval & 0x1f) + 'A';
+					int bytes = cmdval >> 5;
+					int bc = 0;
+					switch (cmdchar) {
+						case 'C': bc = 6*bytes; break;
+						case 'H':
+						case 'L':
+						case 'M':
+						case 'T':
+						case 'V': bc = 2*bytes; break;
+						case 'Q':
+						case 'S': bc = 4*bytes; break;
+						case 'Z': break;
+						default : return false;
+					}
+					info.numbytes += bc+1; // command length + command
+					info.numcmds++;
+					is.seekg(bc, ios_base::cur);
 				}
-				info.numbytes += bc+1; // command length + command
-				info.numcmds++;
-				is.seekg(bc, ios_base::cur);
+				info.numbytes += 6; // number of path commands + char code
 			}
-			info.numbytes += 6; // number of path commands + char code
+			info.numbytes += 6+info.name.length(); // version + 0-byte + fontname + number of chars
+		}
+		catch (StreamReaderException &e) {
+			return false;
 		}
-		info.numbytes += 6+info.name.length(); // version + 0-byte + fontname + number of chars
 	}
 	return true;
 }
@@ -358,6 +358,7 @@ bool FontCache::fontinfo (std::istream &is, FontInfo &info) {
  *  @param[in] purge if true, outdated and corrupted cache files are removed */
 void FontCache::fontinfo (const char *dirname, ostream &os, bool purge) {
 	if (dirname) {
+		ios::fmtflags osflags(os.flags());
 		vector<FontInfo> infos;
 		vector<string> invalid_files;
 		if (fontinfo(dirname, infos, invalid_files)) {
@@ -384,5 +385,6 @@ void FontCache::fontinfo (const char *dirname, ostream &os, bool purge) {
 			if (FileSystem::remove(path))
 				os << "invalid cache file " << (*it) << " removed\n";
 		}
+		os.flags(osflags);  // restore format flags
 	}
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontCache.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontCache.h
index 247906e9e76..c6c868edf49 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontCache.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontCache.h
@@ -2,7 +2,7 @@
 ** FontCache.h                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef FONTCACHE_H
-#define FONTCACHE_H
+#ifndef DVISVGM_FONTCACHE_H
+#define DVISVGM_FONTCACHE_H
 
 #include <iostream>
 #include <string>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontEncoding.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEncoding.cpp
index a5f75e3338b..dfa5b6c750e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontEncoding.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEncoding.cpp
@@ -2,7 +2,7 @@
 ** FontEncoding.cpp                                                     **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontEncoding.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEncoding.h
index a8ea57c55e8..81d65806387 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontEncoding.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEncoding.h
@@ -2,7 +2,7 @@
 ** FontEncoding.h                                                       **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef FONTENCODING_H
-#define FONTENCODING_H
+#ifndef DVISVGM_FONTENCODING_H
+#define DVISVGM_FONTENCODING_H
 
 #include <string>
 #include "Character.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontEngine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEngine.cpp
index 1b9d63e08c4..8894586c3f3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontEngine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEngine.cpp
@@ -2,7 +2,7 @@
 ** FontEngine.cpp                                                       **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontEngine.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEngine.h
index 75e36ec4aae..353613a40ef 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontEngine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEngine.h
@@ -2,7 +2,7 @@
 ** FontEngine.h                                                         **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef FONTENGINE_H
-#define FONTENGINE_H
+#ifndef DVISVGM_FONTENGINE_H
+#define DVISVGM_FONTENGINE_H
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontManager.cpp
index b80211402c7..2064ed1e43a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontManager.cpp
@@ -2,7 +2,7 @@
 ** FontManager.cpp                                                      **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontManager.h
index a765a868d96..24402f5ae5e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontManager.h
@@ -2,7 +2,7 @@
 ** FontManager.h                                                        **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef FONTMANAGER_H
-#define FONTMANAGER_H
+#ifndef DVISVGM_FONTMANAGER_H
+#define DVISVGM_FONTMANAGER_H
 
 #include <map>
 #include <ostream>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMap.cpp
index d7f32808e26..c5b87303c6e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMap.cpp
@@ -2,7 +2,7 @@
 ** FontMap.cpp                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -249,7 +249,7 @@ ostream& FontMap::write (ostream &os) const {
  *  @param[in] path to directory containing the map files to be read */
 void FontMap::readdir (const string &dirname) {
 	Directory dir(dirname);
-	while (const char *fname = dir.read('f')) {
+	while (const char *fname = dir.read(Directory::ET_FILE)) {
 		if (strlen(fname) >= 4 && strcmp(fname+strlen(fname)-4, ".map") == 0) {
 			string path = dirname + "/" + fname;
 			read(path.c_str());
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMap.h
index 6ff9c21ad58..8bd2f712340 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMap.h
@@ -2,7 +2,7 @@
 ** FontMap.h                                                            **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef FONTMAP_H
-#define FONTMAP_H
+#ifndef DVISVGM_FONTMAP_H
+#define DVISVGM_FONTMAP_H
 
 #include <map>
 #include <ostream>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontMetrics.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMetrics.cpp
index 7dbe4e0ff24..3920e4e6e76 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontMetrics.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMetrics.cpp
@@ -2,7 +2,7 @@
 ** FontMetrics.cpp                                                      **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontMetrics.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMetrics.h
index 1ce1b15dc8f..50207211d2c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontMetrics.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMetrics.h
@@ -2,7 +2,7 @@
 ** FontMetrics.h                                                        **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef FONTMETRICS_H
-#define FONTMETRICS_H
+#ifndef DVISVGM_FONTMETRICS_H
+#define DVISVGM_FONTMETRICS_H
 
 #include <istream>
 #include "MessageException.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontStyle.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontStyle.h
index 932c09291cc..932c09291cc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/FontStyle.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontStyle.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFGlyphTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFGlyphTracer.cpp
index 470b7a9b160..a3604aebbb7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFGlyphTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFGlyphTracer.cpp
@@ -2,7 +2,7 @@
 ** GFGlyphTracer.cpp                                                    **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFGlyphTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFGlyphTracer.h
index 379ed1d98c8..84063a994b5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFGlyphTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFGlyphTracer.h
@@ -2,7 +2,7 @@
 ** GFGlyphTracer.h                                                      **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef GFGLYPHTRACER_H
-#define GFGLYPHTRACER_H
+#ifndef DVISVGM_GFGLYPHTRACER_H
+#define DVISVGM_GFGLYPHTRACER_H
 
 #include <fstream>
 #include <string>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFReader.cpp
index ed1b9381f56..95e8e14d1ce 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFReader.cpp
@@ -2,7 +2,7 @@
 ** GFReader.cpp                                                         **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -47,6 +47,10 @@ static inline double scaled2double (Int32 scaled) {
 GFReader::GFReader (istream &is) : _in(is), _penDown(false)
 {
 	_minX = _maxX = _minY = _maxY = _x = _y = 0;
+	_currentChar = 0;
+	_designSize = 0;
+	_hppp = _vppp = 0;
+	_checksum = 0;
 }
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFReader.h
index 0d9a7bb0e32..62c36a0498b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFReader.h
@@ -2,7 +2,7 @@
 ** GFReader.h                                                           **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef GFREADER_H
-#define GFREADER_H
+#ifndef DVISVGM_GFREADER_H
+#define DVISVGM_GFREADER_H
 
 #include <istream>
 #include <map>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFTracer.cpp
index c7fb3bca11c..af8d5eecce9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFTracer.cpp
@@ -2,7 +2,7 @@
 ** GFTracer.cpp                                                         **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFTracer.h
index ba15961db65..9bd50e719c9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GFTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFTracer.h
@@ -2,7 +2,7 @@
 ** GFTracer.h                                                           **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef GFTRACER_H
-#define GFTRACER_H
+#ifndef DVISVGM_GFTRACER_H
+#define DVISVGM_GFTRACER_H
 
 #include <istream>
 #include "GFReader.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Ghostscript.cpp
index 8d2538457c9..eee5de49212 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Ghostscript.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Ghostscript.cpp
@@ -2,7 +2,7 @@
 ** Ghostscript.cpp                                                      **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Ghostscript.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Ghostscript.h
index cff13b745a7..d223ad04edf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Ghostscript.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Ghostscript.h
@@ -2,7 +2,7 @@
 ** Ghostscript.h                                                        **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef GHOSTSCRIPT_H
-#define GHOSTSCRIPT_H
+#ifndef DVISVGM_GHOSTSCRIPT_H
+#define DVISVGM_GHOSTSCRIPT_H
 
 #include <config.h>
 #include <string>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Glyph.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Glyph.h
index b598dc5002d..5a003a2196b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Glyph.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Glyph.h
@@ -2,7 +2,7 @@
 ** Glyph.h                                                              **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef GLYPH_H
-#define GLYPH_H
+#ifndef DVISVGM_GLYPH_H
+#define DVISVGM_GLYPH_H
 
 #include "GraphicPath.h"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GlyphTracerMessages.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GlyphTracerMessages.h
index 2b0cedcd8b6..6256bb843a0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GlyphTracerMessages.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GlyphTracerMessages.h
@@ -2,7 +2,7 @@
 ** GlyphTracerMessages.h                                                **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef GLYPHTRACERMESSAGES_H
-#define GLYPHTRACERMESSAGES_H
+#ifndef DVISVGM_GLYPHTRACERMESSAGES_H
+#define DVISVGM_GLYPHTRACERMESSAGES_H
 
 #include <sstream>
 #include "GFGlyphTracer.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GraphicPath.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GraphicPath.h
index 46a3b0cc335..3b401b2a162 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/GraphicPath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GraphicPath.h
@@ -2,7 +2,7 @@
 ** GraphicPath.h                                                        **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef GRAPHICPATH_H
-#define GRAPHICPATH_H
+#ifndef DVISVGM_GRAPHICPATH_H
+#define DVISVGM_GRAPHICPATH_H
 
 #include <list>
 #include <ostream>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/HtmlSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/HtmlSpecialHandler.cpp
index 7422e9f778d..f8681aceb8f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/HtmlSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/HtmlSpecialHandler.cpp
@@ -2,7 +2,7 @@
 ** HtmlSpecialHandler.cpp                                               **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/HtmlSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/HtmlSpecialHandler.h
index 6e1e0e40c53..d58b6afc7b4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/HtmlSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/HtmlSpecialHandler.h
@@ -2,7 +2,7 @@
 ** HtmlSpecialHandler.h                                                 **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef HTMLSPECIALHANDLER_H
-#define HTMLSPECIALHANDLER_H
+#ifndef DVISVGM_HTMLSPECIALHANDLER_H
+#define DVISVGM_HTMLSPECIALHANDLER_H
 
 #include <map>
 #include <string>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/InputBuffer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputBuffer.cpp
index a01449bb3f3..79e0dcf39c7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/InputBuffer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputBuffer.cpp
@@ -2,7 +2,7 @@
 ** InputBuffer.cpp                                                      **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/InputBuffer.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputBuffer.h
index 963d1ff7680..c29a943a7e7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/InputBuffer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputBuffer.h
@@ -2,7 +2,7 @@
 ** InputBuffer.h                                                        **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef INPUTBUFFER_H
-#define INPUTBUFFER_H
+#ifndef DVISVGM_INPUTBUFFER_H
+#define DVISVGM_INPUTBUFFER_H
 
 #include <algorithm>
 #include <cstring>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/InputReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputReader.cpp
index 10a4fca01c6..b2f01f5ea1e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/InputReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputReader.cpp
@@ -2,7 +2,7 @@
 ** InputReader.cpp                                                      **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/InputReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputReader.h
index 7d1ee838110..c0d726424f6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/InputReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputReader.h
@@ -2,7 +2,7 @@
 ** InputReader.h                                                        **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef INPUTREADER_H
-#define INPUTREADER_H
+#ifndef DVISVGM_INPUTREADER_H
+#define DVISVGM_INPUTREADER_H
 
 #include <istream>
 #include <map>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/JFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/JFM.cpp
index 19edb5218a5..89c4796616c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/JFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/JFM.cpp
@@ -2,7 +2,7 @@
 ** JFM.cpp                                                              **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/JFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/JFM.h
index dd4ca212c49..86585477f74 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/JFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/JFM.h
@@ -2,7 +2,7 @@
 ** JFM.h                                                                **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef JFM_H
-#define JFM_H
+#ifndef DVISVGM_JFM_H
+#define DVISVGM_JFM_H
 
 #include <istream>
 #include "TFM.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Length.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Length.cpp
index fb9a1ae3158..63d1509d3fd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Length.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Length.cpp
@@ -2,7 +2,7 @@
 ** Length.cpp                                                           **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Length.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Length.h
index 995ba068cee..f2e4f5d4114 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Length.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Length.h
@@ -2,7 +2,7 @@
 ** Length.h                                                             **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef LENGTH_H
-#define LENGTH_H
+#ifndef DVISVGM_LENGTH_H
+#define DVISVGM_LENGTH_H
 
 #include <string>
 #include "MessageException.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Makefile.am
index 53187f58f60..726863b714e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Makefile.am
@@ -1,5 +1,5 @@
 :## This file is part of dvisvgm
-## Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>
+## Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>
 ##
 ## Process this file with automake.
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MapLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MapLine.cpp
index 845fc20acc2..b225b0ba4fd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MapLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MapLine.cpp
@@ -2,7 +2,7 @@
 ** MapLine.cpp                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MapLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MapLine.h
index 87451dc912d..16ee9687ae3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MapLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MapLine.h
@@ -2,7 +2,7 @@
 ** MapLine.h                                                            **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef MAPLINE_H
-#define MAPLINE_H
+#ifndef DVISVGM_MAPLINE_H
+#define DVISVGM_MAPLINE_H
 
 #include <istream>
 #include <string>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Matrix.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Matrix.cpp
index 524dcf435fb..9eb956f0529 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Matrix.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Matrix.cpp
@@ -2,7 +2,7 @@
 ** Matrix.cpp                                                           **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -342,7 +342,7 @@ static double getArgument (istream &is, Calculator &calc, double def, bool optio
    }
 	string expr;
 	while (is && !isupper(is.peek()) && is.peek() != ',')
-		expr += is.get();
+		expr += (char)is.get();
    if (expr.length() == 0) {
       if (optional)
          return def;
@@ -358,7 +358,7 @@ Matrix& Matrix::parse (istream &is, Calculator &calc) {
 	while (is) {
       while (isspace(is.peek()))
          is.get();
-		char cmd = is.get();
+		int cmd = is.get();
 		switch (cmd) {
 			case 'T': {
 				double tx = getArgument(is, calc, 0, false, false);
@@ -382,7 +382,7 @@ Matrix& Matrix::parse (istream &is, Calculator &calc) {
             break;
 			}
 			case 'F': {
-				char c = is.get();
+				int c = is.get();
 				if (c != 'H' && c != 'V')
 					throw ParserException("'H' or 'V' expected");
 				double a = getArgument(is, calc, 0, false, false);
@@ -390,7 +390,7 @@ Matrix& Matrix::parse (istream &is, Calculator &calc) {
 				break;
 			}
 			case 'K': {
-				char c = is.get();
+				int c = is.get();
 				if (c != 'X' && c != 'Y')
 					throw ParserException("transformation command 'K' must be followed by 'X' or 'Y'");
 				double a = getArgument(is, calc, 0, false, false);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Matrix.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Matrix.h
index fedeff90695..1da461d99a0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Matrix.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Matrix.h
@@ -2,7 +2,7 @@
 ** Matrix.h                                                             **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef MATRIX_H
-#define MATRIX_H
+#ifndef DVISVGM_MATRIX_H
+#define DVISVGM_MATRIX_H
 
 #include <istream>
 #include <string>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Message.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Message.cpp
index bf70b1eff04..c875109633f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Message.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Message.cpp
@@ -2,7 +2,7 @@
 ** Message.cpp                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Message.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Message.h
index bc4a9ed016c..7c39127dbd4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Message.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Message.h
@@ -2,7 +2,7 @@
 ** Message.h                                                            **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef MESSAGE_H
-#define MESSAGE_H
+#ifndef DVISVGM_MESSAGE_H
+#define DVISVGM_MESSAGE_H
 
 #include <algorithm>
 #include <string>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MessageException.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MessageException.h
index e6c4ace019f..48ae4b5bb4c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MessageException.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MessageException.h
@@ -2,7 +2,7 @@
 ** MessageException.h                                                   **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef MESSAGEEXCEPTION_H
-#define MESSAGEEXCEPTION_H
+#ifndef DVISVGM_MESSAGEEXCEPTION_H
+#define DVISVGM_MESSAGEEXCEPTION_H
 
 #include <exception>
 #include <string>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MetafontWrapper.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MetafontWrapper.cpp
index 0144f1caa42..d7922b1825b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MetafontWrapper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MetafontWrapper.cpp
@@ -2,7 +2,7 @@
 ** MetafontWrapper.cpp                                                  **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MetafontWrapper.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MetafontWrapper.h
index 2a69654ff95..3b2485122d0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MetafontWrapper.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MetafontWrapper.h
@@ -2,7 +2,7 @@
 ** MetafontWrapper.h                                                    **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef METAFONTWRAPPER_H
-#define METAFONTWRAPPER_H
+#ifndef DVISVGM_METAFONTWRAPPER_H
+#define DVISVGM_METAFONTWRAPPER_H
 
 #include <string>
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MiKTeXCom.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MiKTeXCom.cpp
index 09fa598990c..bb4353f8ee4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MiKTeXCom.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MiKTeXCom.cpp
@@ -2,7 +2,7 @@
 ** MiKTeXCom.cpp                                                        **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -38,18 +38,22 @@ MiKTeXCom::MiKTeXCom () : _session(0) {
 #else
 	HRESULT hres = CoCreateInstance(CLSID_MiKTeXSession2_9, 0, CLSCTX_INPROC_SERVER, IID_ISession2, (void**)&_session);
 #endif
-	if (FAILED(hres))
+	if (FAILED(hres)) {
+		CoUninitialize();
 		throw MessageException("MiKTeX.Session could not be initialized");
+	}
 }
 
 
 MiKTeXCom::~MiKTeXCom () {
+	if (_session) {
 #ifdef _MSC_VER
-	_session.Release();
+		_session.Release();
 #else
-	_session->Release();
+		_session->Release();
 #endif
-	_session = 0; // avoid automatic calling of Release() after CoUninitialize()
+		_session = 0; // avoid automatic calling of Release() after CoUninitialize()
+	}
 	CoUninitialize();
 }
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MiKTeXCom.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MiKTeXCom.h
index 3f387c8204b..dcb6271a4bc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/MiKTeXCom.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MiKTeXCom.h
@@ -2,7 +2,7 @@
 ** MiKTeXCom.h                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef MIKTEXCOM_H
-#define MIKTEXCOM_H
+#ifndef DVISVGM_MIKTEXCOM_H
+#define DVISVGM_MIKTEXCOM_H
 
 #include <string>
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/NoPsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/NoPsSpecialHandler.cpp
index 89b16609331..0a5119f6938 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/NoPsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/NoPsSpecialHandler.cpp
@@ -2,7 +2,7 @@
 ** NoPsSpecialHandler.cpp                                               **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/NoPsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/NoPsSpecialHandler.h
index e2f38302186..7a017fecb06 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/NoPsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/NoPsSpecialHandler.h
@@ -2,7 +2,7 @@
 ** NoPsSpecialHandler.h                                                 **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef NOPSSPECIALHANDLER_H
-#define NOPSSPECIALHANDLER_H
+#ifndef DVISVGM_NOPSSPECIALHANDLER_H
+#define DVISVGM_NOPSSPECIALHANDLER_H
 
 #include "SpecialHandler.h"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSFilter.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSFilter.h
index abb707b86e5..e2c5c092dd3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSFilter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSFilter.h
@@ -2,7 +2,7 @@
 ** PSFilter.h                                                           **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef PSFILTER_H
-#define PSFILTER_H
+#ifndef DVISVGM_PSFILTER_H
+#define DVISVGM_PSFILTER_H
 
 class PSInterpreter;
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSInterpreter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSInterpreter.cpp
index 855e951036d..00a9e66cb3c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSInterpreter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSInterpreter.cpp
@@ -2,7 +2,7 @@
 ** PSInterpreter.cpp                                                    **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSInterpreter.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSInterpreter.h
index b6f28d0f9d9..c1f30598e16 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSInterpreter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSInterpreter.h
@@ -2,7 +2,7 @@
 ** PSInterpreter.h                                                      **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef PSINTERPRETER_H
-#define PSINTERPRETER_H
+#ifndef DVISVGM_PSINTERPRETER_H
+#define DVISVGM_PSINTERPRETER_H
 
 #include <cstring>
 #include <istream>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSPattern.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPattern.cpp
index b031cb69975..a0eea24f94b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSPattern.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPattern.cpp
@@ -2,7 +2,7 @@
 ** PSPattern.cpp                                                        **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSPattern.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPattern.h
index 7e2848dea3b..db11b59f0e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSPattern.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPattern.h
@@ -2,7 +2,7 @@
 ** PSPattern.h                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef PSPATTERN_H
-#define PSPATTERN_H
+#ifndef DVISVGM_PSPATTERN_H
+#define DVISVGM_PSPATTERN_H
 
 #include <set>
 #include <string>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSPreviewFilter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPreviewFilter.cpp
index c6300eeb932..9995fd1d93b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSPreviewFilter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPreviewFilter.cpp
@@ -2,7 +2,7 @@
 ** PSPreviewFilter.cpp                                                  **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSPreviewFilter.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPreviewFilter.h
index 7662dfa74cc..792116a7083 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PSPreviewFilter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPreviewFilter.h
@@ -2,7 +2,7 @@
 ** PSPreviewFilter.h                                                    **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef PSPREVIEWFILTER_H
-#define PSPREVIEWFILTER_H
+#ifndef DVISVGM_PSPREVIEWFILTER_H
+#define DVISVGM_PSPREVIEWFILTER_H
 
 #include <string>
 #include <vector>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PageRanges.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageRanges.cpp
index 392be0acf33..f7991464ca9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PageRanges.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageRanges.cpp
@@ -2,7 +2,7 @@
 ** PageRanges.cpp                                                       **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PageRanges.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageRanges.h
index 0e5cd58e5ff..57b47b91e44 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PageRanges.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageRanges.h
@@ -2,7 +2,7 @@
 ** PageRanges.h                                                         **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef PAGERANGES_H
-#define PAGERANGES_H
+#ifndef DVISVGM_PAGERANGES_H
+#define DVISVGM_PAGERANGES_H
 
 #include <list>
 #include <string>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PageSize.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageSize.cpp
index 4625af066a8..c6adbfbb2f2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PageSize.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageSize.cpp
@@ -2,7 +2,7 @@
 ** PageSize.cpp                                                         **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PageSize.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageSize.h
index bb7a55c7cdc..4c20c5ca2a9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PageSize.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageSize.h
@@ -2,7 +2,7 @@
 ** PageSize.h                                                           **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef PAGESIZE_H
-#define PAGESIZE_H
+#ifndef DVISVGM_PAGESIZE_H
+#define DVISVGM_PAGESIZE_H
 
 #include "MessageException.h"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Pair.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Pair.h
index a3dc5a12af3..4c2d465e7c0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Pair.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Pair.h
@@ -2,7 +2,7 @@
 ** Pair.h                                                               **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef PAIR_H
-#define PAIR_H
+#ifndef DVISVGM_PAIR_H
+#define DVISVGM_PAIR_H
 
 #include <cmath>
 #include <ostream>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PdfSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PdfSpecialHandler.cpp
index 8dc7d7fd13d..998b8016eae 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PdfSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PdfSpecialHandler.cpp
@@ -2,7 +2,7 @@
 ** PdfSpecialHandler.cpp                                                **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PdfSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PdfSpecialHandler.h
index 43cdd1045de..a5391fbf141 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PdfSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PdfSpecialHandler.h
@@ -2,7 +2,7 @@
 ** PdfSpecialHandler.h                                                  **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef PDFSPECIALHANDLER_H
-#define PDFSPECIALHANDLER_H
+#ifndef DVISVGM_PDFSPECIALHANDLER_H
+#define DVISVGM_PDFSPECIALHANDLER_H
 
 #include "SpecialHandler.h"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Process.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Process.cpp
index 03e3261de6d..41c3bec0daa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Process.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Process.cpp
@@ -2,7 +2,7 @@
 ** Process.cpp                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Process.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Process.h
index caf80de4c14..df2e0545049 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Process.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Process.h
@@ -2,7 +2,7 @@
 ** Process.h                                                            **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef PROCESS_H
-#define PROCESS_H
+#ifndef DVISVGM_PROCESS_H
+#define DVISVGM_PROCESS_H
 
 #include <string>
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PsSpecialHandler.cpp
index 09d23aa03b8..8958dfa1f8d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PsSpecialHandler.cpp
@@ -2,7 +2,7 @@
 ** PsSpecialHandler.cpp                                                 **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PsSpecialHandler.h
index d1d61e92568..01bb1ada1ee 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/PsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PsSpecialHandler.h
@@ -2,7 +2,7 @@
 ** PsSpecialHandler.h                                                   **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef PSSPECIALHANDLER_H
-#define PSSPECIALHANDLER_H
+#ifndef DVISVGM_PSSPECIALHANDLER_H
+#define DVISVGM_PSSPECIALHANDLER_H
 
 #include <set>
 #include <stack>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SVGOutputBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SVGOutputBase.h
index f53815c0a28..cad892ea068 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SVGOutputBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SVGOutputBase.h
@@ -2,7 +2,7 @@
 ** SVGOutputBase.h                                                      **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef SVGOUTPUTBASE_H
-#define SVGOUTPUTBASE_H
+#ifndef DVISVGM_SVGOUTPUTBASE_H
+#define DVISVGM_SVGOUTPUTBASE_H
 
 #include <ostream>
 #include <string>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SVGTree.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SVGTree.cpp
index 626d81da133..c61526e4de8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SVGTree.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SVGTree.cpp
@@ -2,7 +2,7 @@
 ** SVGTree.cpp                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -72,6 +72,21 @@ void SVGTree::setBBox (const BoundingBox &bbox) {
 }
 
 
+void SVGTree::setColor (const Color &c) {
+	if (!_font.get() || _font.get()->color() == Color::BLACK)
+		_color.set(c);
+}
+
+
+void SVGTree::setFont (int num, const Font *font) {
+	_font.set(font);
+	_fontnum = num;
+	// set default color assigned to the font
+	if (font->color() != Color::BLACK && _color.get() != font->color())
+		_color.set(font->color());
+}
+
+
 /** Starts a new page.
  *  @param[in] pageno number of new page */
 void SVGTree::newPage (int pageno) {
@@ -142,7 +157,7 @@ void SVGTree::appendChar (int c, double x, double y, const Font &font) {
 				_span->addAttribute("y", y);
 				_ychanged = false;
 			}
-			if (_color.get() != Color::BLACK) {
+			if (_color.get() != font.color()) {
 					_span->addAttribute("fill", _color.get().rgbString());
 				_color.changed(false);
 			}
@@ -269,15 +284,6 @@ void SVGTree::newTextNode (double x, double y) {
 }
 
 
-void SVGTree::setFont (int num, const Font *font) {
-	_font.set(font);
-	_fontnum = num;
-	// set default color assigned to the font
-	if (!USE_FONTS && _color.get() != font->color())
-		setColor(font->color());
-}
-
-
 void SVGTree::transformPage (const Matrix *usermatrix) {
 	double bp = 72.0/72.27;  // pt -> bp
 	ScalingMatrix matrix(bp, bp);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SVGTree.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SVGTree.h
index 041d97d21d8..fb27c661c71 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SVGTree.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SVGTree.h
@@ -2,7 +2,7 @@
 ** SVGTree.h                                                            **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef SVGTREE_H
-#define SVGTREE_H
+#ifndef DVISVGM_SVGTREE_H
+#define DVISVGM_SVGTREE_H
 
 #include <map>
 #include <set>
@@ -80,7 +80,7 @@ class SVGTree
 		void setX (double x)              {_xchanged = true;}
 		void setY (double y)              {_ychanged = true;}
 		void setMatrix (const Matrix &m)  {_matrix.set(m);}
-		void setColor (const Color &c)    {_color.set(c);}
+		void setColor (const Color &c);
 		void setVertical (bool state)     {_vertical.set(state);}
 		void transformPage (const Matrix *m);
 		const Color& getColor () const    {return _color.get();}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SignalHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SignalHandler.cpp
index 494c87b8e90..6e91a05442d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SignalHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SignalHandler.cpp
@@ -2,7 +2,7 @@
 ** SignalHandler.cpp                                                    **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SignalHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SignalHandler.h
index e7473f567d8..dfece9963e4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SignalHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SignalHandler.h
@@ -2,7 +2,7 @@
 ** SignalHandler.h                                                      **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef SIGNALHANDLER_H
-#define SIGNALHANDLER_H
+#ifndef DVISVGM_SIGNALHANDLER_H
+#define DVISVGM_SIGNALHANDLER_H
 
 #include <exception>
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SpecialActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialActions.h
index a3cbafeefe3..d28a24a766e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SpecialActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialActions.h
@@ -2,7 +2,7 @@
 ** SpecialActions.h                                                     **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef SPECIALACTIONS_H
-#define SPECIALACTIONS_H
+#ifndef DVISVGM_SPECIALACTIONS_H
+#define DVISVGM_SPECIALACTIONS_H
 
 #include <string>
 #include "BoundingBox.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialHandler.h
index 0883b4cf326..29df03728e8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialHandler.h
@@ -2,7 +2,7 @@
 ** SpecialHandler.h                                                     **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef SPECIALHANDLER_H
-#define SPECIALHANDLER_H
+#ifndef DVISVGM_SPECIALHANDLER_H
+#define DVISVGM_SPECIALHANDLER_H
 
 #include <istream>
 #include <list>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SpecialManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialManager.cpp
index 2f1641393a0..d6b9569e1aa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SpecialManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialManager.cpp
@@ -2,7 +2,7 @@
 ** SpecialManager.cpp                                                   **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -153,6 +153,7 @@ void SpecialManager::notifyPositionChange (double x, double y) const {
 
 
 void SpecialManager::writeHandlerInfo (ostream &os) const {
+	ios::fmtflags osflags(os.flags());
 	typedef map<string, SpecialHandler*> SortMap;
 	SortMap m;
 	FORALL(_handlers, ConstIterator, it)
@@ -164,5 +165,6 @@ void SpecialManager::writeHandlerInfo (ostream &os) const {
 			os << it->second->info();
 		os << endl;
 	}
+	os.flags(osflags);  // restore format flags
 }
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SpecialManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialManager.h
index fc609569ce7..930367259ea 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/SpecialManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialManager.h
@@ -2,7 +2,7 @@
 ** SpecialManager.h                                                     **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef SPECIALMANAGER_H
-#define SPECIALMANAGER_H
+#ifndef DVISVGM_SPECIALMANAGER_H
+#define DVISVGM_SPECIALMANAGER_H
 
 #include <map>
 #include <ostream>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/StreamReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamReader.cpp
index 7b56222e852..1464b9fdcf6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/StreamReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamReader.cpp
@@ -2,7 +2,7 @@
 ** StreamReader.cpp                                                     **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/StreamReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamReader.h
index 3bb25dacca9..a35bae2d91f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/StreamReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamReader.h
@@ -2,7 +2,7 @@
 ** StreamReader.h                                                       **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef STREAMREADER_H
-#define STREAMREADER_H
+#ifndef DVISVGM_STREAMREADER_H
+#define DVISVGM_STREAMREADER_H
 
 #include <istream>
 #include <string>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/StreamWriter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamWriter.cpp
index 72ffd5b5eac..203a1788f87 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/StreamWriter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamWriter.cpp
@@ -2,7 +2,7 @@
 ** StreamWriter.cpp                                                     **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/StreamWriter.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamWriter.h
index 6217800dae6..05999c48fb5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/StreamWriter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamWriter.h
@@ -2,7 +2,7 @@
 ** StreamWriter.h                                                       **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef STREAMWRITER_H
-#define STREAMWRITER_H
+#ifndef DVISVGM_STREAMWRITER_H
+#define DVISVGM_STREAMWRITER_H
 
 #include <ostream>
 #include "types.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Subfont.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Subfont.cpp
index 7b005d00aa9..88452fd1dcc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Subfont.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Subfont.cpp
@@ -2,7 +2,7 @@
 ** Subfont.cpp                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Subfont.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Subfont.h
index b099bc76897..03ce75c3e99 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Subfont.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Subfont.h
@@ -2,7 +2,7 @@
 ** Subfont.h                                                            **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef SUBFONT_H
-#define SUBFONT_H
+#ifndef DVISVGM_SUBFONT_H
+#define DVISVGM_SUBFONT_H
 
 #include <istream>
 #include <map>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/System.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/System.cpp
index 816f3dc02a1..6769f843cae 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/System.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/System.cpp
@@ -2,7 +2,7 @@
 ** System.cpp                                                           **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/System.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/System.h
index 775d6358dd7..9485f029d96 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/System.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/System.h
@@ -2,7 +2,7 @@
 ** System.h                                                             **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef SYSTEM_H
-#define SYSTEM_H
+#ifndef DVISVGM_SYSTEM_H
+#define DVISVGM_SYSTEM_H
 
 namespace System
 {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/TFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TFM.cpp
index 1d97600361d..b4c1f06b569 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/TFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TFM.cpp
@@ -2,7 +2,7 @@
 ** TFM.cpp                                                              **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/TFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TFM.h
index a46d2560c22..1f75d76cb50 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/TFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TFM.h
@@ -2,7 +2,7 @@
 ** TFM.h                                                                **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef TFM_H
-#define TFM_H
+#ifndef DVISVGM_TFM_H
+#define DVISVGM_TFM_H
 
 #include <istream>
 #include <string>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Terminal.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Terminal.cpp
index 6d61bea78d4..e95111d196b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Terminal.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Terminal.cpp
@@ -2,7 +2,7 @@
 ** Terminal.cpp                                                         **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Terminal.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Terminal.h
index 0a876272c91..08ac7e6300a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/Terminal.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Terminal.h
@@ -2,7 +2,7 @@
 ** Terminal.h                                                           **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef TERMINAL_H
-#define TERMINAL_H
+#ifndef DVISVGM_TERMINAL_H
+#define DVISVGM_TERMINAL_H
 
 #include <ostream>
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/TpicSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TpicSpecialHandler.cpp
index 8d160e9d9a4..f5b15cd4c41 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/TpicSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TpicSpecialHandler.cpp
@@ -2,7 +2,7 @@
 ** TpicSpecialHandler.cpp                                               **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/TpicSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TpicSpecialHandler.h
index e055e2e0a69..5c8e73cef67 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/TpicSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TpicSpecialHandler.h
@@ -2,7 +2,7 @@
 ** TpicSpecialHandler.h                                                 **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef TPICSPECIALHANDLER_H
-#define TPICSPECIALHANDLER_H
+#ifndef DVISVGM_TPICSPECIALHANDLER_H
+#define DVISVGM_TPICSPECIALHANDLER_H
 
 #include <list>
 #include "Pair.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/VFActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VFActions.h
index ba25639b337..a8e86831fe9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/VFActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VFActions.h
@@ -2,7 +2,7 @@
 ** VFActions.h                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef VFACTIONS_H
-#define VFACTIONS_H
+#ifndef DVISVGM_VFACTIONS_H
+#define DVISVGM_VFACTIONS_H
 
 #include <string>
 #include <vector>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/VFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VFReader.cpp
index 20c7fef457c..b4a0f965492 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/VFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VFReader.cpp
@@ -2,7 +2,7 @@
 ** VFReader.cpp                                                         **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/VFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VFReader.h
index 25689dec2c8..f6d9474ccbe 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/VFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VFReader.h
@@ -2,7 +2,7 @@
 ** VFReader.h                                                           **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef VFREADER_H
-#define VFREADER_H
+#ifndef DVISVGM_VFREADER_H
+#define DVISVGM_VFREADER_H
 
 #include "MessageException.h"
 #include "StreamReader.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/VectorStream.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VectorStream.h
index e57dad43ad1..345b319c7b3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/VectorStream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VectorStream.h
@@ -2,7 +2,7 @@
 ** VectorStream.h                                                       **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef VECTORSTREAM_H
-#define VECTORSTREAM_H
+#ifndef DVISVGM_VECTORSTREAM_H
+#define DVISVGM_VECTORSTREAM_H
 
 #include <istream>
 #include <vector>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLDocument.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLDocument.cpp
index 00517b218ff..da19bfc6740 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLDocument.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLDocument.cpp
@@ -2,7 +2,7 @@
 ** XMLDocument.cpp                                                      **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLDocument.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLDocument.h
index 31cf9dea303..c3d6b928ee7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLDocument.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLDocument.h
@@ -2,7 +2,7 @@
 ** XMLDocument.h                                                        **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef XMLDOCUMENT_H
-#define XMLDOCUMENT_H
+#ifndef DVISVGM_XMLDOCUMENT_H
+#define DVISVGM_XMLDOCUMENT_H
 
 #include "XMLNode.h"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLNode.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLNode.cpp
index e7c9f295d89..e61f35b1e8c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLNode.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLNode.cpp
@@ -2,7 +2,7 @@
 ** XMLNode.cpp                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLNode.h
index 324bea068aa..cd878701db9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLNode.h
@@ -2,7 +2,7 @@
 ** XMLNode.h                                                            **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef XMLNODE_H
-#define XMLNODE_H
+#ifndef DVISVGM_XMLNODE_H
+#define DVISVGM_XMLNODE_H
 
 #include <list>
 #include <map>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLString.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLString.cpp
index 2b46d049db6..ea4487f45bc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLString.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLString.cpp
@@ -2,7 +2,7 @@
 ** XMLString.cpp                                                        **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLString.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLString.h
index b1496b4a503..ae27053a856 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/XMLString.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLString.h
@@ -2,7 +2,7 @@
 ** XMLString.h                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef XMLSTRING_H
-#define XMLSTRING_H
+#ifndef DVISVGM_XMLSTRING_H
+#define DVISVGM_XMLSTRING_H
 
 #include <string>
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/dvisvgm.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/dvisvgm.cpp
index f45d44790ad..85bd428f5eb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/dvisvgm.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/dvisvgm.cpp
@@ -2,7 +2,7 @@
 ** dvisvgm.cpp                                                          **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -151,7 +151,7 @@ class SVGOutput : public SVGOutputBase
 static void show_help (const CommandLine &cmd) {
 	cout << PACKAGE_STRING "\n\n";
 	cmd.help(cmd.help_arg());
-   cout << "\nCopyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de> \n\n";
+   cout << "\nCopyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de> \n\n";
 }
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/gzstream.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/gzstream.cpp
index 2893c299891..2893c299891 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/gzstream.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/gzstream.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/gzstream.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/gzstream.h
index 60f38c4fac7..60f38c4fac7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/gzstream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/gzstream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/iapi.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/iapi.h
index 8e29d938d03..8e29d938d03 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/iapi.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/iapi.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/ierrors.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/ierrors.h
index 3184341177e..3184341177e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/ierrors.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/ierrors.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/macros.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/macros.h
index 8935b9babe9..73217c763e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/macros.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/macros.h
@@ -2,7 +2,7 @@
 ** macros.h                                                             **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef MACROS_H
-#define MACROS_H
+#ifndef DVISVGM_MACROS_H
+#define DVISVGM_MACROS_H
 
 #define FORALL(container, itertype, itervar) \
 	for (itertype itervar=(container).begin(); itervar != (container).end(); ++itervar)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/options.xml b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/options.xml
index ea0a6f6db95..bf1e0106999 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/options.xml
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/options.xml
@@ -3,7 +3,7 @@
 ** options.xml                                                          **
 **                                                                      **
 ** This file is part of dvisvgm - the DVI to SVG converter              **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/psdefs.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/psdefs.cpp
index 9742ca1cd7a..4edce3af1d8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/psdefs.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/psdefs.cpp
@@ -2,7 +2,7 @@
 ** psdefs.cpp                                                           **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/types.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/types.h
index c22d0e1bf47..306a0ab4e26 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.1/src/types.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/types.h
@@ -2,7 +2,7 @@
 ** types.h                                                              **
 **                                                                      **
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
-** Copyright (C) 2005-2013 Martin Gieseking <martin.gieseking@uos.de>   **
+** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
 ** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
@@ -18,8 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#ifndef TYPES_H
-#define TYPES_H
+#ifndef DVISVGM_TYPES_H
+#define DVISVGM_TYPES_H
 
 namespace internal {
    template<unsigned BYTES>
diff --git a/Build/source/texk/dvisvgm/version.ac b/Build/source/texk/dvisvgm/version.ac
index a778c53becc..101d22febc4 100644
--- a/Build/source/texk/dvisvgm/version.ac
+++ b/Build/source/texk/dvisvgm/version.ac
@@ -1,5 +1,5 @@
 dnl
-dnl   Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current dvisvgm version
-m4_define([dvisvgm_version], [1.5.1])
+m4_define([dvisvgm_version], [1.5.2])