texlive[55919] Build/source/texk/dvipdfm-x: fix bugs in "force
commits+kakuto at tug.org
commits+kakuto at tug.org
Thu Jul 23 23:57:19 CEST 2020
Revision: 55919
http://tug.org/svn/texlive?view=revision&revision=55919
Author: kakuto
Date: 2020-07-23 23:57:19 +0200 (Thu, 23 Jul 2020)
Log Message:
-----------
fix bugs in "force fixed-pitch" option for .otf fonts and in image cache (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/pdfximage.c
Modified: trunk/Build/source/texk/dvipdfm-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/ChangeLog 2020-07-23 21:25:49 UTC (rev 55918)
+++ trunk/Build/source/texk/dvipdfm-x/ChangeLog 2020-07-23 21:57:19 UTC (rev 55919)
@@ -1,3 +1,11 @@
+2020-07-24 Shunsaku Hirata <shunsaku.hirata74 at 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 at gmail.com>
* pdfdoc.[ch], pdfnames.[ch], pdfobj.c, pdfximage.[ch],
Modified: trunk/Build/source/texk/dvipdfm-x/cidtype0.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/cidtype0.c 2020-07-23 21:25:49 UTC (rev 55918)
+++ trunk/Build/source/texk/dvipdfm-x/cidtype0.c 2020-07-23 21:57:19 UTC (rev 55919)
@@ -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 @@
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 @@
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));
}
Modified: trunk/Build/source/texk/dvipdfm-x/pdfximage.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/pdfximage.c 2020-07-23 21:25:49 UTC (rev 55918)
+++ trunk/Build/source/texk/dvipdfm-x/pdfximage.c 2020-07-23 21:57:19 UTC (rev 55919)
@@ -416,7 +416,7 @@
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 */
More information about the tex-live-commits
mailing list.