summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-12-14 05:02:54 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-12-14 05:02:54 +0000
commitae73c4f80e8a3a5b37072abb903b2e2e2d3530c7 (patch)
treeee8425ee6050ba12a8945c206239c3fabd495b6d /Build
parent80d0f2b2204433a3a33e5404c03d84039511eb51 (diff)
dvipdfm-x: Fix an incorrect argument for mktexpk.
git-svn-id: svn://tug.org/texlive/trunk@57134 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog6
-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/pkfont.c18
4 files changed, 34 insertions, 14 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index e36ce3567c7..c033bfba7f3 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,9 @@
+2020-12-14 Akira Kakuto <kakuto@w32tex.org>
+
+ * pkfont.c: Fix an incorrect argument for mktexpk.
+ https://tug.org/pipermail/dvipdfmx/2020-December/000142.html.
+ * configure.ac: Version 20201214.
+
2020-11-11 Shunsaku Hirata <shunsaku.hirata74@gmail.com>
* spc_html.c: Fix a bug that html-special was not working
diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure
index f3e71508bda..353386a85a0 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) 20201111.
+# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20201214.
#
# Report bugs to <dvipdfmx@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='20201111'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20201111'
+PACKAGE_VERSION='20201214'
+PACKAGE_STRING='dvipdfm-x (TeX Live) 20201214'
PACKAGE_BUGREPORT='dvipdfmx@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) 20201111 to adapt to many kinds of systems.
+\`configure' configures dvipdfm-x (TeX Live) 20201214 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) 20201111:";;
+ short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20201214:";;
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 20201111
+dvipdfm-x (TeX Live) configure 20201214
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 20201111, which was
+It was created by dvipdfm-x (TeX Live) $as_me 20201214, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8072,7 +8072,7 @@ fi
# Define the identity of the package.
PACKAGE='dvipdfm-x--tex-live-'
- VERSION='20201111'
+ VERSION='20201214'
cat >>confdefs.h <<_ACEOF
@@ -14741,7 +14741,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-dvipdfm-x (TeX Live) config.lt 20201111
+dvipdfm-x (TeX Live) config.lt 20201214
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -16631,7 +16631,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 20201111, which was
+This file was extended by dvipdfm-x (TeX Live) $as_me 20201214, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16701,7 +16701,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 20201111
+dvipdfm-x (TeX Live) config.status 20201214
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 5b4efc95032..47c0d0ff61a 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)], [20201111], [dvipdfmx@tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20201214], [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/pkfont.c b/Build/source/texk/dvipdfm-x/pkfont.c
index 1e4173bd397..b42f4f086f4 100644
--- a/Build/source/texk/dvipdfm-x/pkfont.c
+++ b/Build/source/texk/dvipdfm-x/pkfont.c
@@ -86,8 +86,22 @@ dpx_open_pk_font_at (const char *ident, unsigned dpi)
FILE *fp;
char *fqpn;
kpse_glyph_file_type kpse_file_info;
-
- fqpn = kpse_find_glyph(ident, dpi, kpse_pk_format, &kpse_file_info);
+/*
+ * ident can be such as "cmr10.pfb":
+ * https://tug.org/pipermail/dvipdfmx/2020-December/000142.html.
+ * As a workaround, we drop a suffix if it exists.
+ * Some messages still seems not to be appropriate, but PK creation
+ * works fine.
+ *
+ */
+ char *ident_nosuffix;
+ ident_nosuffix = xstrdup(ident);
+ fqpn = strrchr(ident_nosuffix, '.');
+ if (fqpn) {
+ *fqpn = '\0';
+ }
+ fqpn = kpse_find_glyph(ident_nosuffix, dpi, kpse_pk_format, &kpse_file_info);
+ RELEASE(ident_nosuffix);
if (!fqpn)
return NULL;
fp = MFOPEN(fqpn, FOPEN_RBIN_MODE);