texlive[60612] Build/source/texk/dvipdfm-x: dvipdfm-x: fix bugs which
commits+kakuto at tug.org
commits+kakuto at tug.org
Sun Sep 26 02:41:09 CEST 2021
Revision: 60612
http://tug.org/svn/texlive?view=revision&revision=60612
Author: kakuto
Date: 2021-09-26 02:41:08 +0200 (Sun, 26 Sep 2021)
Log Message:
-----------
dvipdfm-x: fix bugs which I introduced
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/pdfdev.c
trunk/Build/source/texk/dvipdfm-x/pkfont.c
Modified: trunk/Build/source/texk/dvipdfm-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/ChangeLog 2021-09-25 23:49:13 UTC (rev 60611)
+++ trunk/Build/source/texk/dvipdfm-x/ChangeLog 2021-09-26 00:41:08 UTC (rev 60612)
@@ -1,3 +1,11 @@
+2021-09-26 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
+ * pdfdev.c: Remove all my changes on 2021-03-04 and 2021-03-05
+ which were completely wrong.
+ * pkfont.c: Before calling kpse_find_glyph(ident, ...), remove
+ a suffix .pfb from the ident, if the suffix exists, because the
+ suffix prevents mktexpk to work right.
+ * configure.ac: version 20210926.
+
2021-06-09 Shunsaku Hirata <shunsaku.hirata74 at gmail.com>
* pdfencoding.c: Replace the changes made on 2021-06-02. The
Modified: trunk/Build/source/texk/dvipdfm-x/configure
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/configure 2021-09-25 23:49:13 UTC (rev 60611)
+++ trunk/Build/source/texk/dvipdfm-x/configure 2021-09-26 00:41:08 UTC (rev 60612)
@@ -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) 20210609.
+# Generated by GNU Autoconf 2.71 for dvipdfm-x (TeX Live) 20210926.
#
# Report bugs to <dvipdfmx at tug.org>.
#
@@ -629,8 +629,8 @@
# Identity of this package.
PACKAGE_NAME='dvipdfm-x (TeX Live)'
PACKAGE_TARNAME='dvipdfm-x--tex-live-'
-PACKAGE_VERSION='20210609'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20210609'
+PACKAGE_VERSION='20210926'
+PACKAGE_STRING='dvipdfm-x (TeX Live) 20210926'
PACKAGE_BUGREPORT='dvipdfmx at tug.org'
PACKAGE_URL=''
@@ -1395,7 +1395,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) 20210609 to adapt to many kinds of systems.
+\`configure' configures dvipdfm-x (TeX Live) 20210926 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1467,7 +1467,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20210609:";;
+ short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20210926:";;
esac
cat <<\_ACEOF
@@ -1597,7 +1597,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dvipdfm-x (TeX Live) configure 20210609
+dvipdfm-x (TeX Live) configure 20210926
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2353,7 +2353,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 20210609, which was
+It was created by dvipdfm-x (TeX Live) $as_me 20210926, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -8675,7 +8675,7 @@
# Define the identity of the package.
PACKAGE='dvipdfm-x--tex-live-'
- VERSION='20210609'
+ VERSION='20210926'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -15480,7 +15480,7 @@
Report bugs to <bug-libtool at gnu.org>."
lt_cl_version="\
-dvipdfm-x (TeX Live) config.lt 20210609
+dvipdfm-x (TeX Live) config.lt 20210926
configured by $0, generated by GNU Autoconf 2.71.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -17392,7 +17392,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 20210609, which was
+This file was extended by dvipdfm-x (TeX Live) $as_me 20210926, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17464,7 +17464,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-dvipdfm-x (TeX Live) config.status 20210609
+dvipdfm-x (TeX Live) config.status 20210926
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Modified: trunk/Build/source/texk/dvipdfm-x/configure.ac
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/configure.ac 2021-09-25 23:49:13 UTC (rev 60611)
+++ trunk/Build/source/texk/dvipdfm-x/configure.ac 2021-09-26 00:41:08 UTC (rev 60612)
@@ -8,7 +8,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)], [20210609], [dvipdfmx at tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20210926], [dvipdfmx 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/pdfdev.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/pdfdev.c 2021-09-25 23:49:13 UTC (rev 60611)
+++ trunk/Build/source/texk/dvipdfm-x/pdfdev.c 2021-09-26 00:41:08 UTC (rev 60612)
@@ -1324,17 +1324,6 @@
/* New font */
mrec = pdf_lookup_fontmap_record(font_name);
-/*
- The extension ".pfb" is not needed for type1 fonts.
- And the extension ".pfb" prohibits to call mktexpk with right
- arguments when pdftex.map is used and when type1 is not found.
- Thus we discard the extension ".pfb".
-*/
- if (mrec && mrec->font_name) {
- pp = strrchr(mrec->font_name, '.');
- if (pp && strcasecmp(pp, ".pfb") == 0)
- *pp = '\0';
- }
if (dpx_conf.verbose_level > 1)
print_fontmap(font_name, mrec);
Modified: trunk/Build/source/texk/dvipdfm-x/pkfont.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/pkfont.c 2021-09-25 23:49:13 UTC (rev 60611)
+++ trunk/Build/source/texk/dvipdfm-x/pkfont.c 2021-09-26 00:41:08 UTC (rev 60612)
@@ -1,6 +1,6 @@
/* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- Copyright (C) 2002-2020 by Jin-Hwan Cho and Shunsaku Hirata,
+ Copyright (C) 2002-2021 by Jin-Hwan Cho and Shunsaku Hirata,
the dvipdfmx project team.
Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks at kettering.edu>
@@ -87,6 +87,15 @@
char *fqpn;
kpse_glyph_file_type kpse_file_info;
+/*
+ If pdftex.map is used, there are cases for example ident is like
+ cmr10.pfb. Because of the suffix .pfb here, mktexpk does not
+ work right. So we remove the suffix .pfb, if it exists.
+*/
+ fqpn = strrchr(ident, '.');
+ if (fqpn && strcasecmp(fqpn, ".pfb") == 0) {
+ *fqpn = '\0';
+ }
fqpn = kpse_find_glyph(ident, dpi, kpse_pk_format, &kpse_file_info);
if (!fqpn)
return NULL;
More information about the tex-live-commits
mailing list.