dvipdfm-x: (from S. Hitara) Disable overriding "D" option setting in the new dvipdfmx:config special.

git-svn-id: svn://tug.org/texlive/trunk@41494 c570f23f-e606-0410-a88d-b1316a301751

14 files changed, 40 insertions, 26 deletions

diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 7a2ed0f9849..4541438c63e 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,10 @@
+2016-06-19  Shunsaku Hirata  <shunsaku.hirata74@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@tug.org>
 
 	* Version 20160307 for TeX Live 2016.
diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure
index d80613d6d2a..60b45b96ce9 100755
--- a/Build/source/texk/dvipdfm-x/configure
+++ b/Build/source/texk/dvipdfm-x/configure
@@ -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@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # 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@tug.org'
 PACKAGE_URL=''
 
@@ -1350,7 +1350,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 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 @@ fi
 
 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 @@ fi
 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 @@ 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 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 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvipdfm-x--tex-live-'
- VERSION='20160307'
+ VERSION='20160619'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14744,7 +14744,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@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 @@ 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 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 @@ _ACEOF
 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\\"
 
diff --git a/Build/source/texk/dvipdfm-x/configure.ac b/Build/source/texk/dvipdfm-x/configure.ac
index e6193fd6707..e85a6dfb92e 100644
--- a/Build/source/texk/dvipdfm-x/configure.ac
+++ b/Build/source/texk/dvipdfm-x/configure.ac
@@ -7,7 +7,7 @@ dnl   This file is free software; the copyright holder
 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@tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20160619], [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([agl.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
diff --git a/Build/source/texk/dvipdfm-x/dvipdfmx.c b/Build/source/texk/dvipdfm-x/dvipdfmx.c
index 644c92cf98c..b089dbc225f 100644
--- a/Build/source/texk/dvipdfm-x/dvipdfmx.c
+++ b/Build/source/texk/dvipdfm-x/dvipdfmx.c
@@ -456,8 +456,11 @@ do_early_args (int argc, char *argv[])
   }
 }
 
+/* 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 @@ do_args (int argc, char *argv[], const char *source)
       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 @@ read_config_file (const char *config)
           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 @@ read_config_special (const char **start, const char *end)
 	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 @@ main (int argc, char *argv[])
 
   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);
diff --git a/Build/source/texk/dvipdfm-x/tests/picbmp.bb b/Build/source/texk/dvipdfm-x/tests/picbmp.bb
index ca839ffe5fc..0261de21878 100644
--- a/Build/source/texk/dvipdfm-x/tests/picbmp.bb
+++ b/Build/source/texk/dvipdfm-x/tests/picbmp.bb
@@ -1,4 +1,4 @@
 %%Title: picbmp.bmp
-%%Creator: extractbb 20160307
+%%Creator: extractbb 20160619
 %%BoundingBox: 0 0 24 24
 
diff --git a/Build/source/texk/dvipdfm-x/tests/picbmp.xbb b/Build/source/texk/dvipdfm-x/tests/picbmp.xbb
index 500462d2e78..561c4912461 100644
--- a/Build/source/texk/dvipdfm-x/tests/picbmp.xbb
+++ b/Build/source/texk/dvipdfm-x/tests/picbmp.xbb
@@ -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
 
diff --git a/Build/source/texk/dvipdfm-x/tests/picjp2.bb b/Build/source/texk/dvipdfm-x/tests/picjp2.bb
index 63563c87903..1d8d0793554 100644
--- a/Build/source/texk/dvipdfm-x/tests/picjp2.bb
+++ b/Build/source/texk/dvipdfm-x/tests/picjp2.bb
@@ -1,4 +1,4 @@
 %%Title: picjp2.jp2
-%%Creator: extractbb 20160307
+%%Creator: extractbb 20160619
 %%BoundingBox: 0 0 33 33
 
diff --git a/Build/source/texk/dvipdfm-x/tests/picjp2.xbb b/Build/source/texk/dvipdfm-x/tests/picjp2.xbb
index a1fee593916..b086c2f9a69 100644
--- a/Build/source/texk/dvipdfm-x/tests/picjp2.xbb
+++ b/Build/source/texk/dvipdfm-x/tests/picjp2.xbb
@@ -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
 
diff --git a/Build/source/texk/dvipdfm-x/tests/picjpeg.bb b/Build/source/texk/dvipdfm-x/tests/picjpeg.bb
index 60ad1914293..f51bef0af71 100644
--- a/Build/source/texk/dvipdfm-x/tests/picjpeg.bb
+++ b/Build/source/texk/dvipdfm-x/tests/picjpeg.bb
@@ -1,4 +1,4 @@
 %%Title: picjpeg.jpeg
-%%Creator: extractbb 20160307
+%%Creator: extractbb 20160619
 %%BoundingBox: 0 0 108 148
 
diff --git a/Build/source/texk/dvipdfm-x/tests/picjpeg.xbb b/Build/source/texk/dvipdfm-x/tests/picjpeg.xbb
index 3bb40f59f1a..e6bd5471683 100644
--- a/Build/source/texk/dvipdfm-x/tests/picjpeg.xbb
+++ b/Build/source/texk/dvipdfm-x/tests/picjpeg.xbb
@@ -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
 
diff --git a/Build/source/texk/dvipdfm-x/tests/picpdf.bb b/Build/source/texk/dvipdfm-x/tests/picpdf.bb
index f7625179674..fccfc73c0db 100644
--- a/Build/source/texk/dvipdfm-x/tests/picpdf.bb
+++ b/Build/source/texk/dvipdfm-x/tests/picpdf.bb
@@ -1,4 +1,4 @@
 %%Title: picpdf.pdf
-%%Creator: extractbb 20160307
+%%Creator: extractbb 20160619
 %%BoundingBox: 0 0 69 83
 
diff --git a/Build/source/texk/dvipdfm-x/tests/picpdf.xbb b/Build/source/texk/dvipdfm-x/tests/picpdf.xbb
index dbdaef35f34..b61ad1b429e 100644
--- a/Build/source/texk/dvipdfm-x/tests/picpdf.xbb
+++ b/Build/source/texk/dvipdfm-x/tests/picpdf.xbb
@@ -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
diff --git a/Build/source/texk/dvipdfm-x/tests/picpng.bb b/Build/source/texk/dvipdfm-x/tests/picpng.bb
index 7cdf13c31a1..4680f0a021e 100644
--- a/Build/source/texk/dvipdfm-x/tests/picpng.bb
+++ b/Build/source/texk/dvipdfm-x/tests/picpng.bb
@@ -1,4 +1,4 @@
 %%Title: picpng.png
-%%Creator: extractbb 20160307
+%%Creator: extractbb 20160619
 %%BoundingBox: 0 0 124 89
 
diff --git a/Build/source/texk/dvipdfm-x/tests/picpng.xbb b/Build/source/texk/dvipdfm-x/tests/picpng.xbb
index 4f649e99b9c..224f014d2ef 100644
--- a/Build/source/texk/dvipdfm-x/tests/picpng.xbb
+++ b/Build/source/texk/dvipdfm-x/tests/picpng.xbb
@@ -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