texlive[44708] Build/source/texk/dvipdfm-x: dvipdfm-x: Simplify the

[commits+kakuto at tug.org]

Revision: 44708
          http://tug.org/svn/texlive?view=revision&revision=44708
Author:   kakuto
Date:     2017-06-27 05:58:39 +0200 (Tue, 27 Jun 2017)
Log Message:
-----------
dvipdfm-x: Simplify the change on 2017-06-25

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/pdfdoc.c

Modified: trunk/Build/source/texk/dvipdfm-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/ChangeLog	2017-06-27 00:17:42 UTC (rev 44707)
+++ trunk/Build/source/texk/dvipdfm-x/ChangeLog	2017-06-27 03:58:39 UTC (rev 44708)
@@ -1,3 +1,8 @@
+2017-06-27  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* pdfdoc.c: Simplify the change in pdf_doc_get_page().
+	* configure.ac: Change version number to distinguish from TL 2017.
+
 2017-06-25  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* pdfdoc.c: Discard the backward compatibility for pdf BoundingBox

Modified: trunk/Build/source/texk/dvipdfm-x/configure
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/configure	2017-06-27 00:17:42 UTC (rev 44707)
+++ trunk/Build/source/texk/dvipdfm-x/configure	2017-06-27 03:58:39 UTC (rev 44708)
@@ -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) 20170318.
+# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20170627.
 #
 # 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='20170318'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20170318'
+PACKAGE_VERSION='20170627'
+PACKAGE_STRING='dvipdfm-x (TeX Live) 20170627'
 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) 20170318 to adapt to many kinds of systems.
+\`configure' configures dvipdfm-x (TeX Live) 20170627 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) 20170318:";;
+     short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20170627:";;
    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 20170318
+dvipdfm-x (TeX Live) configure 20170627
 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 20170318, which was
+It was created by dvipdfm-x (TeX Live) $as_me 20170627, 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='20170318'
+ VERSION='20170627'
 
 
 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 20170318
+dvipdfm-x (TeX Live) config.lt 20170627
 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 20170318, which was
+This file was extended by dvipdfm-x (TeX Live) $as_me 20170627, 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 20170318
+dvipdfm-x (TeX Live) config.status 20170627
 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	2017-06-27 00:17:42 UTC (rev 44707)
+++ trunk/Build/source/texk/dvipdfm-x/configure.ac	2017-06-27 03:58:39 UTC (rev 44708)
@@ -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)], [20170318], [tex-k at tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20170627], [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/pdfdoc.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/pdfdoc.c	2017-06-27 00:17:42 UTC (rev 44707)
+++ trunk/Build/source/texk/dvipdfm-x/pdfdoc.c	2017-06-27 03:58:39 UTC (rev 44708)
@@ -1109,20 +1109,9 @@
     }
 
     /* Nasty BBox selection... */
-    if (options == 0) {
+    if ((options == 0) || (options == 1)) {
       if (crop_box)
         box = crop_box;
-      else {
-        if (!(box = media_box) &&
-            !(box = bleed_box) &&
-            !(box = trim_box) &&
-            art_box) {
-            box = art_box;
-        }
-      }
-    } else if (options == 1) {
-      if (crop_box)
-        box = crop_box;
       else
         if (!(box = media_box) &&
             !(box = bleed_box) &&