texlive[55140] Build/source/texk/web2c/pdftexdir: thanh fix for

[commits+karl at tug.org]

Revision: 55140
          http://tug.org/svn/texlive?view=revision&revision=55140
Author:   karl
Date:     2020-05-14 20:21:09 +0200 (Thu, 14 May 2020)
Log Message:
-----------
thanh fix for non-autoexpand virtual fonts

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
    trunk/Build/source/texk/web2c/pdftexdir/pdftex.web

Modified: trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/ChangeLog	2020-05-14 17:52:08 UTC (rev 55139)
+++ trunk/Build/source/texk/web2c/pdftexdir/ChangeLog	2020-05-14 18:21:09 UTC (rev 55140)
@@ -17,6 +17,14 @@
 	support; now poppler is not supported in TL.
 	See source/m4/kpse-xpdf-flags.m4 for some discussion.
 
+2020-03-28  Thanh Han The  <hanthethanh at gmail.com>
+
+	* pdftex.web (load_expand_font, vf_def_font): do not call
+	copy_expand_params on null_font.
+	Original report from Robert Schlicht,
+	https://tug.org/pipermail/tex-live/2020-March/045099.html
+	https://mailman.ntg.nl/pipermail/ntg-pdftex/2020-March/004307.html
+
 2020-03-27  Karl Berry  <karl at tug.org>
 
 	* TeX Live 2020, pdftex 1.40.21.

Modified: trunk/Build/source/texk/web2c/pdftexdir/pdftex.web
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/pdftex.web	2020-05-14 17:52:08 UTC (rev 55139)
+++ trunk/Build/source/texk/web2c/pdftexdir/pdftex.web	2020-05-14 18:21:09 UTC (rev 55140)
@@ -17434,7 +17434,8 @@
         else
             k := read_font_info(null_cs, s, "", font_size[f]);
     end;
-    copy_expand_params(k, f, e);
+    if k <> null_font then
+        copy_expand_params(k, f, e);
     load_expand_font := k;
 end;
 
@@ -17990,12 +17991,12 @@
             vf_local_font_warning(f, k, "checksum mismatch");
         if ds <> font_dsize[k] then
             vf_local_font_warning(f, k, "design size mismatch");
+        if (pdf_font_step[f] <> 0) then
+            set_expand_params(k, pdf_font_auto_expand[f],
+                              pdf_font_expand_ratio[pdf_font_stretch[f]],
+                              -pdf_font_expand_ratio[pdf_font_shrink[f]],
+                              pdf_font_step[f], pdf_font_expand_ratio[f]);
     end;
-    if (pdf_font_step[f] <> 0) then
-        set_expand_params(k, pdf_font_auto_expand[f],
-                          pdf_font_expand_ratio[pdf_font_stretch[f]],
-                          -pdf_font_expand_ratio[pdf_font_shrink[f]],
-                          pdf_font_step[f], pdf_font_expand_ratio[f]);
     vf_def_font := k;
 end;