dvisvgm 1.0.10

git-svn-id: svn://tug.org/texlive/trunk@24907 c570f23f-e606-0410-a88d-b1316a301751
author: Peter Breitenlohner <peb@mppmu.mpg.de> 2011-12-22 12:05:55 +0000
committer: Peter Breitenlohner <peb@mppmu.mpg.de> 2011-12-22 12:05:55 +0000
commit: 6b6a57de24d436e9b5f47fd031f5347de05e7e80 (patch)
tree: 4db5f719bcdd2b1f92ec15e3b60de2d5d4f6b9d3 /Build/source
parent: f4a722180ef0a33d802f5cf15b65fda6e6df0187 (diff)
202 files changed, 489 insertions, 199 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README
index fa6754587e3..5e8a75789a1 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -58,8 +58,8 @@ dvipos - ?
 
 dvipsk - maintained here by Tom Rokicki, Karl Berry, Akira Kakuto, ...
 
-dvisvgm 1.0.9 - checked 17oct11
-  http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.0.9.tar.gz
+dvisvgm 1.0.10 - checked 22dec11
+  http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.0.10.tar.gz
 
 gsftopk - from Paul Vojta's xdvi?
 
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index 9753c50e3e9..403474338f6 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Imported release 1.0.10.
+	* version.ac: Adapted.
+
 2011-11-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Imported release 1.0.9.
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index fcb9793ccec..6cc25b0c961 100755
--- a/Build/source/texk/dvisvgm/configure
+++ b/Build/source/texk/dvisvgm/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for dvisvgm 1.0.9.
+# Generated by GNU Autoconf 2.68 for dvisvgm 1.0.10.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -570,12 +570,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvisvgm'
 PACKAGE_TARNAME='dvisvgm'
