Add a special pdffontattr for compatibility with pdftex (S. Hirata)

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

4 files changed, 104 insertions, 13 deletions

diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index dbd67f61f9f..fce47e9781d 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,8 @@
+2021-01-24  Shunsaku Hirata  <shunsaku.hirata74@gmail.com>
+
+	* spc_misc.c: Add a compatibility special pdffontattr.
+	* configure.ac: Version 20210124.
+
 2021-01-22  Shunsaku Hirata  <shunsaku.hirata74@gmail.com>
 
 	* cidtype0.c: Fix the VORG bug reported in
diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure
index a6a20c50563..579c9abfd6f 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) 20210122.
+# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20210124.
 #
 # 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='20210122'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20210122'
+PACKAGE_VERSION='20210124'
+PACKAGE_STRING='dvipdfm-x (TeX Live) 20210124'
 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) 20210122 to adapt to many kinds of systems.
+\`configure' configures dvipdfm-x (TeX Live) 20210124 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) 20210122:";;
+     short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20210124:";;
    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 20210122
+dvipdfm-x (TeX Live) configure 20210124
 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 20210122, which was
+It was created by dvipdfm-x (TeX Live) $as_me 20210124, 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='20210122'
+ VERSION='20210124'
 
 
 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 20210122
+dvipdfm-x (TeX Live) config.lt 20210124
 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 20210122, which was
+This file was extended by dvipdfm-x (TeX Live) $as_me 20210124, 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 20210122
+dvipdfm-x (TeX Live) config.status 20210124
 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 5a864566ed1..b0ae737d076 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)], [20210122], [dvipdfmx@tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20210124], [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/spc_misc.c b/Build/source/texk/dvipdfm-x/spc_misc.c
index c30fbb92003..95da54c003b 100644
--- a/Build/source/texk/dvipdfm-x/spc_misc.c
+++ b/Build/source/texk/dvipdfm-x/spc_misc.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 <mwicks@kettering.edu>
@@ -335,6 +335,91 @@ spc_handler_pdfcolorstack (struct spc_env *spe, struct spc_arg *args)
   return error;
 }
 
+/* Duplicate from spc_pdfm */
+static pdf_obj *
+parse_pdf_reference (const char **start, const char *end, void *user_data)
+{
+  pdf_obj *result = NULL;
+  char    *name;
+
+  skip_white(start, end);
+  name = parse_opt_ident(start, end);
+  if (name) {
+    result = spc_lookup_reference(name);
+    if (!result) {
+      WARN("Could not find the named reference (@%s).", name);
+    }
+    RELEASE(name);
+  } else {
+    WARN("Could not find a reference name.");
+    result = NULL;
+  }
+
+  return result;
+}
+
+#include "pdffont.h"
+
+static int
+spc_handler_pdffontattr (struct spc_env *spe, struct spc_arg *args)
+{
+  pdf_obj *fontdict, *fontattr;
+  char    *ident   = NULL;
+  int      font_id = -1;
+  double   size    = 0.0;
+
+  skip_white(&args->curptr, args->endptr);
+  if (args->curptr >= args->endptr) {
+    return -1;
+  }
+
+  ident = parse_ident(&args->curptr, args->endptr);
+  if (!ident) {
+    spc_warn(spe, "Missing a font name.");
+    return -1;
+  }
+  skip_white(&args->curptr, args->endptr);
+
+  if (args->curptr < args->endptr && args->curptr[0] != '<') {
+    char *fontscale = parse_float_decimal(&args->curptr, args->endptr);
+    if (fontscale) {
+      size = atof(fontscale);
+      RELEASE(fontscale);
+      skip_white(&args->curptr, args->endptr);
+    } else {
+      spc_warn(spe, "A number expected but not found.");
+      RELEASE(ident);
+      return -1;
+    }
+  }
+
+  font_id = pdf_font_findresource(ident, size*(72.0/72.27));
+  if (font_id < 0) {
+    spc_warn(spe, "Could not find specified font resource: %s (%gpt)", ident, size);
+    RELEASE(ident);
+    return -1;
+  }
+    
+  fontdict = pdf_get_font_resource(font_id);
+  if (!fontdict) {
+    spc_warn(spe, "Specified object not exist: %s (%gpt)", ident, size);
+    RELEASE(ident);
+    return  -1;
+  }
+
+  fontattr = parse_pdf_object_extended(&args->curptr, args->endptr, NULL, parse_pdf_reference, spe);
+  if (!fontattr) {
+    spc_warn(spe, "Failed to parse a PDF dictionary object...");
+    RELEASE(ident);
+    return -1;
+  }
+
+  pdf_merge_dict(fontdict, fontattr);
+  pdf_release_obj(fontattr);
+  RELEASE(ident);
+
+  return 0;
+}
 
 int
 spc_misc_at_begin_document (void)
@@ -469,6 +554,7 @@ static struct spc_handler misc_handlers[] = {
   {"postscriptbox",     spc_handler_postscriptbox},
   {"pdfcolorstackinit", spc_handler_pdfcolorstackinit},
   {"pdfcolorstack",     spc_handler_pdfcolorstack},
+  {"pdffontattr",       spc_handler_pdffontattr},
   {"landscape",         spc_handler_null}, /* handled at bop */
   {"papersize",         spc_handler_null}, /* handled at bop */
   {"src:",              spc_handler_null}, /* simply ignore  */