diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-04-01 07:29:32 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-04-01 07:29:32 +0000 |
commit | 8bccdb4d27ab05c44c37bfa7ccdfad234423f356 (patch) | |
tree | 03d8d4acd5c744a552795c14ad0d0a3373dfc98c /Build/source/texk/web2c/pdftexdir/mapfile.c | |
parent | 74864b33d4904033fe9ca870b546c21d0a969650 (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/mapfile.c')
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/mapfile.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/mapfile.c b/Build/source/texk/web2c/pdftexdir/mapfile.c index 8b2e270b643..ab665164a29 100644 --- a/Build/source/texk/web2c/pdftexdir/mapfile.c +++ b/Build/source/texk/web2c/pdftexdir/mapfile.c @@ -290,8 +290,7 @@ static int check_fm_entry(fm_entry * fm, boolean warn) /* if for non-Type3 font both ps_name and font file are missing, drop this entry */ - if ((is_type1(fm) || is_truetype(fm) || is_opentype(fm)) - && fm->ps_name == NULL && !is_fontfile(fm)) { + if (!is_type3(fm) && fm->ps_name == NULL && !is_fontfile(fm)) { if (warn) pdftex_warn ("invalid entry for `%s': both ps_name and font file missing", @@ -539,8 +538,13 @@ static void fm_scan_line(void) set_opentype(fm); else set_type1(fm); - } else if (is_std_t1font(fm)) - set_type1(fm); /* assume a builtin font is Type1 */ + } else { + if (is_std_t1font(fm)) { + set_type1(fm); /* assume a builtin font is Type1 */ + } else { + set_type3(fm); /* otherwise font is Type3 */ + } + } if (check_fm_entry(fm, true) != 0) goto bad_line; /* @@ -624,6 +628,11 @@ boolean hasfmentry(internalfontnumber f) return pdffontmap[f] != (fmentryptr) dummy_fm_entry(); } +boolean isscalable(internalfontnumber f) +{ + return hasfmentry(f) && (!is_type3((fm_entry *)pdffontmap[f])); +} + /* check whether a map entry is valid for font replacement */ static boolean fm_valid_for_font_replacement(fm_entry * fm) |