From a57a49cf8de9eee716acc6c9944e42c4d07faf0c Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Sun, 26 Sep 2021 00:41:08 +0000 Subject: dvipdfm-x: fix bugs which I introduced git-svn-id: svn://tug.org/texlive/trunk@60612 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 8 ++++++++ Build/source/texk/dvipdfm-x/configure | 22 +++++++++++----------- Build/source/texk/dvipdfm-x/configure.ac | 2 +- Build/source/texk/dvipdfm-x/pdfdev.c | 11 ----------- Build/source/texk/dvipdfm-x/pkfont.c | 11 ++++++++++- 5 files changed, 30 insertions(+), 24 deletions(-) diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 2126228791b..7456cc7dfb9 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,11 @@ +2021-09-26 Akira Kakuto + * 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 * pdfencoding.c: Replace the changes made on 2021-06-02. The diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure index ddcb418b390..c735536012c 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) 20210609. +# Generated by GNU Autoconf 2.71 for dvipdfm-x (TeX Live) 20210926. # # Report bugs to . # @@ -629,8 +629,8 @@ MAKEFLAGS= # 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@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) 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 @@ fi 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 @@ fi 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 @@ 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 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 @@ fi # 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 @@ Usage: $0 [OPTIONS] Report bugs to ." 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 @@ 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 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 @@ 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 20210609 +dvipdfm-x (TeX Live) config.status 20210926 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 0e104125cf2..15d4b2a5f97 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)], [20210609], [dvipdfmx@tug.org]) +AC_INIT([dvipdfm-x (TeX Live)], [20210926], [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/pdfdev.c b/Build/source/texk/dvipdfm-x/pdfdev.c index f6d654e7c30..1c503c41b46 100644 --- a/Build/source/texk/dvipdfm-x/pdfdev.c +++ b/Build/source/texk/dvipdfm-x/pdfdev.c @@ -1324,17 +1324,6 @@ pdf_dev_locate_font (const char *font_name, spt_t ptsize) /* 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); diff --git a/Build/source/texk/dvipdfm-x/pkfont.c b/Build/source/texk/dvipdfm-x/pkfont.c index 1e4173bd397..6d8cfc07e07 100644 --- a/Build/source/texk/dvipdfm-x/pkfont.c +++ b/Build/source/texk/dvipdfm-x/pkfont.c @@ -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 @@ -87,6 +87,15 @@ dpx_open_pk_font_at (const char *ident, unsigned dpi) 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; -- cgit v1.2.3