diff options
author | Norbert Preining <norbert@preining.info> | 2022-01-27 03:00:41 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-01-27 03:00:41 +0000 |
commit | b5deca5ab245af14ca010a3e61225189e9c860f9 (patch) | |
tree | 50f4cfc4a516024350a41166589f283a0d0c1871 /dviware | |
parent | d36626add433e216b29d959884d3593baa216866 (diff) |
CTAN sync 202201270300
Diffstat (limited to 'dviware')
-rw-r--r-- | dviware/dvisvgm/ChangeLog | 36 | ||||
-rw-r--r-- | dviware/dvisvgm/NEWS | 5 | ||||
-rwxr-xr-x | dviware/dvisvgm/configure | 20 | ||||
-rw-r--r-- | dviware/dvisvgm/configure.ac | 2 | ||||
-rw-r--r-- | dviware/dvisvgm/doc/dvisvgm.1 | 4 | ||||
-rw-r--r-- | dviware/dvisvgm/libs/xxHash/xxhash.h | 3 | ||||
-rw-r--r-- | dviware/dvisvgm/src/DvisvgmSpecialHandler.cpp | 1 | ||||
-rw-r--r-- | dviware/dvisvgm/src/PSPattern.cpp | 2 | ||||
-rw-r--r-- | dviware/dvisvgm/src/PsSpecialHandler.cpp | 8 |
9 files changed, 61 insertions, 20 deletions
diff --git a/dviware/dvisvgm/ChangeLog b/dviware/dvisvgm/ChangeLog index c215c9f441..388fcf2acd 100644 --- a/dviware/dvisvgm/ChangeLog +++ b/dviware/dvisvgm/ChangeLog @@ -1,3 +1,39 @@ +2022-01-26 Martin Gieseking <martin.gieseking@uos.de> + + * .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 <martin.gieseking@uos.de> + + * src/PSPattern.cpp: + added explicit std::move to fix build issues with older compilers +closes + #173 + +2022-01-24 Martin Gieseking <martin.gieseking@uos.de> + + * README.md: + removed Travis badge from README + + * libs/xxHash/xxhash.h: + do no longer depend on <assert.h> for + XXH_STATIC_ASSERT +https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1 + +2022-01-23 Martin Gieseking <martin.gieseking@uos.de> + + * 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 <martin.gieseking@uos.de> * .github/workflows/c-cpp.yml: diff --git a/dviware/dvisvgm/NEWS b/dviware/dvisvgm/NEWS index a3ae16653b..d525c62948 100644 --- a/dviware/dvisvgm/NEWS +++ b/dviware/dvisvgm/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/dviware/dvisvgm/configure b/dviware/dvisvgm/configure index 6fd5fdd0cd..2974ef7caf 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.69 for dvisvgm 2.13. +# Generated by GNU Autoconf 2.69 for dvisvgm 2.13.1. # # Report bugs to <martin.gieseking@uos.de>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dvisvgm' PACKAGE_TARNAME='dvisvgm' -PACKAGE_VERSION='2.13' -PACKAGE_STRING='dvisvgm 2.13' +PACKAGE_VERSION='2.13.1' +PACKAGE_STRING='dvisvgm 2.13.1' PACKAGE_BUGREPORT='martin.gieseking@uos.de' PACKAGE_URL='' @@ -1417,7 +1417,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 2.13 to adapt to many kinds of systems. +\`configure' configures dvisvgm 2.13.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1489,7 +1489,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dvisvgm 2.13:";; + short | recursive ) echo "Configuration of dvisvgm 2.13.1:";; esac cat <<\_ACEOF @@ -1637,7 +1637,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dvisvgm configure 2.13 +dvisvgm configure 2.13.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2181,7 +2181,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 2.13, which was +It was created by dvisvgm $as_me 2.13.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3169,7 +3169,7 @@ fi # Define the identity of the package. PACKAGE='dvisvgm' - VERSION='2.13' + VERSION='2.13.1' cat >>confdefs.h <<_ACEOF @@ -20459,7 +20459,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 2.13, which was +This file was extended by dvisvgm $as_me 2.13.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20525,7 +20525,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dvisvgm config.status 2.13 +dvisvgm config.status 2.13.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/dviware/dvisvgm/configure.ac b/dviware/dvisvgm/configure.ac index edd12a938f..8eabe7972e 100644 --- a/dviware/dvisvgm/configure.ac +++ b/dviware/dvisvgm/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/dviware/dvisvgm/doc/dvisvgm.1 b/dviware/dvisvgm/doc/dvisvgm.1 index 73a0443b68..19bfa9eb62 100644 --- a/dviware/dvisvgm/doc/dvisvgm.1 +++ b/dviware/dvisvgm/doc/dvisvgm.1 @@ -4,10 +4,10 @@ .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> .\" 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/dviware/dvisvgm/libs/xxHash/xxhash.h b/dviware/dvisvgm/libs/xxHash/xxhash.h index 08ab794572..511c4d12bf 100644 --- a/dviware/dvisvgm/libs/xxHash/xxhash.h +++ b/dviware/dvisvgm/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 <assert.h> -# 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/dviware/dvisvgm/src/DvisvgmSpecialHandler.cpp b/dviware/dvisvgm/src/DvisvgmSpecialHandler.cpp index 8fba6d8974..9a38ef9b3b 100644 --- a/dviware/dvisvgm/src/DvisvgmSpecialHandler.cpp +++ b/dviware/dvisvgm/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/dviware/dvisvgm/src/PSPattern.cpp b/dviware/dvisvgm/src/PSPattern.cpp index 6cebe7844d..3232c88bbe 100644 --- a/dviware/dvisvgm/src/PSPattern.cpp +++ b/dviware/dvisvgm/src/PSPattern.cpp @@ -108,7 +108,7 @@ unique_ptr<XMLElement> PSTilingPattern::createGroupNode () const { // add all succeeding path elements to this group auto group = util::make_unique<SVGElement>("g"); group->setClipPathUrl("pc"+XMLString(psID())); - return group; + return std::move(group); } diff --git a/dviware/dvisvgm/src/PsSpecialHandler.cpp b/dviware/dvisvgm/src/PsSpecialHandler.cpp index aa6c7461dc..66514d1b08 100644 --- a/dviware/dvisvgm/src/PsSpecialHandler.cpp +++ b/dviware/dvisvgm/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)); } |