From afc5ee21bbacfb331d2262419ed90c3d521d24d7 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Thu, 4 Mar 2021 04:18:32 +0000 Subject: fix to call mktexpk with correct arguments git-svn-id: svn://tug.org/texlive/trunk@58110 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 | 13 ++++++++++++- 4 files changed, 32 insertions(+), 13 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index afb4702b6cc..5e1180e3a8c 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,11 @@ +2021-03-04 Akira Kakuto + + * pdfdev.c: Fix to call mktexpk with correct arguments when + pdftex.map is used and type1 font is not found. + Reported by Igor Liferenko: + https://tug.org/pipermail/dvipdfmx/2021-March/000241.html + * configure.ac: Version 20210304. + 2021-02-12 Shunsaku Hirata * dvi.c: Fix a bug (segfault) that current_font is not checked diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure index be146fd367b..6347f3c22e0 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) 20210212. +# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20210304. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dvipdfm-x (TeX Live)' PACKAGE_TARNAME='dvipdfm-x--tex-live-' -PACKAGE_VERSION='20210212' -PACKAGE_STRING='dvipdfm-x (TeX Live) 20210212' +PACKAGE_VERSION='20210304' +PACKAGE_STRING='dvipdfm-x (TeX Live) 20210304' 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) 20210212 to adapt to many kinds of systems. +\`configure' configures dvipdfm-x (TeX Live) 20210304 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) 20210212:";; + short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20210304:";; 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 20210212 +dvipdfm-x (TeX Live) configure 20210304 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 20210212, which was +It was created by dvipdfm-x (TeX Live) $as_me 20210304, 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='20210212' + VERSION='20210304' cat >>confdefs.h <<_ACEOF @@ -14741,7 +14741,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -dvipdfm-x (TeX Live) config.lt 20210212 +dvipdfm-x (TeX Live) config.lt 20210304 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 20210212, which was +This file was extended by dvipdfm-x (TeX Live) $as_me 20210304, 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 20210212 +dvipdfm-x (TeX Live) config.status 20210304 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 d8b2b4eec25..b85b91aba57 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)], [20210212], [dvipdfmx@tug.org]) +AC_INIT([dvipdfm-x (TeX Live)], [20210304], [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 29980b5ade8..403c523b3a5 100644 --- a/Build/source/texk/dvipdfm-x/pdfdev.c +++ b/Build/source/texk/dvipdfm-x/pdfdev.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 @@ -1243,11 +1243,22 @@ pdf_dev_eop (void) static void print_fontmap (const char *font_name, fontmap_rec *mrec) { + char *p; if (!mrec) return; MESG("\n"); +/* + 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". +*/ + p = strrchr(mrec->font_name, '.'); + if (p && strcasecmp(p, ".pfb") == 0) + *p = '\0'; + MESG("fontmap: %s -> %s", font_name, mrec->font_name); if (mrec->enc_name) MESG("(%s)", mrec->enc_name); -- cgit v1.2.3