summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-08-23 03:54:32 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-08-23 03:54:32 +0000
commitde43892c3a53e4eb0c07719cb531933d179a7404 (patch)
tree385cf033e233c507d3df448cb88d06874c0895d0
parent1555da111b7187031b9062b8e7865a780468bf48 (diff)
Add glyph names of component glyphs used by seac operator to CharSet string (S. Hirata)
git-svn-id: svn://tug.org/texlive/trunk@48463 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog6
-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/type1.c20
4 files changed, 33 insertions, 17 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 6afb917c84e..bb43949934f 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-23 Shunsaku Hirata <shunsaku.hirata74@gmail.com>
+
+ * type1.c: Add glyph names of component glyphs used by seac
+ operator to CharSet string.
+ * configure.ac: Version 20180823.
+
2018-08-21 Shunsaku Hirata <shunsaku.hirata74@gmail.com>
* pdfobj.c: Fix for "infinite loop" detection. Now handles the
diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure
index 307ba78063d..b0e01366694 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) 20180821.
+# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20180823.
#
# Report bugs to <tex-k@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='20180821'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20180821'
+PACKAGE_VERSION='20180823'
+PACKAGE_STRING='dvipdfm-x (TeX Live) 20180823'
PACKAGE_BUGREPORT='tex-k@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) 20180821 to adapt to many kinds of systems.
+\`configure' configures dvipdfm-x (TeX Live) 20180823 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) 20180821:";;
+ short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20180823:";;
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 20180821
+dvipdfm-x (TeX Live) configure 20180823
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 20180821, which was
+It was created by dvipdfm-x (TeX Live) $as_me 20180823, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8075,7 +8075,7 @@ fi
# Define the identity of the package.
PACKAGE='dvipdfm-x--tex-live-'
- VERSION='20180821'
+ VERSION='20180823'
cat >>confdefs.h <<_ACEOF
@@ -14744,7 +14744,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-dvipdfm-x (TeX Live) config.lt 20180821
+dvipdfm-x (TeX Live) config.lt 20180823
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -16624,7 +16624,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 20180821, which was
+This file was extended by dvipdfm-x (TeX Live) $as_me 20180823, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16694,7 +16694,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 20180821
+dvipdfm-x (TeX Live) config.status 20180823
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 8363038da9a..c6f7cd52de0 100644
--- a/Build/source/texk/dvipdfm-x/configure.ac
+++ b/Build/source/texk/dvipdfm-x/configure.ac
@@ -7,7 +7,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)], [20180821], [tex-k@tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20180823], [tex-k@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/type1.c b/Build/source/texk/dvipdfm-x/type1.c
index ce935d923e3..b713c2b58a2 100644
--- a/Build/source/texk/dvipdfm-x/type1.c
+++ b/Build/source/texk/dvipdfm-x/type1.c
@@ -1,6 +1,6 @@
/* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- Copyright (C) 2008-2016 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata,
+ Copyright (C) 2008-2018 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata,
the dvipdfmx project team.
Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -780,6 +780,13 @@ pdf_font_load_type1 (pdf_font *font)
GIDMap[num_glyphs++] = achar_gid;
charset->data.glyphs[charset->num_entries] = cff_get_seac_sid(cffont, achar_name);
charset->num_entries += 1;
+#if !defined(LIBDPX)
+ /* CharSet is actually string object. */
+ {
+ pdf_add_stream(pdfcharset, "/", 1);
+ pdf_add_stream(pdfcharset, achar_name, strlen(achar_name));
+ }
+#endif /* !LIBDPX */
}
for (i = 0; i < num_glyphs; i++) {
@@ -792,6 +799,13 @@ pdf_font_load_type1 (pdf_font *font)
GIDMap[num_glyphs++] = bchar_gid;
charset->data.glyphs[charset->num_entries] = cff_get_seac_sid(cffont, bchar_name);
charset->num_entries += 1;
+ #if !defined(LIBDPX)
+ /* CharSet is actually string object. */
+ {
+ pdf_add_stream(pdfcharset, "/", 1);
+ pdf_add_stream(pdfcharset, bchar_name, strlen(bchar_name));
+ }
+#endif /* !LIBDPX */
}
}
widths[gid] = gm.wx;
@@ -847,9 +861,5 @@ pdf_font_load_type1 (pdf_font *font)
if (GIDMap)
RELEASE(GIDMap);
- /*
- * Maybe writing Charset is recommended for subsetted font.
- */
-
return 0;
}