Fix a bug introduced by the recent font related changes (S. Hirata).

git-svn-id: svn://tug.org/texlive/trunk@56412 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 27 insertions, 16 deletions

diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index eb545679bcf..6c2dcf7a678 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,10 @@
+2020-09-24  Shunsaku Hirata  <shunsaku.hirata74@gmail.com>
+
+	* pdffont.c: Fix a bug introduced by the recent font related
+	changes which can cause a problem when there is a font
+	defined but not used.
+	* configure.ac: Version 20200924.
+
 2020-09-22  Shunsaku Hirata  <shunsaku.hirata74@gmail.com>
 
 	* cid.[ch], cidtype0.[ch], cidtype2.[ch], pdfdev.c,
diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure
index 816697a5ef5..e50a5a911a4 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) 20200922.
+# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20200924.
 #
 # 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='20200922'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20200922'
+PACKAGE_VERSION='20200924'
+PACKAGE_STRING='dvipdfm-x (TeX Live) 20200924'
 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) 20200922 to adapt to many kinds of systems.
+\`configure' configures dvipdfm-x (TeX Live) 20200924 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) 20200922:";;
+     short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20200924:";;
    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 20200922
+dvipdfm-x (TeX Live) configure 20200924
 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 20200922, which was
+It was created by dvipdfm-x (TeX Live) $as_me 20200924, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8077,7 +8077,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvipdfm-x--tex-live-'
- VERSION='20200922'
+ VERSION='20200924'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14746,7 +14746,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dvipdfm-x (TeX Live) config.lt 20200922
+dvipdfm-x (TeX Live) config.lt 20200924
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -16636,7 +16636,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 20200922, which was
+This file was extended by dvipdfm-x (TeX Live) $as_me 20200924, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16706,7 +16706,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 20200922
+dvipdfm-x (TeX Live) config.status 20200924
 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 b428d0b25c4..0e45fdc994e 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)], [20200922], [dvipdfmx@tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20200924], [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/pdffont.c b/Build/source/texk/dvipdfm-x/pdffont.c
index ce4432c9af9..e49763ca2f4 100644
--- a/Build/source/texk/dvipdfm-x/pdffont.c
+++ b/Build/source/texk/dvipdfm-x/pdffont.c
@@ -490,12 +490,14 @@ pdf_close_fonts (void)
 
     font = &font_cache.fonts[font_id];
     if ((font->flags & PDF_FONT_FLAG_IS_ALIAS) ||
-        (font->flags & PDF_FONT_FLAG_IS_REENCODE)) {
+        (font->flags & PDF_FONT_FLAG_IS_REENCODE) ||
+        !font->reference) {
       continue;
     }
     if (font->subtype == PDF_FONT_FONTTYPE_CIDTYPE0 ||
-        font->subtype == PDF_FONT_FONTTYPE_CIDTYPE2)
+        font->subtype == PDF_FONT_FONTTYPE_CIDTYPE2) {
       continue;
+    }
 
     if (dpx_conf.verbose_level > 0) {
       if (font->subtype != PDF_FONT_FONTTYPE_TYPE0) {
@@ -567,7 +569,8 @@ pdf_close_fonts (void)
     pdf_font *font = &font_cache.fonts[font_id];
 
     if ((font->flags & PDF_FONT_FLAG_IS_ALIAS) ||
-        (font->flags & PDF_FONT_FLAG_IS_REENCODE)) {
+        (font->flags & PDF_FONT_FLAG_IS_REENCODE) ||
+        !font->reference) {
       continue;
     }
 
@@ -585,7 +588,8 @@ pdf_close_fonts (void)
     font = &font_cache.fonts[font_id];
 
     if ((font->flags & PDF_FONT_FLAG_IS_ALIAS) ||
-        (font->flags & PDF_FONT_FLAG_IS_REENCODE)) {
+        (font->flags & PDF_FONT_FLAG_IS_REENCODE) ||
+        !font->reference) {
       pdf_clean_font_struct(font);
       continue;
     }