diff options
author | Taco Hoekwater <taco@elvenkind.com> | 2011-04-12 14:17:47 +0000 |
---|---|---|
committer | Taco Hoekwater <taco@elvenkind.com> | 2011-04-12 14:17:47 +0000 |
commit | 307453997ef030ec4dfa1e876feaf0b8b8125bab (patch) | |
tree | ab2054693ba95e9ac8f6e3478b4d0175d893329f /Build/source/texk/web2c/luatexdir/utils/utils.w | |
parent | d95b11a25d3d9e17cc4afb9c8713ef4037567527 (diff) |
check in luatex 0.66.0
git-svn-id: svn://tug.org/texlive/trunk@22059 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/utils/utils.w')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/utils/utils.w | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/Build/source/texk/web2c/luatexdir/utils/utils.w b/Build/source/texk/web2c/luatexdir/utils/utils.w index 05eca81cbc6..e3dc26bc6bf 100644 --- a/Build/source/texk/web2c/luatexdir/utils/utils.w +++ b/Build/source/texk/web2c/luatexdir/utils/utils.w @@ -20,8 +20,8 @@ @ @c static const char _svn_version[] = - "$Id: utils.w 3584 2010-04-02 17:45:55Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/utils/utils.w $"; + "$Id: utils.w 3779 2010-07-31 11:29:22Z oneiros $ " + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.66.0/source/texk/web2c/luatexdir/utils/utils.w $"; @ @c #include "openbsd-compat.h" @@ -49,13 +49,11 @@ static const char _svn_version[] = #include "lua/luatex-api.h" /* for ptexbanner */ #include "png.h" -#ifdef POPPLER_VERSION -# define xpdfString "poppler" -# include "poppler-config.h" -# define xpdfVersion POPPLER_VERSION -#else -# define xpdfString "xpdf" -# include "xpdf/config.h" /* just to get the xpdf version */ + +#include "poppler-config.h" +#ifndef POPPLER_VERSION +# include "aconf.h" +# define POPPLER_VERSION POPPLER_PACKAGE_VERSION #endif @ @c @@ -354,9 +352,9 @@ void initversionstring(char **versions) (void) asprintf(versions, "Compiled with libpng %s; using libpng %s\n" "Compiled with zlib %s; using zlib %s\n" - "Compiled with %s version %s\n", + "Compiled with poppler version %s\n", PNG_LIBPNG_VER_STRING, png_libpng_ver, - ZLIB_VERSION, zlib_version, xpdfString, xpdfVersion); + ZLIB_VERSION, zlib_version, POPPLER_VERSION); } @ @c @@ -407,7 +405,6 @@ scaled divide_scaled(scaled s, scaled m, int dd) /* rounding */ if (2 * r >= m) { q++; - r -= m; } return sign * q; } |