dvisvgm 1.0.2

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

192 files changed, 620 insertions, 332 deletions

diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index 39109acad3b..994b9d15d91 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Imported release 1.0.2.
+	* configure.ac: Adapted.
+
 2010-06-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Imported release 1.0.1.
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 72297888bf6..6f41398cc9d 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.65 for dvisvgm 1.0.1.
+# Generated by GNU Autoconf 2.65 for dvisvgm 1.0.2.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -701,12 +701,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvisvgm'
 PACKAGE_TARNAME='dvisvgm'
-PACKAGE_VERSION='1.0.1'
-PACKAGE_STRING='dvisvgm 1.0.1'
+PACKAGE_VERSION='1.0.2'
+PACKAGE_STRING='dvisvgm 1.0.2'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="dvisvgm-1.0.1/src/dvisvgm.cpp"
+ac_unique_file="dvisvgm-1.0.2/src/dvisvgm.cpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1464,7 +1464,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dvisvgm 1.0.1 to adapt to many kinds of systems.
+\`configure' configures dvisvgm 1.0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1534,7 +1534,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvisvgm 1.0.1:";;
+     short | recursive ) echo "Configuration of dvisvgm 1.0.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1659,7 +1659,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvisvgm configure 1.0.1
+dvisvgm configure 1.0.2
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2355,7 +2355,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dvisvgm $as_me 1.0.1, which was
+It was created by dvisvgm $as_me 1.0.2, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -7081,7 +7081,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvisvgm'
- VERSION='1.0.1'
+ VERSION='1.0.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16613,7 +16613,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dvisvgm config.lt 1.0.1
+dvisvgm config.lt 1.0.2
 configured by $0, generated by GNU Autoconf 2.65.
 
 Copyright (C) 2008 Free Software Foundation, Inc.
@@ -18294,7 +18294,7 @@ CPPFLAGS=$kpse_save_CPPFLAGS
 LIBS=$kpse_save_LIBS
 
 
-DVISVGM_TREE=dvisvgm-1.0.1
+DVISVGM_TREE=dvisvgm-1.0.2
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -18837,7 +18837,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dvisvgm $as_me 1.0.1, which was
+This file was extended by dvisvgm $as_me 1.0.2, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18903,7 +18903,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dvisvgm config.status 1.0.1
+dvisvgm config.status 1.0.2
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvisvgm/configure.ac b/Build/source/texk/dvisvgm/configure.ac
index fc49ad4e597..5fccab6cc28 100644
--- a/Build/source/texk/dvisvgm/configure.ac
+++ b/Build/source/texk/dvisvgm/configure.ac
@@ -13,7 +13,7 @@ dnl  Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de>
 dnl
 dnl *********************************************************************
 dnl
-m4_define([dvisvgm_version], [1.0.1])[]dnl using unmodified dvisvgm source tree
+m4_define([dvisvgm_version], [1.0.2])[]dnl using unmodified dvisvgm source tree
 AC_INIT([dvisvgm], dvisvgm_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([dvisvgm-]dvisvgm_version[/src/dvisvgm.cpp])
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/TL-Changes
deleted file mode 100644
index 0382ea45562..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/TL-Changes
+++ /dev/null
@@ -1,10 +0,0 @@
-Changes applied to the dvisvgm-1.0 tree as obtained from:
-	http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.0.tar.gz
-
-Removed:
-	config.guess
-	config.sub
-	depcomp
-	install-sh
-	missing
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-01-isopen b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-01-isopen
deleted file mode 100644
index 666c01ecd9a..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-01-isopen
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur dvisvgm-1.0.1.orig/src/GFGlyphTracer.h dvisvgm-1.0.1/src/GFGlyphTracer.h
---- dvisvgm-1.0.1.orig/src/GFGlyphTracer.h	2010-03-18 20:20:04.000000000 +0100
-+++ dvisvgm-1.0.1/src/GFGlyphTracer.h	2010-06-12 15:56:17.189565656 +0200
-@@ -50,7 +50,6 @@
- 		void endChar (UInt32 c);
- 		void setGlyph (Glyph &glyph)   {_glyph = &glyph;}
- 		const Glyph& getGlyph () const {return *_glyph;}
--		bool opened () const           {return _ifs.is_open();}
- 
-    private:
- 		std::ifstream _ifs;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-02-newline-at-end-of-file b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-02-newline-at-end-of-file
deleted file mode 100644
index 31c5b7f9943..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-02-newline-at-end-of-file
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -ur dvisvgm-1.0.1.orig/src/FontEncoding.cpp dvisvgm-1.0.1/src/FontEncoding.cpp
---- dvisvgm-1.0.1.orig/src/FontEncoding.cpp	2010-04-20 19:07:42.000000000 +0200
-+++ dvisvgm-1.0.1/src/FontEncoding.cpp	2010-06-12 15:59:17.947919039 +0200
-@@ -155,4 +155,4 @@
- 		return enc;      
- 	}
- 	return 0;
--}
-\ No newline at end of file
-+}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-07-libdvisvgm-uint32 b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-07-libdvisvgm-uint32
deleted file mode 100644
index c5216203dd2..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-07-libdvisvgm-uint32
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur dvisvgm-1.0.1.orig/src/FontEngine.cpp dvisvgm-1.0.1/src/FontEngine.cpp
---- dvisvgm-1.0.1.orig/src/FontEngine.cpp	2010-03-24 19:45:38.000000000 +0100
-+++ dvisvgm-1.0.1/src/FontEngine.cpp	2010-06-12 21:09:47.143615966 +0200
-@@ -66,7 +66,7 @@
-  * @param[in] face font face to be used
-  * @param[out] reverseMap the resulting map */
- static void build_reverse_map (FT_Face face, map<UInt32, UInt32> &reverseMap) {
--	UInt32 glyphIndex;
-+	FT_UInt glyphIndex;
- 	UInt32 charcode = FT_Get_First_Char(face, &glyphIndex);
- 	while (glyphIndex) {
- //		if (reverseMap.find(glyphIndex) == reverseMap.end())
-@@ -127,7 +127,7 @@
- 	build_reverse_map(_currentFace, reverseMap);
- 
- 	FT_Set_Charmap(_currentFace, unicodeMap);
--	UInt32 glyphIndex;
-+	FT_UInt glyphIndex;
- 	UInt32 charcode = FT_Get_First_Char(_currentFace, &glyphIndex);
- 	while (glyphIndex) {
- 		translationMap[reverseMap[glyphIndex]] = charcode;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-08-static-const-members b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-08-static-const-members
deleted file mode 100644
index 86bc6dbc51f..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-08-static-const-members
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur dvisvgm-1.0.1.orig/src/FontCache.cpp dvisvgm-1.0.1/src/FontCache.cpp
---- dvisvgm-1.0.1.orig/src/FontCache.cpp	2010-03-24 19:45:38.000000000 +0100
-+++ dvisvgm-1.0.1/src/FontCache.cpp	2010-06-12 21:31:51.080119555 +0200
-@@ -34,6 +34,7 @@
- 
- using namespace std;
- 
-+const UInt8 FontCache::VERSION;
- 
- static Pair32 read_pair (int bytes, StreamReader &sr) {
- 	Int32 x = sr.readSigned(bytes);
-diff -ur dvisvgm-1.0.1.orig/src/gzstream.cpp dvisvgm-1.0.1/src/gzstream.cpp
---- dvisvgm-1.0.1.orig/src/gzstream.cpp	2009-08-29 22:06:31.000000000 +0200
-+++ dvisvgm-1.0.1/src/gzstream.cpp	2010-06-12 21:31:51.080119555 +0200
-@@ -34,6 +34,8 @@
- namespace GZSTREAM_NAMESPACE {
- #endif
- 
-+const int gzstreambuf::bufferSize;
-+
- // ----------------------------------------------------------------------------
- // Internal classes to implement gzstream. See header file for user classes.
- // ----------------------------------------------------------------------------
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-30-WIN32-warning b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-30-WIN32-warning
deleted file mode 100644
index ad436f81bbc..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-30-WIN32-warning
+++ /dev/null
@@ -1,14 +0,0 @@
-	Avoid compiler warning.
-
-diff -ur dvisvgm-1.0.1.orig/src/MetafontWrapper.cpp dvisvgm-1.0.1/src/MetafontWrapper.cpp
---- dvisvgm-1.0.1.orig/src/MetafontWrapper.cpp	2010-06-08 10:40:37.000000000 +0200
-+++ dvisvgm-1.0.1/src/MetafontWrapper.cpp	2010-06-12 21:34:50.868358077 +0200
-@@ -55,7 +55,7 @@
- 	string cmdline = string("\"")+cmd+"\" "+params;
- 	CreateProcess(NULL, (LPSTR)cmdline.c_str(), NULL, NULL, true, 0, NULL, NULL, &si, &pi);
- 	WaitForSingleObject(pi.hProcess, INFINITE);
--	DWORD exitcode = -1;
-+	DWORD exitcode = (DWORD)-1;
- 	GetExitCodeProcess(pi.hProcess, &exitcode);
- 	CloseHandle(devnull);
- 	return exitcode;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/ChangeLog
index 5d530acde4c..b0cfa0c1c48 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/ChangeLog
@@ -1,3 +1,12 @@
+2010-06-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported release 1.0.2.
+
+	Removed patch-01-isopen, patch-02-newline-at-end-of-file,
+	patch-07-libdvisvgm-uint32, patch-08-static-const-members,
+	patch-30-WIN32-warning,
+	now all included in the original source tree.
+
 2010-06-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported release 1.0.1.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/TL-Changes
new file mode 100644
index 00000000000..06f9b20b7a2
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/TL-Changes
@@ -0,0 +1,10 @@
+Changes applied to the dvisvgm-1.0.2 tree as obtained from:
+	http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.0.2.tar.gz
+
+Removed:
+	config.guess
+	config.sub
+	depcomp
+	install-sh
+	missing
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/AUTHORS b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/AUTHORS
index 837e1e96bfb..837e1e96bfb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/AUTHORS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/AUTHORS
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/COPYING b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/COPYING
index 94a9ed024d3..94a9ed024d3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/COPYING
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/COPYING
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/INSTALL b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/INSTALL
index a4b34144dcf..a4b34144dcf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/INSTALL
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/INSTALL
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/LGPL-2.1.txt b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/LGPL-2.1.txt
index 602bfc94635..602bfc94635 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/LGPL-2.1.txt
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/LGPL-2.1.txt
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/Makefile.am
index 8b330e8e7c0..8b330e8e7c0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/Makefile.in
index aaf403c1fe2..aaf403c1fe2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/NEWS b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/NEWS
index 9115ef31300..becfa1bef1d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/NEWS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/NEWS
@@ -1,3 +1,10 @@
+dvisvgm-1.0.2
+- applied latest TeX Live portability patches sent by Peter Breitenlohner and Karl Berry
+- fixed a potrace name clash occurred on Mac OS X Tiger
+- fixed putchar() name clash occurred on Solaris
+- fixed a couple of conversion warnings
+- updated the test suite
+
 dvisvgm-1.0.1
 - fixed a memory issue in the PS handler that could lead to a segfault (SF bug #3013392)
 - fixed a recursion issue in the PS handler
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/README b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/README
index e83d7f09ff6..e83d7f09ff6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/README
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/README
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/aclocal.m4 b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/aclocal.m4
index 721df62391d..721df62391d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/aclocal.m4
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/aclocal.m4
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/config.h.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/config.h.in
index b027999e9b3..b027999e9b3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/config.h.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/config.h.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/configure b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/configure
index 4d1f6db566b..3791732c742 100755
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/configure
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for dvisvgm 1.0.1.
+# Generated by GNU Autoconf 2.65 for dvisvgm 1.0.2.
 #
 # Report bugs to <martin.gieseking@uos.de>.
 #
@@ -552,8 +552,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvisvgm'
 PACKAGE_TARNAME='dvisvgm'
-PACKAGE_VERSION='1.0.1'
-PACKAGE_STRING='dvisvgm 1.0.1'
+PACKAGE_VERSION='1.0.2'
+PACKAGE_STRING='dvisvgm 1.0.2'
 PACKAGE_BUGREPORT='martin.gieseking@uos.de'
 PACKAGE_URL=''
 
@@ -1266,7 +1266,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dvisvgm 1.0.1 to adapt to many kinds of systems.
+\`configure' configures dvisvgm 1.0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1337,7 +1337,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvisvgm 1.0.1:";;
+     short | recursive ) echo "Configuration of dvisvgm 1.0.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1436,7 +1436,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvisvgm configure 1.0.1
+dvisvgm configure 1.0.2
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1899,7 +1899,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dvisvgm $as_me 1.0.1, which was
+It was created by dvisvgm $as_me 1.0.2, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2821,7 +2821,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvisvgm'
- VERSION='1.0.1'
+ VERSION='1.0.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5014,7 +5014,7 @@ fi
 
 
 if test "$HAVE_LIBPOTRACE" -eq 0; then
-	AM_CPPFLAGS="$AM_CXXFLAGS -I../potracelib -I../../potracelib"
+	AM_CPPFLAGS="$AM_CXXFLAGS -I\${srcdir}/../potracelib -I\${srcdir}/../../potracelib"
 	EXTRA_LIBS="$EXTRA_LIBS ../potracelib/libpotrace.a "
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Using bundled potrace library" >&5
 $as_echo "$as_me: Using bundled potrace library" >&6;}
@@ -6837,7 +6837,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dvisvgm $as_me 1.0.1, which was
+This file was extended by dvisvgm $as_me 1.0.2, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6903,7 +6903,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dvisvgm config.status 1.0.1
+dvisvgm config.status 1.0.2
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/configure.ac b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/configure.ac
index 2a5fde916eb..35768f3450f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/configure.ac
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/configure.ac
@@ -4,7 +4,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dvisvgm],[1.0.1],[martin.gieseking@uos.de])
+AC_INIT([dvisvgm],[1.0.2],[martin.gieseking@uos.de])
 DATE="May 2010"
 AC_CONFIG_SRCDIR(src)
 AC_CONFIG_HEADER(config.h)
@@ -57,7 +57,7 @@ AC_CHECK_HEADER([potracelib.h],
 	 AC_CHECK_LIB(potrace, potrace_trace, , HAVE_LIBPOTRACE=0)], HAVE_LIBPOTRACE=0)
 
 if test "$HAVE_LIBPOTRACE" -eq 0; then
-	AM_CPPFLAGS="$AM_CXXFLAGS -I../potracelib -I../../potracelib"
+	AM_CPPFLAGS="$AM_CXXFLAGS -I\${srcdir}/../potracelib -I\${srcdir}/../../potracelib"
 	EXTRA_LIBS="$EXTRA_LIBS ../potracelib/libpotrace.a "
 	AC_MSG_NOTICE([Using bundled potrace library])
 fi
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/doc/Makefile.am
index e9c79906fde..e9c79906fde 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/doc/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/doc/Makefile.in
index d08fc354c5d..d08fc354c5d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/doc/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/dvisvgm.1 b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/doc/dvisvgm.1
index e3638af6267..74d82bce23a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/dvisvgm.1
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/doc/dvisvgm.1
@@ -2,12 +2,12 @@
 .\"     Title: dvisvgm
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/11/2010
+.\"      Date: 06/22/2010
 .\"    Manual: dvisvgm Manual
-.\"    Source: dvisvgm 1.0.1
+.\"    Source: dvisvgm 1.0.2
 .\"  Language: English
 .\"
-.TH "DVISVGM" "1" "06/11/2010" "dvisvgm 1\&.0\&.1" "dvisvgm Manual"
+.TH "DVISVGM" "1" "06/22/2010" "dvisvgm 1\&.0\&.2" "dvisvgm Manual"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/dvisvgm.txt.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/doc/dvisvgm.txt.in
index 3003fb44e16..3003fb44e16 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/dvisvgm.txt.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/doc/dvisvgm.txt.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/Makefile.am
index 97bf78f50f4..97bf78f50f4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/Makefile.in
index 01af70e8ac1..01af70e8ac1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/auxiliary.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/auxiliary.h
index 7baab851cff..7baab851cff 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/auxiliary.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/auxiliary.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/bitmap.h
index 2a172b1ad6a..2a172b1ad6a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/curve.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/curve.c
index 0dc1005b36e..6a4ac6df4b5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/curve.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/curve.c
@@ -19,7 +19,7 @@
 /* ---------------------------------------------------------------------- */
 /* allocate and free path objects */
 
-path_t *path_new(void) {
+path_t *potrace_path_new(void) {
   path_t *p = NULL;
   privpath_t *priv = NULL;
 
@@ -47,7 +47,7 @@ static void privcurve_free_members(privcurve_t *curve) {
 }
 
 /* free a path. Leave errno untouched. */
-void path_free(path_t *p) {
+void potrace_path_free(path_t *p) {
   if (p) {
     if (p->priv) {
       free(p->priv->pt);
@@ -68,7 +68,7 @@ void pathlist_free(path_t *plist) {
   path_t *p;
 
   list_forall_unlink(p, plist) {
-    path_free(p);
+    potrace_path_free(p);
   }
 }
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/curve.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/curve.h
index 45c0790bee3..60b22d6f492 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/curve.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/curve.h
@@ -67,8 +67,8 @@ typedef struct potrace_privpath_s potrace_privpath_t;
 typedef potrace_privpath_t privpath_t;
 typedef potrace_path_t path_t;
 
-path_t *path_new(void);
-void path_free(path_t *p);
+path_t *potrace_path_new(void);
+void potrace_path_free(path_t *p);
 void pathlist_free(path_t *plist);
 int privcurve_init(privcurve_t *curve, int n);
 void privcurve_to_curve(privcurve_t *pc, potrace_curve_t *c);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/decompose.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/decompose.c
index f54df3b7e78..f5057d65419 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/decompose.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/decompose.c
@@ -266,7 +266,7 @@ static path_t *findpath(potrace_bitmap_t *bm, int x0, int y0, int sign, int turn
   } /* while this path */
 
   /* allocate new path object */
-  p = path_new();
+  p = potrace_path_new();
   if (!p) {
     goto error;
   }
@@ -481,7 +481,7 @@ int bm_to_pathlist(const potrace_bitmap_t *bm, path_t **plistp, const potrace_pa
 
     /* if it's a turd, eliminate it, else append it to the list */
     if (p->area <= param->turdsize) {
-      path_free(p);
+      potrace_path_free(p);
     } else {
       list_insert_beforehook(p, hook);
     }
@@ -502,7 +502,7 @@ int bm_to_pathlist(const potrace_bitmap_t *bm, path_t **plistp, const potrace_pa
  error:
   bm_free(bm1);
   list_forall_unlink(p, plist) {
-    path_free(p);
+    potrace_path_free(p);
   }
   return -1;
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/decompose.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/decompose.h
index 512baf14d21..512baf14d21 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/decompose.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/decompose.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/lists.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/lists.h
index 931cbb04a73..931cbb04a73 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/lists.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/lists.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/potracelib.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/potracelib.c
index 2b247b6a125..2b247b6a125 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/potracelib.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/potracelib.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/potracelib.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/potracelib.h
index 5791d1d73d6..5791d1d73d6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/potracelib.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/potracelib.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/progress.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/progress.h
index 0e077430d7f..0e077430d7f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/progress.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/progress.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/trace.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/trace.c
index bd193f57218..bd193f57218 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/trace.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/trace.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/trace.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/trace.h
index b1e05a649f5..b1e05a649f5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/trace.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/potracelib/trace.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BgColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/BgColorSpecialHandler.cpp
index 26806694edf..26806694edf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BgColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/BgColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BgColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/BgColorSpecialHandler.h
index cecfb39339c..cecfb39339c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BgColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/BgColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Bitmap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Bitmap.cpp
index 7d2b0e9b338..65e8ab76449 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Bitmap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Bitmap.cpp
@@ -4,7 +4,7 @@
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
 ** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
-** This program is free software; you can redistribute it and/or        ** 
+** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
 ** published by the Free Software Foundation; either version 3 of       **
 ** the License, or (at your option) any later version.                  **
@@ -15,7 +15,7 @@
 ** GNU General Public License for more details.                         **
 **                                                                      **
 ** You should have received a copy of the GNU General Public License    **
-** along with this program; if not, see <http://www.gnu.org/licenses/>. ** 
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
 #include <cstdlib>
@@ -64,9 +64,9 @@ void Bitmap::setBits (int r, int c, int n) {
 	while (n > 0) {
 		int b = 7 - c%8;            // number of leftmost bit in current byte to be set
 		int m = min(n, b+1);        // number of bits to be set in current byte
-		Int16 bitseq = (1 << m)-1;  // sequence of n set bits (bits 0..n-1 are set)
+		int bitseq = (1 << m)-1;    // sequence of n set bits (bits 0..n-1 are set)
 		bitseq <<= b-m+1;           // move bit sequence so that bit b is the leftmost set bit
-		*byte |= bitseq;		       // apply bit sequence to current byte
+		*byte |= UInt8(bitseq);     // apply bit sequence to current byte
 		byte++;
 		n -= m;
 		c += m;
@@ -75,11 +75,12 @@ void Bitmap::setBits (int r, int c, int n) {
 
 
 void Bitmap::forAllPixels (ForAllData &data) const {
-	for (int r=_rows-1; r >= 0 ; r--) {
+	for (int y=_rows-1; y >= 0 ; y--) {
 		for (int c=0; c < _bpr; c++) {
-			UInt8 byte = _bytes[r*_bpr+c];
-			for (int b=7; b >= 0; b--) {
-				data.pixel(8*c+(7-b), r, byte & (1 << b), *this);
+			UInt8 byte = _bytes[y*_bpr+c];
+			int x;
+			for (int b=7; (b >= 0) && ((x = 8*c+(7-b)) < _cols); b--) {
+				data.pixel(x, y, byte & (1 << b), *this);
 			}
 		}
 	}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Bitmap.h
index 9e108b236cf..9e108b236cf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BoundingBox.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/BoundingBox.cpp
index 83a84892f6d..83a84892f6d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BoundingBox.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/BoundingBox.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BoundingBox.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/BoundingBox.h
index b0e811b33a9..b0e811b33a9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BoundingBox.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/BoundingBox.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Calculator.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Calculator.cpp
index 6ed489c8d24..7ec135f6c02 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Calculator.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Calculator.cpp
@@ -4,7 +4,7 @@
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
 ** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
-** This program is free software; you can redistribute it and/or        ** 
+** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
 ** published by the Free Software Foundation; either version 3 of       **
 ** the License, or (at your option) any later version.                  **
@@ -15,7 +15,7 @@
 ** GNU General Public License for more details.                         **
 **                                                                      **
 ** You should have received a copy of the GNU General Public License    **
-** along with this program; if not, see <http://www.gnu.org/licenses/>. ** 
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
 #include <cmath>
@@ -131,12 +131,12 @@ char Calculator::lookAhead (istream &is) {
       is.get();
    if (is.eof())
       return END;
-   char c = is.peek();
+   int c = is.peek();
    if (isdigit(c) || c == '.')
       return NUMBER;
    if (isalpha(c))
       return NAME;
-   return c;
+   return char(c);
 }
 
 
@@ -147,7 +147,7 @@ char Calculator::lookAhead (istream &is) {
  *  @param[in] is next token is read from this stream
  *  @return token type */
 char Calculator::lex (istream &is) {
-	char tokenType = lookAhead(is);
+	int tokenType = lookAhead(is);
    switch (tokenType) {
       case NUMBER:
          is >> numValue;
@@ -161,7 +161,7 @@ char Calculator::lex (istream &is) {
 		default:
 			tokenType = is.get();
    }
-   return tokenType;
+   return char(tokenType);
 }
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Calculator.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Calculator.h
index 5ae0ab6e9fb..5ae0ab6e9fb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Calculator.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Calculator.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CmdLineParserBase.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/CmdLineParserBase.cpp
index 1519643dc28..21d38574bb9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CmdLineParserBase.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/CmdLineParserBase.cpp
@@ -53,7 +53,7 @@ void CmdLineParserBase::parse (int argc, char **argv, bool printErrors) {
 				else {
 					string longname;
 					while (isalnum(ir.peek()) || ir.peek() == '-')
-						longname += ir.get();
+						longname += char(ir.get());
 					if (const Option *opt = option(longname))
 						(*opt->handler)(this, ir, *opt, true);
 					else if (!_error) {
@@ -257,7 +257,7 @@ bool CmdLineParserBase::getStringArg (InputReader &ir, const Option &opt, bool l
 	if (checkArgPrefix(ir, opt, longopt)) {
 		arg.clear();
 		while (!ir.eof())
-			arg += ir.get();
+			arg += char(ir.get());
 		if (!arg.empty())
 			return true;
 		error(opt, longopt, "string argument expected");
@@ -276,7 +276,7 @@ bool CmdLineParserBase::getBoolArg (InputReader &ir, const Option &opt, bool lon
 	if (checkArgPrefix(ir, opt, longopt)) {
 		string str;
 		while (!ir.eof())
-			str += ir.get();
+			str += char(ir.get());
 		if (str == "yes" || str == "y" || str == "true" || str == "1") {
 			arg = true;
 			return true;
@@ -299,7 +299,7 @@ bool CmdLineParserBase::getBoolArg (InputReader &ir, const Option &opt, bool lon
  *  @return true if argument could be scanned without errors */
 bool CmdLineParserBase::getCharArg (InputReader &ir, const Option &opt, bool longopt, char &arg) const {
 	if (checkArgPrefix(ir, opt, longopt)) {
-		arg = ir.get();
+		arg = char(ir.get());
 		if (arg >= 0 && ir.eof())
 			return true;
 		error(opt, longopt, "character argument expected");
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CmdLineParserBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/CmdLineParserBase.h
index 3e36babf750..da9d91dca13 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CmdLineParserBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/CmdLineParserBase.h
@@ -65,7 +65,7 @@ class CmdLineParserBase
 		virtual void parse (int argc, char **argv, bool printErrors=true);
 		virtual void help () const  {}
 		virtual int numFiles () const       {return _files.size();}
-		virtual const char* file (size_t n) {return (n >= 0 && n < _files.size()) ? _files[n].c_str() : 0;}
+		virtual const char* file (size_t n) {return n < _files.size() ? _files[n].c_str() : 0;}
 		virtual void status () const;
 		virtual bool error () const         {return _error;}
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Color.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Color.cpp
index 5848d0fc1ef..4f96c803172 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Color.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Color.cpp
@@ -4,7 +4,7 @@
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
 ** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
-** This program is free software; you can redistribute it and/or        ** 
+** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
 ** published by the Free Software Foundation; either version 3 of       **
 ** the License, or (at your option) any later version.                  **
@@ -15,7 +15,7 @@
 ** GNU General Public License for more details.                         **
 **                                                                      **
 ** You should have received a copy of the GNU General Public License    **
-** along with this program; if not, see <http://www.gnu.org/licenses/>. ** 
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
 #include <cmath>
@@ -89,7 +89,7 @@ string Color::rgbString () const {
  *  @param[out] rgb  RGB approximation */
 void Color::CMYK2RGB (const vector<float> &cmyk, vector<float> &rgb) {
 	for (int i=0; i < 3; i++)
-		rgb[i] = 1.0-min(1.0f, cmyk[i]+cmyk[3]);
+		rgb[i] = 1.0f-min(1.0f, cmyk[i]+cmyk[3]);
 }
 
 
@@ -101,8 +101,8 @@ void Color::HSB2RGB (const vector<float> &hsb, vector<float> &rgb) {
 		rgb[0] = rgb[1] = rgb[2] = hsb[2];
 	else {
 		float h = hsb[0]-floor(hsb[0]);
-		int i = (int) (6*h);
-		float f =  6*h-i;
+		int i = int(6*h);
+		float f =  float(6.0*h-i);
 		float p = hsb[2]*(1-hsb[1]);
 		float q = hsb[2]*(1-hsb[1]*f);
 		float t = hsb[2]*(1-hsb[1]*(1-f));
@@ -120,7 +120,7 @@ void Color::HSB2RGB (const vector<float> &hsb, vector<float> &rgb) {
 
 
 void Color::getRGB (float &r, float &g, float &b) const {
-	r = ((_rgb >> 16) & 255) / 255.0;
-	g = ((_rgb >> 8) & 255) / 255.0;
-	b = (_rgb & 255) / 255.0;
+	r = float(((_rgb >> 16) & 255) / 255.0);
+	g = float(((_rgb >> 8) & 255) / 255.0);
+	b = float((_rgb & 255) / 255.0);
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Color.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Color.h
index 64aa0f105bb..64aa0f105bb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Color.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Color.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/ColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/ColorSpecialHandler.cpp
index b9dc12d120a..1870597f3fc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/ColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/ColorSpecialHandler.cpp
@@ -4,7 +4,7 @@
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
 ** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
-** This program is free software; you can redistribute it and/or        ** 
+** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
 ** published by the Free Software Foundation; either version 3 of       **
 ** the License, or (at your option) any later version.                  **
@@ -15,7 +15,7 @@
 ** GNU General Public License for more details.                         **
 **                                                                      **
 ** You should have received a copy of the GNU General Public License    **
-** along with this program; if not, see <http://www.gnu.org/licenses/>. ** 
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
 #include <algorithm>
@@ -37,7 +37,7 @@ using namespace std;
  *  @param[out] rgb  RGB approximation */
 static void cmyk_to_rgb (const vector<float> &cmyk, vector<float> &rgb) {
 	for (int i=0; i < 3; i++)
-		rgb[i] = 1.0-min(1.0f, cmyk[i]+cmyk[3]);
+		rgb[i] = 1.0f-min(1.0f, cmyk[i]+cmyk[3]);
 }
 
 
@@ -49,12 +49,12 @@ static void hsb_to_rgb (const vector<float> &hsb, vector<float> &rgb) {
 		rgb[0] = rgb[1] = rgb[2] = hsb[2];
 	else {
 		float h = hsb[0]-floor(hsb[0]);
-		int i = (int) (6*h);
-		float f =  6*h-i;
+		float i = floor(6*h);
+		float f = 6.0f*h-i;
 		float p = hsb[2]*(1-hsb[1]);
 		float q = hsb[2]*(1-hsb[1]*f);
 		float t = hsb[2]*(1-hsb[1]*(1-f));
-		switch (i) {
+		switch (int(i)) {
 			case 0 : rgb[0]=hsb[2]; rgb[1]=t; rgb[2]=p; break;
 			case 1 : rgb[0]=q; rgb[1]=hsb[2]; rgb[2]=p; break;
 			case 2 : rgb[0]=p; rgb[1]=hsb[2]; rgb[2]=t; break;
@@ -103,74 +103,74 @@ static bool color_constant (const string &c, vector<float> &rgb) {
 		const float rgb[3];
 	}
 	constants[] = {
-		{"Apricot", {1, 0.68, 0.48}},
-		{"Aquamarine", {0.18, 1, 0.7}},
-		{"Bittersweet", {0.76, 0.01, 0}},
+		{"Apricot", {1, 0.68f, 0.48f}},
+		{"Aquamarine", {0.18f, 1, 0.7f}},
+		{"Bittersweet", {0.76f, 0.01f, 0}},
 		{"Black", {0, 0, 0}},
 		{"Blue", {0, 0, 1}},
-		{"BlueGreen", {0.15, 1, 0.67}},
-		{"BlueViolet", {0.1, 0.05, 0.96}},
-		{"BrickRed", {0.72, 0, 0}},
-		{"Brown", {0.4, 0, 0}},
-		{"BurntOrange", {1, 0.49, 0}},
-		{"CadetBlue", {0.38, 0.43, 0.77}},
-		{"CarnationPink", {1, 0.37, 1}},
-		{"Cerulean", {0.06, 0.89, 1}},
-		{"CornflowerBlue", {0.35, 0.87, 1}},
+		{"BlueGreen", {0.15f, 1, 0.67f}},
+		{"BlueViolet", {0.1f, 0.05f, 0.96f}},
+		{"BrickRed", {0.72f, 0, 0}},
+		{"Brown", {0.4f, 0, 0}},
+		{"BurntOrange", {1, 0.49f, 0}},
+		{"CadetBlue", {0.38f, 0.43f, 0.77f}},
+		{"CarnationPink", {1, 0.37f, 1}},
+		{"Cerulean", {0.06f, 0.89f, 1}},
+		{"CornflowerBlue", {0.35f, 0.87f, 1}},
 		{"Cyan", {0, 1, 1}},
-		{"Dandelion", {1, 0.71, 0.16}},
-		{"DarkOrchid", {0.6, 0.2, 0.8}},
-		{"Emerald", {0, 1, 0.5}},
-		{"ForestGreen", {0, 0.88, 0}},
-		{"Fuchsia", {0.45, 0.01, 0.92}},
-		{"Goldenrod", {1, 0.9, 0.16}},
-		{"Gray", {0.5, 0.5, 0.5}},
+		{"Dandelion", {1, 0.71f, 0.16f}},
+		{"DarkOrchid", {0.6f, 0.2f, 0.8f}},
+		{"Emerald", {0, 1, 0.5f}},
+		{"ForestGreen", {0, 0.88f, 0}},
+		{"Fuchsia", {0.45f, 0.01f, 0.92f}},
+		{"Goldenrod", {1, 0.9f, 0.16f}},
+		{"Gray", {0.5f, 0.5f, 0.5f}},
 		{"Green", {0, 1, 0}},
-		{"GreenYellow", {0.85, 1, 0.31}},
-		{"JungleGreen", {0.01, 1, 0.48}},
-		{"Lavender", {1, 0.52, 1}},
-		{"LimeGreen", {0.5, 1, 0}},
+		{"GreenYellow", {0.85f, 1, 0.31f}},
+		{"JungleGreen", {0.01f, 1, 0.48f}},
+		{"Lavender", {1, 0.52f, 1}},
+		{"LimeGreen", {0.5f, 1, 0}},
 		{"Magenta", {1, 0, 1}},
-		{"Mahogany", {0.65, 0, 0}},
-		{"Maroon", {0.68, 0, 0}},
-		{"Melon", {1, 0.54, 0.5}},
-		{"MidnightBlue", {0, 0.44, 0.57}},
-		{"Mulberry", {0.64, 0.08, 0.98}},
-		{"NavyBlue", {0.06, 0.46, 1}},
-		{"OliveGreen", {0, 0.6, 0}},
-		{"Orange", {1, 0.39, 0.13}},
-		{"OrangeRed", {1, 0, 0.5}},
-		{"Orchid", {0.68, 0.36, 1}},
-		{"Peach", {1, 0.5, 0.3}},
-		{"Periwinkle", {0.43, 0.45, 1}},
-		{"PineGreen", {0, 0.75, 0.16}},
-		{"Plum", {0.5, 0, 1}},
-		{"ProcessBlue", {0.04, 1, 1}},
-		{"Purple", {0.55, 0.14, 1}},
-		{"RawSienna", {0.55, 0, 0}},
+		{"Mahogany", {0.65f, 0, 0}},
+		{"Maroon", {0.68f, 0, 0}},
+		{"Melon", {1, 0.54f, 0.5f}},
+		{"MidnightBlue", {0, 0.44f, 0.57f}},
+		{"Mulberry", {0.64f, 0.08f, 0.98f}},
+		{"NavyBlue", {0.06f, 0.46f, 1}},
+		{"OliveGreen", {0, 0.6f, 0}},
+		{"Orange", {1, 0.39f, 0.13f}},
+		{"OrangeRed", {1, 0, 0.5f}},
+		{"Orchid", {0.68f, 0.36f, 1}},
+		{"Peach", {1, 0.5f, 0.3f}},
+		{"Periwinkle", {0.43f, 0.45f, 1}},
+		{"PineGreen", {0, 0.75f, 0.16f}},
+		{"Plum", {0.5f, 0, 1}},
+		{"ProcessBlue", {0.04f, 1, 1}},
+		{"Purple", {0.55f, 0.14f, 1}},
+		{"RawSienna", {0.55f, 0, 0}},
 		{"Red", {1, 0, 0}},
-		{"RedOrange", {1, 0.23, 0.13}},
-		{"RedViolet", {0.59, 0, 0.66}},
-		{"Rhodamine", {1, 0.18, 1}},
-		{"RoyalBlue", {0, 0.5, 1}},
-		{"RoyalPurple", {0.25, 0.1, 1}},
-		{"RubineRed", {1, 0, 0.87}},
-		{"Salmon", {1, 0.47, 0.62}},
-		{"SeaGreen", {0.31, 1, 0.5}},
-		{"Sepia", {0.3, 0, 0}},
-		{"SkyBlue", {0.38, 1, 0.88}},
-		{"SpringGreen", {0.74, 1, 0.24}},
-		{"Tan", {0.86, 0.58, 0.44}},
-		{"TealBlue", {0.12, 0.98, 0.64}},
-		{"Thistle", {0.88, 0.41, 1}},
-		{"Turquoise", {0.15, 1, 0.8}},
-		{"Violet", {0.21, 0.12, 1}},
-		{"VioletRed", {1, 0.19, 1}},
+		{"RedOrange", {1, 0.23f, 0.13f}},
+		{"RedViolet", {0.59f, 0, 0.66f}},
+		{"Rhodamine", {1, 0.18f, 1}},
+		{"RoyalBlue", {0, 0.5f, 1}},
+		{"RoyalPurple", {0.25f, 0.1f, 1}},
+		{"RubineRed", {1, 0, 0.87f}},
+		{"Salmon", {1, 0.47f, 0.62f}},
+		{"SeaGreen", {0.31f, 1, 0.5f}},
+		{"Sepia", {0.3f, 0, 0}},
+		{"SkyBlue", {0.38f, 1, 0.88f}},
+		{"SpringGreen", {0.74f, 1, 0.24f}},
+		{"Tan", {0.86f, 0.58f, 0.44f}},
+		{"TealBlue", {0.12f, 0.98f, 0.64f}},
+		{"Thistle", {0.88f, 0.41f, 1}},
+		{"Turquoise", {0.15f, 1, 0.8f}},
+		{"Violet", {0.21f, 0.12f, 1}},
+		{"VioletRed", {1, 0.19f, 1}},
 		{"White", {1, 1, 1}},
-		{"WildStrawberry", {1, 0.04, 0.61}},
+		{"WildStrawberry", {1, 0.04f, 0.61f}},
 		{"Yellow", {1, 1, 0}},
-		{"YellowGreen", {0.56, 1, 0.26}},
-		{"YellowOrange", {1, 0.58, 0}}
+		{"YellowGreen", {0.56f, 1, 0.26f}},
+		{"YellowOrange", {1, 0.58f, 0}}
 	};
 	// binary search
 	int first=0, last=68-1;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/ColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/ColorSpecialHandler.h
index 339271be38e..339271be38e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/ColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/ColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CommandLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/CommandLine.cpp
index 35e51b1cf4b..35e51b1cf4b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CommandLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/CommandLine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CommandLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/CommandLine.h
index 1454c40687b..1454c40687b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CommandLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/CommandLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DLLoader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DLLoader.cpp
index 9e4325d5774..9e4325d5774 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DLLoader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DLLoader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DLLoader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DLLoader.h
index 1810be99770..1810be99770 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DLLoader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DLLoader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIActions.cpp
index bec202a126a..bec202a126a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIActions.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIActions.h
index edc83dd89b4..edc83dd89b4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIReader.cpp
index 1c1343300b2..13b21657e08 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIReader.cpp
@@ -45,7 +45,8 @@ DVIReader::DVIReader (istream &is, DVIActions *a) : StreamReader(is), _actions(a
 	_totalPages = 0;  // we don't know the correct value yet
 	_currFontNum = 0;
 	_currPageNum = 0;
-	_pageLength = _pagePos = 0;
+	_pageLength = 0;
+	_pagePos = 0;
 }
 
 
@@ -387,7 +388,8 @@ void DVIReader::cmdBop (int) {
 		_posStack.pop();
 	_currFontNum = 0;
 	_inPage = true;
-	_pageLength = _pagePos = 0;
+	_pageLength = 0;
+	_pagePos = 0;
 	if (COMPUTE_PAGE_LENGTH) {
 		// compute number of bytes in current page
 		int length, param;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIReader.h
index 42e255140aa..0a404e207c1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIReader.h
@@ -132,8 +132,8 @@ class DVIReader : public StreamReader, protected VFActions
 		double _pageHeight, _pageWidth;  ///< page height and width in TeX points
 		DVIPosition _currPos;
 		std::stack<DVIPosition> _posStack;
-		size_t _pageLength;     ///< number of bytes between current bop end eop
-		size_t _pagePos;        ///< distance of current DVI command from bop (in bytes)
+		size_t _pageLength;      ///< number of bytes between current bop end eop
+		std::streampos _pagePos; ///< distance of current DVI command from bop (in bytes)
 
 	public:
 		static bool COMPUTE_PAGE_LENGTH;  ///< if true, the bop handler computes the number of bytes of the current page
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIToSVG.cpp
index ec35140fdc8..ec35140fdc8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIToSVG.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIToSVG.h
index 6008faccb66..6008faccb66 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVGActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIToSVGActions.cpp
index d032a59b86f..d3043bffd5b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVGActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIToSVGActions.cpp
@@ -277,8 +277,8 @@ static int digits (int n) {
 	if (n == 0)
 		return 1;
 	if (n > 0)
-		return log10(double(n))+1;
-	return log10(double(-n))+2;
+		return int(log10(double(n))+1);
+	return int(log10(double(-n))+2);
 }
 
 
@@ -315,13 +315,13 @@ void DVIToSVGActions::progress (size_t current, size_t total, const char *id) {
 		// adapt length of progress indicator to terminal width
 		int cols = Terminal::columns();
 		int width = (cols == 0 || cols > 60) ? 50 : 49-60+cols;
-		double factor = double(current)/total;
-		int length = width*factor;
+		double factor = double(current)/double(total);
+		int length = int(width*factor);
 		Message::mstream(false, Terminal::MAGENTA)
 			<< '[' << string(length, '=')
 			<< (factor < 1.0 ? (step < 0 ? ' ' : tips[step]) : '=')
 			<< string(width-length, ' ')
-			<< "] " << string(3-digits(100*factor), ' ') << int(100*factor)
+			<< "] " << string(3-digits(int(100*factor)), ' ') << int(100*factor)
 			<< "%\r";
 		// overprint indicator when finished
 		if (factor == 1.0)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVGActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIToSVGActions.h
index 1589fdaa0d9..1589fdaa0d9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVGActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DVIToSVGActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Directory.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Directory.cpp
index e811f471f38..e811f471f38 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Directory.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Directory.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Directory.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Directory.h
index 5932bba25f2..5932bba25f2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Directory.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Directory.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DvisvgmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DvisvgmSpecialHandler.cpp
index ea9bea79375..5d8e9be52f7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DvisvgmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DvisvgmSpecialHandler.cpp
@@ -92,9 +92,9 @@ static void update_bbox (double w, double h, double d, SpecialActions *actions)
 static void raw (InputReader &in, SpecialActions *actions, bool group=false) {
 	string str;
 	while (!in.eof()) {
-		char c = in.get();
+		int c = in.get();
 		if (isprint(c))
-			str += c;
+			str += char(c);
 	}
 	expand_constants(str, actions);
 	if (!str.empty()) {
@@ -120,7 +120,7 @@ static void raw (InputReader &in, SpecialActions *actions, bool group=false) {
  *  variant 4: dvisvgm:bbox n[ew] <name> */
 static void bbox (InputReader &in, SpecialActions *actions) {
 	in.skipSpace();
-	char c = in.peek();
+	int c = in.peek();
 	if (isalpha(c)) {
 		while (!isspace(in.peek()))  // skip trailing characters
 			in.get();
@@ -128,7 +128,7 @@ static void bbox (InputReader &in, SpecialActions *actions) {
 			in.skipSpace();
 			string name;
 			while (isalnum(in.peek()))
-				name += in.get();
+				name += char(in.get());
 			in.skipSpace();
 			if (!name.empty() && in.eof())
 				actions->bbox(name, true); // create new user box
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DvisvgmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DvisvgmSpecialHandler.h
index 7eccf473ce1..7eccf473ce1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DvisvgmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/DvisvgmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/EmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/EmSpecialHandler.cpp
index cbb1a15c7b3..28576bdfa5d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/EmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/EmSpecialHandler.cpp
@@ -4,7 +4,7 @@
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
 ** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
-** This program is free software; you can redistribute it and/or        ** 
+** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
 ** published by the Free Software Foundation; either version 3 of       **
 ** the License, or (at your option) any later version.                  **
@@ -15,7 +15,7 @@
 ** GNU General Public License for more details.                         **
 **                                                                      **
 ** You should have received a copy of the GNU General Public License    **
-** along with this program; if not, see <http://www.gnu.org/licenses/>. ** 
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
 #include <sstream>
@@ -193,12 +193,12 @@ bool EmSpecialHandler::process (const char *prefix, istream &is, SpecialActions
 			map<int,DPair>::iterator it1=_points.find(n1);
 			map<int,DPair>::iterator it2=_points.find(n2);
 			if (it1 != _points.end() && it2 != _points.end())
-				create_line(it1->second, it2->second, c1, c2, lw, actions);
+				create_line(it1->second, it2->second, char(c1), char(c2), lw, actions);
 			else {
 				// Line endpoints havn't necessarily to be defined before
 				// a line definition. If a point wasn't defined yet we push the line
 				// in a wait list and process the lines at the end of the page.
-				_lines.push_back(Line(n1, n2, c1, c2, lw));
+				_lines.push_back(Line(n1, n2, char(c1), char(c2), lw));
 			}
 		}
 	}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/EmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/EmSpecialHandler.h
index 84e619abf79..84e619abf79 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/EmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/EmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileFinder.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FileFinder.cpp
index 77706bbbeef..77706bbbeef 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileFinder.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FileFinder.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileFinder.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FileFinder.h
index da7cdb71393..9b04e5d76b9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileFinder.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FileFinder.h
@@ -4,7 +4,7 @@
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
 ** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
-** This program is free software; you can redistribute it and/or        ** 
+** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
 ** published by the Free Software Foundation; either version 3 of       **
 ** the License, or (at your option) any later version.                  **
@@ -15,7 +15,7 @@
 ** GNU General Public License for more details.                         **
 **                                                                      **
 ** You should have received a copy of the GNU General Public License    **
-** along with this program; if not, see <http://www.gnu.org/licenses/>. ** 
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
 #ifndef KPSFILEFINDER_H
@@ -66,7 +66,7 @@ class FileFinder
 			return Impl::instance().lookupEncName(fname);
 		}
 
-		static const void init (const char *progname, bool enable_mktexmf) {
+		static void init (const char *progname, bool enable_mktexmf) {
 			Impl::setProgname(progname);
 			Impl::enableMktex(enable_mktexmf);
 		}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FilePath.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FilePath.cpp
index d1dc1c216e6..d1dc1c216e6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FilePath.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FilePath.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FilePath.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FilePath.h
index c80a1925db7..c80a1925db7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FilePath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FilePath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileSystem.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FileSystem.cpp
index 892b5ba47d2..892b5ba47d2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileSystem.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FileSystem.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileSystem.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FileSystem.h
index 086f0f6e500..086f0f6e500 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileSystem.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FileSystem.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Font.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Font.cpp
index 415e0051dc1..415e0051dc1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Font.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Font.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Font.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Font.h
index 854430334d3..854430334d3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Font.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Font.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontCache.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontCache.cpp
index 9cf3f018fa5..97bc129ba6a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontCache.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontCache.cpp
@@ -34,7 +34,8 @@
 
 using namespace std;
 
-const UInt8 FontCache::VERSION;
+const UInt8 FontCache::VERSION = 4;
+
 
 static Pair32 read_pair (int bytes, StreamReader &sr) {
 	Int32 x = sr.readSigned(bytes);
@@ -147,7 +148,7 @@ bool FontCache::write (const char *fontname, ostream &os) const {
 
 		void draw (char cmd, const Glyph::Point *points, int n) {
 			int bytes = max_int_size(points, n);
-			UInt8 cmdchar = (bytes << 5) | (cmd - 'A');
+			int cmdchar = (bytes << 5) | (cmd - 'A');
 			_sw.writeUnsigned(cmdchar, 1);
 			for (int i=0; i < n; i++) {
 				_sw.writeSigned(points[i].x(), bytes);
@@ -208,7 +209,7 @@ bool FontCache::read (const char *fontname, istream &is) {
 		return false;
 	string fname;
 	while (!is.eof() && is.peek() != 0)
-		fname += is.get();
+		fname += char(is.get());
 	is.get(); // skip 0-byte
 	if (fname != fontname)
 		return false;
@@ -286,7 +287,7 @@ bool FontCache::fontinfo (std::istream &is, FontInfo &info) {
 		if ((info.version = sr.readUnsigned(1)) != VERSION)
 			return false;
 		while (!is.eof() && is.peek() != 0)
-			info.name += is.get();
+			info.name += char(is.get());
 		is.get(); // skip 0-byte
 		info.numchars = sr.readUnsigned(4);
 		for (UInt32 i=0; i < info.numchars; i++) {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontCache.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontCache.h
index 8638fb6b3b2..0aa93ca2203 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontCache.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontCache.h
@@ -64,7 +64,7 @@ class FontCache
 		static void fontinfo (const char *dirname, std::ostream &os);
 
    private:
-		const static UInt8 VERSION = 4;
+		static const UInt8 VERSION;
       std::string _fontname;
 		GlyphMap _glyphs;
 		bool _changed;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEncoding.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEncoding.cpp
index 31599ddc9b7..62487408ca8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEncoding.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEncoding.cpp
@@ -29,7 +29,7 @@
 using namespace std;
 
 static string read_entry (InputReader &in);
-static bool valid_name_char (char c);
+static bool valid_name_char (int c);
 
 
 FontEncoding::FontEncoding (const string &encname) : _encname(encname)
@@ -116,7 +116,7 @@ static string read_entry (InputReader &in) {
 }
 
 
-static bool valid_name_char (char c) {
+static bool valid_name_char (int c) {
 	const char *delimiters = "<>(){}[]/~%";
 	return isprint(c) && !isspace(c) && !strchr(delimiters, c);
 }
@@ -148,11 +148,12 @@ FontEncoding* FontEncoding::encoding (const string &fontname) {
 	static EncodingMap encmap;
 	if (const char *encname = FileFinder::lookupEncName(fontname)) {
       EncodingMap::const_iterator it = encmap.find(encname);
-   	if (it != encmap.end()) 
+   	if (it != encmap.end())
 			return it->second;
 		FontEncoding *enc = new FontEncoding(encname);
 		encmap[encname] = enc;
-		return enc;      
+		return enc;
 	}
 	return 0;
 }
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEncoding.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEncoding.h
index dfcd6822153..dfcd6822153 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEncoding.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEncoding.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEngine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEngine.cpp
index f8410535d5d..f8410535d5d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEngine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEngine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEngine.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEngine.h
index a92e970d6db..a92e970d6db 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEngine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEngine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontManager.cpp
index c32d43c0bc3..c32d43c0bc3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontManager.h
index d3d18156a91..d3d18156a91 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontMap.cpp
index 1a67917f687..1a67917f687 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontMap.h
index d57153c9d4b..d57153c9d4b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFGlyphTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFGlyphTracer.cpp
index 41f73835352..d94ecda14a8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFGlyphTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFGlyphTracer.cpp
@@ -67,17 +67,17 @@ bool GFGlyphTracer::executeChar (UInt8 c) {
 
 
 void GFGlyphTracer::moveTo (double x, double y) {
-	_glyph->moveto(x, y);
+	_glyph->moveto(int(x), int(y));
 }
 
 
 void GFGlyphTracer::lineTo (double x, double y) {
-	_glyph->lineto(x, y);
+	_glyph->lineto(int(x), int(y));
 }
 
 
 void GFGlyphTracer::curveTo (double c1x, double c1y, double c2x, double c2y, double x, double y) {
-	_glyph->cubicto(c1x, c1y, c2x, c2y, x, y);
+	_glyph->cubicto(int(c1x), int(c1y), int(c2x), int(c2y), int(x), int(y));
 }
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFGlyphTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFGlyphTracer.h
index 9a51703a003..9a51703a003 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFGlyphTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFGlyphTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFReader.cpp
index a146c14bf50..a146c14bf50 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFReader.h
index 17b96a1503f..17b96a1503f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFTracer.cpp
index 8a3dd245a86..8a3dd245a86 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFTracer.h
index 3a60e03c8ab..3a60e03c8ab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GFTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Ghostscript.cpp
index 4b2550253ef..4b2550253ef 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Ghostscript.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Ghostscript.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Ghostscript.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Ghostscript.h
index 80f55d086e9..80f55d086e9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Ghostscript.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Ghostscript.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Glyph.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Glyph.h
index 6edcfa1e6cc..6edcfa1e6cc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Glyph.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Glyph.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GlyphTracerMessages.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GlyphTracerMessages.h
index ab8b71e4365..ab8b71e4365 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GlyphTracerMessages.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GlyphTracerMessages.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GraphicPath.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GraphicPath.h
index f2c70e97b02..f2c70e97b02 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GraphicPath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/GraphicPath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputBuffer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/InputBuffer.cpp
index cb1a393fb6f..cb1a393fb6f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputBuffer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/InputBuffer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputBuffer.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/InputBuffer.h
index 72caff31f8d..72caff31f8d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputBuffer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/InputBuffer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/InputReader.cpp
index 7465c4f6f8f..7465c4f6f8f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/InputReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/InputReader.h
index ae7b4e9e594..ae7b4e9e594 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/InputReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Length.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Length.cpp
index 7edeb5c5f37..7edeb5c5f37 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Length.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Length.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Length.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Length.h
index ba79dfa66f8..ba79dfa66f8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Length.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Length.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Makefile.am
index 22a20250844..22a20250844 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Makefile.in
index d394eba494e..d394eba494e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Matrix.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Matrix.cpp
index 08c4f1489c0..08c4f1489c0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Matrix.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Matrix.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Matrix.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Matrix.h
index c6c8c854c0b..c6c8c854c0b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Matrix.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Matrix.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Message.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Message.cpp
index cc7a36dde11..f43a231957c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Message.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Message.cpp
@@ -40,7 +40,7 @@ MessageStream::~MessageStream () {
 }
 
 
-void MessageStream::putchar (const char c, ostream &os) {
+void MessageStream::putChar (const char c, ostream &os) {
 	switch (c) {
 		case '\r':
 			os << '\r';
@@ -80,9 +80,9 @@ MessageStream& MessageStream::operator << (const char *str) {
 		const int len = strlen(str);
 		const int cols = Terminal::columns();
 		if (cols > 0 && _col+len > cols && _indent+len <= cols)
-			putchar('\n', *_os);
+			putChar('\n', *_os);
 		for (const char *p=str; *p; ++p)
-			putchar(*p, *_os);
+			putChar(*p, *_os);
 	}
 	return *this;
 }
@@ -90,7 +90,7 @@ MessageStream& MessageStream::operator << (const char *str) {
 
 MessageStream& MessageStream::operator << (const char &c) {
 	if (_os)
-		putchar(c, *_os);
+		putChar(c, *_os);
 	return *this;
 }
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Message.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Message.h
index 22677195e32..6a21112ae5d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Message.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Message.h
@@ -27,6 +27,7 @@
 #include <sstream>
 #include "Terminal.h"
 
+
 class Message;
 
 class MessageStream
@@ -49,20 +50,20 @@ class MessageStream
 		MessageStream& operator << (const char &c);
 		MessageStream& operator << (const std::string &str) {return (*this) << str.c_str();}
 
-		void indent (int level)        {_indent = std::max(0, level*2); }
+		void indent (int level)        {_indent = std::max(0, level*2);}
 		void indent (bool reset=false);
 		void outdent (bool all=false);
 		void clearline ();
 
 	protected:
-		void putchar (const char c, std::ostream &os);
+		void putChar (const char c, std::ostream &os);
 		std::ostream* os () {return _os;}
 
 	private:
 		std::ostream *_os;
 		bool _nl;     ///< true if previous character was a newline
 		int _col;     ///< current terminal column
-		int _indent;  ///< indentation width
+		int _indent;  ///< indentation width (number of columns/characters)
 };
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/MessageException.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/MessageException.h
index cf5d0d311b5..cf5d0d311b5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/MessageException.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/MessageException.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/MetafontWrapper.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/MetafontWrapper.cpp
index 3113366aa17..3113366aa17 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/MetafontWrapper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/MetafontWrapper.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/MetafontWrapper.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/MetafontWrapper.h
index 9d0ea7b0d50..9d0ea7b0d50 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/MetafontWrapper.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/MetafontWrapper.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PSInterpreter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PSInterpreter.cpp
index d511d52548e..d511d52548e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PSInterpreter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PSInterpreter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PSInterpreter.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PSInterpreter.h
index b24ee2fa637..b24ee2fa637 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PSInterpreter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PSInterpreter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageRanges.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PageRanges.cpp
index 85a124683c7..85a124683c7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageRanges.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PageRanges.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageRanges.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PageRanges.h
index a2a6fc28589..a2a6fc28589 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageRanges.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PageRanges.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageSize.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PageSize.cpp
index 9b5e6b29b40..9b5e6b29b40 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageSize.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PageSize.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageSize.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PageSize.h
index 38cfd22e922..38cfd22e922 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageSize.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PageSize.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Pair.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Pair.h
index 495e79d2149..778b68d3a2d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Pair.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Pair.h
@@ -4,7 +4,7 @@
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
 ** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
-** This program is free software; you can redistribute it and/or        ** 
+** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
 ** published by the Free Software Foundation; either version 3 of       **
 ** the License, or (at your option) any later version.                  **
@@ -15,7 +15,7 @@
 ** GNU General Public License for more details.                         **
 **                                                                      **
 ** You should have received a copy of the GNU General Public License    **
-** along with this program; if not, see <http://www.gnu.org/licenses/>. ** 
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
 #ifndef PAIR_H
@@ -55,7 +55,7 @@ struct Pair32 : public Pair<Int32>
    Pair32 (Int32 x=0, Int32 y=0) : Pair<Int32>(x, y) {}
 	explicit Pair32 (double x, double y) : Pair<Int32>(Int32(x+0.5), Int32(y+0.5)) {}
 	Pair32 (const Pair<Int32> &p) : Pair<Int32>(p) {}
-	operator Pair<Int32> () {return *this;}
+//	operator Pair<Int32> () {return *this;}
 };
 
 typedef Pair<double> DPair;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PsSpecialHandler.cpp
index 00e4b90a130..aea16b36724 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PsSpecialHandler.cpp
@@ -549,7 +549,7 @@ void PsSpecialHandler::setrgbcolor (vector<double> &p) {
 void PsSpecialHandler::setcmykcolor (vector<double> &p) {
 	if (_actions) {
 		Color c;
-		c.setCMYK(p[0], p[1], p[2], p[3]);
+		c.setCMYK((float)p[0], (float)p[1], (float)p[2], (float)p[3]);
 		_actions->setColor(c);
 	}
 }
@@ -558,7 +558,7 @@ void PsSpecialHandler::setcmykcolor (vector<double> &p) {
 void PsSpecialHandler::sethsbcolor (vector<double> &p) {
 	if (_actions) {
 		Color c;
-		c.setHSB(p[0], p[1], p[2]);
+		c.setHSB((float)p[0], (float)p[1], (float)p[2]);
 		_actions->setColor(c);
 	}
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PsSpecialHandler.h
index aa9cf171b46..85d84e16b2d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/PsSpecialHandler.h
@@ -83,8 +83,8 @@ class PsSpecialHandler : public SpecialHandler, protected PSActions
 		void setdash (std::vector<double> &p);
 		void setgray (std::vector<double> &p);
 		void sethsbcolor (std::vector<double> &hsb);
-		void setlinecap (std::vector<double> &p)     {_linecap = (unsigned int) p[0];}
-		void setlinejoin (std::vector<double> &p)    {_linejoin = (unsigned int) p[0];}
+		void setlinecap (std::vector<double> &p)     {_linecap = UInt8(p[0]);}
+		void setlinejoin (std::vector<double> &p)    {_linejoin = UInt8(p[0]);}
 		void setlinewidth (std::vector<double> &p)   {_linewidth = p[0] ? p[0]*1.00375 : 0.5;}
 		void setmatrix (std::vector<double> &p);
 		void setmiterlimit (std::vector<double> &p)  {_miterlimit = p[0]*1.00375;}
@@ -102,11 +102,11 @@ class PsSpecialHandler : public SpecialHandler, protected PSActions
 		XMLElementNode *_xmlnode;   ///< if != 0, created SVG elements are appended to this node
 		GraphicPath<double> _path;
 		DPair _currentpoint;        ///< current PS position
-		float _linewidth;           ///< current linewidth
-		float _miterlimit;          ///< current miter limit
-		float _opacityalpha;        ///< opacity level (0=fully transparent, ..., 1=opaque)
-		unsigned _linecap  : 2;     ///< current line cap (0=butt, 1=round, 2=projecting square)
-		unsigned _linejoin : 2;     ///< current line join (0=miter, 1=round, 2=bevel)
+		double _linewidth;          ///< current linewidth
+		double _miterlimit;         ///< current miter limit
+		double _opacityalpha;       ///< opacity level (0=fully transparent, ..., 1=opaque)
+		UInt8 _linecap  : 2;        ///< current line cap (0=butt, 1=round, 2=projecting square)
+		UInt8 _linejoin : 2;        ///< current line join (0=miter, 1=round, 2=bevel)
 		int _dashoffset;            ///< current dash offset
 		std::vector<int> _dashpattern;
 		ClippingStack _clipStack;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SVGTree.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SVGTree.cpp
index c1af13f4f3a..c1af13f4f3a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SVGTree.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SVGTree.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SVGTree.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SVGTree.h
index de432609e8b..de432609e8b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SVGTree.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SVGTree.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SpecialActions.h
index 8132ac3c510..8132ac3c510 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SpecialActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SpecialHandler.h
index cf52c070d4d..cf52c070d4d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SpecialManager.cpp
index b115d49be2c..b115d49be2c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SpecialManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SpecialManager.h
index 07d1f01e454..07d1f01e454 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/SpecialManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/StreamReader.cpp
index 519fb726be7..519fb726be7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/StreamReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/StreamReader.h
index 8f7986f2fe5..8f7986f2fe5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/StreamReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamWriter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/StreamWriter.cpp
index 7512f89e3fa..7512f89e3fa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamWriter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/StreamWriter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamWriter.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/StreamWriter.h
index 1fd01aae62a..1fd01aae62a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamWriter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/StreamWriter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/System.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/System.cpp
index 4651b44fccc..4651b44fccc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/System.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/System.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/System.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/System.h
index 11c7f44078d..11c7f44078d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/System.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/System.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/TFM.cpp
index 528c65cbeb5..235548bbbe6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/TFM.cpp
@@ -73,18 +73,18 @@ TFM* TFM::createFromFile (const char *fontname) {
 
 bool TFM::readFromStream (istream &is) {
 	StreamReader sr(is);
-	is.seekg(2, ios_base::beg);        // skip file size
-	UInt16 lh = sr.readUnsigned(2);  // length of header in 4 byte words
-	_firstChar= sr.readUnsigned(2);  // smalles character code in font
-	_lastChar = sr.readUnsigned(2);  // largest character code in font
-	UInt16 nw = sr.readUnsigned(2);  // number of words in width table
-	UInt16 nh = sr.readUnsigned(2);  // number of words in height table
-	UInt16 nd = sr.readUnsigned(2);  // number of words in depth table
-	UInt16 ni = sr.readUnsigned(2);  // number of words in italic corr. table
-//	UInt16 nl = sr.readUnsigned(2);  // number of words in lig/kern table
-//	UInt16 nk = sr.readUnsigned(2);  // number of words in kern table
-//	UInt16 ne = sr.readUnsigned(2);  // number of words in ext. char table
-//	UInt16 np = sr.readUnsigned(2);  // number of font parameter words
+	is.seekg(2, ios_base::beg);             // skip file size
+	UInt16 lh = UInt16(sr.readUnsigned(2)); // length of header in 4 byte words
+	_firstChar= UInt16(sr.readUnsigned(2)); // smalles character code in font
+	_lastChar = UInt16(sr.readUnsigned(2)); // largest character code in font
+	UInt16 nw = UInt16(sr.readUnsigned(2)); // number of words in width table
+	UInt16 nh = UInt16(sr.readUnsigned(2)); // number of words in height table
+	UInt16 nd = UInt16(sr.readUnsigned(2)); // number of words in depth table
+	UInt16 ni = UInt16(sr.readUnsigned(2)); // number of words in italic corr. table
+//	UInt16 nl = UInt16(sr.readUnsigned(2)); // number of words in lig/kern table
+//	UInt16 nk = UInt16(sr.readUnsigned(2)); // number of words in kern table
+//	UInt16 ne = UInt16(sr.readUnsigned(2)); // number of words in ext. char table
+//	UInt16 np = UInt16(sr.readUnsigned(2)); // number of font parameter words
 
 	is.seekg(8, ios_base::cur);        // move to header (skip above commented bytes)
 	_checksum = sr.readUnsigned(4);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/TFM.h
index 0001e289d3c..c375efed407 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/TFM.h
@@ -4,7 +4,7 @@
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
 ** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
-** This program is free software; you can redistribute it and/or        ** 
+** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
 ** published by the Free Software Foundation; either version 3 of       **
 ** the License, or (at your option) any later version.                  **
@@ -15,7 +15,7 @@
 ** GNU General Public License for more details.                         **
 **                                                                      **
 ** You should have received a copy of the GNU General Public License    **
-** along with this program; if not, see <http://www.gnu.org/licenses/>. ** 
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
 #ifndef TFM_H
@@ -38,7 +38,7 @@ class TFM
 		double getCharHeight (int c) const;
 		double getCharDepth (int c) const;
 		double getItalicCorr (int c) const;
-		UInt16 getChecksum () const {return _checksum;}
+		UInt32 getChecksum () const {return _checksum;}
 		UInt16 firstChar () const   {return _firstChar;}
 		UInt16 lastChar () const    {return _lastChar;}
 
@@ -46,7 +46,7 @@ class TFM
 		bool readFromStream (std::istream &is);
 
    private:
-		UInt16 _checksum;
+		UInt32 _checksum;
 		UInt16 _firstChar, _lastChar;
 		FixWord _designSize;  ///< design size of the font in TeX points (7227 pt = 254 cm)
 		std::vector<UInt32>  _charInfoTable;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Terminal.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Terminal.cpp
index 17037ce68fe..17037ce68fe 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Terminal.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Terminal.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Terminal.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Terminal.h
index a1a1c7e578d..a1a1c7e578d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Terminal.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/Terminal.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TpicSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/TpicSpecialHandler.cpp
index a2dc4627f46..a2dc4627f46 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TpicSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/TpicSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TpicSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/TpicSpecialHandler.h
index 93f4c123c23..93f4c123c23 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TpicSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/TpicSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VFActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/VFActions.h
index 34be50e5b70..34be50e5b70 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VFActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/VFActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/VFReader.cpp
index 21b468c247a..21b468c247a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/VFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/VFReader.h
index b60acccb32b..b60acccb32b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/VFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VectorStream.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/VectorStream.h
index e2221b3df7a..e2221b3df7a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VectorStream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/VectorStream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLDocTypeNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLDocTypeNode.h
index a45e10cfaba..a45e10cfaba 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLDocTypeNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLDocTypeNode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLDocument.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLDocument.cpp
index 11f0ded7337..11f0ded7337 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLDocument.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLDocument.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLDocument.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLDocument.h
index 8e2b4f75a9c..8e2b4f75a9c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLDocument.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLDocument.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLNode.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLNode.cpp
index 6b7d2747221..6b7d2747221 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLNode.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLNode.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLNode.h
index d46619b038a..d46619b038a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLNode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLString.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLString.cpp
index c7cd33f7b1d..c7cd33f7b1d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLString.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLString.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLString.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLString.h
index acce6f966ad..acce6f966ad 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLString.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/XMLString.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/dvisvgm.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/dvisvgm.cpp
index 55548803064..55548803064 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/dvisvgm.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/dvisvgm.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/gzstream.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/gzstream.cpp
index e738caa8229..2893c299891 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/gzstream.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/gzstream.cpp
@@ -34,7 +34,7 @@
 namespace GZSTREAM_NAMESPACE {
 #endif
 
-const int gzstreambuf::bufferSize;
+const int gzstreambuf::bufferSize = 47+256;    // size of data buff
 
 // ----------------------------------------------------------------------------
 // Internal classes to implement gzstream. See header file for user classes.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/gzstream.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/gzstream.h
index bca84f1b4e8..60f38c4fac7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/gzstream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/gzstream.h
@@ -44,11 +44,11 @@ namespace GZSTREAM_NAMESPACE {
 
 class gzstreambuf : public std::streambuf {
 private:
-    static const int bufferSize = 47+256;    // size of data buff
+    static const int bufferSize;    // size of data buff
     // totals 512 bytes under g++ for igzstream at the end.
 
     gzFile           file;               // file handle for compressed file
-    char             buffer[bufferSize]; // data buffer
+    char             buffer[47+256];     // data buffer
     char             opened;             // open/close state of stream
     int              mode;               // I/O mode
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/iapi.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/iapi.h
index 8e29d938d03..8e29d938d03 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/iapi.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/iapi.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/ierrors.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/ierrors.h
index 3184341177e..3184341177e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/ierrors.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/ierrors.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/macros.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/macros.h
index 24d97419af2..24d97419af2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/macros.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/macros.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/options.xml b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/options.xml
index 1866977995b..1866977995b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/options.xml
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/options.xml
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/psdefs.psc b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/psdefs.psc
index 445d7973233..445d7973233 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/psdefs.psc
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/psdefs.psc
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/types.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/types.h
index 5eada8b24b1..6ffdb42a149 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/types.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/types.h
@@ -4,7 +4,7 @@
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
 ** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
-** This program is free software; you can redistribute it and/or        ** 
+** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
 ** published by the Free Software Foundation; either version 3 of       **
 ** the License, or (at your option) any later version.                  **
@@ -15,7 +15,7 @@
 ** GNU General Public License for more details.                         **
 **                                                                      **
 ** You should have received a copy of the GNU General Public License    **
-** along with this program; if not, see <http://www.gnu.org/licenses/>. ** 
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
 #ifndef TYPES_H
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/BoundingBoxTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/BoundingBoxTest.cpp
index 59b9ddbc7a5..59b9ddbc7a5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/BoundingBoxTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/BoundingBoxTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/CalculatorTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/CalculatorTest.cpp
index 14dc34d9e89..14dc34d9e89 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/CalculatorTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/CalculatorTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/ColorSpecialTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/ColorSpecialTest.cpp
index b3a9d52d699..b3a9d52d699 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/ColorSpecialTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/ColorSpecialTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/CommandLineTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/CommandLineTest.cpp
index 1fe5be9a47f..1fe5be9a47f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/CommandLineTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/CommandLineTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/DirectoryTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/DirectoryTest.cpp
index 8637efe9dcf..59cba3e6027 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/DirectoryTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/DirectoryTest.cpp
@@ -4,7 +4,7 @@
 ** This file is part of dvisvgm -- the DVI to SVG converter             **
 ** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>   **
 **                                                                      **
-** This program is free software; you can redistribute it and/or        ** 
+** This program is free software; you can redistribute it and/or        **
 ** modify it under the terms of the GNU General Public License as       **
 ** published by the Free Software Foundation; either version 3 of       **
 ** the License, or (at your option) any later version.                  **
@@ -15,7 +15,7 @@
 ** GNU General Public License for more details.                         **
 **                                                                      **
 ** You should have received a copy of the GNU General Public License    **
-** along with this program; if not, see <http://www.gnu.org/licenses/>. ** 
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
 #include <gtest/gtest.h>
@@ -26,6 +26,11 @@
 #include "FileSystem.h"
 #include "macros.h"
 
+#ifndef SRCDIR
+#define SRCDIR "."
+#endif
+
+
 using namespace std;
 
 TEST(DirectoryTest, dirs) {
@@ -41,27 +46,17 @@ TEST(DirectoryTest, dirs) {
 
 
 TEST(DirectoryTest, file) {
-	// Skip this test if test-all is executed outside the original src directory.
-	// This is necessary to make "make distcheck" happy.
-	string cwd = FileSystem::getcwd();
-	unsigned pos = cwd.find("dvisvgm/src");
-	if (pos != cwd.length()-11) {
-		cout << "DirectoryTest::test_file skipped\n";
-		return;
-	}
-
 	const char *files_to_find[] = {
-		"Bitmap.cpp", "BoundingBox.cpp", "Calculator.cpp", "CharmapTranslator.cpp", 
-		"Directory.cpp", "DVIReader.cpp", "DVIToSVG.cpp", "DVIToSVGActions.cpp", 
-		"FileSystem.cpp", "Font.cpp", "FontEngine.cpp", "FontGlyph.cpp", "FontManager.cpp", 
-		"FontMap.cpp", "GFReader.cpp", "GFTracer.cpp", "FileFinder.cpp", "Message.cpp", 
-		"MetafontWrapper.cpp", "PageSize.cpp", "StreamReader.cpp", "SVGFontEmitter.cpp", 
-		"SVGFontTraceEmitter.cpp", "TFM.cpp", "TransformationMatrix.cpp", "VFReader.cpp", 
-		"XMLDocument.cpp", "XMLNode.cpp", "XMLString.cpp",
+		"Bitmap.cpp", "BoundingBox.cpp", "Calculator.cpp",
+		"Directory.cpp", "DVIReader.cpp", "DVIToSVG.cpp", "DVIToSVGActions.cpp",
+		"FileSystem.cpp", "Font.cpp", "FontEngine.cpp", "FontManager.cpp",
+		"FontMap.cpp", "GFReader.cpp", "GFTracer.cpp", "FileFinder.cpp", "Message.cpp",
+		"MetafontWrapper.cpp", "PageSize.cpp", "StreamReader.cpp",
+		"TFM.cpp", "VFReader.cpp", "XMLDocument.cpp", "XMLNode.cpp", "XMLString.cpp",
 		0
 	};
 	set<string> found_files;
-	Directory dir(".");
+	Directory dir(string(SRCDIR)+"/../src");
 	while (const char *fname = dir.read('f'))
 		found_files.insert(fname);
 	for (const char **p=files_to_find; *p; ++p) {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FileFinderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/FileFinderTest.cpp
index caf7781a8d9..caf7781a8d9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FileFinderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/FileFinderTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FilePathTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/FilePathTest.cpp
index fc7ffe2eda7..fc7ffe2eda7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FilePathTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/FilePathTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FontManagerTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/FontManagerTest.cpp
index e0774119d00..e0774119d00 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FontManagerTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/FontManagerTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FontMapTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/FontMapTest.cpp
index af6b7dadd1d..af6b7dadd1d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FontMapTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/FontMapTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/GFReaderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/GFReaderTest.cpp
new file mode 100644
index 00000000000..0e78790e2ff
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/GFReaderTest.cpp
@@ -0,0 +1,253 @@
+/*************************************************************************
+** GFReaderTest.cpp                                                     **
+**                                                                      **
+** This file is part of dvisvgm -- the DVI to SVG converter             **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>   **
+**                                                                      **
+** This program is free software; you can redistribute it and/or        **
+** modify it under the terms of the GNU General Public License as       **
+** published by the Free Software Foundation; either version 3 of       **
+** the License, or (at your option) any later version.                  **
+**                                                                      **
+** This program is distributed in the hope that it will be useful, but  **
+** WITHOUT ANY WARRANTY; without even the implied warranty of           **
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the         **
+** GNU General Public License for more details.                         **
+**                                                                      **
+** You should have received a copy of the GNU General Public License    **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
+*************************************************************************/
+
+
+#include <gtest/gtest.h>
+#include <cstdlib>
+#include <fstream>
+#include <string>
+#include <vector>
+#include "GFReader.h"
+#include "macros.h"
+
+#ifndef SRCDIR
+#define SRCDIR "."
+#endif
+
+using namespace std;
+
+
+struct PixelActions : public Bitmap::ForAllData
+{
+	void pixel (int x, int y, bool set, const Bitmap &bm) {
+		if (charmap.size() == 0) {
+			charmap.resize(bm.height());
+			for (int i=0; i < bm.height(); i++)
+				charmap[i] = string(bm.width(), ' ');
+		}
+		ASSERT_GE(x, 0);
+		ASSERT_LT(x, bm.width());
+		ASSERT_GE(y, 0);
+		ASSERT_LT(y, bm.height());
+		charmap[y][x] = (set ? '*' : '-');
+	}
+
+	vector<string> charmap;
+};
+
+
+const char *letter_a[] = {
+	"-----------********--------------------",
+	"--------**************-----------------",
+	"------*****-------******---------------",
+	"-----***------------*****--------------",
+	"----*****------------******------------",
+	"---*******------------******-----------",
+	"---********-----------******-----------",
+	"---********------------******----------",
+	"---********------------******----------",
+	"---********-------------******---------",
+	"----******--------------******---------",
+	"-----****---------------******---------",
+	"------------------------******---------",
+	"------------------------******---------",
+	"------------------------******---------",
+	"------------------------******---------",
+	"-----------------*************---------",
+	"-------------*****************---------",
+	"----------*********-----******---------",
+	"--------*******---------******---------",
+	"------*******-----------******---------",
+	"----********------------******---------",
+	"---*******--------------******---------",
+	"--********--------------******---------",
+	"-********---------------******---------",
+	"-*******----------------******---------",
+	"-*******----------------******------**-",
+	"*******-----------------******------**-",
+	"*******-----------------******------**-",
+	"*******-----------------******------**-",
+	"*******----------------*******------**-",
+	"*******----------------*******------**-",
+	"********--------------********------**-",
+	"-*******-------------***-*****------**-",
+	"-********------------**---*****----**--",
+	"--********---------****---*****----**--",
+	"----*******------****------*********---",
+	"------**************--------*******----",
+	"---------********------------*****-----",
+};
+
+
+const char *letter_g[] = {
+	"------------------------------******---",
+	"------------********--------*********--",
+	"----------************----****----****-",
+	"--------*****------*****-***-----*****-",
+	"-------*****--------*******------*****-",
+	"------*****----------*****-------*****-",
+	"-----*****------------*****--------*---",
+	"----******------------******-----------",
+	"----******------------******-----------",
+	"---******--------------******----------",
+	"---******--------------******----------",
+	"---******--------------******----------",
+	"---******--------------******----------",
+	"---******--------------******----------",
+	"---******--------------******----------",
+	"---******--------------******----------",
+	"---******--------------******----------",
+	"----******------------******-----------",
+	"----******------------******-----------",
+	"-----*****------------*****------------",
+	"------*****----------*****-------------",
+	"------******--------*****--------------",
+	"------*******------*****---------------",
+	"-----***--************-----------------",
+	"-----**-----********-------------------",
+	"----***--------------------------------",
+	"----***--------------------------------",
+	"----***--------------------------------",
+	"----***--------------------------------",
+	"----****-------------------------------",
+	"----****-------------------------------",
+	"----******-----------------------------",
+	"-----*********************-------------",
+	"-----************************----------",
+	"------*************************--------",
+	"-------**************************------",
+	"------****************************-----",
+	"----*****----------------**********----",
+	"---*****--------------------********---",
+	"--*****-----------------------******---",
+	"-*****-------------------------*****---",
+	"-*****-------------------------******--",
+	"*****---------------------------*****--",
+	"*****---------------------------*****--",
+	"*****---------------------------*****--",
+	"*****---------------------------*****--",
+	"*****---------------------------*****--",
+	"******-------------------------******--",
+	"-*****-------------------------*****---",
+	"--*****-----------------------*****----",
+	"--******---------------------******----",
+	"----*****-------------------*****------",
+	"-----******---------------******-------",
+	"-------*******---------*******---------",
+	"---------*******************-----------",
+	"-------------***********---------------",
+};
+
+
+const char *letter_M[] = {
+	"****************-------------------------------------****************-",
+	"*****************-----------------------------------*****************-",
+	"*****************-----------------------------------*****************-",
+	"-------**********-----------------------------------**********--------",
+	"--------**-*******---------------------------------**-*******---------",
+	"--------**-*******---------------------------------**-*******---------",
+	"--------**--*******-------------------------------**--*******---------",
+	"--------**--*******-------------------------------**--*******---------",
+	"--------**--*******-------------------------------**--*******---------",
+	"--------**---*******-----------------------------**---*******---------",
+	"--------**---*******-----------------------------**---*******---------",
+	"--------**---*******-----------------------------**---*******---------",
+	"--------**----*******---------------------------**----*******---------",
+	"--------**----*******---------------------------**----*******---------",
+	"--------**-----*******-------------------------**-----*******---------",
+	"--------**-----*******-------------------------**-----*******---------",
+	"--------**-----*******-------------------------**-----*******---------",
+	"--------**------*******-----------------------**------*******---------",
+	"--------**------*******-----------------------**------*******---------",
+	"--------**-------*******---------------------**-------*******---------",
+	"--------**-------*******---------------------**-------*******---------",
+	"--------**-------*******---------------------**-------*******---------",
+	"--------**--------*******-------------------**--------*******---------",
+	"--------**--------*******-------------------**--------*******---------",
+	"--------**--------*******-------------------**--------*******---------",
+	"--------**---------*******-----------------**---------*******---------",
+	"--------**---------*******-----------------**---------*******---------",
+	"--------**----------*******---------------**----------*******---------",
+	"--------**----------*******---------------**----------*******---------",
+	"--------**----------*******---------------**----------*******---------",
+	"--------**-----------*******-------------**-----------*******---------",
+	"--------**-----------*******-------------**-----------*******---------",
+	"--------**------------*******-----------**------------*******---------",
+	"--------**------------*******-----------**------------*******---------",
+	"--------**------------*******-----------**------------*******---------",
+	"--------**-------------*******---------**-------------*******---------",
+	"--------**-------------*******---------**-------------*******---------",
+	"--------**-------------*******---------**-------------*******---------",
+	"--------**--------------*******-------**--------------*******---------",
+	"--------**--------------*******-------**--------------*******---------",
+	"--------**---------------*******-----**---------------*******---------",
+	"--------**---------------*******-----**---------------*******---------",
+	"--------**---------------*******-----**---------------*******---------",
+	"--------**----------------*******---**----------------*******---------",
+	"--------**----------------*******---**----------------*******---------",
+	"--------**-----------------*******-**-----------------*******---------",
+	"--------**-----------------*******-**-----------------*******---------",
+	"--------**-----------------*******-**-----------------*******---------",
+	"--------**------------------********------------------*******---------",
+	"--------**------------------********------------------*******---------",
+	"--------**------------------********------------------*******---------",
+	"-------****------------------******-------------------*******---------",
+	"------******-----------------******-------------------*******---------",
+	"----**********----------------****-------------------*********--------",
+	"******************------------****------------***********************-",
+	"******************------------****------------***********************-",
+	"******************-------------**-------------***********************-",
+};
+
+
+static void check_letter (const char **lettermap, const vector<string> &charmap) {
+	for (size_t i=0; i < charmap.size(); i++)
+		ASSERT_EQ(lettermap[i], charmap[charmap.size()-i-1]);
+}
+
+
+TEST(GFReaderTest, executeChar) {
+	string gf = string(SRCDIR)+"/cmr10.600gf";
+	ifstream ifs(gf.c_str());
+	ASSERT_TRUE(ifs);
+	GFReader gfReader(ifs);
+	PixelActions actions;
+
+	gfReader.executeChar('a');
+	ASSERT_EQ(gfReader.getBitmap().width(), 39);
+	ASSERT_EQ(gfReader.getBitmap().height(), 39);
+	gfReader.getBitmap().forAllPixels(actions);
+	check_letter(letter_a, actions.charmap);
+
+	actions.charmap.clear();
+	gfReader.executeChar('g');
+	ASSERT_EQ(gfReader.getBitmap().width(), 39);
+	ASSERT_EQ(gfReader.getBitmap().height(), 56);
+	gfReader.getBitmap().forAllPixels(actions);
+	check_letter(letter_g, actions.charmap);
+
+	actions.charmap.clear();
+	gfReader.executeChar('M');
+	ASSERT_EQ(gfReader.getBitmap().width(), 70);
+	ASSERT_EQ(gfReader.getBitmap().height(), 57);
+	gfReader.getBitmap().forAllPixels(actions);
+	check_letter(letter_M, actions.charmap);
+}
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/GraphicPathTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/GraphicPathTest.cpp
index 1cf92d53156..1cf92d53156 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/GraphicPathTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/GraphicPathTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/LengthTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/LengthTest.cpp
index 7add99c2d55..7add99c2d55 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/LengthTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/LengthTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/Makefile.am
index abdc55d39f7..d5065ce529c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/Makefile.am
@@ -3,7 +3,7 @@
 ##
 ## Process this file with automake.
 
-AM_CXXFLAGS = -I../src -I../../src -Wall
+AM_CXXFLAGS = -I$(srcdir)/../src -I$(srcdir)/../../src -Wall -DSRCDIR='"$(srcdir)"'
 
 TESTS =
 check_PROGRAMS =
@@ -53,6 +53,11 @@ check_PROGRAMS += FontMapTest
 FontMapTest_SOURCES = FontMapTest.cpp
 FontMapTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
 
+TESTS += GFReaderTest
+check_PROGRAMS += GFReaderTest
+GFReaderTest_SOURCES = GFReaderTest.cpp
+GFReaderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
 TESTS += GraphicPathTest
 check_PROGRAMS += GraphicPathTest
 GraphicPathTest_SOURCES = GraphicPathTest.cpp
@@ -88,6 +93,11 @@ check_PROGRAMS += StreamInputBufferTest
 StreamInputBufferTest_SOURCES = StreamInputBufferTest.cpp
 StreamInputBufferTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
 
+TESTS += TypesTest
+check_PROGRAMS += TypesTest
+TypesTest_SOURCES = TypesTest.cpp
+TypesTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
 TESTS += VectorStreamTest
 check_PROGRAMS += VectorStreamTest
 VectorStreamTest_SOURCES = VectorStreamTest.cpp
@@ -96,5 +106,5 @@ VectorStreamTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest
 TESTDATA =
 TESTDATA += frktest.dvi frktest-wf-cmp.svg frktest-nf-cmp.svg
 TESTDATA += sample.dvi sample-wf-cmp.svg sample-nf-cmp.svg
-EXTRA_DIST = check-conv normalize.xsl $(TESTDATA)
+EXTRA_DIST = check-conv normalize.xsl cmr10.600gf $(TESTDATA)
 TESTS += check-conv
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/Makefile.in
index feb5ed5a14c..05fc561efb2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/Makefile.in
@@ -38,19 +38,22 @@ TESTS = BoundingBoxTest$(EXEEXT) CalculatorTest$(EXEEXT) \
 	ColorSpecialTest$(EXEEXT) CommandLineTest$(EXEEXT) \
 	DirectoryTest$(EXEEXT) FileFinderTest$(EXEEXT) \
 	FilePathTest$(EXEEXT) FontManagerTest$(EXEEXT) \
-	FontMapTest$(EXEEXT) GraphicPathTest$(EXEEXT) \
-	LengthTest$(EXEEXT) MatrixTest$(EXEEXT) PageRagesTest$(EXEEXT) \
+	FontMapTest$(EXEEXT) GFReaderTest$(EXEEXT) \
+	GraphicPathTest$(EXEEXT) LengthTest$(EXEEXT) \
+	MatrixTest$(EXEEXT) PageRagesTest$(EXEEXT) \
 	PageSizeTest$(EXEEXT) SplittedCharInputBufferTest$(EXEEXT) \
-	StreamInputBufferTest$(EXEEXT) VectorStreamTest$(EXEEXT) \
-	check-conv
+	StreamInputBufferTest$(EXEEXT) TypesTest$(EXEEXT) \
+	VectorStreamTest$(EXEEXT) check-conv
 check_PROGRAMS = BoundingBoxTest$(EXEEXT) CalculatorTest$(EXEEXT) \
 	ColorSpecialTest$(EXEEXT) CommandLineTest$(EXEEXT) \
 	DirectoryTest$(EXEEXT) FileFinderTest$(EXEEXT) \
 	FilePathTest$(EXEEXT) FontManagerTest$(EXEEXT) \
-	FontMapTest$(EXEEXT) GraphicPathTest$(EXEEXT) \
-	LengthTest$(EXEEXT) MatrixTest$(EXEEXT) PageRagesTest$(EXEEXT) \
+	FontMapTest$(EXEEXT) GFReaderTest$(EXEEXT) \
+	GraphicPathTest$(EXEEXT) LengthTest$(EXEEXT) \
+	MatrixTest$(EXEEXT) PageRagesTest$(EXEEXT) \
 	PageSizeTest$(EXEEXT) SplittedCharInputBufferTest$(EXEEXT) \
-	StreamInputBufferTest$(EXEEXT) VectorStreamTest$(EXEEXT)
+	StreamInputBufferTest$(EXEEXT) TypesTest$(EXEEXT) \
+	VectorStreamTest$(EXEEXT)
 subdir = tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -97,6 +100,10 @@ am_FontMapTest_OBJECTS = FontMapTest.$(OBJEXT)
 FontMapTest_OBJECTS = $(am_FontMapTest_OBJECTS)
 FontMapTest_DEPENDENCIES = ../src/libdvisvgm.a \
 	../potracelib/libpotrace.a
+am_GFReaderTest_OBJECTS = GFReaderTest.$(OBJEXT)
+GFReaderTest_OBJECTS = $(am_GFReaderTest_OBJECTS)
+GFReaderTest_DEPENDENCIES = ../src/libdvisvgm.a \
+	../potracelib/libpotrace.a
 am_GraphicPathTest_OBJECTS = GraphicPathTest.$(OBJEXT)
 GraphicPathTest_OBJECTS = $(am_GraphicPathTest_OBJECTS)
 GraphicPathTest_DEPENDENCIES = ../src/libdvisvgm.a \
@@ -127,6 +134,10 @@ am_StreamInputBufferTest_OBJECTS = StreamInputBufferTest.$(OBJEXT)
 StreamInputBufferTest_OBJECTS = $(am_StreamInputBufferTest_OBJECTS)
 StreamInputBufferTest_DEPENDENCIES = ../src/libdvisvgm.a \
 	../potracelib/libpotrace.a
+am_TypesTest_OBJECTS = TypesTest.$(OBJEXT)
+TypesTest_OBJECTS = $(am_TypesTest_OBJECTS)
+TypesTest_DEPENDENCIES = ../src/libdvisvgm.a \
+	../potracelib/libpotrace.a
 am_VectorStreamTest_OBJECTS = VectorStreamTest.$(OBJEXT)
 VectorStreamTest_OBJECTS = $(am_VectorStreamTest_OBJECTS)
 VectorStreamTest_DEPENDENCIES = ../src/libdvisvgm.a \
@@ -144,20 +155,22 @@ SOURCES = $(BoundingBoxTest_SOURCES) $(CalculatorTest_SOURCES) \
 	$(ColorSpecialTest_SOURCES) $(CommandLineTest_SOURCES) \
 	$(DirectoryTest_SOURCES) $(FileFinderTest_SOURCES) \
 	$(FilePathTest_SOURCES) $(FontManagerTest_SOURCES) \
-	$(FontMapTest_SOURCES) $(GraphicPathTest_SOURCES) \
-	$(LengthTest_SOURCES) $(MatrixTest_SOURCES) \
-	$(PageRagesTest_SOURCES) $(PageSizeTest_SOURCES) \
-	$(SplittedCharInputBufferTest_SOURCES) \
-	$(StreamInputBufferTest_SOURCES) $(VectorStreamTest_SOURCES)
+	$(FontMapTest_SOURCES) $(GFReaderTest_SOURCES) \
+	$(GraphicPathTest_SOURCES) $(LengthTest_SOURCES) \
+	$(MatrixTest_SOURCES) $(PageRagesTest_SOURCES) \
+	$(PageSizeTest_SOURCES) $(SplittedCharInputBufferTest_SOURCES) \
+	$(StreamInputBufferTest_SOURCES) $(TypesTest_SOURCES) \
+	$(VectorStreamTest_SOURCES)
 DIST_SOURCES = $(BoundingBoxTest_SOURCES) $(CalculatorTest_SOURCES) \
 	$(ColorSpecialTest_SOURCES) $(CommandLineTest_SOURCES) \
 	$(DirectoryTest_SOURCES) $(FileFinderTest_SOURCES) \
 	$(FilePathTest_SOURCES) $(FontManagerTest_SOURCES) \
-	$(FontMapTest_SOURCES) $(GraphicPathTest_SOURCES) \
-	$(LengthTest_SOURCES) $(MatrixTest_SOURCES) \
-	$(PageRagesTest_SOURCES) $(PageSizeTest_SOURCES) \
-	$(SplittedCharInputBufferTest_SOURCES) \
-	$(StreamInputBufferTest_SOURCES) $(VectorStreamTest_SOURCES)
+	$(FontMapTest_SOURCES) $(GFReaderTest_SOURCES) \
+	$(GraphicPathTest_SOURCES) $(LengthTest_SOURCES) \
+	$(MatrixTest_SOURCES) $(PageRagesTest_SOURCES) \
+	$(PageSizeTest_SOURCES) $(SplittedCharInputBufferTest_SOURCES) \
+	$(StreamInputBufferTest_SOURCES) $(TypesTest_SOURCES) \
+	$(VectorStreamTest_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 am__tty_colors = \
@@ -273,7 +286,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CXXFLAGS = -I../src -I../../src -Wall
+AM_CXXFLAGS = -I$(srcdir)/../src -I$(srcdir)/../../src -Wall -DSRCDIR='"$(srcdir)"'
 BoundingBoxTest_SOURCES = BoundingBoxTest.cpp
 BoundingBoxTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
 CalculatorTest_SOURCES = CalculatorTest.cpp
@@ -292,6 +305,8 @@ FontManagerTest_SOURCES = FontManagerTest.cpp
 FontManagerTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
 FontMapTest_SOURCES = FontMapTest.cpp
 FontMapTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+GFReaderTest_SOURCES = GFReaderTest.cpp
+GFReaderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
 GraphicPathTest_SOURCES = GraphicPathTest.cpp
 GraphicPathTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
 LengthTest_SOURCES = LengthTest.cpp
@@ -306,11 +321,13 @@ SplittedCharInputBufferTest_SOURCES = SplittedCharInputBufferTest.cpp
 SplittedCharInputBufferTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
 StreamInputBufferTest_SOURCES = StreamInputBufferTest.cpp
 StreamInputBufferTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+TypesTest_SOURCES = TypesTest.cpp
+TypesTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
 VectorStreamTest_SOURCES = VectorStreamTest.cpp
 VectorStreamTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
 TESTDATA = frktest.dvi frktest-wf-cmp.svg frktest-nf-cmp.svg \
 	sample.dvi sample-wf-cmp.svg sample-nf-cmp.svg
-EXTRA_DIST = check-conv normalize.xsl $(TESTDATA)
+EXTRA_DIST = check-conv normalize.xsl cmr10.600gf $(TESTDATA)
 all: all-am
 
 .SUFFIXES:
@@ -375,6 +392,9 @@ FontManagerTest$(EXEEXT): $(FontManagerTest_OBJECTS) $(FontManagerTest_DEPENDENC
 FontMapTest$(EXEEXT): $(FontMapTest_OBJECTS) $(FontMapTest_DEPENDENCIES) 
 	@rm -f FontMapTest$(EXEEXT)
 	$(CXXLINK) $(FontMapTest_OBJECTS) $(FontMapTest_LDADD) $(LIBS)
+GFReaderTest$(EXEEXT): $(GFReaderTest_OBJECTS) $(GFReaderTest_DEPENDENCIES) 
+	@rm -f GFReaderTest$(EXEEXT)
+	$(CXXLINK) $(GFReaderTest_OBJECTS) $(GFReaderTest_LDADD) $(LIBS)
 GraphicPathTest$(EXEEXT): $(GraphicPathTest_OBJECTS) $(GraphicPathTest_DEPENDENCIES) 
 	@rm -f GraphicPathTest$(EXEEXT)
 	$(CXXLINK) $(GraphicPathTest_OBJECTS) $(GraphicPathTest_LDADD) $(LIBS)
@@ -396,6 +416,9 @@ SplittedCharInputBufferTest$(EXEEXT): $(SplittedCharInputBufferTest_OBJECTS) $(S
 StreamInputBufferTest$(EXEEXT): $(StreamInputBufferTest_OBJECTS) $(StreamInputBufferTest_DEPENDENCIES) 
 	@rm -f StreamInputBufferTest$(EXEEXT)
 	$(CXXLINK) $(StreamInputBufferTest_OBJECTS) $(StreamInputBufferTest_LDADD) $(LIBS)
+TypesTest$(EXEEXT): $(TypesTest_OBJECTS) $(TypesTest_DEPENDENCIES) 
+	@rm -f TypesTest$(EXEEXT)
+	$(CXXLINK) $(TypesTest_OBJECTS) $(TypesTest_LDADD) $(LIBS)
 VectorStreamTest$(EXEEXT): $(VectorStreamTest_OBJECTS) $(VectorStreamTest_DEPENDENCIES) 
 	@rm -f VectorStreamTest$(EXEEXT)
 	$(CXXLINK) $(VectorStreamTest_OBJECTS) $(VectorStreamTest_LDADD) $(LIBS)
@@ -415,6 +438,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FilePathTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontManagerTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontMapTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GFReaderTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GraphicPathTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LengthTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MatrixTest.Po@am__quote@
@@ -422,6 +446,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PageSizeTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplittedCharInputBufferTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StreamInputBufferTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TypesTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VectorStreamTest.Po@am__quote@
 
 .cpp.o:
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/MatrixTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/MatrixTest.cpp
index d5cfa92cb40..d5cfa92cb40 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/MatrixTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/MatrixTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/PageRagesTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/PageRagesTest.cpp
index a5f28ba807b..a5f28ba807b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/PageRagesTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/PageRagesTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/PageSizeTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/PageSizeTest.cpp
index 65a990db73d..65a990db73d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/PageSizeTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/PageSizeTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/SplittedCharInputBufferTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/SplittedCharInputBufferTest.cpp
index dcb91728210..dcb91728210 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/SplittedCharInputBufferTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/SplittedCharInputBufferTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/StreamInputBufferTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/StreamInputBufferTest.cpp
index 08084563fce..08084563fce 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/StreamInputBufferTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/StreamInputBufferTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/TypesTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/TypesTest.cpp
new file mode 100644
index 00000000000..86021d5c7e2
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/TypesTest.cpp
@@ -0,0 +1,57 @@
+/*************************************************************************
+** TypesTest.cpp                                                        **
+**                                                                      **
+** This file is part of dvisvgm -- the DVI to SVG converter             **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>   **
+**                                                                      **
+** This program is free software; you can redistribute it and/or        **
+** modify it under the terms of the GNU General Public License as       **
+** published by the Free Software Foundation; either version 3 of       **
+** the License, or (at your option) any later version.                  **
+**                                                                      **
+** This program is distributed in the hope that it will be useful, but  **
+** WITHOUT ANY WARRANTY; without even the implied warranty of           **
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the         **
+** GNU General Public License for more details.                         **
+**                                                                      **
+** You should have received a copy of the GNU General Public License    **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
+*************************************************************************/
+
+#include <gtest/gtest.h>
+#include "types.h"
+
+using namespace std;
+
+
+TEST(TypesTest, size_signed) {
+	ASSERT_EQ(sizeof(Int8),  1);
+	ASSERT_EQ(sizeof(Int16), 2);
+	ASSERT_EQ(sizeof(Int32), 4);
+	ASSERT_EQ(sizeof(Int64), 8);
+}
+
+
+TEST(TypesTest, neg_signed) {
+	ASSERT_LT(Int8(-1),  0);
+	ASSERT_LT(Int16(-1), 0);
+	ASSERT_LT(Int32(-1), 0);
+	ASSERT_LT(Int64(-1), 0);
+}
+
+
+TEST(TypesTest, unsigned_types) {
+	ASSERT_EQ(sizeof(UInt8),  1);
+	ASSERT_EQ(sizeof(UInt16), 2);
+	ASSERT_EQ(sizeof(UInt32), 4);
+	ASSERT_EQ(sizeof(UInt64), 8);
+}
+
+
+TEST(TypesTest, neg_unsigned) {
+	ASSERT_GT(UInt8(-1),  0);
+	ASSERT_GT(UInt16(-1), 0);
+	ASSERT_GT(UInt32(-1), 0);
+	ASSERT_GT(UInt64(-1), 0);
+}
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/VectorStreamTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/VectorStreamTest.cpp
index e47e2046de3..e47e2046de3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/VectorStreamTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/VectorStreamTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/check-conv b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/check-conv
index e1e6315d776..e1e6315d776 100755
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/check-conv
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/check-conv
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/cmr10.600gf b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/cmr10.600gf
new file mode 100644
index 00000000000..6dca421e21c
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/cmr10.600gf
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/frktest-nf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/frktest-nf-cmp.svg
index 4efb2993236..4efb2993236 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/frktest-nf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/frktest-nf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/frktest-wf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/frktest-wf-cmp.svg
index 78e67a13116..78e67a13116 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/frktest-wf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/frktest-wf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/normalize.xsl b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/normalize.xsl
index 5a6ba2f62d6..5a6ba2f62d6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/normalize.xsl
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/normalize.xsl
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/sample-nf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/sample-nf-cmp.svg
index c115ae96c29..c115ae96c29 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/sample-nf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/sample-nf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/sample-wf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/sample-wf-cmp.svg
index 84c3de4ba3c..84c3de4ba3c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/sample-wf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/tests/sample-wf-cmp.svg