summaryrefslogtreecommitdiff
path: root/dviware
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-03-11 03:01:57 +0000
committerNorbert Preining <norbert@preining.info>2023-03-11 03:01:57 +0000
commit6d29701d91e7deb368e3829e1ff11dcf483cd2fb (patch)
tree48b99cc0de5eddd0e49f8a6d0e5f515763b408f5 /dviware
parentf6cb3d263826846efe7b926e6ad2092198db0522 (diff)
CTAN sync 202303110301
Diffstat (limited to 'dviware')
-rw-r--r--dviware/dvisvgm/Makefile.in4
-rw-r--r--dviware/dvisvgm/NEWS8
-rw-r--r--dviware/dvisvgm/README7
-rw-r--r--dviware/dvisvgm/aminclude_static.am2
-rw-r--r--dviware/dvisvgm/config.h.in3
-rwxr-xr-xdviware/dvisvgm/configure140
-rw-r--r--dviware/dvisvgm/configure.ac10
-rw-r--r--dviware/dvisvgm/doc/Makefile.in2
-rw-r--r--dviware/dvisvgm/doc/dvisvgm.18
-rw-r--r--dviware/dvisvgm/doc/dvisvgm.txt.in4
-rw-r--r--dviware/dvisvgm/libs/Makefile.in2
-rw-r--r--dviware/dvisvgm/libs/boost/Makefile.in2
-rw-r--r--dviware/dvisvgm/libs/brotli/Makefile.in2
-rw-r--r--dviware/dvisvgm/libs/clipper/Makefile.in2
-rw-r--r--dviware/dvisvgm/libs/defs.am3
-rw-r--r--dviware/dvisvgm/libs/md5/Makefile.am3
-rw-r--r--dviware/dvisvgm/libs/md5/Makefile.in15
-rw-r--r--dviware/dvisvgm/libs/potrace/Makefile.in2
-rw-r--r--dviware/dvisvgm/libs/variant/Makefile.in2
-rw-r--r--dviware/dvisvgm/libs/woff2/Makefile.in2
-rw-r--r--dviware/dvisvgm/libs/xxHash/Makefile.in2
-rw-r--r--dviware/dvisvgm/src/InputBuffer.cpp45
-rw-r--r--dviware/dvisvgm/src/InputBuffer.hpp22
-rw-r--r--dviware/dvisvgm/src/InputReader.cpp2
-rw-r--r--dviware/dvisvgm/src/InputReader.hpp2
-rw-r--r--dviware/dvisvgm/src/MD5HashFunction.hpp8
-rw-r--r--dviware/dvisvgm/src/Makefile.am40
-rw-r--r--dviware/dvisvgm/src/Makefile.in65
-rw-r--r--dviware/dvisvgm/src/Process.cpp7
-rw-r--r--dviware/dvisvgm/src/PsSpecialHandler.cpp16
-rw-r--r--dviware/dvisvgm/src/fonts/Makefile.in2
-rw-r--r--dviware/dvisvgm/src/optimizer/Makefile.in2
-rw-r--r--dviware/dvisvgm/src/ttf/Makefile.in2
-rw-r--r--dviware/dvisvgm/tests/Makefile.am13
-rw-r--r--dviware/dvisvgm/tests/Makefile.in144
-rw-r--r--dviware/dvisvgm/tests/data/Makefile.in2
36 files changed, 232 insertions, 365 deletions
diff --git a/dviware/dvisvgm/Makefile.in b/dviware/dvisvgm/Makefile.in
index 160efa911e..97e8c49f34 100644
--- a/dviware/dvisvgm/Makefile.in
+++ b/dviware/dvisvgm/Makefile.in
@@ -15,7 +15,7 @@
@SET_MAKE@
# aminclude_static.am generated automatically by Autoconf
-# from AX_AM_MACROS_STATIC on Tue Feb 21 11:55:35 CET 2023
+# from AX_AM_MACROS_STATIC on Fri Mar 10 10:15:03 CET 2023
VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
@@ -276,8 +276,6 @@ KPSE_LIBS = @KPSE_LIBS@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
-LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
diff --git a/dviware/dvisvgm/NEWS b/dviware/dvisvgm/NEWS
index c610fad9bc..4d262a71fa 100644
--- a/dviware/dvisvgm/NEWS
+++ b/dviware/dvisvgm/NEWS
@@ -1,3 +1,11 @@
+dvisvgm-3.0.4 (2023-03-10)
+- fixed issue that could prevent reading the output of subprocesses
+ (GH issue #232)
+- removed optional dependency on libcrypto (OpenSSL) because the MD5 functions
+ have been deprecated (always using the bundled MD5 function now)
+- added TeX Live conditionals to the build system (patch by Karl Berry)
+- small code and manual page improvements
+
dvisvgm-3.0.3 (2023-02-21)
- fixed resetting of character contexts (GH issue #227)
- added missing #includes required for GCC 13
diff --git a/dviware/dvisvgm/README b/dviware/dvisvgm/README
index 0dbbc51a35..a69ecda5d0 100644
--- a/dviware/dvisvgm/README
+++ b/dviware/dvisvgm/README
@@ -34,13 +34,6 @@ DEPENDENCIES
searching files in the large texmf tree. Please ensure that you use the
kpathsea version coming with or matching your TeX system.
- * OpenSSL crypto library (https://www.openssl.org)
- dvisvgm comes with a bundled implementation of the MD5 hash algorithm which
- can optionally be replaced with the corresponding function of the OpenSSL
- crypto library. If the configuration script finds the OpenSSL development
- files on the build system, it links against libcrypto instead of the bundled
- MD5 module.
-
* potracelib (http://potrace.sourceforge.net)
Peter Selinger's bitmap tracing library is utilized to vectorize Metafont's
bitmap output. A recent version is also part of the dvisvgm sources.
diff --git a/dviware/dvisvgm/aminclude_static.am b/dviware/dvisvgm/aminclude_static.am
index 8892cc24c0..a76abf305d 100644
--- a/dviware/dvisvgm/aminclude_static.am
+++ b/dviware/dvisvgm/aminclude_static.am
@@ -1,6 +1,6 @@
# aminclude_static.am generated automatically by Autoconf
-# from AX_AM_MACROS_STATIC on Tue Feb 21 11:55:35 CET 2023
+# from AX_AM_MACROS_STATIC on Fri Mar 10 10:15:03 CET 2023
# Code coverage
diff --git a/dviware/dvisvgm/config.h.in b/dviware/dvisvgm/config.h.in
index f649cc3dcb..2f4dea5984 100644
--- a/dviware/dvisvgm/config.h.in
+++ b/dviware/dvisvgm/config.h.in
@@ -49,9 +49,6 @@
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
#undef HAVE_NDIR_H
-/* Define to 1 if you have the <openssl/md5.h> header file. */
-#undef HAVE_OPENSSL_MD5_H
-
/* Define to 1 if you have the `sigaction' function. */
#undef HAVE_SIGACTION
diff --git a/dviware/dvisvgm/configure b/dviware/dvisvgm/configure
index 7ad9ff707e..87202e1eba 100755
--- a/dviware/dvisvgm/configure
+++ b/dviware/dvisvgm/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for dvisvgm 3.0.3.
+# Generated by GNU Autoconf 2.71 for dvisvgm 3.0.4.
#
# Report bugs to <martin.gieseking@uos.de>.
#
@@ -621,8 +621,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='dvisvgm'
PACKAGE_TARNAME='dvisvgm'
-PACKAGE_VERSION='3.0.3'
-PACKAGE_STRING='dvisvgm 3.0.3'
+PACKAGE_VERSION='3.0.4'
+PACKAGE_STRING='dvisvgm 3.0.4'
PACKAGE_BUGREPORT='martin.gieseking@uos.de'
PACKAGE_URL=''
@@ -687,10 +687,6 @@ ASCIIDOC
ZLIB_LIBS
ZLIB_CFLAGS
LIBOBJS
-USE_BUNDLED_MD5_FALSE
-USE_BUNDLED_MD5_TRUE
-LIBCRYPTO_LIBS
-LIBCRYPTO_CFLAGS
TTFAUTOHINT_LIBS
TTFAUTOHINT_CFLAGS
HAVE_XXHASH_FALSE
@@ -764,6 +760,8 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+TEXLIVE_BUILD_FALSE
+TEXLIVE_BUILD_TRUE
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
@@ -890,9 +888,7 @@ BROTLI_LIBS
WOFF2_CFLAGS
WOFF2_LIBS
TTFAUTOHINT_CFLAGS
-TTFAUTOHINT_LIBS
-LIBCRYPTO_CFLAGS
-LIBCRYPTO_LIBS'
+TTFAUTOHINT_LIBS'
# Initialize some variables set by options.
@@ -1441,7 +1437,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 3.0.3 to adapt to many kinds of systems.
+\`configure' configures dvisvgm 3.0.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1512,7 +1508,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dvisvgm 3.0.3:";;
+ short | recursive ) echo "Configuration of dvisvgm 3.0.4:";;
esac
cat <<\_ACEOF
@@ -1589,10 +1585,6 @@ Some influential environment variables:
C compiler flags for TTFAUTOHINT, overriding pkg-config
TTFAUTOHINT_LIBS
linker flags for TTFAUTOHINT, overriding pkg-config
- LIBCRYPTO_CFLAGS
- C compiler flags for LIBCRYPTO, overriding pkg-config
- LIBCRYPTO_LIBS
- linker flags for LIBCRYPTO, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1661,7 +1653,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dvisvgm configure 3.0.3
+dvisvgm configure 3.0.4
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2141,7 +2133,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dvisvgm $as_me 3.0.3, which was
+It was created by dvisvgm $as_me 3.0.4, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -3118,7 +3110,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DATE="February 2023"
+DATE="March 2023"
ac_config_headers="$ac_config_headers config.h"
@@ -3712,7 +3704,7 @@ fi
# Define the identity of the package.
PACKAGE='dvisvgm'
- VERSION='3.0.3'
+ VERSION='3.0.4'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -3816,6 +3808,15 @@ END
fi
+ if test "x$enable_texlive_build" = xyes; then
+ TEXLIVE_BUILD_TRUE=
+ TEXLIVE_BUILD_FALSE='#'
+else
+ TEXLIVE_BUILD_TRUE='#'
+ TEXLIVE_BUILD_FALSE=
+fi
+
+
printf "%s\n" "#define HOST_SYSTEM \"$host\"" >>confdefs.h
@@ -19492,93 +19493,6 @@ fi
fi
fi
-ac_fn_c_check_header_compile "$LINENO" "openssl/md5.h" "ac_cv_header_openssl_md5_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_md5_h" = xyes
-then :
- printf "%s\n" "#define HAVE_OPENSSL_MD5_H 1" >>confdefs.h
-
-fi
-
-
-pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBCRYPTO" >&5
-printf %s "checking for LIBCRYPTO... " >&6; }
-
-if test -n "$LIBCRYPTO_CFLAGS"; then
- pkg_cv_LIBCRYPTO_CFLAGS="$LIBCRYPTO_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcrypto\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libcrypto") 2>&5
- ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LIBCRYPTO_CFLAGS=`$PKG_CONFIG --cflags "libcrypto" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$LIBCRYPTO_LIBS"; then
- pkg_cv_LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcrypto\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libcrypto") 2>&5
- ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LIBCRYPTO_LIBS=`$PKG_CONFIG --libs "libcrypto" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- LIBCRYPTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcrypto" 2>&1`
- else
- LIBCRYPTO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcrypto" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBCRYPTO_PKG_ERRORS" >&5
-
- HAVE_LIBCRYPTO=0
-elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
- HAVE_LIBCRYPTO=0
-else
- LIBCRYPTO_CFLAGS=$pkg_cv_LIBCRYPTO_CFLAGS
- LIBCRYPTO_LIBS=$pkg_cv_LIBCRYPTO_LIBS
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
- HAVE_LIBCRYPTO=1
-fi
- if test "$HAVE_LIBCRYPTO" -eq 0; then
- USE_BUNDLED_MD5_TRUE=
- USE_BUNDLED_MD5_FALSE='#'
-else
- USE_BUNDLED_MD5_TRUE='#'
- USE_BUNDLED_MD5_FALSE=
-fi
-
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
printf %s "checking for gzopen in -lz... " >&6; }
if test ${ac_cv_lib_z_gzopen+y}
@@ -20927,6 +20841,10 @@ else
am__EXEEXT_FALSE=
fi
+if test -z "${TEXLIVE_BUILD_TRUE}" && test -z "${TEXLIVE_BUILD_FALSE}"; then
+ as_fn_error $? "conditional \"TEXLIVE_BUILD\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
as_fn_error $? "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20963,10 +20881,6 @@ if test -z "${HAVE_XXHASH_TRUE}" && test -z "${HAVE_XXHASH_FALSE}"; then
as_fn_error $? "conditional \"HAVE_XXHASH\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${USE_BUNDLED_MD5_TRUE}" && test -z "${USE_BUNDLED_MD5_FALSE}"; then
- as_fn_error $? "conditional \"USE_BUNDLED_MD5\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${BUILD_MANPAGE_TRUE}" && test -z "${BUILD_MANPAGE_FALSE}"; then
as_fn_error $? "conditional \"BUILD_MANPAGE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -21365,7 +21279,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by dvisvgm $as_me 3.0.3, which was
+This file was extended by dvisvgm $as_me 3.0.4, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21433,7 +21347,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-dvisvgm config.status 3.0.3
+dvisvgm config.status 3.0.4
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff --git a/dviware/dvisvgm/configure.ac b/dviware/dvisvgm/configure.ac
index f2ea0467ee..07ef2eb1c2 100644
--- a/dviware/dvisvgm/configure.ac
+++ b/dviware/dvisvgm/configure.ac
@@ -4,14 +4,16 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([dvisvgm],[3.0.3],[martin.gieseking@uos.de])
-DATE="February 2023"
+AC_INIT([dvisvgm],[3.0.4],[martin.gieseking@uos.de])
+DATE="March 2023"
AC_CONFIG_SRCDIR(src)
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_HOST
AM_INIT_AUTOMAKE([subdir-objects dist-xz])
+AM_CONDITIONAL([TEXLIVE_BUILD], [test "x$enable_texlive_build" = xyes])
+
AH_TEMPLATE([HOST_SYSTEM], [The machine triplet of the host system])
AC_DEFINE_UNQUOTED([HOST_SYSTEM], ["$host"])
@@ -136,10 +138,6 @@ AS_IF([test "x$enable_woff" != "xyes"],
[AC_MSG_WARN([disabled ttfautohint support])])])]
[AC_SUBST(TTFAUTOHINT_CFLAGS) AC_SUBST(TTFAUTOHINT_LIBS)])])
-AC_CHECK_HEADERS([openssl/md5.h])
-PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto], [HAVE_LIBCRYPTO=1], [HAVE_LIBCRYPTO=0])
-AM_CONDITIONAL([USE_BUNDLED_MD5], [test "$HAVE_LIBCRYPTO" -eq 0])
-
AC_CHECK_LIB(z, gzopen)
# Check for header files.
diff --git a/dviware/dvisvgm/doc/Makefile.in b/dviware/dvisvgm/doc/Makefile.in
index d9d639c5c3..3ec7a8cac2 100644
--- a/dviware/dvisvgm/doc/Makefile.in
+++ b/dviware/dvisvgm/doc/Makefile.in
@@ -225,8 +225,6 @@ KPSE_LIBS = @KPSE_LIBS@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
-LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
diff --git a/dviware/dvisvgm/doc/dvisvgm.1 b/dviware/dvisvgm/doc/dvisvgm.1
index 063eb4b3da..7dc660abe4 100644
--- a/dviware/dvisvgm/doc/dvisvgm.1
+++ b/dviware/dvisvgm/doc/dvisvgm.1
@@ -2,12 +2,12 @@
.\" Title: dvisvgm
.\" Author: Martin Gieseking <martin.gieseking@uos.de>
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\" Date: 2022-10-14
+.\" Date: 2023-02-21
.\" Manual: dvisvgm Manual
-.\" Source: dvisvgm 3.0.3
+.\" Source: dvisvgm 3.0.4
.\" Language: English
.\"
-.TH "DVISVGM" "1" "2022\-10\-14" "dvisvgm 3\&.0\&.3" "dvisvgm Manual"
+.TH "DVISVGM" "1" "2023\-02\-21" "dvisvgm 3\&.0\&.4" "dvisvgm Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -299,7 +299,7 @@ predefined colors (\m[blue]https://www.w3.org/TR/SVG11/types.html#ColorKeywords\
Adds comments with further information about selected data to the SVG file\&. Currently, only font elements and font CSS rules related to native fonts are annotated\&.
.RE
.PP
-\fBembed\-bitmaps\fR
+\fB\-\-embed\-bitmaps\fR
.RS 4
Embeds the contents of bitmap files into the generated SVG files instead of adding file references\&. Because of the base64\-encoded data, the SVG files are usually much bigger but at the same time more portable because they don\(cqt rely on external bitmap files\&.
.sp
diff --git a/dviware/dvisvgm/doc/dvisvgm.txt.in b/dviware/dvisvgm/doc/dvisvgm.txt.in
index f415189aef..a5968c2bcc 100644
--- a/dviware/dvisvgm/doc/dvisvgm.txt.in
+++ b/dviware/dvisvgm/doc/dvisvgm.txt.in
@@ -22,7 +22,7 @@ Martin Gieseking <@PACKAGE_BUGREPORT@>
:man source: dvisvgm
:man version: @VERSION@
:man manual: dvisvgm Manual
-:revdate: 2022-10-14 12:56 +0200
+:revdate: 2023-02-21 19:20 +0100
Name
----
@@ -206,7 +206,7 @@ In order to apply these color names rather than their RGB values, call dvisvgm w
Adds comments with further information about selected data to the SVG file. Currently, only
font elements and font CSS rules related to native fonts are annotated.
-*embed-bitmaps*::
+*--embed-bitmaps*::
Embeds the contents of bitmap files into the generated SVG files instead of adding file references.
Because of the base64-encoded data, the SVG files are usually much bigger but at the same time
more portable because they don't rely on external bitmap files.
diff --git a/dviware/dvisvgm/libs/Makefile.in b/dviware/dvisvgm/libs/Makefile.in
index b8fdad7d3f..b62c4d9945 100644
--- a/dviware/dvisvgm/libs/Makefile.in
+++ b/dviware/dvisvgm/libs/Makefile.in
@@ -249,8 +249,6 @@ KPSE_LIBS = @KPSE_LIBS@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
-LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
diff --git a/dviware/dvisvgm/libs/boost/Makefile.in b/dviware/dvisvgm/libs/boost/Makefile.in
index 5cba11f705..92f94caebe 100644
--- a/dviware/dvisvgm/libs/boost/Makefile.in
+++ b/dviware/dvisvgm/libs/boost/Makefile.in
@@ -209,8 +209,6 @@ KPSE_LIBS = @KPSE_LIBS@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
-LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
diff --git a/dviware/dvisvgm/libs/brotli/Makefile.in b/dviware/dvisvgm/libs/brotli/Makefile.in
index b222bd13cd..6518869128 100644
--- a/dviware/dvisvgm/libs/brotli/Makefile.in
+++ b/dviware/dvisvgm/libs/brotli/Makefile.in
@@ -314,8 +314,6 @@ KPSE_LIBS = @KPSE_LIBS@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
-LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
diff --git a/dviware/dvisvgm/libs/clipper/Makefile.in b/dviware/dvisvgm/libs/clipper/Makefile.in
index 2f848bd483..1eab2ee6e8 100644
--- a/dviware/dvisvgm/libs/clipper/Makefile.in
+++ b/dviware/dvisvgm/libs/clipper/Makefile.in
@@ -262,8 +262,6 @@ KPSE_LIBS = @KPSE_LIBS@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
-LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
diff --git a/dviware/dvisvgm/libs/defs.am b/dviware/dvisvgm/libs/defs.am
index 6e220e4334..3758a89da1 100644
--- a/dviware/dvisvgm/libs/defs.am
+++ b/dviware/dvisvgm/libs/defs.am
@@ -1,3 +1,6 @@
+## This file is part of dvisvgm
+## Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de>
+
if !HAVE_BROTLI
BROTLI_CFLAGS += -I$(dvisvgm_srcdir)/libs/brotli/include
BROTLI_LIBS += ../libs/brotli/libbrotli.a
diff --git a/dviware/dvisvgm/libs/md5/Makefile.am b/dviware/dvisvgm/libs/md5/Makefile.am
index ce1e71eb5f..55d34b70c4 100644
--- a/dviware/dvisvgm/libs/md5/Makefile.am
+++ b/dviware/dvisvgm/libs/md5/Makefile.am
@@ -1,4 +1,3 @@
-if USE_BUNDLED_MD5
noinst_LIBRARIES = libmd5.a
libmd5_a_SOURCES = md5.c md5.h
@@ -6,7 +5,5 @@ AM_CXXFLAGS = -Wall
md5.c: md5.h
-endif
-
CLEANFILES = *.gcda *.gcno
diff --git a/dviware/dvisvgm/libs/md5/Makefile.in b/dviware/dvisvgm/libs/md5/Makefile.in
index 41193f0de2..4a3cc4c358 100644
--- a/dviware/dvisvgm/libs/md5/Makefile.in
+++ b/dviware/dvisvgm/libs/md5/Makefile.in
@@ -117,8 +117,7 @@ am__v_AR_0 = @echo " AR " $@;
am__v_AR_1 =
libmd5_a_AR = $(AR) $(ARFLAGS)
libmd5_a_LIBADD =
-am__libmd5_a_SOURCES_DIST = md5.c md5.h
-@USE_BUNDLED_MD5_TRUE@am_libmd5_a_OBJECTS = md5.$(OBJEXT)
+am_libmd5_a_OBJECTS = md5.$(OBJEXT)
libmd5_a_OBJECTS = $(am_libmd5_a_OBJECTS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -160,7 +159,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(libmd5_a_SOURCES)
-DIST_SOURCES = $(am__libmd5_a_SOURCES_DIST)
+DIST_SOURCES = $(libmd5_a_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -245,8 +244,6 @@ KPSE_LIBS = @KPSE_LIBS@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
-LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
@@ -345,9 +342,9 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-@USE_BUNDLED_MD5_TRUE@noinst_LIBRARIES = libmd5.a
-@USE_BUNDLED_MD5_TRUE@libmd5_a_SOURCES = md5.c md5.h
-@USE_BUNDLED_MD5_TRUE@AM_CXXFLAGS = -Wall
+noinst_LIBRARIES = libmd5.a
+libmd5_a_SOURCES = md5.c md5.h
+AM_CXXFLAGS = -Wall
CLEANFILES = *.gcda *.gcno
all: all-am
@@ -644,7 +641,7 @@ uninstall-am:
.PRECIOUS: Makefile
-@USE_BUNDLED_MD5_TRUE@md5.c: md5.h
+md5.c: md5.h
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/dviware/dvisvgm/libs/potrace/Makefile.in b/dviware/dvisvgm/libs/potrace/Makefile.in
index 4e69e7b921..3439019139 100644
--- a/dviware/dvisvgm/libs/potrace/Makefile.in
+++ b/dviware/dvisvgm/libs/potrace/Makefile.in
@@ -250,8 +250,6 @@ KPSE_LIBS = @KPSE_LIBS@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
-LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
diff --git a/dviware/dvisvgm/libs/variant/Makefile.in b/dviware/dvisvgm/libs/variant/Makefile.in
index 61922750ab..a912add7f2 100644
--- a/dviware/dvisvgm/libs/variant/Makefile.in
+++ b/dviware/dvisvgm/libs/variant/Makefile.in
@@ -209,8 +209,6 @@ KPSE_LIBS = @KPSE_LIBS@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
-LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
diff --git a/dviware/dvisvgm/libs/woff2/Makefile.in b/dviware/dvisvgm/libs/woff2/Makefile.in
index cbe03525d4..ddcc66031b 100644
--- a/dviware/dvisvgm/libs/woff2/Makefile.in
+++ b/dviware/dvisvgm/libs/woff2/Makefile.in
@@ -283,8 +283,6 @@ KPSE_LIBS = @KPSE_LIBS@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
-LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
diff --git a/dviware/dvisvgm/libs/xxHash/Makefile.in b/dviware/dvisvgm/libs/xxHash/Makefile.in
index e270c97fe3..b8f25d3fc7 100644
--- a/dviware/dvisvgm/libs/xxHash/Makefile.in
+++ b/dviware/dvisvgm/libs/xxHash/Makefile.in
@@ -245,8 +245,6 @@ KPSE_LIBS = @KPSE_LIBS@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
-LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
diff --git a/dviware/dvisvgm/src/InputBuffer.cpp b/dviware/dvisvgm/src/InputBuffer.cpp
index 095b7e22cc..6c23f00063 100644
--- a/dviware/dvisvgm/src/InputBuffer.cpp
+++ b/dviware/dvisvgm/src/InputBuffer.cpp
@@ -26,60 +26,53 @@ using namespace std;
StreamInputBuffer::StreamInputBuffer (istream &is, size_t bufsize)
- : _is(is), _bufsize(bufsize), _buf1(new uint8_t[_bufsize]), _buf2(new uint8_t[_bufsize]), _bufptr(_buf1)
+ : _is(is), _buf1(bufsize), _buf2(bufsize)
{
_size1 = fillBuffer(_buf1);
_size2 = fillBuffer(_buf2);
}
-StreamInputBuffer::~StreamInputBuffer () {
- delete [] _buf1;
- delete [] _buf2;
-}
-
-
+/** Returns the next character from the input buffer (or -1 if there's none). */
int StreamInputBuffer::get () {
- if (pos() == _size1) {
+ if (_pos == _size1) {
if (_size2 == 0)
return -1;
- swap(_buf1, _buf2);
+ swap(_buf1, _buf2); // O(1) swap of memory buffers
_size1 = _size2;
- _bufptr = _buf1;
+ _pos = 0;
_size2 = fillBuffer(_buf2);
}
- uint8_t c = *_bufptr++;
- return c;
+ return _buf1[_pos++];
}
/** Returns the next character to be read without skipping it.
* Same as peek(0). */
int StreamInputBuffer::peek () const {
- if (pos() < _size1)
- return *_bufptr;
- return _size2 > 0 ? *_buf2 : -1;
+ if (_pos < _size1)
+ return _buf1[_pos];
+ return _size2 > 0 ? _buf2[0] : -1;
}
/** Returns the n-th next character without skipping it. */
int StreamInputBuffer::peek (size_t n) const {
- if (pos()+n < _size1)
- return *(_bufptr+n);
- if (pos()+n < _size1+_size2)
- return *(_buf2 + pos()+n-_size1);
+ if (_pos+n < _size1)
+ return _buf1[_pos+n];
+ if (_pos+n < _size1+_size2)
+ return _buf2[_pos+n-_size1];
return -1;
}
-/** Fills the buffer by reading a sequence of characters from the assigned
- * input stream.
- * @param[in] buf pointer to character buffer to be filled
+/** Fills the buffer by reading a sequence of characters from the assigned input stream.
+ * @param[in] buf buffer to be filled
* @return number of characters read */
-int StreamInputBuffer::fillBuffer (uint8_t *buf) {
+size_t StreamInputBuffer::fillBuffer (vector<uint8_t> &buf) {
if (_is && !_is.eof()) {
- _is.read((char*)buf, _bufsize);
- return _is.gcount();
+ _is.read(reinterpret_cast<char*>(buf.data()), streamsize(buf.size()));
+ return _is.gcount();
}
return 0;
}
@@ -133,5 +126,3 @@ int TextStreamInputBuffer::get () {
_col++;
return c;
}
-
-
diff --git a/dviware/dvisvgm/src/InputBuffer.hpp b/dviware/dvisvgm/src/InputBuffer.hpp
index ea6ce17a70..cb429f9d0d 100644
--- a/dviware/dvisvgm/src/InputBuffer.hpp
+++ b/dviware/dvisvgm/src/InputBuffer.hpp
@@ -25,8 +25,9 @@
#include <cstdint>
#include <cstring>
#include <istream>
-#include <string>
#include <ostream>
+#include <string>
+#include <vector>
struct InputBuffer {
virtual ~InputBuffer () =default;
@@ -42,26 +43,23 @@ class StreamInputBuffer : public InputBuffer {
public:
explicit StreamInputBuffer (std::istream &is, size_t bufsize=1024);
StreamInputBuffer (const StreamInputBuffer &ib) =delete;
- ~StreamInputBuffer () override;
int get () override;
int peek () const override;
int peek (size_t n) const override;
- bool eof () const override {return pos() == _size1 && _size2 == 0;}
- void invalidate () override {_bufptr = _buf1+_size1; _size2 = 0;}
+ bool eof () const override {return _pos == _size1 && _size2 == 0;}
+ void invalidate () override {_pos = _size1; _size2 = 0;}
void operator = (const StreamInputBuffer &ib) =delete;
protected:
- int fillBuffer (uint8_t *buf);
- size_t pos () const {return _bufptr-_buf1;}
+ size_t fillBuffer (std::vector<uint8_t> &buf);
private:
std::istream &_is;
- const size_t _bufsize; ///< maximal number of bytes each buffer can hold
- uint8_t *_buf1; ///< pointer to first buffer
- uint8_t *_buf2; ///< pointer to second buffer
- size_t _size1; ///< number of bytes in buffer 1
- size_t _size2; ///< number of bytes in buffer 2
- uint8_t *_bufptr; ///< pointer to next byte to read
+ std::vector<uint8_t> _buf1; ///< first buffer
+ std::vector<uint8_t> _buf2; ///< second buffer
+ size_t _size1; ///< number of bytes in buffer 1
+ size_t _size2; ///< number of bytes in buffer 2
+ size_t _pos=0; ///< position of next character to be read from first buffer
};
diff --git a/dviware/dvisvgm/src/InputReader.cpp b/dviware/dvisvgm/src/InputReader.cpp
index 9c5cc504cd..bfca9d8606 100644
--- a/dviware/dvisvgm/src/InputReader.cpp
+++ b/dviware/dvisvgm/src/InputReader.cpp
@@ -394,7 +394,7 @@ int InputReader::parseAttributes (map<string,string> &attr, bool requireValues,
else if (!requireValues)
attr.emplace(std::move(key), "");
}
- return attr.size();
+ return int(attr.size());
}
//////////////////////////////////////////
diff --git a/dviware/dvisvgm/src/InputReader.hpp b/dviware/dvisvgm/src/InputReader.hpp
index fefd450bac..bd344fbf46 100644
--- a/dviware/dvisvgm/src/InputReader.hpp
+++ b/dviware/dvisvgm/src/InputReader.hpp
@@ -100,7 +100,7 @@ class StringMatcher {
private:
std::string _pattern;
- std::vector<size_t> _borders;
+ std::vector<int> _borders;
size_t _charsRead;
};
diff --git a/dviware/dvisvgm/src/MD5HashFunction.hpp b/dviware/dvisvgm/src/MD5HashFunction.hpp
index d5cfdf2bfa..7a379cc52a 100644
--- a/dviware/dvisvgm/src/MD5HashFunction.hpp
+++ b/dviware/dvisvgm/src/MD5HashFunction.hpp
@@ -21,13 +21,7 @@
#ifndef MD5HASHFUNCTION_HPP
#define MD5HASHFUNCTION_HPP
-#include <config.h>
-#ifdef HAVE_OPENSSL_MD5_H
-# include <openssl/md5.h>
-#else
-# include <md5.h>
-#endif
-
+#include <md5.h>
#include "HashFunction.hpp"
class MD5HashFunction : public HashFunction {
diff --git a/dviware/dvisvgm/src/Makefile.am b/dviware/dvisvgm/src/Makefile.am
index 85ca88ddc4..1272a216f3 100644
--- a/dviware/dvisvgm/src/Makefile.am
+++ b/dviware/dvisvgm/src/Makefile.am
@@ -16,6 +16,7 @@ include ../libs/defs.am
dvisvgm_LDADD = \
$(noinst_LTLIBRARIES) \
../libs/clipper/libclipper.a \
+ ../libs/md5/libmd5.a \
$(FREETYPE_LIBS) \
$(POTRACE_LIBS) \
$(XXHASH_LIBS) \
@@ -29,14 +30,13 @@ dvisvgm_LDADD += \
$(BROTLI_LIBS)
endif
-if USE_BUNDLED_MD5
-dvisvgm_LDADD += ../libs/md5/libmd5.a
-else
-dvisvgm_LDADD += $(LIBCRYPTO_LIBS)
-endif
-
dvisvgm_DEPENDENCIES = $(noinst_LTLIBRARIES)
+if TEXLIVE_BUILD
+dvisvgm_DEPENDENCIES += $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) $(FREETYPE2_DEPEND)
+dvisvgm_DEPENDENCIES += $(POTRACE_DEPEND)
+endif
+
libdvisvgm_la_SOURCES = \
AGLTable.hpp \
BasicDVIReader.hpp BasicDVIReader.cpp \
@@ -170,11 +170,16 @@ endif
EXTRA_DIST = options.xml options.dtd iapi.h ierrors.h MiKTeXCom.hpp MiKTeXCom.cpp
-AM_CFLAGS = -Wall \
+if !TEXLIVE_BUILD
+WARNING_CFLAGS = -Wall
+WARNING_CXXFLAGS = -Wall -Wnon-virtual-dtor
+endif
+
+AM_CFLAGS = $(WARNING_CFLAGS) \
$(ZLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS)
-AM_CXXFLAGS = -Wall -Wnon-virtual-dtor \
+AM_CXXFLAGS = $(WARNING_CXXFLAGS) \
-I$(dvisvgm_srcdir)/libs/clipper \
-I$(dvisvgm_srcdir)/libs/variant/include \
$(KPSE_CFLAGS) \
@@ -200,14 +205,9 @@ AM_CXXFLAGS += \
AM_LDFLAGS += $(TTFAUTOHINT_LIBS)
endif
-if USE_BUNDLED_MD5
AM_CXXFLAGS += -I$(dvisvgm_srcdir)/libs/md5
-else
-AM_CXXFLAGS += $(LIBCRYPTO_CFLAGS)
-endif
-
-
+if !TEXLIVE_BUILD
# the command-line parser class is generated from options.xml by opt2cpp
$(srcdir)/CommandLine.hpp: options.xml
rm -f $@
@@ -220,5 +220,17 @@ $(srcdir)/psdefs.cpp: psdefs.ps
fi
psdefs.ps: ;
+endif !TEXLIVE_BUILD
CLEANFILES = *.gcda *.gcno
+
+if TEXLIVE_BUILD
+# Rebuild libkpathsea:
+@KPATHSEA_RULE@
+# Rebuild libfreetype:
+@FREETYPE2_RULE@
+# Rebuild libz:
+@ZLIB_RULE@
+# Rebuild potrace:
+@POTRACE_RULE@
+endif TEXLIVE_BUILD
diff --git a/dviware/dvisvgm/src/Makefile.in b/dviware/dvisvgm/src/Makefile.in
index 8ebc8641d3..411c96252d 100644
--- a/dviware/dvisvgm/src/Makefile.in
+++ b/dviware/dvisvgm/src/Makefile.in
@@ -99,14 +99,12 @@ bin_PROGRAMS = dvisvgm$(EXEEXT)
@ENABLE_WOFF_TRUE@ $(WOFF2_LIBS) \
@ENABLE_WOFF_TRUE@ $(BROTLI_LIBS)
-@USE_BUNDLED_MD5_TRUE@am__append_7 = ../libs/md5/libmd5.a
-@USE_BUNDLED_MD5_FALSE@am__append_8 = $(LIBCRYPTO_LIBS)
-@ENABLE_WOFF_TRUE@am__append_9 = ttf/libttf.la
-@ENABLE_WOFF_TRUE@am__append_10 = $(TTFAUTOHINT_CFLAGS) \
+@TEXLIVE_BUILD_TRUE@am__append_7 = $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) \
+@TEXLIVE_BUILD_TRUE@ $(FREETYPE2_DEPEND) $(POTRACE_DEPEND)
+@ENABLE_WOFF_TRUE@am__append_8 = ttf/libttf.la
+@ENABLE_WOFF_TRUE@am__append_9 = $(TTFAUTOHINT_CFLAGS) \
@ENABLE_WOFF_TRUE@ $(BROTLI_CFLAGS) $(WOFF2_CFLAGS)
-@ENABLE_WOFF_TRUE@am__append_11 = $(TTFAUTOHINT_LIBS)
-@USE_BUNDLED_MD5_TRUE@am__append_12 = -I$(dvisvgm_srcdir)/libs/md5
-@USE_BUNDLED_MD5_FALSE@am__append_13 = $(LIBCRYPTO_CFLAGS)
+@ENABLE_WOFF_TRUE@am__append_10 = $(TTFAUTOHINT_LIBS)
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_ac_append_to_file.m4 \
@@ -132,7 +130,7 @@ am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
LTLIBRARIES = $(noinst_LTLIBRARIES)
libdvisvgm_la_DEPENDENCIES = fonts/libbase14fonts.la \
- optimizer/liboptimizer.la $(am__append_9)
+ optimizer/liboptimizer.la $(am__append_8)
am_libdvisvgm_la_OBJECTS = BasicDVIReader.lo Bezier.lo \
BgColorSpecialHandler.lo Bitmap.lo BoundingBox.lo \
Calculator.lo CharMapID.lo CLCommandLine.lo CMap.lo \
@@ -173,7 +171,6 @@ am__DEPENDENCIES_2 = $(am__append_4)
am__DEPENDENCIES_3 = $(am__append_2)
@ENABLE_WOFF_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_2) \
@ENABLE_WOFF_TRUE@ $(am__DEPENDENCIES_3)
-@USE_BUNDLED_MD5_FALSE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -354,7 +351,7 @@ ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_CPPFLAGS = @AM_CPPFLAGS@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = $(KPSE_LIBS) $(CODE_COVERAGE_LDFLAGS) $(am__append_11)
+AM_LDFLAGS = $(KPSE_LIBS) $(CODE_COVERAGE_LDFLAGS) $(am__append_10)
AR = @AR@
ASCIIDOC = @ASCIIDOC@
AUTOCONF = @AUTOCONF@
@@ -410,8 +407,6 @@ KPSE_LIBS = @KPSE_LIBS@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
-LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
@@ -521,9 +516,9 @@ dvisvgm_SOURCES = \
@HAVE_XXHASH_FALSE@XXHASH_CFLAGS = -I$(dvisvgm_srcdir)/libs/xxHash
@HAVE_XXHASH_FALSE@XXHASH_LIBS = ../libs/xxHash/libxxhash.a
dvisvgm_LDADD = $(noinst_LTLIBRARIES) ../libs/clipper/libclipper.a \
- $(FREETYPE_LIBS) $(POTRACE_LIBS) $(XXHASH_LIBS) $(ZLIB_LIBS) \
- $(am__append_6) $(am__append_7) $(am__append_8)
-dvisvgm_DEPENDENCIES = $(noinst_LTLIBRARIES)
+ ../libs/md5/libmd5.a $(FREETYPE_LIBS) $(POTRACE_LIBS) \
+ $(XXHASH_LIBS) $(ZLIB_LIBS) $(am__append_6)
+dvisvgm_DEPENDENCIES = $(noinst_LTLIBRARIES) $(am__append_7)
libdvisvgm_la_SOURCES = \
AGLTable.hpp \
BasicDVIReader.hpp BasicDVIReader.cpp \
@@ -650,18 +645,19 @@ libdvisvgm_la_SOURCES = \
ZLibOutputStream.hpp
libdvisvgm_la_LIBADD = fonts/libbase14fonts.la \
- optimizer/liboptimizer.la $(am__append_9)
+ optimizer/liboptimizer.la $(am__append_8)
EXTRA_DIST = options.xml options.dtd iapi.h ierrors.h MiKTeXCom.hpp MiKTeXCom.cpp
-AM_CFLAGS = -Wall \
+@TEXLIVE_BUILD_FALSE@WARNING_CFLAGS = -Wall
+@TEXLIVE_BUILD_FALSE@WARNING_CXXFLAGS = -Wall -Wnon-virtual-dtor
+AM_CFLAGS = $(WARNING_CFLAGS) \
$(ZLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS)
-AM_CXXFLAGS = -Wall -Wnon-virtual-dtor \
- -I$(dvisvgm_srcdir)/libs/clipper \
+AM_CXXFLAGS = $(WARNING_CXXFLAGS) -I$(dvisvgm_srcdir)/libs/clipper \
-I$(dvisvgm_srcdir)/libs/variant/include $(KPSE_CFLAGS) \
$(FREETYPE_CFLAGS) $(ZLIB_CFLAGS) $(CODE_COVERAGE_CFLAGS) \
- $(POTRACE_CFLAGS) $(XXHASH_CFLAGS) $(am__append_10) \
- $(am__append_12) $(am__append_13)
+ $(POTRACE_CFLAGS) $(XXHASH_CFLAGS) $(am__append_9) \
+ -I$(dvisvgm_srcdir)/libs/md5
CLEANFILES = *.gcda *.gcno
all: all-recursive
@@ -1390,17 +1386,26 @@ uninstall-am: uninstall-binPROGRAMS
# the command-line parser class is generated from options.xml by opt2cpp
-$(srcdir)/CommandLine.hpp: options.xml
- rm -f $@
- python $(srcdir)/opt2cpp.py $< >$@
+@TEXLIVE_BUILD_FALSE@$(srcdir)/CommandLine.hpp: options.xml
+@TEXLIVE_BUILD_FALSE@ rm -f $@
+@TEXLIVE_BUILD_FALSE@ python $(srcdir)/opt2cpp.py $< >$@
# Create a C string definition containing the PostScript routines psdefs.ps needed by class PSInterpreter
-$(srcdir)/psdefs.cpp: psdefs.ps
- if test -f $<; then \
- ps2c PSInterpreter::PSDEFS $< >$@; \
- fi
-
-psdefs.ps: ;
+@TEXLIVE_BUILD_FALSE@$(srcdir)/psdefs.cpp: psdefs.ps
+@TEXLIVE_BUILD_FALSE@ if test -f $<; then \
+@TEXLIVE_BUILD_FALSE@ ps2c PSInterpreter::PSDEFS $< >$@; \
+@TEXLIVE_BUILD_FALSE@ fi
+
+@TEXLIVE_BUILD_FALSE@psdefs.ps: ;
+
+# Rebuild libkpathsea:
+@TEXLIVE_BUILD_TRUE@@KPATHSEA_RULE@
+# Rebuild libfreetype:
+@TEXLIVE_BUILD_TRUE@@FREETYPE2_RULE@
+# Rebuild libz:
+@TEXLIVE_BUILD_TRUE@@ZLIB_RULE@
+# Rebuild potrace:
+@TEXLIVE_BUILD_TRUE@@POTRACE_RULE@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/dviware/dvisvgm/src/Process.cpp b/dviware/dvisvgm/src/Process.cpp
index 72465c0c73..c79f6e9526 100644
--- a/dviware/dvisvgm/src/Process.cpp
+++ b/dviware/dvisvgm/src/Process.cpp
@@ -118,10 +118,13 @@ bool Process::run (string *out, const SearchPattern &pattern, PipeFlags flags) {
Subprocess subprocess;
if (!subprocess.run(_cmd, _paramstr, flags))
return false;
+ if (out)
+ out->clear();
for (;;) {
if (out) {
- out->clear();
- subprocess.readFromPipe(*out, pattern);
+ string chunk;
+ subprocess.readFromPipe(chunk, pattern);
+ *out += chunk;
}
Subprocess::State state = subprocess.state();
if (state != Subprocess::State::RUNNING)
diff --git a/dviware/dvisvgm/src/PsSpecialHandler.cpp b/dviware/dvisvgm/src/PsSpecialHandler.cpp
index 7645adea02..5dfdfc0852 100644
--- a/dviware/dvisvgm/src/PsSpecialHandler.cpp
+++ b/dviware/dvisvgm/src/PsSpecialHandler.cpp
@@ -422,17 +422,17 @@ PsSpecialHandler::ImageNode PsSpecialHandler::createBitmapNode (const string &fn
imgnode.element->addAttribute("y", 0);
imgnode.element->addAttribute("width", bbox.width());
imgnode.element->addAttribute("height", bbox.height());
-
- // Only reference the image with an absolute path if either an absolute path was given by the user
- // or a given plain filename is not present in the current working directory but was found through
- // the FileFinder, i.e. it's usually located somewhere in the texmf tree.
- string href = path;
- if (!FilePath::isAbsolute(fname) && (fname.find('/') != string::npos || FilePath(fname).exists()))
- href = FilePath(path).relative(FilePath(_actions->getSVGFilePath(pageno)));
if (EMBED_BITMAP_DATA)
imgnode.element->addAttribute("@@xlink:href", "data:" + util::mimetype(fname) + ";base64," + fname);
- else
+ else {
+ string href = path;
+ // Only reference the image with an absolute path if either an absolute path was given by the user
+ // or a given plain filename is not present in the current working directory but was found through
+ // the FileFinder, i.e. it's usually located somewhere in the texmf tree.
+ if (!FilePath::isAbsolute(fname) && (fname.find('/') != string::npos || FilePath(fname).exists()))
+ href = FilePath(path).relative(FilePath(_actions->getSVGFilePath(pageno)));
imgnode.element->addAttribute("xlink:href", href);
+ }
return imgnode;
}
diff --git a/dviware/dvisvgm/src/fonts/Makefile.in b/dviware/dvisvgm/src/fonts/Makefile.in
index 4d46348ce4..8d96f5387c 100644
--- a/dviware/dvisvgm/src/fonts/Makefile.in
+++ b/dviware/dvisvgm/src/fonts/Makefile.in
@@ -277,8 +277,6 @@ KPSE_LIBS = @KPSE_LIBS@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
-LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
diff --git a/dviware/dvisvgm/src/optimizer/Makefile.in b/dviware/dvisvgm/src/optimizer/Makefile.in
index 2f1424683a..cc979ed0bd 100644
--- a/dviware/dvisvgm/src/optimizer/Makefile.in
+++ b/dviware/dvisvgm/src/optimizer/Makefile.in
@@ -270,8 +270,6 @@ KPSE_LIBS = @KPSE_LIBS@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
-LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
diff --git a/dviware/dvisvgm/src/ttf/Makefile.in b/dviware/dvisvgm/src/ttf/Makefile.in
index b3e1721d82..33746f9d1f 100644
--- a/dviware/dvisvgm/src/ttf/Makefile.in
+++ b/dviware/dvisvgm/src/ttf/Makefile.in
@@ -271,8 +271,6 @@ KPSE_LIBS = @KPSE_LIBS@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
-LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
diff --git a/dviware/dvisvgm/tests/Makefile.am b/dviware/dvisvgm/tests/Makefile.am
index 3197481f7a..3ce3d363be 100644
--- a/dviware/dvisvgm/tests/Makefile.am
+++ b/dviware/dvisvgm/tests/Makefile.am
@@ -24,20 +24,13 @@ EXTRA_DIST = gtest/LICENSE \
include ../libs/defs.am
-LIBS_CFLAGS = $(XXHASH_CFLAGS)
-LIBS_LIBS = $(POTRACE_LIBS) $(XXHASH_LIBS)
+LIBS_CFLAGS = $(XXHASH_CFLAGS) -I$(dvisvgm_srcdir)/libs/md5
+LIBS_LIBS = $(POTRACE_LIBS) $(XXHASH_LIBS) ../libs/md5/libmd5.a
+
if ENABLE_WOFF
LIBS_LIBS += $(WOFF2_LIBS) $(BROTLI_LIBS)
endif
-if USE_BUNDLED_MD5
-LIBS_CFLAGS += -I$(dvisvgm_srcdir)/libs/md5
-LIBS_LIBS += ../libs/md5/libmd5.a
-else
-LIBS_CFLAGS += $(LIBCRYPTO_CFLAGS)
-LIBS_LIBS += $(LIBCRYPTO_LIBS)
-endif
-
AM_CXXFLAGS = -I$(dvisvgm_srcdir)/src -I$(dvisvgm_srcdir)/libs/variant/include \
-Wall -Wno-mismatched-tags \
-DBUILDDIR='"$(abs_builddir)"' -DSRCDIR='"$(abs_srcdir)"' \
diff --git a/dviware/dvisvgm/tests/Makefile.in b/dviware/dvisvgm/tests/Makefile.in
index 05fd5a87b9..c0a3270987 100644
--- a/dviware/dvisvgm/tests/Makefile.in
+++ b/dviware/dvisvgm/tests/Makefile.in
@@ -92,10 +92,6 @@ host_triplet = @host@
@HAVE_WOFF2_FALSE@am__append_3 = -I$(dvisvgm_srcdir)/libs/woff2/include
@HAVE_WOFF2_FALSE@am__append_4 = ../libs/woff2/libwoff2.a
@ENABLE_WOFF_TRUE@am__append_5 = $(WOFF2_LIBS) $(BROTLI_LIBS)
-@USE_BUNDLED_MD5_TRUE@am__append_6 = -I$(dvisvgm_srcdir)/libs/md5
-@USE_BUNDLED_MD5_TRUE@am__append_7 = ../libs/md5/libmd5.a
-@USE_BUNDLED_MD5_FALSE@am__append_8 = $(LIBCRYPTO_CFLAGS)
-@USE_BUNDLED_MD5_FALSE@am__append_9 = $(LIBCRYPTO_LIBS)
TESTS = hashcheck$(EXEEXT) BezierTest$(EXEEXT) BitmapTest$(EXEEXT) \
BoundingBoxTest$(EXEEXT) CalculatorTest$(EXEEXT) \
CMapManagerTest$(EXEEXT) CMapReaderTest$(EXEEXT) \
@@ -196,222 +192,220 @@ am__DEPENDENCIES_1 = $(am__append_4)
am__DEPENDENCIES_2 = $(am__append_2)
@ENABLE_WOFF_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) \
@ENABLE_WOFF_TRUE@ $(am__DEPENDENCIES_2)
-am__DEPENDENCIES_4 =
-@USE_BUNDLED_MD5_FALSE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_4)
-am__DEPENDENCIES_6 = $(POTRACE_LIBS) $(XXHASH_LIBS) \
- $(am__DEPENDENCIES_3) $(am__append_7) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = libgtest.la ../src/libdvisvgm.la \
- $(am__DEPENDENCIES_6)
-BezierTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_4 = $(POTRACE_LIBS) $(XXHASH_LIBS) \
+ ../libs/md5/libmd5.a $(am__DEPENDENCIES_3)
+am__DEPENDENCIES_5 = libgtest.la ../src/libdvisvgm.la \
+ $(am__DEPENDENCIES_4)
+BezierTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_BitmapTest_OBJECTS = BitmapTest-BitmapTest.$(OBJEXT)
BitmapTest_OBJECTS = $(am_BitmapTest_OBJECTS)
-BitmapTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+BitmapTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_BoundingBoxTest_OBJECTS = \
BoundingBoxTest-BoundingBoxTest.$(OBJEXT)
BoundingBoxTest_OBJECTS = $(am_BoundingBoxTest_OBJECTS)
-BoundingBoxTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+BoundingBoxTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_CMapManagerTest_OBJECTS = \
CMapManagerTest-CMapManagerTest.$(OBJEXT)
CMapManagerTest_OBJECTS = $(am_CMapManagerTest_OBJECTS)
-CMapManagerTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+CMapManagerTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_CMapReaderTest_OBJECTS = CMapReaderTest-CMapReaderTest.$(OBJEXT)
CMapReaderTest_OBJECTS = $(am_CMapReaderTest_OBJECTS)
-CMapReaderTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+CMapReaderTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_CMapTest_OBJECTS = CMapTest-CMapTest.$(OBJEXT)
CMapTest_OBJECTS = $(am_CMapTest_OBJECTS)
-CMapTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+CMapTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_CalculatorTest_OBJECTS = CalculatorTest-CalculatorTest.$(OBJEXT)
CalculatorTest_OBJECTS = $(am_CalculatorTest_OBJECTS)
-CalculatorTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+CalculatorTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_ColorSpecialTest_OBJECTS = \
ColorSpecialTest-ColorSpecialTest.$(OBJEXT)
ColorSpecialTest_OBJECTS = $(am_ColorSpecialTest_OBJECTS)
-ColorSpecialTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+ColorSpecialTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_ColorTest_OBJECTS = ColorTest-ColorTest.$(OBJEXT)
ColorTest_OBJECTS = $(am_ColorTest_OBJECTS)
-ColorTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+ColorTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_CommandLineTest_OBJECTS = \
CommandLineTest-CommandLineTest.$(OBJEXT)
CommandLineTest_OBJECTS = $(am_CommandLineTest_OBJECTS)
-CommandLineTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+CommandLineTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_DVIReaderTest_OBJECTS = DVIReaderTest-DVIReaderTest.$(OBJEXT)
DVIReaderTest_OBJECTS = $(am_DVIReaderTest_OBJECTS)
-DVIReaderTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+DVIReaderTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_DependencyGraphTest_OBJECTS = \
DependencyGraphTest-DependencyGraphTest.$(OBJEXT)
DependencyGraphTest_OBJECTS = $(am_DependencyGraphTest_OBJECTS)
-DependencyGraphTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+DependencyGraphTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_DirectoryTest_OBJECTS = DirectoryTest-DirectoryTest.$(OBJEXT)
DirectoryTest_OBJECTS = $(am_DirectoryTest_OBJECTS)
-DirectoryTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+DirectoryTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_DvisvgmSpecialTest_OBJECTS = \
DvisvgmSpecialTest-DvisvgmSpecialTest.$(OBJEXT)
DvisvgmSpecialTest_OBJECTS = $(am_DvisvgmSpecialTest_OBJECTS)
-DvisvgmSpecialTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+DvisvgmSpecialTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_EllipticalArcTest_OBJECTS = \
EllipticalArcTest-EllipticalArcTest.$(OBJEXT)
EllipticalArcTest_OBJECTS = $(am_EllipticalArcTest_OBJECTS)
-EllipticalArcTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+EllipticalArcTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_EmSpecialTest_OBJECTS = EmSpecialTest-EmSpecialTest.$(OBJEXT)
EmSpecialTest_OBJECTS = $(am_EmSpecialTest_OBJECTS)
-EmSpecialTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+EmSpecialTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_FileFinderTest_OBJECTS = FileFinderTest-FileFinderTest.$(OBJEXT)
FileFinderTest_OBJECTS = $(am_FileFinderTest_OBJECTS)
-FileFinderTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+FileFinderTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_FilePathTest_OBJECTS = FilePathTest-FilePathTest.$(OBJEXT)
FilePathTest_OBJECTS = $(am_FilePathTest_OBJECTS)
-FilePathTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+FilePathTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_FileSystemTest_OBJECTS = FileSystemTest-FileSystemTest.$(OBJEXT)
FileSystemTest_OBJECTS = $(am_FileSystemTest_OBJECTS)
-FileSystemTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+FileSystemTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_FontCacheTest_OBJECTS = FontCacheTest-FontCacheTest.$(OBJEXT)
FontCacheTest_OBJECTS = $(am_FontCacheTest_OBJECTS)
-FontCacheTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+FontCacheTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_FontManagerTest_OBJECTS = \
FontManagerTest-FontManagerTest.$(OBJEXT)
FontManagerTest_OBJECTS = $(am_FontManagerTest_OBJECTS)
-FontManagerTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+FontManagerTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_FontMapTest_OBJECTS = FontMapTest-FontMapTest.$(OBJEXT)
FontMapTest_OBJECTS = $(am_FontMapTest_OBJECTS)
-FontMapTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+FontMapTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_GFGlyphTracerTest_OBJECTS = \
GFGlyphTracerTest-GFGlyphTracerTest.$(OBJEXT)
GFGlyphTracerTest_OBJECTS = $(am_GFGlyphTracerTest_OBJECTS)
-GFGlyphTracerTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+GFGlyphTracerTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_GFReaderTest_OBJECTS = GFReaderTest-GFReaderTest.$(OBJEXT)
GFReaderTest_OBJECTS = $(am_GFReaderTest_OBJECTS)
-GFReaderTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+GFReaderTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_GhostscriptTest_OBJECTS = \
GhostscriptTest-GhostscriptTest.$(OBJEXT)
GhostscriptTest_OBJECTS = $(am_GhostscriptTest_OBJECTS)
-GhostscriptTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+GhostscriptTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_GraphicsPathParserTest_OBJECTS = \
GraphicsPathParserTest-GraphicsPathParserTest.$(OBJEXT)
GraphicsPathParserTest_OBJECTS = $(am_GraphicsPathParserTest_OBJECTS)
-GraphicsPathParserTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+GraphicsPathParserTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_GraphicsPathTest_OBJECTS = \
GraphicsPathTest-GraphicsPathTest.$(OBJEXT)
GraphicsPathTest_OBJECTS = $(am_GraphicsPathTest_OBJECTS)
-GraphicsPathTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+GraphicsPathTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_HashFunctionTest_OBJECTS = \
HashFunctionTest-HashFunctionTest.$(OBJEXT)
HashFunctionTest_OBJECTS = $(am_HashFunctionTest_OBJECTS)
-HashFunctionTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+HashFunctionTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_JFMReaderTest_OBJECTS = JFMReaderTest-JFMReaderTest.$(OBJEXT)
JFMReaderTest_OBJECTS = $(am_JFMReaderTest_OBJECTS)
-JFMReaderTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+JFMReaderTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_LengthTest_OBJECTS = LengthTest-LengthTest.$(OBJEXT)
LengthTest_OBJECTS = $(am_LengthTest_OBJECTS)
-LengthTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+LengthTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_MapLineTest_OBJECTS = MapLineTest-MapLineTest.$(OBJEXT)
MapLineTest_OBJECTS = $(am_MapLineTest_OBJECTS)
-MapLineTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+MapLineTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_MatrixTest_OBJECTS = MatrixTest-MatrixTest.$(OBJEXT)
MatrixTest_OBJECTS = $(am_MatrixTest_OBJECTS)
-MatrixTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+MatrixTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_MessageExceptionTest_OBJECTS = \
MessageExceptionTest-MessageExceptionTest.$(OBJEXT)
MessageExceptionTest_OBJECTS = $(am_MessageExceptionTest_OBJECTS)
-MessageExceptionTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+MessageExceptionTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_PDFParserTest_OBJECTS = PDFParserTest-PDFParserTest.$(OBJEXT)
PDFParserTest_OBJECTS = $(am_PDFParserTest_OBJECTS)
-PDFParserTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+PDFParserTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_PSInterpreterTest_OBJECTS = \
PSInterpreterTest-PSInterpreterTest.$(OBJEXT)
PSInterpreterTest_OBJECTS = $(am_PSInterpreterTest_OBJECTS)
-PSInterpreterTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+PSInterpreterTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_PageRagesTest_OBJECTS = PageRagesTest-PageRagesTest.$(OBJEXT)
PageRagesTest_OBJECTS = $(am_PageRagesTest_OBJECTS)
-PageRagesTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+PageRagesTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_PageSizeTest_OBJECTS = PageSizeTest-PageSizeTest.$(OBJEXT)
PageSizeTest_OBJECTS = $(am_PageSizeTest_OBJECTS)
-PageSizeTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+PageSizeTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_PairTest_OBJECTS = PairTest-PairTest.$(OBJEXT)
PairTest_OBJECTS = $(am_PairTest_OBJECTS)
-PairTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+PairTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_PapersizeSpecialTest_OBJECTS = \
PapersizeSpecialTest-PapersizeSpecialTest.$(OBJEXT)
PapersizeSpecialTest_OBJECTS = $(am_PapersizeSpecialTest_OBJECTS)
-PapersizeSpecialTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+PapersizeSpecialTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_RangeMapTest_OBJECTS = RangeMapTest-RangeMapTest.$(OBJEXT)
RangeMapTest_OBJECTS = $(am_RangeMapTest_OBJECTS)
-RangeMapTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+RangeMapTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_SVGOutputTest_OBJECTS = SVGOutputTest-SVGOutputTest.$(OBJEXT)
SVGOutputTest_OBJECTS = $(am_SVGOutputTest_OBJECTS)
-SVGOutputTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+SVGOutputTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_ShadingPatchTest_OBJECTS = \
ShadingPatchTest-ShadingPatchTest.$(OBJEXT)
ShadingPatchTest_OBJECTS = $(am_ShadingPatchTest_OBJECTS)
-ShadingPatchTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+ShadingPatchTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_SpecialManagerTest_OBJECTS = \
SpecialManagerTest-SpecialManagerTest.$(OBJEXT)
SpecialManagerTest_OBJECTS = $(am_SpecialManagerTest_OBJECTS)
-SpecialManagerTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+SpecialManagerTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_SplittedCharInputBufferTest_OBJECTS = SplittedCharInputBufferTest-SplittedCharInputBufferTest.$(OBJEXT)
SplittedCharInputBufferTest_OBJECTS = \
$(am_SplittedCharInputBufferTest_OBJECTS)
-SplittedCharInputBufferTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+SplittedCharInputBufferTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_StreamInputBufferTest_OBJECTS = \
StreamInputBufferTest-StreamInputBufferTest.$(OBJEXT)
StreamInputBufferTest_OBJECTS = $(am_StreamInputBufferTest_OBJECTS)
-StreamInputBufferTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+StreamInputBufferTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_StreamReaderTest_OBJECTS = \
StreamReaderTest-StreamReaderTest.$(OBJEXT)
StreamReaderTest_OBJECTS = $(am_StreamReaderTest_OBJECTS)
-StreamReaderTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+StreamReaderTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_StreamWriterTest_OBJECTS = \
StreamWriterTest-StreamWriterTest.$(OBJEXT)
StreamWriterTest_OBJECTS = $(am_StreamWriterTest_OBJECTS)
-StreamWriterTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+StreamWriterTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_StringMatcherTest_OBJECTS = \
StringMatcherTest-StringMatcherTest.$(OBJEXT)
StringMatcherTest_OBJECTS = $(am_StringMatcherTest_OBJECTS)
-StringMatcherTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+StringMatcherTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_SubfontTest_OBJECTS = SubfontTest-SubfontTest.$(OBJEXT)
SubfontTest_OBJECTS = $(am_SubfontTest_OBJECTS)
-SubfontTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+SubfontTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_TFMReaderTest_OBJECTS = TFMReaderTest-TFMReaderTest.$(OBJEXT)
TFMReaderTest_OBJECTS = $(am_TFMReaderTest_OBJECTS)
-TFMReaderTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+TFMReaderTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_TensorProductPatchTest_OBJECTS = \
TensorProductPatchTest-TensorProductPatchTest.$(OBJEXT)
TensorProductPatchTest_OBJECTS = $(am_TensorProductPatchTest_OBJECTS)
-TensorProductPatchTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+TensorProductPatchTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_ToUnicodeMapTest_OBJECTS = \
ToUnicodeMapTest-ToUnicodeMapTest.$(OBJEXT)
ToUnicodeMapTest_OBJECTS = $(am_ToUnicodeMapTest_OBJECTS)
-ToUnicodeMapTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+ToUnicodeMapTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_TpicSpecialTest_OBJECTS = \
TpicSpecialTest-TpicSpecialTest.$(OBJEXT)
TpicSpecialTest_OBJECTS = $(am_TpicSpecialTest_OBJECTS)
-TpicSpecialTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+TpicSpecialTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_TriangularPatchTest_OBJECTS = \
TriangularPatchTest-TriangularPatchTest.$(OBJEXT)
TriangularPatchTest_OBJECTS = $(am_TriangularPatchTest_OBJECTS)
-TriangularPatchTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+TriangularPatchTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_UnicodeTest_OBJECTS = UnicodeTest-UnicodeTest.$(OBJEXT)
UnicodeTest_OBJECTS = $(am_UnicodeTest_OBJECTS)
-UnicodeTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+UnicodeTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_UtilityTest_OBJECTS = UtilityTest-UtilityTest.$(OBJEXT)
UtilityTest_OBJECTS = $(am_UtilityTest_OBJECTS)
-UtilityTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+UtilityTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_VectorIteratorTest_OBJECTS = \
VectorIteratorTest-VectorIteratorTest.$(OBJEXT)
VectorIteratorTest_OBJECTS = $(am_VectorIteratorTest_OBJECTS)
-VectorIteratorTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+VectorIteratorTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_VectorStreamTest_OBJECTS = \
VectorStreamTest-VectorStreamTest.$(OBJEXT)
VectorStreamTest_OBJECTS = $(am_VectorStreamTest_OBJECTS)
-VectorStreamTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+VectorStreamTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_XMLNodeTest_OBJECTS = XMLNodeTest-XMLNodeTest.$(OBJEXT)
XMLNodeTest_OBJECTS = $(am_XMLNodeTest_OBJECTS)
-XMLNodeTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+XMLNodeTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
am_XMLStringTest_OBJECTS = XMLStringTest-XMLStringTest.$(OBJEXT)
XMLStringTest_OBJECTS = $(am_XMLStringTest_OBJECTS)
-XMLStringTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+XMLStringTest_DEPENDENCIES = $(am__DEPENDENCIES_5)
nodist_hashcheck_OBJECTS = hashcheck-hashcheck.$(OBJEXT)
hashcheck_OBJECTS = $(nodist_hashcheck_OBJECTS)
-hashcheck_DEPENDENCIES = $(am__DEPENDENCIES_6)
+hashcheck_DEPENDENCIES = $(am__DEPENDENCIES_4)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -921,8 +915,6 @@ KPSE_LIBS = @KPSE_LIBS@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
-LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
@@ -1037,9 +1029,9 @@ EXTRA_DIST = gtest/LICENSE gtest/include gtest/src/gtest.cc \
@HAVE_POTRACE_FALSE@POTRACE_LIBS = ../libs/potrace/libpotrace.a
@HAVE_XXHASH_FALSE@XXHASH_CFLAGS = -I$(dvisvgm_srcdir)/libs/xxHash
@HAVE_XXHASH_FALSE@XXHASH_LIBS = ../libs/xxHash/libxxhash.a
-LIBS_CFLAGS = $(XXHASH_CFLAGS) $(am__append_6) $(am__append_8)
-LIBS_LIBS = $(POTRACE_LIBS) $(XXHASH_LIBS) $(am__append_5) \
- $(am__append_7) $(am__append_9)
+LIBS_CFLAGS = $(XXHASH_CFLAGS) -I$(dvisvgm_srcdir)/libs/md5
+LIBS_LIBS = $(POTRACE_LIBS) $(XXHASH_LIBS) ../libs/md5/libmd5.a \
+ $(am__append_5)
AM_CXXFLAGS = -I$(dvisvgm_srcdir)/src -I$(dvisvgm_srcdir)/libs/variant/include \
-Wall -Wno-mismatched-tags \
-DBUILDDIR='"$(abs_builddir)"' -DSRCDIR='"$(abs_srcdir)"' \
diff --git a/dviware/dvisvgm/tests/data/Makefile.in b/dviware/dvisvgm/tests/data/Makefile.in
index 944d237691..6027ed575c 100644
--- a/dviware/dvisvgm/tests/data/Makefile.in
+++ b/dviware/dvisvgm/tests/data/Makefile.in
@@ -190,8 +190,6 @@ KPSE_LIBS = @KPSE_LIBS@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
-LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@