texlive[41494] Build/source/texk/dvipdfm-x: dvipdfm-x: (from S.
commits+kakuto at tug.org
commits+kakuto at tug.org
Sun Jun 19 08:03:57 CEST 2016
Revision: 41494
http://tug.org/svn/texlive?view=revision&revision=41494
Author: kakuto
Date: 2016-06-19 08:03:57 +0200 (Sun, 19 Jun 2016)
Log Message:
-----------
dvipdfm-x: (from S. Hitara) Disable overriding "D" option setting in the new dvipdfmx:config special.
Modified Paths:
--------------
trunk/Build/source/texk/dvipdfm-x/ChangeLog
trunk/Build/source/texk/dvipdfm-x/configure
trunk/Build/source/texk/dvipdfm-x/configure.ac
trunk/Build/source/texk/dvipdfm-x/dvipdfmx.c
trunk/Build/source/texk/dvipdfm-x/tests/picbmp.bb
trunk/Build/source/texk/dvipdfm-x/tests/picbmp.xbb
trunk/Build/source/texk/dvipdfm-x/tests/picjp2.bb
trunk/Build/source/texk/dvipdfm-x/tests/picjp2.xbb
trunk/Build/source/texk/dvipdfm-x/tests/picjpeg.bb
trunk/Build/source/texk/dvipdfm-x/tests/picjpeg.xbb
trunk/Build/source/texk/dvipdfm-x/tests/picpdf.bb
trunk/Build/source/texk/dvipdfm-x/tests/picpdf.xbb
trunk/Build/source/texk/dvipdfm-x/tests/picpng.bb
trunk/Build/source/texk/dvipdfm-x/tests/picpng.xbb
Modified: trunk/Build/source/texk/dvipdfm-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/ChangeLog 2016-06-19 01:16:09 UTC (rev 41493)
+++ trunk/Build/source/texk/dvipdfm-x/ChangeLog 2016-06-19 06:03:57 UTC (rev 41494)
@@ -1,3 +1,10 @@
+2016-06-19 Shunsaku Hirata <shunsaku.hirata74 at gmail.com>
+
+ * dvipdfmx.c: Disable overriding "D" option setting from
+ dvipdfmx:config special.
+ * configure.ac: Change version from 20160307 to 20160619 in order to
+ distinguish the new one from that in TeX Live 2016.
+
2016-05-20 Karl Berry <karl at tug.org>
* Version 20160307 for TeX Live 2016.
Modified: trunk/Build/source/texk/dvipdfm-x/configure
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/configure 2016-06-19 01:16:09 UTC (rev 41493)
+++ trunk/Build/source/texk/dvipdfm-x/configure 2016-06-19 06:03:57 UTC (rev 41494)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20160307.
+# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20160619.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='dvipdfm-x (TeX Live)'
PACKAGE_TARNAME='dvipdfm-x--tex-live-'
-PACKAGE_VERSION='20160307'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20160307'
+PACKAGE_VERSION='20160619'
+PACKAGE_STRING='dvipdfm-x (TeX Live) 20160619'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1350,7 +1350,7 @@
# 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 dvipdfm-x (TeX Live) 20160307 to adapt to many kinds of systems.
+\`configure' configures dvipdfm-x (TeX Live) 20160619 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1421,7 +1421,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20160307:";;
+ short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20160619:";;
esac
cat <<\_ACEOF
@@ -1551,7 +1551,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dvipdfm-x (TeX Live) configure 20160307
+dvipdfm-x (TeX Live) configure 20160619
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2390,7 +2390,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dvipdfm-x (TeX Live) $as_me 20160307, which was
+It was created by dvipdfm-x (TeX Live) $as_me 20160619, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8075,7 +8075,7 @@
# Define the identity of the package.
PACKAGE='dvipdfm-x--tex-live-'
- VERSION='20160307'
+ VERSION='20160619'
cat >>confdefs.h <<_ACEOF
@@ -14744,7 +14744,7 @@
Report bugs to <bug-libtool at gnu.org>."
lt_cl_version="\
-dvipdfm-x (TeX Live) config.lt 20160307
+dvipdfm-x (TeX Live) config.lt 20160619
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -16624,7 +16624,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by dvipdfm-x (TeX Live) $as_me 20160307, which was
+This file was extended by dvipdfm-x (TeX Live) $as_me 20160619, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16694,7 +16694,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-dvipdfm-x (TeX Live) config.status 20160307
+dvipdfm-x (TeX Live) config.status 20160619
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: trunk/Build/source/texk/dvipdfm-x/configure.ac
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/configure.ac 2016-06-19 01:16:09 UTC (rev 41493)
+++ trunk/Build/source/texk/dvipdfm-x/configure.ac 2016-06-19 06:03:57 UTC (rev 41494)
@@ -7,7 +7,7 @@
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-AC_INIT([dvipdfm-x (TeX Live)], [20160307], [tex-k at tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20160619], [tex-k at tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([agl.c])
AC_CONFIG_AUX_DIR([../../build-aux])
Modified: trunk/Build/source/texk/dvipdfm-x/dvipdfmx.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/dvipdfmx.c 2016-06-19 01:16:09 UTC (rev 41493)
+++ trunk/Build/source/texk/dvipdfm-x/dvipdfmx.c 2016-06-19 06:03:57 UTC (rev 41494)
@@ -456,8 +456,11 @@
}
}
+/* Set "unsafe" to non-zero value when parsing config specials to
+ * disallow overriding "D" option value.
+ */
static void
-do_args (int argc, char *argv[], const char *source)
+do_args (int argc, char *argv[], const char *source, int unsafe)
{
int c;
char *nextptr;
@@ -479,7 +482,11 @@
break;
case 'D':
+ if (unsafe) {
+ WARN("Ignoring \"D\" option for dvipdfmx:config special. (unsafe)");
+ } else {
set_distiller_template(optarg);
+ }
break;
case 'r':
@@ -696,7 +703,7 @@
argv[2] = parse_ident (&start, end);
}
}
- do_args (argc, argv, config);
+ do_args (argc, argv, config, 0);
while (argc > 1) {
RELEASE (argv[--argc]);
}
@@ -736,7 +743,7 @@
argv[2] = parse_ident (start, end);
}
}
- do_args (argc, argv, argv0);
+ do_args (argc, argv, argv0, 1); /* Set to unsafe */
while (argc > 1) {
RELEASE (argv[--argc]);
}
@@ -991,7 +998,7 @@
read_config_file(DPX_CONFIG_FILE);
- do_args (argc, argv, NULL);
+ do_args (argc, argv, NULL, 0);
#ifndef MIKTEX
kpse_init_prog("", font_dpi, NULL, NULL);
Modified: trunk/Build/source/texk/dvipdfm-x/tests/picbmp.bb
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/picbmp.bb 2016-06-19 01:16:09 UTC (rev 41493)
+++ trunk/Build/source/texk/dvipdfm-x/tests/picbmp.bb 2016-06-19 06:03:57 UTC (rev 41494)
@@ -1,4 +1,4 @@
%%Title: picbmp.bmp
-%%Creator: extractbb 20160307
+%%Creator: extractbb 20160619
%%BoundingBox: 0 0 24 24
Modified: trunk/Build/source/texk/dvipdfm-x/tests/picbmp.xbb
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/picbmp.xbb 2016-06-19 01:16:09 UTC (rev 41493)
+++ trunk/Build/source/texk/dvipdfm-x/tests/picbmp.xbb 2016-06-19 06:03:57 UTC (rev 41494)
@@ -1,5 +1,5 @@
%%Title: picbmp.bmp
-%%Creator: extractbb 20160307
+%%Creator: extractbb 20160619
%%BoundingBox: 0 0 30 30
%%HiResBoundingBox: 0.000000 0.000000 29.715155 29.715155
Modified: trunk/Build/source/texk/dvipdfm-x/tests/picjp2.bb
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/picjp2.bb 2016-06-19 01:16:09 UTC (rev 41493)
+++ trunk/Build/source/texk/dvipdfm-x/tests/picjp2.bb 2016-06-19 06:03:57 UTC (rev 41494)
@@ -1,4 +1,4 @@
%%Title: picjp2.jp2
-%%Creator: extractbb 20160307
+%%Creator: extractbb 20160619
%%BoundingBox: 0 0 33 33
Modified: trunk/Build/source/texk/dvipdfm-x/tests/picjp2.xbb
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/picjp2.xbb 2016-06-19 01:16:09 UTC (rev 41493)
+++ trunk/Build/source/texk/dvipdfm-x/tests/picjp2.xbb 2016-06-19 06:03:57 UTC (rev 41494)
@@ -1,5 +1,5 @@
%%Title: picjp2.jp2
-%%Creator: extractbb 20160307
+%%Creator: extractbb 20160619
%%BoundingBox: 0 0 33 33
%%HiResBoundingBox: 0.000000 0.000000 33.000000 33.000000
Modified: trunk/Build/source/texk/dvipdfm-x/tests/picjpeg.bb
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/picjpeg.bb 2016-06-19 01:16:09 UTC (rev 41493)
+++ trunk/Build/source/texk/dvipdfm-x/tests/picjpeg.bb 2016-06-19 06:03:57 UTC (rev 41494)
@@ -1,4 +1,4 @@
%%Title: picjpeg.jpeg
-%%Creator: extractbb 20160307
+%%Creator: extractbb 20160619
%%BoundingBox: 0 0 108 148
Modified: trunk/Build/source/texk/dvipdfm-x/tests/picjpeg.xbb
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/picjpeg.xbb 2016-06-19 01:16:09 UTC (rev 41493)
+++ trunk/Build/source/texk/dvipdfm-x/tests/picjpeg.xbb 2016-06-19 06:03:57 UTC (rev 41494)
@@ -1,5 +1,5 @@
%%Title: picjpeg.jpeg
-%%Creator: extractbb 20160307
+%%Creator: extractbb 20160619
%%BoundingBox: 0 0 150 205
%%HiResBoundingBox: 0.000000 0.000000 150.000000 205.000000
Modified: trunk/Build/source/texk/dvipdfm-x/tests/picpdf.bb
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/picpdf.bb 2016-06-19 01:16:09 UTC (rev 41493)
+++ trunk/Build/source/texk/dvipdfm-x/tests/picpdf.bb 2016-06-19 06:03:57 UTC (rev 41494)
@@ -1,4 +1,4 @@
%%Title: picpdf.pdf
-%%Creator: extractbb 20160307
+%%Creator: extractbb 20160619
%%BoundingBox: 0 0 69 83
Modified: trunk/Build/source/texk/dvipdfm-x/tests/picpdf.xbb
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/picpdf.xbb 2016-06-19 01:16:09 UTC (rev 41493)
+++ trunk/Build/source/texk/dvipdfm-x/tests/picpdf.xbb 2016-06-19 06:03:57 UTC (rev 41494)
@@ -1,5 +1,5 @@
%%Title: picpdf.pdf
-%%Creator: extractbb 20160307
+%%Creator: extractbb 20160619
%%BoundingBox: 0 0 69 83
%%HiResBoundingBox: 0.000000 0.000000 69.000000 83.000000
%%PDFVersion: 1.4
Modified: trunk/Build/source/texk/dvipdfm-x/tests/picpng.bb
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/picpng.bb 2016-06-19 01:16:09 UTC (rev 41493)
+++ trunk/Build/source/texk/dvipdfm-x/tests/picpng.bb 2016-06-19 06:03:57 UTC (rev 41494)
@@ -1,4 +1,4 @@
%%Title: picpng.png
-%%Creator: extractbb 20160307
+%%Creator: extractbb 20160619
%%BoundingBox: 0 0 124 89
Modified: trunk/Build/source/texk/dvipdfm-x/tests/picpng.xbb
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/picpng.xbb 2016-06-19 01:16:09 UTC (rev 41493)
+++ trunk/Build/source/texk/dvipdfm-x/tests/picpng.xbb 2016-06-19 06:03:57 UTC (rev 41494)
@@ -1,5 +1,5 @@
%%Title: picpng.png
-%%Creator: extractbb 20160307
+%%Creator: extractbb 20160619
%%BoundingBox: 0 0 172 124
%%HiResBoundingBox: 0.000000 0.000000 172.000000 124.000000
More information about the tex-live-commits
mailing list