summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-11-10 20:13:11 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-11-10 20:13:11 +0000
commit9e98579f62dba2cae1ea06e4583e68158fb01b86 (patch)
treeb351407a5edb4ca2db500fde43a1dc57b885167c
parentc1c25c304c37f499e1ad06eada5cb660a04ad42e (diff)
Fix a bug in html-special support. Add pseudo-unique tag to ToUnicode
CMap name again. (S. Hirata) git-svn-id: svn://tug.org/texlive/trunk@56902 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog8
-rwxr-xr-xBuild/source/texk/dvipdfm-x/configure22
-rw-r--r--Build/source/texk/dvipdfm-x/configure.ac2
-rw-r--r--Build/source/texk/dvipdfm-x/spc_html.c32
-rw-r--r--Build/source/texk/dvipdfm-x/type0.c23
5 files changed, 44 insertions, 43 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index f8cfce751be..e36ce3567c7 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,11 @@
+2020-11-11 Shunsaku Hirata <shunsaku.hirata74@gmail.com>
+
+ * spc_html.c: Fix a bug that html-special was not working
+ after the changes introduced in rev.55722 (pdf:bann accepts a
+ reference ID).
+ * type0.c: Add pseudo-unique tag to ToUnicode CMap name again.
+ * configure.ac: Version 20201111.
+
2020-10-31 Shunsaku Hirata <shunsaku.hirata74@gmail.com>
* pdfximage.c: Fix a bug that mps images are not reused when
diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure
index 7db187ef858..e9219433579 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) 20201031.
+# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20201111.
#
# 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='20201031'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20201031'
+PACKAGE_VERSION='20201111'
+PACKAGE_STRING='dvipdfm-x (TeX Live) 20201111'
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) 20201031 to adapt to many kinds of systems.
+\`configure' configures dvipdfm-x (TeX Live) 20201111 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) 20201031:";;
+ short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20201111:";;
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 20201031
+dvipdfm-x (TeX Live) configure 20201111
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 20201031, which was
+It was created by dvipdfm-x (TeX Live) $as_me 20201111, 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='20201031'
+ VERSION='20201111'
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 20201031
+dvipdfm-x (TeX Live) config.lt 20201111
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 20201031, which was
+This file was extended by dvipdfm-x (TeX Live) $as_me 20201111, 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 20201031
+dvipdfm-x (TeX Live) config.status 20201111
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 eecf48a733c..5b4efc95032 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)], [20201031], [dvipdfmx@tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20201111], [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_html.c b/Build/source/texk/dvipdfm-x/spc_html.c
index 2007f7441ff..14640be11b5 100644
--- a/Build/source/texk/dvipdfm-x/spc_html.c
+++ b/Build/source/texk/dvipdfm-x/spc_html.c
@@ -313,10 +313,8 @@ html_open_link (struct spc_env *spe, const char *name, struct spc_html_ *sd)
ASSERT( sd->link_dict == NULL ); /* Should be checked somewhere else */
sd->link_dict = pdf_new_dict();
- pdf_add_dict(sd->link_dict,
- pdf_new_name("Type"), pdf_new_name ("Annot"));
- pdf_add_dict(sd->link_dict,
- pdf_new_name("Subtype"), pdf_new_name ("Link"));
+ pdf_add_dict(sd->link_dict, pdf_new_name("Type"), pdf_new_name ("Annot"));
+ pdf_add_dict(sd->link_dict, pdf_new_name("Subtype"), pdf_new_name ("Link"));
color = pdf_new_array ();
pdf_add_array(color, pdf_new_number(0.0));
@@ -327,28 +325,18 @@ html_open_link (struct spc_env *spe, const char *name, struct spc_html_ *sd)
url = fqurl(sd->baseurl, name);
if (url[0] == '#') {
/* url++; causes memory leak in RELEASE(url) */
- pdf_add_dict(sd->link_dict,
- pdf_new_name("Dest"),
- pdf_new_string(url+1, strlen(url+1)));
+ pdf_add_dict(sd->link_dict, pdf_new_name("Dest"), pdf_new_string(url+1, strlen(url+1)));
} else { /* Assume this is URL */
pdf_obj *action = pdf_new_dict();
- pdf_add_dict(action,
- pdf_new_name("Type"),
- pdf_new_name("Action"));
- pdf_add_dict(action,
- pdf_new_name("S"),
- pdf_new_name("URI"));
- pdf_add_dict(action,
- pdf_new_name("URI"),
- pdf_new_string(url, strlen(url)));
- pdf_add_dict(sd->link_dict,
- pdf_new_name("A"),
- pdf_link_obj(action));
+ pdf_add_dict(action, pdf_new_name("Type"), pdf_new_name("Action"));
+ pdf_add_dict(action, pdf_new_name("S"), pdf_new_name("URI"));
+ pdf_add_dict(action, pdf_new_name("URI"), pdf_new_string(url, strlen(url)));
+ pdf_add_dict(sd->link_dict, pdf_new_name("A"), pdf_link_obj(action));
pdf_release_obj(action);
}
RELEASE(url);
- spc_begin_annot(spe, sd->link_dict);
+ spc_begin_annot(spe, pdf_link_obj(sd->link_dict));
sd->pending_type = ANCHOR_TYPE_HREF;
@@ -375,9 +363,7 @@ html_open_dest (struct spc_env *spe, const char *name, struct spc_html_ *sd)
pdf_add_array(array, pdf_new_number(cp.y + 24.0));
pdf_add_array(array, pdf_new_null());
- error = pdf_doc_add_names("Dests",
- name, strlen(name),
- array);
+ error = pdf_doc_add_names("Dests", name, strlen(name), array);
if (error)
spc_warn(spe, "Failed to add named destination: %s", name);
diff --git a/Build/source/texk/dvipdfm-x/type0.c b/Build/source/texk/dvipdfm-x/type0.c
index 09d161df6ae..afb4bbbc1bc 100644
--- a/Build/source/texk/dvipdfm-x/type0.c
+++ b/Build/source/texk/dvipdfm-x/type0.c
@@ -111,13 +111,19 @@ Type0Font_attach_ToUnicode_stream (pdf_font *font)
tounicode = NULL;
csi = &cidfont->cid.csi;
- fontname = cidfont->fontname;
+ if (cidfont->cid.options.embed) {
+ fontname = NEW(strlen(cidfont->fontname)+8, char);
+ sprintf(fontname, "%s+%s", cidfont->uniqueID, cidfont->fontname);
+ } else {
+ fontname = NEW(strlen(cidfont->fontname)+1, char);
+ strcpy(fontname, cidfont->fontname);
+ }
switch (cidfont->subtype) {
case PDF_FONT_FONTTYPE_CIDTYPE2:
if (!strcmp(csi->registry, "Adobe") && !strcmp(csi->ordering, "Identity")) {
tounicode = otf_create_ToUnicode_stream(cidfont->ident, cidfont->index,
- cidfont->fontname, font->usedchars);
+ fontname, font->usedchars);
} else {
char *cmap_base = NEW(strlen(csi->registry) + strlen(csi->ordering) + 2, char);
sprintf(cmap_base, "%s-%s", csi->registry, csi->ordering);
@@ -129,26 +135,27 @@ Type0Font_attach_ToUnicode_stream (pdf_font *font)
default:
if (cidfont->flags & CIDFONT_FLAG_TYPE1C) {
tounicode = otf_create_ToUnicode_stream(cidfont->ident, cidfont->index,
- cidfont->fontname, font->usedchars);
+ fontname, font->usedchars);
} else if (cidfont->flags & CIDFONT_FLAG_TYPE1) {
- tounicode = CIDFont_type0_t1create_ToUnicode_stream(cidfont->ident, cidfont->fontname, font->usedchars);
+ tounicode = CIDFont_type0_t1create_ToUnicode_stream(cidfont->ident, fontname, font->usedchars);
} else {
- tounicode = try_load_ToUnicode_file(fontname);
+ tounicode = try_load_ToUnicode_file(cidfont->fontname);
if (!tounicode) {
tounicode = otf_create_ToUnicode_stream(cidfont->ident, cidfont->index,
- cidfont->fontname, font->usedchars);
+ fontname, font->usedchars);
}
}
}
+ RELEASE(fontname);
if (tounicode) {
pdf_add_dict(font->resource, pdf_new_name("ToUnicode"), tounicode);
} else {
#if defined(LIBDPX)
if (dpx_conf.verbose_level > 0)
- WARN("Failed to load ToUnicode CMap for font \"%s\"", fontname);
+ WARN("Failed to load ToUnicode CMap for font \"%s\"", cidfont->fontname);
#else
- WARN("Failed to load ToUnicode CMap for font \"%s\"", fontname);
+ WARN("Failed to load ToUnicode CMap for font \"%s\"", cidfont->filename);
#endif /* LIBDPX */
}