pdftex[823]

[commits+thanh at tug.org]

Revision: 823
          http://tug.org/svn/pdftex?view=revision&revision=823
Author:   thanh
Date:     2020-03-27 10:47:47 +0100 (Fri, 27 Mar 2020)
Log Message:
-----------
bugfix: pdftex tries to load non-sense fonts

Modified Paths:
--------------
    branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web	2020-03-02 16:57:37 UTC (rev 822)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web	2020-03-27 09:47:47 UTC (rev 823)
@@ -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;