texlive[56402] Build/source/texk/dvipdfm-x: Fix a bug introduced by

[commits+kakuto at tug.org]

Revision: 56402
          http://tug.org/svn/texlive?view=revision&revision=56402
Author:   kakuto
Date:     2020-09-22 11:21:14 +0200 (Tue, 22 Sep 2020)
Log Message:
-----------
Fix a bug introduced by the previous font related code changes. (S. Hirata)

Modified Paths:
--------------
    trunk/Build/source/texk/dvipdfm-x/ChangeLog
    trunk/Build/source/texk/dvipdfm-x/pdffont.c
    trunk/Build/source/texk/dvipdfm-x/xdvipdfmx.test

Modified: trunk/Build/source/texk/dvipdfm-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/ChangeLog	2020-09-22 02:25:13 UTC (rev 56401)
+++ trunk/Build/source/texk/dvipdfm-x/ChangeLog	2020-09-22 09:21:14 UTC (rev 56402)
@@ -1,7 +1,3 @@
-2020-09-22  Akira Kakuto  <kakuto at w32tex.org>
-
-	* xdvipdfmx.test: Disable PK test temporarily.
-
 2020-09-22  Shunsaku Hirata  <shunsaku.hirata74 at gmail.com>
 
 	* cid.[ch], cidtype0.[ch], cidtype2.[ch], pdfdev.c,

Modified: trunk/Build/source/texk/dvipdfm-x/pdffont.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/pdffont.c	2020-09-22 02:25:13 UTC (rev 56401)
+++ trunk/Build/source/texk/dvipdfm-x/pdffont.c	2020-09-22 09:21:14 UTC (rev 56402)
@@ -987,6 +987,7 @@
     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 @@
       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);

Modified: trunk/Build/source/texk/dvipdfm-x/xdvipdfmx.test
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/xdvipdfmx.test	2020-09-22 02:25:13 UTC (rev 56401)
+++ trunk/Build/source/texk/dvipdfm-x/xdvipdfmx.test	2020-09-22 09:21:14 UTC (rev 56402)
@@ -34,16 +34,12 @@
 	&& 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
-