diff options
| author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2020-07-23 21:57:19 +0000 |
|---|---|---|
| committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2020-07-23 21:57:19 +0000 |
| commit | 967183e9e9672cb77270ae4b858f5dfcbff0950b (patch) | |
| tree | 360e5d008465caca527619887bd02aaf60e16716 | |
| parent | 4f97216d337350afed0b6718c5ccfbb5c6d4d3b4 (diff) | |
fix bugs in "force fixed-pitch" option for .otf fonts and in image cache (S. Hirata).
git-svn-id: svn://tug.org/texlive/trunk@55919 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Build/source/texk/dvipdfm-x/ChangeLog | 8 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfm-x/cidtype0.c | 20 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfm-x/pdfximage.c | 2 |
3 files changed, 20 insertions, 10 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index d71cee39b55..d6d4bec2d8b 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,11 @@ +2020-07-24 Shunsaku Hirata <shunsaku.hirata74@gmail.com> + + * cidtype0.c: Fix a bug introduced in rev.37144 that generated + CIDType0 font file is corrupt when the "force fixed-pitch" + option is enabled. + * pdfximage.c: "filename" was wrongly used for cached converted + PS images. + 2020-07-21 Shunsaku Hirata <shunsaku.hirata74@gmail.com> * pdfdoc.[ch], pdfnames.[ch], pdfobj.c, pdfximage.[ch], diff --git a/Build/source/texk/dvipdfm-x/cidtype0.c b/Build/source/texk/dvipdfm-x/cidtype0.c index 14a8c39b9a5..ecd5759a5a7 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) 2007-2019 by Jin-Hwan Cho and Shunsaku Hirata, + Copyright (C) 2007-2020 by Jin-Hwan Cho and Shunsaku Hirata, the dvipdfmx project team. This program is free software; you can redistribute it and/or modify @@ -656,14 +656,7 @@ CIDFont_type0_dofont (CIDFont *font) cff_read_charsets(cffont); - /* - * DW, W, DW2 and W2: - * Those values are obtained from OpenType table (not TFM). - */ - if (opt_flags & CIDFONT_FORCE_FIXEDPITCH) { - pdf_add_dict(font->fontdict, - pdf_new_name("DW"), pdf_new_number(1000.0)); - } else { + { int cid_count; if (cff_dict_known(cffont->topdict, "CIDCount")) { @@ -689,7 +682,16 @@ CIDFont_type0_dofont (CIDFont *font) num_glyphs++; } } + } + /* + * DW, W, DW2 and W2: + * Those values are obtained from OpenType table (not TFM). + */ + if (opt_flags & CIDFONT_FORCE_FIXEDPITCH) { + pdf_add_dict(font->fontdict, + pdf_new_name("DW"), pdf_new_number(1000.0)); + } else { add_CIDMetrics(info.sfont, font->fontdict, CIDToGIDMap, last_cid, ((CIDFont_get_parent_id(font, 1) < 0) ? 0 : 1)); } diff --git a/Build/source/texk/dvipdfm-x/pdfximage.c b/Build/source/texk/dvipdfm-x/pdfximage.c index 27894763c4b..e83d29f47fa 100644 --- a/Build/source/texk/dvipdfm-x/pdfximage.c +++ b/Build/source/texk/dvipdfm-x/pdfximage.c @@ -416,7 +416,7 @@ pdf_ximage_load_image (const char *ident, const char *filename, load_options opt I->attr.bbox_type == options.bbox_type) { return id; } - f = I->filename; + f = I->fullname; } if (f) { /* we already have converted this file; f is the temporary file name */ |