summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2021-10-16 00:18:30 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2021-10-16 00:18:30 +0000
commit8d559f2742f696e5519d407aa029a5520b8c965c (patch)
treed12eafac79d992e97015ebe4ce462c64f0fcf3b5 /Build/source
parent260ce72fb2d88de1f243082be182fe2be08fe7d2 (diff)
fix a bug that -r option did not work
git-svn-id: svn://tug.org/texlive/trunk@60775 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog7
-rwxr-xr-xBuild/source/texk/dvipdfm-x/configure22
-rw-r--r--Build/source/texk/dvipdfm-x/configure.ac2
-rw-r--r--Build/source/texk/dvipdfm-x/dvipdfmx.c12
4 files changed, 26 insertions, 17 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 7456cc7dfb9..1c756ea7454 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,10 @@
+2021-10-16 Akira Kakuto <kakuto@jcom.zaq.ne.jp>
+
+ * dvipdfmx.c: Fix a bug that the -r option was not effective,
+ as reported in
+ https://tug.org/pipermail/dvipdfmx/2021-September/000296.html.
+ * configure.ac: version 20211016.
+
2021-09-26 Akira Kakuto <kakuto@jcom.zaq.ne.jp>
* pdfdev.c: Remove all my changes on 2021-03-04 and 2021-03-05
which were completely wrong.
diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure
index c735536012c..f278c6643a7 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.71 for dvipdfm-x (TeX Live) 20210926.
+# Generated by GNU Autoconf 2.71 for dvipdfm-x (TeX Live) 20211016.
#
# Report bugs to <dvipdfmx@tug.org>.
#
@@ -629,8 +629,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='dvipdfm-x (TeX Live)'
PACKAGE_TARNAME='dvipdfm-x--tex-live-'
-PACKAGE_VERSION='20210926'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20210926'
+PACKAGE_VERSION='20211016'
+PACKAGE_STRING='dvipdfm-x (TeX Live) 20211016'
PACKAGE_BUGREPORT='dvipdfmx@tug.org'
PACKAGE_URL=''
@@ -1395,7 +1395,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) 20210926 to adapt to many kinds of systems.
+\`configure' configures dvipdfm-x (TeX Live) 20211016 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1467,7 +1467,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20210926:";;
+ short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20211016:";;
esac
cat <<\_ACEOF
@@ -1597,7 +1597,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dvipdfm-x (TeX Live) configure 20210926
+dvipdfm-x (TeX Live) configure 20211016
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2353,7 +2353,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 20210926, which was
+It was created by dvipdfm-x (TeX Live) $as_me 20211016, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -8675,7 +8675,7 @@ fi
# Define the identity of the package.
PACKAGE='dvipdfm-x--tex-live-'
- VERSION='20210926'
+ VERSION='20211016'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -15480,7 +15480,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-dvipdfm-x (TeX Live) config.lt 20210926
+dvipdfm-x (TeX Live) config.lt 20211016
configured by $0, generated by GNU Autoconf 2.71.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -17392,7 +17392,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 20210926, which was
+This file was extended by dvipdfm-x (TeX Live) $as_me 20211016, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17464,7 +17464,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-dvipdfm-x (TeX Live) config.status 20210926
+dvipdfm-x (TeX Live) config.status 20211016
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/texk/dvipdfm-x/configure.ac b/Build/source/texk/dvipdfm-x/configure.ac
index 15d4b2a5f97..ac1a562c395 100644
--- a/Build/source/texk/dvipdfm-x/configure.ac
+++ b/Build/source/texk/dvipdfm-x/configure.ac
@@ -8,7 +8,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)], [20210926], [dvipdfmx@tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20211016], [dvipdfmx@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 ec4499c45f1..76c64c63837 100644
--- a/Build/source/texk/dvipdfm-x/dvipdfmx.c
+++ b/Build/source/texk/dvipdfm-x/dvipdfmx.c
@@ -1108,11 +1108,6 @@ main (int argc, char *argv[])
*/
has_paper_option = 0;
-#ifndef MIKTEX
- kpse_init_prog("", font_dpi, NULL, NULL);
- kpse_set_program_enabled(kpse_pk_format, true, kpse_src_texmf_cnf);
-#endif
- pdf_font_set_dpi(font_dpi);
if (!dvi_filename) {
if (verbose)
MESG("No dvi filename specified, reading standard input.\n");
@@ -1154,6 +1149,13 @@ main (int argc, char *argv[])
}
}
+ /* moved to here because -r option was not effective */
+#ifndef MIKTEX
+ kpse_init_prog("", font_dpi, NULL, NULL);
+ kpse_set_program_enabled(kpse_pk_format, true, kpse_src_texmf_cnf);
+#endif
+ pdf_font_set_dpi(font_dpi);
+
/* moved to here because image caching was not effective */
dpx_delete_old_cache(image_cache_life);