From a08ef3d9c56058190190dc91712b7d336f8eaea6 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Sat, 9 Jan 2021 01:10:34 +0000 Subject: Fix a bug that vertical metrics are not written (S. Hirata) git-svn-id: svn://tug.org/texlive/trunk@57357 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 6 ++++++ Build/source/texk/dvipdfm-x/cidtype0.c | 6 +++--- Build/source/texk/dvipdfm-x/cidtype2.c | 4 ++-- Build/source/texk/dvipdfm-x/configure | 22 +++++++++++----------- Build/source/texk/dvipdfm-x/configure.ac | 2 +- Build/source/texk/dvipdfm-x/pdffont.c | 3 ++- Build/source/texk/dvipdfm-x/pdffont.h | 3 ++- Build/source/texk/dvipdfm-x/type0.c | 8 +++++++- 8 files changed, 34 insertions(+), 20 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 4914ffa7d96..8f9d01f5643 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,9 @@ +2021-01-09 Shunsaku Hirata + + * 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 * dvipdfmx.c (show_usage): -f loads an additional map file, diff --git a/Build/source/texk/dvipdfm-x/cidtype0.c b/Build/source/texk/dvipdfm-x/cidtype0.c index a1eb757a799..9e68d00d7da 100644 --- a/Build/source/texk/dvipdfm-x/cidtype0.c +++ b/Build/source/texk/dvipdfm-x/cidtype0.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. This program is free software; you can redistribute it and/or modify @@ -599,7 +599,7 @@ CIDFont_type0_dofont (pdf_font *font) 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 @@ CIDFont_type0_t1cdofont (pdf_font *font) } } add_CIDMetrics(sfont, font->resource, CIDToGIDMap, last_cid, - font->cid.usedchars_v ? 1 : 0); + font->cid.need_vmetrics ? 1 : 0); RELEASE(CIDToGIDMap); } diff --git a/Build/source/texk/dvipdfm-x/cidtype2.c b/Build/source/texk/dvipdfm-x/cidtype2.c index 4c990c12f26..11554b47780 100644 --- a/Build/source/texk/dvipdfm-x/cidtype2.c +++ b/Build/source/texk/dvipdfm-x/cidtype2.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. This program is free software; you can redistribute it and/or modify @@ -932,7 +932,7 @@ CIDFont_type2_dofont (pdf_font *font) 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); } diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure index 609476ac362..639649dd243 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) 20201216. +# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20210109. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # 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@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) 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 @@ fi 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 @@ fi 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 @@ 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 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 @@ fi # Define the identity of the package. PACKAGE='dvipdfm-x--tex-live-' - VERSION='20201216' + VERSION='20210109' cat >>confdefs.h <<_ACEOF @@ -14741,7 +14741,7 @@ Usage: $0 [OPTIONS] Report bugs to ." 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 @@ 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 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 @@ _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 20201216 +dvipdfm-x (TeX Live) config.status 20210109 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 9724740b696..12654bacd24 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)], [20201216], [dvipdfmx@tug.org]) +AC_INIT([dvipdfm-x (TeX Live)], [20210109], [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 e282a7da58e..b95d150ba21 100644 --- a/Build/source/texk/dvipdfm-x/pdffont.c +++ b/Build/source/texk/dvipdfm-x/pdffont.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, 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 @@ -110,6 +110,7 @@ pdf_init_font_struct (pdf_font *font) 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; diff --git a/Build/source/texk/dvipdfm-x/pdffont.h b/Build/source/texk/dvipdfm-x/pdffont.h index e0782e0e6e7..7794b860111 100644 --- a/Build/source/texk/dvipdfm-x/pdffont.h +++ b/Build/source/texk/dvipdfm-x/pdffont.h @@ -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 @@ -117,6 +117,7 @@ struct pdf_font struct { CIDSysInfo csi; /* Character collection */ cid_opt options; /* Options from map record */ + int need_vmetrics; char *usedchars_v; } cid; }; diff --git a/Build/source/texk/dvipdfm-x/type0.c b/Build/source/texk/dvipdfm-x/type0.c index afb4bbbc1bc..7dbbd984ad5 100644 --- a/Build/source/texk/dvipdfm-x/type0.c +++ b/Build/source/texk/dvipdfm-x/type0.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. This program is free software; you can redistribute it and/or modify @@ -213,6 +213,9 @@ pdf_font_open_type0 (pdf_font *font, int cid_id, int wmode) 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 @@ pdf_font_open_type0 (pdf_font *font, int cid_id, int wmode) 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; } -- cgit v1.2.3