From f1f88a89457902b6526f283b4c9003a977cdc6d6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 26 Jan 2022 23:21:49 +0000 Subject: dvisvgm 2.13.1 git-svn-id: svn://tug.org/texlive/trunk@61755 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvisvgm/TLpatches/TL-Changes | 3 +- Build/source/texk/dvisvgm/configure | 22 ++++++------- Build/source/texk/dvisvgm/dvisvgm-src/ChangeLog | 36 ++++++++++++++++++++++ Build/source/texk/dvisvgm/dvisvgm-src/NEWS | 5 +++ Build/source/texk/dvisvgm/dvisvgm-src/configure.ac | 2 +- .../source/texk/dvisvgm/dvisvgm-src/doc/dvisvgm.1 | 4 +-- .../texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.h | 3 +- .../dvisvgm-src/src/DvisvgmSpecialHandler.cpp | 1 + .../dvisvgm/dvisvgm-src/src/PsSpecialHandler.cpp | 8 ++--- Build/source/texk/dvisvgm/version.ac | 2 +- 10 files changed, 64 insertions(+), 22 deletions(-) (limited to 'Build/source/texk/dvisvgm') diff --git a/Build/source/texk/dvisvgm/TLpatches/TL-Changes b/Build/source/texk/dvisvgm/TLpatches/TL-Changes index cb97d3ca891..d1f6fd7ae63 100644 --- a/Build/source/texk/dvisvgm/TLpatches/TL-Changes +++ b/Build/source/texk/dvisvgm/TLpatches/TL-Changes @@ -11,6 +11,7 @@ mv dvisvgm-src dvisvgm-prev tar xf dvisvgm-VER.tar.gz mv dvisvgm-VER dvisvgm-src cd dvisvgm-src +tar xf dvisvgm-VER.tar.gz # so we can compare orig release to ours # remove common and generated files: rm ar-lib compile config.guess config.sub depcomp install-sh @@ -34,7 +35,7 @@ See patch-04-configure for reference, but they won't apply as-is. Probably easiest to check the previous original dvisvgm/configure.ac vs. the new, and then install the changes in our configure.ac by hand. -# patch to integrate into TL build; will probably need adjusting also. +# patch to integrate into TL build; will likely need adjusting also. patch -d dvisvgm-src -p1 . # @@ -629,8 +629,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dvisvgm (TeX Live)' PACKAGE_TARNAME='dvisvgm--tex-live-' -PACKAGE_VERSION='2.13' -PACKAGE_STRING='dvisvgm (TeX Live) 2.13' +PACKAGE_VERSION='2.13.1' +PACKAGE_STRING='dvisvgm (TeX Live) 2.13.1' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1437,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 (TeX Live) 2.13 to adapt to many kinds of systems. +\`configure' configures dvisvgm (TeX Live) 2.13.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1509,7 +1509,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dvisvgm (TeX Live) 2.13:";; + short | recursive ) echo "Configuration of dvisvgm (TeX Live) 2.13.1:";; esac cat <<\_ACEOF @@ -1642,7 +1642,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dvisvgm (TeX Live) configure 2.13 +dvisvgm (TeX Live) configure 2.13.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2404,7 +2404,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 2.13, which was +It was created by dvisvgm (TeX Live) $as_me 2.13.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -9015,7 +9015,7 @@ fi # Define the identity of the package. PACKAGE='dvisvgm--tex-live-' - VERSION='2.13' + VERSION='2.13.1' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -21413,7 +21413,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -dvisvgm (TeX Live) config.lt 2.13 +dvisvgm (TeX Live) config.lt 2.13.1 configured by $0, generated by GNU Autoconf 2.71. Copyright (C) 2011 Free Software Foundation, Inc. @@ -24822,7 +24822,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 2.13, which was +This file was extended by dvisvgm (TeX Live) $as_me 2.13.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24890,7 +24890,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 (TeX Live) config.status 2.13 +dvisvgm (TeX Live) config.status 2.13.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-src/ChangeLog index c215c9f4410..388fcf2acd8 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/ChangeLog +++ b/Build/source/texk/dvisvgm/dvisvgm-src/ChangeLog @@ -1,3 +1,39 @@ +2022-01-26 Martin Gieseking + + * .appveyor.yml, configure.ac, doc/dvisvgm.1, src/Doxyfile, + src/version.hpp: + set version to 2.13.1 + + * NEWS: + updated NEWS + +2022-01-25 Martin Gieseking + + * src/PSPattern.cpp: + added explicit std::move to fix build issues with older compilers +closes + #173 + +2022-01-24 Martin Gieseking + + * README.md: + removed Travis badge from README + + * libs/xxHash/xxhash.h: + do no longer depend on for + XXH_STATIC_ASSERT +https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1 + +2022-01-23 Martin Gieseking + + * src/PsSpecialHandler.cpp: + apply bounding box parameters given with pdffile special +closes #174 + + * src/DvisvgmSpecialHandler.cpp: + added evaluation of {?(...)} to dvisvgm:rawdef special +closes #175 + 2022-01-19 Martin Gieseking * .github/workflows/c-cpp.yml: diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/NEWS b/Build/source/texk/dvisvgm/dvisvgm-src/NEWS index a3ae16653ba..d525c629487 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/NEWS +++ b/Build/source/texk/dvisvgm/dvisvgm-src/NEWS @@ -1,3 +1,8 @@ +dvisvgm-2.13.1 (2022-01-26) +- added evaluation of expression {?(...)} to special dvisvgm:rawdef +- fixed regression regarding positioning of PDF graphics (GH issue #174) +- fixed some build issues + dvisvgm-2.13 (2022-01-20) - allow for conversion of multiple EPS files given on the command-line - added variables n and N to option --output representing the current file diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/configure.ac b/Build/source/texk/dvisvgm/dvisvgm-src/configure.ac index edd12a938f9..8eabe7972e2 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/configure.ac +++ b/Build/source/texk/dvisvgm/dvisvgm-src/configure.ac @@ -4,7 +4,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([dvisvgm],[2.13],[martin.gieseking@uos.de]) +AC_INIT([dvisvgm],[2.13.1],[martin.gieseking@uos.de]) DATE="January 2022" AC_CONFIG_SRCDIR(src) AC_CONFIG_HEADERS([config.h]) diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/doc/dvisvgm.1 b/Build/source/texk/dvisvgm/dvisvgm-src/doc/dvisvgm.1 index 73a0443b68c..19bfa9eb622 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/doc/dvisvgm.1 +++ b/Build/source/texk/dvisvgm/dvisvgm-src/doc/dvisvgm.1 @@ -4,10 +4,10 @@ .\" Generator: DocBook XSL Stylesheets vsnapshot .\" Date: 2022-01-18 .\" Manual: dvisvgm Manual -.\" Source: dvisvgm 2.13 +.\" Source: dvisvgm 2.13.1 .\" Language: English .\" -.TH "DVISVGM" "1" "2022\-01\-18" "dvisvgm 2\&.13" "dvisvgm Manual" +.TH "DVISVGM" "1" "2022\-01\-18" "dvisvgm 2\&.13\&.1" "dvisvgm Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.h b/Build/source/texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.h index 08ab7945723..511c4d12bf6 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.h +++ b/Build/source/texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.h @@ -1546,8 +1546,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) /* note: use after variable declarations */ #ifndef XXH_STATIC_ASSERT # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ -# include -# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) +# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) # else diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/src/DvisvgmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/DvisvgmSpecialHandler.cpp index 8fba6d8974b..9a38ef9b3ba 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/src/DvisvgmSpecialHandler.cpp +++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/DvisvgmSpecialHandler.cpp @@ -242,6 +242,7 @@ void DvisvgmSpecialHandler::processRawDef (InputReader &ir, SpecialActions &acti if (_nestingLevel == 0) { string xml = ir.getLine(); if (!xml.empty()) { + evaluate_expressions(xml, actions); expand_constants(xml, actions); _defsParser.parse(xml, actions); } diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/src/PsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/PsSpecialHandler.cpp index aa6c7461dc9..66514d1b081 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/src/PsSpecialHandler.cpp +++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/PsSpecialHandler.cpp @@ -287,6 +287,7 @@ bool PsSpecialHandler::process (const string &prefix, istream &is, SpecialAction return true; } + /** Handles a psfile/pdffile special which places an external EPS/PDF graphic * at the current DVI position. The lower left corner (llx,lly) of the * given bounding box is placed at the DVI position. @@ -312,9 +313,9 @@ void PsSpecialHandler::imgfile (FileType filetype, const string &fname, const ma swap(lly, ury); else if (filetype == FileType::PDF && llx == 0 && lly == 0 && urx == 0 && ury == 0) { BoundingBox pagebox = _psi.pdfPageBox(fname, pageno); + pagebox.transform(TranslationMatrix(-pagebox.minX(), -pagebox.minY())); if (pagebox.valid()) { - llx = pagebox.minX(); - lly = pagebox.minY(); + llx = lly = 0.0; urx = pagebox.maxX(); ury = pagebox.maxY(); } @@ -371,8 +372,7 @@ void PsSpecialHandler::imgfile (FileType filetype, const string &fname, const ma _actions->embed(bbox); // insert element containing the image data - if (filetype != FileType::PDF) - matrix.rmultiply(TranslationMatrix(-llx, -lly)); // move lower left corner of image to origin + matrix.rmultiply(TranslationMatrix(-llx, -lly)); // move lower left corner of image to origin imgNode->setTransform(matrix); _actions->svgTree().appendToPage(std::move(imgNode)); } diff --git a/Build/source/texk/dvisvgm/version.ac b/Build/source/texk/dvisvgm/version.ac index a5889c65ba6..d113089ea2d 100644 --- a/Build/source/texk/dvisvgm/version.ac +++ b/Build/source/texk/dvisvgm/version.ac @@ -9,4 +9,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current dvisvgm version -m4_define([dvisvgm_version], [2.13]) +m4_define([dvisvgm_version], [2.13.1]) -- cgit v1.2.3