From 9f6faeb83212a65c9de8b11d03f63224a6884e3e Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Tue, 22 Sep 2020 09:21:14 +0000 Subject: Fix a bug introduced by the previous font related code changes. (S. Hirata) git-svn-id: svn://tug.org/texlive/trunk@56402 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 4 ---- Build/source/texk/dvipdfm-x/pdffont.c | 3 ++- Build/source/texk/dvipdfm-x/xdvipdfmx.test | 12 ++++-------- 3 files changed, 6 insertions(+), 13 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 9fcfe560d6e..eb545679bcf 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,7 +1,3 @@ -2020-09-22 Akira Kakuto - - * xdvipdfmx.test: Disable PK test temporarily. - 2020-09-22 Shunsaku Hirata * cid.[ch], cidtype0.[ch], cidtype2.[ch], pdfdev.c, diff --git a/Build/source/texk/dvipdfm-x/pdffont.c b/Build/source/texk/dvipdfm-x/pdffont.c index cc05c2e1ac9..ce4432c9af9 100644 --- a/Build/source/texk/dvipdfm-x/pdffont.c +++ b/Build/source/texk/dvipdfm-x/pdffont.c @@ -987,6 +987,7 @@ pdf_font_load_font (const char *ident, double font_scale, fontmap_rec *mrec) strcpy(font->ident, ident); font->encoding_id = encoding_id; font->filename = NEW(strlen(fontname) + 1, char); + font->point_size = font_scale; strcpy(font->filename, fontname); font->index = (mrec && mrec->opt.index) ? mrec->opt.index : 0; font->flags |= (mrec && (mrec->opt.flags & FONTMAP_OPT_NOEMBED)) ? PDF_FONT_FLAG_NOEMBED : 0; @@ -996,7 +997,7 @@ pdf_font_load_font (const char *ident, double font_scale, fontmap_rec *mrec) font->subtype = PDF_FONT_FONTTYPE_TYPE1C; } else if (pdf_font_open_truetype(font, font->filename, font->index, font->encoding_id, (font->flags & PDF_FONT_FLAG_NOEMBED) ? 0 : 1) >= 0) { font->subtype = PDF_FONT_FONTTYPE_TRUETYPE; - } else if (pdf_font_open_pkfont(font,font->filename, font->index, font->encoding_id, (font->flags & PDF_FONT_FLAG_NOEMBED) ? 0 : 1, font->point_size) >= 0) { + } else if (pdf_font_open_pkfont(font, font->filename, font->index, font->encoding_id, (font->flags & PDF_FONT_FLAG_NOEMBED) ? 0 : 1, font->point_size) >= 0) { font->subtype = PDF_FONT_FONTTYPE_TYPE3; } else { pdf_clean_font_struct(font); diff --git a/Build/source/texk/dvipdfm-x/xdvipdfmx.test b/Build/source/texk/dvipdfm-x/xdvipdfmx.test index bab67d41ff4..4d6e7cd92ba 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfmx.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfmx.test @@ -34,16 +34,12 @@ echo "*** xdvipdfmx -v -o image2.pdf image" && echo \ && echo && echo "xdvipdfmx-image tests OK" && echo \ || failed="$failed xdvipdfmx-image" -# -# disable PK test temporarily -# -#echo "*** xdvipdfmx -v -o xbmc2.pdf xbmc" && echo \ -# && ./xdvipdfmx -v -o xbmc2.pdf $srcdir/tests/xbmc \ -# && echo && echo "xdvipdfmx-xbmc tests OK" && echo \ -# || failed="$failed xdvipdfmx-xbmc" +echo "*** xdvipdfmx -v -o xbmc2.pdf xbmc" && echo \ + && ./xdvipdfmx -v -o xbmc2.pdf $srcdir/tests/xbmc \ + && echo && echo "xdvipdfmx-xbmc tests OK" && echo \ + || failed="$failed xdvipdfmx-xbmc" test -z "$failed" && exit 0 echo echo "failed tests:$failed" exit 1 - -- cgit v1.2.3