summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-29 23:48:29 +0000
committerKarl Berry <karl@freefriends.org>2017-03-29 23:48:29 +0000
commit4876aa3a20e41be9c4b60d955aa59a4596883c57 (patch)
tree1e7e51039a9c383940b8d309f2a4e9a16d11f7c6
parent64fe492d04d786d03d443b50d3834e1c6a1f6a53 (diff)
embed each re-encoded bitmap font separately
git-svn-id: svn://tug.org/texlive/trunk@43642 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog10
-rw-r--r--Build/source/texk/web2c/pdftexdir/NEWS3
-rw-r--r--Build/source/texk/web2c/pdftexdir/mapfile.c8
-rw-r--r--Build/source/texk/web2c/pdftexdir/writet3.c4
4 files changed, 18 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 92dc192dfcb..c788f747633 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,11 @@
+2017-03-30 Pali Roh\'ar <pali.rohar@gmail.com>
+
+ * writet3.c (writet3): ensure fm is non-NULL before dereferencing.
+ * mapfile.c (check_fm_entry): omit check for is_reencoded, i.e.,
+ an .enc file. This way, each bitmap font is embedded separately,
+ thus rasterized by MF instead of geometrically scaling up.
+ https://mailman.ntg.nl/pipermail/ntg-pdftex/2017-March/004125.html
+
2017-03-29 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* writepng.c: Fix the size of memory to allocate when writing
@@ -11,7 +19,7 @@
* pdftex.web (pdftex_revision, pdftex_version_string):
version [1.40.]18 for TL17.
-2017-03-16 Pali Roh\'ar <pali.rohar@gmail.com>
+2017-03-16 Pali Roh\'ar <pali.rohar@gmail.com>
Allow .enc files for bitmap fonts, following thread at
http://tug.org/pipermail/pdftex/2016-June/008980.html
diff --git a/Build/source/texk/web2c/pdftexdir/NEWS b/Build/source/texk/web2c/pdftexdir/NEWS
index b7c30ab861f..16ab2304eaa 100644
--- a/Build/source/texk/web2c/pdftexdir/NEWS
+++ b/Build/source/texk/web2c/pdftexdir/NEWS
@@ -7,7 +7,8 @@ pdfTeX 3.14159265-2.6-1.40.18 (TeX Live 2017)
omitting output of the default /MediaBox.
- bugfixes:
- - \pdflastmatch more reliable when there was no match
+ - \pdflastmatch more reliable when there was no match.
+ - avoid writing uninitialized memory with alpha-channel images.
---------------------------------------------------
pdfTeX 3.14159265-2.6-1.40.17 (TeX Live 2016) (May 20, 2016)
diff --git a/Build/source/texk/web2c/pdftexdir/mapfile.c b/Build/source/texk/web2c/pdftexdir/mapfile.c
index 457fedb4df7..25f61f7071e 100644
--- a/Build/source/texk/web2c/pdftexdir/mapfile.c
+++ b/Build/source/texk/web2c/pdftexdir/mapfile.c
@@ -288,11 +288,13 @@ static int check_fm_entry(fm_entry * fm, boolean warn)
/* do not set variable |a| as this entry will be still accepted */
}
- /* if ps_name, font file and enc file are missing, drop this entry */
- if (fm->ps_name == NULL && !is_fontfile(fm) && !is_reencoded(fm)) {
+ /* 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 (warn)
pdftex_warn
- ("invalid entry for `%s': ps_name, font file, enc file all missing",
+ ("invalid entry for `%s': both ps_name and font file missing",
fm->tfm_name);
a += 1;
}
diff --git a/Build/source/texk/web2c/pdftexdir/writet3.c b/Build/source/texk/web2c/pdftexdir/writet3.c
index a7f7a18c3d7..bdcfa58eb3b 100644
--- a/Build/source/texk/web2c/pdftexdir/writet3.c
+++ b/Build/source/texk/web2c/pdftexdir/writet3.c
@@ -1,5 +1,5 @@
/*
-Copyright 1996-2014 Han The Thanh, <thanh@pdftex.org>
+Copyright 1996-2017 Han The Thanh, <thanh@pdftex.org>
This file is part of pdfTeX.
@@ -295,7 +295,7 @@ void writet3(fm_entry * fm, int objnum, internalfontnumber f)
t3_char_procs[i] = 0;
t3_char_widths[i] = 0;
}
- fe = fm ? get_fe_entry(fm->encname) : NULL;
+ fe = fm && fm->encname ? get_fe_entry(fm->encname) : NULL;
glyph_names = fe ? fe->glyph_names : NULL;
if (glyph_names)
remove_duplicate_glyph_names(glyph_names, fm->encname);