-PACKAGE_VERSION='1.0.9'
-PACKAGE_STRING='dvisvgm 1.0.9'
+PACKAGE_VERSION='1.0.10'
+PACKAGE_STRING='dvisvgm 1.0.10'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="dvisvgm-1.0.9/src/dvisvgm.cpp"
+ac_unique_file="dvisvgm-1.0.10/src/dvisvgm.cpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1338,7 +1338,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.9 to adapt to many kinds of systems.
+\`configure' configures dvisvgm 1.0.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1408,7 +1408,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvisvgm 1.0.9:";;
+     short | recursive ) echo "Configuration of dvisvgm 1.0.10:";;
    esac
   cat <<\_ACEOF
 
@@ -1535,7 +1535,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvisvgm configure 1.0.9
+dvisvgm configure 1.0.10
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2227,7 +2227,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.9, which was
+It was created by dvisvgm $as_me 1.0.10, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -7610,7 +7610,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvisvgm'
- VERSION='1.0.9'
+ VERSION='1.0.10'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17284,7 +17284,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dvisvgm config.lt 1.0.9
+dvisvgm config.lt 1.0.10
 configured by $0, generated by GNU Autoconf 2.68.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -18980,7 +18980,7 @@ CPPFLAGS=$kpse_save_CPPFLAGS
 LIBS=$kpse_save_LIBS
 
 
-DVISVGM_TREE=dvisvgm-1.0.9
+DVISVGM_TREE=dvisvgm-1.0.10
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -19536,7 +19536,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.9, which was
+This file was extended by dvisvgm $as_me 1.0.10, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19602,7 +19602,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.9
+dvisvgm config.status 1.0.10
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.0.10-PATCHES/TL-Changes
index 99779c5d531..93d68b58c59 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9-PATCHES/TL-Changes
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10-PATCHES/TL-Changes
@@ -1,9 +1,8 @@
-Changes applied to the dvisvgm-1.0.9 tree as obtained from:
-	http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.0.9.tar.gz
+Changes applied to the dvisvgm-1.0.10 tree as obtained from:
+	http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.0.10.tar.gz
 
 Removed:
 	config.guess
-	config.rpath
 	config.sub
 	depcomp
 	install-sh
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9-PATCHES/patch-03-texlive_gs_init b/Build/source/texk/dvisvgm/dvisvgm-1.0.10-PATCHES/patch-03-texlive_gs_init
index d341e9cebac..046f366232e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9-PATCHES/patch-03-texlive_gs_init
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10-PATCHES/patch-03-texlive_gs_init
@@ -1,6 +1,6 @@
-diff -ur dvisvgm-1.0.9.orig/src/FileFinder.cpp dvisvgm-1.0.9/src/FileFinder.cpp
---- dvisvgm-1.0.9.orig/src/FileFinder.cpp	2011-10-04 18:35:48.000000000 +0200
-+++ dvisvgm-1.0.9/src/FileFinder.cpp	2011-10-17 11:57:07.000000000 +0200
+diff -ur dvisvgm-1.0.10.orig/src/FileFinder.cpp dvisvgm-1.0.10/src/FileFinder.cpp
+--- dvisvgm-1.0.10.orig/src/FileFinder.cpp	2011-10-05 18:04:40.000000000 +0200
++++ dvisvgm-1.0.10/src/FileFinder.cpp	2011-12-22 12:03:19.222930951 +0100
 @@ -84,6 +84,9 @@
  	kpse_set_program_enabled(kpse_tfm_format, 1, kpse_src_env);
  	kpse_set_program_enabled(kpse_mf_format, 1, kpse_src_env);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/AUTHORS b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/AUTHORS
index 837e1e96bfb..837e1e96bfb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/AUTHORS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/AUTHORS
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/COPYING b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/COPYING
index 94a9ed024d3..94a9ed024d3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/COPYING
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/COPYING
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/INSTALL b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/INSTALL
index a4b34144dcf..a4b34144dcf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/INSTALL
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/INSTALL
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/LGPL-2.1.txt b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/LGPL-2.1.txt
index 602bfc94635..602bfc94635 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/LGPL-2.1.txt
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/LGPL-2.1.txt
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/Makefile.am
index d0557a0e78c..d0557a0e78c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/Makefile.in
index fb7ee798f04..fb7ee798f04 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/NEWS b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/NEWS
index b3f4f1b5cac..6236d65df47 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/NEWS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/NEWS
@@ -1,3 +1,8 @@
+dvisvgm-1.0.10 (2011-12-18)
+- introduced environment variable DVISVGM_COLORS to allow user-defined message colors
+- fixed linking issue concerning libfreetype
+- fixed potential clashes of character IDs
+
 dvisvgm-1.0.9 (2011-10-13)
 - fixed segfault occurred in TeX Live Win32 caused by mf.exe being unavailable
   (thanks to Akira Kakuto for tracking down the issue)
@@ -8,7 +13,7 @@ dvisvgm-1.0.8 (2011-05-31)
 - PS handler: added evaluation of PS operators save, restore, and grestoreall
 - PS handler: fixed potention segfault caused by invisible zero-length paths
 - fixed computation of current drawing position influenced by PS and DVI actions
-- don't stop Metafont conversions on errors any longer in order to convert 
+- don't stop Metafont conversions on errors any longer in order to convert
   buggy MF fonts properly
 
 dvisvgm-1.0.7 (2011-05-06)
@@ -18,7 +23,7 @@ dvisvgm-1.0.7 (2011-05-06)
 - fixed semantics of TPIC special 'ip' (doesn't draw polygon outlines any longer)
 
 dvisvgm-1.0.6 (2011-04-21)
-- fixed segfault occured if a (malformed) DVI file calls set_char/put_char 
+- fixed segfault occured if a (malformed) DVI file calls set_char/put_char
   whithout preceding font definition
 - added CTRL-C handler
 - MiKTeX support updated to version 2.9
@@ -68,7 +73,7 @@ dvisvgm-0.9.1 (2010-04-23)
 - fixed two memory issues that could lead to segfaults
 
 dvisvgm-0.9 (2010-03-25)
-- added option --exact and corresponding algorithms to compute the exact 
+- added option --exact and corresponding algorithms to compute the exact
   bounding boxes of characters
 - added option --keep that prevents deleting temporary font files
 - extended option --trace-all by an optional boolean argument controlling
@@ -81,10 +86,10 @@ dvisvgm-0.8.8 (2010-02-02)
   to overwrite the expected file name of the GS shared library
   (only available if dvisvgm isn't linked against libgs and GS support
   isn't completely disabled)
-- option --bbox can now be used to enlarge the minimal bounding box by 
+- option --bbox can now be used to enlarge the minimal bounding box by
   a given amount
 - fixed bug in evaluation of option --page
-- applied patches sent by Peter Breitenlohner to prepare the integration of 
+- applied patches sent by Peter Breitenlohner to prepare the integration of
   dvisvgm into TeX Live
 - some code refactorings
 
@@ -138,7 +143,7 @@ dvisvgm-0.8.1 (2009-08-02)
 - fixed compilation errors and a conversion bug occurred on x64 systems
 
 dvisvgm-0.8 (2009-07-27)
-- experimental evaluation of PostScript specials has been added (requires 
+- experimental evaluation of PostScript specials has been added (requires
   a recent version of the Ghostscript shared library libgs.so or gsdll32.dll)
 - several code improvements and refactorings
 - fixed compilation bug occurred when using GCC 4.4.x
@@ -152,8 +157,8 @@ dvisvgm-0.7.2 (2009-04-02)
 - font caching has been added (speeds up embedding of bitmap fonts)
 - added option --trace-all that enables tracing of all glyphs of all
   bitmap fonts used in the current DVI file. Even glyphs that are currently
-  not needed are considered. This avoids multiple calls of Metafont for the 
-  same fonts. In combination with the new caching functionality this can 
+  not needed are considered. This avoids multiple calls of Metafont for the
+  same fonts. In combination with the new caching functionality this can
   drastically increase the speed of successive dvisvgm calls.
 - if option --no-fonts is used, all glyph sizes are now computed correctly
 - use shorthand path commands in SVG fonts if possible
@@ -198,18 +203,18 @@ dvisvgm-0.6 (2009-01-23)
 dvisvgm-0.5 (2007-03-26)
 - redesigned and improved font handling
 - added support for virtual fonts
-- evaluation of dvipdfm's map file to find font files with differing 
+- evaluation of dvipdfm's map file to find font files with differing
   names (e.g. cork-lmr10 => lmr10)
 - automatic invocation of mktexmf etc. in case of missing font files (tfm, mf)
 - command-line option -m has been renamed to -M
 - added command-line options -m/--map-file and -n/--no-mktexmf
 - memory bug in StreamCounter class has been fixed
-- added sources of Peter Selinger's potrace library (part of potrace, http://potrace.sourceforge.net) 
+- added sources of Peter Selinger's potrace library (part of potrace, http://potrace.sourceforge.net)
   to simplify the build process
 
 dvisvgm-0.4.3 (2007-01-03)
 - problem with changed freetype API (freetype version >= 2.2.1) has been fixed
-- updated MiKTeX support to version 2.5 
+- updated MiKTeX support to version 2.5
 - minor code improvements
 - some unit tests based on CxxTest (http://cxxtest.sourceforge.net) have been added
 
@@ -220,7 +225,7 @@ dvisvgm-0.4.2 (2005-09-22)
 
 dvisvgm-0.4.1 (2005-09-02)
 - added option -b to specify the bounding box
-- added a manual page 
+- added a manual page
 
 dvisvgm-0.4 (2005-08-24)
 - Added a glyph tracing module that vectorizes Metafont's bitmap output
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/README b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/README
index 2157b7d6078..2157b7d6078 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/README
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/README
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/aclocal.m4 b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/aclocal.m4
index 866c84ad432..866c84ad432 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/aclocal.m4
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/aclocal.m4
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/config.h.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/config.h.in
index b027999e9b3..b027999e9b3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/config.h.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/config.h.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/configure b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/configure
index 435db52adb3..f9c831aeb7d 100755
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/configure
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for dvisvgm 1.0.9.
+# Generated by GNU Autoconf 2.68 for dvisvgm 1.0.10.
 #
 # Report bugs to <martin.gieseking@uos.de>.
 #
@@ -560,8 +560,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvisvgm'
 PACKAGE_TARNAME='dvisvgm'
-PACKAGE_VERSION='1.0.9'
-PACKAGE_STRING='dvisvgm 1.0.9'
+PACKAGE_VERSION='1.0.10'
+PACKAGE_STRING='dvisvgm 1.0.10'
 PACKAGE_BUGREPORT='martin.gieseking@uos.de'
 PACKAGE_URL=''
 
@@ -1279,7 +1279,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.9 to adapt to many kinds of systems.
+\`configure' configures dvisvgm 1.0.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1350,7 +1350,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvisvgm 1.0.9:";;
+     short | recursive ) echo "Configuration of dvisvgm 1.0.10:";;
    esac
   cat <<\_ACEOF
 
@@ -1453,7 +1453,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvisvgm configure 1.0.9
+dvisvgm configure 1.0.10
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1914,7 +1914,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.9, which was
+It was created by dvisvgm $as_me 1.0.10, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2262,7 +2262,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-DATE="October 2011"
+DATE="December 2011"
 
 ac_config_headers="$ac_config_headers config.h"
 
@@ -2843,7 +2843,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvisvgm'
- VERSION='1.0.9'
+ VERSION='1.0.10'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5409,7 +5409,7 @@ $as_echo "yes" >&6; }
 
 fi
 CXXFLAGS="$CXXFLAGS ${FREETYPE_CFLAGS}"
-LDFLAGS="$LDFLAGS ${FREETYPE_LIBS}"
+LIBS="$LIBS ${FREETYPE_LIBS}"
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
 $as_echo_n "checking for gzopen in -lz... " >&6; }
@@ -6855,7 +6855,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.9, which was
+This file was extended by dvisvgm $as_me 1.0.10, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6921,7 +6921,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.9
+dvisvgm config.status 1.0.10
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/configure.ac b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/configure.ac
index 98dd3bb7209..39a012bd760 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/configure.ac
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/configure.ac
@@ -4,8 +4,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dvisvgm],[1.0.9],[martin.gieseking@uos.de])
-DATE="October 2011"
+AC_INIT([dvisvgm],[1.0.10],[martin.gieseking@uos.de])
+DATE="December 2011"
 AC_CONFIG_SRCDIR(src)
 AC_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST
@@ -106,7 +106,7 @@ PKG_PROG_PKG_CONFIG
 # Check for libraries.
 PKG_CHECK_MODULES([FREETYPE], [freetype2])
 CXXFLAGS="$CXXFLAGS ${FREETYPE_CFLAGS}"
-LDFLAGS="$LDFLAGS ${FREETYPE_LIBS}"
+LIBS="$LIBS ${FREETYPE_LIBS}"
 
 AC_CHECK_LIB(z, gzopen)
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/doc/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/doc/Makefile.am
index f8ff1dfe3cc..f8ff1dfe3cc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/doc/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/doc/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/doc/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/doc/Makefile.in
index d5cbd4e068e..d5cbd4e068e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/doc/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/doc/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/doc/dvisvgm.1 b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/doc/dvisvgm.1
index 69d135fa210..d61c4c2b7b3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/doc/dvisvgm.1
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/doc/dvisvgm.1
@@ -2,12 +2,12 @@
 .\"     Title: dvisvgm
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/14/2011
+.\"      Date: 12/18/2011
 .\"    Manual: dvisvgm Manual
-.\"    Source: dvisvgm 1.0.9
+.\"    Source: dvisvgm 1.0.10
 .\"  Language: English
 .\"
-.TH "DVISVGM" "1" "10/14/2011" "dvisvgm 1\&.0\&.9" "dvisvgm Manual"
+.TH "DVISVGM" "1" "12/18/2011" "dvisvgm 1\&.0\&.10" "dvisvgm Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -194,7 +194,8 @@ is omitted, dvisvgm prints the path of the default cache directory and some info
 .PP
 \fB\-\-color\fR
 .RS 4
-Enables colorization of messages printed during the conversion process\&.
+Enables colorization of messages printed during the conversion process\&. The colors can be customized via the environment variable
+DVISVGM_COLORS\&. See ENVIRONMENT section below for further information\&.
 .RE
 .PP
 \fB\-e, \-\-exact\fR
@@ -213,7 +214,7 @@ Prints a short summary of all available command\-line options\&.
 This option is only available if the Ghostscript library is not directly linked to dvisvgm and PostScript support was not completely disabled during compilation\&. In this case, dvisvgm tries to load the shared GS library dynamically during runtime\&. By default, it expects the library\(cqs name to be libgs\&.so (on Unix\-like systems) or gsdll32\&.dll (Windows)\&. Option
 \fB\-\-libgs\fR
 can be used to give a different name\&. Alternatively, the GS library name can also be set by the environment variable
-\fBLIBGS\fR\&. The latter has less precedence than the command\-line option\&.
+LIBGS\&. The latter has less precedence than the command\-line option\&.
 .RE
 .PP
 \fB\-l, \-\-list\-specials\fR
@@ -681,7 +682,8 @@ does not try to implement its own PostScript interpreter but relies on Ghostscri
 \fIlibgs\&.so\fR
 on Unix\-like systems, and for
 \fIgsdll32\&.dll\fR
-on Windows\&. You can override these default file names with the environment variable LIBGS\&. The library must be installed and must be reachable through the ld search path (*nix) or the PATH environment variable (Windows)\&. If it cannot be found, the evaluation of PostScript specials is disabled\&. Use option
+on Windows\&. You can override these default file names with the environment variable
+LIBGS\&. The library must be installed and must be reachable through the ld search path (*nix) or the PATH environment variable (Windows)\&. If it cannot be found, the evaluation of PostScript specials is disabled\&. Use option
 \fB\-\-list\-specials\fR
 to check whether PS support is available, i\&.e\&. the entry
 \fIps\fR
@@ -747,7 +749,81 @@ Converts first page of \fIfile\&.dvi\fR to \fIfile\&.svg\fR where three transfor
 .sp
 If dvisvgm was linked without the Ghostscript library, and if PostScript support has not been disabled, the shared Ghostscript library is looked up during runtime\&. The environment variable LIBGS can be used to specify path and file name of the library\&.
 .sp
-The pre\-compiled Windows version of \fBdvisvgm\fR requires a working installation of MiKTeX 2\&.7 or above\&. To enable evaluation of PostScript specials, the original Ghostscript DLL must be present and reachable through the search path\&.
+The pre\-compiled Windows version of \fBdvisvgm\fR requires a working installation of MiKTeX 2\&.9 or above\&. To enable evaluation of PostScript specials, the original Ghostscript DLL must be present and reachable through the search path\&.
+.sp
+The environment variable DVISVGM_COLORS specifies the colors used to highlight various parts of dvisvgm\(cqs message output\&. It is only evaluated if option \fB\-\-color\fR is given\&. The value of DVISVGM_COLORS is a list of colon\-separated entries of the form \fIgg\fR=\fIBF\fR, where \fIgg\fR denotes one of the color group indicators listed below, and \fIBF\fR are two hexadecimal digits specifying the background (first digit) and foreground/text color (second digit)\&. The color color values are defined as follows: 0=black, 1=red, 2=green, 3=yellow, 4=blue, 5=magenta, 6=cyan, 7:gray, 8=bright red, 9=bright green, A=bright yellow, B=bright blue, C=bright magenta, D=bright cyan, E=bright gray, F=white\&. Depending on the terminal, the colors may differ\&. Rather than changing always both the text and background color, it\(cqs also possible to change only one of them: An asterisk (*) in place of a hexadecimal digit indicates the default text or background color of the terminal\&.
+.sp
+All malformed entries in the list are silently ignored\&.
+.TS
+tab(:);
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt.
+T{
+.sp
+\fBer\fR
+T}:T{
+.sp
+error messages
+T}
+T{
+.sp
+\fBwn\fR
+T}:T{
+.sp
+warning messages
+T}
+T{
+.sp
+\fBpn\fR
+T}:T{
+.sp
+messages about page numbers
+T}
+T{
+.sp
+\fBps\fR
+T}:T{
+.sp
+page size messages
+T}
+T{
+.sp
+\fBfw\fR
+T}:T{
+.sp
+information about the files written
+T}
+T{
+.sp
+\fBsm\fR
+T}:T{
+.sp
+state messages
+T}
+T{
+.sp
+\fBtr\fR
+T}:T{
+.sp
+messages of the glyph tracer
+T}
+T{
+.sp
+\fBpi\fR
+T}:T{
+.sp
+progress indicator
+T}
+.TE
+.sp 1
+.sp
+\fBExample:\fR er=01:pi=*5 sets the colors of error messages (er) to red (1) on black (0), and those of progress indicators (pi) to cyan (5) on default background (*)\&.
 .SH "FILES"
 .sp
 The location of the following files is determined by the kpathsea library\&. To check the actual kpathsea configuration you can use the \fBkpsewhich\fR utility\&.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/doc/dvisvgm.txt.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/doc/dvisvgm.txt.in
index 2c804069190..a11afb1470b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/doc/dvisvgm.txt.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/doc/dvisvgm.txt.in
@@ -132,7 +132,8 @@ Additionally, outdated and corrupted cache files are removed.
 
 
 *--color*::
-Enables colorization of messages printed during the conversion process.
+Enables colorization of messages printed during the conversion process. The colors can be customized
+via the environment variable +DVISVGM_COLORS+. See ENVIRONMENT section below for further information.
 
 
 *-e, --exact*::
@@ -154,7 +155,7 @@ This option is only available if the Ghostscript library is not directly linked
 PostScript support was not completely disabled during compilation. In this case, dvisvgm tries
 to load the shared GS library dynamically during runtime. By default, it expects the library's name
 to be libgs.so (on Unix-like systems) or gsdll32.dll (Windows). Option *--libgs* can be used to give
-a different name. Alternatively, the GS library name can also be set by the environment variable *LIBGS*.
+a different name. Alternatively, the GS library name can also be set by the environment variable +LIBGS+.
 The latter has less precedence than the command-line option.
 
 
@@ -453,7 +454,7 @@ the relative locations of the graphic elements may slightly differ from those co
 Since PostScript is a rather complex language, *dvisvgm* does not try to implement its own PostScript interpreter but relies on
 Ghostscript instead. If the Ghostscript library was not linked while building dvisvgm, it is looked up and dynamically loaded
 during runtime. In this case, dvisvgm looks for 'libgs.so' on Unix-like systems, and for 'gsdll32.dll' on Windows.
-You can override these default file names with the environment variable LIBGS.
+You can override these default file names with the environment variable +LIBGS+.
 The library must be installed and must be reachable through the ld search path (\*nix) or the PATH environment
 variable (Windows). If it cannot be found, the evaluation of PostScript specials is disabled.
 Use option *--list-specials* to check whether PS support is available, i.e. the entry 'ps' is present.
@@ -493,13 +494,38 @@ ENVIRONMENT
 Hence, the environment variables described in the library's documentation influence the converter.
 
 If dvisvgm was linked without the Ghostscript library, and if PostScript support has not been disabled,
-the shared Ghostscript library is looked up during runtime. The environment variable LIBGS can be
+the shared Ghostscript library is looked up during runtime. The environment variable +LIBGS+ can be
 used to specify path and file name of the library.
 
-The pre-compiled Windows version of *dvisvgm* requires a working installation of MiKTeX 2.7 or above.
+The pre-compiled Windows version of *dvisvgm* requires a working installation of MiKTeX 2.9 or above.
 To enable evaluation of PostScript specials, the original Ghostscript DLL must be present and reachable
 through the search path.
 
+The environment variable +DVISVGM_COLORS+ specifies the colors used to highlight various parts of dvisvgm's
+message output. It is only evaluated if option *--color* is given. The value of +DVISVGM_COLORS+ is a list of
+colon-separated entries of the form 'gg'='BF', where 'gg' denotes one of the color group indicators listed
+below, and 'BF' are two hexadecimal digits specifying the background (first digit) and foreground/text color
+(second digit). The color color values are defined as follows: 0=black, 1=red, 2=green, 3=yellow, 4=blue,
+5=magenta, 6=cyan, 7:gray, 8=bright red, 9=bright green, A=bright yellow, B=bright blue, C=bright magenta,
+D=bright cyan, E=bright gray, F=white. Depending on the terminal, the colors may differ. Rather than changing
+always both the text and background color, it's also possible to change only one of them: An asterisk (*) in
+place of a hexadecimal digit indicates the default text or background color of the terminal.
+
+All malformed entries in the list are silently ignored.
+
+[horizontal]
+*er*:: error messages
+*wn*:: warning messages
+*pn*:: messages about page numbers
+*ps*:: page size messages
+*fw*:: information about the files written
+*sm*:: state messages
+*tr*:: messages of the glyph tracer
+*pi*:: progress indicator
+
+*Example:* +er=01:pi=\*5+ sets the colors of error messages (+er+) to red (+1+) on black (+0+), and those
+of progress indicators (+pi+) to cyan (+5+) on default background (+*+).
+
 FILES
 -----
 The location of the following files is determined by the kpathsea library.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/Makefile.am
index 97bf78f50f4..97bf78f50f4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/Makefile.in
index e7ca5bae59e..e7ca5bae59e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/auxiliary.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/auxiliary.h
index fbd1db4c166..fbd1db4c166 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/auxiliary.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/auxiliary.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/bitmap.h
index 2df04b46fbe..2df04b46fbe 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/curve.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/curve.c
index 414fb5de9ee..414fb5de9ee 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/curve.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/curve.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/curve.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/curve.h
index e98efdf5cfd..e98efdf5cfd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/curve.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/curve.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/decompose.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/decompose.c
index 376af015df3..376af015df3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/decompose.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/decompose.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/decompose.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/decompose.h
index 89b01e5045c..89b01e5045c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/decompose.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/decompose.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/lists.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/lists.h
index 078129afce5..078129afce5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/lists.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/lists.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/potracelib.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/potracelib.c
index c483ea335b9..c483ea335b9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/potracelib.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/potracelib.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/potracelib.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/potracelib.h
index 99e17e424ae..99e17e424ae 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/potracelib.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/potracelib.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/progress.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/progress.h
index 93a1fa3f04c..93a1fa3f04c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/progress.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/progress.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/trace.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/trace.c
index f1e88a90862..f1e88a90862 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/trace.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/trace.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/trace.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/trace.h
index dc2b9247adb..dc2b9247adb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/potracelib/trace.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/potracelib/trace.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/BgColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/BgColorSpecialHandler.cpp
index 979d76bdd0f..979d76bdd0f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/BgColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/BgColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/BgColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/BgColorSpecialHandler.h
index d3b0a75ccca..d3b0a75ccca 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/BgColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/BgColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Bitmap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Bitmap.cpp
index 4c2a0510bc8..4c2a0510bc8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Bitmap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Bitmap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Bitmap.h
index a9a6be61b2a..a9a6be61b2a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/BoundingBox.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/BoundingBox.cpp
index c5ab55e27a9..c5ab55e27a9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/BoundingBox.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/BoundingBox.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/BoundingBox.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/BoundingBox.h
index 952fbdfd3af..952fbdfd3af 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/BoundingBox.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/BoundingBox.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/CRC32.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/CRC32.cpp
index 339375a6b06..339375a6b06 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/CRC32.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/CRC32.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/CRC32.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/CRC32.h
index 4dd323ad3df..4dd323ad3df 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/CRC32.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/CRC32.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Calculator.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Calculator.cpp
index 33502d6cec2..33502d6cec2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Calculator.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Calculator.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Calculator.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Calculator.h
index ce4f6698b20..ce4f6698b20 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Calculator.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Calculator.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/CmdLineParserBase.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/CmdLineParserBase.cpp
index 6c18f221ad3..6c18f221ad3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/CmdLineParserBase.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/CmdLineParserBase.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/CmdLineParserBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/CmdLineParserBase.h
index 1be54e022a5..1be54e022a5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/CmdLineParserBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/CmdLineParserBase.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Color.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Color.cpp
index 630c3798cda..630c3798cda 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Color.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Color.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Color.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Color.h
index d1d8ce3f6cc..d1d8ce3f6cc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Color.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Color.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/ColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/ColorSpecialHandler.cpp
index 2dfbb5fc606..2dfbb5fc606 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/ColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/ColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/ColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/ColorSpecialHandler.h
index 0e098631354..0e098631354 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/ColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/ColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/CommandLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/CommandLine.cpp
index ccba1e74f08..ccba1e74f08 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/CommandLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/CommandLine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/CommandLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/CommandLine.h
index 5d1eb7bd078..5d1eb7bd078 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/CommandLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/CommandLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DLLoader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DLLoader.cpp
index 8d6c48c4c85..8d6c48c4c85 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DLLoader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DLLoader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DLLoader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DLLoader.h
index c68533e3486..c68533e3486 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DLLoader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DLLoader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DVIActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DVIActions.cpp
index 355a59efaba..355a59efaba 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DVIActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DVIActions.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DVIActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DVIActions.h
index 42ae3330b07..42ae3330b07 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DVIActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DVIActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DVIReader.cpp
index b4ba8bc00d6..b4ba8bc00d6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DVIReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DVIReader.h
index 524310457f8..524310457f8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DVIReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DVIToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DVIToSVG.cpp
index 89ce9eb60e0..34f4efcc49d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DVIToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DVIToSVG.cpp
@@ -146,7 +146,7 @@ void DVIToSVG::convert (unsigned first, unsigned last, pair<int,int> *pageinfo)
 		embedFonts(_svg.rootNode());
 		_svg.write(_out.getPageStream(getCurrentPageNumber(), getTotalPages()));
 		string fname = _out.filename(i, getTotalPages());
-		Message::mstream(false, Terminal::GREEN) << "\npage written to " << (fname.empty() ? "<stdout>" : fname) << '\n';
+		Message::mstream(false, Message::MC_PAGE_WRITTEN) << "\npage written to " << (fname.empty() ? "<stdout>" : fname) << '\n';
 		_svg.reset();
 		static_cast<DVIToSVGActions*>(getActions())->reset();
 	}
@@ -183,7 +183,7 @@ void DVIToSVG::convert (const string &rangestr, pair<int,int> *pageinfo) {
 void DVIToSVG::beginPage (unsigned n, Int32 *c) {
 	if (dynamic_cast<DVIToSVGActions*>(getActions())) {
 		Message::mstream().indent(0);
-		Message::mstream(false, Terminal::BLUE, true) << "processing page " << n << " [" << c[0] << ']';
+		Message::mstream(false, Message::MC_PAGE_NUMBER) << "processing page " << n << " [" << c[0] << ']';
 		Message::mstream().indent(1);
 		_svg.appendToDoc(new XMLCommentNode(" This file was generated by dvisvgm "VERSION_STR" "));
 		_svg.appendToDoc(new XMLCommentNode(" " + datetime() + " "));
@@ -245,14 +245,16 @@ void DVIToSVG::endPage () {
 	}
 	if (_bboxString != "none") {
 		if (bbox.width() == 0)
-			Message::mstream(false, Terminal::YELLOW) << "\npage is empty\n";
+			Message::wstream(false) << "\npage is empty\n";
 		else {
 			_svg.setBBox(bbox);
 
-			Message::mstream(false, Terminal::MAGENTA) << "\npage size: " << bbox.width() << "pt"
+			Message::mstream(false) << '\n';
+			Message::mstream(false, Message::MC_PAGE_SIZE) << "page size: " << bbox.width() << "pt"
 				" x " << bbox.height() << "pt"
 				" (" << bbox.width()/72.27*25.4 << "mm"
-				" x " << bbox.height()/72.27*25.4 << "mm)\n";
+				" x " << bbox.height()/72.27*25.4 << "mm)";
+			Message::mstream(false) << '\n';
 		}
 	}
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DVIToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DVIToSVG.h
index 0e5fa7da7d8..0e5fa7da7d8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DVIToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DVIToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DVIToSVGActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DVIToSVGActions.cpp
index 18ccdc23a44..0a55195cd3b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DVIToSVGActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DVIToSVGActions.cpp
@@ -328,7 +328,7 @@ void DVIToSVGActions::progress (size_t current, size_t total, const char *id) {
 		int width = (cols == 0 || cols > 60) ? 50 : 49-60+cols;
 		double factor = double(current)/double(total);
 		int length = int(width*factor);
-		Message::mstream(false, Terminal::MAGENTA)
+		Message::mstream(false, Message::MC_PROGRESS)
 			<< '[' << string(length, '=')
 			<< (factor < 1.0 ? (step < 0 ? ' ' : tips[step]) : '=')
 			<< string(width-length, ' ')
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DVIToSVGActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DVIToSVGActions.h
index bc103952f30..bc103952f30 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DVIToSVGActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DVIToSVGActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Directory.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Directory.cpp
index 86a8b446ceb..86a8b446ceb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Directory.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Directory.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Directory.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Directory.h
index f877b05a807..f877b05a807 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Directory.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Directory.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DvisvgmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DvisvgmSpecialHandler.cpp
index 2e44169362a..2e44169362a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DvisvgmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DvisvgmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DvisvgmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DvisvgmSpecialHandler.h
index 1d15f864cf4..1d15f864cf4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/DvisvgmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/DvisvgmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/EmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/EmSpecialHandler.cpp
index 5fa5346b4ca..5fa5346b4ca 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/EmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/EmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/EmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/EmSpecialHandler.h
index 090d775b71d..090d775b71d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/EmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/EmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FileFinder.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FileFinder.cpp
index 457a9a88df1..457a9a88df1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FileFinder.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FileFinder.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FileFinder.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FileFinder.h
index 6dcdf335e1c..6dcdf335e1c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FileFinder.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FileFinder.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FilePath.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FilePath.cpp
index 3875fdc21b8..3875fdc21b8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FilePath.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FilePath.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FilePath.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FilePath.h
index 4702cb8d969..4702cb8d969 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FilePath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FilePath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FileSystem.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FileSystem.cpp
index f53b84b42b4..f53b84b42b4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FileSystem.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FileSystem.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FileSystem.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FileSystem.h
index b53b42b09a8..b53b42b09a8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FileSystem.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FileSystem.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Font.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Font.cpp
index ac0cd0cf60f..ac0cd0cf60f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Font.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Font.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Font.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Font.h
index adddcb98458..adddcb98458 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Font.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Font.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontCache.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontCache.cpp
index c4ca8ad1fbf..c4ca8ad1fbf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontCache.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontCache.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontCache.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontCache.h
index 5ab7b885210..5ab7b885210 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontCache.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontCache.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontEncoding.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontEncoding.cpp
index e02e859933d..e02e859933d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontEncoding.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontEncoding.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontEncoding.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontEncoding.h
index 6766611f64f..6766611f64f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontEncoding.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontEncoding.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontEngine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontEngine.cpp
index 991813fc1a5..991813fc1a5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontEngine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontEngine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontEngine.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontEngine.h
index 678bc43c180..678bc43c180 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontEngine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontEngine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontManager.cpp
index 8f6958cdb42..8f6958cdb42 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontManager.h
index 14f6d2aae71..14f6d2aae71 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontMap.cpp
index 01075d91309..803cebb9dad 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontMap.cpp
@@ -164,13 +164,10 @@ static FontMapFieldType read_entry (char* &first, char* &last, bool name_only) {
 			return FM_PS_CODE;
 		}
 		else if (*first == '<') {
-			bool eval_prefix = true;
 			FontMapFieldType type=FM_HEADER;
 			first++;
-			if (isspace(*first)) {
+			if (isspace(*first))
 				first++;
-				eval_prefix = false;
-			}
 			else if (*first == '<' || *first == '[') {
 				type = (*first == '<') ? FM_FONT : FM_ENC;
 				first++;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontMap.h
index ec2c69af0f6..ec2c69af0f6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/FontMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/FontMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/GFGlyphTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/GFGlyphTracer.cpp
index 9dbb4b5fa71..9dbb4b5fa71 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/GFGlyphTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/GFGlyphTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/GFGlyphTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/GFGlyphTracer.h
index 14a927fcef9..14a927fcef9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/GFGlyphTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/GFGlyphTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/GFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/GFReader.cpp
index b47c175f048..b47c175f048 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/GFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/GFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/GFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/GFReader.h
index cbc9fec3e77..cbc9fec3e77 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/GFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/GFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/GFTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/GFTracer.cpp
index 981d45dda10..981d45dda10 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/GFTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/GFTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/GFTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/GFTracer.h
index 6d6a4351a05..6d6a4351a05 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/GFTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/GFTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Ghostscript.cpp
index d7534b045ce..d7534b045ce 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Ghostscript.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Ghostscript.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Ghostscript.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Ghostscript.h
index ab9bb000841..ab9bb000841 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Ghostscript.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Ghostscript.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Glyph.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Glyph.h
index 5866f23737b..5866f23737b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Glyph.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Glyph.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/GlyphTracerMessages.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/GlyphTracerMessages.h
index 4f99a2db2a9..909d0db6979 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/GlyphTracerMessages.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/GlyphTracerMessages.h
@@ -44,14 +44,14 @@ class GlyphTracerMessages : public GFGlyphTracer::Callback
 			else
 				oss << '#' << unsigned(c);
 			oss << ']';
-			Message::mstream(false, Terminal::BLUE) << oss.str();
+			Message::mstream(false, Message::MC_TRACING) << oss.str();
 		}
 
 		void setFont (const std::string &fname) {
 			if (_sfmsg && fname != _fname) {
 				if (!_fname.empty())
 					Message::mstream() << '\n';
-				Message::mstream(false, Terminal::CYAN) << "tracing glyphs of " << fname.substr(0, fname.length()-3) << '\n';
+				Message::mstream(false, Message::MC_STATE) << "tracing glyphs of " << fname.substr(0, fname.length()-3) << '\n';
 				_fname = fname;
 			}
 		}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/GraphicPath.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/GraphicPath.h
index bcebc040f38..d496cf1bfa3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/GraphicPath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/GraphicPath.h
@@ -105,6 +105,8 @@ class GraphicPath
 			return _commands.empty();
 		}
 
+
+		/// Returns the number of path commands used to describe the path.
 		size_t size () const {
 			return _commands.size();
 		}
@@ -175,6 +177,12 @@ class GraphicPath
 		}
 
 
+		/** Writes the path data as SVG path drawing command to a given output stream. 
+		 *  @param[in] os output stream used to write the SVG commands to 
+		 *  @param[in] sx horizontal scale factor
+		 *  @param[in] sy vertical scale factor 
+		 *  @param[in] dx horizontal translation in TeX point units
+		 *  @param[in] sy vertical translation in TeX point units */
 		void writeSVG (std::ostream &os, double sx=1.0, double sy=1.0, double dx=0.0, double dy=0.0) const {
 			struct WriteActions : Actions {
 				WriteActions (std::ostream &os, double sx, double sy, double dx, double dy)
@@ -200,6 +208,8 @@ class GraphicPath
 		}
 
 
+		/** Computes the bounding box of the current path.
+		 *  @param[out] bbox the computed bounding box */
 		void computeBBox (BoundingBox &bbox) const {
 			struct BBoxActions : Actions {
 				BBoxActions (BoundingBox &bb) : bbox(bb) {}
@@ -212,6 +222,10 @@ class GraphicPath
 			iterate(actions, false);
 		}
 
+
+		/** Checks whether the current path describes a dot/point only (with no extent). 
+		 *  @param[out] p coordinates of the point if path describes a dot
+		 *  @return true if path is a dot/point */
 		bool isDot (Point &p) const {
 			struct DotActions : Actions {
 				DotActions () : differs(false) {}
@@ -228,6 +242,9 @@ class GraphicPath
 			return !actions.differs;
 		}
 
+
+		/** Transforms the path according to a given Matrix. 
+		 *  @param[in] matrix Matrix describing the affine transformation */
 		void transform (const Matrix &matrix) {
 			FORALL(_commands, Iterator, it)
 				it->transform(matrix);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/InputBuffer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/InputBuffer.cpp
index f5e7125f80b..f5e7125f80b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/InputBuffer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/InputBuffer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/InputBuffer.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/InputBuffer.h
index 910f66429e9..910f66429e9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/InputBuffer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/InputBuffer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/InputReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/InputReader.cpp
index 76652da26a8..76652da26a8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/InputReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/InputReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/InputReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/InputReader.h
index 0e3d23f5eb0..0e3d23f5eb0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/InputReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/InputReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Length.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Length.cpp
index 7ae102df7c5..7ae102df7c5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Length.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Length.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Length.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Length.h
index c062af5b256..c062af5b256 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Length.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Length.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Makefile.am
index ce57433d0be..ce57433d0be 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Makefile.in
index 95f21b43ab4..95f21b43ab4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Makefile.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Matrix.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Matrix.cpp
index 0e3dbc93024..0e3dbc93024 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Matrix.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Matrix.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Matrix.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Matrix.h
index 5c3b7442081..5c3b7442081 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Matrix.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Matrix.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Message.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Message.cpp
index 52cb6da56d0..8ce0d3db236 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Message.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Message.cpp
@@ -19,14 +19,19 @@
 *************************************************************************/
 
 #include <cstdarg>
+#include <cstdlib>
 #include <cstring>
 #include <iostream>
+#include <map>
 #include "Message.h"
 #include "Terminal.h"
-#include "macros.h"
 
 using namespace std;
 
+MessageStream::MessageStream () : _os(0), _nl(false) {
+}
+
+
 MessageStream::MessageStream (std::ostream &os)
 	: _os(&os), _nl(true), _col(1), _indent(0)
 {
@@ -122,16 +127,24 @@ void MessageStream::clearline () {
 static MessageStream nullStream;
 static MessageStream messageStream(cerr);
 
+
+//////////////////////////////
+
 // maximal verbosity
 int Message::LEVEL = Message::MESSAGES | Message::WARNINGS | Message::ERRORS;
 bool Message::COLORIZE = false;
+bool Message::_initialized = false;
+Message::Color Message::_classColors[9];
 
 
 /** Returns the stream for usual messages. */
-MessageStream& Message::mstream (bool prefix, int color, bool light) {
+MessageStream& Message::mstream (bool prefix, MessageClass mclass) {
+	init();
 	MessageStream *ms = (LEVEL & MESSAGES) ? &messageStream : &nullStream;
-	if (COLORIZE && ms && ms->os())
-		Terminal::color(color, light, *ms->os());
+	if (COLORIZE && ms && ms->os()) {
+		Terminal::fgcolor(_classColors[mclass].foreground, *ms->os());
+		Terminal::bgcolor(_classColors[mclass].background, *ms->os());
+	}
 	if (prefix)
 		*ms << "\nMESSAGE: ";
 	return *ms;
@@ -140,9 +153,12 @@ MessageStream& Message::mstream (bool prefix, int color, bool light) {
 
 /** Returns the stream for warning messages. */
 MessageStream& Message::wstream (bool prefix) {
+	init();
 	MessageStream *ms = (LEVEL & WARNINGS) ? &messageStream : &nullStream;
-	if (COLORIZE && ms && ms->os())
-		Terminal::color(Terminal::YELLOW, false, *ms->os());
+	if (COLORIZE && ms && ms->os()) {
+		Terminal::fgcolor(_classColors[MC_WARNING].foreground, *ms->os());
+		Terminal::bgcolor(_classColors[MC_WARNING].background, *ms->os());
+	}
 	if (prefix)
 		*ms << "\nWARNING: ";
 	return *ms;
@@ -151,11 +167,93 @@ MessageStream& Message::wstream (bool prefix) {
 
 /** Returns the stream for error messages. */
 MessageStream& Message::estream (bool prefix) {
+	init();
 	MessageStream *ms = (LEVEL & ERRORS) ? &messageStream : &nullStream;
-	if (COLORIZE && ms && ms->os())
-		Terminal::color(Terminal::RED, true, *ms->os());
+	if (COLORIZE && ms && ms->os()) {
+		Terminal::fgcolor(_classColors[MC_ERROR].foreground, *ms->os());
+		Terminal::bgcolor(_classColors[MC_ERROR].background, *ms->os());
+	}
 	if (prefix)
 		*ms << "\nERROR: ";
 	return *ms;
 }
 
+
+static bool colorchar2int (char colorchar, int *val) {
+	colorchar = tolower(colorchar);
+	if (colorchar >= '0' && colorchar <= '9')
+		*val = int(colorchar-'0');
+	else if (colorchar >= 'a' && colorchar <= 'f')
+		*val = int(colorchar-'a'+10);
+	else if (colorchar == '*')
+		*val = -1;
+	else
+		return false;
+	return true;
+}
+
+
+/** Initializes the Message class. Sets the colors for each message set.
+ *  The colors can be changed via environment variable DVISVGM_COLORS. Its
+ *  value must be a sequence of color entries of the form gg:BF where the
+ *  two-letter ID gg specifies a message set, B the hex digit of the
+ *  background, and F the hex digit of the foreground/text color.
+ *  Color codes:
+ *  - 1: red, 2: green, 4: blue
+ *  - 0-7: dark colors
+ *  - 8-F: light colors
+ *  - *: default color
+ *  Example: num:01 sets page number messages to red on black background */
+void Message::init () {
+	if (_initialized || !Message::COLORIZE)
+		return;
+
+	// set default message colors
+	_classColors[MC_ERROR]        = Color(Terminal::RED, true);
+	_classColors[MC_WARNING]      = Color(Terminal::YELLOW);
+	_classColors[MC_PAGE_NUMBER]  = Color(Terminal::BLUE, true);
+	_classColors[MC_PAGE_SIZE]    = Color(Terminal::MAGENTA);
+	_classColors[MC_PAGE_WRITTEN] = Color(Terminal::GREEN);
+	_classColors[MC_STATE]        = Color(Terminal::CYAN);
+	_classColors[MC_TRACING]      = Color(Terminal::BLUE);
+	_classColors[MC_PROGRESS]     = Color(Terminal::MAGENTA);
+
+	if (const char *color_str = getenv("DVISVGM_COLORS")) {
+		map<string, MessageClass> classes;
+		classes["er"] = MC_ERROR;
+		classes["wn"] = MC_WARNING;
+		classes["pn"] = MC_PAGE_NUMBER;
+		classes["ps"] = MC_PAGE_SIZE;
+		classes["fw"] = MC_PAGE_WRITTEN;
+		classes["sm"] = MC_STATE;
+		classes["tr"] = MC_TRACING;
+		classes["pi"] = MC_PROGRESS;
+		const char *p=color_str;
+
+		// skip leading whitespace
+		while (isspace(*p))
+			++p;
+
+		// iterate over color assignments
+		while (strlen(p) >= 5) {
+			map<string, MessageClass>::iterator it = classes.find(string(p, 2));
+			if (it != classes.end() && p[2] == '=') {
+				int bgcolor, fgcolor;
+				if (colorchar2int(p[3], &bgcolor) && colorchar2int(p[4], &fgcolor)) {
+					_classColors[it->second].background = bgcolor;
+					_classColors[it->second].foreground = fgcolor;
+				}
+			}
+			p += 5;
+
+			// skip trailing characters in a malformed entry
+			while (!isspace(*p) && *p != ':' && *p != ';')
+				++p;
+			// skip separation characters
+			while (isspace(*p) || *p == ':' || *p == ';')
+				++p;
+		}
+	}
+	_initialized = true;
+}
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Message.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Message.h
index a69b414c727..cb6ff92a2d8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Message.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Message.h
@@ -26,6 +26,7 @@
 #include <ostream>
 #include <sstream>
 #include "Terminal.h"
+#include "types.h"
 
 
 class Message;
@@ -33,8 +34,9 @@ class Message;
 class MessageStream
 {
 	friend class Message;
+
 	public:
-		MessageStream () : _os(0), _nl(false) {}
+		MessageStream ();
 		MessageStream (std::ostream &os);
 		~MessageStream ();
 
@@ -67,15 +69,46 @@ class MessageStream
 };
 
 
-struct Message
+class Message
 {
-	static MessageStream& mstream (bool prefix=false, int color=Terminal::DEFAULT, bool light=false);
-	static MessageStream& estream (bool prefix=false);
-	static MessageStream& wstream (bool prefix=false);
+	struct Color {
+		Color () : foreground(-1), background(-1) {}
+		Color (Int8 fgcolor) : foreground(fgcolor), background(-1) {}
+		Color (Int8 fgcolor, bool light) : foreground(fgcolor + (light ? 8 : 0)), background(-1) {}
+		Color (Int8 fgcolor, Int8 bgcolor) : foreground(fgcolor), background(bgcolor) {}
+		Int8 foreground;
+		Int8 background;
+	};
+
+	public:
+		enum MessageClass {
+			MC_ERROR,
+			MC_WARNING,
+			MC_MESSAGE,
+			MC_PAGE_NUMBER,
+			MC_PAGE_SIZE,
+			MC_PAGE_WRITTEN,
+			MC_STATE,
+			MC_TRACING,
+			MC_PROGRESS,
+		};
+
+	public:
+		static MessageStream& mstream (bool prefix=false, MessageClass mclass=MC_MESSAGE);
+		static MessageStream& estream (bool prefix=false);
+		static MessageStream& wstream (bool prefix=false);
 
-	enum {ERRORS=1, WARNINGS=2, MESSAGES=4};
-	static int LEVEL;
-	static bool COLORIZE;
+		enum {ERRORS=1, WARNINGS=2, MESSAGES=4};
+		static int LEVEL;
+		static bool COLORIZE;
+
+	protected:
+		static void init ();
+
+
+	private:
+		static Color _classColors[];
+		static bool _initialized;
 };
 
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/MessageException.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/MessageException.h
index 338c9daac9f..338c9daac9f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/MessageException.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/MessageException.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/MetafontWrapper.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/MetafontWrapper.cpp
index 9f9394ff535..fe41a5b34d1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/MetafontWrapper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/MetafontWrapper.cpp
@@ -68,7 +68,7 @@ bool MetafontWrapper::call (const string &mode, double mag) {
 		   "mag:=" << mag << ";"
 		   "batchmode;"
 		   "input " << _fontname << "\"";
-	Message::mstream(false, Terminal::CYAN) << "\nrunning Metafont for " << _fontname << '\n';
+	Message::mstream(false, Message::MC_STATE) << "\nrunning Metafont for " << _fontname << '\n';
 	Process mf_process(cmd, oss.str().c_str());
 	mf_process.run();
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/MetafontWrapper.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/MetafontWrapper.h
index c042fef3c89..c042fef3c89 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/MetafontWrapper.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/MetafontWrapper.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/PSInterpreter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/PSInterpreter.cpp
index 1f741cb212b..1f741cb212b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/PSInterpreter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/PSInterpreter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/PSInterpreter.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/PSInterpreter.h
index c33ad43a237..c33ad43a237 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/PSInterpreter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/PSInterpreter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/PageRanges.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/PageRanges.cpp
index 9c985972b72..9c985972b72 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/PageRanges.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/PageRanges.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/PageRanges.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/PageRanges.h
index f15641b9f70..f15641b9f70 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/PageRanges.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/PageRanges.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/PageSize.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/PageSize.cpp
index 88990136285..88990136285 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/PageSize.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/PageSize.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/PageSize.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/PageSize.h
index c2ca163e051..c2ca163e051 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/PageSize.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/PageSize.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Pair.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Pair.h
index 9e6d1f0d0d1..9e6d1f0d0d1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Pair.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Pair.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Process.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Process.cpp
index 7ad4874f3d5..7ad4874f3d5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Process.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Process.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Process.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Process.h
index 2b9e79e43ce..2b9e79e43ce 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Process.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Process.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/PsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/PsSpecialHandler.cpp
index 98dab7909a1..98dab7909a1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/PsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/PsSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/PsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/PsSpecialHandler.h
index 39898926812..39898926812 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/PsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/PsSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/SVGTree.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/SVGTree.cpp
index 07cdca2a4b9..25f6034a0c8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/SVGTree.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/SVGTree.cpp
@@ -87,6 +87,7 @@ void SVGTree::appendToDefs (XMLNode *node) {
 	_defs->append(node);
 }
 
+
 /** Appends a single charater to the current text node. If necessary, and depending on output mode
  *  and further output states, new XML elements (text, tspan, g, ...) are created.
  *  @param[in] c character to be added
@@ -150,7 +151,7 @@ void SVGTree::appendChar (int c, double x, double y, const Font &font) {
 			node = _page;
 		if (CREATE_USE_ELEMENTS) {
 			ostringstream oss;
-			oss << "#g" << FontManager::instance().fontID(_font) << c;
+			oss << "#g" << FontManager::instance().fontID(_font) << '-' << c;
 			XMLElementNode *use = new XMLElementNode("use");
 			use->addAttribute("x", XMLString(x));
 			use->addAttribute("y", XMLString(y));
@@ -234,7 +235,7 @@ static XMLElementNode* createGlyphNode (int c, const PhysicalFont &font, GFGlyph
 	}
 	else {
 		ostringstream oss;
-		oss << 'g' << FontManager::instance().fontID(&font) << c;
+		oss << 'g' << FontManager::instance().fontID(&font) << '-' << c;
 		glyph_node = new XMLElementNode("path");
 		glyph_node->addAttribute("id", oss.str());
 		sx = font.scaledSize()/upem;
@@ -260,7 +261,7 @@ void SVGTree::appendFontStyles (const set<const Font*> &fonts) {
 		ostringstream style;
 		// add font style definitions in ascending order
 		FORALL(sortmap, SortMap::const_iterator, it) {
-			style << "text.f"        << it->first << ' '
+			style << "text.f"     << it->first << ' '
 				<< "{font-family:" << it->second->name()
 				<< ";font-size:"   << it->second->scaledSize() << "}\n";
 		}
@@ -308,10 +309,10 @@ void SVGTree::append (const PhysicalFont &font, const set<int> &chars, GFGlyphTr
 		FORALL(chars, set<int>::const_iterator, it) {
 			ostringstream oss;
 			XMLElementNode *use = new XMLElementNode("use");
-			oss << 'g' << FontManager::instance().fontID(&font) << *it;
+			oss << 'g' << FontManager::instance().fontID(&font) << '-' << *it;
 			use->addAttribute("id", oss.str());
 			oss.str("");
-			oss << "#g" << FontManager::instance().fontID(font.uniqueFont()) << *it;
+			oss << "#g" << FontManager::instance().fontID(font.uniqueFont()) << '-' << *it;
 			use->addAttribute("xlink:href", oss.str());
 			double scale = font.scaledSize()/font.uniqueFont()->scaledSize();
 			if (scale != 1.0) {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/SVGTree.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/SVGTree.h
index a9659f72b37..a9659f72b37 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/SVGTree.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/SVGTree.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/SignalHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/SignalHandler.cpp
index 2f2b9817e81..2f2b9817e81 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/SignalHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/SignalHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/SignalHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/SignalHandler.h
index 70d2abd8ee8..70d2abd8ee8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/SignalHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/SignalHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/SpecialActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/SpecialActions.h
index 936ca866809..936ca866809 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/SpecialActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/SpecialActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/SpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/SpecialHandler.h
index 45c4905ddb5..45c4905ddb5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/SpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/SpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/SpecialManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/SpecialManager.cpp
index 7698726de7c..7698726de7c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/SpecialManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/SpecialManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/SpecialManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/SpecialManager.h
index 555af4380ec..555af4380ec 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/SpecialManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/SpecialManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/StreamReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/StreamReader.cpp
index 65c7149f780..65c7149f780 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/StreamReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/StreamReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/StreamReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/StreamReader.h
index 6fbd94e00de..6fbd94e00de 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/StreamReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/StreamReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/StreamWriter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/StreamWriter.cpp
index 2a1e7b4a34f..2a1e7b4a34f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/StreamWriter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/StreamWriter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/StreamWriter.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/StreamWriter.h
index 440bd94a2a9..440bd94a2a9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/StreamWriter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/StreamWriter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/System.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/System.cpp
index b57c0662462..b57c0662462 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/System.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/System.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/System.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/System.h
index 3485c27e6b5..3485c27e6b5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/System.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/System.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/TFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/TFM.cpp
index d56185d0086..d56185d0086 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/TFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/TFM.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/TFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/TFM.h
index 09accaea2c6..09accaea2c6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/TFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/TFM.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Terminal.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Terminal.cpp
index 0cbb4116796..479e24a7c1b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Terminal.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Terminal.cpp
@@ -42,16 +42,9 @@
 using namespace std;
 
 
-#ifdef __WIN32__
-int Terminal::_defaultColor;
-const int Terminal::RED     = FOREGROUND_RED;
-const int Terminal::GREEN   = FOREGROUND_GREEN;
-const int Terminal::BLUE    = FOREGROUND_BLUE;
-#else
 const int Terminal::RED     = 1;
 const int Terminal::GREEN   = 2;
 const int Terminal::BLUE    = 4;
-#endif
 
 const int Terminal::CYAN    = GREEN|BLUE;
 const int Terminal::YELLOW  = RED|GREEN;
@@ -60,8 +53,16 @@ const int Terminal::WHITE   = RED|GREEN|BLUE;
 const int Terminal::DEFAULT = -1;
 const int Terminal::BLACK   = 0;
 
+#ifdef __WIN32__
+int Terminal::_defaultColor;
+#endif
+
+int Terminal::_fgcolor = Terminal::DEFAULT;
+int Terminal::_bgcolor = Terminal::DEFAULT;
 
 
+/** Initializes the terminal. This method should be called before any of the others.
+ *  @param[in,out] os terminal output stream (currently unused) */
 void Terminal::init (ostream &os) {
 #ifdef __WIN32__
 	HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -74,8 +75,11 @@ void Terminal::init (ostream &os) {
 }
 
 
+/** Finishes the terminal output. Should be called after last terminal action.
+ *  @param[in,out] os terminal output stream */
 void Terminal::finish (ostream &os) {
-	color(DEFAULT, false, os);
+	fgcolor(DEFAULT, os);
+	bgcolor(DEFAULT, os);
 }
 
 
@@ -117,48 +121,70 @@ int Terminal::rows () {
 }
 
 
-void Terminal::color (int color, bool light, ostream &os) {
+/** Sets the foreground color.
+ *  @param[in] color color code
+ *  @param[in] os terminal output stream */
+void Terminal::fgcolor (int color, ostream &os) {
+	_fgcolor = color;
+
 #ifdef __WIN32__
 	HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE);
 	if (h != INVALID_HANDLE_VALUE) {
-		if (color == DEFAULT)
-			color = _defaultColor;
+		CONSOLE_SCREEN_BUFFER_INFO info;
+		GetConsoleScreenBufferInfo(h, &info);
+		if (_fgcolor == DEFAULT)
+			color = _defaultColor & 0x0f;
 		else {
-			CONSOLE_SCREEN_BUFFER_INFO info;
-			GetConsoleScreenBufferInfo(h, &info);
-			color = (info.wAttributes & 0xf0) | (color & 0x07);
-			if (light)
-				color |= FOREGROUND_INTENSITY;
+			// swap red and blue bits
+			color = (color & 0x0a) | ((color & 1) << 2) | ((color & 4) >> 2);
 		}
+		color = (info.wAttributes & 0xf0) | (color & 0x0f);
 		SetConsoleTextAttribute(h, (DWORD)color);
 	}
 #else
-	if (color == DEFAULT)
+	bool light = false;
+	if (color != DEFAULT && color > 7) {
+		light = true;
+		color %= 8;
+	}
+	if (color == DEFAULT) {
 		os << "\x1B[0m";
+		if (_bgcolor != DEFAULT)
+			bgcolor(_bgcolor, os);
+	}
 	else
 		os << "\x1B[" << (light ? '1': '0') << ';' << (30+(color & 0x07)) << 'm';
 #endif
 }
 
 
-void Terminal::bgcolor (int color, bool light, ostream &os) {
+/** Sets the background color.
+ *  @param[in] color color code
+ *  @param[in] os terminal output stream */
+void Terminal::bgcolor (int color, ostream &os) {
+	_bgcolor = color;
 #ifdef __WIN32__
 	HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE);
 	if (h != INVALID_HANDLE_VALUE) {
-		if (color == DEFAULT)
-			color = _defaultColor;
+		CONSOLE_SCREEN_BUFFER_INFO info;
+		GetConsoleScreenBufferInfo(h, &info);
+		if (_bgcolor == DEFAULT)
+			color = (_defaultColor & 0xf0) >> 4;
 		else {
-			CONSOLE_SCREEN_BUFFER_INFO info;
-			GetConsoleScreenBufferInfo(h, &info);
-			color = (info.wAttributes & 0x0f) | ((color & 0x07) << 4);
-			if (light)
-				color |= BACKGROUND_INTENSITY;
+			// swap red and blue bits
+			color = (color & 0x0a) | ((color & 1) << 2) | ((color & 4) >> 2);
 		}
+		color = (info.wAttributes & 0x0f) | ((color & 0x0f) << 4);
 		SetConsoleTextAttribute(h, (DWORD)color);
 	}
 #else
-	if (color == DEFAULT)
+	if (color != DEFAULT && color > 7)
+		color %= 8;
+	if (color == DEFAULT) {
 		os << "\x1B[0m";
+		if (_fgcolor != DEFAULT)
+			fgcolor(_fgcolor, os);
+	}
 	else
 		os << "\x1B[" << (40+(color & 0x07)) << 'm';
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Terminal.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Terminal.h
index 33f71312ffe..5981d52e677 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/Terminal.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/Terminal.h
@@ -41,11 +41,14 @@ class Terminal
 		static void finish (std::ostream &os);
 		static int columns ();
 		static int rows ();
-		static void color (int color, bool light, std::ostream &os);
-		static void bgcolor (int color, bool light, std::ostream &os);
+		static void fgcolor (int color, std::ostream &os);
+		static void bgcolor (int color, std::ostream &os);
 
-#ifdef __WIN32__
 	private:
+		static int _fgcolor;  ///< current foreground color
+		static int _bgcolor;  ///< current background color
+
+#ifdef __WIN32__
 		static int _defaultColor;
 #endif
 };
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/TpicSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/TpicSpecialHandler.cpp
index fcd33a5bcf5..fcd33a5bcf5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/TpicSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/TpicSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/TpicSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/TpicSpecialHandler.h
index 30bae57358a..30bae57358a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/TpicSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/TpicSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/VFActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/VFActions.h
index 898fd8850c1..898fd8850c1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/VFActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/VFActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/VFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/VFReader.cpp
index 57660c99825..57660c99825 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/VFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/VFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/VFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/VFReader.h
index 22e51f30a0e..22e51f30a0e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/VFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/VFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/VectorStream.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/VectorStream.h
index 228089db9b2..228089db9b2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/VectorStream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/VectorStream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/XMLDocTypeNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/XMLDocTypeNode.h
index 490d398b6b7..490d398b6b7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/XMLDocTypeNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/XMLDocTypeNode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/XMLDocument.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/XMLDocument.cpp
index 39973266a7c..39973266a7c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/XMLDocument.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/XMLDocument.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/XMLDocument.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/XMLDocument.h
index 8adab2fb0dd..8adab2fb0dd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/XMLDocument.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/XMLDocument.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/XMLNode.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/XMLNode.cpp
index 3e5aa93ca62..3e5aa93ca62 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/XMLNode.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/XMLNode.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/XMLNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/XMLNode.h
index e4576e9d830..e4576e9d830 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/XMLNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/XMLNode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/XMLString.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/XMLString.cpp
index 630736b29f0..630736b29f0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/XMLString.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/XMLString.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/XMLString.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/XMLString.h
index 2f669e21fb7..2f669e21fb7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/XMLString.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/XMLString.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/dvisvgm.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/dvisvgm.cpp
index 90015fccbc7..02b9cb1457c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/dvisvgm.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/dvisvgm.cpp
@@ -362,10 +362,12 @@ int main (int argc, char *argv[]) {
 			SignalHandler::instance().start();
 			dvisvg.convert(args.page_arg(), &pageinfo);
 			Message::mstream().indent(0);
-			Message::mstream(false, Terminal::BLUE, true) << "\n" << pageinfo.first << " of " << pageinfo.second << " page";
+			Message::mstream(false, Message::MC_PAGE_NUMBER) << "\n" << pageinfo.first << " of " << pageinfo.second << " page";
 			if (pageinfo.second > 1)
-				Message::mstream(false, Terminal::BLUE, true) << 's';
-			Message::mstream(false, Terminal::BLUE, true) << " converted in " << (System::time()-start_time) << " seconds\n";
+				Message::mstream(false, Message::MC_PAGE_NUMBER) << 's';
+			Message::mstream(false, Message::MC_PAGE_NUMBER) << " converted in " << (System::time()-start_time) << " seconds";
+			Message::mstream(false) << "\n";
+
 		}
 		catch (DVIException &e) {
 			Message::estream() << "\nDVI error: " << e.what() << '\n';
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/gzstream.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/gzstream.cpp
index 2893c299891..2893c299891 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/gzstream.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/gzstream.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/gzstream.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/gzstream.h
index 60f38c4fac7..60f38c4fac7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/gzstream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/gzstream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/iapi.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/iapi.h
index 8e29d938d03..8e29d938d03 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/iapi.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/iapi.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/ierrors.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/ierrors.h
index 3184341177e..3184341177e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/ierrors.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/ierrors.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/macros.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/macros.h
index 12be07323c7..12be07323c7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/macros.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/macros.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/options.xml b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/options.xml
index 10846285b3d..10846285b3d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/options.xml
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/options.xml
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/psdefs.psc b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/psdefs.psc
index 60785a721e1..60785a721e1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/psdefs.psc
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/psdefs.psc
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/types.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/types.h
index f404565df96..f404565df96 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/src/types.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/src/types.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/BoundingBoxTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/BoundingBoxTest.cpp
index 3e092af7f13..3e092af7f13 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/BoundingBoxTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/BoundingBoxTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/CRC32Test.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/CRC32Test.cpp
index bd5015df06f..bd5015df06f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/CRC32Test.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/CRC32Test.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/CalculatorTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/CalculatorTest.cpp
index 6d9a095370c..6d9a095370c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/CalculatorTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/CalculatorTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/ColorSpecialTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/ColorSpecialTest.cpp
index 1fd0cbf6930..1fd0cbf6930 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/ColorSpecialTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/ColorSpecialTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/CommandLineTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/CommandLineTest.cpp
index 3de612db08e..3de612db08e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/CommandLineTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/CommandLineTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/DirectoryTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/DirectoryTest.cpp
index 37b46b7c080..37b46b7c080 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/DirectoryTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/DirectoryTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/FileFinderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/FileFinderTest.cpp
index 64772a1f8d2..64772a1f8d2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/FileFinderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/FileFinderTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/FilePathTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/FilePathTest.cpp
index 04449fcf919..04449fcf919 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/FilePathTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/FilePathTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/FileSystemTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/FileSystemTest.cpp
index 5b8c6912d31..5b8c6912d31 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/FileSystemTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/FileSystemTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/FontManagerTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/FontManagerTest.cpp
index e7259b80f7c..e7259b80f7c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/FontManagerTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/FontManagerTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/FontMapTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/FontMapTest.cpp
index 92bd6420724..92bd6420724 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/FontMapTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/FontMapTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/GFReaderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/GFReaderTest.cpp
index ae527feddbf..ae527feddbf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/GFReaderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/GFReaderTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/GraphicPathTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/GraphicPathTest.cpp
index 6263dc90178..6263dc90178 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/GraphicPathTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/GraphicPathTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/LengthTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/LengthTest.cpp
index c7c38f755c4..c7c38f755c4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/LengthTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/LengthTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/Makefile.am
index 44ec80dd990..ece50a55505 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/Makefile.am
@@ -11,132 +11,132 @@ check_PROGRAMS =
 TESTS += BoundingBoxTest
 check_PROGRAMS += BoundingBoxTest
 BoundingBoxTest_SOURCES = BoundingBoxTest.cpp
-BoundingBoxTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+BoundingBoxTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+
+TESTS += CRC32Test
+check_PROGRAMS += CRC32Test
+CRC32Test_SOURCES = CRC32Test.cpp
+CRC32Test_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += CalculatorTest
 check_PROGRAMS += CalculatorTest
 CalculatorTest_SOURCES = CalculatorTest.cpp
-CalculatorTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+CalculatorTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += ColorSpecialTest
 check_PROGRAMS += ColorSpecialTest
 ColorSpecialTest_SOURCES = ColorSpecialTest.cpp
-ColorSpecialTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+ColorSpecialTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += CommandLineTest
 check_PROGRAMS += CommandLineTest
 CommandLineTest_SOURCES = CommandLineTest.cpp
-CommandLineTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
-
-TESTS += CRC32Test
-check_PROGRAMS += CRC32Test
-CRC32Test_SOURCES = CRC32Test.cpp
-CRC32Test_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+CommandLineTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += DirectoryTest
 check_PROGRAMS += DirectoryTest
 DirectoryTest_SOURCES = DirectoryTest.cpp
-DirectoryTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+DirectoryTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += FileFinderTest
 check_PROGRAMS += FileFinderTest
 FileFinderTest_SOURCES = FileFinderTest.cpp
-FileFinderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+FileFinderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += FilePathTest
 check_PROGRAMS += FilePathTest
 FilePathTest_SOURCES = FilePathTest.cpp
-FilePathTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+FilePathTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += FileSystemTest
 check_PROGRAMS += FileSystemTest
 FileSystemTest_SOURCES = FileSystemTest.cpp
-FileSystemTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+FileSystemTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += FontManagerTest
 check_PROGRAMS += FontManagerTest
 FontManagerTest_SOURCES = FontManagerTest.cpp
-FontManagerTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+FontManagerTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += FontMapTest
 check_PROGRAMS += FontMapTest
 FontMapTest_SOURCES = FontMapTest.cpp
-FontMapTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+FontMapTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += GFReaderTest
 check_PROGRAMS += GFReaderTest
 GFReaderTest_SOURCES = GFReaderTest.cpp
-GFReaderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+GFReaderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += GraphicPathTest
 check_PROGRAMS += GraphicPathTest
 GraphicPathTest_SOURCES = GraphicPathTest.cpp
-GraphicPathTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+GraphicPathTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += LengthTest
 check_PROGRAMS += LengthTest
 LengthTest_SOURCES = LengthTest.cpp
-LengthTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+LengthTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += MatrixTest
 check_PROGRAMS += MatrixTest
 MatrixTest_SOURCES = MatrixTest.cpp
-MatrixTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+MatrixTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += MessageExceptionTest
 check_PROGRAMS += MessageExceptionTest
 MessageExceptionTest_SOURCES = MessageExceptionTest.cpp
-MessageExceptionTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+MessageExceptionTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+
+TESTS += PSInterpreterTest
+check_PROGRAMS += PSInterpreterTest
+PSInterpreterTest_SOURCES = PSInterpreterTest.cpp
+PSInterpreterTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += PageRagesTest
 check_PROGRAMS += PageRagesTest
 PageRagesTest_SOURCES = PageRagesTest.cpp
-PageRagesTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+PageRagesTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += PageSizeTest
 check_PROGRAMS += PageSizeTest
 PageSizeTest_SOURCES = PageSizeTest.cpp
-PageSizeTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+PageSizeTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += PairTest
 check_PROGRAMS += PairTest
 PairTest_SOURCES = PairTest.cpp
-PairTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
-
-TESTS += PSInterpreterTest
-check_PROGRAMS += PSInterpreterTest
-PSInterpreterTest_SOURCES = PSInterpreterTest.cpp
-PSInterpreterTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+PairTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += SplittedCharInputBufferTest
 check_PROGRAMS += SplittedCharInputBufferTest
 SplittedCharInputBufferTest_SOURCES = SplittedCharInputBufferTest.cpp
-SplittedCharInputBufferTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+SplittedCharInputBufferTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += StreamInputBufferTest
 check_PROGRAMS += StreamInputBufferTest
 StreamInputBufferTest_SOURCES = StreamInputBufferTest.cpp
-StreamInputBufferTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+StreamInputBufferTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += StreamReaderTest
 check_PROGRAMS += StreamReaderTest
 StreamReaderTest_SOURCES = StreamReaderTest.cpp
-StreamReaderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+StreamReaderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += StreamWriterTest
 check_PROGRAMS += StreamWriterTest
 StreamWriterTest_SOURCES = StreamWriterTest.cpp
-StreamWriterTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+StreamWriterTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += TypesTest
 check_PROGRAMS += TypesTest
 TypesTest_SOURCES = TypesTest.cpp
-TypesTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+TypesTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTS += VectorStreamTest
 check_PROGRAMS += VectorStreamTest
 VectorStreamTest_SOURCES = VectorStreamTest.cpp
-VectorStreamTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+VectorStreamTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 
 TESTDATA =
 TESTDATA += frktest.dvi frktest-wf-cmp.svg frktest-nf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/Makefile.in
index 8919d065389..2c39867102f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/Makefile.in
@@ -34,30 +34,30 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-TESTS = BoundingBoxTest$(EXEEXT) CalculatorTest$(EXEEXT) \
-	ColorSpecialTest$(EXEEXT) CommandLineTest$(EXEEXT) \
-	CRC32Test$(EXEEXT) DirectoryTest$(EXEEXT) \
+TESTS = BoundingBoxTest$(EXEEXT) CRC32Test$(EXEEXT) \
+	CalculatorTest$(EXEEXT) ColorSpecialTest$(EXEEXT) \
+	CommandLineTest$(EXEEXT) DirectoryTest$(EXEEXT) \
 	FileFinderTest$(EXEEXT) FilePathTest$(EXEEXT) \
 	FileSystemTest$(EXEEXT) FontManagerTest$(EXEEXT) \
 	FontMapTest$(EXEEXT) GFReaderTest$(EXEEXT) \
 	GraphicPathTest$(EXEEXT) LengthTest$(EXEEXT) \
 	MatrixTest$(EXEEXT) MessageExceptionTest$(EXEEXT) \
-	PageRagesTest$(EXEEXT) PageSizeTest$(EXEEXT) PairTest$(EXEEXT) \
-	PSInterpreterTest$(EXEEXT) \
+	PSInterpreterTest$(EXEEXT) PageRagesTest$(EXEEXT) \
+	PageSizeTest$(EXEEXT) PairTest$(EXEEXT) \
 	SplittedCharInputBufferTest$(EXEEXT) \
 	StreamInputBufferTest$(EXEEXT) StreamReaderTest$(EXEEXT) \
 	StreamWriterTest$(EXEEXT) TypesTest$(EXEEXT) \
 	VectorStreamTest$(EXEEXT) check-conv
-check_PROGRAMS = BoundingBoxTest$(EXEEXT) CalculatorTest$(EXEEXT) \
-	ColorSpecialTest$(EXEEXT) CommandLineTest$(EXEEXT) \
-	CRC32Test$(EXEEXT) DirectoryTest$(EXEEXT) \
+check_PROGRAMS = BoundingBoxTest$(EXEEXT) CRC32Test$(EXEEXT) \
+	CalculatorTest$(EXEEXT) ColorSpecialTest$(EXEEXT) \
+	CommandLineTest$(EXEEXT) DirectoryTest$(EXEEXT) \
 	FileFinderTest$(EXEEXT) FilePathTest$(EXEEXT) \
 	FileSystemTest$(EXEEXT) FontManagerTest$(EXEEXT) \
 	FontMapTest$(EXEEXT) GFReaderTest$(EXEEXT) \
 	GraphicPathTest$(EXEEXT) LengthTest$(EXEEXT) \
 	MatrixTest$(EXEEXT) MessageExceptionTest$(EXEEXT) \
-	PageRagesTest$(EXEEXT) PageSizeTest$(EXEEXT) PairTest$(EXEEXT) \
-	PSInterpreterTest$(EXEEXT) \
+	PSInterpreterTest$(EXEEXT) PageRagesTest$(EXEEXT) \
+	PageSizeTest$(EXEEXT) PairTest$(EXEEXT) \
 	SplittedCharInputBufferTest$(EXEEXT) \
 	StreamInputBufferTest$(EXEEXT) StreamReaderTest$(EXEEXT) \
 	StreamWriterTest$(EXEEXT) TypesTest$(EXEEXT) \
@@ -333,57 +333,57 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 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
+BoundingBoxTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+CRC32Test_SOURCES = CRC32Test.cpp
+CRC32Test_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 CalculatorTest_SOURCES = CalculatorTest.cpp
-CalculatorTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+CalculatorTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 ColorSpecialTest_SOURCES = ColorSpecialTest.cpp
-ColorSpecialTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+ColorSpecialTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 CommandLineTest_SOURCES = CommandLineTest.cpp
-CommandLineTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
-CRC32Test_SOURCES = CRC32Test.cpp
-CRC32Test_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+CommandLineTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 DirectoryTest_SOURCES = DirectoryTest.cpp
-DirectoryTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+DirectoryTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 FileFinderTest_SOURCES = FileFinderTest.cpp
-FileFinderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+FileFinderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 FilePathTest_SOURCES = FilePathTest.cpp
-FilePathTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+FilePathTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 FileSystemTest_SOURCES = FileSystemTest.cpp
-FileSystemTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+FileSystemTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 FontManagerTest_SOURCES = FontManagerTest.cpp
-FontManagerTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+FontManagerTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 FontMapTest_SOURCES = FontMapTest.cpp
-FontMapTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+FontMapTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 GFReaderTest_SOURCES = GFReaderTest.cpp
-GFReaderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+GFReaderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 GraphicPathTest_SOURCES = GraphicPathTest.cpp
-GraphicPathTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+GraphicPathTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 LengthTest_SOURCES = LengthTest.cpp
-LengthTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+LengthTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 MatrixTest_SOURCES = MatrixTest.cpp
-MatrixTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+MatrixTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 MessageExceptionTest_SOURCES = MessageExceptionTest.cpp
-MessageExceptionTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+MessageExceptionTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
+PSInterpreterTest_SOURCES = PSInterpreterTest.cpp
+PSInterpreterTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 PageRagesTest_SOURCES = PageRagesTest.cpp
-PageRagesTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+PageRagesTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 PageSizeTest_SOURCES = PageSizeTest.cpp
-PageSizeTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+PageSizeTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 PairTest_SOURCES = PairTest.cpp
-PairTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
-PSInterpreterTest_SOURCES = PSInterpreterTest.cpp
-PSInterpreterTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+PairTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 SplittedCharInputBufferTest_SOURCES = SplittedCharInputBufferTest.cpp
-SplittedCharInputBufferTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+SplittedCharInputBufferTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 StreamInputBufferTest_SOURCES = StreamInputBufferTest.cpp
-StreamInputBufferTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+StreamInputBufferTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 StreamReaderTest_SOURCES = StreamReaderTest.cpp
-StreamReaderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+StreamReaderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 StreamWriterTest_SOURCES = StreamWriterTest.cpp
-StreamWriterTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+StreamWriterTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 TypesTest_SOURCES = TypesTest.cpp
-TypesTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+TypesTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 VectorStreamTest_SOURCES = VectorStreamTest.cpp
-VectorStreamTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+VectorStreamTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main -lpthread
 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 cmr10.600gf $(TESTDATA)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/MatrixTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/MatrixTest.cpp
index 9567d52c6ea..9567d52c6ea 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/MatrixTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/MatrixTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/MessageExceptionTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/MessageExceptionTest.cpp
index 11eb87c29eb..11eb87c29eb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/MessageExceptionTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/MessageExceptionTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/PSInterpreterTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/PSInterpreterTest.cpp
index d5c8c82274b..d5c8c82274b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/PSInterpreterTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/PSInterpreterTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/PageRagesTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/PageRagesTest.cpp
index 353ea15b7d1..353ea15b7d1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/PageRagesTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/PageRagesTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/PageSizeTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/PageSizeTest.cpp
index 785fde6d162..785fde6d162 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/PageSizeTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/PageSizeTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/PairTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/PairTest.cpp
index 9807cc7a353..9807cc7a353 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/PairTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/PairTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/SplittedCharInputBufferTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/SplittedCharInputBufferTest.cpp
index ff8970da2c7..ff8970da2c7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/SplittedCharInputBufferTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/SplittedCharInputBufferTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/StreamInputBufferTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/StreamInputBufferTest.cpp
index 56769671708..56769671708 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/StreamInputBufferTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/StreamInputBufferTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/StreamReaderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/StreamReaderTest.cpp
index 1b7fd35ad90..1b7fd35ad90 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/StreamReaderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/StreamReaderTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/StreamWriterTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/StreamWriterTest.cpp
index 4256ce84448..4256ce84448 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/StreamWriterTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/StreamWriterTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/TypesTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/TypesTest.cpp
index 5d30cef2369..5d30cef2369 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/TypesTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/TypesTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/VectorStreamTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/VectorStreamTest.cpp
index 14b03ac763b..14b03ac763b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/VectorStreamTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/VectorStreamTest.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/check-conv b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/check-conv
index 0def881b648..0def881b648 100755
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/check-conv
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/check-conv
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/cmr10.600gf b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/cmr10.600gf
index 6dca421e21c..6dca421e21c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/cmr10.600gf
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/cmr10.600gf
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/frktest-nf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/frktest-nf-cmp.svg
index 7c40a685071..7c40a685071 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/frktest-nf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/frktest-nf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/frktest-wf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/frktest-wf-cmp.svg
index 93212ad4abc..93212ad4abc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/frktest-wf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/frktest-wf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/frktest.dvi b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/frktest.dvi
index 723b08a2964..723b08a2964 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/frktest.dvi
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/frktest.dvi
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/normalize.xsl b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/normalize.xsl
index 5a6ba2f62d6..5a6ba2f62d6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/normalize.xsl
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/normalize.xsl
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/sample-nf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/sample-nf-cmp.svg
index 9e2dc81bfb0..9e2dc81bfb0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/sample-nf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/sample-nf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/sample-wf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/sample-wf-cmp.svg
index 44393742587..44393742587 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/sample-wf-cmp.svg
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/sample-wf-cmp.svg
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/sample.dvi b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/sample.dvi
index 87e6236021d..87e6236021d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.0.9/tests/sample.dvi
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.10/tests/sample.dvi
diff --git a/Build/source/texk/dvisvgm/version.ac b/Build/source/texk/dvisvgm/version.ac
index 8243ab843f2..020fa8e6075 100644
--- a/Build/source/texk/dvisvgm/version.ac
+++ b/Build/source/texk/dvisvgm/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current dvisvgm version
-m4_define([dvisvgm_version], [1.0.9])
+m4_define([dvisvgm_version], [1.0.10])
author	Peter Breitenlohner <peb@mppmu.mpg.de>	2011-12-22 12:05:55 +0000
committer	Peter Breitenlohner <peb@mppmu.mpg.de>	2011-12-22 12:05:55 +0000
commit	6b6a57de24d436e9b5f47fd031f5347de05e7e80 (patch)
tree	4db5f719bcdd2b1f92ec15e3b60de2d5d4f6b9d3 /Build/source
parent	f4a722180ef0a33d802f5cf15b65fda6e6df0187 (diff)