diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-06-27 03:58:39 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-06-27 03:58:39 +0000 |
commit | 23ca6c42ea310ce31f3607d6efebd184048250ec (patch) | |
tree | e0a14c5a7d8b6058d4bbb9c1d2aea461e489f52c /Build/source/texk | |
parent | 9b6cf3a9f62f36cd53a437ec9695eb36c23d0696 (diff) |
dvipdfm-x: Simplify the change on 2017-06-25
git-svn-id: svn://tug.org/texlive/trunk@44708 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r-- | Build/source/texk/dvipdfm-x/ChangeLog | 5 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm-x/configure | 22 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/configure.ac | 2 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/pdfdoc.c | 13 |
4 files changed, 18 insertions, 24 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 4b20e5fa121..010dfbba3ee 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,8 @@ +2017-06-27 Akira Kakuto <kakuto@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@fuk.kindai.ac.jp> * pdfdoc.c: Discard the backward compatibility for pdf BoundingBox diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure index 61dcc81e3d6..a9688343232 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) 20170318. +# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20170627. # # 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='20170318' -PACKAGE_STRING='dvipdfm-x (TeX Live) 20170318' +PACKAGE_VERSION='20170627' +PACKAGE_STRING='dvipdfm-x (TeX Live) 20170627' 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) 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 @@ fi 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 @@ fi 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 @@ 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 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 @@ fi # Define the identity of the package. PACKAGE='dvipdfm-x--tex-live-' - VERSION='20170318' + VERSION='20170627' 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 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 @@ 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 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 @@ _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 20170318 +dvipdfm-x (TeX Live) config.status 20170627 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 bc8bcd70cf6..ed083e9d6b2 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)], [20170318], [tex-k@tug.org]) +AC_INIT([dvipdfm-x (TeX Live)], [20170627], [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/pdfdoc.c b/Build/source/texk/dvipdfm-x/pdfdoc.c index 2aba7ab0596..0921924d0bf 100644 --- a/Build/source/texk/dvipdfm-x/pdfdoc.c +++ b/Build/source/texk/dvipdfm-x/pdfdoc.c @@ -1109,18 +1109,7 @@ pdf_doc_get_page (pdf_file *pf, } /* Nasty BBox selection... */ - if (options == 0) { - 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 ((options == 0) || (options == 1)) { if (crop_box) box = crop_box; else |