texlive[57357] Build/source/texk/dvipdfm-x: Fix a bug that vertical
commits+kakuto at tug.org
commits+kakuto at tug.org
Sat Jan 9 02:10:34 CET 2021
Revision: 57357
http://tug.org/svn/texlive?view=revision&revision=57357
Author: kakuto
Date: 2021-01-09 02:10:34 +0100 (Sat, 09 Jan 2021)
Log Message:
-----------
Fix a bug that vertical metrics are not written (S. Hirata)
Modified Paths:
--------------
trunk/Build/source/texk/dvipdfm-x/ChangeLog
trunk/Build/source/texk/dvipdfm-x/cidtype0.c
trunk/Build/source/texk/dvipdfm-x/cidtype2.c
trunk/Build/source/texk/dvipdfm-x/configure
trunk/Build/source/texk/dvipdfm-x/configure.ac
trunk/Build/source/texk/dvipdfm-x/pdffont.c
trunk/Build/source/texk/dvipdfm-x/pdffont.h
trunk/Build/source/texk/dvipdfm-x/type0.c
Modified: trunk/Build/source/texk/dvipdfm-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/ChangeLog 2021-01-09 00:54:17 UTC (rev 57356)
+++ trunk/Build/source/texk/dvipdfm-x/ChangeLog 2021-01-09 01:10:34 UTC (rev 57357)
@@ -1,3 +1,9 @@
+2021-01-09 Shunsaku Hirata <shunsaku.hirata74 at gmail.com>
+
+ * cidtype0.c, cidtype2.c, pdffont.[ch], type0.c: Fix a bug
+ that vertical metrics are not written. Introduced in rev.56400.
+ * configure.ac: Version 20210109.
+
2020-12-16 Karl Berry <karl at freefriends.org>
* dvipdfmx.c (show_usage): -f loads an additional map file,
Modified: trunk/Build/source/texk/dvipdfm-x/cidtype0.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/cidtype0.c 2021-01-09 00:54:17 UTC (rev 57356)
+++ trunk/Build/source/texk/dvipdfm-x/cidtype0.c 2021-01-09 01:10:34 UTC (rev 57357)
@@ -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.
This program is free software; you can redistribute it and/or modify
@@ -599,7 +599,7 @@
pdf_new_name("DW"), pdf_new_number(1000.0));
} else {
add_CIDMetrics(sfont, font->resource, CIDToGIDMap, last_cid,
- font->cid.usedchars_v ? 1 : 0);
+ font->cid.need_vmetrics ? 1 : 0);
}
if (!font->cid.options.embed) {
@@ -1430,7 +1430,7 @@
}
}
add_CIDMetrics(sfont, font->resource, CIDToGIDMap, last_cid,
- font->cid.usedchars_v ? 1 : 0);
+ font->cid.need_vmetrics ? 1 : 0);
RELEASE(CIDToGIDMap);
}
Modified: trunk/Build/source/texk/dvipdfm-x/cidtype2.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/cidtype2.c 2021-01-09 00:54:17 UTC (rev 57356)
+++ trunk/Build/source/texk/dvipdfm-x/cidtype2.c 2021-01-09 01:10:34 UTC (rev 57357)
@@ -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.
This program is free software; you can redistribute it and/or modify
@@ -932,7 +932,7 @@
pdf_add_dict(font->resource, pdf_new_name("DW"), pdf_new_number(1000.0));
} else {
add_TTCIDHMetrics(font->resource, glyphs, used_chars, cidtogidmap, last_cid);
- if (v_used_chars)
+ if (font->cid.need_vmetrics)
add_TTCIDVMetrics(font->resource, glyphs, used_chars, last_cid);
}
Modified: trunk/Build/source/texk/dvipdfm-x/configure
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/configure 2021-01-09 00:54:17 UTC (rev 57356)
+++ trunk/Build/source/texk/dvipdfm-x/configure 2021-01-09 01:10:34 UTC (rev 57357)
@@ -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) 20201216.
+# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20210109.
#
# Report bugs to <dvipdfmx at tug.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='dvipdfm-x (TeX Live)'
PACKAGE_TARNAME='dvipdfm-x--tex-live-'
-PACKAGE_VERSION='20201216'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20201216'
+PACKAGE_VERSION='20210109'
+PACKAGE_STRING='dvipdfm-x (TeX Live) 20210109'
PACKAGE_BUGREPORT='dvipdfmx at tug.org'
PACKAGE_URL=''
@@ -1350,7 +1350,7 @@
# 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) 20201216 to adapt to many kinds of systems.
+\`configure' configures dvipdfm-x (TeX Live) 20210109 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1421,7 +1421,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20201216:";;
+ short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20210109:";;
esac
cat <<\_ACEOF
@@ -1551,7 +1551,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dvipdfm-x (TeX Live) configure 20201216
+dvipdfm-x (TeX Live) configure 20210109
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2390,7 +2390,7 @@
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 20201216, which was
+It was created by dvipdfm-x (TeX Live) $as_me 20210109, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8072,7 +8072,7 @@
# Define the identity of the package.
PACKAGE='dvipdfm-x--tex-live-'
- VERSION='20201216'
+ VERSION='20210109'
cat >>confdefs.h <<_ACEOF
@@ -14741,7 +14741,7 @@
Report bugs to <bug-libtool at gnu.org>."
lt_cl_version="\
-dvipdfm-x (TeX Live) config.lt 20201216
+dvipdfm-x (TeX Live) config.lt 20210109
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -16631,7 +16631,7 @@
# 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 20201216, which was
+This file was extended by dvipdfm-x (TeX Live) $as_me 20210109, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16701,7 +16701,7 @@
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 20201216
+dvipdfm-x (TeX Live) config.status 20210109
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: trunk/Build/source/texk/dvipdfm-x/configure.ac
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/configure.ac 2021-01-09 00:54:17 UTC (rev 57356)
+++ trunk/Build/source/texk/dvipdfm-x/configure.ac 2021-01-09 01:10:34 UTC (rev 57357)
@@ -8,7 +8,7 @@
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)], [20201216], [dvipdfmx at tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20210109], [dvipdfmx at tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([agl.c])
AC_CONFIG_AUX_DIR([../../build-aux])
Modified: trunk/Build/source/texk/dvipdfm-x/pdffont.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/pdffont.c 2021-01-09 00:54:17 UTC (rev 57356)
+++ trunk/Build/source/texk/dvipdfm-x/pdffont.c 2021-01-09 01:10:34 UTC (rev 57357)
@@ -1,6 +1,6 @@
/* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- Copyright (C) 2002-2020 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata,
+ Copyright (C) 2002-2021 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata,
the dvipdfmx project team.
Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks at kettering.edu>
@@ -110,6 +110,7 @@
font->type0.wmode = 0;
init_CIDSysInfo(&font->cid.csi);
+ font->cid.need_vmetrics = 0;
font->cid.usedchars_v = NULL;
font->cid.options.embed = 0;
font->cid.options.style = FONT_STYLE_NONE;
Modified: trunk/Build/source/texk/dvipdfm-x/pdffont.h
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/pdffont.h 2021-01-09 00:54:17 UTC (rev 57356)
+++ trunk/Build/source/texk/dvipdfm-x/pdffont.h 2021-01-09 01:10:34 UTC (rev 57357)
@@ -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 at kettering.edu>
@@ -117,6 +117,7 @@
struct {
CIDSysInfo csi; /* Character collection */
cid_opt options; /* Options from map record */
+ int need_vmetrics;
char *usedchars_v;
} cid;
};
Modified: trunk/Build/source/texk/dvipdfm-x/type0.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/type0.c 2021-01-09 00:54:17 UTC (rev 57356)
+++ trunk/Build/source/texk/dvipdfm-x/type0.c 2021-01-09 01:10:34 UTC (rev 57357)
@@ -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.
This program is free software; you can redistribute it and/or modify
@@ -213,6 +213,9 @@
sprintf(font->fontname, "%s-%s", fontname, wmode ? "Identity-V" : "Identity-H");
font->usedchars = CIDFont_get_usedchars(cidfont);
font->flags |= PDF_FONT_FLAG_USEDCHAR_SHARED;
+ if (wmode) {
+ cidfont->cid.need_vmetrics = 1;
+ }
break;
case PDF_FONT_FONTTYPE_CIDTYPE2:
font->fontname = NEW(strlen(fontname)+1, char);
@@ -228,6 +231,9 @@
font->usedchars = wmode ? CIDFont_get_usedchars_v(cidfont) : CIDFont_get_usedchars(cidfont);
font->flags |= PDF_FONT_FLAG_USEDCHAR_SHARED;
}
+ if (wmode) {
+ cidfont->cid.need_vmetrics = 1;
+ }
break;
}
More information about the tex-live-commits
mailing list.