summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-05-14 18:21:09 +0000
committerKarl Berry <karl@freefriends.org>2020-05-14 18:21:09 +0000
commit3c1313f321e217f3c4cc242aefe150cff4526afb (patch)
tree0fa545b3e309605e209ef6d747c2371ed3cef358 /Build/source/texk
parent23026cfc77a4cf6f833a2710bf5689042583b2c7 (diff)
thanh fix for non-autoexpand virtual fonts
git-svn-id: svn://tug.org/texlive/trunk@55140 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog8
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftex.web13
2 files changed, 15 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index b4378b8a335..745ea3b05ed 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -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@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@tug.org>
* TeX Live 2020, pdftex 1.40.21.
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index a3091b95aa4..ebe71620df7 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -17434,7 +17434,8 @@ begin
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 @@ begin
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;