texlive[58888] Build/source/texk/dvipdfm-x: recover the original
commits+kakuto at tug.org
commits+kakuto at tug.org
Sat Apr 17 01:37:32 CEST 2021
Revision: 58888
http://tug.org/svn/texlive?view=revision&revision=58888
Author: kakuto
Date: 2021-04-17 01:37:32 +0200 (Sat, 17 Apr 2021)
Log Message:
-----------
recover the original pkfont.c
Modified Paths:
--------------
trunk/Build/source/texk/dvipdfm-x/ChangeLog
trunk/Build/source/texk/dvipdfm-x/pkfont.c
Modified: trunk/Build/source/texk/dvipdfm-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/ChangeLog 2021-04-16 20:30:06 UTC (rev 58887)
+++ trunk/Build/source/texk/dvipdfm-x/ChangeLog 2021-04-16 23:37:32 UTC (rev 58888)
@@ -1,3 +1,8 @@
+2021-04-17 Akira Kakuto <kakuto at w32tex.org>
+
+ * pkfont.c: Remove all changes in 2020-12-14 and recover the
+ original pkfont.c.
+
2021-04-15 Akira Kakuto <kakuto at w32tex.org>
* tfm.c: Improve to find ofm files.
Modified: trunk/Build/source/texk/dvipdfm-x/pkfont.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/pkfont.c 2021-04-16 20:30:06 UTC (rev 58887)
+++ trunk/Build/source/texk/dvipdfm-x/pkfont.c 2021-04-16 23:37:32 UTC (rev 58888)
@@ -1,6 +1,6 @@
/* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- Copyright (C) 2002-2021 by Jin-Hwan Cho and Shunsaku Hirata,
+ Copyright (C) 2002-2020 by Jin-Hwan Cho and Shunsaku Hirata,
the dvipdfmx project team.
Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks at kettering.edu>
@@ -81,7 +81,7 @@
}
static FILE *
-dpx_open_pk_font_at (const char *ident, unsigned dpi, char **pkname)
+dpx_open_pk_font_at (const char *ident, unsigned dpi)
{
FILE *fp;
char *fqpn;
@@ -92,8 +92,6 @@
return NULL;
fp = MFOPEN(fqpn, FOPEN_RBIN_MODE);
RELEASE(fqpn);
- *pkname = NEW(strlen(ident)+12, char);
- (void)snprintf(*pkname, strlen(ident)+12, "%s.%dpk", ident, dpi);
return fp;
}
@@ -104,7 +102,6 @@
{
unsigned dpi;
FILE *fp;
- char *pkname;
if (!ident || point_size <= 0.0)
return -1;
@@ -116,7 +113,7 @@
}
dpi = truedpi(ident, point_size, base_dpi);
- fp = dpx_open_pk_font_at(ident, dpi, &pkname);
+ fp = dpx_open_pk_font_at(ident, dpi);
if (!fp)
return -1;
MFCLOSE(fp);
@@ -124,7 +121,8 @@
/* Type 3 fonts doesn't have FontName.
* FontFamily is recommended for PDF 1.5.
*/
- font->fontname = pkname;
+ font->fontname = NEW(strlen(ident)+1, char);
+ strcpy(font->fontname, ident);
if (encoding_id >= 0) {
pdf_encoding_used_by_type3(encoding_id);
@@ -487,7 +485,6 @@
int
pdf_font_load_pkfont (pdf_font *font)
{
- char *pkname;
pdf_obj *fontdict;
char *usedchars;
char *ident;
@@ -523,11 +520,11 @@
ASSERT(ident && usedchars && point_size > 0.0);
dpi = truedpi(ident, point_size, base_dpi);
- fp = dpx_open_pk_font_at(ident, dpi, &pkname);
+ fp = dpx_open_pk_font_at(ident, dpi);
if (!fp) {
ERROR("Could not find/open PK font file: %s (at %udpi)", ident, dpi);
}
- font->filename = pkname;
+
memset(charavail, 0, 256);
charprocs = pdf_new_dict();
/* Include bitmap as 72dpi image:
More information about the tex-live-commits
mailing list.