From ce020ad65649f6c6ad6721038fe63aa3cf8f34b2 Mon Sep 17 00:00:00 2001 From: Han The Thanh Date: Mon, 13 Jul 2009 08:40:49 +0000 Subject: minor fixes for pdftex git-svn-id: svn://tug.org/texlive/trunk@14235 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/pdftexdir/ChangeLog | 7 +++++++ Build/source/texk/web2c/pdftexdir/mapfile.c | 2 ++ Build/source/texk/web2c/pdftexdir/pdftex.web | 1 + Build/source/texk/web2c/pdftexdir/writejpg.c | 7 +++++++ Build/source/texk/web2c/pdftexdir/writettf.c | 2 +- 5 files changed, 18 insertions(+), 1 deletion(-) (limited to 'Build/source/texk/web2c/pdftexdir') diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index de1dadd7092..4bad69487a8 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,10 @@ +2009-07-13 Han The Thanh + + * mapfile.c: treat TTC fonts as TTF + * writejpg.c: fix bitmap resolution + * writettf.c: fix segfault for certain TTF fonts + * pdftex.web: enable pk generation by default + 2009-06-26 Han The Thanh * pdftex.web: bugfix from Hartmut: fix \pdfobj file {foo} for files diff --git a/Build/source/texk/web2c/pdftexdir/mapfile.c b/Build/source/texk/web2c/pdftexdir/mapfile.c index 1b0b2b4510f..f19c4dde883 100644 --- a/Build/source/texk/web2c/pdftexdir/mapfile.c +++ b/Build/source/texk/web2c/pdftexdir/mapfile.c @@ -530,6 +530,8 @@ static void fm_scan_line() if (is_fontfile(fm) && strlen(fm_fontfile(fm)) > 3) { if (strcasecmp(strend(fm_fontfile(fm)) - 4, ".ttf") == 0) set_truetype(fm); + else if (strcasecmp(strend(fm_fontfile(fm)) - 4, ".ttc") == 0) + set_truetype(fm); else if (strcasecmp(strend(fm_fontfile(fm)) - 4, ".otf") == 0) set_opentype(fm); else diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web index 47630498136..0c2faf3a7db 100644 --- a/Build/source/texk/web2c/pdftexdir/pdftex.web +++ b/Build/source/texk/web2c/pdftexdir/pdftex.web @@ -19376,6 +19376,7 @@ if pdf_pk_mode <> null then begin flush_string; end else kpse_init_prog('PDFTEX', fixed_pk_resolution, nil, nil); +kpse_set_program_enabled (kpse_pk_format, 1, kpse_src_compile); set_job_id(year, month, day, time); if (pdf_unique_resname > 0) and (pdf_resname_prefix = 0) then pdf_resname_prefix := get_resname_prefix diff --git a/Build/source/texk/web2c/pdftexdir/writejpg.c b/Build/source/texk/web2c/pdftexdir/writejpg.c index d07db2f4a91..e1a9cacef88 100644 --- a/Build/source/texk/web2c/pdftexdir/writejpg.c +++ b/Build/source/texk/web2c/pdftexdir/writejpg.c @@ -134,6 +134,13 @@ void read_jpg_info(integer img) break; } } + /* if either xres or yres is 0 but the other isn't, set it to the value of the other */ + if ((img_xres(img) == 0) && (img_yres(img) != 0)) { + img_xres(img) = img_yres(img); + } + if ((img_yres(img) == 0) && (img_xres(img) != 0)) { + img_yres(img) = img_xres(img); + } } xfseek(jpg_ptr(img)->file, 0, SEEK_SET, cur_file_name); while (1) { diff --git a/Build/source/texk/web2c/pdftexdir/writettf.c b/Build/source/texk/web2c/pdftexdir/writettf.c index 920627453bb..211e750f295 100644 --- a/Build/source/texk/web2c/pdftexdir/writettf.c +++ b/Build/source/texk/web2c/pdftexdir/writettf.c @@ -403,7 +403,7 @@ static void ttf_read_mapx(void) glyph->name_index = 0; glyph->name = (char *) notdef; } - glyph_index = xtalloc(glyphs_count, long); + glyph_index = xtalloc(glyphs_count + 1, long); glyph_index[0] = 0; /* index of ".notdef" glyph */ glyph_index[1] = 1; /* index of ".null" glyph */ } -- cgit v1.2.3