summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/pdftexdir/pdftex.web
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2017-04-01 07:29:32 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2017-04-01 07:29:32 +0000
commit8bccdb4d27ab05c44c37bfa7ccdfad234423f356 (patch)
tree03d8d4acd5c744a552795c14ad0d0a3373dfc98c /Build/source/texk/web2c/pdftexdir/pdftex.web
parent74864b33d4904033fe9ca870b546c21d0a969650 (diff)
pdftexdir: Always embed each bitmap font, even if it has an entry in a font-map file, with different size separately (Pali Roh\'ar)
git-svn-id: svn://tug.org/texlive/trunk@43667 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/pdftexdir/pdftex.web')
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftex.web8
1 files changed, 4 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index a00d8d408ac..b74cc416237 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -15731,7 +15731,7 @@ var w, s_out: scaled;
s: integer;
begin
w := char_width(f)(char_info(f)(c));
- if hasfmentry(f) then begin
+ if isscalable(f) then begin
if pdf_cur_Tm_a = 0 then begin
call_func(divide_scaled(w, pdf_font_size[f], 4));
pdf_delta_h := pdf_delta_h + scaled_out;
@@ -15942,7 +15942,7 @@ begin
{if |f| is auto expanded then ensure the base font is initialized}
if pdf_font_auto_expand[f] and (pdf_font_blink[f] <> null_font) then begin
b := pdf_font_blink[f];
- if not hasfmentry(b) then
+ if not isscalable(b) then
pdf_error("font expansion", "auto expansion is only possible with scalable fonts");
if not font_used[b] then
pdf_init_font(b);
@@ -15953,11 +15953,11 @@ begin
here: 1) |f| and |k| have the same tfm name (so they have been loaded at
different sizes, eg 'cmr10' and 'cmr10 at 11pt'); 2) |f| has been auto
expanded from |k|}
- if hasfmentry(f) then begin
+ if isscalable(f) then begin
i := head_tab[obj_type_font];
while i <> 0 do begin
k := obj_info(i);
- if hasfmentry(k) and
+ if isscalable(k) and
(pdf_font_map[k] = pdf_font_map[f]) and
(str_eq_str(font_name[k], font_name[f]) or
(pdf_font_auto_expand[f] and