217 files changed, 508 insertions, 213 deletions

diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index 5c38cadd196..775e58db480 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-03  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* Imported release 1.12.
+	* version.ac: Adapted.
+
 2015-09-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Imported release 1.11.
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index f36bca83531..52540d00020 100755
--- a/Build/source/texk/dvisvgm/configure
+++ b/Build/source/texk/dvisvgm/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dvisvgm (TeX Live) 1.11.
+# Generated by GNU Autoconf 2.69 for dvisvgm (TeX Live) 1.12.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,12 +590,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvisvgm (TeX Live)'
 PACKAGE_TARNAME='dvisvgm--tex-live-'
-PACKAGE_VERSION='1.11'
-PACKAGE_STRING='dvisvgm (TeX Live) 1.11'
+PACKAGE_VERSION='1.12'
+PACKAGE_STRING='dvisvgm (TeX Live) 1.12'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="dvisvgm-1.11/src/dvisvgm.cpp"
+ac_unique_file="dvisvgm-src/src/dvisvgm.cpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1372,7 +1372,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dvisvgm (TeX Live) 1.11 to adapt to many kinds of systems.
+\`configure' configures dvisvgm (TeX Live) 1.12 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1443,7 +1443,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvisvgm (TeX Live) 1.11:";;
+     short | recursive ) echo "Configuration of dvisvgm (TeX Live) 1.12:";;
    esac
   cat <<\_ACEOF
 
@@ -1583,7 +1583,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvisvgm (TeX Live) configure 1.11
+dvisvgm (TeX Live) configure 1.12
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2451,7 +2451,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dvisvgm (TeX Live) $as_me 1.11, which was
+It was created by dvisvgm (TeX Live) $as_me 1.12, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8137,7 +8137,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvisvgm--tex-live-'
- VERSION='1.11'
+ VERSION='1.12'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18321,7 +18321,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dvisvgm (TeX Live) config.lt 1.11
+dvisvgm (TeX Live) config.lt 1.12
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -20132,7 +20132,7 @@ $as_echo "#define KPSE_CXX_UNSAFE 1" >>confdefs.h
 
 fi
 
-DVISVGM_TREE=dvisvgm-1.11
+DVISVGM_TREE=dvisvgm-src
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -20684,7 +20684,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dvisvgm (TeX Live) $as_me 1.11, which was
+This file was extended by dvisvgm (TeX Live) $as_me 1.12, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20750,7 +20750,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dvisvgm (TeX Live) config.status 1.11
+dvisvgm (TeX Live) config.status 1.12
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-src-PATCHES/ChangeLog
index e8de4ebf0a2..b51282d02f4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11-PATCHES/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-src-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-03  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* Import release 1.12.
+
 2015-04-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Import release 1.9.2.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-src-PATCHES/TL-Changes
index 84e222f7d83..c19886df7a7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11-PATCHES/TL-Changes
+++ b/Build/source/texk/dvisvgm/dvisvgm-src-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the dvisvgm-1.11 tree as obtained from:
+Changes applied to the dvisvgm-1.12 tree as obtained from:
 	http://dvisvgm.bplaced.net/Downloads
 
 Removed:
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/AUTHORS b/Build/source/texk/dvisvgm/dvisvgm-src/AUTHORS
index d9b6468421e..d9b6468421e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/AUTHORS
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/AUTHORS
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/COPYING b/Build/source/texk/dvisvgm/dvisvgm-src/COPYING
index 94a9ed024d3..94a9ed024d3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/COPYING
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/COPYING
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-src/ChangeLog
index 062f02e146a..ce8772109de 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/ChangeLog
@@ -1,3 +1,52 @@
+2015-11-18  Martin Gieseking  <martin.gieseking@uos.de>
+
+  * NEWS: 
+  updated NEWS 
+
+  * .travis.yml, configure.ac, src/Doxyfile: 
+  set version to 1.12 
+
+2015-11-16  Martin Gieseking  <martin.gieseking@uos.de>
+
+  * src/FontEngine.cpp: 
+  treat character code as character index if no font mapping is set 
+
+  * src/FontManager.cpp: 
+  removed redundant #include 
+
+2015-11-12  Martin Gieseking  <martin.gieseking@uos.de>
+
+  * README, README.md: 
+  updated links to Google Test framework 
+
+2015-11-09  Martin Gieseking  <martin.gieseking@uos.de>
+
+  * doc/dvisvgm.txt.in, src/Color.cpp, src/Color.h, src/CommandLine.cpp, 
+    src/CommandLine.h, src/DVIToSVGActions.cpp, 
+    src/DvisvgmSpecialHandler.cpp, src/EmSpecialHandler.cpp, 
+    src/HtmlSpecialHandler.cpp, src/PSPattern.cpp, src/PsSpecialHandler.cpp, 
+    src/SVGTree.cpp, src/TpicSpecialHandler.cpp, src/dvisvgm.cpp, 
+    src/options.xml, tests/ColorTest.cpp: 
+  added option --colornames to replace RGB color values with SVG color 
+  names 
+
+  * tests/Makefile.am, tests/ShadingPatch.cpp, tests/ShadingPatchTest.cpp: 
+  renamed ShadingPatchTest 
+
+  * src/Color.cpp, src/Color.h, src/ColorSpecialHandler.cpp, 
+    src/HtmlSpecialHandler.cpp, tests/ColorTest.cpp: 
+  renamed Color::setName() to Color::setPSName() 
+
+2015-10-27  Martin Gieseking  <martin.gieseking@uos.de>
+
+  * src/Process.cpp, src/Process.h: 
+  fixed invalid access to freed string memory 
+
+2015-10-06  Martin Gieseking  <martin.gieseking@uos.de>
+
+  * doc/dvisvgm.txt.in: 
+  minor improvements of the manual page 
+
 2015-09-21  Martin Gieseking  <martin.gieseking@uos.de>
 
   * NEWS, README, README.md: 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/INSTALL b/Build/source/texk/dvisvgm/dvisvgm-src/INSTALL
index a4b34144dcf..a4b34144dcf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/INSTALL
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/INSTALL
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/LGPL-2.1.txt b/Build/source/texk/dvisvgm/dvisvgm-src/LGPL-2.1.txt
index 602bfc94635..602bfc94635 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/LGPL-2.1.txt
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/LGPL-2.1.txt
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-src/Makefile.am
index b219497ebca..b219497ebca 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/NEWS b/Build/source/texk/dvisvgm/dvisvgm-src/NEWS
index e3c2998d6da..495d70c6dff 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/NEWS
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/NEWS
@@ -1,3 +1,8 @@
+dvisvgm-1.12 (2015-11-18)
+- added option --colornames to replace RGB values by SVG color names
+- fixed resolving of character codes for fonts without supported chracater maps
+- fixed a memory issue that could occur when calling Metafont
+
 dvisvgm-1.11 (2015-09-21)
 - improved mapping of unknown characters to Unicode
 - improved handling of text elements in conjunction with \specials (patch by Till Tantau)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/README b/Build/source/texk/dvisvgm/dvisvgm-src/README
index 0420c2fd68f..b596c0f3582 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/README
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/README
@@ -51,7 +51,7 @@ DEPENDENCIES
    and should be included with this package.
 
  If you want to build and run the test suite located in the tests subdirectory,
- you also need the googletest libraries (http://code.google.com/p/googletest).
+ you also need the Google Test libraries (https://github.com/google/googletest).
 
 
 COMPILATION
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/clipper/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-src/clipper/Makefile.am
index 2da73955400..2da73955400 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/clipper/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/clipper/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/clipper/clipper.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/clipper/clipper.cpp
index 89b7e8e683d..89b7e8e683d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/clipper/clipper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/clipper/clipper.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/clipper/clipper.hpp b/Build/source/texk/dvisvgm/dvisvgm-src/clipper/clipper.hpp
index 566289f82b1..566289f82b1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/clipper/clipper.hpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/clipper/clipper.hpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/config.h.in b/Build/source/texk/dvisvgm/dvisvgm-src/config.h.in
index fcd8cf41872..fcd8cf41872 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/config.h.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/config.h.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/configure.ac b/Build/source/texk/dvisvgm/dvisvgm-src/configure.ac
index fb791c817b3..57586feedc1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/configure.ac
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/configure.ac
@@ -4,8 +4,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dvisvgm],[1.11],[martin.gieseking@uos.de])
-DATE="September 2015"
+AC_INIT([dvisvgm],[1.12],[martin.gieseking@uos.de])
+DATE="November 2015"
 AC_CONFIG_SRCDIR(src)
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/doc/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-src/doc/Makefile.am
index 3acae1631c4..3acae1631c4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/doc/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/doc/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/doc/conf-dblatex-man.xsl b/Build/source/texk/dvisvgm/dvisvgm-src/doc/conf-dblatex-man.xsl
index 23283210027..23283210027 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/doc/conf-dblatex-man.xsl
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/doc/conf-dblatex-man.xsl
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/doc/conf-dblatex-pdf.xsl b/Build/source/texk/dvisvgm/dvisvgm-src/doc/conf-dblatex-pdf.xsl
index 2a8aeec290a..2a8aeec290a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/doc/conf-dblatex-pdf.xsl
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/doc/conf-dblatex-pdf.xsl
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/doc/dvisvgm.1 b/Build/source/texk/dvisvgm/dvisvgm-src/doc/dvisvgm.1
index c9e24b6aa1f..bcd2f4d5728 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/doc/dvisvgm.1
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/doc/dvisvgm.1
@@ -2,12 +2,12 @@
 .\"     Title: dvisvgm
 .\"    Author: Martin Gieseking <martin.gieseking@uos.de>
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 09/18/2015
+.\"      Date: 11/18/2015
 .\"    Manual: dvisvgm Manual
-.\"    Source: dvisvgm 1.11
+.\"    Source: dvisvgm 1.12
 .\"  Language: English
 .\"
-.TH "DVISVGM" "1" "09/18/2015" "dvisvgm 1\&.11" "dvisvgm Manual"
+.TH "DVISVGM" "1" "11/18/2015" "dvisvgm 1\&.12" "dvisvgm Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -36,21 +36,20 @@ dvisvgm \- converts DVI and EPS files to the XML\-based SVG format
 \fBdvisvgm\fR \-E [ \fIoptions\fR ] \fIfile\fR [\&.eps]
 .SH "DESCRIPTION"
 .sp
-The command\-line utility \fBdvisvgm\fR converts DVI files, as generated by TeX/LaTeX, to the XML\-based scalable vector graphics format SVG\&. It supports the classic DVI format 2 as well as format 3 (created by pTeX in vertical mode), and the XeTeX formats 5 and 6 which are also known as XDV\&. Besides the basic DVI commands, dvisvgm also evaluates many so\-called \fIspecials\fR which heavily extend the capabilities of the DVI format\&. For a more detailed overview, see section \fBSupported Specials\fR below\&.
+The command\-line utility \fBdvisvgm\fR converts DVI files, as generated by TeX/LaTeX, to the XML\-based scalable vector graphics format SVG\&. It supports the classic DVI format 2 as well as format 3 (created by pTeX in vertical mode), and the XeTeX formats 5 and 6 which are also known as XDV\&. Besides the basic DVI commands, dvisvgm also evaluates many so\-called \fIspecials\fR which heavily extend the capabilities of the plain DVI format\&. For a more detailed overview, see section \fBSupported Specials\fR below\&.
 .sp
 Since the current SVG standard 1\&.1 doesn\(cqt specify multi\-page graphics, dvisvgm creates separate SVG files for each DVI page\&. Because of compatibility reasons, only the first page is converted by default\&. In order to select a different page or arbitrary page sequences, use option \fB\-p\fR which is described below\&.
 .sp
-SVG is a vector\-based graphics format and therefore dvisvgm tries to convert the glyph outlines of all used fonts to scalable path descriptions\&. The fastest way to do that is to extract the path information from font files in PFB, TTF, or OTF format\&. If dvisvgm is able to find such a file, it extracts all necessary outline information about the glyphs from it\&.
+SVG is a vector\-based graphics format and therefore dvisvgm tries to convert the glyph outlines of all fonts referenced in a DVI page section to scalable path descriptions\&. The fastest way to achieve this is to extract the path information from vector\-based font files available in PFB, TTF, or OTF format\&. If dvisvgm is able to find such a file, it extracts all necessary outline information about the glyphs from it\&.
 .sp
 However, TeX\(cqs main source for font descriptions is Metafont, which produces bitmap output (GF files)\&. That\(cqs why not all obtainable TeX fonts are available in a scalable format\&. In these cases, dvisvgm tries to vectorize Metafont\(cqs output by tracing the glyph bitmaps\&. The results are not as perfect as most (manually optimized) PFB or OTF counterparts, but are nonetheless really nice in most cases\&.
 .sp
-When running dvisvgm without option \fB\-\-no\-fonts\fR, \fIfont\fR elements (\fB<font>\fR\&...\fB</font>\fR) are used to embed the font data into the SVG files\&. Unfortunately, only few SVG renderes support these elements yet\&. Most web browsers and vector graphics applications don\(cqt evaluate them properly so that the text components of the resulting graphics might look strange\&. In order to create more compatible SVG files, command\-line option \fB\-\-no\-fonts\fR can be given to replace the font elements by plain graphics paths\&.
+When running dvisvgm without option \fB\-\-no\-fonts\fR, it creates \fIfont\fR elements (\fB<font>\fR\&...\fB</font>\fR) to embed the font data into the SVG files\&. Unfortunately, only few SVG renderes support these elements yet\&. Most web browsers and vector graphics applications don\(cqt evaluate them properly so that the text components of the resulting graphics might look strange\&. In order to create more compatible SVG files, command\-line option \fB\-\-no\-fonts\fR can be given to replace the font elements by plain graphics paths\&.
 .SH "OPTIONS"
 .PP
 \fB\-a, \-\-trace\-all\fR=[\fIretrace\fR]
 .RS 4
-This option forces dvisvgm to trace not only the actually needed glyphs but all glyphs of all bitmap fonts used in the DVI file\&. Since the tracing results are stored in the font cache, all following DVI conversions (without option
-\fB\-\-trace\-all\fR) where these fonts are involved, will be much faster\&. By default, dvisvgm traces only the actually needed glyphs, and adds them to the cache\&. The boolean option
+This option forces dvisvgm to vectorize not only the glyphs actually required to render the SVG file correctly \(en which is the default \(en, but processes all glyphs of all fonts referenced in the DVI file\&. Because dvisvgm stores the tracing results a font cache, all following conversions these fonts will speed up significantly\&. The boolean option
 \fIretrace\fR
 determines how to handle glyphs already stored in the cache\&. By default, these glyphs are skipped\&. Setting argument
 \fIretrace\fR
@@ -58,7 +57,7 @@ to
 \fIyes\fR
 or
 \fItrue\fR
-forces dvisvgm to trace the corresponding bitmaps again\&.
+forces dvisvgm to retrace the corresponding bitmaps again\&.
 .if n \{\
 .sp
 .\}
@@ -88,12 +87,12 @@ takes either one of the format specifiers listed below, or a sequence of four co
 \fIy1\fR,
 \fIx2\fR
 and
-\fIy2\fR\&. The latter define two diagonal corners of the bounding box\&. Each length value consists of a floating point number and an optional length unit (pt, bp, cm, mm, in, or pc)\&. If the unit is omitted, TeX points (pt) are assumed\&.
+\fIy2\fR\&. The latter define the absolute coordinates of two diagonal corners of the bounding box\&. Each length value consists of a floating point number and an optional length unit (pt, bp, cm, mm, in, or pc)\&. If the unit is omitted, TeX points (pt) are assumed\&.
 .sp
 It\(cqs also possible to give only one length value
 \fIl\fR\&. In this case, the minimal bounding box is computed and enlarged by adding (\-\fIl\fR,\-\fIl\fR) to the upper left and (\fIl\fR,\fIl\fR) to the lower right corner\&.
 .sp
-Alternatively, the following format specifiers are supported:
+Additionally, dvisvgm also supports the following format specifiers:
 .PP
 \fBInternational DIN/ISO paper sizes\fR
 .RS 4
@@ -177,7 +176,8 @@ only affects the bounding box and does not transform the page content\&. Hence,
 .PP
 \fB\-C, \-\-cache\fR[=\fIdir\fR]
 .RS 4
-To speed up the conversion process of bitmap fonts, dvisvgm saves intermediate conversion information in cache files\&. By default, these files are stored in $HOME/\&.dvisvgm/cache\&. If you prefer a different location, use option
+To speed up the conversion process of bitmap fonts, dvisvgm saves intermediate conversion information in cache files\&. By default, these files are stored in
+\fB$HOME/\&.dvisvgm/cache\fR\&. If you prefer a different location, use option
 \fB\-\-cache\fR
 to overwrite the default\&. Furthermore, it is also possible to disable the font caching mechanism completely with option
 \fB\-\-cache=none\fR\&. If argument
@@ -187,9 +187,9 @@ is omitted, dvisvgm prints the path of the default cache directory together with
 .PP
 \fB\-j, \-\-clipjoin\fR
 .RS 4
-This option tells dvisvgm to compute the intersection of clipping paths itself if necessary, and not to delegate this task to the SVG renderer\&. The resulting SVG files are more portable because some SVG renderers don\(cqt support intersections of clipping paths which are defined by
+This option tells dvisvgm to compute all intersections of clipping paths itself rather than delegating this task to the SVG renderer\&. The resulting SVG files are more portable because some SVG viewers don\(cqt support intersecting clipping paths which are defined by
 \fIclipPath\fR
-elements that contain a
+elements containing a
 \fIclip\-path\fR
 attribute\&.
 .RE
@@ -197,7 +197,20 @@ attribute\&.
 \fB\-\-color\fR
 .RS 4
 Enables colorization of messages printed during the conversion process\&. The colors can be customized via the environment variable
-\fBDVISVGM_COLORS\fR\&. See the ENVIRONMENT section below for further information\&.
+\fBDVISVGM_COLORS\fR\&. See the
+Environment section
+below for further information\&.
+.RE
+.PP
+\fB\-\-colornames\fR
+.RS 4
+By default, dvisvgm exclusively uses RGB values of the form
+\fI#RRGGBB\fR
+to represent colors in the SVG file\&. According to the SVG standard, it\(cqs also possible to use color names (like
+\fBblack\fR
+and
+\fBdarkblue\fR) for a limited number of predefined colors\&. In order to apply these color names rather than their RGB values, call dvisvgm with option
+\fB\-\-colornames\fR\&. All colors without an SVG color name will still be represented by RGB values\&.
 .RE
 .PP
 \fB\-E, \-\-eps\fR
@@ -211,26 +224,26 @@ for further information\&.
 .PP
 \fB\-e, \-\-exact\fR
 .RS 4
-If this option is given, dvisvgm computes the precise bounding box of each character\&. By default, the values stored in a font\(cqs TFM file are used to determine a glyph\(cqs extent\&. As these values are intended to implement optimal character placements and are not designed to represent the exact dimensions, they don\(cqt necessarily correspond with the bounds of the visual glyphs\&. Thus, width and/or height of some glyphs may be larger (or smaller) than the respective TFM values\&. As a result, this can lead to clipped characters at the bounds of the SVG graphics\&. With option
+This option tells dvisvgm to compute the precise bounding box of each character\&. By default, the values stored in a font\(cqs TFM file are used to determine a glyph\(cqs extent\&. As these values are intended to implement optimal character placements and are not designed to represent the exact dimensions, they don\(cqt necessarily correspond with the bounds of the visual glyphs\&. Thus, width and/or height of some glyphs may be larger (or smaller) than the respective TFM values\&. As a result, this can lead to clipped characters at the bounds of the SVG graphics\&. With option
 \fB\-\-exact\fR
 given, dvisvgm analyzes the actual shape of each character and derives a usually tight bounding box\&.
 .RE
 .PP
 \fB\-m, \-\-fontmap\fR=\fIfilenames\fR
 .RS 4
-Loads and evaluates a single or multiple font map files\&. These files are required to resolve font file names and encodings\&. dvisvgm does not provide its own map files but tries to read available ones coming with dvips or dvipdfm\&. If option
+Loads and evaluates a single font map file or a sequence of font map files\&. These files are required to resolve font file names and encodings\&. dvisvgm does not provide its own map files but tries to read available ones coming with dvips or dvipdfm\&. If option
 \fB\-\-fontmap\fR
 is omitted, dvisvgm looks for the default map files
 \fIps2pk\&.map\fR,
 \fIdvipdfm\&.map\fR, and
 \fIpsfonts\&.map\fR
-(in this order)\&. Otherwise, the listed files are used\&. Multiple filenames must be separated by commas without leading and/or trailing whitespace\&. The map files are evaluated in the given order\&. By default, redefined mappings do not replace previous ones\&. However, each filename can be preceded by an optional mode specifier (\fB+\fR,
+(in this order)\&. Otherwise, the files as option arguments are evaluated in the given order\&. Multiple filenames must be separated by commas without leading and/or trailing whitespace\&. By default, redefined mappings do not replace previous ones\&. However, each filename can be preceded by an optional mode specifier (\fB+\fR,
 \fB\-\fR, or
 \fB=\fR) to change this behavior:
 .PP
 +mapfile
 .RS 4
-Only those entries in the given map file that don\(cqt redefine a font mapping are applied\&. That\(cqs also the default mode if no mode specifier is given\&.
+Only those entries in the given map file that don\(cqt redefine a font mapping are applied, i\&.e\&. fonts already mapped keep untouched\&. That\(cqs also the default mode if no mode specifier is given\&.
 .RE
 .PP
 \-mapfile
@@ -240,7 +253,7 @@ Ensures that none of the font mappings defined in the given map file are used, i
 .PP
 =mapfile
 .RS 4
-All mappings defined in the map file are applied\&. Previously defined settings for the same font are replaced\&.
+All mappings defined in the map file are applied\&. Previously defined settings for the same fonts are replaced\&.
 .sp
 If the first filename in the filename sequence is preceded by a mode specifier, dvisvgm loads the default font map (see above) and applies the other map files afterwards\&. Otherwise, none of default map files will be loaded automatically\&.
 .sp
@@ -272,12 +285,12 @@ For further information about the map file formats and the mode specifiers, see
 .RS 4
 Tells dvisvgm to create overlapping grid segments when approximating color gradient fills (also see option
 \fB\-\-grad\-segments\fR
-below)\&. By default, adjacent segments don\(cqt overlap but only touch each other like separate tiles\&. Unfortunately, this alignment can lead to visible gaps between the segments because the background influences the color at the boundary of the segments if the SVG renderer uses anti\-aliasing to create smooth contours\&. One way to avoid this and to create seamlessly touching color regions is to enlarge the segments so that they extent into the area of their right and bottom neighbors\&. Since the latter are drawn on top of the overlapping parts, the visible size of all segments keeps unchanged\&. Just the former gaps disappear as the background is now completely covered by the correct colors\&. Currently, dvisvgm computes the overlapping segments separately for each patch of the mesh (a patch mesh may consist of multiple patches of the same type)\&. Therefore, there still might be visible gaps at the seam of two adjacent patches\&.
+below)\&. By default, adjacent segments don\(cqt overlap but only touch each other like separate tiles\&. However, this alignment can lead to visible gaps between the segments because the background color usually influences the color at the boundary of the segments if the SVG renderer uses anti\-aliasing to create smooth contours\&. One way to avoid this and to create seamlessly touching color regions is to enlarge the segments so that they extent into the area of their right and bottom neighbors\&. Since the latter are drawn on top of the overlapping parts, the visible size of all segments keeps unchanged\&. Just the former gaps disappear as the background is now completely covered by the correct colors\&. Currently, dvisvgm computes the overlapping segments separately for each patch of the mesh (a patch mesh may consist of multiple patches of the same type)\&. Therefore, there still might be visible gaps at the seam of two adjacent patches\&.
 .RE
 .PP
 \fB\-\-grad\-segments\fR=\fInumber\fR
 .RS 4
-Determines the maximal number of segments per column and row used to approximate gradient color fills\&. Since SVG 1\&.1 only supports a small subset of the shading algorithms available in PostScript, dvisvgm approximates some of them by subdividing the area to be filled into smaller, monochromatic segments\&. Each of these segments gets the average color of the region it covers\&. Thus, increasing the number of segments leads to smaller monochromatic areas and therefore results in a better approximation of the actual color gradient\&. As a drawback, more segments imply bigger SVG files because every segment is represented by a separate path element\&.
+Determines the maximal number of segments per column and row used to approximate gradient color fills\&. Since SVG 1\&.1 only supports a small subset of the shading algorithms available in PostScript, dvisvgm approximates some of them by subdividing the area to be filled into smaller, monochromatic segments\&. Each of these segments gets the average color of the region it covers\&. Thus, increasing the number of segments leads to smaller monochromatic areas and therefore a better approximation of the actual color gradient\&. As a drawback, more segments imply bigger SVG files because every segment is represented by a separate path element\&.
 .sp
 Currently, dvisvgm supports free\- and lattice\-form triangular patch meshes as well as Coons and tensor\-product patch meshes\&. They are approximated by subdividing the area of each patch into a
 \fIn\fR\(mu\fIn\fR
@@ -287,7 +300,8 @@ grid of smaller segments\&. The maximal number of segments per column and row ca
 .PP
 \fB\-\-grad\-simplify\fR=\fIdelta\fR
 .RS 4
-If the size of the segments created to approximate gradient color fills falls below the given delta value, dvisvgm reduces their level of detail\&. For example, B\('ezier curves are replaced by straight lines, and triangular segments are combined to tetragons\&. For a small delta these simplifications are usually not noticeable but reduce the size of the generated SVG files\&.
+If the size of the segments created to approximate gradient color fills falls below the given delta value, dvisvgm reduces their level of detail\&. For example, B\('ezier curves are replaced by straight lines, and triangular segments are combined to tetragons\&. For a small
+\fIdelta\fR, these simplifications are usually not noticeable but reduce the size of the generated SVG files significantly\&.
 .RE
 .PP
 \fB\-h, \-\-help\fR[=\fImode\fR]
@@ -304,7 +318,13 @@ Disables the removal of temporary files as created by Metafont (usually \&.gf, \
 .PP
 \fB\-\-libgs\fR=\fIfilename\fR
 .RS 4
-This option is only available if the Ghostscript library is not directly linked to dvisvgm and if 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\&.X (on Unix\-like systems, where X is the ABI version of the library) or gsdll32\&.dll/gsdll64\&.dll (Windows)\&. Option
+This option is only available if the Ghostscript library is not directly linked to dvisvgm and if 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
+\fBlibgs\&.so\&.X\fR
+(on Unix\-like systems, where
+\fBX\fR
+is the ABI version of the library) or
+\fBgsdll32\&.dll\fR/\fBgsdll64\&.dll\fR
+(Windows)\&. Option
 \fB\-\-libgs\fR
 can be used to give a different name\&. Alternatively, it\(cqs also possible to set the GS library name by the environment variable
 \fBLIBGS\fR\&. The latter has less precedence than the command\-line option, i\&.e\&. dvisvgm ignores variable
@@ -337,7 +357,7 @@ dvips color name (\m[blue]http://en.wikibooks.org/wiki/LaTeX/Colors#The_68_stand
 .sp
 Moreover, argument
 \fIstyle\fR
-can take a single color specifier to highlight the linked region by a frameless box filled with that color\&. An optional second color specifier separated by colon selects the frame color\&.
+can take a single color specifier to highlight the linked region by a frameless box filled with that color\&. An optional second color specifier separated by a colon selects the frame color\&.
 .sp
 Examples:
 \fBbox:red\fR
@@ -378,7 +398,10 @@ elements are only created if a string starts at a location that differs from the
 .PP
 \fB\-\-no\-mktexmf\fR
 .RS 4
-Suppresses the generation of missing font files\&. If dvisvgm can\(cqt find a font file through the kpathsea lookup mechanism, it calls the external tools mktextfm or mktexmf by\&. This option disables these calls\&.
+Suppresses the generation of missing font files\&. If dvisvgm can\(cqt find a font file through the kpathsea lookup mechanism, it calls the external tools
+\fImktextfm\fR
+or
+\fImktexmf\fR\&. This option disables these calls\&.
 .RE
 .PP
 \fB\-n, \-\-no\-fonts\fR[=\fIvariant\fR]
@@ -393,7 +416,7 @@ selects the method how to substitute fonts by paths\&. Variant 0 creates
 \fIpath\fR
 and
 \fIuse\fR
-elements\&. Variant 1 creates
+elements in order to avoid lengthy duplicates\&. Variant 1 creates
 \fIpath\fR
 elements only\&. Option
 \fB\-\-no\-fonts\fR
@@ -412,24 +435,24 @@ and vertically by
 .PP
 \fB\-S, \-\-no\-specials\fR[=\fInames\fR]
 .RS 4
-Disable processing of special commands embedded in the DVI file\&. If no further parameter is given, all specials are ignored\&. To selectively disable sets of specials, an optional comma\-separated list of names can be appended to this option\&. A
+Disable processing of special commands embedded in the DVI file\&. If no further parameter is given, all specials are ignored\&. To disable a selected set of specials, an optional comma\-separated list of names can be appended to this option\&. A
 \fIname\fR
 is the unique identifier referencing the intended special handler\&. Option
 \fB\-\-list\-specials\fR
-lists all currently available handlers and their names\&. All unsupported special statements are silently ignored\&.
+lists all handlers currently available together with their names\&. All unsupported special statements are silently ignored\&.
 .RE
 .PP
 \fB\-\-no\-styles\fR
 .RS 4
-By default, dvisvgm creates CSS styles and class attributes to reference fonts because it\(cqs more compact than repeatedly set the complete font information in each text element\&. However, if you prefer direct font references, the default behavior can be disabled with option
+By default, dvisvgm creates CSS styles and class attributes to reference fonts\&. This variant is more compact than adding the complete font information to each text element over and over again\&. However, if you prefer direct font references, the default behavior can be disabled with option
 \fB\-\-no\-styles\fR\&.
 .RE
 .PP
 \fB\-o, \-\-output\fR=\fIpattern\fR
 .RS 4
-Sets the name pattern of the output file\&. Parameter
+Sets the pattern specifying the names of the generated SVG files\&. Parameter
 \fIpattern\fR
-is a string that may contain the variables
+is a string that may contain static character sequences as well as the variables
 \fB%f\fR,
 \fB%p\fR, and
 \fB%P\fR\&.
@@ -438,7 +461,7 @@ expands to the base name of the DVI file, i\&.e\&. the filename without suffix,
 \fB%p\fR
 is the current page number, and
 \fB%P\fR
-the total number of pages in the DVI file\&. An optional number (0\-9) given after the percent sign specifies the minimal number of digits to be written\&. If a particular value is shorter, the number is padded with leading zeros\&. Example:
+the total number of pages in the DVI file\&. An optional number (0\-9) given directly after the percent sign specifies the minimal number of digits to be written\&. If a particular value consists of less digits, the number is padded with leading zeros\&. Example:
 \fB%3p\fR
 enforces 3 digits for the current page number (001, 002, etc\&.)\&. Without an explicit width specifier,
 \fB%p\fR
@@ -475,15 +498,15 @@ is a single\-page document\&. Otherwise, multiple SVG files
 .PP
 \fB\-p, \-\-page\fR=\fIranges\fR
 .RS 4
-This option sets the pages to be processed\&. Parameter
+This option selects the pages to be processed\&. Parameter
 \fIranges\fR
-consists of a comma\-separated list of single page numbers and/or page ranges\&. A page range is a pair of numbers separated by a hyphen, e\&.g\&. 5\-12\&. Thus, a page sequence might look like this: 2\-4,6,9\-12,15\&. It doesn\(cqt matter if a page is given more than once or if page ranges overlap\&. dvisvgm always extracts the page numbers in ascending order and converts them only once\&. In order to stay compatible with previous versions, the default page sequence is 1\&. dvisvgm therefore converts only the first page and not the whole document in case option
+consists of a comma\-separated list of single page numbers and/or page ranges\&. A page range is a pair of numbers separated by a hyphen, e\&.g\&. 5\-12\&. Thus, a page sequence might look like this: 2\-4,6,9\-12,15\&. It doesn\(cqt matter if a page is given more than once or if page ranges overlap\&. dvisvgm always extracts the page numbers in ascending order and converts them only once\&. In order to stay compatible with previous versions, the default page sequence is 1\&. dvisvgm therefore converts only the first page and not the whole document if option
 \fB\-\-page\fR
-is omitted\&. Usually, page ranges consist of two numbers denoting the first and last page to be converted\&. If the conversion is to be started at page 1, or if it should continue up to the last DVI page, the first or second range number can be omitted, respectively\&. Example:
+is omitted\&. Usually, page ranges consist of two numbers denoting the first and last page to be converted\&. If the conversion should start at page 1, or if it should continue up to the last DVI page, the first or second range number can be omitted, respectively\&. Example:
 \fB\-\-page=\-10\fR
 converts all pages up to page 10,
 \fB\-\-page=10\-\fR
-converts all pages starting with page 10\&. Please consider that the page values don\(cqt refer to the page numbers printed on the page\&. Instead, the physical page count is expected, where the first page always gets number 1\&.
+converts all pages starting with page 10\&. Please consider that the page values don\(cqt refer to the page numbers printed on the corresponding page\&. Instead, the physical page count is expected, where the first page always gets number 1\&.
 .RE
 .PP
 \fB\-d, \-\-precision\fR=\fIdigits\fR
@@ -509,9 +532,9 @@ degrees around the page center\&. This option is equivalent to
 .PP
 \fB\-R, \-\-relative\fR
 .RS 4
-SVG allows to define graphics paths by a sequence of absolute and/or relative commands, i\&.e\&. each command expects either absolute coordinates or coordinates relative to the current drawing position\&. By default, dvisvgm creates paths made up of absolute commands\&. If option
+SVG allows to define graphics paths by a sequence of absolute and/or relative path commands, i\&.e\&. each command expects either absolute coordinates or coordinates relative to the current drawing position\&. By default, dvisvgm creates paths made up of absolute commands\&. If option
 \fB\-\-relative\fR
-is given, relative commands are created instead which slightly reduces the size of the SVG files in most cases\&.
+is given, relative commands are created instead\&. This slightly reduces the size of the SVG files in most cases\&.
 .RE
 .PP
 \fB\-s, \-\-stdout\fR
@@ -528,7 +551,7 @@ beginning with a capital letter followed by a list of comma\-separated parameter
 .PP
 \fBT\fR \fItx\fR[,\fIty\fR]
 .RS 4
-Translates (moves) the page in direction of vector (\fItx\fR,\fIty\fR)\&. If
+Translates (moves/shifts) the page in direction of vector (\fItx\fR,\fIty\fR)\&. If
 \fIty\fR
 is omitted,
 \fIty\fR=0 is assumed\&. The expected unit length of
@@ -624,7 +647,7 @@ Applies a transformation described by the 3\(mu3 matrix ((\fIm1\fR,\fIm2\fR,\fIm
 .br
 All transformation commands of option
 \fB\-T, \-\-transform\fR
-are applied in the order of their appearance\&. Multiple commands can optionally be separated by spaces\&. In this case the whole transformation string has to be enclosed in double quotes\&. All parameters are expressions of floating point type\&. You can either give plain numbers or arithmetic terms combined by the operators
+are applied in the order of their appearance\&. Multiple commands can optionally be separated by spaces\&. In this case the whole transformation string has to be enclosed in double quotes to keep them together\&. All parameters are expressions of floating point type\&. You can either give plain numbers or arithmetic terms combined by the operators
 \fB+\fR
 (addition),
 \fB\-\fR
@@ -679,11 +702,13 @@ or
 \fB\-TT1in,0R45\fR
 moves the page content 1 inch to the right and rotates it by 45 degrees around the page center afterwards\&.
 .sp
-For single transformations you can also use options
+For single transformations, there are also the short\-hand options
 \fB\-c\fR,
 \fB\-t\fR
 and
-\fB\-r\fR\&. Note that the order in which these options are given is not significant, i\&.e\&. you can\(cqt use them to describe transformation sequences\&. They are simply independent shorthand options for common transformations\&.
+\fB\-r\fR
+available\&. In contrast to the
+\fB\-\-transform\fR* commands, the order of these options is not significant, so that it\(cqs not possible to describe transformation sequences with them\&.
 .sp .5v
 .RE
 .RE
@@ -707,7 +732,7 @@ lt lt.
 T{
 \fB0\fR
 T}:T{
-no message output
+no message output at all
 T}
 T{
 \fB1\fR
@@ -751,7 +776,7 @@ Prints the version of dvisvgm and exits\&. If the optional argument is set to
 .PP
 \fB\-z, \-\-zip\fR[=\fIlevel\fR]
 .RS 4
-Creates a compressed SVG file with suffix \&.svgz\&. The optional argument specifies the compression level\&. Valid values are in the range of 1 to 9 (default value is 9)\&. Larger values cause better compression results but take more computation time\&.
+Creates a compressed SVG file with suffix \&.svgz\&. The optional argument specifies the compression level\&. Valid values are in the range of 1 to 9 (default value is 9)\&. Larger values cause better compression results but may take slightly more computation time\&.
 .if n \{\
 .sp
 .\}
@@ -778,7 +803,7 @@ and
 \fIheight\fR
 attributes of the SVG root element by argument
 \fIfactor\fR
-while the coordinate system of the graphic is retained\&. As a result, most SVG viewers zoom the graphics accordingly\&. If a negative zoom factor is given, the
+while the coordinate system of the graphic content is retained\&. As a result, most SVG viewers zoom the graphics accordingly\&. If a negative zoom factor is given, the
 \fIwidth\fR
 and
 \fIheight\fR
@@ -786,7 +811,7 @@ attributes are omitted\&.
 .RE
 .SH "SUPPORTED SPECIALS"
 .sp
-dvisvgm supports several sets of \fIspecial commands\fR that can be used to enrich DVI files with additional features, like color, graphics, and hyperlinks\&. The evaluation of special commands is delegated to dedicated handlers\&. Each handler is responsible for all special statements of the same command set, i\&.e\&. commands beginning with the same prefix\&. To get a list of actually provided special handlers, use option \fB\-\-list\-specials\fR (see above)\&. This section gives an overview of the special commands currently supported\&.
+dvisvgm supports several sets of \fIspecial commands\fR that can be used to enrich DVI files with additional features, like color, graphics, and hyperlinks\&. The evaluation of special commands is delegated to dedicated handlers provided by dvisvgm\&. Each handler is responsible for all special statements of the same command set, i\&.e\&. commands beginning with the same prefix\&. To get a list of the actually provided special handlers, use option \fB\-\-list\-specials\fR (see above)\&. This section gives an overview of the special commands currently supported\&.
 .PP
 \fBbgcolor\fR
 .RS 4
@@ -855,7 +880,7 @@ must be unique throughout the DVI file\&. Using
 \fBdvisvgm:rawset\fR
 multiple times together with the same
 \fIname\fR
-leads to a warning message\&.
+leads to warning messages\&.
 .RE
 .PP
 \fBdvisvgm:rawput\fR \fIname\fR
@@ -885,7 +910,8 @@ must be given as plain floating point numbers in TeX point units (1in = 72\&.27p
 \fBdvisvgm:bbox\fR n[ew] \fIname\fR
 .RS 4
 Defines or resets a local bounding box called
-\fIname\fR\&. The name may consist of letters and digits\&. While processing a DVI page, dvisvgm continuously updates the (global) bounding box of the current page in order to determine the minimal rectangle containing all visible page components (characters, images, drawing elements etc\&.) Additionally to the global bounding box, the user can request an arbitrary number of named local bounding boxes\&. Once defined, these boxes are updated together with the global bounding box starting with the first character that follows the definition\&. Thus, the local boxes can be used to compute the extent of parts of the page\&. This is useful for scenarios where the generated SVG file is post\-processed\&. In conjunction with special dvisvgm:raw, the macro
+\fIname\fR\&. The name may consist of letters and digits\&. While processing a DVI page, dvisvgm continuously updates the (global) bounding box of the current page in order to determine the minimal rectangle containing all visible page components (characters, images, drawing elements etc\&.) Additionally to the global bounding box, the user can request an arbitrary number of named local bounding boxes\&. Once defined, these boxes are updated together with the global bounding box starting with the first character that follows the definition\&. Thus, the local boxes can be used to compute the extent of parts of the page\&. This is useful for scenarios where the generated SVG file is post\-processed\&. In conjunction with special
+\fBdvisvgm:raw\fR, the macro
 \fB{?bbox \fR\fB\fIname\fR\fR\fB}\fR
 expands to the four values
 \fIx\fR,
@@ -895,7 +921,7 @@ expands to the four values
 (separated by spaces) specifying the coordinates of the upper left corner, width, and height of the local box
 \fIname\fR\&. If box
 \fIname\fR
-wasn\(cqt previously defined, all four values equal zero\&.
+wasn\(cqt previously defined, all four values equal to zero\&.
 .RE
 .PP
 \fBdvisvgm:bbox\fR \fIwidth\fR \fIheight\fR [\fIdepth\fR]
@@ -992,7 +1018,7 @@ is present\&.
 The PostScript handler also recognizes and evaluates bounding box data generated by the
 \fIpreview\fR
 package with option
-\fItightpage\fR\&. If the data is present in a DVI file, dvisvgm adapts the bounding box of the generated SVG file accordingly, and prints a message showing the width, height, and depth of the box in TeX point units\&. Especially, the depth value can be used to vertically align the SVG graphics with the baseline of surrounding text in HTML or XSL\-FO documents, for example\&.
+\fItightpage\fR\&. If such data is present in a DVI file, dvisvgm adapts the bounding box of the generated SVG file accordingly, and prints a message showing the width, height, and depth of the box in TeX point units\&. Especially, the depth value can be used to vertically align the SVG graphics with the baseline of surrounding text in HTML or XSL\-FO documents, for example\&.
 .RE
 .PP
 \fBtpic\fR
@@ -1054,7 +1080,7 @@ dvisvgm uses the \fBkpathsea\fR library for locating the files that it opens\&.
 .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 via dlopen()\&. The environment variable \fBLIBGS\fR can be used to specify path and file name of the library\&.
 .sp
-The pre\-compiled Windows versions of dvisvgm require a working installation of MiKTeX 2\&.9 or above\&. dvisvgm does not work together with the portable edition of MiKTeX because it relies on MiKTeX\(cqs COM interface only accessible in a local installation\&. To enable the evaluation of PostScript specials, the original Ghostscript DLL \fIgsdll32\&.dll\fR must be present and reachable through the search path\&. 64\-bit Windows builds require the 64\-bit Ghostscript DLL \fIgsdll64\&.dll\fR\&. Both DLLs come with the corresponding Ghostscript installers available from www\&.ghostscript\&.com\&.
+The pre\-compiled Windows versions of dvisvgm require a working installation of MiKTeX 2\&.9 or above\&. dvisvgm does not work together with the portable edition of MiKTeX because it relies on MiKTeX\(cqs COM interface that is only accessible in a local installation\&. To enable the evaluation of PostScript specials, the original Ghostscript DLL \fIgsdll32\&.dll\fR must be present and reachable through the search path\&. 64\-bit Windows builds require the 64\-bit Ghostscript DLL \fIgsdll64\&.dll\fR\&. Both DLLs come with the corresponding Ghostscript installers available from \m[blue]\fBhttp://ghostscript\&.com\fR\m[]\&.
 .sp
 The environment variable \fBDVISVGM_COLORS\fR 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 \fBDVISVGM_COLORS\fR 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 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 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
@@ -1224,7 +1250,7 @@ Code repository
 .RE
 .SH "BUGS"
 .sp
-Please report bugs using the bug tracker at GitHub (\m[blue]https://github.com/mgieseki/dvisvgm/issues\m[]) or Launchpad (\m[blue]https://bugs.launchpad.net/dvisvgm\m[])\&.
+Please report bugs using the bug tracker at GitHub (\m[blue]https://github.com/mgieseki/dvisvgm/issues\m[])\&.
 .SH "AUTHOR"
 .sp
 Written by Martin Gieseking <\m[blue]\fBmartin\&.gieseking@uos\&.de\fR\m[]>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/doc/dvisvgm.txt.in b/Build/source/texk/dvisvgm/dvisvgm-src/doc/dvisvgm.txt.in
index 24b888ccea5..7189d5c874d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/doc/dvisvgm.txt.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/doc/dvisvgm.txt.in
@@ -41,7 +41,7 @@ The command-line utility *dvisvgm* converts DVI files, as generated by TeX/LaTeX
 XML-based scalable vector graphics format SVG. It supports the classic DVI format 2 as
 well as format 3 (created by pTeX in vertical mode), and the XeTeX formats 5 and 6 which are
 also known as XDV. Besides the basic DVI commands, dvisvgm also evaluates many so-called
-'specials' which heavily extend the capabilities of the DVI format. For a more detailed
+'specials' which heavily extend the capabilities of the plain DVI format. For a more detailed
 overview, see section <<specials,*Supported Specials*>> below.
 
 Since the current SVG standard 1.1 doesn't specify multi-page graphics, dvisvgm creates
@@ -50,9 +50,10 @@ is converted by default. In order to select a different page or arbitrary page s
 use option *-p* which is described below.
 
 SVG is a vector-based graphics format and therefore dvisvgm tries to convert the glyph outlines
-of all used fonts to scalable path descriptions. The fastest way to do that is to extract the
-path information from font files in PFB, TTF, or OTF format. If dvisvgm is able to find such
-a file, it extracts all necessary outline information about the glyphs from it.
+of all fonts referenced in a DVI page section to scalable path descriptions. The fastest way
+to achieve this is to extract the path information from vector-based font files available in
+PFB, TTF, or OTF format. If dvisvgm is able to find such a file, it extracts all necessary
+outline information about the glyphs from it.
 
 However, TeX's main source for font descriptions is Metafont, which produces bitmap output
 (GF files). That's why not all obtainable TeX fonts are available in a scalable format.
@@ -60,25 +61,24 @@ In these cases, dvisvgm tries to vectorize Metafont's output by tracing the glyp
 The results are not as perfect as most (manually optimized) PFB or OTF counterparts, but are
 nonetheless really nice in most cases.
 
-When running dvisvgm without option *--no-fonts*, 'font' elements (+<font>+...+</font>+) are used to
-embed the font data into the SVG files. Unfortunately, only few SVG renderes support these
-elements yet. Most web browsers and vector graphics applications don't evaluate them properly
-so that the text components of the resulting graphics might look strange. In order to create
-more compatible SVG files, command-line option *--no-fonts* can be given to replace the font
-elements by plain graphics paths.
+When running dvisvgm without option *--no-fonts*, it creates 'font' elements (+<font>+...+</font>+)
+to embed the font data into the SVG files. Unfortunately, only few SVG renderes support these
+elements yet. Most web browsers and vector graphics applications don't evaluate them properly so
+that the text components of the resulting graphics might look strange. In order to create more
+compatible SVG files, command-line option *--no-fonts* can be given to replace the font elements
+by plain graphics paths.
 
 
 OPTIONS
 -------
 *-a, --trace-all*=['retrace']::
-This option forces dvisvgm to trace not only the actually needed glyphs but all
-glyphs of all bitmap fonts used in the DVI file. Since the tracing results are stored in
-the font cache, all following DVI conversions (without option *--trace-all*) where these
-fonts are involved, will be much faster. By default, dvisvgm traces only the actually
-needed glyphs, and adds them to the cache.
+This option forces dvisvgm to vectorize not only the glyphs actually required to render the
+SVG file correctly – which is the default –, but processes all glyphs of all fonts referenced in
+the DVI file. Because dvisvgm stores the tracing results a font cache, all following conversions these
+fonts will speed up significantly.
 The boolean option 'retrace' determines how to handle glyphs already stored in the cache.
-By default, these glyphs are skipped. Setting argument 'retrace' to 'yes' or
-'true' forces dvisvgm to trace the corresponding bitmaps again.
+By default, these glyphs are skipped. Setting argument 'retrace' to 'yes' or 'true' forces dvisvgm
+to retrace the corresponding bitmaps again.
 +
 [NOTE]
 This option only takes effect if font caching is active. Therefore, *--trace-all* cannot be
@@ -89,15 +89,16 @@ combined with option *--cache=none*.
 *-b, --bbox*='fmt'::
 Sets the bounding box of the generated graphic to the specified format. The parameter 'fmt'
 takes either one of the format specifiers listed below, or a sequence of four comma- or
-whitespace-separated length values 'x1', 'y1', 'x2' and 'y2'. The latter define two diagonal
-corners of the bounding box. Each length value consists of a floating point number and an optional
-length unit (pt, bp, cm, mm, in, or pc). If the unit is omitted, TeX points (pt) are assumed.
+whitespace-separated length values 'x1', 'y1', 'x2' and 'y2'. The latter define the absolute
+coordinates of two diagonal corners of the bounding box. Each length value consists of a floating
+point number and an optional length unit (pt, bp, cm, mm, in, or pc). If the unit is omitted,
+TeX points (pt) are assumed.
 +
 It's also possible to give only one length value 'l'. In this case, the minimal bounding box
 is computed and enlarged by adding (-'l',-'l') to the upper left and ('l','l') to the lower
 right corner.
 +
-Alternatively, the following format specifiers are supported:
+Additionally, dvisvgm also supports the following format specifiers:
  
  *International DIN/ISO paper sizes*;;
  A__n__, B__n__, C__n__, D__n__, where 'n' is a non-negative integer, e.g. A4 or a4 for DIN/ISO A4
@@ -130,23 +131,33 @@ Hence, if you choose a landscape format, the page won't be rotated.
 //
 *-C, --cache*[='dir']::
 To speed up the conversion process of bitmap fonts, dvisvgm saves intermediate conversion
-information in cache files. By default, these files are stored in $HOME/.dvisvgm/cache. If you prefer
-a different location, use option *--cache* to overwrite the default. Furthermore, it is also possible
-to disable the font caching mechanism completely with option *--cache=none*. If argument 'dir' is omitted,
-dvisvgm prints the path of the default cache directory together with further information about the stored fonts.
-Additionally, outdated and corrupted cache files are removed.
+information in cache files. By default, these files are stored in +$HOME/.dvisvgm/cache+.
+If you prefer a different location, use option *--cache* to overwrite the default. Furthermore,
+it is also possible to disable the font caching mechanism completely with option *--cache=none*.
+If argument 'dir' is omitted, dvisvgm prints the path of the default cache directory together
+with further information about the stored fonts. Additionally, outdated and corrupted cache files
+are removed.
 
 
 *-j, --clipjoin*::
-This option tells dvisvgm to compute the intersection of clipping paths itself if necessary,
-and not to delegate this task to the SVG renderer. The resulting SVG files are more portable
-because some SVG renderers don't support intersections of clipping paths which are defined by
-'clipPath' elements that contain a 'clip-path' attribute.
+This option tells dvisvgm to compute all intersections of clipping paths itself rather than
+delegating this task to the SVG renderer. The resulting SVG files are more portable because
+some SVG viewers don't support intersecting clipping paths which are defined by 'clipPath'
+elements containing a 'clip-path' attribute.
 
 
 *--color*::
-Enables colorization of messages printed during the conversion process. The colors can be customized
-via the environment variable *DVISVGM_COLORS*. See the ENVIRONMENT section below for further information.
+Enables colorization of messages printed during the conversion process. The colors can be
+customized via the environment variable *DVISVGM_COLORS*. See the <<environment, Environment section>>
+below for further information.
+
+
+*--colornames*::
+By default, dvisvgm exclusively uses RGB values of the form '#RRGGBB' to represent colors in
+the SVG file. According to the SVG standard, it's also possible to use color names (like +black+
+and +darkblue+) for a limited number of predefined colors. In order to apply these color names
+rather than their RGB values, call dvisvgm with option *--colornames*. All colors without an
+SVG color name will still be represented by RGB values.
 
 
 *-E, --eps*::
@@ -158,7 +169,7 @@ Ghostscript to be available. See option *--libgs* for further information.
 
 
 *-e, --exact*::
-If this option is given, dvisvgm computes the precise bounding box of each character. By default,
+This option tells dvisvgm to compute the precise bounding box of each character. By default,
 the values stored in a font's TFM file are used to determine a glyph's extent. As these values are
 intended to implement optimal character placements and are not designed to represent the exact
 dimensions, they don't necessarily correspond with the bounds of the visual glyphs. Thus, width
@@ -168,25 +179,25 @@ dvisvgm analyzes the actual shape of each character and derives a usually tight
 
 
 *-m, --fontmap*='filenames'::
-Loads and evaluates a single or multiple font map files. These files are required to resolve
-font file names and encodings. dvisvgm does not provide its own map files but tries to read
+Loads and evaluates a single font map file or a sequence of font map files. These files are required
+to resolve font file names and encodings. dvisvgm does not provide its own map files but tries to read
 available ones coming with dvips or dvipdfm. If option *--fontmap* is omitted, dvisvgm looks for the
 default map files 'ps2pk.map', 'dvipdfm.map', and 'psfonts.map' (in this order). Otherwise, the
-listed files are used. Multiple filenames must be separated by commas without leading and/or trailing
-whitespace.
-The map files are evaluated in the given order. By default, redefined mappings do not replace previous ones.
-However, each filename can be preceded by an optional mode specifier (*+*, *-*, or *=*) to change this behavior:
+files as option arguments are evaluated in the given order. Multiple filenames must be separated by
+commas without leading and/or trailing whitespace.
+By default, redefined mappings do not replace previous ones. However, each filename can be preceded by
+an optional mode specifier (*+*, *-*, or *=*) to change this behavior:
  
   +mapfile;;
-    Only those entries in the given map file that don't redefine a font mapping are applied.
-    That's also the default mode if no mode specifier is given.
+    Only those entries in the given map file that don't redefine a font mapping are applied, i.e.
+	 fonts already mapped keep untouched. That's also the default mode if no mode specifier is given.
   
   -mapfile;;
     Ensures that none of the font mappings defined in the given map file are used, i.e. previously
     defined mappings for the specified fonts are removed.
   
   =mapfile;;
-    All mappings defined in the map file are applied. Previously defined settings for the same font
+    All mappings defined in the map file are applied. Previously defined settings for the same fonts
     are replaced.
 +
 If the first filename in the filename sequence is preceded by a mode specifier, dvisvgm loads the
@@ -199,15 +210,16 @@ redefinitions of `myfile2.map` are ignored.
 where all redefinitions of 'myfile1.map' replace previous entries. Afterwards, all definitions for the fonts
 given in 'myfile2.map' are removed from the font map tree.
 +
-For further information about the map file formats and the mode specifiers, see the manuals of dvips and dvipdfm.
+For further information about the map file formats and the mode specifiers, see the manuals of
+dvips and dvipdfm.
 
 
 *--grad-overlap*::
 Tells dvisvgm to create overlapping grid segments when approximating color gradient fills (also see
 option *--grad-segments* below). By default, adjacent segments don't overlap but only touch each other
-like separate tiles. Unfortunately, this alignment can lead to visible gaps between the segments
-because the background influences the color at the boundary of the segments if the SVG renderer uses
-anti-aliasing to create smooth contours.
+like separate tiles. However, this alignment can lead to visible gaps between the segments
+because the background color usually influences the color at the boundary of the segments if the
+SVG renderer uses anti-aliasing to create smooth contours.
 One way to avoid this and to create seamlessly touching color regions is to enlarge the segments so
 that they extent into the area of their right and bottom neighbors. Since the latter are drawn on top
 of the overlapping parts, the visible size of all segments keeps unchanged. Just the former gaps
@@ -222,9 +234,9 @@ Determines the maximal number of segments per column and row used to approximate
 Since SVG 1.1 only supports a small subset of the shading algorithms available in PostScript,
 dvisvgm approximates some of them by subdividing the area to be filled into smaller, monochromatic
 segments. Each of these segments gets the average color of the region it covers. Thus, increasing the
-number of segments leads to smaller monochromatic areas and therefore results in a better approximation
-of the actual color gradient. As a drawback, more segments imply bigger SVG files because every
-segment is represented by a separate path element.
+number of segments leads to smaller monochromatic areas and therefore a better approximation of the
+actual color gradient. As a drawback, more segments imply bigger SVG files because every segment is
+represented by a separate path element.
 +
 Currently, dvisvgm supports free- and lattice-form triangular patch meshes as well as Coons and
 tensor-product patch meshes. They are approximated by subdividing the area of each patch into a
@@ -235,8 +247,8 @@ changed with option *--grad-segments*.
 *--grad-simplify*='delta'::
 If the size of the segments created to approximate gradient color fills falls below the given delta
 value, dvisvgm reduces their level of detail. For example, Bézier curves are replaced by straight
-lines, and triangular segments are combined to tetragons. For a small delta these simplifications
-are usually not noticeable but reduce the size of the generated SVG files.
+lines, and triangular segments are combined to tetragons. For a small 'delta', these simplifications
+are usually not noticeable but reduce the size of the generated SVG files significantly.
 
 
 *-h, --help*[='mode']::
@@ -255,8 +267,8 @@ Disables the removal of temporary files as created by Metafont (usually .gf, .tf
 This option is only available if the Ghostscript library is not directly linked to dvisvgm and if
 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.X (on Unix-like systems, where X is the ABI version of the library) or
-gsdll32.dll/gsdll64.dll (Windows). Option *--libgs* can be used to give a different name.
+to be +libgs.so.X+ (on Unix-like systems, where +X+ is the ABI version of the library) or
++gsdll32.dll+/+gsdll64.dll+ (Windows). Option *--libgs* can be used to give a different name.
 Alternatively, it's also possible to set the GS library name by the environment variable *LIBGS*.
 The latter has less precedence than the command-line option, i.e. dvisvgm ignores variable *LIBGS*
 if *--libgs* is given.
@@ -273,7 +285,7 @@ a hexadecimal RGB value of the form '#RRGGBB', or a
 http://en.wikibooks.org/wiki/LaTeX/Colors#The_68_standard_colors_known_to_dvips[dvips color name].
 +
 Moreover, argument 'style' can take a single color specifier to highlight the linked region by
-a frameless box filled with that color. An optional second color specifier separated by colon
+a frameless box filled with that color. An optional second color specifier separated by a colon
 selects the frame color.
 +
 Examples: +box:red+ or +box:#ff0000+ draws red boxes around the linked areas. +yellow:blue+ creates
@@ -302,7 +314,7 @@ differs from the regular position defined by the characters' advance values.
 
 *--no-mktexmf*::
 Suppresses the generation of missing font files. If dvisvgm can't find a font file
-through the kpathsea lookup mechanism, it calls the external tools mktextfm or mktexmf by.
+through the kpathsea lookup mechanism, it calls the external tools 'mktextfm' or 'mktexmf'.
 This option disables these calls.
 
 
@@ -310,7 +322,8 @@ This option disables these calls.
 If this option is given, dvisvgm doesn't create SVG 'font' elements but uses 'paths' instead. The
 resulting SVG files tend to be larger but they are concurrently more compatible with most applications that
 don't support SVG fonts yet. The optional argument 'variant' selects the method how to substitute fonts
-by paths. Variant 0 creates 'path' and 'use' elements. Variant 1 creates 'path' elements only.
+by paths. Variant 0 creates 'path' and 'use' elements in order to avoid lengthy duplicates.
+Variant 1 creates 'path' elements only.
 Option *--no-fonts* implies *--no-styles*.
 
 
@@ -321,28 +334,30 @@ to *-TS*'sx','sy'.
 
 *-S, --no-specials*[='names']::
 Disable processing of special commands embedded in the DVI file. If no further
-parameter is given, all specials are ignored. To selectively disable sets of specials,
+parameter is given, all specials are ignored. To disable a selected set of specials,
 an optional comma-separated list of names can be appended to this option. A 'name' is the unique
-identifier referencing the intended special handler. Option *--list-specials* lists all currently
-available handlers and their names.
+identifier referencing the intended special handler. Option *--list-specials* lists all handlers 
+currently available together with their names.
 All unsupported special statements are silently ignored.
 
 
 *--no-styles*::
-By default, dvisvgm creates CSS styles and class attributes to reference fonts because it's more
-compact than repeatedly set the complete font information in each text element. However, if you
-prefer direct font references, the default behavior can be disabled with option *--no-styles*.
+By default, dvisvgm creates CSS styles and class attributes to reference fonts. This variant is
+more compact than adding the complete font information to each text element over and over again.
+However, if you prefer direct font references, the default behavior can be disabled with
+option *--no-styles*.
 
 
 *-o, --output*='pattern'::
-Sets the name pattern of the output file. Parameter 'pattern' is a string that may
-contain the variables *%f*, *%p*, and *%P*. *%f* expands to the base name of the DVI file, i.e.
-the filename without suffix, *%p* is the current page number, and *%P* the total number of
-pages in the DVI file. An optional number (0-9) given after the percent sign specifies
-the minimal number of digits to be written. If a particular value is shorter, the number is
-padded with leading zeros. Example: +%3p+ enforces 3 digits for the current page number
-(001, 002, etc.). Without an explicit width specifier, *%p* gets the same number of digits
-as *%P*.
+Sets the pattern specifying the names of the generated SVG files. Parameter 'pattern' is
+a string that may contain static character sequences as well as the variables *%f*, *%p*,
+and *%P*. *%f* expands to the base name of the DVI file, i.e. the filename without suffix,
+*%p* is the current page number, and *%P* the total number of pages in the DVI file. An
+optional number (0-9) given directly after the percent sign specifies the minimal number
+of digits to be written. If a particular value consists of less digits, the number is
+padded with leading zeros.
+Example: +%3p+ enforces 3 digits for the current page number (001, 002, etc.).
+Without an explicit width specifier, *%p* gets the same number of digits as *%P*.
 +
 If you need more control over the numbering, you can use arithmetic expressions as part of
 a pattern. The syntax is *%(expr)* where 'expr' may contain additions, subtractions,
@@ -359,19 +374,20 @@ variables, and must therefore be protected by a second percent sign, e.g. +--out
 
 
 *-p, --page*='ranges'::
-This option sets the pages to be processed. Parameter 'ranges' consists of a comma-separated list
-of single page numbers and/or page ranges. A page range is a pair of numbers separated by a hyphen,
-e.g. 5-12. Thus, a page sequence might look like this: 2-4,6,9-12,15. It doesn't matter if a page
-is given more than once or if page ranges overlap. dvisvgm always extracts the page numbers in
-ascending order and converts them only once.
+This option selects the pages to be processed. Parameter 'ranges' consists of a comma-separated
+list of single page numbers and/or page ranges. A page range is a pair of numbers separated by
+a hyphen, e.g. 5-12. Thus, a page sequence might look like this: 2-4,6,9-12,15. It doesn't matter
+if a page is given more than once or if page ranges overlap. dvisvgm always extracts the page
+numbers in ascending order and converts them only once.
 In order to stay compatible with previous versions, the default page sequence is 1. dvisvgm
-therefore converts only the first page and not the whole document in case option *--page* is omitted.
+therefore converts only the first page and not the whole document if option *--page* is omitted.
 Usually, page ranges consist of two numbers denoting the first and last page to be converted.
-If the conversion is to be started at page 1, or if it should continue up to the last DVI page, the
+If the conversion should start at page 1, or if it should continue up to the last DVI page, the
 first or second range number can be omitted, respectively. Example: +--page=-10+ converts all
 pages up to page 10, +--page=10-+ converts all pages starting with page 10.
-Please consider that the page values don't refer to the page numbers printed on the page.
-Instead, the physical page count is expected, where the first page always gets number 1.
+Please consider that the page values don't refer to the page numbers printed on the
+corresponding page. Instead, the physical page count is expected, where the first page always
+gets number 1.
 
 
 *-d, --precision*='digits'::
@@ -394,10 +410,10 @@ This option is equivalent to *-TR*'angle'.
 
 
 *-R, --relative*::
-SVG allows to define graphics paths by a sequence of absolute and/or relative commands,
+SVG allows to define graphics paths by a sequence of absolute and/or relative path commands,
 i.e. each command expects either absolute coordinates or coordinates relative to the
 current drawing position. By default, dvisvgm creates paths made up of absolute commands.
-If option *--relative* is given, relative commands are created instead which slightly reduces
+If option *--relative* is given, relative commands are created instead. This slightly reduces
 the size of the SVG files in most cases.
 
 
@@ -411,7 +427,7 @@ by a 'command' beginning with a capital letter followed by a list of comma-separ
 parameters. Following transformation commands are supported:
  
   *T* 'tx'[,'ty'];;
-    Translates (moves) the page in direction of vector ('tx','ty'). If 'ty' is omitted,
+    Translates (moves/shifts) the page in direction of vector ('tx','ty'). If 'ty' is omitted,
     'ty'=0 is assumed.
     The expected unit length of 'tx' and 'ty' are TeX points (1pt = 1/72.27in). However, there
     are several constants defined to simplify the unit conversion (see below).
@@ -450,9 +466,9 @@ parameters. Following transformation commands are supported:
 =================================================================================================
 All transformation commands of option *-T, --transform* are applied in the order of their appearance.
 Multiple commands can optionally be separated by spaces. In this case the whole transformation string
-has to be enclosed in double quotes. All parameters are expressions of floating point type. You can either
-give plain numbers or arithmetic terms combined by the operators *+* (addition), *-* (subtraction),
-*** (multiplication), */* (division) or *%* (modulo) with common associativity and
+has to be enclosed in double quotes to keep them together. All parameters are expressions of floating
+point type. You can either give plain numbers or arithmetic terms combined by the operators *+* (addition),
+*-* (subtraction), *** (multiplication), */* (division) or *%* (modulo) with common associativity and
 precedence rules. Parentheses may be used as well.
 
 [[constants]]
@@ -468,9 +484,9 @@ Furthermore, you can use the length constants *pt*, *mm*, *cm* and *in*, e.g.
 +2cm+ or +1.6in+. Thus, option +-TT1in,0R45+ moves the page content 1 inch to the right and rotates it
 by 45 degrees around the page center afterwards.
 
-For single transformations you can also use options *-c*, *-t* and *-r*. Note that
-the order in which these options are given is not significant, i.e. you can't use them to describe
-transformation sequences. They are simply independent shorthand options for common transformations.
+For single transformations, there are also the short-hand options *-c*, *-t* and *-r* available.
+In contrast to the *--transform** commands, the order of these options is not significant, so
+that it's not possible to describe transformation sequences with them.
 
 =================================================================================================
 +
@@ -485,7 +501,7 @@ equivalent to *-TT*'tx','ty'.
 *-v, --verbosity*='level'::
 Controls the type of messages printed during a dvisvgm run:
 [horizontal]
-  *0*;; no message output
+  *0*;; no message output at all
   *1*;; error messages only
   *2*;; warning messages only
   *4*;; informational messages only
@@ -505,15 +521,15 @@ version numbers of the linked libraries are printed as well.
 *-z, --zip*[='level']::
 Creates a compressed SVG file with suffix .svgz. The optional argument specifies the compression
 level. Valid values are in the range of 1 to 9 (default value is 9). Larger values cause better
-compression results but take more computation time.
+compression results but may take slightly more computation time.
 +
 CAUTION: This option cannot be combined with *-s, --stdout*.
 
 
 *-Z, --zoom*[='factor']::
 Multiplies the 'width' and 'height' attributes of the SVG root element by argument 'factor' while
-the coordinate system of the graphic is retained. As a result, most SVG viewers zoom the graphics
-accordingly. If a negative zoom factor is given, the 'width' and 'height' attributes are omitted.
+the coordinate system of the graphic content is retained. As a result, most SVG viewers zoom the
+graphics accordingly. If a negative zoom factor is given, the 'width' and 'height' attributes are omitted.
 
 
 [[specials]]
@@ -521,9 +537,10 @@ SUPPORTED SPECIALS
 ------------------
 dvisvgm supports several sets of 'special commands' that can be used to enrich DVI files with additional
 features, like color, graphics, and hyperlinks. The evaluation of special commands is delegated to dedicated
-handlers. Each handler is responsible for all special statements of the same command set, i.e. commands
-beginning with the same prefix. To get a list of actually provided special handlers, use option
-*--list-specials* (see above). This section gives an overview of the special commands currently supported.
+handlers provided by dvisvgm. Each handler is responsible for all special statements of the same command set,
+i.e. commands beginning with the same prefix. To get a list of the actually provided special handlers, use
+option *--list-specials* (see above). This section gives an overview of the special commands currently
+supported.
 
 *bgcolor*::
 Special statement for changing the background/page color. Since SVG 1.1 doesn't support background colors,
@@ -556,7 +573,7 @@ dvisvgm offers its own small set of specials. The following list gives a brief o
   The two commands *dvisvgm:rawset* and *dvisvgm:endrawset* must not be nested, i.e. each call of *dvisvgm:rawset*
   has to be followed by a corresponding call of *dvisvgm:endrawset* before another *dvisvgm:rawset* may occur.
   Also, the identifier 'name' must be unique throughout the DVI file. Using *dvisvgm:rawset* multiple times
-  together with the same 'name' leads to a warning message.
+  together with the same 'name' leads to warning messages.
 
   *dvisvgm:rawput* 'name';;
   Inserts raw SVG fragments previously stored under the given 'name'. dvisvgm distinguishes between fragments
@@ -577,9 +594,9 @@ dvisvgm offers its own small set of specials. The following list gives a brief o
   Once defined, these boxes are updated together with the global bounding box starting with the first character that
   follows the definition. Thus, the local boxes can be used to compute the extent of parts of the page. This is useful
   for scenarios where the generated SVG file is post-processed.
-  In conjunction with special dvisvgm:raw, the macro *{?bbox 'name'}* expands to the four values 'x', 'y', 'w', and 'h'
+  In conjunction with special *dvisvgm:raw*, the macro *{?bbox 'name'}* expands to the four values 'x', 'y', 'w', and 'h'
   (separated by spaces) specifying the coordinates of the upper left corner, width, and height of the local box 'name'.
-  If box 'name' wasn't previously defined, all four values equal zero.
+  If box 'name' wasn't previously defined, all four values equal to zero.
  
   *dvisvgm:bbox* 'width' 'height' ['depth'];;
   Updates the bounding box of the current page by embedding a virtual rectangle ('x', 'y', 'width', 'height')
@@ -650,7 +667,7 @@ dvisvgm disables the processing of PostScript specials and prints a warning mess
 Use option *--list-specials* to check whether PostScript support is available, i.e. entry 'ps' is present.
 +
 The PostScript handler also recognizes and evaluates bounding box data generated by the 'preview' package with
-option 'tightpage'. If the data is present in a DVI file, dvisvgm adapts the bounding box of the generated SVG file
+option 'tightpage'. If such data is present in a DVI file, dvisvgm adapts the bounding box of the generated SVG file
 accordingly, and prints a message showing the width, height, and depth of the box in TeX point units. Especially,
 the depth value can be used to vertically align the SVG graphics with the baseline of surrounding text in HTML
 or XSL-FO documents, for example.
@@ -684,6 +701,7 @@ dvisvgm --transform="R20,w/3,2h/5 T1cm,1cm S2,3" file
 Converts the first page of 'file.dvi' to 'file.svg' where three transformations are applied.
 
 
+[[environment]]
 ENVIRONMENT
 -----------
 dvisvgm uses the *kpathsea* library for locating the files that it opens.
@@ -695,10 +713,10 @@ can be used to specify path and file name of the library.
 
 The pre-compiled Windows versions of dvisvgm require a working installation of MiKTeX 2.9 or above.
 dvisvgm does not work together with the portable edition of MiKTeX because it relies on MiKTeX's COM
-interface only accessible in a local installation.
+interface that is only accessible in a local installation.
 To enable the evaluation of PostScript specials, the original Ghostscript DLL 'gsdll32.dll' must be present
 and reachable through the search path. 64-bit Windows builds require the 64-bit Ghostscript DLL 'gsdll64.dll'.
-Both DLLs come with the corresponding Ghostscript installers available from www.ghostscript.com.
+Both DLLs come with the corresponding Ghostscript installers available from http://ghostscript.com.
 
 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
@@ -754,8 +772,7 @@ Code repository::: https://github.com/mgieseki/dvisvgm
 
 BUGS
 ----
-Please report bugs using the bug tracker at https://github.com/mgieseki/dvisvgm/issues[GitHub]
-or https://bugs.launchpad.net/dvisvgm[Launchpad].
+Please report bugs using the bug tracker at https://github.com/mgieseki/dvisvgm/issues[GitHub].
 
 
 AUTHOR
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/doc/tweak-dblatex-pdf.xsl b/Build/source/texk/dvisvgm/dvisvgm-src/doc/tweak-dblatex-pdf.xsl
index a28bbb97e30..a28bbb97e30 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/doc/tweak-dblatex-pdf.xsl
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/doc/tweak-dblatex-pdf.xsl
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/m4/ax_code_coverage.m4 b/Build/source/texk/dvisvgm/dvisvgm-src/m4/ax_code_coverage.m4
index 2751459c1d1..2751459c1d1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/m4/ax_code_coverage.m4
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/m4/ax_code_coverage.m4
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/BasicDVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/BasicDVIReader.cpp
index 475a94566b0..475a94566b0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/BasicDVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/BasicDVIReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/BasicDVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/BasicDVIReader.h
index 005269616c3..005269616c3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/BasicDVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/BasicDVIReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Bezier.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/Bezier.cpp
index 46cc79d69d9..46cc79d69d9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Bezier.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Bezier.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Bezier.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/Bezier.h
index dcb6ee393c6..dcb6ee393c6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Bezier.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Bezier.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/BgColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/BgColorSpecialHandler.cpp
index 43bf3a9f68b..43bf3a9f68b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/BgColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/BgColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/BgColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/BgColorSpecialHandler.h
index 1d7ec2fbd10..1d7ec2fbd10 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/BgColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/BgColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Bitmap.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/Bitmap.cpp
index 642f079b7ab..642f079b7ab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Bitmap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Bitmap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/Bitmap.h
index 7a8210abeaa..7a8210abeaa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/BoundingBox.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/BoundingBox.cpp
index 30d711f0eb2..30d711f0eb2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/BoundingBox.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/BoundingBox.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/BoundingBox.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/BoundingBox.h
index 223e0433748..223e0433748 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/BoundingBox.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/BoundingBox.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/CMap.cpp
index 2c9a22c8fbb..2c9a22c8fbb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/CMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CMap.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/CMap.h
index 5a58ced5f3a..5a58ced5f3a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/CMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CMapManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/CMapManager.cpp
index d3b3fd399d6..d3b3fd399d6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CMapManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/CMapManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CMapManager.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/CMapManager.h
index 5388cb90f94..5388cb90f94 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CMapManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/CMapManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CMapReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/CMapReader.cpp
index f655eca5139..f655eca5139 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CMapReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/CMapReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CMapReader.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/CMapReader.h
index a7a243999d7..a7a243999d7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CMapReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/CMapReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CRC32.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/CRC32.cpp
index 09670551baf..09670551baf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CRC32.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/CRC32.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CRC32.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/CRC32.h
index 3eacb17bf33..3eacb17bf33 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CRC32.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/CRC32.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Calculator.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/Calculator.cpp
index d90405e8610..d90405e8610 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Calculator.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Calculator.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Calculator.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/Calculator.h
index 76b07e40a60..76b07e40a60 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Calculator.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Calculator.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CharMapID.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/CharMapID.cpp
index 0bcd054104f..0bcd054104f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CharMapID.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/CharMapID.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CharMapID.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/CharMapID.h
index 0b4e6bf7e17..0b4e6bf7e17 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CharMapID.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/CharMapID.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Character.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/Character.h
index 7ad3a7e36ff..7ad3a7e36ff 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Character.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Character.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CmdLineParserBase.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/CmdLineParserBase.cpp
index da935b4b0dc..da935b4b0dc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CmdLineParserBase.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/CmdLineParserBase.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CmdLineParserBase.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/CmdLineParserBase.h
index 8096fa6500f..8096fa6500f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CmdLineParserBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/CmdLineParserBase.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Color.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/Color.cpp
index 2173cba9594..18c134c696e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Color.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Color.cpp
@@ -31,6 +31,7 @@
 
 using namespace std;
 
+bool Color::SUPPRESS_COLOR_NAMES = true;
 
 const Color Color::BLACK(UInt32(0));
 const Color Color::WHITE(UInt8(255), UInt8(255), UInt8(255));
@@ -49,14 +50,14 @@ static void tolower (string &str) {
 }
 
 
-Color::Color (const char *name) {
-	if (!setName(name, false))
+Color::Color (const char *psname) {
+	if (!setPSName(psname, false))
 		setGray(UInt8(0));
 }
 
 
-Color::Color (const string &name) {
-	if (!setName(name, false))
+Color::Color (const string &psname) {
+	if (!setPSName(psname, false))
 		setGray(UInt8(0));
 }
 
@@ -66,7 +67,11 @@ void Color::setRGB (double r, double g, double b) {
 }
 
 
-bool Color::setName (string name, bool case_sensitive) {
+/** Expects a PostScript color name and sets the color accordingly.
+ *  @param[in] name PS color name
+ *  @param[in] case_sensitive if true, upper/lower case spelling is significant
+ *  @return true if color name could be applied properly */
+bool Color::setPSName (string name, bool case_sensitive) {
 	if (name[0] == '#') {
 		char *p=0;
 		_rgb = UInt32(strtol(name.c_str()+1, &p, 16));
@@ -239,6 +244,171 @@ string Color::rgbString () const {
 }
 
 
+/** Returns an SVG color string representing the current color. The result can
+ *  either be an SVG color name or an RGB string of the form #RRGGBB. The latter
+ *  will be returned if parameter rgbonly is true or if the SVG standard doesn't
+ *  define a name for the current color. */
+string Color::svgColorString (bool rgbonly) const {
+	if (!rgbonly) {
+		static const struct ColorName {
+			UInt32 rgb;
+			const char *name;
+		} colornames[] = {
+			{0x000000, "black"},
+			{0x000080, "navy"},
+			{0x00008b, "darkblue"},
+			{0x0000cd, "mediumblue"},
+			{0x0000ff, "blue"},
+			{0x006400, "darkgreen"},
+			{0x008000, "green"},
+			{0x008080, "teal"},
+			{0x008b8b, "darkcyan"},
+			{0x00bfff, "deepskyblue"},
+			{0x00ced1, "darkturquoise"},
+			{0x00fa9a, "mediumspringgreen"},
+			{0x00ff00, "lime"},
+			{0x00ff7f, "springgreen"},
+			{0x00ffff, "cyan"},
+			{0x191970, "midnightblue"},
+			{0x1e90ff, "dodgerblue"},
+			{0x20b2aa, "lightseagreen"},
+			{0x228b22, "forestgreen"},
+			{0x2e8b57, "seagreen"},
+			{0x2f4f4f, "darkslategray"},
+			{0x32cd32, "limegreen"},
+			{0x3cb371, "mediumseagreen"},
+			{0x40e0d0, "turquoise"},
+			{0x4169e1, "royalblue"},
+			{0x4682b4, "steelblue"},
+			{0x483d8b, "darkslateblue"},
+			{0x48d1cc, "mediumturquoise"},
+			{0x4b0082, "indigo"},
+			{0x556b2f, "darkolivegreen"},
+			{0x5f9ea0, "cadetblue"},
+			{0x6495ed, "cornflowerblue"},
+			{0x66cdaa, "mediumaquamarine"},
+			{0x696969, "dimgray"},
+			{0x6a5acd, "slateblue"},
+			{0x6b8e23, "olivedrab"},
+			{0x708090, "slategray"},
+			{0x778899, "lightslategray"},
+			{0x7b68ee, "mediumslateblue"},
+			{0x7cfc00, "lawngreen"},
+			{0x7fff00, "chartreuse"},
+			{0x7fffd4, "aquamarine"},
+			{0x800000, "maroon"},
+			{0x800080, "purple"},
+			{0x808000, "olive"},
+			{0x808080, "gray"},
+			{0x87ceeb, "skyblue"},
+			{0x87cefa, "lightskyblue"},
+			{0x8a2be2, "blueviolet"},
+			{0x8b0000, "darkred"},
+			{0x8b008b, "darkmagenta"},
+			{0x8b4513, "saddlebrown"},
+			{0x8fbc8f, "darkseagreen"},
+			{0x90ee90, "lightgreen"},
+			{0x9370db, "mediumpurple"},
+			{0x9400d3, "darkviolet"},
+			{0x98fb98, "palegreen"},
+			{0x9932cc, "darkorchid"},
+			{0x9acd32, "yellowgreen"},
+			{0xa0522d, "sienna"},
+			{0xa52a2a, "brown"},
+			{0xa9a9a9, "darkgray"},
+			{0xadd8e6, "lightblue"},
+			{0xadff2f, "greenyellow"},
+			{0xafeeee, "paleturquoise"},
+			{0xb0c4de, "lightsteelblue"},
+			{0xb0e0e6, "powderblue"},
+			{0xb22222, "firebrick"},
+			{0xb8860b, "darkgoldenrod"},
+			{0xba55d3, "mediumorchid"},
+			{0xbc8f8f, "rosybrown"},
+			{0xbdb76b, "darkkhaki"},
+			{0xc0c0c0, "silver"},
+			{0xc71585, "mediumvioletred"},
+			{0xcd5c5c, "indianred"},
+			{0xcd853f, "peru"},
+			{0xd2691e, "chocolate"},
+			{0xd2b48c, "tan"},
+			{0xd3d3d3, "lightgray"},
+			{0xd8bfd8, "thistle"},
+			{0xda70d6, "orchid"},
+			{0xdaa520, "goldenrod"},
+			{0xdb7093, "palevioletred"},
+			{0xdc143c, "crimson"},
+			{0xdcdcdc, "gainsboro"},
+			{0xdda0dd, "plum"},
+			{0xdeb887, "burlywood"},
+			{0xe0ffff, "lightcyan"},
+			{0xe6e6fa, "lavender"},
+			{0xe9967a, "darksalmon"},
+			{0xee82ee, "violet"},
+			{0xeee8aa, "palegoldenrod"},
+			{0xf08080, "lightcoral"},
+			{0xf0e68c, "khaki"},
+			{0xf0f8ff, "aliceblue"},
+			{0xf0fff0, "honeydew"},
+			{0xf0ffff, "azure"},
+			{0xf4a460, "sandybrown"},
+			{0xf5deb3, "wheat"},
+			{0xf5f5dc, "beige"},
+			{0xf5f5f5, "whitesmoke"},
+			{0xf5fffa, "mintcream"},
+			{0xf8f8ff, "ghostwhite"},
+			{0xfa8072, "salmon"},
+			{0xfaebd7, "antiquewhite"},
+			{0xfaf0e6, "linen"},
+			{0xfafad2, "lightgoldenrodyellow"},
+			{0xfdf5e6, "oldlace"},
+			{0xff0000, "red"},
+			{0xff00ff, "magenta"},
+			{0xff1493, "deeppink"},
+			{0xff4500, "orangered"},
+			{0xff6347, "tomato"},
+			{0xff69b4, "hotpink"},
+			{0xff7f50, "coral"},
+			{0xff8c00, "darkorange"},
+			{0xffa07a, "lightsalmon"},
+			{0xffa500, "orange"},
+			{0xffb6c1, "lightpink"},
+			{0xffc0cb, "pink"},
+			{0xffd700, "gold"},
+			{0xffdab9, "peachpuff"},
+			{0xffdead, "navajowhite"},
+			{0xffe4b5, "moccasin"},
+			{0xffe4c4, "bisque"},
+			{0xffe4e1, "mistyrose"},
+			{0xffebcd, "blanchedalmond"},
+			{0xffefd5, "papayawhip"},
+			{0xfff0f5, "lavenderblush"},
+			{0xfff5ee, "seashell"},
+			{0xfff8dc, "cornsilk"},
+			{0xfffacd, "lemonchiffon"},
+			{0xfffaf0, "floralwhite"},
+			{0xfffafa, "snow"},
+			{0xffff00, "yellow"},
+			{0xffffe0, "lightyellow"},
+			{0xfffff0, "ivory"},
+			{0xffffff, "white"}
+		};
+		int left=0;
+		int right=sizeof(colornames)/sizeof(ColorName)-1;
+		while (left <= right) {
+			int mid = left+(right-left)/2;
+			if (colornames[mid].rgb == _rgb)
+				return colornames[mid].name;
+			if (colornames[mid].rgb > _rgb)
+				right = mid-1;
+			else
+				left = mid+1;
+		}
+	}
+	return rgbString();
+}
+
+
 /** Approximates a CMYK color by an RGB triple. The component values
  *  are expected to be normalized, i.e. 0 <= cmyk[i],rgb[j] <= 1.
  *  @param[in]  cmyk color in CMYK space
@@ -506,4 +676,4 @@ int Color::numComponents (ColorSpace colorSpace) {
 		case CMYK_SPACE: return 4;
 	}
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Color.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/Color.h
index 6b1c50d5d71..fe7000897d0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Color.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Color.h
@@ -34,6 +34,7 @@
 class Color
 {
 	public:
+		static bool SUPPRESS_COLOR_NAMES;
 		static const Color BLACK;
 		static const Color WHITE;
 		static const Color TRANSPARENT;
@@ -55,7 +56,7 @@ class Color
 		void setRGB (UInt8 r, UInt8 g, UInt8 b)  {_rgb = (r << 16) | (g << 8) | b;}
 		void setRGB (double r, double g, double b);
 		void setRGB (const std::valarray<double> &rgb) {setRGB(rgb[0], rgb[1], rgb[2]);}
-		bool setName (std::string name, bool case_sensitive=true);
+		bool setPSName (std::string name, bool case_sensitive=true);
 		void setGray (UInt8 g)  {setRGB(g,g,g);}
 		void setGray (double g) {setRGB(g,g,g);}
 		void setGray (const std::valarray<double> &gray) {setRGB(gray[0], gray[0], gray[0]);}
@@ -79,6 +80,8 @@ class Color
 		void operator *= (double c);
 		double deltaE (const Color &c) const;
 		std::string rgbString () const;
+		std::string svgColorString (bool rgbonly) const;
+		std::string svgColorString () const {return svgColorString(SUPPRESS_COLOR_NAMES);}
 		static void CMYK2RGB (const std::valarray<double> &cmyk, std::valarray<double> &rgb);
 		static void RGB2CMYK (const std::valarray<double> &rgb, std::valarray<double> &cmyk);
 		static void HSB2RGB (const std::valarray<double> &hsb, std::valarray<double> &rgb);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/ColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/ColorSpecialHandler.cpp
index b3743a71979..531341b719e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/ColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/ColorSpecialHandler.cpp
@@ -80,7 +80,7 @@ static void read_color (string model, istream &is, Color &color) {
 	}
 	else if (model == "gray")
 		color.setGray(read_double(is));
-	else if (!color.setName(model, true))
+	else if (!color.setPSName(model, true))
 		throw SpecialException("unknown color statement");
 }
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/ColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/ColorSpecialHandler.h
index f945492b05b..f945492b05b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/ColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/ColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CommandLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/CommandLine.cpp
index ead88465ae3..7513563f6c6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CommandLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/CommandLine.cpp
@@ -20,6 +20,7 @@ const CmdLineParserBase::Option CommandLine::_options[] = {
 	{'j', "clipjoin", ARG_NONE, new OptionHandlerImpl<CommandLine>(&CommandLine::handle_clipjoin)},
 #endif
 	{'\0', "color", ARG_NONE, new OptionHandlerImpl<CommandLine>(&CommandLine::handle_color)},
+	{'\0', "colornames", ARG_NONE, new OptionHandlerImpl<CommandLine>(&CommandLine::handle_colornames)},
 #if !defined(DISABLE_GS)
 	{'E', "eps", ARG_NONE, new OptionHandlerImpl<CommandLine>(&CommandLine::handle_eps)},
 #endif
@@ -79,6 +80,7 @@ void CommandLine::init () {
 	_clipjoin_given = false;
 #endif
 	_color_given = false;
+	_colornames_given = false;
 #if !defined(DISABLE_GS)
 	_eps_given = false;
 #endif
@@ -169,6 +171,7 @@ const char** CommandLine::helplines (size_t *numlines) const {
 #if !defined(DISABLE_GS)
 		"o-j, --clipjoin                compute intersection of clipping paths",
 #endif
+		"o    --colornames              prefer color names to RGB values if possible",
 #if !defined(DISABLE_GS)
 		"o    --grad-overlap            create operlapping color gradient segments",
 #endif
@@ -236,6 +239,10 @@ void CommandLine::handle_color (InputReader &ir, const Option &opt, bool longopt
 	_color_given = true;
 }
 
+void CommandLine::handle_colornames (InputReader &ir, const Option &opt, bool longopt) {
+	_colornames_given = true;
+}
+
 #if !defined(DISABLE_GS)
 void CommandLine::handle_eps (InputReader &ir, const Option &opt, bool longopt) {
 	_eps_given = true;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CommandLine.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/CommandLine.h
index 4c68706fc7e..cc85d896fd4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/CommandLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/CommandLine.h
@@ -23,6 +23,7 @@ class CommandLine : public CmdLineParserBase
 		bool clipjoin_given () const {return _clipjoin_given;}
 #endif
 		bool color_given () const {return _color_given;}
+		bool colornames_given () const {return _colornames_given;}
 #if !defined(DISABLE_GS)
 		bool eps_given () const {return _eps_given;}
 #endif
@@ -97,6 +98,7 @@ class CommandLine : public CmdLineParserBase
 		void handle_clipjoin (InputReader &ir, const Option &opt, bool longopt);
 #endif
 		void handle_color (InputReader &ir, const Option &opt, bool longopt);
+		void handle_colornames (InputReader &ir, const Option &opt, bool longopt);
 #if !defined(DISABLE_GS)
 		void handle_eps (InputReader &ir, const Option &opt, bool longopt);
 #endif
@@ -150,6 +152,7 @@ class CommandLine : public CmdLineParserBase
 		bool _clipjoin_given;
 #endif
 		bool _color_given;
+		bool _colornames_given;
 #if !defined(DISABLE_GS)
 		bool _eps_given;
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DLLoader.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/DLLoader.cpp
index f227cae1f80..f227cae1f80 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DLLoader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/DLLoader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DLLoader.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/DLLoader.h
index 6050467277b..6050467277b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DLLoader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/DLLoader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DVIActions.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/DVIActions.h
index d6248d59cf3..d6248d59cf3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DVIActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/DVIActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/DVIReader.cpp
index f84252bff1c..f84252bff1c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/DVIReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/DVIReader.h
index 4a1a5f5f899..4a1a5f5f899 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/DVIReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DVIToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/DVIToSVG.cpp
index 00becb10aeb..00becb10aeb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DVIToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/DVIToSVG.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DVIToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/DVIToSVG.h
index 9e3f5d659ca..9e3f5d659ca 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DVIToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/DVIToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DVIToSVGActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/DVIToSVGActions.cpp
index adf4ebe549d..9553a9d7846 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DVIToSVGActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/DVIToSVGActions.cpp
@@ -176,7 +176,7 @@ void DVIToSVGActions::setRule (double x, double y, double height, double width)
 	if (!getMatrix().isIdentity())
 		rect->addAttribute("transform", getMatrix().getSVG());
 	if (getColor() != Color::BLACK)
-		rect->addAttribute("fill", _svg.getColor().rgbString());
+		rect->addAttribute("fill", _svg.getColor().svgColorString());
 	_svg.appendToPage(rect);
 
 	// update bounding box
@@ -247,7 +247,7 @@ void DVIToSVGActions::endPage (unsigned pageno) {
 		r->addAttribute("y", _bbox.minY());
 		r->addAttribute("width", _bbox.width());
 		r->addAttribute("height", _bbox.height());
-		r->addAttribute("fill", _bgcolor.rgbString());
+		r->addAttribute("fill", _bgcolor.svgColorString());
 		_svg.prependToPage(r);
 	}
 }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DVIToSVGActions.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/DVIToSVGActions.h
index 873f104550a..873f104550a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DVIToSVGActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/DVIToSVGActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DependencyGraph.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/DependencyGraph.h
index e00a68ffbd1..e00a68ffbd1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DependencyGraph.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/DependencyGraph.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Directory.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/Directory.cpp
index 0bc3c555e45..0bc3c555e45 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Directory.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Directory.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Directory.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/Directory.h
index 17bd10f507d..17bd10f507d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Directory.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Directory.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DvisvgmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/DvisvgmSpecialHandler.cpp
index 809172d0b8c..0d97120a2cf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DvisvgmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/DvisvgmSpecialHandler.cpp
@@ -154,7 +154,7 @@ static void expand_constants (string &str, SpecialActions *actions) {
 	constants[] = {
 		{"x", XMLString(actions->getX())},
 		{"y", XMLString(actions->getY())},
-		{"color", actions->getColor().rgbString()},
+		{"color", actions->getColor().svgColorString()},
 		{"nl", "\n"},
 		{0, ""}
 	};
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DvisvgmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/DvisvgmSpecialHandler.h
index fb3a0c754aa..fb3a0c754aa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/DvisvgmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/DvisvgmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/EPSFile.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/EPSFile.cpp
index 3b8632599a3..3b8632599a3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/EPSFile.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/EPSFile.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/EPSFile.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/EPSFile.h
index 24871103327..24871103327 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/EPSFile.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/EPSFile.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/EPSToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/EPSToSVG.cpp
index 555e3549760..555e3549760 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/EPSToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/EPSToSVG.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/EPSToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/EPSToSVG.h
index 841ffe5d0a9..841ffe5d0a9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/EPSToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/EPSToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/EmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/EmSpecialHandler.cpp
index 994f46f7c4b..20293b204bc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/EmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/EmSpecialHandler.cpp
@@ -81,7 +81,7 @@ static void create_line (const DPair &p1, const DPair &p2, char c1, char c2, dou
 		node->addAttribute("x2", p2.x());
 		node->addAttribute("y2", p2.y());
 		node->addAttribute("stroke-width", lw);
-		node->addAttribute("stroke", actions->getColor().rgbString());
+		node->addAttribute("stroke", actions->getColor().svgColorString());
 		// update bounding box
 		actions->embed(p1);
 		actions->embed(p2);
@@ -100,7 +100,7 @@ static void create_line (const DPair &p1, const DPair &p2, char c1, char c2, dou
 			 << XMLString(q21.x()) << ',' << XMLString(q21.y());
 		node->addAttribute("points", oss.str());
 		if (actions->getColor() != Color::BLACK)
-			node->addAttribute("fill", actions->getColor().rgbString());
+			node->addAttribute("fill", actions->getColor().svgColorString());
 		// update bounding box
 		actions->embed(q11);
 		actions->embed(q12);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/EmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/EmSpecialHandler.h
index 7b3c78b6b24..7b3c78b6b24 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/EmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/EmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/EncFile.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/EncFile.cpp
index cc1b8151e14..cc1b8151e14 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/EncFile.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/EncFile.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/EncFile.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/EncFile.h
index 249db961054..249db961054 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/EncFile.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/EncFile.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FileFinder.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/FileFinder.cpp
index 2418c8fb786..2418c8fb786 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FileFinder.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FileFinder.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FileFinder.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/FileFinder.h
index 6727bd3e81d..6727bd3e81d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FileFinder.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FileFinder.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FilePath.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/FilePath.cpp
index fc8430145f5..fc8430145f5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FilePath.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FilePath.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FilePath.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/FilePath.h
index 005d9ecc66e..005d9ecc66e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FilePath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FilePath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FileSystem.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/FileSystem.cpp
index a0c93177ac8..a0c93177ac8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FileSystem.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FileSystem.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FileSystem.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/FileSystem.h
index d14454262ac..d14454262ac 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FileSystem.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FileSystem.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Font.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/Font.cpp
index d09f3c7d334..d09f3c7d334 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Font.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Font.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Font.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/Font.h
index e1959f202e1..e1959f202e1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Font.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Font.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontCache.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontCache.cpp
index df638715785..df638715785 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontCache.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontCache.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontCache.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontCache.h
index 49efb455495..49efb455495 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontCache.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontCache.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontEncoding.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontEncoding.cpp
index d2dbfd8da50..d2dbfd8da50 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontEncoding.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontEncoding.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontEncoding.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontEncoding.h
index e36eb899bac..e36eb899bac 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontEncoding.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontEncoding.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontEngine.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontEngine.cpp
index 633be5514db..bc3ad6a2a65 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontEngine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontEngine.cpp
@@ -239,6 +239,8 @@ int FontEngine::getVAdvance (const Character &c) const {
 
 
 int FontEngine::charIndex (const Character &c) const {
+	if (!_currentFace || !_currentFace->charmap)
+		return c.type() == Character::NAME ? 0 : c.number();
 	switch (c.type()) {
 		case Character::CHRCODE:
 			return FT_Get_Char_Index(_currentFace, (FT_ULong)c.number());
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontEngine.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontEngine.h
index 33a4cf7a63b..33a4cf7a63b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontEngine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontEngine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontManager.cpp
index 36ac5b017c2..4561d5c0ca7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontManager.cpp
@@ -31,7 +31,6 @@
 #include "FileSystem.h"
 #include "Message.h"
 #include "macros.h"
-#include "CMapManager.h"
 
 using namespace std;
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontManager.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontManager.h
index f856eb656a1..f856eb656a1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontMap.cpp
index e6179c8115e..e6179c8115e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontMap.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontMap.h
index 0360a67d3df..0360a67d3df 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontMetrics.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontMetrics.cpp
index 5792e8abbd5..5792e8abbd5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontMetrics.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontMetrics.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontMetrics.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontMetrics.h
index 7e7a9d3e12a..7e7a9d3e12a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontMetrics.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontMetrics.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontStyle.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontStyle.h
index 932c09291cc..932c09291cc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/FontStyle.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontStyle.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/GFGlyphTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/GFGlyphTracer.cpp
index 19d9e0bb533..19d9e0bb533 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/GFGlyphTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/GFGlyphTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/GFGlyphTracer.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/GFGlyphTracer.h
index 1449657465f..1449657465f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/GFGlyphTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/GFGlyphTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/GFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/GFReader.cpp
index 8e10c21373f..8e10c21373f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/GFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/GFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/GFReader.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/GFReader.h
index a644fce901c..a644fce901c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/GFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/GFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/GFTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/GFTracer.cpp
index e071e93e1f6..e071e93e1f6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/GFTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/GFTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/GFTracer.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/GFTracer.h
index a288284f3ab..a288284f3ab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/GFTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/GFTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/Ghostscript.cpp
index 6a58ba0c6b5..6a58ba0c6b5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Ghostscript.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Ghostscript.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Ghostscript.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/Ghostscript.h
index c20c847dfbe..c20c847dfbe 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Ghostscript.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Ghostscript.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Glyph.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/Glyph.h
index d19f130ceaf..d19f130ceaf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Glyph.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Glyph.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/GlyphTracerMessages.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/GlyphTracerMessages.h
index c6190730ecf..c6190730ecf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/GlyphTracerMessages.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/GlyphTracerMessages.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/GraphicPath.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/GraphicPath.h
index 6d377eb8a59..6d377eb8a59 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/GraphicPath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/GraphicPath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/HtmlSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/HtmlSpecialHandler.cpp
index 894c74db665..d8e0c8f30f6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/HtmlSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/HtmlSpecialHandler.cpp
@@ -182,22 +182,22 @@ void HtmlSpecialHandler::markLinkedBox () {
 			double h = linewidth;
 			const Color &linecolor = USE_LINECOLOR ? LINK_LINECOLOR : _actions->getColor();
 			if (MARKER_TYPE == MT_LINE)
-				rect->addAttribute("fill", linecolor.rgbString());
+				rect->addAttribute("fill", linecolor.svgColorString());
 			else {
 				x -= linewidth;
 				y = bbox.minY()-linewidth;
 				w += 2*linewidth;
 				h += bbox.height()+linewidth;
 				if (MARKER_TYPE == MT_BGCOLOR) {
-					rect->addAttribute("fill", LINK_BGCOLOR.rgbString());
+					rect->addAttribute("fill", LINK_BGCOLOR.svgColorString());
 					if (USE_LINECOLOR) {
-						rect->addAttribute("stroke", linecolor.rgbString());
+						rect->addAttribute("stroke", linecolor.svgColorString());
 						rect->addAttribute("stroke-width", linewidth);
 					}
 				}
 				else {  // LM_BOX
 					rect->addAttribute("fill", "none");
-					rect->addAttribute("stroke", linecolor.rgbString());
+					rect->addAttribute("stroke", linecolor.svgColorString());
 					rect->addAttribute("stroke-width", linewidth);
 				}
 			}
@@ -286,13 +286,13 @@ bool HtmlSpecialHandler::setLinkMarker (const string &marker) {
 	else if (type == "box")
 		MARKER_TYPE = MT_BOX;
 	else {
-		if (!LINK_BGCOLOR.setName(type, false))
+		if (!LINK_BGCOLOR.setPSName(type, false))
 			return false;
 		MARKER_TYPE = MT_BGCOLOR;
 	}
 	USE_LINECOLOR = false;
 	if (MARKER_TYPE != MT_NONE && !color.empty()) {
-		if (!LINK_LINECOLOR.setName(color, false))
+		if (!LINK_LINECOLOR.setPSName(color, false))
 			return false;
 		USE_LINECOLOR = true;
 	}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/HtmlSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/HtmlSpecialHandler.h
index 4c5893c0306..4c5893c0306 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/HtmlSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/HtmlSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/InputBuffer.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/InputBuffer.cpp
index acf19e2f1c2..acf19e2f1c2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/InputBuffer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/InputBuffer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/InputBuffer.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/InputBuffer.h
index 35ea9401a6e..35ea9401a6e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/InputBuffer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/InputBuffer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/InputReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/InputReader.cpp
index cfe46f9d87f..cfe46f9d87f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/InputReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/InputReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/InputReader.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/InputReader.h
index 5cf43b6142d..5cf43b6142d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/InputReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/InputReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/JFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/JFM.cpp
index fb93b716d01..fb93b716d01 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/JFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/JFM.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/JFM.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/JFM.h
index e3a98e8e94c..e3a98e8e94c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/JFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/JFM.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Length.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/Length.cpp
index 7ed0a4d1dfe..7ed0a4d1dfe 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Length.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Length.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Length.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/Length.h
index b4782cb8b23..b4782cb8b23 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Length.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Length.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.am
index 837dd0cd633..837dd0cd633 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/MapLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/MapLine.cpp
index d65649a4c34..d65649a4c34 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/MapLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/MapLine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/MapLine.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/MapLine.h
index ea3f92e526e..ea3f92e526e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/MapLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/MapLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Matrix.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/Matrix.cpp
index 06537689c3f..06537689c3f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Matrix.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Matrix.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Matrix.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/Matrix.h
index 02b94299fd5..02b94299fd5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Matrix.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Matrix.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Message.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/Message.cpp
index 17b9b526f9e..17b9b526f9e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Message.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Message.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Message.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/Message.h
index e9ab6bf116b..e9ab6bf116b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Message.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Message.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/MessageException.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/MessageException.h
index c7a84b4b13c..c7a84b4b13c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/MessageException.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/MessageException.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/MetafontWrapper.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/MetafontWrapper.cpp
index 42fcaa266b0..42fcaa266b0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/MetafontWrapper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/MetafontWrapper.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/MetafontWrapper.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/MetafontWrapper.h
index 93266c5122e..93266c5122e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/MetafontWrapper.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/MetafontWrapper.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/MiKTeXCom.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/MiKTeXCom.cpp
index bf43c038035..bf43c038035 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/MiKTeXCom.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/MiKTeXCom.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/MiKTeXCom.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/MiKTeXCom.h
index c278840c9c8..c278840c9c8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/MiKTeXCom.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/MiKTeXCom.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/NoPsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/NoPsSpecialHandler.cpp
index 659cd81818b..659cd81818b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/NoPsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/NoPsSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/NoPsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/NoPsSpecialHandler.h
index 5176d87a2a4..5176d87a2a4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/NoPsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/NoPsSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/NumericRanges.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/NumericRanges.h
index 34be8486fb2..34be8486fb2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/NumericRanges.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/NumericRanges.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PSFilter.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/PSFilter.h
index 3b2a9391250..3b2a9391250 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PSFilter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PSFilter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PSInterpreter.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/PSInterpreter.cpp
index a297bd2bb9b..a297bd2bb9b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PSInterpreter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PSInterpreter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PSInterpreter.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/PSInterpreter.h
index 528e95ca83c..528e95ca83c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PSInterpreter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PSInterpreter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PSPattern.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/PSPattern.cpp
index 99c60c29827..8465df01469 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PSPattern.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PSPattern.cpp
@@ -157,7 +157,7 @@ void PSUncoloredTilingPattern::apply (SpecialActions* actions) {
 			getGroupNode()->getDescendants(0, attribs[i], colored_elems);
 			for (vector<XMLElementNode*>::iterator it=colored_elems.begin(); it != colored_elems.end(); ++it)
 				if (string((*it)->getAttributeValue(attribs[i])) != "none")
-					(*it)->addAttribute(attribs[i], _currentColor.rgbString());
+					(*it)->addAttribute(attribs[i], _currentColor.svgColorString());
 			colored_elems.clear();
 		}
 		PSPattern::apply(actions);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PSPattern.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/PSPattern.h
index d394f5a65ab..d394f5a65ab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PSPattern.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PSPattern.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PSPreviewFilter.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/PSPreviewFilter.cpp
index 5029874c681..5029874c681 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PSPreviewFilter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PSPreviewFilter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PSPreviewFilter.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/PSPreviewFilter.h
index 3e9f9ad2052..3e9f9ad2052 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PSPreviewFilter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PSPreviewFilter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PageRanges.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/PageRanges.cpp
index 8e6339c72e8..8e6339c72e8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PageRanges.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PageRanges.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PageRanges.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/PageRanges.h
index 0f5e2faafa3..0f5e2faafa3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PageRanges.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PageRanges.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PageSize.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/PageSize.cpp
index d3e60571d06..d3e60571d06 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PageSize.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PageSize.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PageSize.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/PageSize.h
index b86218393c1..b86218393c1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PageSize.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PageSize.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Pair.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/Pair.h
index fa27033b199..fa27033b199 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Pair.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Pair.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PathClipper.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/PathClipper.cpp
index 02816ecac18..02816ecac18 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PathClipper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PathClipper.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PathClipper.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/PathClipper.h
index b9c9158a228..b9c9158a228 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PathClipper.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PathClipper.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PdfSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/PdfSpecialHandler.cpp
index 848d38b562d..848d38b562d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PdfSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PdfSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PdfSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/PdfSpecialHandler.h
index cdb24b6ad76..cdb24b6ad76 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PdfSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PdfSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PreScanDVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/PreScanDVIReader.cpp
index 9d45be980f1..9d45be980f1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PreScanDVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PreScanDVIReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PreScanDVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/PreScanDVIReader.h
index 6e1642548f5..6e1642548f5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PreScanDVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PreScanDVIReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Process.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/Process.cpp
index b79331f4fab..3e15c4d6864 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Process.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Process.cpp
@@ -72,9 +72,9 @@ static inline void close_handle (HANDLE handle) {
 #else
 
 /** Extracts whitespace-sparated parameters from a string.
- *  @param[in] paramstr the parameter string
+ *  @param[in,out] paramstr the parameter string
  *  @param[out] params vector holding the extracted parameters */
-static void split_paramstr (string paramstr, vector<const char*> &params) {
+static void split_paramstr (string &paramstr, vector<const char*> &params) {
 	size_t left=0, right=0;  // index of first and last character of current parameter
 	char quote=0;            // current quote character, 0=none
 	const size_t len = paramstr.length();
@@ -163,7 +163,8 @@ bool Process::run (string *out) {
 		}
 		vector<const char*> params;
 		params.push_back(_cmd.c_str());
-		split_paramstr(_paramstr, params);
+		string paramstr = _paramstr;  // private copy to be changed by split_paramstr()
+		split_paramstr(paramstr, params);
 		params.push_back(0);     // trailing NULL marks end
 		execvp(_cmd.c_str(), const_cast<char* const*>(&params[0]));
 		exit(1);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Process.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/Process.h
index bf6deb28a51..45a6b4df020 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Process.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Process.h
@@ -34,7 +34,7 @@ class Process
 
 	private:
 		std::string _cmd;
-		std::string _paramstr;
+		const std::string _paramstr;
 };
 
 #endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/PsSpecialHandler.cpp
index 9e02f353e4b..7140b6be270 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PsSpecialHandler.cpp
@@ -485,7 +485,7 @@ void PsSpecialHandler::stroke (vector<double> &p) {
 			path->addAttribute("cx", x);
 			path->addAttribute("cy", y);
 			path->addAttribute("r", r);
-			path->addAttribute("fill", _actions->getColor().rgbString());
+			path->addAttribute("fill", _actions->getColor().svgColorString());
 			bbox = BoundingBox(x-r, y-r, x+r, y+r);
 		}
 	}
@@ -498,7 +498,7 @@ void PsSpecialHandler::stroke (vector<double> &p) {
 		_path.writeSVG(oss, SVGTree::RELATIVE_PATH_CMDS);
 		path = new XMLElementNode("path");
 		path->addAttribute("d", oss.str());
-		path->addAttribute("stroke", _actions->getColor().rgbString());
+		path->addAttribute("stroke", _actions->getColor().svgColorString());
 		path->addAttribute("fill", "none");
 		if (_linewidth != 1)
 			path->addAttribute("stroke-width", _linewidth);
@@ -565,7 +565,7 @@ void PsSpecialHandler::fill (vector<double> &p, bool evenodd) {
 	if (_pattern)
 		path->addAttribute("fill", XMLString("url(#")+_pattern->svgID()+")");
 	else if (_actions->getColor() != Color::BLACK || _savenode)
-		path->addAttribute("fill", _actions->getColor().rgbString());
+		path->addAttribute("fill", _actions->getColor().svgColorString());
 	if (_clipStack.top()) {
 		// assign clipping path and clip bounding box
 		path->addAttribute("clip-path", XMLString("url(#clip")+XMLString(_clipStack.topID())+")");
@@ -885,7 +885,7 @@ class ShadingCallback : public ShadingPatch::Callback {
 			path.writeSVG(oss, SVGTree::RELATIVE_PATH_CMDS);
 			XMLElementNode *pathElem = new XMLElementNode("path");
 			pathElem->addAttribute("d", oss.str());
-			pathElem->addAttribute("fill", color.rgbString());
+			pathElem->addAttribute("fill", color.svgColorString());
 			_group->append(pathElem);
 		}
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/PsSpecialHandler.h
index 38c04c50afa..38c04c50afa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/PsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PsSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/RangeMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/RangeMap.cpp
index ba9a9463b70..ba9a9463b70 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/RangeMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/RangeMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/RangeMap.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/RangeMap.h
index a1d2f139070..a1d2f139070 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/RangeMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/RangeMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SVGOutput.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/SVGOutput.cpp
index 26621d49303..26621d49303 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SVGOutput.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/SVGOutput.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SVGOutput.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/SVGOutput.h
index b696a32b8f8..b696a32b8f8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SVGOutput.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/SVGOutput.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SVGTree.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/SVGTree.cpp
index 32a4e1cfe6a..fce034a3bf4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SVGTree.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/SVGTree.cpp
@@ -162,7 +162,7 @@ void SVGTree::appendChar (int c, double x, double y, const Font &font) {
 				_ychanged = false;
 			}
 			if (_color.get() != font.color()) {
-					_span->addAttribute("fill", _color.get().rgbString());
+					_span->addAttribute("fill", _color.get().svgColorString());
 				_color.changed(false);
 			}
 			_text->append(_span);
@@ -175,7 +175,7 @@ void SVGTree::appendChar (int c, double x, double y, const Font &font) {
 		}
 		node->append(XMLString(font.unicode(c), false));
 		if (!MERGE_CHARS && _color.get() != font.color()) {
-			node->addAttribute("fill", _color.get().rgbString());
+			node->addAttribute("fill", _color.get().svgColorString());
 			_color.changed(false);
 		}
 	}
@@ -186,7 +186,7 @@ void SVGTree::appendChar (int c, double x, double y, const Font &font) {
 			if (set_color || set_matrix) {
 				_span = new XMLElementNode("g");
 				if (_color.get() != Color::BLACK)
-					_span->addAttribute("fill", _color.get().rgbString());
+					_span->addAttribute("fill", _color.get().svgColorString());
 				if (!_matrix.get().isIdentity())
 					_span->addAttribute("transform", _matrix.get().getSVG());
 				appendToPage(_span);
@@ -267,7 +267,7 @@ void SVGTree::newTextNode (double x, double y) {
 			_text->addAttribute("font-family", font->name());
 			_text->addAttribute("font-size", XMLString(font->scaledSize()));
 			if (font->color() != Color::BLACK)
-				_text->addAttribute("fill", font->color().rgbString());
+				_text->addAttribute("fill", font->color().svgColorString());
 		}
 		if (_vertical) {
 			_text->addAttribute("writing-mode", "tb");
@@ -353,7 +353,7 @@ void SVGTree::appendFontStyles (const set<const Font*> &fonts) {
 				<< "{font-family:" << it->second->name()
 				<< ";font-size:"   << XMLString(it->second->scaledSize()) << "px";
 			if (it->second->color() != Color::BLACK)
-				style << ";fill:" << it->second->color().rgbString();
+				style << ";fill:" << it->second->color().svgColorString();
 			style << "}\n";
 		}
 		XMLCDataNode *cdata = new XMLCDataNode(style.str());
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SVGTree.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/SVGTree.h
index a8d123a013d..a8d123a013d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SVGTree.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/SVGTree.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/ShadingPatch.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/ShadingPatch.cpp
index 057f67f3f65..057f67f3f65 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/ShadingPatch.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/ShadingPatch.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/ShadingPatch.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/ShadingPatch.h
index 84c44041e5e..84c44041e5e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/ShadingPatch.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/ShadingPatch.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SignalHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/SignalHandler.cpp
index 3af78a66012..3af78a66012 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SignalHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/SignalHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SignalHandler.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/SignalHandler.h
index 25ee5fba118..25ee5fba118 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SignalHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/SignalHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SpecialActions.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/SpecialActions.h
index e0f35c78738..e0f35c78738 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SpecialActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/SpecialActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/SpecialHandler.h
index 1924bf12102..1924bf12102 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/SpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SpecialManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/SpecialManager.cpp
index 6699b9ee0c7..6699b9ee0c7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SpecialManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/SpecialManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SpecialManager.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/SpecialManager.h
index 29c325c20cc..29c325c20cc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/SpecialManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/SpecialManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/StreamReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/StreamReader.cpp
index 95722a77c87..95722a77c87 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/StreamReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/StreamReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/StreamReader.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/StreamReader.h
index 24c37c487d2..24c37c487d2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/StreamReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/StreamReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/StreamWriter.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/StreamWriter.cpp
index db336b64d5f..db336b64d5f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/StreamWriter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/StreamWriter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/StreamWriter.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/StreamWriter.h
index a17c891e741..a17c891e741 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/StreamWriter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/StreamWriter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Subfont.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/Subfont.cpp
index b71775e9297..b71775e9297 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Subfont.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Subfont.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Subfont.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/Subfont.h
index 4585a0981df..4585a0981df 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Subfont.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Subfont.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/System.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/System.cpp
index 1bbd4378df4..1bbd4378df4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/System.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/System.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/System.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/System.h
index ffca48e1cd3..ffca48e1cd3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/System.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/System.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/TFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/TFM.cpp
index 6e3ad81eb9a..6e3ad81eb9a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/TFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/TFM.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/TFM.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/TFM.h
index 3afc88ec83d..3afc88ec83d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/TFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/TFM.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/TensorProductPatch.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/TensorProductPatch.cpp
index 2ad8a4c29dc..2ad8a4c29dc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/TensorProductPatch.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/TensorProductPatch.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/TensorProductPatch.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/TensorProductPatch.h
index 50fcac5a1e5..50fcac5a1e5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/TensorProductPatch.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/TensorProductPatch.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Terminal.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/Terminal.cpp
index c0d74a5c16e..c0d74a5c16e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Terminal.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Terminal.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Terminal.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/Terminal.h
index 8998e054f77..8998e054f77 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Terminal.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Terminal.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/ToUnicodeMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/ToUnicodeMap.cpp
index fa749d31f38..fa749d31f38 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/ToUnicodeMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/ToUnicodeMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/ToUnicodeMap.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/ToUnicodeMap.h
index bf7788b7b98..bf7788b7b98 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/ToUnicodeMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/ToUnicodeMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/TpicSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/TpicSpecialHandler.cpp
index de769352019..93fe0b19385 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/TpicSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/TpicSpecialHandler.cpp
@@ -85,7 +85,7 @@ void TpicSpecialHandler::drawLines (bool stroke, bool fill, double ddist, Specia
 				Color color = actions->getColor();
 				color *= _fill;
 				elem = new XMLElementNode("polygon");
-				elem->addAttribute("fill", fill ? color.rgbString() : "none");
+				elem->addAttribute("fill", fill ? color.svgColorString() : "none");
 			}
 			ostringstream oss;
 			FORALL(_points, vector<DPair>::iterator, it) {
@@ -155,7 +155,7 @@ void TpicSpecialHandler::drawSplines (double ddist, SpecialActions *actions) {
 		if (_fill >= 0) {
 			if (_points[0] != _points[size-1])
 				path.closepath();
-			pathElem->addAttribute("fill", color.rgbString());
+			pathElem->addAttribute("fill", color.svgColorString());
 		}
 		else
 			pathElem->addAttribute("fill", "none");
@@ -163,7 +163,7 @@ void TpicSpecialHandler::drawSplines (double ddist, SpecialActions *actions) {
 		ostringstream oss;
 		path.writeSVG(oss, SVGTree::RELATIVE_PATH_CMDS);
 		pathElem->addAttribute("d", oss.str());
-		pathElem->addAttribute("stroke", actions->getColor().rgbString());
+		pathElem->addAttribute("stroke", actions->getColor().svgColorString());
 		pathElem->addAttribute("stroke-width", XMLString(_penwidth));
 		if (ddist > 0)
 			pathElem->addAttribute("stroke-dasharray", XMLString(ddist));
@@ -227,13 +227,13 @@ void TpicSpecialHandler::drawArc (double cx, double cy, double rx, double ry, do
 			elem->addAttribute("d", oss.str());
 		}
 		elem->addAttribute("stroke-width", _penwidth);
-		elem->addAttribute("stroke", actions->getColor().rgbString());
+		elem->addAttribute("stroke", actions->getColor().svgColorString());
 		elem->addAttribute("stroke-linecap", "round");
 		elem->addAttribute("fill", "none");
 		if (_fill >= 0) {
 			Color color=actions->getColor();
 			color *= _fill;
-			elem->addAttribute("fill", color.rgbString());
+			elem->addAttribute("fill", color.svgColorString());
 		}
 		else
 			elem->addAttribute("fill", "none");
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/TpicSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/TpicSpecialHandler.h
index 3c5ea9fa876..3c5ea9fa876 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/TpicSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/TpicSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/TriangularPatch.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/TriangularPatch.cpp
index 75b3132345b..75b3132345b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/TriangularPatch.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/TriangularPatch.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/TriangularPatch.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/TriangularPatch.h
index d18d76ebb0a..d18d76ebb0a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/TriangularPatch.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/TriangularPatch.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Unicode.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/Unicode.cpp
index b0a8ace7f3b..b0a8ace7f3b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Unicode.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Unicode.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Unicode.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/Unicode.h
index 738f38a6e3a..738f38a6e3a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/Unicode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Unicode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/VFActions.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/VFActions.h
index 886771e75a7..886771e75a7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/VFActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/VFActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/VFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/VFReader.cpp
index f17a82c02f7..f17a82c02f7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/VFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/VFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/VFReader.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/VFReader.h
index 00467f5746a..00467f5746a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/VFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/VFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/VectorIterator.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/VectorIterator.h
index dc27327a60c..dc27327a60c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/VectorIterator.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/VectorIterator.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/VectorStream.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/VectorStream.h
index f3043943669..f3043943669 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/VectorStream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/VectorStream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/XMLDocument.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLDocument.cpp
index 6b73f7cd436..6b73f7cd436 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/XMLDocument.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLDocument.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/XMLDocument.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLDocument.h
index e3b2727dfd9..e3b2727dfd9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/XMLDocument.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLDocument.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/XMLNode.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLNode.cpp
index 4fd3b997391..4fd3b997391 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/XMLNode.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLNode.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/XMLNode.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLNode.h
index 71bd5a8ada9..71bd5a8ada9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/XMLNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLNode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/XMLString.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLString.cpp
index 97aa91ee4ab..97aa91ee4ab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/XMLString.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLString.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/XMLString.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLString.h
index f160c4427a4..f160c4427a4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/XMLString.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLString.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/dvisvgm.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/dvisvgm.cpp
index 03e40623982..db0dd86fd69 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/dvisvgm.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/dvisvgm.cpp
@@ -256,6 +256,7 @@ int main (int argc, char *argv[]) {
 		DVIReader::COMPUTE_PROGRESS = args.progress_given();
 		SpecialActions::PROGRESSBAR_DELAY = args.progress_arg();
 	}
+	Color::SUPPRESS_COLOR_NAMES = !args.colornames_given();
 	SVGTree::CREATE_STYLE = !args.no_styles_given();
 	SVGTree::USE_FONTS = !args.no_fonts_given();
 	SVGTree::CREATE_USE_ELEMENTS = args.no_fonts_arg() < 1;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/gzstream.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/gzstream.cpp
index 2893c299891..2893c299891 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/gzstream.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/gzstream.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/gzstream.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/gzstream.h
index 60f38c4fac7..60f38c4fac7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/gzstream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/gzstream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/iapi.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/iapi.h
index 8e29d938d03..8e29d938d03 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/iapi.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/iapi.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/ierrors.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/ierrors.h
index 3184341177e..3184341177e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/ierrors.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/ierrors.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/macros.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/macros.h
index 50deb9417c1..50deb9417c1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/macros.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/macros.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/options.dtd b/Build/source/texk/dvisvgm/dvisvgm-src/src/options.dtd
index c5321e3444b..c5321e3444b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/options.dtd
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/options.dtd
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/options.xml b/Build/source/texk/dvisvgm/dvisvgm-src/src/options.xml
index a05d4489ef3..f56f219a0a8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/options.xml
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/options.xml
@@ -49,6 +49,9 @@
 			<option long="clipjoin" short="j" if="!defined(DISABLE_GS)">
 				<description>compute intersection of clipping paths</description>
 			</option>
+			<option long="colornames">
+				<description>prefer color names to RGB values if possible</description>
+			</option>
 			<option long="grad-overlap" if="!defined(DISABLE_GS)">
 				<description>create operlapping color gradient segments</description>
 			</option>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/psdefs.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp
index a9a818a3fe7..a9a818a3fe7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/psdefs.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/types.h b/Build/source/texk/dvisvgm/dvisvgm-src/src/types.h
index 54a028fe085..54a028fe085 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/src/types.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/types.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/xxHash/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-src/xxHash/Makefile.am
index df0a4c53238..df0a4c53238 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/xxHash/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/xxHash/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/xxHash/xxhash.c b/Build/source/texk/dvisvgm/dvisvgm-src/xxHash/xxhash.c
index e6fb8f149a5..e6fb8f149a5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/xxHash/xxhash.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/xxHash/xxhash.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.11/xxHash/xxhash.h b/Build/source/texk/dvisvgm/dvisvgm-src/xxHash/xxhash.h
index c60aa61571c..c60aa61571c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.11/xxHash/xxhash.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/xxHash/xxhash.h
diff --git a/Build/source/texk/dvisvgm/version.ac b/Build/source/texk/dvisvgm/version.ac
index 68ed2dd9df5..c48fac49e88 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.11])
+m4_define([dvisvgm_version], [1.12])