summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/README5
-rw-r--r--Build/source/texk/dvipdfm/ChangeLog5
-rwxr-xr-xBuild/source/texk/dvipdfm/configure4
-rw-r--r--Build/source/texk/dvipdfm/configure.in2
-rw-r--r--Build/source/texk/dvipdfm/dvipdfm.c4
-rw-r--r--Build/source/texk/dvipdfm/pdfdoc.c34
6 files changed, 36 insertions, 18 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README
index 6f3f5c6ae68..a41a19a5c73 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -36,8 +36,9 @@ dvidvi - ?
dviljk - Joachim Schrod
-dvipdfm - now moribund, but until dvipdfmx is a 100% replacement we
- cannot drop it.
+dvipdfm 0.13.2d - ok 5jun08
+ http://gaspra.kettering.edu/dvipdfm/dvipdfm-0.13.2d.tar.gz
+ until dvipdfmx is a 100% replacement we cannot drop it.
dvipdfmx 20080524 - ok 24may08
http://project.ktug.or.kr/dvipdfmx/snapshot/latest/
diff --git a/Build/source/texk/dvipdfm/ChangeLog b/Build/source/texk/dvipdfm/ChangeLog
index 1972c011002..ac3ed5cb337 100644
--- a/Build/source/texk/dvipdfm/ChangeLog
+++ b/Build/source/texk/dvipdfm/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-05 Karl Berry <karl@tug.org>
+
+ * Update to 0.13.2d (with the timezone fix we already had, but
+ also finding fontmaps along the new path).
+
2000-07-25 Mark A. Wicks <mwicks@betelgeuse.localdomain>
* Changed version to 0.13
diff --git a/Build/source/texk/dvipdfm/configure b/Build/source/texk/dvipdfm/configure
index 2409f64dec2..efd8916e291 100755
--- a/Build/source/texk/dvipdfm/configure
+++ b/Build/source/texk/dvipdfm/configure
@@ -1715,11 +1715,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-VERSION="0.13.2c"
+VERSION="0.13.2d"
cat >>confdefs.h <<\_ACEOF
-#define VERSION "0.13.2c"
+#define VERSION "0.13.2d"
_ACEOF
diff --git a/Build/source/texk/dvipdfm/configure.in b/Build/source/texk/dvipdfm/configure.in
index b6f749cafc0..26fef88d265 100644
--- a/Build/source/texk/dvipdfm/configure.in
+++ b/Build/source/texk/dvipdfm/configure.in
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(dvipdfm.c)
-define([_version_],"0.13.2c")
+define([_version_],"0.13.2d")
VERSION=_version_
AC_SUBST(VERSION)
diff --git a/Build/source/texk/dvipdfm/dvipdfm.c b/Build/source/texk/dvipdfm/dvipdfm.c
index a75be847743..71dde47b775 100644
--- a/Build/source/texk/dvipdfm/dvipdfm.c
+++ b/Build/source/texk/dvipdfm/dvipdfm.c
@@ -1,7 +1,7 @@
/* $Header$
This is dvipdfm, a DVI to PDF translator.
- Copyright (C) 1998, 1999 by Mark A. Wicks
+ Copyright (C) 1998, 1999, 2007 by Mark A. Wicks
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -102,7 +102,7 @@ static void set_default_pdf_filename(void)
}
static void usage (void)
{
- fprintf (stdout, "\n%s, version %s, Copyright (C) 1998, 1999 by Mark A. Wicks\n", PACKAGE, VERSION);
+ fprintf (stdout, "\n%s, version %s, Copyright (C) 1998, 1999, 2007 by Mark A. Wicks\n", PACKAGE, VERSION);
fprintf (stdout, "dvipdfm comes with ABSOLUTELY NO WARRANTY.\n");
fprintf (stdout, "This is free software, and you are welcome to redistribute it\n");
fprintf (stdout, "under certain conditions. Details are distributed with the software.\n");
diff --git a/Build/source/texk/dvipdfm/pdfdoc.c b/Build/source/texk/dvipdfm/pdfdoc.c
index 7aa20f72a02..67810a2084e 100644
--- a/Build/source/texk/dvipdfm/pdfdoc.c
+++ b/Build/source/texk/dvipdfm/pdfdoc.c
@@ -232,13 +232,7 @@ static void start_name_tree (void)
static char *asn_date (void)
{
-#ifndef HAVE_TIMEZONE
- #ifdef TM_GM_TOFF
- #define timezone (bdtime->gm_toff)
- #else
- #define timezone 0l
-#endif /* TM_GM_TOFF */
-#endif /* HAVE_TIMEZONE */
+ long tz_offset;
static char date_string[24];
time_t current_time;
struct tm *bd_time;
@@ -247,10 +241,28 @@ static char *asn_date (void)
}
time(&current_time);
bd_time = localtime(&current_time);
- sprintf (date_string, "D:%04d%02d%02d%02d%02d%02d%+03ld'%02ld'",
- bd_time -> tm_year+1900, bd_time -> tm_mon+1, bd_time -> tm_mday,
- bd_time -> tm_hour, bd_time -> tm_min, bd_time -> tm_sec,
- -timezone/3600, timezone%3600);
+
+#ifdef HAVE_TM_GMTOFF /* Preferred way to get time zone offset */
+ tz_offset = bd_time->tm_gmtoff;
+#else
+#ifdef HAVE_TIMEZONE /* Plan B --- use external variable 'timezone'
+ /* (may not provide correct offset for daylight savings time) */
+ tz_offset = - timezone;
+#else /* Last resort --- without more information, set offset to zero */
+ tz_offset = 0l;
+#endif /* HAVE_TIMEZONE */
+#endif /* HAVE_TM_GMTOFF */
+
+ if (tz_offset == 0l) {
+ sprintf (date_string, "D:%04d%02d%02d%02d%02d%02dZ00'00'",
+ bd_time -> tm_year+1900, bd_time -> tm_mon+1, bd_time -> tm_mday,
+ bd_time -> tm_hour, bd_time -> tm_min, bd_time -> tm_sec);
+ } else {
+ sprintf (date_string, "D:%04d%02d%02d%02d%02d%02d%c%02ld'%02ld'",
+ bd_time -> tm_year+1900, bd_time -> tm_mon+1, bd_time -> tm_mday,
+ bd_time -> tm_hour, bd_time -> tm_min, bd_time -> tm_sec,
+ (tz_offset>0)? '+':'-', labs(tz_offset)/3600, (labs(tz_offset)/60)%60);
+ }
return date_string;
}