summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorHan The Thanh <hanthethanh@gmail.com>2009-07-13 08:40:49 +0000
committerHan The Thanh <hanthethanh@gmail.com>2009-07-13 08:40:49 +0000
commitce020ad65649f6c6ad6721038fe63aa3cf8f34b2 (patch)
tree3a57a1bf90defae56a025fdb0186dc5a512f7866 /Build
parent10f6b2c95a4f134435e20f90eb9d3ca04f5f5e85 (diff)
minor fixes for pdftex
git-svn-id: svn://tug.org/texlive/trunk@14235 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/cpascal.h2
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog7
-rw-r--r--Build/source/texk/web2c/pdftexdir/mapfile.c2
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftex.web1
-rw-r--r--Build/source/texk/web2c/pdftexdir/writejpg.c7
-rw-r--r--Build/source/texk/web2c/pdftexdir/writettf.c2
-rw-r--r--Build/source/texk/web2c/web2c/common.defines2
7 files changed, 20 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/cpascal.h b/Build/source/texk/web2c/cpascal.h
index bdafa3c2dd7..a512f2d8bdc 100644
--- a/Build/source/texk/web2c/cpascal.h
+++ b/Build/source/texk/web2c/cpascal.h
@@ -253,7 +253,7 @@ typedef unsigned char *pointertobyte;
#define kpsewebformat kpse_web_format
#define kpsevarvalue kpse_var_value
#define kpsesetprogramenabled kpse_set_program_enabled
-#define kpsesrccmdline kpse_src_cmdline
+#define kpsesrccompile kpse_src_compile
#define makesuffix make_suffix
#define recorderchangefilename recorder_change_filename
#define recorderenabled recorder_enabled
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 <hanthethanh@gmail.com>
+
+ * 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 <hanthethanh@gmail.com>
* 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 */
}
diff --git a/Build/source/texk/web2c/web2c/common.defines b/Build/source/texk/web2c/web2c/common.defines
index 32a8ab6016a..b58aeb56784 100644
--- a/Build/source/texk/web2c/web2c/common.defines
+++ b/Build/source/texk/web2c/web2c/common.defines
@@ -50,7 +50,7 @@
@define const kpsetfmformat;
@define const kpsevfformat;
@define const kpsewebformat;
-@define const kpsesrccmdline;
+@define const kpsesrccompile;
@define const maxint;
@define const nil;
@define const output;